texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Common.pm Texinfo/Report.pm ...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Common.pm Texinfo/Report.pm ...
Date: Tue, 01 Nov 2011 16:08:21 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/01 16:08:21

Modified files:
        tp/Texinfo     : Common.pm Report.pm 
        tp/Texinfo/Convert: Converter.pm DocBook.pm Info.pm Plaintext.pm 
                            Text.pm 
        tp/init        : chm.pm 
        tp/t           : languages.t 
Added files:
        tp/t/results/languages: appendix_translated.pl 

Log message:
        Translate 'Appendix' in headings in Convert::Text if possible.  Add a 
mode
        argument to gdt to pass that the string is not to be considered as 
texinfo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Report.pm?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.181&r2=1.182
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/chm.pm?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/languages.t?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/appendix_translated.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Texinfo/Common.pm   1 Nov 2011 12:01:26 -0000       1.88
+++ Texinfo/Common.pm   1 Nov 2011 16:08:19 -0000       1.89
@@ -49,6 +49,7 @@
 expand_verbatiminclude
 definition_category
 expand_today
+numbered_heading
 trim_spaces_comment_from_content
 float_name_caption
 normalize_top_node_name
@@ -906,6 +907,44 @@
             'day' => $mday, 'year' => $year });
 }
 
+sub numbered_heading($$$;$)
+{
+  my $self = shift;
+  my $current = shift;
+  my $text = shift;
+  my $numbered = shift;
+
+  my $number;
+  if (defined($current->{'number'}) and ($numbered or !defined($numbered))) {
+    $number = $current->{'number'};
+  }
+
+  my $result;
+  if ($self) {
+    if (defined($number)) {
+      if ($current->{'cmdname'} eq 'appendix' and $current->{'level'} == 1) {
+        $result = $self->gdt('Appendix {number} {section_title}',
+                   {'number' => $number, 'section_title' => $text}, 
+                   'translated_text');
+      } else {
+        $result = $self->gdt('{number} {section_title}',
+                   {'number' => $number, 'section_title' => $text},
+                   'translated_text');
+      }
+    } else {
+      $result = $text;
+    }
+  } else {
+    $result = $text;
+    $result = $number.' '.$result if (defined($number));
+    if ($current->{'cmdname'} eq 'appendix' and $current->{'level'} == 1) {
+      $result = 'Appendix '.$result;
+    }
+  }
+  chomp ($result);
+  return $result;
+}
+
 sub definition_arguments_content($)
 {
   my $root = shift;
@@ -1451,6 +1490,15 @@
 returns a texinfo tree corresponding to the category of the
 I<$def_line> taking the class into account, if there is one.
 
+=item $result = numbered_heading ($converter, $heading_element, $heading_text, 
$do_number)
+
+The I<$converter> argument may be undef.  I<$heading_element> is 
+a heading command tree element.  I<$heading_text> is the already 
+formatted heading text.  if the I<$do_number> optional argument is 
+defined and false, no number is used and the text is returned as is.
+This function returns the heading with a number and the appendix 
+part if needed.
+
 =item ($caption, $prepended) = float_name_caption ($converter, $float)
 
 I<$float> is a texinfo tree C<@float> element.  This function 

Index: Texinfo/Report.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Report.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Texinfo/Report.pm   30 Oct 2011 23:03:32 -0000      1.16
+++ Texinfo/Report.pm   1 Nov 2011 16:08:19 -0000       1.17
@@ -197,7 +197,7 @@
   my $self = shift;
   my $message = shift;
   my $context = shift;
-  my $conf = shift;
+  my $type = shift;
 
   my $re = join '|', map { quotemeta $_ } keys %$context
       if (defined($context) and ref($context));
@@ -291,6 +291,14 @@
 #  $saved_str_LANG = 'UNDEF' if (!defined($saved_str_LANG));
 #  print STDERR "  LANG $saved_str_LANG $new_LANG\n";
 
+  if ($type and $type eq 'translated_text') {
+    if (defined($re)) {
+      # next line taken from libintl perl, copyright Guido. sub __expand
+      $translation_result =~ s/\{($re)\}/defined $context->{$1} ? 
$context->{$1} : "{$1}"/ge;
+    }
+    return $translation_result;
+  }
+
   my $parser_conf;
   # we change the substituted brace-enclosed strings to values, that
   # way they are substituted, including when they are Texinfo trees.
@@ -330,7 +338,7 @@
 
   my $tree;
   # Right now this is not used anywhere.
-  if ($conf->{'translated_paragraph'}) {
+  if ($type and $type eq 'translated_paragraph') {
     $tree = $parser->parse_texi_text($translation_result);
   } else {
     $tree = $parser->parse_texi_line($translation_result);
@@ -397,19 +405,38 @@
 
 =over
 
-=item $tree = $converter->gdt($string, $replaced_substrings)
+=item $tree = $converter->gdt($string, $replaced_substrings, $mode)
 
-The I<$string> is a string to be translated.  The function returns a 
-Texinfo tree, as the string is interpreted as Texinfo code after
+The I<$string> is a string to be translated.  In the default case, 
+the function returns a Texinfo tree, as the string is 
+interpreted as Texinfo code after
 translation.  I<$replaced_substrings> is an optional 
 hash reference specifying some 
 substitution to be done after the translation.  The key of 
 the I<$replaced_substrings> hash reference identifies what is to 
-be substituted, the value is some texinfo tree or array content 
+be substituted, the value is some string, texinfo tree or array content 
 that is substituted in the resulting texinfo tree.
 In the string to be translated word in brace matching keys of 
 I<$replaced_substrings> are replaced.
 
+I<$mode> is an optional string which may modify how the function
+behave.  The possible values are
+
+=over 
+
+=item translated_text
+
+In that case the string is not considered to be Texinfo, a plain string
+that is returned after translation and substitution.  The substitutions
+may only be strings in that case.
+
+=item translated_paragraph
+
+In that case, the parsing of the Texinfo string is done in a 
+context of a paragraph, not in the context of an inline text.
+
+=back
+
 For example in the following call, the string 
 I<See {reference} in @cite{{book}}> is translated, then
 parsed as a Texinfo string, with I<{reference}> substituted by

Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- Texinfo/Convert/Converter.pm        1 Nov 2011 12:01:28 -0000       1.61
+++ Texinfo/Convert/Converter.pm        1 Nov 2011 16:08:19 -0000       1.62
@@ -80,6 +80,7 @@
 # This is the default, mainly for tests; the caller should set them.  These
 # values are what is used in tests of the Converters.
   'PACKAGE_AND_VERSION'  => 'texinfo',
+  'PACKAGE_VERSION'      => '',
   'PACKAGE_URL'          => 'http://www.gnu.org/software/texinfo/',
   'PROGRAM'              => 'tp',
 

Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- Texinfo/Convert/DocBook.pm  1 Nov 2011 12:26:00 -0000       1.28
+++ Texinfo/Convert/DocBook.pm  1 Nov 2011 16:08:20 -0000       1.29
@@ -779,19 +779,18 @@
             if ($book_contents or $manual_file_contents) {
               return '' if (!$book_contents);
               if ($root->{'cmdname'} eq 'ref') {
-                # FIXME drop the asis?
                 return $self->_convert(
-                  $self->gdt('section address@hidden'@asis{}\' in 
@cite{{book}}',
+                  $self->gdt('section ``{section_name}\'\' in @cite{{book}}',
                     { 'section_name' => {'contents' => $section_name_contents},
                       'book' => $book_contents }));
               } elsif ($root->{'cmdname'} eq 'xref') {
                 return $self->_convert(
-                  $self->gdt('See section address@hidden'@asis{}\' in 
@cite{{book}}',
+                  $self->gdt('See section ``{section_name}\'\' in 
@cite{{book}}',
                     { 'section_name' => {'contents' => $section_name_contents},
                       'book' => $book_contents }));
               } elsif ($root->{'cmdname'} eq 'pxref') {
                 return $self->_convert(
-                  $self->gdt('see section address@hidden'@asis{}\' in 
@cite{{book}}',
+                  $self->gdt('see section ``{section_name}\'\' in 
@cite{{book}}',
                     { 'section_name' => {'contents' => $section_name_contents},
                       'book' => $book_contents }));
               }

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- Texinfo/Convert/Info.pm     1 Nov 2011 12:26:00 -0000       1.69
+++ Texinfo/Convert/Info.pm     1 Nov 2011 16:08:20 -0000       1.70
@@ -221,7 +221,6 @@
 
   $self->_set_global_multiple_commands();
   my $paragraph = Texinfo::Convert::Paragraph->new();
-  #my $result = $paragraph->add_text($text);
   my $result = $paragraph->add_text("This is ");
   # This ensures that spaces in file are kept.
   $result .= $paragraph->add_next($self->{'output_filename'});

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- Texinfo/Convert/Plaintext.pm        1 Nov 2011 12:01:31 -0000       1.181
+++ Texinfo/Convert/Plaintext.pm        1 Nov 2011 16:08:20 -0000       1.182
@@ -1558,7 +1558,8 @@
                'contents' => [$root->{'args'}->[0]]});
       pop @{$self->{'count_context'}};
       $result = Texinfo::Convert::Text::heading({'level' => 0, 
-        'cmdname' => 'titlefont'}, $result, 
$self->get_conf('NUMBER_SECTIONS'));
+        'cmdname' => 'titlefont'}, $result, $self, 
+        $self->get_conf('NUMBER_SECTIONS'));
       $self->{'empty_lines_count'} = 0 unless ($result eq '');
       $self->_add_text_count($result);
       $self->_add_lines_count(2);
@@ -1728,7 +1729,7 @@
         # @* leads to an end of line, underlying appears on the line below
         # over one line
         my $heading_underlined = 
-             Texinfo::Convert::Text::heading ($root, $heading, 
+             Texinfo::Convert::Text::heading ($root, $heading, $self,
                                               
$self->get_conf('NUMBER_SECTIONS'));
         $result .= $self->_add_newline_if_needed();
         $self->{'empty_lines_count'} = 0 unless ($heading_underlined eq '');

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- Texinfo/Convert/Text.pm     22 Oct 2011 19:56:26 -0000      1.75
+++ Texinfo/Convert/Text.pm     1 Nov 2011 16:08:20 -0000       1.76
@@ -78,7 +78,7 @@
                'dots'         => '...',
                'enddots'      => '...',
                'equiv'        => '==',
-# FIXME i18n
+# FIXME(Karl) i18n?
                'error'        => 'error-->',
                'expansion'    => '==>',
                'arrow'        => '->',
@@ -262,29 +262,15 @@
   4 => '.'
 );
 
-sub numbered_heading($$$)
+sub heading($$$;$)
 {
   my $current = shift;
   my $text = shift;
+  my $converter = shift;
   my $numbered = shift;
 
-  $text = $current->{'number'}.' '.$text if (defined($current->{'number'}) 
-                                         and ($numbered or 
!defined($numbered)));
-  if ($current->{'cmdname'} eq 'appendix' and $current->{'level'} == 1) {
-    # FIXME i18n
-    $text = 'Appendix '.$text;
-  }
-  chomp ($text);
-  return $text;
-}
-
-sub heading($$$)
-{
-  my $current = shift;
-  my $text = shift;
-  my $numbered = shift;
-
-  $text = numbered_heading($current, $text, $numbered);
+  $text = Texinfo::Common::numbered_heading($converter, $current, $text, 
+                                            $numbered);
   return '' if ($text !~ /\S/);
   my $result = $text ."\n";
   $result .=($underline_symbol{$current->{'level'}} 
@@ -451,7 +437,8 @@
       } elsif ($root->{'cmdname'} ne 'node') {
         $result = convert($root->{'args'}->[0], $options);
         if ($Texinfo::Common::sectioning_commands{$root->{'cmdname'}}) {
-          $result = heading ($root, $result, $options->{'NUMBER_SECTIONS'});
+          $result = heading ($root, $result, $options->{'converter'}, 
+                             $options->{'NUMBER_SECTIONS'});
         } else {
         # we always want an end of line even if is was eaten by a 
           chomp ($result);

Index: init/chm.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/chm.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- init/chm.pm 30 Oct 2011 10:13:20 -0000      1.6
+++ init/chm.pm 1 Nov 2011 16:08:20 -0000       1.7
@@ -362,7 +362,7 @@
       }
       my $text = convert_tree($self,
               {'contents' => $section->{'extra'}->{'misc_content'}});
-      $text = Texinfo::Convert::Text::numbered_heading($section, $text,
+      $text = $self->Texinfo::Common::numbered_heading($section, $text,
                           $self->get_conf('NUMBER_SECTIONS')); 
       my $file = $self->command_filename($section);
       my $anchor = $self->command_target($section);

Index: t/languages.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/languages.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/languages.t       30 Sep 2011 22:31:31 -0000      1.3
+++ t/languages.t       1 Nov 2011 16:08:20 -0000       1.4
@@ -32,10 +32,23 @@
 @end defivar
 
 @insertcopying
-']);
+'],
+['appendix_translated',
+'@documentlanguage fr
+
address@hidden Top
address@hidden top
+
address@hidden dernier
+
address@hidden
+'
+],
+);
 
 my %info_tests = (
   'multiple' => 1,
+  'appendix_translated' => 1,
 );
 
 foreach my $test (@test_cases) {

Index: t/results/languages/appendix_translated.pl
===================================================================
RCS file: t/results/languages/appendix_translated.pl
diff -N t/results/languages/appendix_translated.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/languages/appendix_translated.pl  1 Nov 2011 16:08:21 -0000       
1.1
@@ -0,0 +1,437 @@
+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{'appendix_translated'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'fr'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'documentlanguage',
+          'extra' => {
+            'text_arg' => 'fr'
+          },
+          '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' => 'Top'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'contents' => [],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 3,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      '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' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'misc_content' => [
+          {}
+        ]
+      },
+      'level' => 0,
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 4,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'dernier'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'appendix',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'contents',
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'misc_content' => [
+          {}
+        ]
+      },
+      'level' => 1,
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 6,
+        'macro' => ''
+      },
+      'number' => 'A',
+      'parent' => {}
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[0];
+$result_trees{'appendix_translated'}{'contents'}[0]{'parent'} = 
$result_trees{'appendix_translated'};
+$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'appendix_translated'}{'contents'}[1];
+$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[1];
+$result_trees{'appendix_translated'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'appendix_translated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = $result_trees{'appendix_translated'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'appendix_translated'}{'contents'}[1]{'parent'} = 
$result_trees{'appendix_translated'};
+$result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'appendix_translated'}{'contents'}[2];
+$result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[2];
+$result_trees{'appendix_translated'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[2];
+$result_trees{'appendix_translated'}{'contents'}[2]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'appendix_translated'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'appendix_translated'}{'contents'}[2]{'parent'} = 
$result_trees{'appendix_translated'};
+$result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'appendix_translated'}{'contents'}[3];
+$result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0];
+$result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[3];
+$result_trees{'appendix_translated'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[3];
+$result_trees{'appendix_translated'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'appendix_translated'}{'contents'}[3];
+$result_trees{'appendix_translated'}{'contents'}[3]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'appendix_translated'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'appendix_translated'}{'contents'}[3]{'parent'} = 
$result_trees{'appendix_translated'};
+
+$result_texis{'appendix_translated'} = '@documentlanguage fr
+
address@hidden Top
address@hidden top
+
address@hidden dernier
+
address@hidden
+';
+
+
+$result_texts{'appendix_translated'} = '
+top
+***
+
+Appendix A dernier
+******************
+
+';
+
+$result_sectioning{'appendix_translated'} = {
+  'level' => -1,
+  'section_childs' => [
+    {
+      'cmdname' => 'top',
+      'extra' => {
+        'associated_node' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Top'
+          }
+        }
+      },
+      'level' => 0,
+      'section_childs' => [
+        {
+          'cmdname' => 'appendix',
+          'extra' => {},
+          'level' => 1,
+          'number' => 'A',
+          'section_up' => {},
+          'toplevel_prev' => {}
+        }
+      ],
+      'section_up' => {}
+    }
+  ]
+};
+$result_sectioning{'appendix_translated'}{'section_childs'}[0]{'section_childs'}[0]{'section_up'}
 = $result_sectioning{'appendix_translated'}{'section_childs'}[0];
+$result_sectioning{'appendix_translated'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_prev'}
 = $result_sectioning{'appendix_translated'}{'section_childs'}[0];
+$result_sectioning{'appendix_translated'}{'section_childs'}[0]{'section_up'} = 
$result_sectioning{'appendix_translated'};
+
+$result_nodes{'appendix_translated'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'level' => 0
+    },
+    'normalized' => 'Top'
+  },
+  'node_up' => {
+    'extra' => {
+      'manual_content' => [
+        {
+          'text' => 'dir'
+        }
+      ],
+      'top_node_up' => {}
+    },
+    'type' => 'top_node_up'
+  }
+};
+$result_nodes{'appendix_translated'}{'node_up'}{'extra'}{'top_node_up'} = 
$result_nodes{'appendix_translated'};
+
+$result_menus{'appendix_translated'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  }
+};
+
+$result_errors{'appendix_translated'} = [];
+
+
+
+$result_converted{'plaintext'}->{'appendix_translated'} = 'top
+***
+
+Appendice A dernier
+*******************
+
+top
+Appendice A dernier
+';
+
+
+$result_converted{'info'}->{'appendix_translated'} = 'This is , produced by tp 
version from .
+
+
+File: ,  Node: Top,  Up: (dir)
+
+top
+***
+
+Appendice A dernier
+*******************
+
+
+
+Tag Table:
+Node: Top41
+
+End Tag Table
+';
+
+
+$result_converted{'html'}->{'appendix_translated'} = '<!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>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="tp">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table des mati&egrave;res">
+<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="fr" bgcolor="#FFFFFF" text="#000000" link="#0000FF" 
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<a name="top"></a>
+<h1 class="top">top</h1>
+
+<a name="dernier"></a>
+<h2 class="appendix">Appendice A dernier</h2>
+
+<a name="SEC_Contents"></a>
+<h1>Table des mati&egrave;res</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+  <li><a name="toc-dernier" href="#dernier">Appendice A dernier</a></li>
+</ul>
+</div>
+
+<hr>
+<p>
+
+
+</p>
+</body>
+</html>
+';
+
+1;



reply via email to

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