texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO texi2any.pl Texinfo/Parser.pm T...


From: Patrice Dumas
Subject: texinfo/tp TODO texi2any.pl Texinfo/Parser.pm T...
Date: Sat, 26 Feb 2011 10:53:00 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/26 10:53:00

Modified files:
        tp             : TODO texi2any.pl 
        tp/Texinfo     : Parser.pm 
        tp/Texinfo/Convert: Plaintext.pm 
        tp/t           : info_tests.t plaintext_tests.t 
        tp/t/results/plaintext_tests: html_expanded.pl 
        tp/t/results/sectioning: complex.pl raiselowersections.pl 
                                 top_no_argument_and_content.pl 
Added files:
        tp/t/results/info_tests: html_expanded.pl 
        tp/t/results/plaintext_tests: isolated_html_expanded.pl 

Log message:
        empty @top is allowed.
        Handle right lone raw commands expansion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/info_tests.t?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/plaintext_tests.t?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/html_expanded.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/html_expanded.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/complex.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/raiselowersections.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_no_argument_and_content.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- TODO        22 Feb 2011 19:46:22 -0000      1.94
+++ TODO        26 Feb 2011 10:52:58 -0000      1.95
@@ -124,6 +124,13 @@
 bib-example.texi (big test)
 macro-at.texi (the macro part is already done)
 
+tests of the command:
+macros/
+cond_no-ifhtml_no-ifinfo_no-iftex cond.texi --no-ifhtml --no-ifinfo --no-iftex
+cond_ifhtml_ifinfo_iftex cond.texi --ifhtml --ifinfo --iftex
+Maybe:
+defcondx_Ubar defcondx_Dbar
+
 from test_paths.texi:
 @image{formatting/f--ile}
 

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- texi2any.pl 23 Feb 2011 22:53:22 -0000      1.19
+++ texi2any.pl 26 Feb 2011 10:52:59 -0000      1.20
@@ -361,11 +361,12 @@
   $set = 1 if (!defined($set));
   if ($set) {
     push @{$parser_default_options->{'expanded_formats'}}, $region
-      unless (grep {$_ eq $region} 
@{$parser_default_options->{'expanded_formats'}})
+      unless (grep {$_ eq $region} 
@{$parser_default_options->{'expanded_formats'}});
   } else {
     @{$parser_default_options->{'expanded_formats'}} = 
       grep {$_ ne $region} @{$parser_default_options->{'expanded_formats'}};
-    grep {$_ ne $region} @{$default_expanded_format};
+    @{$default_expanded_format} 
+       = grep {$_ ne $region} @{$default_expanded_format};
   }
 }
 

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- Texinfo/Parser.pm   23 Feb 2011 22:53:22 -0000      1.208
+++ Texinfo/Parser.pm   26 Feb 2011 10:52:59 -0000      1.209
@@ -2354,7 +2354,8 @@
     } else {
       my @contents = @{$current->{'args'}->[0]->{'contents'}};
       _trim_spaces_comment_from_content(address@hidden);
-      if (!scalar(@contents)) {
+      # empty @top is allowed
+      if (!scalar(@contents) and $command ne 'top') {
         $self->line_error (sprintf($self->__("address@hidden missing 
argument"), 
            $command), $line_nr);
         $current->{'extra'}->{'missing_argument'} = 1;

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- Texinfo/Convert/Plaintext.pm        24 Feb 2011 01:24:05 -0000      1.94
+++ Texinfo/Convert/Plaintext.pm        26 Feb 2011 10:52:59 -0000      1.95
@@ -96,9 +96,9 @@
   $formatting_misc_commands{$def_command} = 1 if 
($misc_commands{$def_command});
 }
 
-my %preformatted_context_commands = %preformatted_commands;
+my %default_preformatted_context_commands = %preformatted_commands;
 foreach my $preformatted_command ('verbatim', keys(%menu_commands)) {
-  $preformatted_context_commands{$preformatted_command} = 1;
+  $default_preformatted_context_commands{$preformatted_command} = 1;
 }
 
 my %ignored_misc_commands;
@@ -130,7 +130,7 @@
     if exists($block_commands{$indented_command});
 }
 
-my %format_context_commands = %indented_commands;
+my %default_format_context_commands = %indented_commands;
 
 foreach my $non_indented('format', 'smallformat') {
   delete $indented_commands{$non_indented};
@@ -138,7 +138,7 @@
 
 foreach my $format_context_command (keys(%menu_commands), 'verbatim',
  'flushleft', 'flushright', 'multitable', 'float') {
-  $format_context_commands{$format_context_command} = 1;
+  $default_format_context_commands{$format_context_command} = 1;
 }
 
 my %flush_commands = (
@@ -425,6 +425,11 @@
 
   %{$converter->{'ignored_types'}} = %ignored_types;
   %{$converter->{'ignored_commands'}} = %ignored_commands;
+  # this is dynamic because raw formats may either be full comma,nds if
+  # isolated, or simple text if in a paragraph
+  %{$converter->{'format_context_commands'}} = 
%default_format_context_commands;
+  %{$converter->{'preformatted_context_commands'}} 
+     = %default_preformatted_context_commands;
   $converter->{'footnote_index'} = 0;
   $converter->{'pending_footnotes'} = [];
 
@@ -599,7 +604,7 @@
     foreach my $context (reverse(@{$self->{'context'}})) {
       if ($menu_commands{$context}) {
         last;
-      } elsif ($preformatted_context_commands{$context}) {
+      } elsif ($self->{'preformatted_context_commands'}->{$context}) {
         $formatter->{'preformatted'} = 1;
         last;
       }
@@ -1143,7 +1148,7 @@
     delete $self->{'text_element_context'}->[-1]->{'counter'};
     $self->{'empty_lines_count'}++;
     if ($self->{'empty_lines_count'} <= 1
-        or $preformatted_context_commands{$self->{'context'}->[-1]}) {
+        or 
$self->{'preformatted_context_commands'}->{$self->{'context'}->[-1]}) {
       $result = "\n";
       $self->_add_text_count($result);
       $self->_add_lines_count(1);
@@ -1156,9 +1161,14 @@
   # process text
   if (defined($root->{'text'})) {
     if (!$formatter->{'_top_formatter'}) {
+      if ($root->{'type'} and $root->{'type'} eq 'raw') {
+        $result = $self->_count_added($formatter->{'container'},
+                    $formatter->{'container'}->add_next($root->{'text'}));
+      } else {
       $result = $self->_count_added($formatter->{'container'},
                     $formatter->{'container'}->add_text(
                        $self->_process_text($root, $formatter)));
+      }
       return $result;
     # the following is only possible if paragraphindent is set to asis
     } elsif ($root->{'type'} and $root->{'type'} eq 
'empty_spaces_before_paragraph') {
@@ -1589,12 +1599,21 @@
       # remark:
       # cartouche group and raggedright -> nothing on format stack
 
-      if ($preformatted_context_commands{$root->{'cmdname'}}) {
+      if ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}}) {
         push @{$self->{'context'}}, $root->{'cmdname'};
       } elsif ($flush_commands{$root->{'cmdname'}}) {
         push @{$self->{'context'}}, $root->{'cmdname'};
+      } elsif ($raw_commands{$root->{'cmdname'}}) {
+        if (!$self->{'formatters'}->[-1]->{'_top_formatter'}) {
+          $result .= $self->_count_added($formatter->{'container'},
+                              $formatter->{'container'}->add_pending_word(1));
+        } else {
+          push @{$self->{'context'}}, $root->{'cmdname'};
+          $self->{'format_context_commands'}->{$root->{'cmdname'}} = 1;
+          $self->{'preformatted_context_commands'}->{$root->{'cmdname'}} = 1;
+        }
       }
-      if ($format_context_commands{$root->{'cmdname'}}) {
+      if ($self->{'format_context_commands'}->{$root->{'cmdname'}}) {
         push @{$self->{'format_context'}}, 
              { 'cmdname' => $root->{'cmdname'},
                'paragraph_count' => 0,
@@ -1607,7 +1626,7 @@
         # preformatted context is not a classical preformatted 
         # command (ie if it is menu or verbatim, and not example or  
         # similar)
-        if ($preformatted_context_commands{$root->{'cmdname'}}
+        if ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}}
             and ! $preformatted_commands{$root->{'cmdname'}}) {
           $preformatted = $self->new_formatter('unfilled');
           push @{$self->{'formatters'}}, $preformatted;
@@ -1689,10 +1708,13 @@
         $self->{'setshortcontentsaftertitlepage'} = 0;
         $result .= $contents;
       }
-      if ($root->{'args'}) {
+      # FIXME use settitle
+      #if ($root->{'cmdname'} eq 'top' and 
address@hidden>{'extra'}->{'misc_content'}}) {
+      #}
+      if (@{$root->{'extra'}->{'misc_content'}}) {
         push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
         my $heading = $self->convert_line({'type' => 'frenchspacing',
-                         'contents' => [$root->{'args'}->[0]]});
+                         'contents' => $root->{'extra'}->{'misc_content'}});
         pop @{$self->{'count_context'}};
         # FIXME address@hidden and @c?
         my $heading_underlined = 
@@ -1808,7 +1830,7 @@
       $self->{'format_context'}->[-1]->{'paragraph_count'}++;
       return $result;
     } elsif ($root->{'cmdname'} eq 'exdent') {
-      if ($preformatted_context_commands{$self->{'context'}->[-1]}) {
+      if 
($self->{'preformatted_context_commands'}->{$self->{'context'}->[-1]}) {
         $result = $self->convert_unfilled({'contents' => 
$root->{'extra'}->{'misc_content'}},
          {'indent_level'
           => $self->{'format_context'}->[-1]->{'indent_level'} -1});
@@ -2375,16 +2397,21 @@
 
   
     # close the contexts and register the cells
-    if ($preformatted_context_commands{$root->{'cmdname'}}) {
+    if ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}}) {
       my $old_context = pop @{$self->{'context'}};
-      die if (!$preformatted_context_commands{$old_context});
+      die "Not a preformatted context: $old_context"
+        if (!$self->{'preformatted_context_commands'}->{$old_context});
+      delete ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}})
+       unless ($default_preformatted_context_commands{$root->{'cmdname'}});
     } elsif ($flush_commands{$root->{'cmdname'}}) {
       my $old_context = pop @{$self->{'context'}};
       die if (! $flush_commands{$old_context});
     }
 
-    if ($format_context_commands{$root->{'cmdname'}}) {
+    if ($self->{'format_context_commands'}->{$root->{'cmdname'}}) {
       pop @{$self->{'format_context'}};
+      delete ($self->{'format_context_commands'}->{$root->{'cmdname'}})
+       unless ($default_format_context_commands{$root->{'cmdname'}});
     } elsif ($cell) {
       pop @{$self->{'format_context'}};
       pop @{$self->{'text_element_context'}};

Index: t/info_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/info_tests.t,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/info_tests.t      20 Feb 2011 15:52:34 -0000      1.18
+++ t/info_tests.t      26 Feb 2011 10:52:59 -0000      1.19
@@ -282,6 +282,14 @@
 ['no_node_but_top',
 '@top top
 '],
+#['html_expanded',
+#'Before
address@hidden
+#html
address@hidden html
+#after.
+#',{'expanded_formats' => ['html']}
+#],
 );
 
 foreach my $test (@test_cases) {

Index: t/plaintext_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/plaintext_tests.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/plaintext_tests.t 19 Feb 2011 12:21:49 -0000      1.7
+++ t/plaintext_tests.t 26 Feb 2011 10:52:59 -0000      1.8
@@ -70,6 +70,13 @@
 after.
 ',{'expanded_formats' => ['html']}
 ],
+['isolated_html_expanded',
+'
address@hidden
+html
address@hidden html
+',{'expanded_formats' => ['html']}
+],
 ['space_at_menu_end',
 '@node Top
 

Index: t/results/plaintext_tests/html_expanded.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/html_expanded.pl  18 Feb 2011 00:34:44 -0000      
1.1
+++ t/results/plaintext_tests/html_expanded.pl  26 Feb 2011 10:52:59 -0000      
1.2
@@ -76,7 +76,8 @@
 
 
 
-$result_converted{'plaintext'}->{'html_expanded'} = 'Before html after.
+$result_converted{'plaintext'}->{'html_expanded'} = 'Before html
+after.
 ';
 
 1;

Index: t/results/sectioning/complex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/complex.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/complex.pl     21 Feb 2011 22:32:23 -0000      1.10
+++ t/results/sectioning/complex.pl     26 Feb 2011 10:53:00 -0000      1.11
@@ -386,7 +386,7 @@
         }
       ],
       'extra' => {
-        'missing_argument' => 1
+        'misc_content' => []
       },
       'level' => 0,
       'line_nr' => {
@@ -2768,8 +2768,7 @@
           'extra' => {
             'normalized' => 'Top'
           }
-        },
-        'missing_argument' => 1
+        }
       },
       'level' => 0,
       'section_childs' => [
@@ -2962,9 +2961,7 @@
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'missing_argument' => 1
-      },
+      'extra' => {},
       'level' => 0
     },
     'normalized' => 'Top'
@@ -3301,17 +3298,7 @@
 $result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'complex'};
 $result_menus{'complex'}{'menu_child'}{'menu_up'} = $result_menus{'complex'};
 
-$result_errors{'complex'} = [
-  {
-    'error_line' => ':2: @top missing argument
-',
-    'file_name' => '',
-    'line_nr' => 2,
-    'macro' => '',
-    'text' => '@top missing argument',
-    'type' => 'error'
-  }
-];
+$result_errors{'complex'} = [];
 
 
 1;

Index: t/results/sectioning/raiselowersections.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/sectioning/raiselowersections.pl  21 Feb 2011 22:32:23 -0000      
1.30
+++ t/results/sectioning/raiselowersections.pl  26 Feb 2011 10:53:00 -0000      
1.31
@@ -231,7 +231,7 @@
         }
       ],
       'extra' => {
-        'missing_argument' => 1
+        'misc_content' => []
       },
       'level' => 0,
       'line_nr' => {
@@ -1344,8 +1344,7 @@
           'extra' => {
             'normalized' => 'Top'
           }
-        },
-        'missing_argument' => 1
+        }
       },
       'level' => 0,
       'section_childs' => [
@@ -1447,9 +1446,7 @@
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'missing_argument' => 1
-      },
+      'extra' => {},
       'level' => 0
     },
     'normalized' => 'Top'
@@ -1631,17 +1628,7 @@
 $result_menus{'raiselowersections'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'raiselowersections'};
 $result_menus{'raiselowersections'}{'menu_child'}{'menu_up'} = 
$result_menus{'raiselowersections'};
 
-$result_errors{'raiselowersections'} = [
-  {
-    'error_line' => ':4: @top missing argument
-',
-    'file_name' => '',
-    'line_nr' => 4,
-    'macro' => '',
-    'text' => '@top missing argument',
-    'type' => 'error'
-  }
-];
+$result_errors{'raiselowersections'} = [];
 
 
 1;

Index: t/results/sectioning/top_no_argument_and_content.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_content.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/sectioning/top_no_argument_and_content.pl 24 Feb 2011 01:24:06 
-0000      1.1
+++ t/results/sectioning/top_no_argument_and_content.pl 26 Feb 2011 10:53:00 
-0000      1.2
@@ -45,7 +45,7 @@
         }
       ],
       'extra' => {
-        'missing_argument' => 1
+        'misc_content' => []
       },
       'level' => 0,
       'line_nr' => {
@@ -81,9 +81,7 @@
   'section_childs' => [
     {
       'cmdname' => 'top',
-      'extra' => {
-        'missing_argument' => 1
-      },
+      'extra' => {},
       'level' => 0,
       'section_up' => {}
     }
@@ -91,17 +89,7 @@
 };
 
$result_sectioning{'top_no_argument_and_content'}{'section_childs'}[0]{'section_up'}
 = $result_sectioning{'top_no_argument_and_content'};
 
-$result_errors{'top_no_argument_and_content'} = [
-  {
-    'error_line' => ':1: @top missing argument
-',
-    'file_name' => '',
-    'line_nr' => 1,
-    'macro' => '',
-    'text' => '@top missing argument',
-    'type' => 'error'
-  }
-];
+$result_errors{'top_no_argument_and_content'} = [];
 
 
 

Index: t/results/info_tests/html_expanded.pl
===================================================================
RCS file: t/results/info_tests/html_expanded.pl
diff -N t/results/info_tests/html_expanded.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/info_tests/html_expanded.pl       26 Feb 2011 10:52:59 -0000      
1.1
@@ -0,0 +1,94 @@
+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_trees{'html_expanded'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Before
+'
+        },
+        {
+          'cmdname' => 'html',
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'html
+',
+              'type' => 'raw'
+            }
+          ],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'parent' => {},
+          'text' => 'after.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'html_expanded'}{'contents'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'html_expanded'}{'contents'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'html_expanded'}{'contents'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'html_expanded'}{'contents'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'parent'} = 
$result_trees{'html_expanded'};
+
+$result_texis{'html_expanded'} = 'Before
address@hidden
+html
address@hidden html
+after.
+';
+
+
+$result_texts{'html_expanded'} = 'Before
+after.
+';
+
+$result_errors{'html_expanded'} = [];
+
+
+
+$result_converted{'info'}->{'html_expanded'} = 'This is , produced by makeinfo 
version 4.13 from .
+
+Before html after.
+';
+
+$result_converted_errors{'info'}->{'html_expanded'} = [
+  {
+    'error_line' => 'warning: Document without nodes.
+',
+    'text' => 'Document without nodes.',
+    'type' => 'warning'
+  }
+];
+
+
+1;

Index: t/results/plaintext_tests/isolated_html_expanded.pl
===================================================================
RCS file: t/results/plaintext_tests/isolated_html_expanded.pl
diff -N t/results/plaintext_tests/isolated_html_expanded.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/plaintext_tests/isolated_html_expanded.pl 26 Feb 2011 10:53:00 
-0000      1.1
@@ -0,0 +1,69 @@
+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_trees{'isolated_html_expanded'} = {
+  'contents' => [
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'html',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'parent' => {},
+          'text' => 'html
+',
+          'type' => 'raw'
+        }
+      ],
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 2,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'isolated_html_expanded'}{'contents'}[0]{'parent'} = 
$result_trees{'isolated_html_expanded'};
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'isolated_html_expanded'}{'contents'}[1];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'isolated_html_expanded'}{'contents'}[1];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'parent'} = 
$result_trees{'isolated_html_expanded'};
+$result_trees{'isolated_html_expanded'}{'contents'}[2]{'parent'} = 
$result_trees{'isolated_html_expanded'};
+
+$result_texis{'isolated_html_expanded'} = '
address@hidden
+html
address@hidden html
+';
+
+
+$result_texts{'isolated_html_expanded'} = '
+';
+
+$result_errors{'isolated_html_expanded'} = [];
+
+
+
+$result_converted{'plaintext'}->{'isolated_html_expanded'} = '
+html
+';
+
+1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]