[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_item_comma
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_item_command): check if in preformatted first before putting in <tt>. Use preformatted_classes_stack() instead of commands_stack() to determine if in %preformatted_code_commands. |
|
Date: |
Sat, 22 Jan 2022 09:23:53 -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 b9d2a85544 * tp/Texinfo/Convert/HTML.pm (_convert_item_command): check
if in preformatted first before putting in <tt>. Use
preformatted_classes_stack() instead of commands_stack() to determine if in
%preformatted_code_commands.
b9d2a85544 is described below
commit b9d2a855449c255e0a5435efd447c1c288eafc00
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 22 15:23:33 2022 +0100
* tp/Texinfo/Convert/HTML.pm (_convert_item_command): check
if in preformatted first before putting in <tt>. Use
preformatted_classes_stack() instead of commands_stack() to determine
if in %preformatted_code_commands.
* tp/Texinfo/Convert/HTML.pm (_convert_heading_command),
tp/init/book.pm: add classes in heading formatting in preformatted.
* tp/Texinfo/Convert/HTML.pm (_mini_toc): avoid using internal
information when not needed.
* tp/Texinfo/Convert/HTML.pm
(%special_list_mark_css_string_no_arg_command): rename from
%special_list_bullet_css_string_no_arg_command.
(html_convert_css_string_for_list_mark): rename from
html_convert_css_string_for_list_bullet().
* tp/Texinfo/Convert/HTML.pm: remove commands_stack() as it is not
used anymore, and 'commands' in $self->{'document_context'}.
---
ChangeLog | 22 ++++
tp/TODO | 128 ++++++++++++++++++++-
tp/Texinfo/Convert/HTML.pm | 69 +++++------
tp/init/book.pm | 7 +-
tp/t/results/heading/heading_in_example.pl | 2 +-
tp/t/results/menu/submenu_in_example.pl | 2 +-
.../layout/res_parser/formatting/formatting.html | 10 +-
.../layout/res_parser/formatting_chm/chapter.html | 10 +-
.../formatting_enable_encoding/formatting.html | 10 +-
.../EPUB/xhtml/formatting.xhtml | 10 +-
.../EPUB/xhtml/chapter.xhtml | 10 +-
.../res_parser/formatting_exotic/chapter.html | 10 +-
.../res_parser/formatting_fr_icons/formatting.html | 10 +-
.../res_parser/formatting_html/formatting.html | 10 +-
.../formatting_html_no_texi2html/formatting.html | 10 +-
.../res_parser/formatting_html_nodes/chapter.html | 10 +-
.../formatting_inline_css/formatting.html | 10 +-
.../res_parser/formatting_mathjax/formatting.html | 10 +-
.../res_parser/formatting_nodes/chapter.html | 10 +-
.../formatting_numerical_entities/formatting.html | 10 +-
.../formatting_regions/formatting_regions.html | 10 +-
.../formatting_weird_quotes/formatting.html | 10 +-
.../res_parser/formatting_xhtml/formatting.html | 10 +-
.../nested_cartouche/nested_formats.html | 6 +-
.../res_parser/nested_deffn/nested_formats.html | 6 +-
.../nested_enumerate/nested_formats.html | 6 +-
.../res_parser/nested_example/nested_formats.html | 24 ++--
.../nested_flushright/nested_formats.html | 12 +-
.../res_parser/nested_group/nested_formats.html | 6 +-
.../res_parser/nested_itemize/nested_formats.html | 6 +-
.../res_parser/nested_menu/nested_formats.html | 24 ++--
.../nested_multitable/nested_formats.html | 6 +-
.../nested_quotation/nested_formats.html | 6 +-
.../res_parser/nested_table/nested_formats.html | 6 +-
.../res_parser/formatting_singular/chapter.html | 10 +-
35 files changed, 323 insertions(+), 195 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bf8112faa3..323581ccf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2022-01-22 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_item_command): check
+ if in preformatted first before putting in <tt>. Use
+ preformatted_classes_stack() instead of commands_stack() to determine
+ if in %preformatted_code_commands.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_heading_command),
+ tp/init/book.pm: add classes in heading formatting in preformatted.
+
+ * tp/Texinfo/Convert/HTML.pm (_mini_toc): avoid using internal
+ information when not needed.
+
+ * tp/Texinfo/Convert/HTML.pm
+ (%special_list_mark_css_string_no_arg_command): rename from
+ %special_list_bullet_css_string_no_arg_command.
+ (html_convert_css_string_for_list_mark): rename from
+ html_convert_css_string_for_list_bullet().
+
+ * tp/Texinfo/Convert/HTML.pm: remove commands_stack() as it is not
+ used anymore, and 'commands' in $self->{'document_context'}.
+
2022-01-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_convert_explained_command): no tree
diff --git a/tp/TODO b/tp/TODO
index 9ce6929134..a627250ead 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -20,18 +20,134 @@ Bugs
HTML API
========
+Issues
+------
+
Add a registering function for:
%$Texinfo::Config::texinfo_code_types
Texinfo::Config::commands_translation{$context}->{$command}
-Use an accessor for css_import_lines, css_rule_lines and css_map
+Use an accessor for css_import_lines, css_rule_lines?
-Document type '_converted' and '_string' for 'text'.
+Some internal state used in conversion:
+ _convert_anchor_command:
+ $self->{'multiple_pass'}
+ _convert_footnote_command:
+ $self->{'current_filename'}
+ $self->{'multiple_pass'}->[-1]
+ _convert_explained_command (actually internal to the function)
+ $self->{'explained_commands'}
+ $self->{'element_explanation_contents'}
+ _convert_raw_command
+ $self->{'output_format'}
+ _convert_inline_command
+ $self->{'expanded_formats_hash'}
+ _convert_itemize_command
+ $self->{'css_map'}
+
+
+ _default_format_button
+ $self->{'current_root_element'} (for from_element_direction())
+ _default_format_element_header
+ $self->{'counter_in_file'}->{$tree_unit->{'structure'}->{'unit_filename'}}
+
+ _default_panel_button_dynamic_direction
+ $self->{'current_root_element'} (for from_element_direction())
+
+Some private function used in conversion
+ _convert_informative_command
+ _translate_names
+
+Some private variables used in conversion
+ _convert_footnote_command:
+ $foot_num, $foot_lines, $NO_NUMBER_FOOTNOTE_SYMBOL, $footid_base,
$docid_base, $target_prefix, %footnote_id_numbers
+ _contents_inline_element
+ %contents_command_element_type
+ _convert_preformatted_command
+ _convert_indented_command
+ _convert_quotation_command
+ %small_alias
+
+in page_head, use $self->title_string()
+
+To document:
+-----------
+
+Texinfo::Config texinfo_ functions
+
+get_conf(), set_conf() (force_conf()?)
+
+
+Convert depth first.
+
+convert* call
+
+args in *convert*, in %default_commands_args
+
+
+register_file_information
+
+register_pending_formatted_inline_content
+get_associated_formatted_inline_content
+get_pending_formatted_inline_content
+associate_pending_formatted_inline_content
+cancel_pending_formatted_inline_content
+
+default_types_conversion
+default_types_open
+
+
+
+Type '_converted' and '_string' for 'text'.
+
+used in _direction_href_attributes, _get_links
+'BUTTONS_ACCESSKEY' 'BUTTONS_REL'
+'LINKS_BUTTONS'
+
+used in _contents_inline_element
+'SPECIAL_ELEMENTS_DIRECTIONS' 'SPECIAL_ELEMENTS_CLASS'
'SPECIAL_ELEMENTS_HEADING'
+
+from_element_direction
+command_target command_filename command_string command_id command_href
+command_contents_href
+special_element (argument: a $special_element_direction?)
+
+required use of
+in_string()
+in_align()
+in_preformatted()
+html_attribute_class()
+close_html_lone_element()
+register_opened_section_level()
+close_registered_sections_level()
+
+protect_text? or use of format_protect_text?
+
+use of
+Texinfo::Convert::Utils::expand_today()
+Texinfo::Convert::Utils::expand_verbatiminclude
+Texinfo::Convert::Converter::float_name_caption()
+convert_tree()
+$self->convert_tree($self->gdt())
+Texinfo::Convert::NodeNameNormalization::normalize_node(
+Texinfo::Convert::NodeNameNormalization::convert
+$self->html_image_file_location_name()
+$self->xml_comment()
+$self->xml_protect_text()
+$self->xml_accents()
+$self->element_is_tree_unit_top()
+$tree_unit->{'structure'} unit_next, unit_filename, unit_prev section_level
associated_unit section_childs
+ {'extra'}->{'unit_command'}
+Texinfo::Structuring::section_level_adjusted_command_name
+Texinfo::Common::section_level()
+Texinfo::Common::set_informative_command_value()
+$self->preformatted_classes_stack
+self->html_non_breaking_space()
+$self->{'floats'}
+$self->convert_tree_new_formatting_context()
+$self->html_convert_css_string_for_list_mark()
+$self->table_item_content_tree() (Converter)
-Check the design of the HTML.pm API. Document the API, in particular
-everything in Texinfo::Config. Add an API for everything used in the
-default functions, for example in page_head, use $self->title_string()
-and so on and so forth.
Profiling
=========
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 6afe6b9751..724f800292 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -371,7 +371,7 @@ sub html_convert_css_string($$;$)
return $result;
}
-my %special_list_bullet_css_string_no_arg_command = (
+my %special_list_mark_css_string_no_arg_command = (
# tried to use HYPHEN BULLET \2043 for use as in a bullet list, but, at least
# with my test of firefox the result is very different from a bullet.
# hyphen minus or hyphen \2010 are even smaller than hyphen bullet.
@@ -383,21 +383,21 @@ my %special_list_bullet_css_string_no_arg_command = (
'minus' => '\2212 ',
);
-sub html_convert_css_string_for_list_bullet($$;$)
+sub html_convert_css_string_for_list_mark($$;$)
{
my $self = shift;
my $element = shift;
my $explanation = shift;
my $saved_css_string_no_arg_command = {};
- foreach my $command (keys(%special_list_bullet_css_string_no_arg_command)) {
+ foreach my $command (keys(%special_list_mark_css_string_no_arg_command)) {
$saved_css_string_no_arg_command->{$command}
= $self->{'no_arg_commands_formatting'}->{'css_string'}->{$command};
$self->{'no_arg_commands_formatting'}->{'css_string'}->{$command}
- = $special_list_bullet_css_string_no_arg_command{$command};
+ = $special_list_mark_css_string_no_arg_command{$command};
}
my $result = $self->html_convert_css_string($element, $explanation);
- foreach my $command (keys(%special_list_bullet_css_string_no_arg_command)) {
+ foreach my $command (keys(%special_list_mark_css_string_no_arg_command)) {
$self->{'no_arg_commands_formatting'}->{'css_string'}->{$command}
= $saved_css_string_no_arg_command->{$command};
}
@@ -491,12 +491,6 @@ sub top_format($)
return $self->{'document_context'}->[-1]->{'formats'}->[-1];
}
-sub commands_stack($)
-{
- my $self = shift;
- return @{$self->{'document_context'}->[-1]->{'commands'}};
-}
-
sub preformatted_classes_stack($)
{
my $self = shift;
@@ -1987,8 +1981,8 @@ foreach my $mark_command
(keys(%{$default_no_arg_commands_formatting{'css_string
$css_string = 'disc';
} elsif ($default_no_arg_commands_formatting{'css_string'}->{$mark_command}
and
$default_no_arg_commands_formatting{'css_string'}->{$mark_command}->{'text'}) {
- if ($special_list_bullet_css_string_no_arg_command{$mark_command}) {
- $css_string =
$special_list_bullet_css_string_no_arg_command{$mark_command};
+ if ($special_list_mark_css_string_no_arg_command{$mark_command}) {
+ $css_string =
$special_list_mark_css_string_no_arg_command{$mark_command};
} else {
$css_string =
$default_no_arg_commands_formatting{'css_string'}->{$mark_command}->{'text'};
}
@@ -2728,7 +2722,7 @@ sub _convert_U_command($$$$)
my $arg = $args->[0]->{'normal'};
my $res;
- if (defined($arg) && $arg) {
+ if (defined($arg) and $arg ne '') {
# checks on the value already done in Parser, just output it here.
$res = "&#x$arg;";
} else {
@@ -3411,15 +3405,16 @@ sub _convert_heading_command($$$$$)
}
}
+ my $heading_class = $level_corrected_cmdname;
+ unshift @heading_classes, $heading_class;
if ($self->in_preformatted()) {
my $id_str = '';
if (defined($heading_id)) {
$id_str = " id=\"$heading_id\"";
}
- $result .= "<strong${id_str}>".$heading.'</strong>'."\n";
+ $result .= $self->html_attribute_class('strong', \@heading_classes)
+ ."${id_str}>".$heading.'</strong>'."\n";
} else {
- my $heading_class = $level_corrected_cmdname;
- unshift @heading_classes, $heading_class;
$result .= &{$self->{'format_heading_text'}}($self,
$level_corrected_cmdname, \@heading_classes, $heading,
$heading_level +$self->get_conf('CHAPTER_HEADER_LEVEL')
-1,
@@ -3630,7 +3625,7 @@ sub _convert_verbatim_command($$$$)
my $command = shift;
my $content = shift;
- if (!$self->in_string) {
+ if (!$self->in_string()) {
return $self->html_attribute_class('pre', [$cmdname]).'>'
.$content . '</pre>';
} else {
@@ -3647,7 +3642,7 @@ sub _convert_displaymath_command($$$$)
my $command = shift;
my $content = shift;
- if ($self->in_string) {
+ if ($self->in_string()) {
return $content;
}
@@ -4114,7 +4109,7 @@ sub _convert_itemize_command($$$$)
return $self->html_attribute_class('ul', [$cmdname]).">\n" . $content.
"</ul>\n";
} else {
my $css_string
- = $self->html_convert_css_string_for_list_bullet($command->{'args'}->[0],
+ = $self->html_convert_css_string_for_list_mark($command->{'args'}->[0],
'itemize arg');
if ($css_string ne '') {
return $self->html_attribute_class('ul', [$cmdname])
@@ -4237,10 +4232,14 @@ sub _convert_item_command($$$$)
my $table_item_tree = $self->table_item_content_tree($command,
[$args->[0]->{'tree'}]);
my $result = $self->convert_tree($table_item_tree, 'convert
table_item_tree');
- foreach my $command_name (reverse($self->commands_stack())) {
- if ($preformatted_code_commands{$command_name}) {
- $result = '<tt>' .$result. '</tt>';
- last;
+ if ($self->in_preformatted()) {
+ my @pre_classes = $self->preformatted_classes_stack();
+ foreach my $pre_class (@pre_classes) {
+ if ($preformatted_code_commands{$pre_class}) {
+ # FIXME use <code>? Add a class?
+ $result = '<tt>' .$result. '</tt>';
+ last;
+ }
}
}
my $index_id = $self->command_id($command);
@@ -6508,7 +6507,7 @@ sub converter_initialize($)
if ($context eq 'css_string'
and exists($brace_commands{$command})
and $command ne 'bullet' and $command ne 'w'
- and not
$special_list_bullet_css_string_no_arg_command{$command}) {
+ and not
$special_list_mark_css_string_no_arg_command{$command}) {
my $css_string
=
$self->{'no_arg_commands_formatting'}->{$context}->{$command}->{'text'};
$css_string = '"'.$css_string.'"';
@@ -7712,10 +7711,8 @@ sub _mini_toc
{
my ($self, $command) = @_;
- my $filename = $self->{'current_filename'};
my $result = '';
my $entry_index = 0;
- my $accesskey;
if ($command->{'structure'}->{'section_childs'}
and @{$command->{'structure'}->{'section_childs'}}) {
@@ -7723,14 +7720,14 @@ sub _mini_toc
foreach my $section (@{$command->{'structure'}->{'section_childs'}}) {
my $tree = $self->command_text($section, 'tree_nonumber');
- my $text = $self->_convert($tree, "mini_toc \@$section->{'cmdname'}");
+ my $text = $self->convert_tree($tree, "mini_toc
\@$section->{'cmdname'}");
$entry_index++;
- $accesskey = '';
+ my $accesskey = '';
$accesskey = " accesskey=\"$entry_index\""
if ($self->get_conf('USE_ACCESSKEY') and $entry_index < 10);
- my $href = $self->command_href($section, $filename);
+ my $href = $self->command_href($section);
if ($text ne '') {
if ($href ne '') {
my $href_attribute = '';
@@ -8108,7 +8105,7 @@ MathJax = {
$program, $generator);
}
-sub _get_links ($$$)
+sub _get_links($$$)
{
my $self = shift;
my $filename = shift;
@@ -8153,7 +8150,7 @@ sub _default_format_begin_file($$$)
$after_body_open, $extra_head, $program_and_version,
$program_homepage,
$program, $generator) = $self->_file_header_informations($command,
$filename);
- my $links = $self->_get_links ($filename, $element);
+ my $links = $self->_get_links($filename, $element);
my $result = "$doctype
<html${root_html_element_attributes}>
@@ -9349,8 +9346,6 @@ sub _convert($$;$)
if (exists($context_brace_commands{$command_name})) {
$self->_new_document_context($command_name);
}
- push @{$self->{'document_context'}->[-1]->{'commands'}},
- $element->{'cmdname'};
if (exists($format_context_commands{$command_name})) {
push @{$self->{'document_context'}->[-1]->{'formatting_context'}},
{'cmdname' => $command_name};
@@ -9488,7 +9483,6 @@ sub _convert($$;$)
if (exists($format_context_commands{$command_name})) {
pop @{$self->{'document_context'}->[-1]->{'formatting_context'}};
}
- pop @{$self->{'document_context'}->[-1]->{'commands'}};
if (exists($context_brace_commands{$command_name})) {
$self->_pop_document_context();
}
@@ -9518,9 +9512,6 @@ sub _convert($$;$)
delete $self->{'current_root_command'};
}
} elsif ($element->{'type'}) {
- push @{$self->{'document_context'}->[-1]->{'commands'}},
- $element->{'cmdname'}
- if ($element->{'cmdname'});
my $result = '';
my $type_name = $element->{'type'};
@@ -9582,8 +9573,6 @@ sub _convert($$;$)
}
print STDERR "DO type ($type_name) => `$result'\n"
if ($self->get_conf('DEBUG'));
- pop @{$self->{'document_context'}->[-1]->{'commands'}}
- if ($element->{'cmdname'});
return $result;
# no type, no cmdname, but contents.
} elsif ($element->{'contents'}) {
diff --git a/tp/init/book.pm b/tp/init/book.pm
index 3dd0ea6c66..9819b5514c 100644
--- a/tp/init/book.pm
+++ b/tp/init/book.pm
@@ -304,15 +304,16 @@ sub book_convert_heading_command($$$$$)
}
}
+ my $heading_class = $level_corrected_cmdname;
+ unshift @heading_classes, $heading_class;
if ($self->in_preformatted()) {
my $id_str = '';
if (defined($heading_id)) {
$id_str = " id=\"$heading_id\"";
}
- $result .= "<strong${id_str}>".$heading.'</strong>'."\n";
+ $result .= $self->html_attribute_class('strong', \@heading_classes)
+ ."${id_str}>".$heading.'</strong>'."\n";
} else {
- my $heading_class = $level_corrected_cmdname;
- unshift @heading_classes, $heading_class;
$result .= &{$self->{'format_heading_text'}}($self,
$level_corrected_cmdname, \@heading_classes, $heading,
$heading_level +$self->get_conf('CHAPTER_HEADER_LEVEL')
-1,
diff --git a/tp/t/results/heading/heading_in_example.pl
b/tp/t/results/heading/heading_in_example.pl
index 1fa471e46c..9873d4df11 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -191,7 +191,7 @@ div.example {margin-left: 3.2em}
<body lang="en">
<div class="example">
-<strong id="in-example-_0040-heading">in example @ <em
class="emph">heading</em></strong>
+<strong class="heading" id="in-example-_0040-heading">in example @ <em
class="emph">heading</em></strong>
</div>
diff --git a/tp/t/results/menu/submenu_in_example.pl
b/tp/t/results/menu/submenu_in_example.pl
index 0993c86343..fe583c8a6d 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -922,7 +922,7 @@ in example
</td></tr></table>
<pre class="menu-comment-preformatted">
-</pre><strong id="subheading-in-menu">subheading in menu</strong>
+</pre><strong class="subheading" id="subheading-in-menu">subheading in
menu</strong>
<pre class="menu-comment-preformatted">
</pre><ol class="enumerate">
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 350dcdfa7e..989ed7ed6b 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 3610001d8e..ef0045040e 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -3876,19 +3876,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 4261171254..48bb2c2707 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 b65f3b3236..7dddf103a7 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
@@ -5937,19 +5937,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 4cbb5e00e7..e92d8211c9 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
@@ -3881,19 +3881,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 66dbe554c4..e5bacb5652 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -3881,19 +3881,19 @@ html ''
-</pre><strong id="majorheading-2">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-2">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-2">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-2">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-2">heading</strong>
+</pre><strong class="heading" id="heading-2">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-2">subheading</strong>
+</pre><strong class="subheading" id="subheading-2">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-2">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-2">subsubheading</strong>
<pre class="example-preformatted">
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 6ed02f3a45..6e5bffa268 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 350dcdfa7e..989ed7ed6b 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 e1299da6a2..9febfccc2f 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
@@ -3933,19 +3933,19 @@ html ''
-</pre><strong id="majorheading-2">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-2">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-2">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-2">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-2">heading</strong>
+</pre><strong class="heading" id="heading-2">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-2">subheading</strong>
+</pre><strong class="subheading" id="subheading-2">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-2">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-2">subsubheading</strong>
<pre class="example-preformatted">
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 379b58942c..dbc6e90fcb 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -3896,19 +3896,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 eb9a7f06f5..9b319c384a 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -5938,19 +5938,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index e50593d2a3..892a115253 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 379b58942c..dbc6e90fcb 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -3896,19 +3896,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 9a99638cce..b2e8a1726b 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 3bb7a50781..c287dc8918 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -4923,19 +4923,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
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 0eca403c84..cddf588980 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index dcedaaa6b7..508e094a18 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -5962,19 +5962,19 @@ html ''
-</pre><strong id="majorheading-3">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-3">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-3">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-3">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-3">heading</strong>
+</pre><strong class="heading" id="heading-3">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-3">subheading</strong>
+</pre><strong class="subheading" id="subheading-3">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-3">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-3">subsubheading</strong>
<pre class="example-preformatted">
diff --git
a/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
index a0fa742a34..6f9de0adf9 100644
--- a/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
@@ -1679,7 +1679,7 @@ Something2
</td></tr></table>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1853,7 +1853,7 @@ Something2
</td></tr></table>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2028,7 +2028,7 @@ Something2
</td></tr></table>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
index 47ac19a3a0..930986fa95 100644
--- a/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
@@ -1862,7 +1862,7 @@ Something2
</dd></dl>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2051,7 +2051,7 @@ Something2
</dd></dl>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2242,7 +2242,7 @@ Something2
</dd></dl>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
index fe5559501b..f3b6b2611b 100644
--- a/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
@@ -1679,7 +1679,7 @@ Something2
</li></ol>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1853,7 +1853,7 @@ Something2
</li></ol>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2028,7 +2028,7 @@ Something2
</li></ol>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
index ef755cf767..b09cd5a5bd 100644
--- a/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
@@ -244,7 +244,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-1">subheading</strong>
+</pre><strong class="subheading" id="subheading-1">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -726,7 +726,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-4">subheading</strong>
+</pre><strong class="subheading" id="subheading-4">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1209,7 +1209,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-7">subheading</strong>
+</pre><strong class="subheading" id="subheading-7">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1692,7 +1692,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-10">subheading</strong>
+</pre><strong class="subheading" id="subheading-10">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1869,7 +1869,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2043,7 +2043,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2218,7 +2218,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2554,7 +2554,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-15">subheading</strong>
+</pre><strong class="subheading" id="subheading-15">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -3196,7 +3196,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-19">subheading</strong>
+</pre><strong class="subheading" id="subheading-19">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -3679,7 +3679,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-22">subheading</strong>
+</pre><strong class="subheading" id="subheading-22">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -4008,7 +4008,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-24">subheading</strong>
+</pre><strong class="subheading" id="subheading-24">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -4334,7 +4334,7 @@ Something2
</div>
<pre class="example-preformatted">
-</pre><strong id="subheading-26">subheading</strong>
+</pre><strong class="subheading" id="subheading-26">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
index fefabd9188..dc47c72aa9 100644
--- a/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
@@ -1532,7 +1532,7 @@ Something2
</pre></blockquote>
</div><pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1639,7 +1639,7 @@ html
<pre class="example-preformatted">
</pre><dl class="table">
-<dt><tt>a</tt></dt>
+<dt>a</dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
</dl>
@@ -1694,7 +1694,7 @@ Something2
</pre></blockquote>
</div><pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1801,7 +1801,7 @@ html
<pre class="example-preformatted">
</pre><dl class="table">
-<dt><tt>a</tt></dt>
+<dt>a</dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
</dl>
@@ -1904,7 +1904,7 @@ html
<pre class="example-preformatted">
</pre><dl class="table">
-<dt><tt>a</tt></dt>
+<dt>a</dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
</dl>
@@ -1963,7 +1963,7 @@ html
<pre class="example-preformatted">
</pre><dl class="table">
-<dt><tt>a</tt></dt>
+<dt>a</dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
</dl>
diff --git
a/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
index aee291dba2..1a7b3de9f0 100644
--- a/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
@@ -1532,7 +1532,7 @@ Something2
</pre></blockquote>
</div><pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1694,7 +1694,7 @@ Something2
</pre></blockquote>
</div><pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1856,7 +1856,7 @@ Something2
</pre></blockquote>
</div><pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
index ccf7564baf..8e97941aa2 100644
--- a/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
@@ -1751,7 +1751,7 @@ Something2
</li></ul>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1931,7 +1931,7 @@ Something2
</li></ul>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2112,7 +2112,7 @@ Something2
</li></ul>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git a/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
index aad7783f15..53baecfaf2 100644
--- a/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
@@ -245,7 +245,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-1">subheading</strong>
+</pre><strong class="subheading" id="subheading-1">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -727,7 +727,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-4">subheading</strong>
+</pre><strong class="subheading" id="subheading-4">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1210,7 +1210,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-7">subheading</strong>
+</pre><strong class="subheading" id="subheading-7">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1693,7 +1693,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-10">subheading</strong>
+</pre><strong class="subheading" id="subheading-10">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1870,7 +1870,7 @@ Something2
</td></tr></table>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2044,7 +2044,7 @@ Something2
</td></tr></table>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2219,7 +2219,7 @@ Something2
</td></tr></table>
<pre class="menu-comment-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2555,7 +2555,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-15">subheading</strong>
+</pre><strong class="subheading" id="subheading-15">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -3197,7 +3197,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-19">subheading</strong>
+</pre><strong class="subheading" id="subheading-19">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -3680,7 +3680,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-22">subheading</strong>
+</pre><strong class="subheading" id="subheading-22">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -4009,7 +4009,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-24">subheading</strong>
+</pre><strong class="subheading" id="subheading-24">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -4335,7 +4335,7 @@ Something2
</th></tr></table>
<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">
-</pre><strong id="subheading-26">subheading</strong>
+</pre><strong class="subheading" id="subheading-26">subheading</strong>
<pre class="menu-comment-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
index 530312230d..5da57d7b5c 100644
--- a/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
@@ -1686,7 +1686,7 @@ Something2
</table>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1840,7 +1840,7 @@ Something2
</table>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1972,7 +1972,7 @@ Something2</pre><table class="multitable">
<pre class="example-preformatted">A quot---ation
</pre></blockquote></td></tr>
</table>
-<pre class="example-preformatted"></pre><strong
id="subheading-13">subheading</strong>
+<pre class="example-preformatted"></pre><strong class="subheading"
id="subheading-13">subheading</strong>
<pre class="example-preformatted"></pre><pre class="verbatim">in verbatim
</pre><pre class="example-preformatted">html</pre><ul class="itemize
mark-bullet">
<li><pre class="example-preformatted">i--tem 1
diff --git
a/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
index b4a6424350..c3f6b33060 100644
--- a/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
@@ -1751,7 +1751,7 @@ Something2
</blockquote>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1931,7 +1931,7 @@ Something2
</blockquote>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2112,7 +2112,7 @@ Something2
</blockquote>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
diff --git
a/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
b/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
index ca71e75266..3660b2db44 100644
--- a/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
@@ -1754,7 +1754,7 @@ Something2
</dl>
<pre class="example-preformatted">
-</pre><strong id="subheading-11">subheading</strong>
+</pre><strong class="subheading" id="subheading-11">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -1934,7 +1934,7 @@ Something2
</dl>
<pre class="example-preformatted">
-</pre><strong id="subheading-12">subheading</strong>
+</pre><strong class="subheading" id="subheading-12">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
@@ -2115,7 +2115,7 @@ Something2
</dl>
<pre class="example-preformatted">
-</pre><strong id="subheading-13">subheading</strong>
+</pre><strong class="subheading" id="subheading-13">subheading</strong>
<pre class="example-preformatted">
</pre><pre class="verbatim">in verbatim
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 f8a870482a..83116aa363 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -4216,19 +4216,19 @@ html ''
-</pre><strong id="majorheading-2">majorheading</strong>
+</pre><strong class="majorheading" id="majorheading-2">majorheading</strong>
<pre class="example-preformatted">
-</pre><strong id="chapheading-2">chapheading</strong>
+</pre><strong class="chapheading" id="chapheading-2">chapheading</strong>
<pre class="example-preformatted">
-</pre><strong id="heading-2">heading</strong>
+</pre><strong class="heading" id="heading-2">heading</strong>
<pre class="example-preformatted">
-</pre><strong id="subheading-2">subheading</strong>
+</pre><strong class="subheading" id="subheading-2">subheading</strong>
<pre class="example-preformatted">
-</pre><strong id="subsubheading-2">subsubheading</strong>
+</pre><strong class="subsubheading" id="subsubheading-2">subsubheading</strong>
<pre class="example-preformatted">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_item_command): check if in preformatted first before putting in <tt>. Use preformatted_classes_stack() instead of commands_stack() to determine if in %preformatted_code_commands.,
Patrice Dumas <=