[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_begin_document):
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_begin_document): add a special page style for Table of Contents which only shows the page number, to avoid an ugly Chapter 0. Set mainmatter after the Table of Contents. |
|
Date: |
Wed, 28 Dec 2022 17:23:27 -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 ebaa541fd1 * tp/Texinfo/Convert/LaTeX.pm (_begin_document): add a
special page style for Table of Contents which only shows the page number, to
avoid an ugly Chapter 0. Set mainmatter after the Table of Contents.
ebaa541fd1 is described below
commit ebaa541fd1ee41075757afc7cc9aba9933cd47fe
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Dec 28 23:23:13 2022 +0100
* tp/Texinfo/Convert/LaTeX.pm (_begin_document): add a special page
style for Table of Contents which only shows the page number, to avoid
an ugly Chapter 0. Set mainmatter after the Table of Contents.
---
ChangeLog | 6 ++++
tp/Texinfo/Convert/LaTeX.pm | 41 +++++++++++++++++-----
.../anchor_in_copying_insertcopying_titlepage.pl | 2 +-
...chor_in_copying_insertcopying_titlepage_chap.pl | 2 +-
.../setchapternewpage_on_odd_titlepage.pl | 2 +-
.../setchapternewpage_on_odd_titlepage.tex | 2 +-
tp/t/results/latex_tests/shorttitlepage.pl | 2 +-
.../shorttitlepage/res_latex/shorttitlepage.tex | 2 +-
tp/t/results/latex_tests/titlepage_and_headings.pl | 2 +-
.../res_latex/titlepage_and_headings.tex | 2 +-
.../titlepage_and_setchapternewpage_odd.pl | 2 +-
.../titlepage_and_setchapternewpage_odd.tex | 2 +-
.../titlepage_and_setchapternewpage_on.pl | 2 +-
.../titlepage_and_setchapternewpage_on.tex | 2 +-
tp/t/results/latex_tests/titlepage_classical.pl | 2 +-
.../res_latex/titlepage_classical.tex | 2 +-
tp/t/results/latex_tests/titlepage_in_top_node.pl | 2 +-
.../res_latex/titlepage_in_top_node.tex | 2 +-
tp/t/results/latex_tests/titlepage_long_title.pl | 2 +-
.../res_latex/titlepage_long_title.tex | 2 +-
tp/t/results/latex_tests/titlepage_no_author.pl | 2 +-
.../res_latex/titlepage_no_author.tex | 2 +-
tp/t/results/latex_tests/titlepage_no_title.pl | 2 +-
.../res_latex/titlepage_no_title.tex | 2 +-
.../titlepage_with_commands_classical.pl | 2 +-
.../titlepage_with_commands_classical.tex | 2 +-
.../codequoteundirected_codequotebacktick.pl | 2 +-
tp/t/results/regions/anchor_in_titlepage.pl | 2 +-
.../regions/anchor_in_titlepage_titlepage.pl | 2 +-
tp/t/results/regions/format_in_titlepage.pl | 2 +-
.../regions/format_in_titlepage_titlepage.pl | 2 +-
.../res_parser/formatting_latex/formatting.tex | 8 +++--
32 files changed, 74 insertions(+), 39 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 87999bedbd..e9c82e633a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-12-28 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/LaTeX.pm (_begin_document): add a special page
+ style for Table of Contents which only shows the page number, to avoid
+ an ugly Chapter 0. Set mainmatter after the Table of Contents.
+
2022-12-28 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/TexinfoMarkup.pm (output, convert, _convert):
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index ef9485c581..5b22b93567 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1459,6 +1459,22 @@ sub _latex_header() {
'\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
{\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
+';
+ }
+
+ if ($self->{'page_styles'}->{'doublepagenum'}) {
+ $header_code .=
+'\newpagestyle{doublepagenum}{\sethead[\thepage{}][][]
+ {}{}{\thepage}}
+
+';
+ }
+
+ if ($self->{'page_styles'}->{'singlepagenum'}) {
+ $header_code .=
+'\newpagestyle{singlepagenum}{\sethead[][][\thepage{}]
+ {}{}{\thepage}}
+
';
}
@@ -1666,8 +1682,6 @@ sub _begin_document($)
$result .= "\\newpage{}\n\\phantom{blabla}\\newpage{}\n";
$result .= "\\end{titlepage}\n";
}
- $result .= _set_headings($self, 'on');
- $result .= $front_main_matter_definitions{$documentclass}->{'main'}."\n";
$self->{'titlepage_done'} = 1;
}
@@ -1676,9 +1690,18 @@ sub _begin_document($)
and $self->{'structuring'}->{'sectioning_root'}
and not (defined($self->get_conf('CONTENTS_OUTPUT_LOCATION'))
and $self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'inline')) {
+ if (exists($self->{'global_commands'}->{'titlepage'})
+ or exists($self->{'global_commands'}->{'shorttitlepage'})) {
+ $result .= _set_headings($self, 'pagenum');
+ }
$result .= "\\tableofcontents\\newpage\n";
}
+ 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');
+ }
return $result;
}
@@ -1827,18 +1850,22 @@ sub _protect_text($$)
return $text;
}
+# pagenum heading is not in Texinfo, it is used for the Table of Contents,
+# to avoid an ugly Chapter 0 that would be there for the default page
+# styles.
sub _set_headings($$)
{
my ($self, $headings_spec) = @_;
my $headings_type;
- if ($headings_spec eq 'on') {
+ if ($headings_spec eq 'on' or $headings_spec eq 'pagenum') {
$headings_type = 'single';
my $setchapternewpage_spec = $self->get_conf('setchapternewpage');
if (defined($setchapternewpage_spec)
and $setchapternewpage_spec eq 'odd') {
$headings_type = 'double';
}
+ $headings_type .= 'pagenum' if ($headings_spec eq 'pagenum');
} elsif ($headings_spec eq 'doubleafter') {
$headings_type = 'double';
} elsif ($headings_spec eq 'singleafter') {
@@ -1853,12 +1880,10 @@ sub _set_headings($$)
}
my $result = '';
- if ($headings_type eq 'single') {
- $result = "\\pagestyle{single}%\n";
- } elsif ($headings_type eq 'double') {
- $result = "\\pagestyle{double}%\n";
- } elsif ($headings_type eq 'off') {
+ if ($headings_type eq 'off') {
$result = "\\pagestyle{empty}%\n";
+ } else {
+ $result = "\\pagestyle{$headings_type}%\n";
}
$self->{'page_styles'}->{$headings_type} = 1;
return $result;
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 9ed7615642..9dd3b3c977 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
@@ -639,8 +639,8 @@
$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage'} =
Cop. \\label{anchor:a-in-copying}%
. Ying.
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chap}}
\\label{anchor:Chapter}%
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 3b4af67cf1..4b7a852d70 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
@@ -638,8 +638,8 @@
$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage_cha
Cop. \\label{anchor:a-in-copying}%
. Ying.
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chap}}
\\label{anchor:Chapter}%
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 366c623223..d505f591e0 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -199,8 +199,8 @@
$result_converted{'latex_text'}->{'setchapternewpage_on_odd_titlepage'} = '\\mak
in titlepage
\\endgroup
\\end{titlepage}
-\\pagestyle{double}%
\\mainmatter
+\\pagestyle{double}%
';
1;
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 3f267c9cc8..dfa4108969 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
@@ -61,6 +61,6 @@
in titlepage
\endgroup
\end{titlepage}
-\pagestyle{double}%
\mainmatter
+\pagestyle{double}%
\end{document}
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl
b/tp/t/results/latex_tests/shorttitlepage.pl
index b4b8e1ae12..db7fe64218 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -351,8 +351,8 @@ $result_converted{'latex_text'}->{'shorttitlepage'} = '
\\newpage{}
\\phantom{blabla}\\newpage{}
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chapter}%
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 a8d13eccf8..d295d9a29f 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -52,8 +52,8 @@
\newpage{}
\phantom{blabla}\newpage{}
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{Chapter}}
\label{anchor:chapter}%
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 90058597be..4f05f9bb40 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -113,8 +113,8 @@ $result_converted{'latex_text'}->{'titlepage_and_headings'}
= '
in titlepage
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
';
1;
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 64d4f9f3f6..287154a8e2 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
@@ -57,6 +57,6 @@
in titlepage
\endgroup
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\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 8e0dff6218..f343dc0e52 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -152,8 +152,8 @@
$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_odd'} = '
in titlepage
\\endgroup
\\end{titlepage}
-\\pagestyle{double}%
\\mainmatter
+\\pagestyle{double}%
';
1;
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 2d82b7316a..ce5a244dff 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
@@ -61,6 +61,6 @@
in titlepage
\endgroup
\end{titlepage}
-\pagestyle{double}%
\mainmatter
+\pagestyle{double}%
\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 c5a14ffcdb..7003f5c5a5 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -155,8 +155,8 @@
$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_on'} = '\\mak
in titlepage
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
';
1;
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 ca1799aa1b..ebf3e70709 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
@@ -58,6 +58,6 @@
in titlepage
\endgroup
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl
b/tp/t/results/latex_tests/titlepage_classical.pl
index d15c82c201..0d7259da0f 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -678,8 +678,8 @@ $result_converted{'latex_text'}->{'titlepage_classical'} = '
\\vskip 0pt plus 1filll
in Copying
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chapter}%
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 3139605888..fd3470f862 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
@@ -73,8 +73,8 @@
\vskip 0pt plus 1filll
in Copying
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{Chapter}}
\label{anchor:chapter}%
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 c3f882aacc..5c2530e290 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -418,8 +418,8 @@ $result_converted{'latex_text'}->{'titlepage_in_top_node'}
= '\\begin{document}
\\vskip\\titlepagebottomglue
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{chap}}
\\label{anchor: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
index e547d547d5..6dc9a956d6 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
@@ -59,8 +59,8 @@
\vskip\titlepagebottomglue
\endgroup
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{chap}}
\label{anchor:chap}%
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 6bfbc05f29..52b9933759 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -415,8 +415,8 @@ $result_converted{'latex_text'}->{'titlepage_long_title'} =
'
\\vskip\\titlepagebottomglue
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chapter}%
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 18387dca6d..314aa18e44 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
@@ -61,8 +61,8 @@
\vskip\titlepagebottomglue
\endgroup
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{Chapter}}
\label{anchor:chapter}%
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 8cd35bae03..b6c4b23e61 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -402,8 +402,8 @@ $result_converted{'latex_text'}->{'titlepage_no_author'} = '
\\vskip\\titlepagebottomglue
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chapter}%
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 1689a72f08..4de93ca51b 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
@@ -60,8 +60,8 @@
\vskip\titlepagebottomglue
\endgroup
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{Chapter}}
\label{anchor:chapter}%
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 09bf5e0a72..7b84b747bd 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -435,8 +435,8 @@ $result_converted{'latex_text'}->{'titlepage_no_title'} = '
\\leftline{\\Large \\bfseries Some Author}%
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chapter}%
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 bf7786129a..c74a49c0ad 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
@@ -60,8 +60,8 @@
\leftline{\Large \bfseries Some Author}%
\endgroup
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{Chapter}}
\label{anchor:chapter}%
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 022fef89a0..dd27c2c796 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -847,8 +847,8 @@ Something about the life.
\\vskip 0pt plus 1filll
in Copying
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chapter}%
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 aab02d53d9..54652c0513 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
@@ -79,8 +79,8 @@ Something about the life.
\vskip 0pt plus 1filll
in Copying
\end{titlepage}
-\pagestyle{single}%
\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{Chapter}}
\label{anchor:chapter}%
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index fa06f2465a..6178ab6fc2 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -4245,8 +4245,8 @@ kbd:
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}
samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
\\chapter{{Chapter}}
\\label{anchor:chap}%
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage.pl
index 57d8fda2ff..f729e32b68 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -507,8 +507,8 @@ $result_converted{'latex_text'}->{'anchor_in_titlepage'} = '
\\label{anchor:in-titlepage}%
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\part*{{top}}
\\label{anchor:Top}%
\\label{anchor:nchap}%
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index b3de38c145..6e38f83a8e 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -509,8 +509,8 @@
$result_converted{'latex_text'}->{'anchor_in_titlepage_titlepage'} = '
\\label{anchor:in-titlepage}%
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\part*{{top}}
\\label{anchor:Top}%
\\label{anchor:nchap}%
diff --git a/tp/t/results/regions/format_in_titlepage.pl
b/tp/t/results/regions/format_in_titlepage.pl
index 968412667f..470955e597 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -304,8 +304,8 @@ Published
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
';
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 3db442bc8c..8e101447d3 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -315,8 +315,8 @@ Published
\\endgroup
\\end{titlepage}
-\\pagestyle{single}%
\\mainmatter
+\\pagestyle{single}%
\\label{anchor:Top}%
';
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 90d51f689a..b0cb657e8c 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -63,6 +63,9 @@
\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
{\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
+\newpagestyle{singlepagenum}{\sethead[][][\thepage{}]
+ {}{}{\thepage}}
+
% avoid pagebreak and headings setting for a sectioning command
\newcommand{\Texinfonopagebreakheading}[2]{{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\Texinfoplaceholder #1{#2}}}
@@ -3454,9 +3457,10 @@ g--roupe
\end{titlepage}
-\pagestyle{single}%
-\mainmatter
+\pagestyle{singlepagenum}%
\tableofcontents\newpage
+\mainmatter
+\pagestyle{single}%
\label{anchor:Top}%
\chapter{{chapter}}
\label{anchor:chapter}%
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_begin_document): add a special page style for Table of Contents which only shows the page number, to avoid an ugly Chapter 0. Set mainmatter after the Table of Contents.,
Patrice Dumas <=