[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command) (_default_format_heading_text, _convert_heading_command) (_contents_inline_element, _default_format_titlepage, _print_title) (_convert_special_element_type, _convert_tree_unit_type) (_default_format_footnotes_text), tp/init/book.pm: pass the command name, possibly undef for special elements, and class to format_heading_text formatting. |
|
Date: |
Tue, 11 Jan 2022 18:51:03 -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 27736a3090 * tp/Texinfo/Convert/HTML.pm (%css_map,
_convert_titlefont_command) (_default_format_heading_text,
_convert_heading_command) (_contents_inline_element, _default_format_titlepage,
_print_title) (_convert_special_element_type, _convert_tree_unit_type)
(_default_format_footnotes_text), tp/init/book.pm: pass the command name,
possibly undef for special elements, and class to format_heading_text
formatting.
27736a3090 is described below
commit 27736a309017663dc128d3681dc5cec70dba7512
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 12 00:50:50 2022 +0100
* tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command)
(_default_format_heading_text, _convert_heading_command)
(_contents_inline_element, _default_format_titlepage, _print_title)
(_convert_special_element_type, _convert_tree_unit_type)
(_default_format_footnotes_text), tp/init/book.pm: pass the
command name, possibly undef for special elements, and class to
format_heading_text formatting.
* tp/Texinfo/Convert/HTML.pm (output, _default_format_titlepage)
(_print_title): keep information on the @-command used for
simpletitle_tree in simpletitle_command_name and use it in the
formatting.
---
ChangeLog | 15 +
tp/TODO | 6 +
tp/Texinfo/Convert/HTML.pm | 70 ++---
tp/init/book.pm | 15 +-
tp/t/html_tests.t | 11 +
tp/t/results/html_tests/shorttitlepage.pl | 446 ++++++++++++++++++++++++++++++
6 files changed, 526 insertions(+), 37 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cdbef8aa8b..ad008ee463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2022-01-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command)
+ (_default_format_heading_text, _convert_heading_command)
+ (_contents_inline_element, _default_format_titlepage, _print_title)
+ (_convert_special_element_type, _convert_tree_unit_type)
+ (_default_format_footnotes_text), tp/init/book.pm: pass the
+ command name, possibly undef for special elements, and class to
+ format_heading_text formatting.
+
+ * tp/Texinfo/Convert/HTML.pm (output, _default_format_titlepage)
+ (_print_title): keep information on the @-command used for
+ simpletitle_tree in simpletitle_command_name and use it in the
+ formatting.
+
2022-01-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use
diff --git a/tp/TODO b/tp/TODO
index 11da404f6d..82059b886a 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -17,6 +17,9 @@ Change in doc:
The text of @copying is output as a comment at the beginning of Info, HTML,
XML, and DocBook output files.
Not true for docbook and XML, it is in elements.
+In HTML the title is shown (using either @settitle or @shortitltpage). Not
clear
+in the documentation.
+
Test of ASCII_PUNCTUATION on texinfo like:
@@ -34,6 +37,9 @@ and @documentencoding US-ASCII using files as there is an
encoded character
and test also OUTPUT_ENCODING (set to utf8)
+
+
+
Bugs
====
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 8301c18f21..1d73c98ab9 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1754,6 +1754,7 @@ my %css_map = (
'h2.centerchap' => 'text-align:center',
'h3.centerchap' => 'text-align:center',
'h1.settitle' => 'text-align:center',
+ 'h1.shorttitlepage' => 'text-align:center',
'h3.subtitle' => 'text-align:right',
'h4.centerchap' => 'text-align:center',
'div.center' => 'text-align:center',
@@ -2693,7 +2694,8 @@ sub _convert_titlefont_command($$$$)
# happens with bogus @-commands without argument, like @strong something
return '';
}
- return &{$self->{'format_heading_text'}}($self, 'titlefont', $text, 0,
$command);
+ return &{$self->{'format_heading_text'}}($self, $cmdname, $cmdname,
+ $text, 0, $command);
}
$default_commands_conversion{'titlefont'} = \&_convert_titlefont_command;
@@ -2745,11 +2747,12 @@ sub _default_css_string_format_protect_text($$) {
}
# can be called on root commands, tree units, special elements
-# and title elements
-sub _default_format_heading_text($$$$$;$)
+# and title elements. $cmdname can be undef for special elements.
+sub _default_format_heading_text($$$$$$;$)
{
my $self = shift;
my $cmdname = shift;
+ my $class = shift;
my $text = shift;
my $level = shift;
my $element = shift;
@@ -2759,17 +2762,10 @@ sub _default_format_heading_text($$$$$;$)
# This should seldom happen.
if ($self->in_string()) {
- $text .= "\n" unless ($cmdname eq 'titlefont');
+ $text .= "\n" unless (defined($cmdname) and $cmdname eq 'titlefont');
return $text;
}
- my $class;
- if ($cmdname eq 'node') {
- $class = 'node-heading';
- } else {
- $class = $cmdname;
- }
-
if ($level < 1) {
$level = 1;
} elsif ($level > $self->get_conf('MAX_HEADER_LEVEL')) {
@@ -2783,10 +2779,10 @@ sub _default_format_heading_text($$$$$;$)
."${id_str}>$text</h$level>";
# titlefont appears inline in text, so no end of line is
# added. The end of line should be added by the user if needed.
- $result .= "\n" unless ($cmdname eq 'titlefont');
- $result .= $self->get_conf('DEFAULT_RULE') . "\n"
- if ($cmdname eq 'part'
- and defined($self->get_conf('DEFAULT_RULE'))
+ $result .= "\n" unless (defined($cmdname) and $cmdname eq 'titlefont');
+ $result .= $self->get_conf('DEFAULT_RULE') . "\n"
+ if (defined($cmdname) and $cmdname eq 'part'
+ and defined($self->get_conf('DEFAULT_RULE'))
and $self->get_conf('DEFAULT_RULE') ne '');
return $result;
}
@@ -3394,9 +3390,14 @@ sub _convert_heading_command($$$$$)
# FIXME for sectioning commands there is a class here but
# it also was the opening section, possibly when encountering
# the associated node element
- $result .= &{$self->{'format_heading_text'}}($self,
$level_corrected_cmdname,
- $heading, $heading_level
+$self->get_conf('CHAPTER_HEADER_LEVEL') -1,
- $element, $heading_id);
+ my $heading_class = $level_corrected_cmdname;
+ if ($cmdname eq 'node') {
+ $heading_class = 'node-heading';
+ }
+ $result .= &{$self->{'format_heading_text'}}($self,
+ $level_corrected_cmdname, $heading_class, $heading,
+ $heading_level +$self->get_conf('CHAPTER_HEADER_LEVEL')
-1,
+ $element, $heading_id);
}
} elsif (defined($heading_id)) {
# case of a lone node and no header, and case of an empty @top
@@ -4735,7 +4736,7 @@ sub _contents_inline_element($$$)
"convert $cmdname special heading");
}
$result .= ">\n";
- $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading',
+ $result .= &{$self->{'format_heading_text'}}($self, $cmdname,
$class.'-heading',
$heading, $self->get_conf('CHAPTER_HEADER_LEVEL'))."\n";
$result .= $content . "</div>\n";
return $result;
@@ -5713,15 +5714,17 @@ sub _default_format_titlepage($)
my $titlepage_text;
if ($self->{'global_commands'}->{'titlepage'}) {
- $titlepage_text = $self->convert_tree({'contents'
+ $titlepage_text = $self->convert_tree({'contents'
=> $self->{'global_commands'}->{'titlepage'}->{'contents'}},
'convert titlepage');
} elsif ($self->{'simpletitle_tree'}) {
my $title_text = $self->convert_tree_new_formatting_context(
- $self->{'simpletitle_tree'}, 'simpletitle_string');
- $titlepage_text = &{$self->{'format_heading_text'}}($self, 'settitle',
$title_text,
- 0, {'cmdname' => 'settitle',
- 'contents' => $self->{'simpletitle_tree'}->{'contents'}});
+ $self->{'simpletitle_tree'}, "$self->{'simpletitle_command_name'}
simpletitle");
+ $titlepage_text = &{$self->{'format_heading_text'}}($self,
+ $self->{'simpletitle_command_name'},
+ $self->{'simpletitle_command_name'}, $title_text,
+ 0, {'cmdname' => $self->{'simpletitle_command_name'},
+ 'contents' =>
$self->{'simpletitle_tree'}->{'contents'}});
}
my $result = '';
$result .= $titlepage_text.$self->get_conf('DEFAULT_RULE')."\n"
@@ -5741,10 +5744,12 @@ sub _print_title($)
} else {
if ($self->{'simpletitle_tree'}) {
my $title_text = $self->convert_tree_new_formatting_context(
- $self->{'simpletitle_tree'}, 'simpletitle_string');
- $result .= &{$self->{'format_heading_text'}}($self, 'settitle',
$title_text,
- 0, {'cmdname' => 'settitle',
- 'contents' => $self->{'simpletitle_tree'}->{'contents'}});
+ $self->{'simpletitle_tree'}, "$self->{'simpletitle_command_name'}
simpletitle");
+ $result .= &{$self->{'format_heading_text'}}($self,
+ $self->{'simpletitle_command_name'},
+ $self->{'simpletitle_command_name'}, $title_text,
+ 0, {'cmdname' => $self->{'simpletitle_command_name'},
+ 'contents' =>
$self->{'simpletitle_tree'}->{'contents'}});
}
$result .= $self->_contents_shortcontents_in_title();
}
@@ -5786,7 +5791,7 @@ sub _convert_special_element_type($$$$)
if ($special_element_type eq 'footnotes') {
$level = $self->get_conf('FOOTNOTE_SEPARATE_HEADER_LEVEL');
}
- $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading',
+ $result .= &{$self->{'format_heading_text'}}($self, undef, $class.'-heading',
$heading, $level)."\n";
my $special_element_body .= &{$self->{'format_special_element_body'}}
@@ -5829,7 +5834,7 @@ sub _convert_tree_unit_type($$$$)
if (!$tree_unit->{'structure'}->{'unit_prev'}) {
$result .= $self->_print_title();
if (!$tree_unit->{'structure'}->{'unit_next'}) {
- # only one unit, use simplfied formatting
+ # only one unit, use simplified formatting
$result .= $content;
# if there is one unit it also means that there is no formatting
# of footnotes in a separate unit. And if footnotestyle is end
@@ -8090,7 +8095,7 @@ sub _default_format_footnotes_text($)
'convert footnotes special heading');
my $class = $self->get_conf('SPECIAL_ELEMENTS_CLASS')->{'footnotes'};
my $level = $self->get_conf('FOOTNOTE_END_HEADER_LEVEL');
- $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading',
+ $result .= &{$self->{'format_heading_text'}}($self, undef, $class.'-heading',
$footnote_heading, $level)."\n";
$result .= &{$self->{'format_special_element_body'}}($self, 'footnotes',
$self->{'current_root_element'});
@@ -8665,13 +8670,14 @@ sub output($$)
$fulltitle = $self->{'global_commands'}->{'titlefont'}->[0];
}
# prepare simpletitle
- foreach my $simpletitle_command('settitle', 'shorttitlepage') {
+ foreach my $simpletitle_command ('settitle', 'shorttitlepage') {
if ($self->{'global_commands'}->{$simpletitle_command}) {
my $command = $self->{'global_commands'}->{$simpletitle_command};
next if ($command->{'extra'}
and $command->{'extra'}->{'missing_argument'});
$self->{'simpletitle_tree'} =
{'contents' => $command->{'args'}->[0]->{'contents'}};
+ $self->{'simpletitle_command_name'} = $simpletitle_command;
last;
}
}
diff --git a/tp/init/book.pm b/tp/init/book.pm
index 0d85f9f929..f79111f6c4 100644
--- a/tp/init/book.pm
+++ b/tp/init/book.pm
@@ -219,7 +219,7 @@ sub book_convert_heading_command($$$$$)
$result .= $element_header;
my $heading_level;
- my $cmdname_for_heading = $cmdname;
+ my $level_corrected_cmdname = $cmdname;
# node is used as heading if there is nothing else.
if ($cmdname eq 'node') {
# FIXME what to do if the $tree_unit extra does not contain any
@@ -240,7 +240,7 @@ sub book_convert_heading_command($$$$$)
} elsif (defined $element->{'structure'}->{'section_level'}) {
$heading_level = $element->{'structure'}->{'section_level'};
# if the level was changed, set the command name right
- $cmdname_for_heading
+ $level_corrected_cmdname
= Texinfo::Structuring::section_level_adjusted_command_name($element);
} else {
# for *heading* @-commands which do not have a level
@@ -271,9 +271,14 @@ sub book_convert_heading_command($$$$$)
}
$result .= "<strong${id_str}>".$heading.'</strong>'."\n";
} else {
- $result .= &{$self->{'format_heading_text'}}($self, $cmdname_for_heading,
- $heading, $heading_level
+$self->get_conf('CHAPTER_HEADER_LEVEL') -1,
- $element, $heading_id);
+ my $heading_class = $level_corrected_cmdname;
+ if ($cmdname eq 'node') {
+ $heading_class = 'node-heading';
+ }
+ $result .= &{$self->{'format_heading_text'}}($self,
+ $level_corrected_cmdname, $heading_class, $heading,
+ $heading_level +$self->get_conf('CHAPTER_HEADER_LEVEL')
-1,
+ $element, $heading_id);
}
} elsif (defined($heading_id)) {
# case of a lone node and no header, and case of an empty @top
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 2cd6f9ad15..1151a36880 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -393,6 +393,17 @@ aa
Top.
+Second paragraph.
+'],
+['shorttitlepage',
+'@setfilename html-shorttitlepage.info
+@shorttitlepage @@title @sc{html} @code{test}
+
+@node Top
+@top Top of @@title @sc{html} @code{test}
+
+Top.
+
Second paragraph.
'],
['html_in_copying',
diff --git a/tp/t/results/html_tests/shorttitlepage.pl
b/tp/t/results/html_tests/shorttitlepage.pl
new file mode 100644
index 0000000000..82e134352b
--- /dev/null
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -0,0 +1,446 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'shorttitlepage'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html-shorttitlepage.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'html-shorttitlepage.info'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'title '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sc',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'test'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'shorttitlepage',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top of '
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'title '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sc',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'test'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Second paragraph.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'parent'} =
$result_trees{'shorttitlepage'};
+$result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[1];
+$result_trees{'shorttitlepage'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[1]{'parent'} =
$result_trees{'shorttitlepage'};
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[5];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[2];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[2];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[1];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[2];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[2];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[3];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'shorttitlepage'}{'contents'}[2];
+$result_trees{'shorttitlepage'}{'contents'}[2]{'parent'} =
$result_trees{'shorttitlepage'};
+
+$result_texis{'shorttitlepage'} = '@setfilename html-shorttitlepage.info
+@shorttitlepage @@title @sc{html} @code{test}
+
+@node Top
+@top Top of @@title @sc{html} @code{test}
+
+Top.
+
+Second paragraph.
+';
+
+
+$result_texts{'shorttitlepage'} = '
+Top of @title HTML test
+***********************
+
+Top.
+
+Second paragraph.
+';
+
+$result_sectioning{'shorttitlepage'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+ }
+ },
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'shorttitlepage'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'shorttitlepage'};
+
+$result_nodes{'shorttitlepage'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'structure' => {}
+ },
+ 'normalized' => 'Top'
+ }
+};
+
+$result_menus{'shorttitlepage'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_errors{'shorttitlepage'} = [];
+
+
+$result_floats{'shorttitlepage'} = {};
+
+
+
+$result_converted{'html'}->{'shorttitlepage'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>@title HTML test</title>
+
+<meta name="description" content="@title HTML test">
+<meta name="keywords" content="@title HTML test">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<style type="text/css">
+<!--
+h1.shorttitlepage {text-align:center}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<h1 class="shorttitlepage">@title <small class="sc">HTML</small> <code
class="code">test</code></h1>
+
+<div class="top" id="Top">
+<h1 class="top" id="Top-of-_0040title-HTML-test">Top of @title <small
class="sc">HTML</small> <code class="code">test</code></h1>
+
+<p>Top.
+</p>
+<p>Second paragraph.
+</p></div>
+
+
+
+</body>
+</html>
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command) (_default_format_heading_text, _convert_heading_command) (_contents_inline_element, _default_format_titlepage, _print_title) (_convert_special_element_type, _convert_tree_unit_type) (_default_format_footnotes_text), tp/init/book.pm: pass the command name, possibly undef for special elements, and class to format_heading_text formatting.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use command as class for anchors, as if it is a @node the heading has another class name, and for an empty @top, there are two classes as for sectioning commands. Move code around, change variable names, add comments for clarity and add FIXMEs.
- Next by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use level corrected sectioning command name for the opening section class.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use command as class for anchors, as if it is a @node the heading has another class name, and for an empty @top, there are two classes as for sectioning commands. Move code around, change variable names, add comments for clarity and add FIXMEs.
- Next by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use level corrected sectioning command name for the opening section class.
- Index(es):