texinfo/tp Texinfo/Convert/HTML.pm t/30sectioni...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/03/03 11:33:59

Modified files:
        tp/Texinfo/Convert: HTML.pm 
        tp/t           : 30sectioning.t 
Added files:
        tp/t/results/sectioning: no_argument_and_contents.pl 

Log message:
        In targets set *contents_id to empty string and not to undef.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_argument_and_contents.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.78&r2=1.79

Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- Texinfo/Convert/HTML.pm     25 Feb 2012 13:15:35 -0000      1.231
+++ Texinfo/Convert/HTML.pm     3 Mar 2012 11:33:58 -0000       1.232
@@ -4912,6 +4912,7 @@
      = $self->{'targets'}->{$command->{'extra'}->{'associated_node'}}->{'id'};
   }
     
+  # These are undefined if the $id is set to ''.
   my $target_contents;
   my $id_contents;
   my $target_shortcontents;
@@ -4981,17 +4982,25 @@
   if (defined($id_contents)) {
     $self->{'targets'}->{$command}->{'contents_id'} = $id_contents;
     $self->{'ids'}->{$id_contents} = $command;
+  } else {
+    $self->{'targets'}->{$command}->{'contents_id'} = '';
   }
   if (defined($target_contents)) {
     $self->{'targets'}->{$command}->{'contents_target'} = $target_contents;
+  } else {
+    $self->{'targets'}->{$command}->{'contents_target'} = '';
   }
   if (defined($id_shortcontents)) {
     $self->{'targets'}->{$command}->{'shortcontents_id'} = $id_shortcontents;
     $self->{'ids'}->{$id_shortcontents} = $command;
+  } else {
+    $self->{'targets'}->{$command}->{'shortcontents_id'} = '';
   }
   if (defined($target_shortcontents)) {
     $self->{'targets'}->{$command}->{'shortcontents_target'} 
        = $target_shortcontents;
+  } else {
+    $self->{'targets'}->{$command}->{'shortcontents_target'} = '';
   }
   return $self->{'targets'}->{$command};
 }

Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- t/30sectioning.t    18 Feb 2012 23:32:04 -0000      1.78
+++ t/30sectioning.t    3 Mar 2012 11:33:59 -0000       1.79
@@ -423,6 +423,14 @@
 '@unnumbered
 @unnumbered
 '],
+['no_argument_and_contents',
+'@contents
+
address@hidden for example
+
address@hidden @asis{}
+
+'],
 ['node_up_external_node',
 '@node Top
 

Index: t/results/sectioning/no_argument_and_contents.pl
===================================================================
RCS file: t/results/sectioning/no_argument_and_contents.pl
diff -N t/results/sectioning/no_argument_and_contents.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/sectioning/no_argument_and_contents.pl    3 Mar 2012 11:33:58 
-0000       1.1
@@ -0,0 +1,291 @@
+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{'no_argument_and_contents'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'cmdname' => 'contents',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'parent' => {},
+      'type' => 'text_root'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'for example'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'misc_content' => [
+          {}
+        ]
+      },
+      'level' => 0,
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 3,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'brace_command_arg'
+                }
+              ],
+              'cmdname' => 'asis',
+              'contents' => [],
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 5,
+                'macro' => ''
+              },
+              'parent' => {}
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'misc_content' => [
+          {}
+        ]
+      },
+      'level' => 1,
+      'line_nr' => {},
+      'number' => 1,
+      'parent' => {}
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_argument_and_contents'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[0]{'parent'} = 
$result_trees{'no_argument_and_contents'};
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[1];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'no_argument_and_contents'}{'contents'}[1];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[1];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'no_argument_and_contents'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'no_argument_and_contents'}{'contents'}[1]{'parent'} = 
$result_trees{'no_argument_and_contents'};
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[2];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'no_argument_and_contents'}{'contents'}[2];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'no_argument_and_contents'}{'contents'}[2];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'line_nr'} = 
$result_trees{'no_argument_and_contents'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'no_argument_and_contents'}{'contents'}[2]{'parent'} = 
$result_trees{'no_argument_and_contents'};
+
+$result_texis{'no_argument_and_contents'} = '@contents
+
address@hidden for example
+
address@hidden @asis{}
+
+';
+
+
+$result_texts{'no_argument_and_contents'} = '
+for example
+***********
+
+1 
+**
+
+';
+
+$result_sectioning{'no_argument_and_contents'} = {
+  'level' => -1,
+  'section_childs' => [
+    {
+      'cmdname' => 'top',
+      'extra' => {},
+      'level' => 0,
+      'section_childs' => [
+        {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'level' => 1,
+          'number' => 1,
+          'section_up' => {},
+          'toplevel_prev' => {},
+          'toplevel_up' => {}
+        }
+      ],
+      'section_up' => {}
+    }
+  ]
+};
+$result_sectioning{'no_argument_and_contents'}{'section_childs'}[0]{'section_childs'}[0]{'section_up'}
 = $result_sectioning{'no_argument_and_contents'}{'section_childs'}[0];
+$result_sectioning{'no_argument_and_contents'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_prev'}
 = $result_sectioning{'no_argument_and_contents'}{'section_childs'}[0];
+$result_sectioning{'no_argument_and_contents'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_up'}
 = $result_sectioning{'no_argument_and_contents'}{'section_childs'}[0];
+$result_sectioning{'no_argument_and_contents'}{'section_childs'}[0]{'section_up'}
 = $result_sectioning{'no_argument_and_contents'};
+
+$result_errors{'no_argument_and_contents'} = [];
+
+
+
+$result_converted{'plaintext'}->{'no_argument_and_contents'} = 'for example
+1 
+for example
+***********
+
+1 
+**
+
+';
+
+
+$result_converted{'html'}->{'no_argument_and_contents'} = '<!DOCTYPE html 
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>for example</title>
+
+<meta name="description" content="for example">
+<meta name="keywords" content="for example">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="tp">
+<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="SEC_Contents"></a>
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="no-bullet">
+  <li>1 </li>
+</ul>
+</div>
+
+
+<a name="for-example"></a>
+<h1 class="top">for example</h1>
+
+<h2 class="chapter">1 </h2>
+
+<hr>
+
+
+
+</body>
+</html>
+';
+
+1;