[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, _convert): output title page after begining of contents independently of where @titlepage is defined. Allows titlepage and shorttitlepage to be in preamble. |
|
Date: |
Sun, 02 Jan 2022 10:04:15 -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 0f43ec2982 * tp/Texinfo/Convert/LaTeX.pm (_begin_document, _convert):
output title page after begining of contents independently of where @titlepage
is defined. Allows titlepage and shorttitlepage to be in preamble.
0f43ec2982 is described below
commit 0f43ec2982a0d46f9fa7fa6aa72b206f4fbe47b1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jan 2 16:03:49 2022 +0100
* tp/Texinfo/Convert/LaTeX.pm (_begin_document, _convert): output
title page after begining of contents independently of where
@titlepage is defined. Allows titlepage and shorttitlepage to be
in preamble.
---
ChangeLog | 7 ++
tp/Texinfo/Convert/LaTeX.pm | 84 ++++++++++------------
.../setchapternewpage_on_odd_titlepage.pl | 12 ----
tp/t/results/latex_tests/shorttitlepage.pl | 7 --
.../shorttitlepage/res_latex/shorttitlepage.tex | 2 +-
tp/t/results/latex_tests/titlepage_and_headings.pl | 12 ----
.../res_latex/titlepage_and_headings.tex | 2 +-
.../titlepage_and_setchapternewpage_odd.pl | 12 ----
.../titlepage_and_setchapternewpage_odd.tex | 2 +-
.../titlepage_and_setchapternewpage_on.pl | 12 ----
.../titlepage_and_setchapternewpage_on.tex | 2 +-
tp/t/results/latex_tests/titlepage_classical.pl | 27 -------
.../res_latex/titlepage_classical.tex | 2 +-
.../res_latex/titlepage_in_top_node.tex | 15 ++++
tp/t/results/latex_tests/titlepage_long_title.pl | 18 +----
.../res_latex/titlepage_long_title.tex | 2 +-
tp/t/results/latex_tests/titlepage_no_author.pl | 17 +----
.../res_latex/titlepage_no_author.tex | 2 +-
tp/t/results/latex_tests/titlepage_no_title.pl | 17 +----
.../res_latex/titlepage_no_title.tex | 2 +-
.../titlepage_with_commands_classical.pl | 33 ---------
.../titlepage_with_commands_classical.tex | 2 +-
.../res_parser/formatting_latex/formatting.tex | 8 +--
23 files changed, 76 insertions(+), 223 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7353711627..a6cbcccb52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,13 @@
* doc/info-stnd.texi: Revise use of @key and @kbd.
+2022-01-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/LaTeX.pm (_begin_document, _convert): output
+ title page after begining of contents independently of where
+ @titlepage is defined. Allows titlepage and shorttitlepage to be
+ in preamble.
+
2022-01-02 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/LaTeX.pm (output, convert, convert_tree): always
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 416da32d24..972d84f618 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -238,14 +238,11 @@ my %in_heading_commands =
%Texinfo::Common::in_heading_commands;
my %preamble_commands = %Texinfo::Common::preamble_commands;
-delete $preamble_commands{'titlepage'};
-delete $preamble_commands{'shorttitlepage'};
-
foreach my $kept_command (keys(%informative_commands),
keys(%default_index_commands),
keys(%headings_specification_commands), keys(%in_heading_commands),
keys(%formattable_misc_commands),
- 'indent', 'noindent', 'shorttitlepage') {
+ 'indent', 'noindent') {
$formatted_misc_commands{$kept_command} = 1;
}
@@ -495,8 +492,9 @@ foreach my $non_indented('format', 'smallformat') {
delete $indented_commands{$non_indented};
}
+# titlepage content is directly formatted at document begin
foreach my $ignored_block_commands ('ignore', 'macro', 'rmacro', 'copying',
- 'documentdescription') {
+ 'documentdescription', 'titlepage') {
$ignored_commands{$ignored_block_commands} = 1;
}
@@ -1293,6 +1291,39 @@ sub _begin_document($)
if (exists($self->{'global_commands'}->{'titlepage'})
or exists($self->{'global_commands'}->{'shorttitlepage'})) {
$result .= "\n\\GNUTexinfofrontmatter\n";
+
+ if (exists($self->{'global_commands'}->{'titlepage'})) {
+ my $element = $self->{'global_commands'}->{'titlepage'};
+ # start a group such that the changes are forgotten when front cover is
done
+ # define glues dimensions that are used in front cover formatting.
+ # Taken from Texinfo TeX.
+ # FIXME replace \\newskip by \\newlen?
+ $result .= "\\begin{titlepage}\n";
+ $result .= "\\begingroup
+\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
+\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
+\\setlength{\\parindent}{0pt}\n";
+ $result .= "% Leave some space at the very top of the page.
+ \\vglue\\titlepagetopglue\n";
+ $self->{'titlepage_formatting'} = {'in_front_cover' => 1};
+ _push_new_context($self, 'titlepage');
+ $result .= $self->_convert({'contents' => $element->{'contents'}});
+ _pop_context($self);
+ $result .= _finish_front_cover_page($self);
+ $result .= "\\end{titlepage}\n";
+ } else {
+ my $element = $self->{'global_commands'}->{'shorttitlepage'};
+ my $title_text = _title_font($self, $element);
+ $result .= "\\begin{titlepage}\n";
+ $result .= "{\\raggedright $title_text}\n";
+ # first newpage ends the title page, phantom and second newpage
+ # adds a blank page
+ $result .= "\\newpage{}\n\\phantom{blabla}\\newpage{}\n";
+ $result .= "\\end{titlepage}\n";
+ }
+ $result .= _set_headings($self, 'on');
+ $result .= "\\GNUTexinfomainmatter\n";
+ $self->{'titlepage_done'} = 1;
}
return $result;
}
@@ -1382,16 +1413,6 @@ sub _protect_text($$)
return $text;
}
-sub _start_mainmatter_after_titlepage($)
-{
- my $self = shift;
-
- my $result = _set_headings($self, 'on');
- $result .= "\\GNUTexinfomainmatter\n";
- $self->{'titlepage_done'} = 1;
- return $result;
-}
-
sub _set_headings($$)
{
my ($self, $headings_spec) = @_;
@@ -2626,20 +2647,7 @@ sub _convert($$)
= _xtable_description_command_format($self, $element);
push @{$self->{'formatting_context'}->[-1]->{'table_command_format'}},
$description_command_format;
- } elsif ($cmdname eq 'titlepage') {
- # start a group such that the changes are forgotten when front cover
is done
- # define glues dimensions that are used in front cover formatting.
- # Taken from Texinfo TeX.
- # FIXME replace \\newskip by \\newlen?
- $result .= "\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}\n";
- $result .= "% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue\n";
- $self->{'titlepage_formatting'} = {'in_front_cover' => 1};
}
-
if ($cmdname eq 'quotation' or $cmdname eq 'smallquotation') {
# this is only used to avoid @author converted as
# a @titlepage author, for a @quotation in @titlepage @author
@@ -2870,20 +2878,9 @@ sub _convert($$)
$result .= "\\needspace{${need_value}pt}%\n";
}
return $result;
- } elsif ($in_heading_commands{$cmdname}){
+ } elsif ($in_heading_commands{$cmdname}) {
$result .= $LaTeX_in_heading_commands{$cmdname};
return $result;
- } elsif ($cmdname eq 'shorttitlepage') {
- # FIXME ignore if there is alreadu a @titlepage?
- my $title_text = _title_font($self, $element);
- $result .= "\\begin{titlepage}\n";
- $result .= "{\\raggedright $title_text}\n";
- # first newpage ends the title page, phantom and second newpage
- # adds a blank page
- $result .= "\\newpage{}\n\\phantom{blabla}\\newpage{}\n";
- $result .= "\\end{titlepage}\n";
- $result .= _start_mainmatter_after_titlepage($self);
- return $result;
} elsif ($cmdname eq 'title') {
my $title_text = _title_font($self, $element);
# FIXME In Texinfo TeX the interline space seems more even
@@ -3279,9 +3276,7 @@ sub _convert($$)
# close commands
if ($cmdname) {
- if ($cmdname eq 'titlepage') {
- $result .= _finish_front_cover_page($self);
- } elsif ($item_line_commands{$cmdname}) {
+ if ($item_line_commands{$cmdname}) {
pop @{$self->{'formatting_context'}->[-1]->{'table_command_format'}};
}
if ($LaTeX_environment_commands{$cmdname}) {
@@ -3324,9 +3319,6 @@ sub _convert($$)
}
}
$self->{'formatting_context'}->[-1]->{'in_quotation'} -= 1;
- } elsif ($cmdname eq 'titlepage') {
- # as explained in the Texinfo manual start headers after titlepage
- $result .= _start_mainmatter_after_titlepage($self);
}
# close the contexts and register the cells
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 03bab97b02..2a7b327800 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -245,18 +245,6 @@
$result_converted{'latex'}->{'setchapternewpage_on_odd_titlepage'} = '\\makeatle
\\patchcmd{\\chapter}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
\\makeatother
-\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-in titlepage
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetdoubleheader{}%
-\\GNUTexinfomainmatter
';
1;
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl
b/tp/t/results/latex_tests/shorttitlepage.pl
index ca4f04e841..26688de4a2 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -416,13 +416,6 @@ $result_floats{'shorttitlepage'} = {};
$result_converted{'latex'}->{'shorttitlepage'} = '
-\\begin{titlepage}
-{\\raggedright {\\huge \\bfseries the title with shorttitlepage
\\leavevmode{}\\\\ it can be long}}
-\\newpage{}
-\\phantom{blabla}\\newpage{}
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
\\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 a398e8697b..0d01655b87 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -113,6 +113,7 @@ roundcorner=10pt}
\pagestyle{empty}%
+
\begin{document}
\GNUTexinfofrontmatter
@@ -123,7 +124,6 @@ roundcorner=10pt}
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\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 bf5a2b2a79..9af0759711 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -158,18 +158,6 @@ $result_floats{'titlepage_and_headings'} = {};
$result_converted{'latex'}->{'titlepage_and_headings'} = '
-\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-in titlepage
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
';
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 a8b30dd657..612f4df7b6 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
@@ -113,6 +113,7 @@ roundcorner=10pt}
\pagestyle{empty}%
+
\begin{document}
\GNUTexinfofrontmatter
@@ -128,5 +129,4 @@ in titlepage
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\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 0de694ab40..09f211b750 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -203,18 +203,6 @@ $result_floats{'titlepage_and_setchapternewpage_odd'} = {};
$result_converted{'latex'}->{'titlepage_and_setchapternewpage_odd'} = '
-\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-in titlepage
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetdoubleheader{}%
-\\GNUTexinfomainmatter
';
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 b1847805a9..d59f7ea1c5 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
@@ -117,6 +117,7 @@ roundcorner=10pt}
\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
+
\begin{document}
\GNUTexinfofrontmatter
@@ -132,5 +133,4 @@ in titlepage
\end{titlepage}
\GNUTexinfosetdoubleheader{}%
\GNUTexinfomainmatter
-
\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 629a622bd8..48f3870e66 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -196,18 +196,6 @@
$result_converted{'latex'}->{'titlepage_and_setchapternewpage_on'} = '\\makeatle
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-in titlepage
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
';
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 a8b30dd657..612f4df7b6 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
@@ -113,6 +113,7 @@ roundcorner=10pt}
\pagestyle{empty}%
+
\begin{document}
\GNUTexinfofrontmatter
@@ -128,5 +129,4 @@ in titlepage
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl
b/tp/t/results/latex_tests/titlepage_classical.pl
index 1b3f398de0..8604a69446 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -795,33 +795,6 @@ $result_floats{'titlepage_classical'} = {};
$result_converted{'latex'}->{'titlepage_classical'} = '
-\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-{\\raggedright {\\huge \\bfseries Some manual tested}}
-\\vskip 4pt \\hrule height 4pt width \\hsize \\vskip 4pt
-\\rightline{Subtitle manual tested}
-\\rightline{Subtitle 2 manual tested}
-\\vskip 0pt plus 1filll
-\\leftline{\\Large \\bfseries First author}%
-\\leftline{\\Large \\bfseries Second author}%
-
-\\vskip4pt \\hrule height 2pt width \\hsize
- \\vskip\\titlepagebottomglue
-\\endgroup
-\\newpage{}%
-\\phantom{blabla}%
-\\newpage{}%
-\\phantom{blabla}%
-\\vskip 0pt plus 1filll
-in Copying
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
\\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 f3d44846ce..3c2b0519ac 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
@@ -114,6 +114,7 @@ roundcorner=10pt}
+
\begin{document}
\GNUTexinfofrontmatter
@@ -144,7 +145,6 @@ in Copying
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\chapter{Chapter}
\label{anchor:chapter}%
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 0df0b28e6a..88658092ef 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
@@ -116,6 +116,21 @@ roundcorner=10pt}
\begin{document}
\GNUTexinfofrontmatter
+\begin{titlepage}
+\begingroup
+\newskip\titlepagetopglue \titlepagetopglue = 1.5in
+\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
+\setlength{\parindent}{0pt}
+% Leave some space at the very top of the page.
+ \vglue\titlepagetopglue
+{\raggedright {\huge \bfseries the TTitle}}
+\vskip 4pt \hrule height 4pt width \hsize \vskip 4pt
+\vskip4pt \hrule height 2pt width \hsize
+ \vskip\titlepagebottomglue
+\endgroup
+\end{titlepage}
+\GNUTexinfosetsingleheader{}%
+\GNUTexinfomainmatter
\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 514467060c..328cc59f2a 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -476,23 +476,7 @@ $result_floats{'titlepage_long_title'} = {};
-$result_converted{'latex'}->{'titlepage_long_title'} = '\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-{\\raggedright {\\huge \\bfseries a title than is long, very long,
veeeeeeeeeeeeeeeeery long, it seems to never stop and it is not so interesting
only very long oh an end of line \\leavevmode{}\\\\ and the title continue and
keep on being unfinished until it is the end}}
-\\vskip 4pt \\hrule height 4pt width \\hsize \\vskip 4pt
-
-\\vskip4pt \\hrule height 2pt width \\hsize
- \\vskip\\titlepagebottomglue
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
-
+$result_converted{'latex'}->{'titlepage_long_title'} = '
\\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 fc308ab88b..7ce6b9a581 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
@@ -112,6 +112,7 @@ roundcorner=10pt}
% no headings before titlepage
\pagestyle{empty}%
+
\begin{document}
\GNUTexinfofrontmatter
@@ -131,7 +132,6 @@ roundcorner=10pt}
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\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 5c1ae8e190..c4e1c88731 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -458,22 +458,7 @@ $result_floats{'titlepage_no_author'} = {};
-$result_converted{'latex'}->{'titlepage_no_author'} = '\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-{\\raggedright {\\huge \\bfseries Some manual tested}}
-\\vskip 4pt \\hrule height 4pt width \\hsize \\vskip 4pt
-\\vskip4pt \\hrule height 2pt width \\hsize
- \\vskip\\titlepagebottomglue
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
-
+$result_converted{'latex'}->{'titlepage_no_author'} = '
\\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 d99e75bdbe..3c2bc8701a 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
@@ -112,6 +112,7 @@ roundcorner=10pt}
% no headings before titlepage
\pagestyle{empty}%
+
\begin{document}
\GNUTexinfofrontmatter
@@ -130,7 +131,6 @@ roundcorner=10pt}
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\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 b2b439c453..510048f1c5 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -500,22 +500,7 @@ $result_floats{'titlepage_no_title'} = {};
-$result_converted{'latex'}->{'titlepage_no_title'} = '\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-{\\huge \\bfseries Some manual tested}
-
-\\vskip 0pt plus 1filll
-\\leftline{\\Large \\bfseries Some Author}%
-\\endgroup
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
-
+$result_converted{'latex'}->{'titlepage_no_title'} = '
\\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 d1b5182b05..b9bdcded13 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
@@ -112,6 +112,7 @@ roundcorner=10pt}
% no headings before titlepage
\pagestyle{empty}%
+
\begin{document}
\GNUTexinfofrontmatter
@@ -130,7 +131,6 @@ roundcorner=10pt}
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\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 409a0d51b4..be42d690f5 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -1018,39 +1018,6 @@ $result_floats{'titlepage_with_commands_classical'} = {};
$result_converted{'latex'}->{'titlepage_with_commands_classical'} = '
-\\begin{titlepage}
-\\begingroup
-\\newskip\\titlepagetopglue \\titlepagetopglue = 1.5in
-\\newskip\\titlepagebottomglue \\titlepagebottomglue = 2pc
-\\setlength{\\parindent}{0pt}
-% Leave some space at the very top of the page.
- \\vglue\\titlepagetopglue
-{\\raggedright {\\huge \\bfseries Some manual \\leavevmode{}\\\\ tested}}
-\\vskip 4pt \\hrule height 4pt width \\hsize \\vskip 4pt
-\\rightline{Subtitle manual \\leavevmode{}\\\\ tested}
-\\rightline{Subtitle 2 manual \\leavevmode{}\\\\ tested}
-\\vskip 0pt plus 1filll
-\\leftline{\\Large \\bfseries First \\leavevmode{}\\\\ author}%
-\\leftline{\\Large \\bfseries Second \\leavevmode{}\\\\
author\\footnote{Something
-about the address of author.
-
-Something about the life.
-$$
-\\frac{a}{b}
-$$
-}}%
-\\vskip4pt \\hrule height 2pt width \\hsize
- \\vskip\\titlepagebottomglue
-\\endgroup
-\\newpage{}%
-\\phantom{blabla}%
-\\newpage{}%
-\\phantom{blabla}%
-\\vskip 0pt plus 1filll
-in Copying
-\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
-\\GNUTexinfomainmatter
\\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 b47359f8d9..aad702498b 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
@@ -114,6 +114,7 @@ roundcorner=10pt}
+
\begin{document}
\GNUTexinfofrontmatter
@@ -150,7 +151,6 @@ in Copying
\end{titlepage}
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
-
\chapter{Chapter}
\label{anchor:chapter}%
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index e19ead8734..2d366e62e0 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -122,10 +122,6 @@ roundcorner=10pt}
\begin{document}
\GNUTexinfofrontmatter
-
-
-
-
\begin{titlepage}
\begingroup
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
@@ -2473,6 +2469,10 @@ Various deff lines
\GNUTexinfosetsingleheader{}%
\GNUTexinfomainmatter
+
+
+
+
\chapter{chapter}
\label{anchor:chapter}%
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_begin_document, _convert): output title page after begining of contents independently of where @titlepage is defined. Allows titlepage and shorttitlepage to be in preamble.,
Patrice Dumas <=