texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co...
Date: Sat, 04 Jun 2011 17:02:23 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/06/04 17:02:23

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/Texinfo/Convert: Converter.pm HTML.pm Plaintext.pm 
        tp/t/results/coverage_braces: empty_ref.pl nested_args.pl 
                                      ref_in_style_command.pl 
                                      uref_in_ref.pl 
        tp/t/results/float: numbering_captions_listoffloats.pl 
        tp/t/results/info_tests: pxref_test.pl ref_tests.pl xref_test.pl 
        tp/t/results/sectioning: character_and_spaces_in_refs.pl 
                                 nodename_parentheses.pl 
                                 some_at_commands_in_ref_nodes.pl 

Log message:
        Factor out common code for float number and type formatting.
        Keep normalized node of external references.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.256&r2=1.257
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/empty_ref.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_args.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/pxref_test.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/ref_tests.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/xref_test.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodename_parentheses.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.34&r2=1.35

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -b -r1.256 -r1.257
--- Texinfo/Parser.pm   4 Jun 2011 08:11:37 -0000       1.256
+++ Texinfo/Parser.pm   4 Jun 2011 17:02:22 -0000       1.257
@@ -1831,13 +1831,13 @@
     my @type_contents = @{$current->{'args'}->[0]->{'contents'}};
     _trim_spaces_comment_from_content(address@hidden);
     if (@type_contents) {
-      my $normalized = 
Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' => 
address@hidden);
+      my $normalized 
+        = Texinfo::Convert::NodeNameNormalization::normalize_node(
+                                               {'contents' => address@hidden);
+      $current->{'extra'}->{'type'}->{'content'} = address@hidden;
       if ($normalized =~ /[^-]/) {
         $current->{'extra'}->{'type'}->{'normalized'} = $normalized;
-        $current->{'extra'}->{'type'}->{'content'} = address@hidden;
         return 1;
-      } else {
-        $current->{'extra'}->{'type'}->{'content'} = address@hidden;
       }
     }
   }
@@ -4099,15 +4099,10 @@
                                         $closed_command), $line_nr);
                 } else {
                   my $parsed_ref_node = 
_parse_node_manual($ref->{'args'}->[0]);
-                  $ref->{'extra'}->{'node_argument'}->{'node_content'} = 
-                       $parsed_ref_node->{'node_content'};
-                  if ($parsed_ref_node->{'manual_content'}) {
-                    $ref->{'extra'}->{'node_argument'}->{'manual_content'} =
-                       $parsed_ref_node->{'manual_content'};
-                  } elsif ($closed_command ne 'inforef' 
-                           and !defined($args[3]) and !defined($args[4])) {
-                    $ref->{'extra'}->{'node_argument'}->{'normalized'} = 
-                       $parsed_ref_node->{'normalized'};
+                  $ref->{'extra'}->{'node_argument'} = $parsed_ref_node;
+                  if ($closed_command ne 'inforef' 
+                           and !defined($args[3]) and !defined($args[4])
+                           and !$parsed_ref_node->{'manual_content'}) {
                     push @{$self->{'internal_references'}}, $ref;
                   }
                 }

Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Texinfo/Convert/Converter.pm        4 Jun 2011 11:28:51 -0000       1.20
+++ Texinfo/Convert/Converter.pm        4 Jun 2011 17:02:22 -0000       1.21
@@ -446,6 +446,34 @@
   return 1;
 }
 
+sub float_type_number($$)
+{
+  my $self = shift;
+  my $float = shift;
+
+  my $type;
+  if ($float->{'extra'}->{'type'}
+      and $float->{'extra'}->{'type'}->{'normalized'} ne '') { 
+    $type = {'contents' => $float->{'extra'}->{'type'}->{'content'}};
+  }
+
+  my $tree;
+  if ($type) {            
+    if (defined($float->{'number'})) {
+      $tree = $self->gdt("{float_type} {float_number}",
+          {'float_type' => $type,
+            'float_number' => $float->{'number'}});
+    } else {
+      $tree = $self->gdt("{float_type}",
+          {'float_type' => $type});
+    }
+  } elsif (defined($float->{'number'})) {
+    $tree = $self->gdt("{float_number}",
+       {'float_number' => $float->{'number'}});
+  }
+  return $tree;
+}
+
 sub xml_protect_text($$)
 {
   my $self = shift;

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- Texinfo/Convert/HTML.pm     4 Jun 2011 11:28:51 -0000       1.78
+++ Texinfo/Convert/HTML.pm     4 Jun 2011 17:02:22 -0000       1.79
@@ -421,28 +421,7 @@
         $tree = {'type' => '_code',
                  'contents' => $command->{'extra'}->{'node_content'}};
       } elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
-        
-        my $type;
-        if ($command->{'extra'}->{'type'} 
-            and defined($command->{'extra'}->{'type'}->{'normalized'})
-            and $command->{'extra'}->{'type'}->{'normalized'} ne '') {
-          $type = {'contents' => $command->{'extra'}->{'type'}->{'content'}};
-        }
-        if ($type) {
-          if (defined($command->{'number'})) {
-            $tree = $self->gdt("{float_type} {float_number}",
-                  {'float_type' => $type,
-                    'float_number' => $command->{'number'}});
-          } else {
-            $tree = $self->gdt("{float_type}",
-                  {'float_type' => $type});
-          }
-        } elsif (defined($command->{'number'})) {
-          $tree = $self->gdt("{float_number}",
-             {'float_number' => $command->{'number'}});
-        } else {
-          die "float target ($command->{'normalized'}) without number nor 
type";
-        }
+        $tree = $self->float_type_number($command); 
       } else {
         if (!$command->{'extra'}->{'misc_content'}) {
           cluck "No misc_content: "
@@ -2474,6 +2453,7 @@
     $name = $args->[1]->{'normal'}
   }
 
+  # internal reference
   if ($root->{'extra'}->{'node_argument'}
       and $root->{'extra'}->{'node_argument'}->{'normalized'}
       and !$root->{'extra'}->{'node_argument'}->{'manual_content'}
@@ -2531,6 +2511,8 @@
     my $node_entry = {};
     $node_entry->{'node_content'} = 
$root->{'extra'}->{'node_argument'}->{'node_content'}
       if ($root->{'extra'}->{'node_argument'}->{'node_content'});
+    $node_entry->{'normalized'} = 
$root->{'extra'}->{'node_argument'}->{'normalized'} 
+      if (exists($root->{'extra'}->{'node_argument'}->{'normalized'}));
 
     my $file_arg_tree;
     my $file = '';
@@ -2610,7 +2592,7 @@
         $tree = $self->gdt('@cite{{book}}', 
               {'book' => {'type' => '_converted', 'text' => $book }});
       } elsif ($href ne '') {
-        $tree = $self->gdt('See {reference}', 
+        $tree = $self->gdt('{reference}', 
              { 'reference' => {'type' => '_converted', 'text' => $reference} 
});
       } elsif ($reference ne '') {
         $tree = $self->gdt('`{section}\'', {
@@ -3849,8 +3831,9 @@
                         and !$self->get_conf('USE_UNIDECODE'));
 
   my ($target, $id);
-  if (defined($node_info->{'normalized'})) {
-    $target = _normalized_to_id($node_info->{'normalized'});
+  my $normalized = $node_info->{'normalized'};
+  if (defined($normalized)) {
+    $target = _normalized_to_id($normalized);
   } else {
     # FIXME Top or configuration variable?
     $target = '';
@@ -4554,6 +4537,8 @@
   
   #print STDERR "external_node: ".join('|', keys(%$external_node))."\n";
   my ($target_filebase, $target, $id) = $self->_node_id_file($external_node);
+  #print STDERR "HHHH 
".Texinfo::Structuring::_node_extra_to_texi($external_node)."\n";
+  #print STDERR "EEEE $target_filebase, $target\n";
 
   my $xml_target = _normalized_to_id($target);
 

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- Texinfo/Convert/Plaintext.pm        4 Jun 2011 08:11:37 -0000       1.141
+++ Texinfo/Convert/Plaintext.pm        4 Jun 2011 17:02:22 -0000       1.142
@@ -1416,12 +1416,9 @@
         # FIXME as a consequence, the line numbers appearing in case of errors
         # correspond to the node lines numbers, and not the @ref.
         my $node_content;
-        if ($root->{'extra'}->{'node_argument'} 
-            and $root->{'extra'}->{'node_argument'}->{'normalized'}
-            and !$root->{'extra'}->{'node_argument'}->{'manual_content'}
-            and $self->{'labels'}
-            and 
$self->{'labels'}->{$root->{'extra'}->{'node_argument'}->{'normalized'}}) {
-          $node_content = 
$self->{'labels'}->{$root->{'extra'}->{'node_argument'}->{'normalized'}}->{'extra'}->{'node_content'};
+        if ($root->{'extra'}
+            and $root->{'extra'}->{'label'}) {
+          $node_content = 
$root->{'extra'}->{'label'}->{'extra'}->{'node_content'};
         } else { 
           $node_content = $args[0];
         }
@@ -1429,31 +1426,13 @@
         # if it a reference to a float with a label, $arg[1] is
         # set to '$type $number' or '$number' if there is no type.
         if (! defined($args[1]) 
-            and $root->{'extra'}->{'node_argument'} 
-            and $root->{'extra'}->{'node_argument'}->{'normalized'}
-            and $self->{'labels'}
-            and 
$self->{'labels'}->{$root->{'extra'}->{'node_argument'}->{'normalized'}}
-            and 
$self->{'labels'}->{$root->{'extra'}->{'node_argument'}->{'normalized'}}->{'cmdname'}
 eq 'float') {
-          my $float = 
$self->{'labels'}->{$root->{'extra'}->{'node_argument'}->{'normalized'}};
-          my $type;
-          if ($float->{'extra'}->{'type'}) {
-            $type = {'contents' => $float->{'extra'}->{'type'}->{'content'}};
-          }
+            and $root->{'extra'}
+            and $root->{'extra'}->{'label'}
+            and $root->{'extra'}->{'label'}->{'cmdname'}
+            and $root->{'extra'}->{'label'}->{'cmdname'} eq 'float') {
+          my $float = $root->{'extra'}->{'label'};
 
-          my $name;
-          if ($type) {            
-            if (defined($float->{'number'})) {
-              $name = $self->gdt("{float_type} {float_number}",
-                  {'float_type' => $type,
-                    'float_number' => $float->{'number'}});
-            } else {
-              $name = $self->gdt("{float_type}",
-                  {'float_type' => $type});
-            }
-          } elsif (defined($float->{'number'})) {
-            $name = $self->gdt("{float_number}",
-               {'float_number' => $float->{'number'}});
-          }
+          my $name = $self->float_type_number($float);;
           $args[1] = $name->{'contents'};
         }
         if ($command eq 'inforef' and scalar(@args) == 3) {

Index: t/results/coverage_braces/empty_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/empty_ref.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/empty_ref.pl      6 Mar 2011 14:44:00 -0000       
1.2
+++ t/results/coverage_braces/empty_ref.pl      4 Jun 2011 17:02:22 -0000       
1.3
@@ -105,7 +105,8 @@
             'node_argument' => {
               'node_content' => [
                 {}
-              ]
+              ],
+              'normalized' => '_00c2_00a0'
             }
           },
           'line_nr' => {},

Index: t/results/coverage_braces/nested_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/coverage_braces/nested_args.pl    6 Mar 2011 14:44:01 -0000       
1.22
+++ t/results/coverage_braces/nested_args.pl    4 Jun 2011 17:02:22 -0000       
1.23
@@ -175,7 +175,8 @@
                 {},
                 {},
                 {}
-              ]
+              ],
+              'normalized' => '_0040-in-samp'
             }
           },
           'line_nr' => {},

Index: t/results/coverage_braces/ref_in_style_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage_braces/ref_in_style_command.pl   6 Mar 2011 14:44:01 
-0000       1.4
+++ t/results/coverage_braces/ref_in_style_command.pl   4 Jun 2011 17:02:22 
-0000       1.5
@@ -45,7 +45,8 @@
                           'parent' => {},
                           'text' => 'other node'
                         }
-                      ]
+                      ],
+                      'normalized' => 'other-node'
                     }
                   },
                   'line_nr' => {

Index: t/results/coverage_braces/uref_in_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage_braces/uref_in_ref.pl    6 Mar 2011 14:44:01 -0000       
1.3
+++ t/results/coverage_braces/uref_in_ref.pl    4 Jun 2011 17:02:22 -0000       
1.4
@@ -269,7 +269,8 @@
                   'parent' => {},
                   'text' => 'node'
                 }
-              ]
+              ],
+              'normalized' => 'node'
             }
           },
           'line_nr' => {},

Index: t/results/float/numbering_captions_listoffloats.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/float/numbering_captions_listoffloats.pl  4 Jun 2011 08:11:39 
-0000       1.21
+++ t/results/float/numbering_captions_listoffloats.pl  4 Jun 2011 17:02:22 
-0000       1.22
@@ -5872,7 +5872,8 @@
                 'node_argument' => {
                   'node_content' => [
                     {}
-                  ]
+                  ],
+                  'normalized' => 'text-with-a-lot-of-features'
                 }
               },
               'line_nr' => {
@@ -5985,7 +5986,8 @@
                 'node_argument' => {
                   'node_content' => [
                     {}
-                  ]
+                  ],
+                  'normalized' => 'text-with-a-lot-of-features'
                 }
               },
               'line_nr' => {

Index: t/results/info_tests/pxref_test.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/pxref_test.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/info_tests/pxref_test.pl  4 Jun 2011 08:11:40 -0000       1.1
+++ t/results/info_tests/pxref_test.pl  4 Jun 2011 17:02:23 -0000       1.2
@@ -85,7 +85,8 @@
                       'parent' => {},
                       'text' => ' in pxref'
                     }
-                  ]
+                  ],
+                  'normalized' => '-in-pxref'
                 }
               },
               'line_nr' => {
@@ -149,7 +150,8 @@
                       'parent' => {},
                       'text' => ' in pxref'
                     }
-                  ]
+                  ],
+                  'normalized' => '-in-pxref'
                 }
               },
               'line_nr' => {},

Index: t/results/info_tests/ref_tests.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/info_tests/ref_tests.pl   4 Jun 2011 08:11:40 -0000       1.6
+++ t/results/info_tests/ref_tests.pl   4 Jun 2011 17:02:23 -0000       1.7
@@ -88,7 +88,8 @@
                       'parent' => {},
                       'text' => 'in ref followed by comma'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-followed-by-comma'
                 }
               },
               'line_nr' => {
@@ -136,7 +137,8 @@
                       'parent' => {},
                       'text' => 'in ref not followed by comma'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-not-followed-by-comma'
                 }
               },
               'line_nr' => {
@@ -188,7 +190,8 @@
                               'parent' => {},
                               'text' => 'in ref followed by end command'
                             }
-                          ]
+                          ],
+                          'normalized' => 'in-ref-followed-by-end-command'
                         }
                       },
                       'line_nr' => {
@@ -281,7 +284,8 @@
                       'parent' => {},
                       'text' => 'in ref followed by comma'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-followed-by-comma'
                 }
               },
               'line_nr' => {
@@ -346,7 +350,8 @@
                       'parent' => {},
                       'text' => 'in ref not followed by comma'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-not-followed-by-comma'
                 }
               },
               'line_nr' => {
@@ -415,7 +420,8 @@
                               'parent' => {},
                               'text' => 'in ref followed by end command'
                             }
-                          ]
+                          ],
+                          'normalized' => 'in-ref-followed-by-end-command'
                         }
                       },
                       'line_nr' => {
@@ -490,7 +496,8 @@
                       'parent' => {},
                       'text' => 'in ref ending with a dot.'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-ending-with-a-dot_002e'
                 }
               },
               'line_nr' => {

Index: t/results/info_tests/xref_test.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/info_tests/xref_test.pl   4 Jun 2011 08:11:41 -0000       1.5
+++ t/results/info_tests/xref_test.pl   4 Jun 2011 17:02:23 -0000       1.6
@@ -88,7 +88,8 @@
                       'parent' => {},
                       'text' => 'in xref'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-xref'
                 }
               },
               'line_nr' => {
@@ -135,7 +136,8 @@
                       'parent' => {},
                       'text' => 'bad xref'
                     }
-                  ]
+                  ],
+                  'normalized' => 'bad-xref'
                 }
               },
               'line_nr' => {},
@@ -183,7 +185,8 @@
                               'parent' => {},
                               'text' => 'bad nested xref'
                             }
-                          ]
+                          ],
+                          'normalized' => 'bad-nested-xref'
                         }
                       },
                       'line_nr' => {
@@ -258,7 +261,8 @@
                       'parent' => {},
                       'text' => 'in ref ending with a dot.'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-ending-with-a-dot_002e'
                 }
               },
               'line_nr' => {
@@ -306,7 +310,8 @@
                       'parent' => {},
                       'text' => 'in ref followed by symbol'
                     }
-                  ]
+                  ],
+                  'normalized' => 'in-ref-followed-by-symbol'
                 }
               },
               'line_nr' => {

Index: t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/sectioning/character_and_spaces_in_refs.pl        4 Jun 2011 
08:11:51 -0000       1.36
+++ t/results/sectioning/character_and_spaces_in_refs.pl        4 Jun 2011 
17:02:23 -0000       1.37
@@ -325,7 +325,8 @@
                 'node_argument' => {
                   'node_content' => [
                     {}
-                  ]
+                  ],
+                  'normalized' => 'a-node'
                 }
               },
               'line_nr' => {
@@ -389,7 +390,8 @@
                 'node_argument' => {
                   'node_content' => [
                     {}
-                  ]
+                  ],
+                  'normalized' => '_003a'
                 }
               },
               'line_nr' => {
@@ -466,7 +468,8 @@
                 'node_argument' => {
                   'node_content' => [
                     {}
-                  ]
+                  ],
+                  'normalized' => 'Top'
                 }
               },
               'line_nr' => {
@@ -514,7 +517,8 @@
                       'parent' => {},
                       'text' => 'Cross References'
                     }
-                  ]
+                  ],
+                  'normalized' => 'Cross-References'
                 }
               },
               'line_nr' => {
@@ -582,7 +586,8 @@
                 'node_argument' => {
                   'node_content' => [
                     {}
-                  ]
+                  ],
+                  'normalized' => 'node'
                 }
               },
               'line_nr' => {

Index: t/results/sectioning/nodename_parentheses.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/sectioning/nodename_parentheses.pl        4 Jun 2011 08:11:52 
-0000       1.38
+++ t/results/sectioning/nodename_parentheses.pl        4 Jun 2011 17:02:23 
-0000       1.39
@@ -633,7 +633,8 @@
                       'parent' => {},
                       'text' => 'node'
                     }
-                  ]
+                  ],
+                  'normalized' => 'node'
                 }
               },
               'line_nr' => {

Index: t/results/sectioning/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl       4 Jun 2011 
08:11:53 -0000       1.34
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl       4 Jun 2011 
17:02:23 -0000       1.35
@@ -1059,7 +1059,8 @@
                     {},
                     {},
                     {}
-                  ]
+                  ],
+                  'normalized' => 
'a-strong-ref-with-SC_002c-a-i-trema-_00ef_002c-a-dotless-i-trema-_00ef-_1e14-and-exclamdown-_00a1'
                 }
               },
               'line_nr' => {},



reply via email to

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