[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/HTML.pm t/html_tests...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/HTML.pm t/html_tests... |
|
Date: |
Sat, 22 Oct 2011 18:41:45 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/10/22 18:41:45
Modified files:
tp/Texinfo/Convert: HTML.pm
tp/t : html_tests.t
Added files:
tp/t/results/html_tests: character_number_leading_toc_stoc.pl
Log message:
Remove g_t in toc and shortableofcontents id.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.190&r2=1.191
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/html_tests.t?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/character_number_leading_toc_stoc.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- Texinfo/Convert/HTML.pm 22 Oct 2011 13:15:32 -0000 1.190
+++ Texinfo/Convert/HTML.pm 22 Oct 2011 18:41:44 -0000 1.191
@@ -4667,8 +4667,11 @@
# $target_base_contents = $target_base;
#}
if ($id ne '') {
- $target_contents = 'toc-'.$id;
+ my $id_base_contents = $id;
+ $id_base_contents =~ s/^g_t//;
+ $target_contents = 'toc-'.$id_base_contents;
my $target_base_contents = $target_base;
+ $target_base_contents =~ s/^g_t//;
my $toc_nr = $nr -1;
while ($self->{'ids'}->{$target_contents}) {
$target_contents = 'toc-'.$target_base_contents.'-'.$toc_nr;
@@ -4687,8 +4690,9 @@
#} else {
# $target_base_shortcontents = $target_base;
#}
- $target_shortcontents = 'stoc-'.$id;
+ $target_shortcontents = 'stoc-'.$id_base_contents;
my $target_base_shortcontents = $target_base;
+ $target_base_shortcontents =~ s/^g_t//;
my $stoc_nr = $nr -1;
while ($self->{'ids'}->{$target_shortcontents}) {
$target_shortcontents = 'stoc-'.$target_base_shortcontents
Index: t/html_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/html_tests.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/html_tests.t 15 Oct 2011 11:42:44 -0000 1.10
+++ t/html_tests.t 22 Oct 2011 18:41:44 -0000 1.11
@@ -127,6 +127,17 @@
@end menu
' ,{'SIMPLE_MENU' => 1}
],
+['character_number_leading_toc_stoc',
+'@top top
address@hidden 0
address@hidden _
address@hidden ?
+
address@hidden
+
address@hidden
+
+']
);
my @test_cases_text = (
Index: t/results/html_tests/character_number_leading_toc_stoc.pl
===================================================================
RCS file: t/results/html_tests/character_number_leading_toc_stoc.pl
diff -N t/results/html_tests/character_number_leading_toc_stoc.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/html_tests/character_number_leading_toc_stoc.pl 22 Oct 2011
18:41:45 -0000 1.1
@@ -0,0 +1,410 @@
+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);
+
+use utf8;
+
+$result_trees{'character_number_leading_toc_stoc'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'top'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [],
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'level' => 0,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '0'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [],
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'level' => 1,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'number' => 1,
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '_'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'unnumbered',
+ 'contents' => [],
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'level' => 1,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '?'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'section',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'contents',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'shortcontents',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'level' => 2,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[0]{'parent'} =
$result_trees{'character_number_leading_toc_stoc'};
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[1];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[1];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[1]{'parent'} =
$result_trees{'character_number_leading_toc_stoc'};
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[2];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[2];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[2]{'parent'} =
$result_trees{'character_number_leading_toc_stoc'};
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[3];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[3];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'extra'}{'misc_content'}[0]
=
$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[3]{'parent'} =
$result_trees{'character_number_leading_toc_stoc'};
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'contents'}[4]{'parent'}
= $result_trees{'character_number_leading_toc_stoc'}{'contents'}[4];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'extra'}{'misc_content'}[0]
=
$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'character_number_leading_toc_stoc'}{'contents'}[4]{'parent'} =
$result_trees{'character_number_leading_toc_stoc'};
+
+$result_texis{'character_number_leading_toc_stoc'} = '@top top
address@hidden 0
address@hidden _
address@hidden ?
+
address@hidden
+
address@hidden
+
+';
+
+
+$result_texts{'character_number_leading_toc_stoc'} = 'top
+***
+1 0
+***
+_
+*
+?
+=
+
+
+
+';
+
+$result_sectioning{'character_number_leading_toc_stoc'} = {
+ 'level' => -1,
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'level' => 0,
+ 'section_childs' => [
+ {
+ 'cmdname' => 'chapter',
+ 'extra' => {},
+ 'level' => 1,
+ 'number' => 1,
+ 'section_up' => {},
+ 'toplevel_prev' => {}
+ },
+ {
+ 'cmdname' => 'unnumbered',
+ 'extra' => {},
+ 'level' => 1,
+ 'section_childs' => [
+ {
+ 'cmdname' => 'section',
+ 'extra' => {},
+ 'level' => 2,
+ 'section_up' => {}
+ }
+ ],
+ 'section_prev' => {},
+ 'section_up' => {},
+ 'toplevel_prev' => {}
+ }
+ ],
+ 'section_up' => {}
+ }
+ ]
+};
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[0]{'section_up'}
= $result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0];
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_prev'}
= $result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0];
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[1]{'section_childs'}[0]{'section_up'}
=
$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[1];
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[1]{'section_prev'}
=
$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[0];
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[1]{'section_up'}
= $result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0];
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[1]{'toplevel_prev'}
=
$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_childs'}[0];
+$result_sectioning{'character_number_leading_toc_stoc'}{'section_childs'}[0]{'section_up'}
= $result_sectioning{'character_number_leading_toc_stoc'};
+
+$result_errors{'character_number_leading_toc_stoc'} = [];
+
+
+
+$result_converted{'html'}->{'character_number_leading_toc_stoc'} = '<!DOCTYPE
html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texi2html, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>top</title>
+
+<meta name="description" content="top">
+<meta name="keywords" content="top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space:pre}
+span.nolinebreak {white-space:pre}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+<a name="top"></a>
+<h1 class="top">top</h1>
+<a name="g_t0"></a>
+<h2 class="chapter">1 0</h2>
+<a name="g_t_005f"></a>
+<h2 class="unnumbered">_</h2>
+<a name="g_t_003f"></a>
+<h3 class="section">?</h3>
+
+<a name="SEC_Contents"></a>
+<h1>Table of Contents</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+ <li><a name="toc-0" href="#g_t0">1 0</a></li>
+ <li><a name="toc-_005f" href="#g_t_005f">_</a>
+ <ul class="no-bullet">
+ <li><a name="toc-_003f" href="#g_t_003f">?</a></li>
+ </ul></li>
+</ul>
+</div>
+
+
+<a name="SEC_Overview"></a>
+<h1>Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a name="stoc-0" href="#toc-0">1 0</a></li>
+<li><a name="stoc-_005f" href="#toc-_005f">_</a></li>
+</ul>
+</div>
+
+
+<hr>
+<p>
+
+
+</p>
+</body>
+</html>
+';
+
+1;