[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm (%document_settable_multip
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/Common.pm (%document_settable_multiple_at_commands) (%formattable_misc_commands): put contents and summarycontents in %document_settable_multiple_at_commands and remove from %formattable_misc_commands. |
Date: |
Sat, 01 Jan 2022 17:43:44 -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 63b2da527f * tp/Texinfo/Common.pm
(%document_settable_multiple_at_commands) (%formattable_misc_commands): put
contents and summarycontents in %document_settable_multiple_at_commands and
remove from %formattable_misc_commands.
63b2da527f is described below
commit 63b2da527f59bcf102cfe5fbdcf018be7662899a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 1 23:41:51 2022 +0100
* tp/Texinfo/Common.pm (%document_settable_multiple_at_commands)
(%formattable_misc_commands): put contents and summarycontents in
%document_settable_multiple_at_commands and remove from
%formattable_misc_commands.
* tp/Texinfo/Convert/HTML.pm (_convert_contents_command)
(@contents_commands): do a separate formatting functions for
contents commands.
* tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/Plaintext.pm,
tp/Texinfo/Convert/Text.pm:
use %Texinfo::Common::formatted_misc_commands and, if relevant,
%Texinfo::Common::formattable_misc_commands instead of
%Texinfo::Convert::Text::formatting_misc_commands, and remove
%Texinfo::Convert::Text::formatting_misc_commands.
* tp/Texinfo/Convert/Text.pm (_convert): separate formatted
and formattable misc commands formatting. Format page
specifically.
---
ChangeLog | 22 +++++++++
tp/Texinfo/Common.pm | 14 ++++--
tp/Texinfo/Convert/HTML.pm | 55 +++++++++++++++-------
tp/Texinfo/Convert/LaTeX.pm | 14 +++---
tp/Texinfo/Convert/Plaintext.pm | 24 ++++++----
tp/Texinfo/Convert/Text.pm | 41 +++++++++-------
tp/t/results/converters_tests/line_breaks.pl | 2 +
tp/t/results/coverage/quotation_author.pl | 2 +
tp/t/results/latex_tests/custom_headings.pl | 5 ++
tp/t/results/latex_tests/settitle_and_headings.pl | 2 +
.../macro/macro_for_ignored_line_command.pl | 1 +
tp/t/results/macro/macro_in_misc_commands.pl | 8 +++-
tp/t/results/misc_commands/also_not_line.pl | 8 +++-
.../author_outside_titlepage_quotation.pl | 3 +-
.../misc_commands/text_before_line_command.pl | 6 ++-
tp/t/results/preformatted/page_in_example.pl | 3 +-
tp/t/results/quotation/quotation_and_author.pl | 3 ++
.../quotation/quotation_author_in_example.pl | 1 +
tp/t/results/sectioning/section_before_part.pl | 9 ----
tp/t/results/value/value_in_misc_commands.pl | 4 ++
.../layout/res_parser/formatting/formatting.html | 5 +-
.../layout/res_parser/formatting_chm/anchor.html | 5 +-
.../layout/res_parser/formatting_chm/chapter.html | 5 +-
.../layout/res_parser/formatting_chm/chapter2.html | 5 +-
.../res_parser/formatting_chm/formatting.html | 5 +-
.../res_parser/formatting_chm/formatting_abt.html | 5 +-
.../res_parser/formatting_chm/formatting_ovr.html | 5 +-
.../res_parser/formatting_chm/formatting_toc.html | 5 +-
.../layout/res_parser/formatting_chm/index.html | 5 +-
.../formatting_chm/s_002d_002dect_002cion.html | 5 +-
.../res_parser/formatting_chm/subsection.html | 5 +-
...tion-_0060_0060simple_002ddouble_002d_002d.html | 5 +-
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 5 +-
.../formatting_enable_encoding/formatting.html | 5 +-
.../EPUB/xhtml/formatting.xhtml | 5 +-
.../EPUB/xhtml/chapter.xhtml | 5 +-
.../EPUB/xhtml/chapter2.xhtml | 5 +-
.../EPUB/xhtml/formatting.xhtml | 5 +-
.../EPUB/xhtml/formatting_abt.xhtml | 5 +-
.../EPUB/xhtml/formatting_fot.xhtml | 5 +-
.../EPUB/xhtml/formatting_ovr.xhtml | 5 +-
.../EPUB/xhtml/formatting_toc.xhtml | 5 +-
.../EPUB/xhtml/s_002d_002dect_002cion.xhtml | 5 +-
.../EPUB/xhtml/subsection.xhtml | 5 +-
...ion-_0060_0060simple_002ddouble_002d_002d.xhtml | 5 +-
...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml | 5 +-
.../res_parser/formatting_exotic/anchor.html | 5 +-
.../res_parser/formatting_exotic/chapter.html | 5 +-
.../res_parser/formatting_exotic/chapter2.html | 5 +-
.../formatting_exotic/formatting_abt.html | 5 +-
.../formatting_exotic/formatting_ovr.html | 5 +-
.../formatting_exotic/formatting_toc.html | 5 +-
.../layout/res_parser/formatting_exotic/index.html | 5 +-
.../formatting_exotic/s_002d_002dect_002cion.html | 5 +-
.../res_parser/formatting_exotic/subsection.html | 5 +-
...tion-_0060_0060simple_002ddouble_002d_002d.html | 5 +-
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 5 +-
.../res_parser/formatting_fr_icons/formatting.html | 5 +-
.../res_parser/formatting_html/formatting.html | 5 +-
.../res_parser/formatting_html32/formatting.html | 5 +-
.../formatting_html_no_texi2html/formatting.html | 5 +-
.../res_parser/formatting_html_nodes/anchor.html | 5 +-
.../res_parser/formatting_html_nodes/chapter.html | 5 +-
.../res_parser/formatting_html_nodes/chapter2.html | 5 +-
.../formatting_html_nodes/formatting_abt.html | 5 +-
.../formatting_html_nodes/formatting_fot.html | 5 +-
.../formatting_html_nodes/formatting_ovr.html | 5 +-
.../formatting_html_nodes/formatting_toc.html | 5 +-
.../res_parser/formatting_html_nodes/index.html | 5 +-
.../s_002d_002dect_002cion.html | 5 +-
.../formatting_html_nodes/subsection.html | 5 +-
...tion-_0060_0060simple_002ddouble_002d_002d.html | 5 +-
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 5 +-
.../formatting_inline_css/formatting.html | 5 +-
.../res_parser/formatting_mathjax/formatting.html | 5 +-
.../layout/res_parser/formatting_nodes/anchor.html | 5 +-
.../res_parser/formatting_nodes/chapter.html | 5 +-
.../res_parser/formatting_nodes/chapter2.html | 5 +-
.../formatting_nodes/formatting_abt.html | 5 +-
.../formatting_nodes/formatting_fot.html | 5 +-
.../formatting_nodes/formatting_ovr.html | 5 +-
.../formatting_nodes/formatting_toc.html | 5 +-
.../layout/res_parser/formatting_nodes/index.html | 5 +-
.../formatting_nodes/s_002d_002dect_002cion.html | 5 +-
.../res_parser/formatting_nodes/subsection.html | 5 +-
...tion-_0060_0060simple_002ddouble_002d_002d.html | 5 +-
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 5 +-
.../formatting_numerical_entities/formatting.html | 5 +-
.../res_parser/formatting_rawtext/formatting.txt | 10 +++-
.../formatting_regions/formatting_regions.html | 5 +-
.../formatting_weird_quotes/formatting.html | 5 +-
.../res_parser/formatting_xhtml/formatting.html | 5 +-
tp/tests/many_input_files/tex_l2h_res/tex.html | 1 +
.../many_input_files/tex_l2h_res/tex_complex.html | 1 +
tp/tests/many_input_files/tex_t4ht_res/tex.html | 1 +
.../many_input_files/tex_t4ht_res/tex_complex.html | 1 +
.../res_parser/block_EOL_tex/block_EOL.html | 1 +
.../res_parser/formatting_singular/anchor.html | 6 ++-
.../res_parser/formatting_singular/chapter.html | 12 +++--
.../res_parser/formatting_singular/chapter2.html | 6 ++-
.../res_parser/formatting_singular/index.htm | 6 ++-
.../res_parser/formatting_singular/index.html | 6 ++-
.../s_002d_002dect_002cion.html | 6 ++-
.../res_parser/formatting_singular/sing_abt.htm | 6 ++-
.../res_parser/formatting_singular/sing_fot.htm | 6 ++-
.../res_parser/formatting_singular/sing_ovr.htm | 6 ++-
.../res_parser/formatting_singular/sing_toc.htm | 6 ++-
.../res_parser/formatting_singular/subsection.html | 6 ++-
...tion-_0060_0060simple_002ddouble_002d_002d.html | 6 ++-
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 6 ++-
.../math_not_closed/math_not_closed.html | 1 +
.../res_parser/simplest_httex/simplest.html | 1 +
tp/tests/tex_html/res_parser/tex/tex.html | 1 +
.../res_parser/tex_accents_httex/tex_accents.html | 1 +
.../res_parser/tex_accents_l2h/tex_accents.html | 1 +
.../res_parser/tex_complex_httex/tex_complex.html | 1 +
.../res_parser/tex_complex_l2h/tex_complex.html | 1 +
.../res_parser/tex_eqalign_httex/tex_eqalign.html | 1 +
.../res_parser/tex_eqalign_l2h/tex_eqalign.html | 1 +
.../res_parser/tex_gdef_httex/tex_gdef.html | 1 +
.../tex_html/res_parser/tex_gdef_l2h/tex_gdef.html | 1 +
.../res_parser/tex_gdef_mathjax/tex_gdef.html | 1 +
tp/tests/tex_html/res_parser/tex_httex/tex.html | 1 +
.../res_parser/tex_in_copying/tex_in_copying.html | 1 +
.../res_parser/tex_not_closed/tex_not_closed.html | 1 +
tp/tests/tex_html/res_parser/tex_notex/tex.html | 1 +
126 files changed, 538 insertions(+), 159 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 17d06b8068..7a3873d41b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,28 @@
(@documentencoding): Edit to reflect fact that a LaTeX back-end
now exists.
+2022-01-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Common.pm (%document_settable_multiple_at_commands)
+ (%formattable_misc_commands): put contents and summarycontents in
+ %document_settable_multiple_at_commands and remove from
+ %formattable_misc_commands.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_contents_command)
+ (@contents_commands): do a separate formatting functions for
+ contents commands.
+
+ * tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/Plaintext.pm,
+ tp/Texinfo/Convert/Text.pm:
+ use %Texinfo::Common::formatted_misc_commands and, if relevant,
+ %Texinfo::Common::formattable_misc_commands instead of
+ %Texinfo::Convert::Text::formatting_misc_commands, and remove
+ %Texinfo::Convert::Text::formatting_misc_commands.
+
+ * tp/Texinfo/Convert/Text.pm (_convert): separate formatted
+ and formattable misc commands formatting. Format page
+ specifically.
+
2022-01-01 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Common.pm (%formattable_misc_commands),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index b7252ddb40..d22bf28a51 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -142,6 +142,8 @@ our %document_settable_multiple_at_commands = (
'kbdinputstyle' => 'distinct',
'paragraphindent' => 3,
'shortcontents' => 0,
+ 'summarycontents' => 0,
+ 'contents' => undef,
'urefbreakstyle' => 'after',
'xrefautomaticsectiontitle' => 'off',
'everyheading' => undef,
@@ -1077,8 +1079,7 @@ foreach my $sectioning_command (keys
(%command_structuring_level)) {
# index commands may be too, but index command may be added with
# @def*index so they are not added here.
our %formatted_misc_commands;
-foreach my $formatted_misc_command ('center',
- 'page',
+foreach my $formatted_misc_command ('center', 'page',
'author', 'subtitle', 'title', 'exdent', 'headitem', 'item',
'itemx', 'tab', 'node', keys(%sectioning_commands)) {
$formatted_misc_commands{$formatted_misc_command} = 1;
@@ -1086,10 +1087,13 @@ foreach my $formatted_misc_command ('center',
# misc commands which may be formatted as text, but that
# require constructing some replacement text
+# depending on the case, @contents, @shortcontents and
+# @summarycontents may be formattable_misc_commands too.
+# Since they already are global commands they are not in the
+# default formattable_misc_commands.
our %formattable_misc_commands;
-foreach my $formattable_misc_command ('insertcopying', 'contents',
- 'shortcontents', 'summarycontents', 'printindex',
- 'listoffloats', 'need', 'sp', 'verbatiminclude') {
+foreach my $formattable_misc_command ('insertcopying',
+ 'printindex', 'listoffloats', 'need', 'sp', 'verbatiminclude') {
$formattable_misc_commands{$formattable_misc_command} = 1;
}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 97516d93f9..15982157ec 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -81,7 +81,8 @@ $VERSION = '6.8dev';
# misc commands that are of use for formatting.
-my %formatting_misc_commands =
%Texinfo::Convert::Text::formatting_misc_commands;
+my %formatted_misc_commands = %Texinfo::Common::formatted_misc_commands;
+my %formattable_misc_commands = %Texinfo::Common::formattable_misc_commands;
my %no_brace_commands = %Texinfo::Common::no_brace_commands;
my %accent_commands = %Texinfo::Common::accent_commands;
my %misc_commands = %Texinfo::Common::misc_commands;
@@ -117,7 +118,7 @@ for my $cmd ('example', 'display', 'format', 'lisp',
'quotation',
};
foreach my $def_command (keys(%def_commands)) {
- $formatting_misc_commands{$def_command} = 1 if
($misc_commands{$def_command});
+ $formatted_misc_commands{$def_command} = 1 if ($misc_commands{$def_command});
}
# FIXME remove raw commands?
@@ -1612,15 +1613,15 @@ sub _noticed_line_warn($$$)
my %kept_misc_commands;
-my @informative_global_commands = ('contents', 'shortcontents',
- 'summarycontents', 'documentlanguage', 'footnotestyle',
+my @informative_global_commands = ('documentlanguage', 'footnotestyle',
'xrefautomaticsectiontitle', 'deftypefnnewline');
-foreach my $misc_command(@informative_global_commands,
- 'verbatiminclude', 'insertcopying', 'printindex', 'listoffloats',
- 'author', 'subtitle',
- 'title', keys(%default_index_commands),
- keys(%formatting_misc_commands)) {
+my @contents_commands = ('contents', 'shortcontents', 'summarycontents');
+
+foreach my $misc_command (@informative_global_commands,
+ @contents_commands, keys(%formattable_misc_commands),
+ keys(%formatted_misc_commands),
+ keys(%default_index_commands)) {
$kept_misc_commands{$misc_command} = 1;
}
@@ -1629,6 +1630,11 @@ foreach my $misc_command (keys(%misc_commands)) {
unless ($kept_misc_commands{$misc_command});
}
+# formatted/formattable @-commands that are not of converted in
+# HTML in the default case.
+$default_commands_conversion{'page'} = undef;
+$default_commands_conversion{'need'} = undef;
+
foreach my $ignored_brace_commands ('caption', 'shortcaption',
'hyphenation', 'sortas') {
$default_commands_conversion{$ignored_brace_commands} = undef;
@@ -3227,7 +3233,6 @@ $default_commands_conversion{'flushleft'} =
\&_convert_command_noop;
$default_commands_conversion{'flushright'} = \&_convert_command_noop;
$default_commands_conversion{'group'} = \&_convert_command_noop;
-
sub _convert_sp_command($$$$)
{
my $self = shift;
@@ -4273,10 +4278,32 @@ sub _convert_informative_command($$$$)
my $cmdname = shift;
my $command = shift;
+ return '' if ($self->in_string());
+
+ $self->set_informative_command_value($command);
+
+ if ($cmdname eq 'documentlanguage') {
+ $self->_translate_names();
+ }
+ return '';
+}
+
+foreach my $informative_command (@informative_global_commands) {
+ $default_commands_conversion{$informative_command}
+ = \&_convert_informative_command;
+}
+
+sub _convert_contents_command
+{
+ my $self = shift;
+ my $cmdname = shift;
+ my $command = shift;
+
return '' if ($self->in_string());
$cmdname = 'shortcontents' if ($cmdname eq 'summarycontents');
$self->set_informative_command_value($command);
+
if ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'inline'
and ($cmdname eq 'contents' or $cmdname eq 'shortcontents')
and $self->get_conf($cmdname)
@@ -4284,15 +4311,11 @@ sub _convert_informative_command($$$$)
and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
return $self->_contents_inline_element($cmdname, $command);
}
- if ($cmdname eq 'documentlanguage') {
- $self->_translate_names();
- }
return '';
}
-foreach my $informative_command (@informative_global_commands) {
- $default_commands_conversion{$informative_command}
- = \&_convert_informative_command;
+foreach my $contents_comand (@contents_commands) {
+ $default_commands_conversion{$contents_comand} = \&_convert_contents_command;
}
# associate same formatting function for @small* command
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 451f75fb0e..fb4ac794e6 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -189,7 +189,8 @@ $VERSION = '6.8dev';
# misc commands that are of use for formatting.
-my %formatting_misc_commands =
%Texinfo::Convert::Text::formatting_misc_commands;
+my %formatted_misc_commands = %Texinfo::Common::formatted_misc_commands;
+my %formattable_misc_commands = %Texinfo::Common::formattable_misc_commands;
my %paper_geometry_commands = (
'afourpaper' => 'papername=a4paper',
@@ -253,14 +254,13 @@ foreach my $preamble_command ('hyphenation', 'anchor',
'errormsg',
foreach my $kept_command (@informative_global_commands,
keys(%default_index_commands),
keys(%headings_specification_commands), keys(%in_heading_commands),
- 'verbatiminclude', 'insertcopying',
- 'listoffloats', 'printindex', 'indent', 'noindent', 'need', 'page',
- 'shorttitlepage', 'title', 'subtitle', 'author', 'vskip') {
- $formatting_misc_commands{$kept_command} = 1;
+ keys(%formattable_misc_commands),
+ 'indent', 'noindent', 'shorttitlepage', 'vskip') {
+ $formatted_misc_commands{$kept_command} = 1;
}
foreach my $def_command (keys(%def_commands)) {
- $formatting_misc_commands{$def_command} = 1 if
($misc_commands{$def_command});
+ $formatted_misc_commands{$def_command} = 1 if ($misc_commands{$def_command});
}
# There are stacks that define the context.
@@ -286,7 +286,7 @@ foreach my $block_math_command (keys(%math_commands)) {
my %ignored_misc_commands;
foreach my $misc_command (keys(%misc_commands)) {
$ignored_misc_commands{$misc_command} = 1
- unless ($formatting_misc_commands{$misc_command});
+ unless ($formatted_misc_commands{$misc_command});
}
# from \def\Gin@extensions in graphics-def/pdftex.def
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 563eda418e..4135e7eab6 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -58,7 +58,9 @@ $VERSION = '6.8dev';
# misc commands that are of use for formatting.
-my %formatting_misc_commands =
%Texinfo::Convert::Text::formatting_misc_commands;
+my %formatted_misc_commands = %Texinfo::Common::formatted_misc_commands;
+my %formattable_misc_commands = %Texinfo::Common::formattable_misc_commands;
+
my $NO_NUMBER_FOOTNOTE_SYMBOL = '*';
@@ -106,15 +108,21 @@ my %preformatted_code_commands =
%Texinfo::Common::preformatted_code_commands;
my %default_index_commands = %Texinfo::Common::default_index_commands;
my %letter_no_arg_commands = %Texinfo::Common::letter_no_arg_commands;
-foreach my $kept_command(keys (%informative_commands),
- keys (%default_index_commands),
- 'verbatiminclude', 'insertcopying', 'contents', 'shortcontents',
- 'summarycontents', 'listoffloats', 'printindex', ) {
- $formatting_misc_commands{$kept_command} = 1;
+my @contents_commands = ('contents', 'shortcontents', 'summarycontents');
+
+foreach my $kept_command (keys (%informative_commands), @contents_commands,
+ keys (%default_index_commands), keys(%formattable_misc_commands)) {
+ $formatted_misc_commands{$kept_command} = 1;
+}
+
+# formatted/formattable @-commands not formatted in Plaintext/Info
+foreach my $non_formatted_misc_command ('page', 'need',
+ 'author', 'subtitle', 'title') {
+ delete $formatted_misc_commands{$non_formatted_misc_command};
}
foreach my $def_command (keys(%def_commands)) {
- $formatting_misc_commands{$def_command} = 1 if
($misc_commands{$def_command});
+ $formatted_misc_commands{$def_command} = 1 if ($misc_commands{$def_command});
}
# There are 6 stacks that define the context.
@@ -169,7 +177,7 @@ foreach my $block_math_command (keys(%math_commands)) {
my %ignored_misc_commands;
foreach my $misc_command (keys(%misc_commands)) {
$ignored_misc_commands{$misc_command} = 1
- unless ($formatting_misc_commands{$misc_command});
+ unless ($formatted_misc_commands{$misc_command});
}
my %ignored_commands = %ignored_misc_commands;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 51d4140c4f..25968b76de 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -145,12 +145,12 @@ foreach my $accent_letter ('o','O','l','L') {
my %accent_commands = %Texinfo::Common::accent_commands;
my %no_brace_commands = %Texinfo::Common::no_brace_commands;
+my %formatted_misc_commands = %Texinfo::Common::formatted_misc_commands;
+# 'page' is a formatted_misc_commands and therefore is replaced by an empty
line.
-our %formatting_misc_commands;
-foreach my $command ('verbatiminclude', 'sp', 'center', 'exdent',
- 'item', 'itemx', 'tab', 'headitem',
- 'node', keys(%Texinfo::Common::sectioning_commands)) {
- $formatting_misc_commands{$command} = 1;
+my %formattable_misc_commands;
+foreach my $command ('verbatiminclude', 'sp') {
+ $formattable_misc_commands{$command} = 1;
}
my %ignored_types;
@@ -389,7 +389,8 @@ sub _convert($;$)
and $element->{'args'}->[0]->{'type'}
and ($element->{'args'}->[0]->{'type'} eq 'line_arg'
or $element->{'args'}->[0]->{'type'} eq 'misc_arg')
- and
!$formatting_misc_commands{$element->{'cmdname'}})))));
+ and !$formatted_misc_commands{$element->{'cmdname'}}
+ and
!$formattable_misc_commands{$element->{'cmdname'}})))));
my $result = '';
if (defined($element->{'text'})) {
if ($element->{'type'} and $element->{'type'} eq 'untranslated'
@@ -525,7 +526,23 @@ sub _convert($;$)
}
} elsif ($options->{'expanded_formats_hash'}->{$element->{'cmdname'}}) {
$options->{'raw'} = 1;
- } elsif ($formatting_misc_commands{$element->{'cmdname'}} and
$element->{'args'}) {
+ } elsif ($formatted_misc_commands{$element->{'cmdname'}} and
$element->{'args'}) {
+ if ($element->{'cmdname'} ne 'node') {
+ if ($element->{'cmdname'} eq 'page') {
+ $result = '';
+ } else {
+ $result = _convert($element->{'args'}->[0], $options);
+ }
+ if ($Texinfo::Common::sectioning_commands{$element->{'cmdname'}}) {
+ $result = heading($element, $result, $options->{'converter'},
+ $options->{'NUMBER_SECTIONS'});
+ } else {
+ # we always want an end of line even if is was eaten by a command
+ chomp($result);
+ $result .= "\n";
+ }
+ }
+ } elsif ($formattable_misc_commands{$element->{'cmdname'}} and
$element->{'args'}) {
if ($element->{'cmdname'} eq 'sp') {
if ($element->{'extra'} and $element->{'extra'}->{'misc_args'}
and $element->{'extra'}->{'misc_args'}->[0]) {
@@ -540,16 +557,6 @@ sub _convert($;$)
if (defined($verbatim_include_verbatim)) {
$result .= _convert($verbatim_include_verbatim, $options);
}
- } elsif ($element->{'cmdname'} ne 'node') {
- $result = _convert($element->{'args'}->[0], $options);
- if ($Texinfo::Common::sectioning_commands{$element->{'cmdname'}}) {
- $result = heading($element, $result, $options->{'converter'},
- $options->{'NUMBER_SECTIONS'});
- } else {
- # we always want an end of line even if is was eaten by a command
- chomp($result);
- $result .= "\n";
- }
}
} elsif ($element->{'cmdname'} eq 'item'
and $element->{'parent'}->{'cmdname'}
diff --git a/tp/t/results/converters_tests/line_breaks.pl
b/tp/t/results/converters_tests/line_breaks.pl
index 15c6dfc7bd..8eae01ab88 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -558,6 +558,8 @@ T
$result_texts{'line_breaks'} = '
+AWK As A Major Systems Programming
+ Language--Revisited
in center
line break
diff --git a/tp/t/results/coverage/quotation_author.pl
b/tp/t/results/coverage/quotation_author.pl
index a455e85efc..4f045f715c 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -225,7 +225,9 @@ quotation continues.
$result_texts{'quotation_author'} = '
+First Author
quotation
+Se~cond author
quotation continues.
';
diff --git a/tp/t/results/latex_tests/custom_headings.pl
b/tp/t/results/latex_tests/custom_headings.pl
index 3f96f4e06b..fcabda01cf 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -910,9 +910,11 @@ top sectionning
*******
+
after ch-ap first page
+
after ch-ap second page
1.1 sec1
@@ -923,9 +925,11 @@ after ch-ap second page
+
after everyheading before chap 3 first page
+
after everyheading before chap 3 second page
3 chap 3
@@ -933,6 +937,7 @@ after everyheading before chap 3 second page
+
';
$result_sectioning{'custom_headings'} = {
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 61c68dbbfa..72a3ca7ee1 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -277,9 +277,11 @@ $result_texts{'settitle_and_headings'} = '
******
+
More text
+
Another page
';
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index 0d8d07b76d..e2f9e3d6c7 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -92,6 +92,7 @@ $result_texis{'macro_for_ignored_line_command'} = '@macro
pagemacro
$result_texts{'macro_for_ignored_line_command'} = '
+
';
$result_errors{'macro_for_ignored_line_command'} = [];
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl
b/tp/t/results/macro/macro_in_misc_commands.pl
index a534d578c2..9972a102a5 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -4241,14 +4241,18 @@ example
-@page @noindent @refill something
+@page
+@noindent @refill something
noindent at beginning of line
noindent on the preceding line
noindent after space at beginning of line
+
+
After page on its own line.
-@page two spaces @noindent @refill
+@page
+two spaces @noindent @refill
diff --git a/tp/t/results/misc_commands/also_not_line.pl
b/tp/t/results/misc_commands/also_not_line.pl
index 1c8aa82bff..e28985eadb 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -514,14 +514,18 @@ exdent @exdent line after exdent
$result_texts{'also_not_line'} = '
-page noindent refill something
+page
+noindent refill something
noindent at beginning of line
noindent on the preceding line
noindent after space at beginning of line
+
+
After page on its own line.
-page noindent refill
+page
+noindent refill
novalidate
special
-------
diff --git a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
index c1a2f3062c..7c8d55552a 100644
--- a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
+++ b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
@@ -53,7 +53,8 @@ $result_texis{'author_outside_titlepage_quotation'} =
'@author Some One
';
-$result_texts{'author_outside_titlepage_quotation'} = '';
+$result_texts{'author_outside_titlepage_quotation'} = 'Some One
+';
$result_errors{'author_outside_titlepage_quotation'} = [
{
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl
b/tp/t/results/misc_commands/text_before_line_command.pl
index dd212f0630..0c43f687a9 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -346,12 +346,14 @@ quotation
';
-$result_texts{'text_before_line_command'} = 'before title
+$result_texts{'text_before_line_command'} = 'before title the title
+
i-- 1 LD Version Scripts
********************
ddd
-aaa quotation
+aaa quotation author
+quotation
';
$result_sectioning{'text_before_line_command'} = {
diff --git a/tp/t/results/preformatted/page_in_example.pl
b/tp/t/results/preformatted/page_in_example.pl
index 10a0a45209..e29459b3bf 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -112,7 +112,8 @@ text
';
-$result_texts{'page_in_example'} = 'text
+$result_texts{'page_in_example'} = '
+text
';
$result_errors{'page_in_example'} = [];
diff --git a/tp/t/results/quotation/quotation_and_author.pl
b/tp/t/results/quotation/quotation_and_author.pl
index a0b5c1a69e..81d4bfb39a 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -475,13 +475,16 @@ A Note
$result_texts{'quotation_and_author'} = '
Text before quotation
+Some One
A quot--ation
Text between quotation and smallquotation
+An Author Name
in small--quotation.
Note
+Some Notifier
A Note
';
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl
b/tp/t/results/quotation/quotation_author_in_example.pl
index 475b1818b6..936c898000 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -239,6 +239,7 @@ A quot---ation
$result_texts{'quotation_author_in_example'} = '
+Some One
A quot---ation
';
diff --git a/tp/t/results/sectioning/section_before_part.pl
b/tp/t/results/sectioning/section_before_part.pl
index 0b8a3ad6fd..3272ada285 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -177,15 +177,6 @@ $result_errors{'section_before_part'} = [
'macro' => '',
'text' => 'no sectioning command associated with @part',
'type' => 'warning'
- },
- {
- 'error_line' => ':3: warning: @part not empty
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => '@part not empty',
- 'type' => 'warning'
}
];
diff --git a/tp/t/results/value/value_in_misc_commands.pl
b/tp/t/results/value/value_in_misc_commands.pl
index 3cec2102b2..04229ce2b2 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -3321,14 +3321,18 @@ line following documentlanguage
@page
+
noindent at beginning of line
noindent on the preceding line
noindent after space at beginning of line
+
+
After page on it\'s own line.
@page
+
line after exdent
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 9b3dff321d..d6e3c016c5 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 2ac2dc86af..4a1a1e0468 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 1d23618133..635bfc2a71 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index f2f6bc9da1..39f87908b6 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index f9e0c29ddc..a762b68e55 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index 953256c8f0..ecd73e288a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index 1c5e8f4ca0..371c1ea828 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index 2dac68b04f..7cae8eab10 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 64ff6461c0..8d18800c0a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 481bdde356..ac4e190953 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 0feabbe5c1..71eeadf0c8 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 64a3f15299..5965cdbef1 100644
---
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index d6674f65f4..fa7ee11dd1 100644
---
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 1b6a19f7a3..68955a8f59 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click → A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 9dd30652b3..3c5e2badb5 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 8018148686..b9c2339d7f 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 9350745a49..623916a8cd 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 9f4543a0c0..a0dfea33ba 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index c764e18ee5..6bfd5b6476 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 6bfa99cab7..b6b9171f14 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 7040dec088..d55a1999c5 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 33f550001e..25c45d7ef9 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index 671df79b8c..d79228ace5 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index 573628b026..2049788170 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 38e99d892b..fc272449a7 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index e736e22f42..6677d1242a 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 732417dd67..5e9158d7e0 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 21f44ba791..49ba301fc7 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index e6af9c6de3..4c9783a92d 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index c4909171d5..ef395c098c 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index 463c1fd9be..d2c0490221 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index 02760be1bf..72fd9a3057 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index efd3640af3..5f1315e15b 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 0b23b11237..22b900d286 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index 9e4df56e95..e3d07e31a3 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index c6dee45a79..c27db1985b 100644
---
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 9dcd03137f..2ba049f402 100644
---
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 53fd1e39ce..ee78055255 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 9b3dff321d..d6e3c016c5 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index db8b5caa1a..8116a75ec2 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index 55e0784f4d..e176a1e2e9 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 2ac2dc86af..4a1a1e0468 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 370af47a33..1f3bdc25c4 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index 5c92d59e49..a63773ee19 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index 89ab5b5d5c..fe915bd09b 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 82fcf52d6b..b8470c6028 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index 7bf8cc0256..64fc92b5c1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index d342bc6af6..68b77d7274 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 2620e4c4e9..9f8b7e4663 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index edc9d60aca..372b44ff96 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index 5bc87ba542..0fd53ebc4c 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index e4b67cffb9..9219d69ddc 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 59709bc3d4..672717d208 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index a0bfa1261f..bf995095bb 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index d7091f1165..c6d7f18edf 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 2ac2dc86af..4a1a1e0468 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 370af47a33..1f3bdc25c4 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index 5c92d59e49..a63773ee19 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index 89ab5b5d5c..fe915bd09b 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 82fcf52d6b..b8470c6028 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index 7bf8cc0256..64fc92b5c1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index d342bc6af6..68b77d7274 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 2620e4c4e9..9f8b7e4663 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index edc9d60aca..372b44ff96 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 5bc87ba542..0fd53ebc4c 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index e4b67cffb9..9219d69ddc 100644
---
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 59709bc3d4..672717d208 100644
---
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 7ba0936cb0..5a0b5e87b1 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
index 0b8fb74223..b5da6b9626 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -242,6 +242,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -331,7 +333,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -1017,6 +1020,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -1106,7 +1111,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 28944e62e8..822721c774 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -213,6 +213,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -302,7 +304,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 136f59083b..30abcee103 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 388cc3f934..95afa36102 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex.html
b/tp/tests/many_input_files/tex_l2h_res/tex.html
index 937c54f843..067baaf25f 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex.html
+++ b/tp/tests/many_input_files/tex_l2h_res/tex.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
b/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
index e0b64afda3..5da01e16be 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
@@ -30,6 +30,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex.html
b/tp/tests/many_input_files/tex_t4ht_res/tex.html
index 55b5585c75..bbb94406c5 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex.html
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex.html
@@ -28,6 +28,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
index 293fd30cd6..70c399f88b 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
@@ -32,6 +32,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
b/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
index d23bcd7500..13cd17c765 100644
--- a/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
+++ b/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index e7a2edd9ab..edf8ec9518 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -801,6 +804,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index cbd4c31de8..18a8d96463 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
@@ -1017,7 +1021,7 @@ but , ,
<code>@file{--a}</code> <samp>--a</samp>
<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <tt class="key">--a</tt>
+<code>@key{--a}</code> <kbd class="key">--a</kbd>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
@@ -2116,7 +2120,7 @@ but , ,
<code>@file{--a}</code> <samp>--a</samp>
<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <tt class="key">--a</tt>
+<code>@key{--a}</code> <kbd class="key">--a</kbd>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
@@ -3221,7 +3225,7 @@ but , ,
<code>@file{--a}</code> <samp>--a</samp>
<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <span class="key">--a</span>
+<code>@key{--a}</code> <kbd class="key">--a</kbd>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index 0add3cb2ba..3d493dc953 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 05ed8c2b1c..d9590755fd 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html
b/tp/tests/tex_html/res_parser/formatting_singular/index.html
index ff7ab7c466..906af5cb67 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -215,6 +215,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -304,7 +306,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -801,6 +804,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index b30545a42d..dff1ebb66f 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index 8832d1f1d5..7902d16e2b 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index 0ffc4d9f30..52574f7b09 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index 32f2e745ee..731563c90b 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index b991774848..486ef8daea 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index 6febf773d3..cc0f112e7b 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index ec9444184a..777fe97e52 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 8472de18c5..cd30f20e7e 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -214,6 +214,8 @@ a@sup{h}@sub{l} ahl
@page
+author
+
need 1002
@clicksequence{click @click{} A} click -> A
@@ -303,7 +305,8 @@ Empty
-aaa quotation
+aaa quotation author
+quotation
indent in quotation
@@ -802,6 +805,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
index f8c20b222f..da74b37940 100644
--- a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
+++ b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
index 52b432ef3c..a6c7a10e1d 100644
--- a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
+++ b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex/tex.html
b/tp/tests/tex_html/res_parser/tex/tex.html
index 937c54f843..067baaf25f 100644
--- a/tp/tests/tex_html/res_parser/tex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex/tex.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
b/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
index 63f2c793ad..4c3638f7e0 100644
--- a/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
+++ b/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
@@ -28,6 +28,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
b/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
index 8a6fcbaddd..0a10d668d1 100644
--- a/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
+++ b/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
index 293fd30cd6..70c399f88b 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
@@ -32,6 +32,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
index e0b64afda3..5da01e16be 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
@@ -30,6 +30,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
index b40be50b31..235c626ba9 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
@@ -28,6 +28,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
index 18e60e302b..a80386b46e 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
index c5ee1effc2..248c538c86 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
@@ -28,6 +28,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
index 3d7bd8c94e..c65bf45729 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
index adec12d451..9dbe36d929 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex.html
b/tp/tests/tex_html/res_parser/tex_httex/tex.html
index 55b5585c75..bbb94406c5 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex.html
@@ -28,6 +28,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
index 3f6f8dda73..c304e9932d 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
@@ -33,6 +33,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
b/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
index 6e0a4ce064..140455f48b 100644
--- a/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
+++ b/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
diff --git a/tp/tests/tex_html/res_parser/tex_notex/tex.html
b/tp/tests/tex_html/res_parser/tex_notex/tex.html
index 93d3decb28..e2de7ac684 100644
--- a/tp/tests/tex_html/res_parser/tex_notex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_notex/tex.html
@@ -26,6 +26,7 @@ h3.center-align {text-align:center}
h3.right-align {text-align:right}
h4.center-align {text-align:center}
kbd {font-style: oblique}
+kbd.key {font-style: normal}
p.center-align {text-align:center}
p.left-align {text-align:left}
p.right-align {text-align:right}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm (%document_settable_multiple_at_commands) (%formattable_misc_commands): put contents and summarycontents in %document_settable_multiple_at_commands and remove from %formattable_misc_commands.,
Patrice Dumas <=