[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_latex_begin_outpu
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_latex_begin_output, _begin_document) (_set_chapter_new_page): initialize based on setchapternewpage and headings customization variables values. Set headings off just before the titlepage, and reset afterwards to headings customization variables values. Return headings set together with setchapternewpage to avoid setting headings again when initializing. Set headings each time after setting setchapternewpage. |
|
Date: |
Wed, 28 Dec 2022 19:12:40 -0500 |
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 72f78681a4 * tp/Texinfo/Convert/LaTeX.pm (_latex_begin_output,
_begin_document) (_set_chapter_new_page): initialize based on setchapternewpage
and headings customization variables values. Set headings off just before the
titlepage, and reset afterwards to headings customization variables values.
Return headings set together with setchapternewpage to avoid setting headings
again when initializing. Set headings each time after setting setchapternewpage.
72f78681a4 is described below
commit 72f78681a49b55419ada397f90c083f1fc7f8a87
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Dec 29 01:12:28 2022 +0100
* tp/Texinfo/Convert/LaTeX.pm (_latex_begin_output, _begin_document)
(_set_chapter_new_page): initialize based on setchapternewpage and
headings customization variables values. Set headings off just before
the titlepage, and reset afterwards to headings customization
variables values. Return headings set together with setchapternewpage
to avoid setting headings again when initializing.
Set headings each time after setting setchapternewpage.
---
ChangeLog | 10 ++++++
tp/Texinfo/Convert/LaTeX.pm | 41 ++++++++++++----------
.../anchor_in_copying_insertcopying_titlepage.pl | 1 +
...chor_in_copying_insertcopying_titlepage_chap.pl | 1 +
.../setchapternewpage_on_odd_titlepage.pl | 3 ++
.../setchapternewpage_on_odd_titlepage.tex | 10 ++++--
tp/t/results/latex_tests/shorttitlepage.pl | 1 +
.../shorttitlepage/res_latex/shorttitlepage.tex | 5 ++-
.../three_setchapternewpage_on_odd_off.pl | 2 +-
.../three_setchapternewpage_on_odd_off.tex | 2 +-
tp/t/results/latex_tests/titlepage_and_headings.pl | 1 +
.../res_latex/titlepage_and_headings.tex | 5 ++-
.../titlepage_and_setchapternewpage_odd.pl | 4 ++-
.../titlepage_and_setchapternewpage_odd.tex | 9 +++--
.../titlepage_and_setchapternewpage_on.pl | 2 ++
.../titlepage_and_setchapternewpage_on.tex | 6 ++--
tp/t/results/latex_tests/titlepage_classical.pl | 1 +
.../res_latex/titlepage_classical.tex | 5 ++-
tp/t/results/latex_tests/titlepage_in_top_node.pl | 1 +
.../res_latex/titlepage_in_top_node.tex | 5 ++-
tp/t/results/latex_tests/titlepage_long_title.pl | 1 +
.../res_latex/titlepage_long_title.tex | 5 ++-
tp/t/results/latex_tests/titlepage_no_author.pl | 1 +
.../res_latex/titlepage_no_author.tex | 5 ++-
tp/t/results/latex_tests/titlepage_no_title.pl | 1 +
.../res_latex/titlepage_no_title.tex | 5 ++-
.../titlepage_with_commands_classical.pl | 1 +
.../titlepage_with_commands_classical.tex | 5 ++-
.../codequoteundirected_codequotebacktick.pl | 5 ++-
tp/t/results/regions/anchor_in_titlepage.pl | 1 +
.../regions/anchor_in_titlepage_titlepage.pl | 1 +
tp/t/results/regions/format_in_titlepage.pl | 1 +
.../regions/format_in_titlepage_titlepage.pl | 1 +
.../res_parser/formatting_latex/formatting.tex | 5 ++-
34 files changed, 92 insertions(+), 61 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 56b0a3ed9d..3e56b314da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-12-28 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/LaTeX.pm (_latex_begin_output, _begin_document)
+ (_set_chapter_new_page): initialize based on setchapternewpage and
+ headings customization variables values. Set headings off just before
+ the titlepage, and reset afterwards to headings customization
+ variables values. Return headings set together with setchapternewpage
+ to avoid setting headings again when initializing.
+ Set headings each time after setting setchapternewpage.
+
2022-12-28 Patrice Dumas <pertusus@free.fr>
* doc/texinfo.texi (@code{@@headings}): Update now that @titlepage
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 5b22b93567..28568aad27 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1626,17 +1626,19 @@ sub _latex_begin_output($)
my $header = '';
# setup defaults
$header .= "% set default for \@setchapternewpage\n";
- $header .= _set_chapter_new_page($self, 'on');
- $header .= "\n";
- # setup headings before titlepage to have no headings
- # before titlepage. They will be set to 'on' after
- # the titlepage if there is a titlepage
- if (exists($self->{'global_commands'}->{'titlepage'})
- or exists($self->{'global_commands'}->{'shorttitlepage'})) {
- $header .= "% no headings before titlepage\n";
- $header .= _set_headings($self, 'off');
- $header .= "\n";
+ my $heading_set;
+ if (defined($self->get_conf('setchapternewpage'))) {
+ my $setchapternewpage_result;
+ ($setchapternewpage_result, $heading_set)
+ = _set_chapter_new_page($self, $self->get_conf('setchapternewpage'));
+ $header .= $setchapternewpage_result;
}
+ my $heading = $self->get_conf('headings');
+ if (defined($heading) and ((!defined($heading_set)
+ or $heading_set ne $heading))) {
+ $header .= _set_headings($self, $heading);
+ }
+ $header .= "\n";
return $header;
}
@@ -1651,6 +1653,7 @@ sub _begin_document($)
or exists($self->{'global_commands'}->{'shorttitlepage'})) {
$result .= "\n";
$result .= $front_main_matter_definitions{$documentclass}->{'front'}."\n";
+ $result .= _set_headings($self, 'off');
if (exists($self->{'global_commands'}->{'titlepage'})) {
my $element = $self->{'global_commands'}->{'titlepage'};
@@ -1700,7 +1703,7 @@ sub _begin_document($)
if (exists($self->{'global_commands'}->{'titlepage'})
or exists($self->{'global_commands'}->{'shorttitlepage'})) {
$result .= $front_main_matter_definitions{$documentclass}->{'main'}."\n";
- $result .= _set_headings($self, 'on');
+ $result .= _set_headings($self, $self->get_conf('headings'));
}
return $result;
@@ -2020,17 +2023,15 @@ sub _set_chapter_new_page($$)
';
}
- # reset headings after titlepage only, or immediately
- # if there is no titlepage
- if ((not $self->{'global_commands'}->{'titlepage'}
- and not $self->{'global_commands'}->{'shorttitlepage'})
- or $self->{'titlepage_done'}) {
- $result .= _set_headings($self, 'on');
+ my $heading_set = 'on';
+ if ($setchapternewpage_spec eq 'off') {
+ $heading_set = 'off';
}
+ $result .= _set_headings($self, $heading_set);
$self->{'prev_chapter_new_page_substitution'} = $new_code;
- return $result;
+ return $result, $heading_set;
}
my %small_font_preformatted_commands;
@@ -3856,7 +3857,9 @@ sub _convert($$)
} elsif ($cmdname eq 'setchapternewpage'
and $element->{'extra'}->{'misc_args'}->[0]) {
my $setchapternewpage_spec = $element->{'extra'}->{'misc_args'}->[0];
- $result .= _set_chapter_new_page($self, $setchapternewpage_spec);
+ my ($setchapternewpage_result, $heading_set)
+ = _set_chapter_new_page($self, $setchapternewpage_spec);
+ $result .= $setchapternewpage_result;
} elsif ($cmdname eq 'headings'
and $element->{'extra'}->{'misc_args'}->[0]) {
my $headings_spec = $element->{'extra'}->{'misc_args'}->[0];
diff --git
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index 9dd3b3c977..2589064f90 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -620,6 +620,7 @@
$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage'} =
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index 4b7a852d70..a9739ef54d 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -620,6 +620,7 @@
$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage_cha
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
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 d505f591e0..794120d5f3 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -181,14 +181,17 @@ $result_floats{'setchapternewpage_on_odd_titlepage'} = {};
$result_converted{'latex_text'}->{'setchapternewpage_on_odd_titlepage'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
+\\pagestyle{single}%
\\makeatletter
\\patchcmd{\\chapter}{\\Texinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
\\makeatother
+\\pagestyle{double}%
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
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
index dfa4108969..e3e7d78ad4 100644
---
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
@@ -26,6 +26,9 @@
% used for substitutions in commands
\newcommand{\Texinfoplaceholder}[1]{}
+\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
+ {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
+
\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
{\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
@@ -39,18 +42,19 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
+\pagestyle{single}%
-% no headings before titlepage
-\pagestyle{empty}%
-
+\pagestyle{single}%
\makeatletter
\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
+\pagestyle{double}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl
b/tp/t/results/latex_tests/shorttitlepage.pl
index db7fe64218..094ae7f766 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -346,6 +346,7 @@ $result_converted{'latex_text'}->{'shorttitlepage'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
{\\raggedright {\\huge \\bfseries the title with shorttitlepage
\\leavevmode{}\\\\ it can be long}}
\\newpage{}
diff --git
a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
index d295d9a29f..9f19a71fc6 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -39,14 +39,13 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
{\raggedright {\huge \bfseries the title with shorttitlepage \leavevmode{}\\
it can be long}}
\newpage{}
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 6dbbd1ae24..9442ab6136 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
@@ -172,7 +172,7 @@
$result_converted{'latex_text'}->{'three_setchapternewpage_on_odd_off'} = '\\mak
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
placeholder}}{}{}
\\makeatother
-\\pagestyle{single}%
+\\pagestyle{empty}%
\\begin{document}
';
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
index ffead92102..a096fea16e 100644
---
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
@@ -54,6 +54,6 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}}{}{}
\makeatother
-\pagestyle{single}%
+\pagestyle{empty}%
\begin{document}
\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 4f05f9bb40..fe9c336a80 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -103,6 +103,7 @@ $result_converted{'latex_text'}->{'titlepage_and_headings'}
= '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
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
index 287154a8e2..87d97fb756 100644
---
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
@@ -39,14 +39,13 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
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 f343dc0e52..622869421c 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -137,11 +137,13 @@ $result_floats{'titlepage_and_setchapternewpage_odd'} =
{};
-$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_odd'} = '
+$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_odd'} =
'\\pagestyle{double}%
+
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
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
index ce5a244dff..cde84cfc1f 100644
---
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
@@ -26,6 +26,9 @@
% used for substitutions in commands
\newcommand{\Texinfoplaceholder}[1]{}
+\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
+ {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
+
\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
{\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
@@ -39,18 +42,18 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\makeatletter
\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
+\pagestyle{double}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
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 7003f5c5a5..abb631d7d9 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -140,11 +140,13 @@ $result_floats{'titlepage_and_setchapternewpage_on'} = {};
$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_on'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
+\\pagestyle{single}%
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
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
index ebf3e70709..16214a0e53 100644
---
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
@@ -39,15 +39,15 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
+\pagestyle{single}%
-% no headings before titlepage
-\pagestyle{empty}%
-
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl
b/tp/t/results/latex_tests/titlepage_classical.pl
index 0d7259da0f..297313eaba 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -653,6 +653,7 @@ $result_converted{'latex_text'}->{'titlepage_classical'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
index fd3470f862..0805e46b3b 100644
---
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
+++
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
@@ -39,15 +39,14 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
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 5c2530e290..cfe93e1d5f 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -405,6 +405,7 @@ $result_floats{'titlepage_in_top_node'} = {};
$result_converted{'latex_text'}->{'titlepage_in_top_node'} = '\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
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
index 6dc9a956d6..edcff2a857 100644
---
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
@@ -39,13 +39,12 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 52b9933759..64b00c6927 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -401,6 +401,7 @@ $result_converted{'latex_text'}->{'titlepage_long_title'} =
'
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git
a/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
b/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
index 314aa18e44..dcf89ee2d9 100644
---
a/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
+++
b/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
@@ -39,14 +39,13 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl
b/tp/t/results/latex_tests/titlepage_no_author.pl
index b6c4b23e61..33da354a43 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -389,6 +389,7 @@ $result_converted{'latex_text'}->{'titlepage_no_author'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git
a/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
b/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
index 4de93ca51b..e5798c2bb5 100644
---
a/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
+++
b/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
@@ -39,14 +39,13 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 7b84b747bd..d06754f4e6 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -422,6 +422,7 @@ $result_converted{'latex_text'}->{'titlepage_no_title'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git
a/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
b/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
index c74a49c0ad..3966bc3e04 100644
---
a/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
+++
b/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
@@ -39,14 +39,13 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index dd27c2c796..cff85eacf8 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -816,6 +816,7 @@
$result_converted{'latex_text'}->{'titlepage_with_commands_classical'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
index 54652c0513..f67c0fbb6b 100644
---
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
+++
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
@@ -39,15 +39,14 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 6178ab6fc2..d3edc7b6bc 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -4192,9 +4192,7 @@
$result_converted{'latex'}->{'codequoteundirected_codequotebacktick'} = '\\docum
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-
-% no headings before titlepage
-\\pagestyle{empty}%
+\\pagestyle{single}%
@@ -4203,6 +4201,7 @@
$result_converted{'latex'}->{'codequoteundirected_codequotebacktick'} = '\\docum
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage.pl
index f729e32b68..b19cf10b9d 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -496,6 +496,7 @@ $result_converted{'latex_text'}->{'anchor_in_titlepage'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 6e38f83a8e..a0d11a55cc 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -498,6 +498,7 @@
$result_converted{'latex_text'}->{'anchor_in_titlepage_titlepage'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git a/tp/t/results/regions/format_in_titlepage.pl
b/tp/t/results/regions/format_in_titlepage.pl
index 470955e597..f14f21da9e 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -290,6 +290,7 @@ $result_converted{'latex_text'}->{'format_in_titlepage'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 8e101447d3..9c4a41a737 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -301,6 +301,7 @@
$result_converted{'latex_text'}->{'format_in_titlepage_titlepage'} = '
\\begin{document}
\\frontmatter
+\\pagestyle{empty}%
\\begin{titlepage}
\\begingroup
\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index b0cb657e8c..b9a398bd60 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -88,9 +88,7 @@ roundcorner=10pt}
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-
-% no headings before titlepage
-\pagestyle{empty}%
+\pagestyle{single}%
@@ -113,6 +111,7 @@ roundcorner=10pt}
\begin{document}
\frontmatter
+\pagestyle{empty}%
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_latex_begin_output, _begin_document) (_set_chapter_new_page): initialize based on setchapternewpage and headings customization variables values. Set headings off just before the titlepage, and reset afterwards to headings customization variables values. Return headings set together with setchapternewpage to avoid setting headings again when initializing. Set headings each time after setting setchapternewpage.,
Patrice Dumas <=