[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: More latex tests on files
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: More latex tests on files |
|
Date: |
Sun, 15 Aug 2021 18:44:23 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 6c40b4a More latex tests on files
6c40b4a is described below
commit 6c40b4a651224774a0539f62c599cb46cc978ef1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 16 00:44:04 2021 +0200
More latex tests on files
---
tp/t/latex_tests.t | 49 ++++++++++-----
.../no_titlepage_and_setchapternewpage_odd.pl | 41 +++++++++---
.../no_titlepage_and_setchapternewpage_odd.tex | 62 ++++++++++++++++++
.../no_titlepage_and_setchapternewpage_on.pl | 41 +++++++++---
.../no_titlepage_and_setchapternewpage_on.tex | 59 +++++++++++++++++
.../setchapternewpage_on_odd_titlepage.pl | 69 ++++++++++++++------
.../setchapternewpage_on_odd_titlepage.tex | 72 +++++++++++++++++++++
tp/t/results/latex_tests/settitle_and_headings.pl | 49 ++++++++++++---
.../res_latex/settitle_and_headings.tex | 62 ++++++++++++++++++
.../three_setchapternewpage_on_odd_off.pl | 57 +++++++++++++----
.../three_setchapternewpage_on_odd_off.tex | 69 ++++++++++++++++++++
tp/t/results/latex_tests/titlepage_and_headings.pl | 67 ++++++++++++++++----
.../res_latex/titlepage_and_headings.tex | 69 ++++++++++++++++++++
.../titlepage_and_setchapternewpage_odd.pl | 61 +++++++++++++-----
.../titlepage_and_setchapternewpage_odd.tex | 73 ++++++++++++++++++++++
.../titlepage_and_setchapternewpage_on.pl | 39 +++++++++---
.../titlepage_and_setchapternewpage_on.tex | 69 ++++++++++++++++++++
tp/t/results/latex_tests/titlepage_in_top_node.pl | 66 +++++++++++++++----
.../res_latex/titlepage_in_top_node.tex | 67 ++++++++++++++++++++
.../latex_tests/two_setchapternewpage_odd_on.pl | 47 +++++++++++---
.../res_latex/two_setchapternewpage_odd_on.tex | 67 ++++++++++++++++++++
.../latex_tests/two_setchapternewpage_on_odd.pl | 47 +++++++++++---
.../res_latex/two_setchapternewpage_on_odd.tex | 64 +++++++++++++++++++
23 files changed, 1236 insertions(+), 130 deletions(-)
diff --git a/tp/t/latex_tests.t b/tp/t/latex_tests.t
index e52e333..29bd0aa 100644
--- a/tp/t/latex_tests.t
+++ b/tp/t/latex_tests.t
@@ -31,8 +31,12 @@ my @test_cases = (
@kbd{in example distinct kbdinputstyle}
@end example
'],
+);
+
+my @file_tests = (
['settitle_and_headings',
-'@settitle Title @* for a manual
+'@setfilename settitle_and_headings.info
+@settitle Title @* for a manual
@headings double
@@ -40,17 +44,21 @@ my @test_cases = (
'],
# default case
['titlepage_and_headings',
-'@titlepage
+'@setfilename titlepage_and_headings.info
+
+@titlepage
in titlepage
@end titlepage
'],
-# note that those tests do not really correspond to
+# note that those tests with 'latex' do not really correspond to
# what happens for real documents, as in real documents,
# LaTeX default (start chapter on odd page) is switched
-# to Texinfo default (@setchapternewpage on).
+# to Texinfo default (@setchapternewpage on). With 'file_latex',
+# the correspond to the actual output
['titlepage_and_setchapternewpage_odd',
-'
+'@setfilename titlepage_and_setchapternewpage_odd.info
+
@setchapternewpage odd
@titlepage
@@ -59,11 +67,11 @@ in titlepage
'],
['no_titlepage_and_setchapternewpage_odd',
-'
+'@setfilename no_titlepage_and_setchapternewpage_odd.info
@setchapternewpage odd
'],
['titlepage_and_setchapternewpage_on',
-'
+'@setfilename titlepage_and_setchapternewpage_on.info
@setchapternewpage on
@titlepage
@@ -72,31 +80,36 @@ in titlepage
'],
['no_titlepage_and_setchapternewpage_on',
-'
+'@setfilename no_titlepage_and_setchapternewpage_on.info
@setchapternewpage on
'],
['two_setchapternewpage_odd_on',
-'@setchapternewpage odd
+'@setfilename two_setchapternewpage_odd_on.info
+@setchapternewpage odd
@setchapternewpage on
'],
['two_setchapternewpage_on_odd',
-'@setchapternewpage on
+'@setfilename two_setchapternewpage_on_odd.info
+@setchapternewpage on
@setchapternewpage odd
'],
['three_setchapternewpage_on_odd_off',
-'@setchapternewpage on
+'@setfilename three_setchapternewpage_on_odd_off.info
+@setchapternewpage on
@setchapternewpage odd
@setchapternewpage off
'],
-# this is more like what would actually happen, switching
+# With 'latex' test type this is more like what would actually
+# happen in the default case with output to a file, switching
# to @setchapternewpage on in preamble, then odd and then the
# title page
['setchapternewpage_on_odd_titlepage',
-'@setchapternewpage on
+'@setfilename setchapternewpage_on_odd_titlepage.info
+@setchapternewpage on
@setchapternewpage odd
@@ -105,7 +118,9 @@ in titlepage
@end titlepage
'],
['titlepage_in_top_node',
-'@node Top
+'@setfilename titlepage_in_top_node.info
+
+@node Top
@top top sectionning
In top
@@ -125,9 +140,13 @@ foreach my $test (@test_cases) {
$test->[2]->{'test_formats'} = ['latex'];
}
+foreach my $test (@file_tests) {
+ $test->[2]->{'test_formats'} = ['latex', 'file_latex'];
+}
+
our ($arg_test_case, $arg_generate, $arg_debug);
-run_all ('latex_tests', [@test_cases], $arg_test_case,
+run_all ('latex_tests', [@test_cases, @file_tests], $arg_test_case,
$arg_generate, $arg_debug);
1;
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
index d8564ef..39d9fbb 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
@@ -8,10 +8,33 @@ use utf8;
$result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'no_titlepage_and_setchapternewpage_odd.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'no_titlepage_and_setchapternewpage_odd.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'args' => [
@@ -47,18 +70,19 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
],
'type' => 'text_root'
};
+$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'args'}[0];
+$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0];
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_odd'};
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'args'}[0];
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[1];
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_odd'};
-$result_texis{'no_titlepage_and_setchapternewpage_odd'} = '
+$result_texis{'no_titlepage_and_setchapternewpage_odd'} = '@setfilename
no_titlepage_and_setchapternewpage_odd.info
@setchapternewpage odd
';
-$result_texts{'no_titlepage_and_setchapternewpage_odd'} = '
-';
+$result_texts{'no_titlepage_and_setchapternewpage_odd'} = '';
$result_errors{'no_titlepage_and_setchapternewpage_odd'} = [];
@@ -67,8 +91,7 @@ $result_floats{'no_titlepage_and_setchapternewpage_odd'} = {};
-$result_converted{'latex'}->{'no_titlepage_and_setchapternewpage_odd'} = '
-\\GNUTexinfosetdoubleheader{No Title}%
+$result_converted{'latex'}->{'no_titlepage_and_setchapternewpage_odd'} =
'\\GNUTexinfosetdoubleheader{No Title}%
';
1;
diff --git
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
new file mode 100644
index 0000000..436f113
--- /dev/null
+++
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
@@ -0,0 +1,62 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetdoubleheader{No Title}%
+
+\begin{document}
+\makeatletter
+\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\makeatother
+\GNUTexinfosetdoubleheader{No Title}%
+\end{document}
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
index ba5b735..42db432 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
@@ -8,10 +8,33 @@ use utf8;
$result_trees{'no_titlepage_and_setchapternewpage_on'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'no_titlepage_and_setchapternewpage_on.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'no_titlepage_and_setchapternewpage_on.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'args' => [
@@ -47,18 +70,19 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
],
'type' => 'text_root'
};
+$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'args'}[0];
+$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0];
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_on'};
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[1]{'args'}[0];
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[1];
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[1]{'parent'}
= $result_trees{'no_titlepage_and_setchapternewpage_on'};
-$result_texis{'no_titlepage_and_setchapternewpage_on'} = '
+$result_texis{'no_titlepage_and_setchapternewpage_on'} = '@setfilename
no_titlepage_and_setchapternewpage_on.info
@setchapternewpage on
';
-$result_texts{'no_titlepage_and_setchapternewpage_on'} = '
-';
+$result_texts{'no_titlepage_and_setchapternewpage_on'} = '';
$result_errors{'no_titlepage_and_setchapternewpage_on'} = [];
@@ -67,8 +91,7 @@ $result_floats{'no_titlepage_and_setchapternewpage_on'} = {};
-$result_converted{'latex'}->{'no_titlepage_and_setchapternewpage_on'} = '
-\\makeatletter
+$result_converted{'latex'}->{'no_titlepage_and_setchapternewpage_on'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
\\GNUTexinfosetsingleheader{}%
diff --git
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
new file mode 100644
index 0000000..72c7426
--- /dev/null
+++
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
@@ -0,0 +1,59 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetsingleheader{}%
+
+\begin{document}
+\GNUTexinfosetsingleheader{}%
+\end{document}
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index edfba38..3e063dc 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -13,6 +13,35 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
'contents' => [
{
'parent' => {},
+ 'text' => 'setchapternewpage_on_odd_titlepage.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'setchapternewpage_on_odd_titlepage.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'on'
}
],
@@ -33,7 +62,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
@@ -70,7 +99,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
@@ -129,7 +158,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 8,
'macro' => ''
},
'parent' => {}
@@ -140,7 +169,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => ''
},
'parent' => {}
@@ -151,22 +180,26 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'args'}[0];
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0];
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'parent'} =
$result_trees{'setchapternewpage_on_odd_titlepage'};
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[1]{'args'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[1];
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[1]{'parent'} =
$result_trees{'setchapternewpage_on_odd_titlepage'};
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[2]{'args'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[2];
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[2]{'parent'} =
$result_trees{'setchapternewpage_on_odd_titlepage'};
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[3]{'args'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[3];
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[3]{'parent'} =
$result_trees{'setchapternewpage_on_odd_titlepage'};
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[1];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[2];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'contents'}[2];
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[4]{'parent'} =
$result_trees{'setchapternewpage_on_odd_titlepage'};
-
-$result_texis{'setchapternewpage_on_odd_titlepage'} = '@setchapternewpage on
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[1];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[2];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[2]{'parent'}
= $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'extra'}{'end_command'}
=
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'contents'}[2];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[5]{'parent'} =
$result_trees{'setchapternewpage_on_odd_titlepage'};
+
+$result_texis{'setchapternewpage_on_odd_titlepage'} = '@setfilename
setchapternewpage_on_odd_titlepage.info
+@setchapternewpage on
@setchapternewpage odd
@@ -182,10 +215,10 @@ $result_texts{'setchapternewpage_on_odd_titlepage'} = '
$result_errors{'setchapternewpage_on_odd_titlepage'} = [
{
- 'error_line' => ':3: warning: multiple @setchapternewpage
+ 'error_line' => ':4: warning: multiple @setchapternewpage
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'multiple @setchapternewpage',
'type' => 'warning'
diff --git
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
new file mode 100644
index 0000000..59a95f2
--- /dev/null
+++
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
@@ -0,0 +1,72 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+
+% no headings before titlepage
+\pagestyle{empty}%
+
+\begin{document}
+
+\frontmatter
+
+\makeatletter
+\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\makeatother
+
+\begin{titlepage}
+in titlepage
+\end{titlepage}
+\GNUTexinfosetdoubleheader{No Title}%
+\mainmatter
+\end{document}
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 65d2b1b..b360333 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -15,6 +15,35 @@ $result_trees{'settitle_and_headings'} = {
'contents' => [
{
'parent' => {},
+ 'text' => 'settitle_and_headings.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'settitle_and_headings.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'Title '
},
{
@@ -40,7 +69,7 @@ $result_trees{'settitle_and_headings'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
@@ -77,7 +106,7 @@ $result_trees{'settitle_and_headings'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
@@ -117,7 +146,7 @@ $result_trees{'settitle_and_headings'} = {
'level' => 1,
'line_nr' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => ''
},
'number' => 1,
@@ -127,21 +156,25 @@ $result_trees{'settitle_and_headings'} = {
'type' => 'document_root'
};
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0];
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1];
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[2];
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[3];
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[0];
$result_trees{'settitle_and_headings'}{'contents'}[0]{'parent'} =
$result_trees{'settitle_and_headings'};
$result_trees{'settitle_and_headings'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'settitle_and_headings'}{'contents'}[1]{'args'}[0];
$result_trees{'settitle_and_headings'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'settitle_and_headings'}{'contents'}[1];
$result_trees{'settitle_and_headings'}{'contents'}[1]{'parent'} =
$result_trees{'settitle_and_headings'};
-$result_texis{'settitle_and_headings'} = '@settitle Title @* for a manual
+$result_texis{'settitle_and_headings'} = '@setfilename
settitle_and_headings.info
+@settitle Title @* for a manual
@headings double
diff --git
a/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
b/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
new file mode 100644
index 0000000..4299e86
--- /dev/null
+++
b/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
@@ -0,0 +1,62 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetsingleheader{}%
+
+\begin{document}
+
+\GNUTexinfosetdoubleheader{Title \leavevmode{}\\ for a manual}%
+
+\chapter{chap}
+\end{document}
diff --git a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
index 93a163c..c0d6f45 100644
--- a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
+++ b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
@@ -13,6 +13,35 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
'contents' => [
{
'parent' => {},
+ 'text' => 'three_setchapternewpage_on_odd_off.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'three_setchapternewpage_on_odd_off.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'on'
}
],
@@ -33,7 +62,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
@@ -70,7 +99,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
@@ -107,7 +136,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => ''
},
'parent' => {}
@@ -118,16 +147,20 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'args'}[0];
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0];
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'parent'} =
$result_trees{'three_setchapternewpage_on_odd_off'};
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[1]{'args'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[1];
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[1]{'parent'} =
$result_trees{'three_setchapternewpage_on_odd_off'};
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[2]{'args'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[2];
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[2]{'parent'} =
$result_trees{'three_setchapternewpage_on_odd_off'};
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[3]{'args'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[3];
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[3]{'parent'} =
$result_trees{'three_setchapternewpage_on_odd_off'};
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[4]{'args'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[4];
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[4]{'parent'} =
$result_trees{'three_setchapternewpage_on_odd_off'};
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[5]{'args'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[5];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[5]{'parent'} =
$result_trees{'three_setchapternewpage_on_odd_off'};
-$result_texis{'three_setchapternewpage_on_odd_off'} = '@setchapternewpage on
+$result_texis{'three_setchapternewpage_on_odd_off'} = '@setfilename
three_setchapternewpage_on_odd_off.info
+@setchapternewpage on
@setchapternewpage odd
@@ -141,19 +174,19 @@ $result_texts{'three_setchapternewpage_on_odd_off'} = '
$result_errors{'three_setchapternewpage_on_odd_off'} = [
{
- 'error_line' => ':3: warning: multiple @setchapternewpage
+ 'error_line' => ':4: warning: multiple @setchapternewpage
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'multiple @setchapternewpage',
'type' => 'warning'
},
{
- 'error_line' => ':5: warning: multiple @setchapternewpage
+ 'error_line' => ':6: warning: multiple @setchapternewpage
',
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => '',
'text' => 'multiple @setchapternewpage',
'type' => 'warning'
diff --git
a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
new file mode 100644
index 0000000..85e306a
--- /dev/null
+++
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
@@ -0,0 +1,69 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetsingleheader{}%
+
+\begin{document}
+\GNUTexinfosetsingleheader{}%
+
+\makeatletter
+\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\makeatother
+\GNUTexinfosetdoubleheader{No Title}%
+
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}}{}{}
+\makeatother
+\GNUTexinfosetsingleheader{}%
+\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 1147844..1be8a73 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -8,6 +8,41 @@ use utf8;
$result_trees{'titlepage_and_headings'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'titlepage_and_headings.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'titlepage_and_headings.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'cmdname' => 'titlepage',
'contents' => [
{
@@ -55,7 +90,7 @@ $result_trees{'titlepage_and_headings'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 5,
'macro' => ''
},
'parent' => {}
@@ -66,7 +101,7 @@ $result_trees{'titlepage_and_headings'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
@@ -80,18 +115,24 @@ $result_trees{'titlepage_and_headings'} = {
],
'type' => 'text_root'
};
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'titlepage_and_headings'}{'contents'}[0];
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'parent'} =
$result_trees{'titlepage_and_headings'};
$result_trees{'titlepage_and_headings'}{'contents'}[1]{'parent'} =
$result_trees{'titlepage_and_headings'};
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[1];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'extra'}{'end_command'}
= $result_trees{'titlepage_and_headings'}{'contents'}[2]{'contents'}[2];
+$result_trees{'titlepage_and_headings'}{'contents'}[2]{'parent'} =
$result_trees{'titlepage_and_headings'};
+$result_trees{'titlepage_and_headings'}{'contents'}[3]{'parent'} =
$result_trees{'titlepage_and_headings'};
+
+$result_texis{'titlepage_and_headings'} = '@setfilename
titlepage_and_headings.info
-$result_texis{'titlepage_and_headings'} = '@titlepage
+@titlepage
in titlepage
@end titlepage
@@ -99,6 +140,7 @@ in titlepage
$result_texts{'titlepage_and_headings'} = '
+
';
$result_errors{'titlepage_and_headings'} = [];
@@ -108,7 +150,8 @@ $result_floats{'titlepage_and_headings'} = {};
-$result_converted{'latex'}->{'titlepage_and_headings'} = '\\begin{titlepage}
+$result_converted{'latex'}->{'titlepage_and_headings'} = '
+\\begin{titlepage}
in titlepage
\\end{titlepage}
\\GNUTexinfosetsingleheader{}%
diff --git
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
new file mode 100644
index 0000000..fc58c15
--- /dev/null
+++
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
@@ -0,0 +1,69 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+
+% no headings before titlepage
+\pagestyle{empty}%
+
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage}
+in titlepage
+\end{titlepage}
+\GNUTexinfosetsingleheader{}%
+\mainmatter
+
+\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index b2c2bdb..3bd8316 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -8,6 +8,35 @@ use utf8;
$result_trees{'titlepage_and_setchapternewpage_odd'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'titlepage_and_setchapternewpage_odd.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'titlepage_and_setchapternewpage_odd.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
'parent' => {},
'text' => '
',
@@ -39,7 +68,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
@@ -98,7 +127,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
},
'parent' => {}
@@ -109,7 +138,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
},
'parent' => {}
@@ -123,23 +152,27 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
],
'type' => 'text_root'
};
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0];
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'};
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[1];
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[1]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'};
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[2];
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[2]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'};
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[1];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[2];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'extra'}{'end_command'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'contents'}[2];
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[3]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'};
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[1];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'contents'}[2];
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[4]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'};
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[5]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_odd'};
+
+$result_texis{'titlepage_and_setchapternewpage_odd'} = '@setfilename
titlepage_and_setchapternewpage_odd.info
-$result_texis{'titlepage_and_setchapternewpage_odd'} = '
@setchapternewpage odd
@titlepage
diff --git
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
new file mode 100644
index 0000000..5fd2b2a
--- /dev/null
+++
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
@@ -0,0 +1,73 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+
+% no headings before titlepage
+\pagestyle{empty}%
+
+\begin{document}
+
+\frontmatter
+
+\makeatletter
+\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\makeatother
+
+\begin{titlepage}
+in titlepage
+\end{titlepage}
+\GNUTexinfosetdoubleheader{No Title}%
+\mainmatter
+
+\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index 31d9625..74f379e 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -8,10 +8,33 @@ use utf8;
$result_trees{'titlepage_and_setchapternewpage_on'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'titlepage_and_setchapternewpage_on.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'titlepage_and_setchapternewpage_on.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'args' => [
@@ -123,6 +146,8 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
],
'type' => 'text_root'
};
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0];
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'parent'} =
$result_trees{'titlepage_and_setchapternewpage_on'};
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[1]{'args'}[0];
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[1];
@@ -139,7 +164,7 @@
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[3]{'extra'}{'end
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[3]{'parent'} =
$result_trees{'titlepage_and_setchapternewpage_on'};
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[4]{'parent'} =
$result_trees{'titlepage_and_setchapternewpage_on'};
-$result_texis{'titlepage_and_setchapternewpage_on'} = '
+$result_texis{'titlepage_and_setchapternewpage_on'} = '@setfilename
titlepage_and_setchapternewpage_on.info
@setchapternewpage on
@titlepage
@@ -151,7 +176,6 @@ in titlepage
$result_texts{'titlepage_and_setchapternewpage_on'} = '
-
';
$result_errors{'titlepage_and_setchapternewpage_on'} = [];
@@ -161,8 +185,7 @@ $result_floats{'titlepage_and_setchapternewpage_on'} = {};
-$result_converted{'latex'}->{'titlepage_and_setchapternewpage_on'} = '
-\\makeatletter
+$result_converted{'latex'}->{'titlepage_and_setchapternewpage_on'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
diff --git
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
new file mode 100644
index 0000000..fc58c15
--- /dev/null
+++
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
@@ -0,0 +1,69 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+
+% no headings before titlepage
+\pagestyle{empty}%
+
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage}
+in titlepage
+\end{titlepage}
+\GNUTexinfosetsingleheader{}%
+\mainmatter
+
+\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 123bbe0..212048a 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -8,7 +8,43 @@ use utf8;
$result_trees{'titlepage_in_top_node'} = {
'contents' => [
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'titlepage_in_top_node.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'titlepage_in_top_node.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
'parent' => {},
'type' => 'text_root'
},
@@ -48,7 +84,7 @@ $result_trees{'titlepage_in_top_node'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
@@ -130,7 +166,7 @@ $result_trees{'titlepage_in_top_node'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 9,
'macro' => ''
},
'parent' => {}
@@ -160,7 +196,7 @@ $result_trees{'titlepage_in_top_node'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 10,
'macro' => ''
},
'parent' => {}
@@ -171,7 +207,7 @@ $result_trees{'titlepage_in_top_node'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 8,
'macro' => ''
},
'parent' => {}
@@ -189,7 +225,7 @@ $result_trees{'titlepage_in_top_node'} = {
'level' => 0,
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
@@ -230,7 +266,7 @@ $result_trees{'titlepage_in_top_node'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 12,
'macro' => ''
},
'parent' => {}
@@ -278,7 +314,7 @@ $result_trees{'titlepage_in_top_node'} = {
'level' => 1,
'line_nr' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 13,
'macro' => ''
},
'number' => 1,
@@ -287,6 +323,10 @@ $result_trees{'titlepage_in_top_node'} = {
],
'type' => 'document_root'
};
+$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_in_top_node'}{'contents'}[0];
+$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'titlepage_in_top_node'}{'contents'}[0];
$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'parent'} =
$result_trees{'titlepage_in_top_node'};
$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0];
$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'titlepage_in_top_node'}{'contents'}[1];
@@ -323,7 +363,9 @@
$result_trees{'titlepage_in_top_node'}{'contents'}[4]{'contents'}[1]{'contents'}
$result_trees{'titlepage_in_top_node'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'titlepage_in_top_node'}{'contents'}[4];
$result_trees{'titlepage_in_top_node'}{'contents'}[4]{'parent'} =
$result_trees{'titlepage_in_top_node'};
-$result_texis{'titlepage_in_top_node'} = '@node Top
+$result_texis{'titlepage_in_top_node'} = '@setfilename
titlepage_in_top_node.info
+
+@node Top
@top top sectionning
In top
@@ -339,7 +381,8 @@ in chap
';
-$result_texts{'titlepage_in_top_node'} = 'top sectionning
+$result_texts{'titlepage_in_top_node'} = '
+top sectionning
***************
In top
@@ -445,7 +488,8 @@ $result_floats{'titlepage_in_top_node'} = {};
-$result_converted{'latex'}->{'titlepage_in_top_node'} = '\\chapter{chap}
+$result_converted{'latex'}->{'titlepage_in_top_node'} = '
+\\chapter{chap}
\\label{anchor:chap}%
in chap
diff --git
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
new file mode 100644
index 0000000..2325ef4
--- /dev/null
+++
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
@@ -0,0 +1,67 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+
+% no headings before titlepage
+\pagestyle{empty}%
+
+\begin{document}
+
+\frontmatter
+
+\chapter{chap}
+\label{anchor:chap}%
+
+in chap
+\end{document}
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
index 7ed8d65..46d9317 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -13,6 +13,35 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
'contents' => [
{
'parent' => {},
+ 'text' => 'two_setchapternewpage_odd_on.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'two_setchapternewpage_odd_on.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'odd'
}
],
@@ -33,7 +62,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
@@ -70,7 +99,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
@@ -81,12 +110,16 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'args'}[0];
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0];
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'parent'} =
$result_trees{'two_setchapternewpage_odd_on'};
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[1]{'args'}[0];
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[1];
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[1]{'parent'} =
$result_trees{'two_setchapternewpage_odd_on'};
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[2]{'args'}[0];
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[2];
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[2]{'parent'} =
$result_trees{'two_setchapternewpage_odd_on'};
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[3]{'args'}[0];
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[3];
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[3]{'parent'} =
$result_trees{'two_setchapternewpage_odd_on'};
-$result_texis{'two_setchapternewpage_odd_on'} = '@setchapternewpage odd
+$result_texis{'two_setchapternewpage_odd_on'} = '@setfilename
two_setchapternewpage_odd_on.info
+@setchapternewpage odd
@setchapternewpage on
';
@@ -97,10 +130,10 @@ $result_texts{'two_setchapternewpage_odd_on'} = '
$result_errors{'two_setchapternewpage_odd_on'} = [
{
- 'error_line' => ':3: warning: multiple @setchapternewpage
+ 'error_line' => ':4: warning: multiple @setchapternewpage
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'multiple @setchapternewpage',
'type' => 'warning'
diff --git
a/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
new file mode 100644
index 0000000..b397096
--- /dev/null
+++
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
@@ -0,0 +1,67 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetdoubleheader{No Title}%
+
+\begin{document}
+\makeatletter
+\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\makeatother
+\GNUTexinfosetdoubleheader{No Title}%
+
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetsingleheader{}%
+\end{document}
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
index 5b937bc..b0744f1 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -13,6 +13,35 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
'contents' => [
{
'parent' => {},
+ 'text' => 'two_setchapternewpage_on_odd.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'two_setchapternewpage_on_odd.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'on'
}
],
@@ -33,7 +62,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
@@ -70,7 +99,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
@@ -81,12 +110,16 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'args'}[0];
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0];
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'parent'} =
$result_trees{'two_setchapternewpage_on_odd'};
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[1]{'args'}[0];
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[1];
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[1]{'parent'} =
$result_trees{'two_setchapternewpage_on_odd'};
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[2]{'args'}[0];
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[2];
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[2]{'parent'} =
$result_trees{'two_setchapternewpage_on_odd'};
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[3]{'args'}[0];
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[3];
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[3]{'parent'} =
$result_trees{'two_setchapternewpage_on_odd'};
-$result_texis{'two_setchapternewpage_on_odd'} = '@setchapternewpage on
+$result_texis{'two_setchapternewpage_on_odd'} = '@setfilename
two_setchapternewpage_on_odd.info
+@setchapternewpage on
@setchapternewpage odd
';
@@ -97,10 +130,10 @@ $result_texts{'two_setchapternewpage_on_odd'} = '
$result_errors{'two_setchapternewpage_on_odd'} = [
{
- 'error_line' => ':3: warning: multiple @setchapternewpage
+ 'error_line' => ':4: warning: multiple @setchapternewpage
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'multiple @setchapternewpage',
'type' => 'warning'
diff --git
a/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
new file mode 100644
index 0000000..c9b15b4
--- /dev/null
+++
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
@@ -0,0 +1,64 @@
+\documentclass{book}
+\usepackage{makeidx}\makeindex
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage[gen]{eurosym}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{graphicx}
+\usepackage{needspace}
+\usepackage{etoolbox}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+
+% command that does nothing used to help with substitutions in commands
+\newcommand{\GNUTexinfoplaceholder}[1]{}
+
+% called when setting single headers
+% use \nouppercase to match with Texinfo TeX style
+\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\fancyhf{}
+\lhead{\nouppercase{\leftmark}}
+\rhead{\thepage}
+}
+
+% called when setting double headers
+\newcommand{\GNUTexinfosetdoubleheader}[1]{\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{#1}
+\fancyhead[LO]{\nouppercase{\leftmark}}
+}
+
+% for part and chapter, which call \thispagestyle{plain}
+\fancypagestyle{plain}{ %
+ \fancyhf{}
+ \fancyhead[LE,RO]{\thepage}
+}
+
+% match Texinfo TeX style
+\renewcommand{\headrulewidth}{0pt}%
+
+% avoid pagebreak and headings setting for a sectionning command
+\newcommand{\GNUTexinfonopagebreakheading}[2]{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}
+
+
+\renewcommand{\includegraphics}[1]{\fbox{FIG #1}}
+
+%temporary to avoid "no line here to end" errors in test suite constructs
+\renewcommand{\obeycr}{\relax}
+
+% set default for @setchapternewpage
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
+\makeatother
+\GNUTexinfosetsingleheader{}%
+
+\begin{document}
+\GNUTexinfosetsingleheader{}%
+
+\makeatletter
+\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\makeatother
+\GNUTexinfosetdoubleheader{No Title}%
+\end{document}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: More latex tests on files,
Patrice Dumas <=