texinfo-commits
[Top][All Lists]
Advanced

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

[7488] don't record normalized for float


From: gavinsmith0123
Subject: [7488] don't record normalized for float
Date: Tue, 1 Nov 2016 11:20:36 +0000 (UTC)

Revision: 7488
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7488
Author:   gavin
Date:     2016-11-01 11:20:36 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
don't record normalized for float

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Converter.pm
    trunk/tp/Texinfo/Convert/DocBook.pm
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/Texinfo/Convert/TexinfoXML.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/Structuring.pm
    trunk/tp/t/results/converters_tests/things_before_setfilename.pl
    trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
    trunk/tp/t/results/coverage/block_commands.pl
    trunk/tp/t/results/coverage/punctuation_in_line_commands.pl
    trunk/tp/t/results/coverage_braces/test_image.pl
    trunk/tp/t/results/float/anchor_in_caption.pl
    trunk/tp/t/results/float/cindex_in_caption.pl
    trunk/tp/t/results/float/comment_space_comand_in_float.pl
    trunk/tp/t/results/float/complex_float.pl
    trunk/tp/t/results/float/empty_listoffloats_with_floats.pl
    trunk/tp/t/results/float/float_copying.pl
    trunk/tp/t/results/float/float_with_at_commands.pl
    trunk/tp/t/results/float/footnote_in_caption.pl
    trunk/tp/t/results/float/footnote_in_caption_and_error.pl
    trunk/tp/t/results/float/numbering_captions_listoffloats.pl
    trunk/tp/t/results/float/ref_to_float.pl
    trunk/tp/t/results/float/simple.pl
    trunk/tp/t/results/info_tests/error_in_footnote.pl
    trunk/tp/t/results/info_tests/float_long_captions.pl
    trunk/tp/t/results/invalid_nestings/float_in_style_command.pl
    trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
    trunk/tp/t/results/paragraph/commands_in_flushright.pl
    trunk/tp/t/results/sectioning/double_node_anchor_float.pl
    trunk/tp/t/results/sectioning/equivalent_labels.pl
    trunk/tp/t/results/sectioning/no_element.pl
    trunk/tp/t/results/sectioning/placed_things_before_element.pl
    trunk/tp/t/results/sectioning/placed_things_before_node.pl
    trunk/tp/t/results/xml_tests/commands_and_spaces.pl
    trunk/tp/t/results/xml_tests/comments_end_lines.pl
    trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
    trunk/tp/t/results/xml_tests/image_inline_or_not.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/ChangeLog     2016-11-01 11:20:36 UTC (rev 7488)
@@ -1,3 +1,21 @@
+2016-11-01  Gavin Smith  <address@hidden>
+
+       Experimental change to reduce use of normalized labels.
+
+       * tp/Texinfo/Parser.pm (_register_label): For @float's only,
+       do not save the normalized HTML target name.  (This does not
+       gain anything at the moment because the normalized name is still
+       calculated in Parser.pm.)
+       * tp/Texinfo/Structuring.pm (number_floats): Check that 
+       'node_content' value exists for float instead of 'normalized'.
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert) <@float>,
+       * tp/Texinfo/Convert/DocBook.pm (_convert) <@float>: Call
+       Texinfo::Convert::NodeNameNormalization::normalize_node to 
+       compensate for loss of 'normalized' value.
+       * tp/Texinfo/Convert/HTML.pm (_node_id_file),
+       * tp/Texinfo/Convert/Converter.pm (_node_filename): Fall back to
+       use 'node_content' if 'normalized' is not available.
+
 2016-10-31  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/HTML.pm (_get_target, command_text)

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2016-10-31 16:12:13 UTC (rev 
7487)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2016-11-01 11:20:36 UTC (rev 
7488)
@@ -570,6 +570,9 @@
     } else {
       $filename = $node_info->{'normalized'};
     }
+  } elsif (defined($node_info->{'node_content'})) { 
+    $filename = Texinfo::Convert::NodeNameNormalization::normalize_node (
+             { 'contents' => $node_info->{'node_content'} });
   } else {
     $filename = '';
   }

Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2016-11-01 11:20:36 UTC (rev 7488)
@@ -1192,8 +1192,11 @@
           }
         }
       } elsif ($root->{'cmdname'} eq 'float') {
-        if ($root->{'extra'} and defined($root->{'extra'}->{'normalized'})) {
-          $result .= "<anchor id=\"$root->{'extra'}->{'normalized'}\"/>\n";
+        if ($root->{'extra'} and defined($root->{'extra'}->{'node_content'})) {
+          my $normalized =
+            Texinfo::Convert::NodeNameNormalization::normalize_node (
+                   { 'contents' => $root->{'extra'}->{'node_content'} });
+          $result .= "<anchor id=\"$normalized\"/>\n";
         }
       } elsif ($root->{'cmdname'} eq 'verbatim') {
         push @elements, 'screen';

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2016-11-01 11:20:36 UTC (rev 7488)
@@ -5079,7 +5079,14 @@
   my $node_info = shift;
 
   my $target;
-  my $normalized = $node_info->{'normalized'};
+  my $normalized; 
+  if ($node_info->{'normalized'}) {
+    $normalized = $node_info->{'normalized'};
+  } elsif ($node_info->{'node_content'}) {
+    $normalized = Texinfo::Convert::NodeNameNormalization::normalize_node (
+      { 'contents' => $node_info->{'node_content'} });
+  }
+
   if (defined($normalized)) {
     $target = _normalized_to_id($normalized);
   } else {

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2016-10-31 16:12:13 UTC (rev 
7487)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2016-11-01 11:20:36 UTC (rev 
7488)
@@ -1276,8 +1276,11 @@
                and $root->{'extra'}->{'enumerate_specification'}) {
         push @$attribute,('first', 
$root->{'extra'}->{'enumerate_specification'});
       } elsif ($root->{'cmdname'} eq 'float' and $root->{'extra'}) {
-        if (defined($root->{'extra'}->{'normalized'})) {
-          push @$attribute, ('name', $root->{'extra'}->{'normalized'});
+        if (defined($root->{'extra'}->{'node_content'})) {
+          my $normalized =
+            Texinfo::Convert::NodeNameNormalization::normalize_node (
+                   { 'contents' => $root->{'extra'}->{'node_content'} });
+          push @$attribute, ('name', $normalized);
         }
         if ($root->{'extra'}->{'type'} and 
             defined($root->{'extra'}->{'type'}->{'normalized'})) {

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/Texinfo/Parser.pm  2016-11-01 11:20:36 UTC (rev 7488)
@@ -2454,7 +2454,8 @@
                        $self->{'labels'}->{$normalized}->{'line_nr'});
     return 0;
   } else {
-    $current->{'extra'}->{'normalized'} = $normalized;
+    $current->{'extra'}->{'normalized'} = $normalized
+      unless $current->{'cmdname'} eq 'float';
     $current->{'extra'}->{'node_content'} = $label->{'node_content'};
     $self->{'labels'}->{$normalized} = $current;
     return 1;

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/Texinfo/Structuring.pm     2016-11-01 11:20:36 UTC (rev 7488)
@@ -1188,7 +1188,7 @@
     my $float_index = 0;
     foreach my $float (@{$floats->{$style}}) {
       next if (!$float->{'extra'} 
-               or !defined($float->{'extra'}->{'normalized'}));
+               or !defined($float->{'extra'}->{'node_content'}));
       $float_index++;
       my $number;
       if ($float->{'extra'}->{'float_section'}) {

Modified: trunk/tp/t/results/converters_tests/things_before_setfilename.pl
===================================================================
--- trunk/tp/t/results/converters_tests/things_before_setfilename.pl    
2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/converters_tests/things_before_setfilename.pl    
2016-11-01 11:20:36 UTC (rev 7488)
@@ -443,7 +443,6 @@
                 'node_content' => [
                   {}
                 ],
-                'normalized' => 'float-anchor',
                 'spaces_after_command' => {},
                 'type' => {
                   'normalized' => ''
@@ -674,7 +673,6 @@
                 'node_content' => [
                   {}
                 ],
-                'normalized' => 'ta',
                 'spaces_after_command' => {},
                 'type' => {
                   'content' => [
@@ -1700,7 +1698,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'float-anchor',
         'type' => {
           'normalized' => ''
         }
@@ -1726,7 +1723,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'ta',
         'type' => {
           'content' => [
             {

Modified: 
trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
--- trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
2016-11-01 11:20:36 UTC (rev 7488)
@@ -441,7 +441,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float-anchor',
             'spaces_after_command' => {},
             'type' => {
               'normalized' => ''
@@ -672,7 +671,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'ta',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -1519,7 +1517,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'float-anchor',
         'type' => {
           'normalized' => ''
         }
@@ -1545,7 +1542,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'ta',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/coverage/block_commands.pl
===================================================================
--- trunk/tp/t/results/coverage/block_commands.pl       2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/coverage/block_commands.pl       2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -375,7 +375,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'b-float',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -525,7 +524,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'b-float',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/coverage/punctuation_in_line_commands.pl
===================================================================
--- trunk/tp/t/results/coverage/punctuation_in_line_commands.pl 2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/coverage/punctuation_in_line_commands.pl 2016-11-01 
11:20:36 UTC (rev 7488)
@@ -545,7 +545,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float-label_0021-After-punc',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -717,7 +716,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label-with-caption',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -1408,7 +1406,6 @@
           'extra' => {},
           'level' => 0
         },
-        'normalized' => 'float-label_0021-After-punc',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -1444,7 +1441,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'label-with-caption',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl    2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/coverage_braces/test_image.pl    2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -3304,7 +3304,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'Image-with-commands',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -4620,7 +4619,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'Image-with-commands',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/anchor_in_caption.pl
===================================================================
--- trunk/tp/t/results/float/anchor_in_caption.pl       2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/float/anchor_in_caption.pl       2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -273,7 +273,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -441,7 +440,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/cindex_in_caption.pl
===================================================================
--- trunk/tp/t/results/float/cindex_in_caption.pl       2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/float/cindex_in_caption.pl       2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -299,7 +299,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -542,7 +541,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/comment_space_comand_in_float.pl
===================================================================
--- trunk/tp/t/results/float/comment_space_comand_in_float.pl   2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/float/comment_space_comand_in_float.pl   2016-11-01 
11:20:36 UTC (rev 7488)
@@ -180,7 +180,6 @@
               {},
               {}
             ],
-            'normalized' => 'label--',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -405,7 +404,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label--',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/complex_float.pl
===================================================================
--- trunk/tp/t/results/float/complex_float.pl   2016-10-31 16:12:13 UTC (rev 
7487)
+++ trunk/tp/t/results/float/complex_float.pl   2016-11-01 11:20:36 UTC (rev 
7488)
@@ -2663,7 +2663,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'text-with-a-lot-of-features',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -4116,7 +4115,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -5362,7 +5360,6 @@
           'extra' => {},
           'level' => 0
         },
-        'normalized' => 'text-with-a-lot-of-features',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -5407,7 +5404,6 @@
           'level' => 1,
           'number' => 1
         },
-        'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/empty_listoffloats_with_floats.pl
===================================================================
--- trunk/tp/t/results/float/empty_listoffloats_with_floats.pl  2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/float/empty_listoffloats_with_floats.pl  2016-11-01 
11:20:36 UTC (rev 7488)
@@ -117,7 +117,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'label1',
         'spaces_after_command' => {},
         'type' => {
           'normalized' => ''
@@ -278,7 +277,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'label2',
         'spaces_after_command' => {},
         'type' => {
           'normalized' => ''
@@ -695,7 +693,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label1',
         'type' => {
           'normalized' => ''
         }
@@ -719,7 +716,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label2',
         'type' => {
           'normalized' => ''
         }

Modified: trunk/tp/t/results/float/float_copying.pl
===================================================================
--- trunk/tp/t/results/float/float_copying.pl   2016-10-31 16:12:13 UTC (rev 
7487)
+++ trunk/tp/t/results/float/float_copying.pl   2016-11-01 11:20:36 UTC (rev 
7488)
@@ -654,7 +654,6 @@
                 'node_content' => [
                   {}
                 ],
-                'normalized' => 'public-domain',
                 'spaces_after_command' => {},
                 'type' => {
                   'content' => [
@@ -1631,7 +1630,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'public-domain',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/float_with_at_commands.pl
===================================================================
--- trunk/tp/t/results/float/float_with_at_commands.pl  2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/float/float_with_at_commands.pl  2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -338,7 +338,6 @@
           {},
           {}
         ],
-        'normalized' => 'premi_00e8re-entr_00e9e',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -577,7 +576,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'premi_00e8re-entr_00e9e',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/footnote_in_caption.pl
===================================================================
--- trunk/tp/t/results/float/footnote_in_caption.pl     2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/float/footnote_in_caption.pl     2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -268,7 +268,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -435,7 +434,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/footnote_in_caption_and_error.pl
===================================================================
--- trunk/tp/t/results/float/footnote_in_caption_and_error.pl   2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/float/footnote_in_caption_and_error.pl   2016-11-01 
11:20:36 UTC (rev 7488)
@@ -274,7 +274,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -453,7 +452,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/numbering_captions_listoffloats.pl
===================================================================
--- trunk/tp/t/results/float/numbering_captions_listoffloats.pl 2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/float/numbering_captions_listoffloats.pl 2016-11-01 
11:20:36 UTC (rev 7488)
@@ -307,7 +307,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'text-with-a-lot-of-features',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -701,7 +700,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label-but-no-type',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -834,7 +832,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label-but-no-type-and-no-caption',
             'spaces_after_command' => {},
             'type' => {
               'normalized' => ''
@@ -1291,7 +1288,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label-but-no-type-2',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -1502,7 +1498,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'warning-in-top',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -2135,7 +2130,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'text-in-chapter',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -2314,7 +2308,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -2635,7 +2628,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'theoreme',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -2837,7 +2829,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label-but-no-type-in-chapter',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -3048,7 +3039,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'warning-in-chapter',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -3423,7 +3413,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'text-in-section',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -3852,7 +3841,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'unnumbered-float',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -4049,7 +4037,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label-but-no-type-in-unnumbered',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -4365,7 +4352,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'Section-within-unnumbered-float',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -4794,7 +4780,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'Chapter-with-subsec-float',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -5102,7 +5087,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'unnumbered-sec-float',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -5305,7 +5289,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 
'label-but-no-type-in-unnumbered-subsec-in-chapter',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -5615,7 +5598,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'appendix-sec-float',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -8551,7 +8533,6 @@
           'extra' => {},
           'level' => 0
         },
-        'normalized' => 'label-but-no-type',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8576,7 +8557,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'label-but-no-type-and-no-caption',
         'type' => {
           'normalized' => ''
         }
@@ -8647,7 +8627,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'label-but-no-type-2',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8683,7 +8662,6 @@
           'level' => 1,
           'number' => 1
         },
-        'normalized' => 'label-but-no-type-in-chapter',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8718,7 +8696,6 @@
           'extra' => {},
           'level' => 1
         },
-        'normalized' => 'label-but-no-type-in-unnumbered',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8753,7 +8730,6 @@
           'extra' => {},
           'level' => 2
         },
-        'normalized' => 'label-but-no-type-in-unnumbered-subsec-in-chapter',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8790,7 +8766,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'text-with-a-lot-of-features',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8860,7 +8835,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'text-in-chapter',
         'type' => {
           'content' => [
             {
@@ -8894,7 +8868,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
         'type' => {
           'content' => [
             {
@@ -8923,7 +8896,6 @@
           'level' => 2,
           'number' => '1.1'
         },
-        'normalized' => 'text-in-section',
         'type' => {
           'content' => [
             {
@@ -8953,7 +8925,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'unnumbered-float',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -8993,7 +8964,6 @@
           'extra' => {},
           'level' => 2
         },
-        'normalized' => 'Section-within-unnumbered-float',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -9034,7 +9004,6 @@
           'level' => 1,
           'number' => 2
         },
-        'normalized' => 'Chapter-with-subsec-float',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -9070,7 +9039,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'unnumbered-sec-float',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -9111,7 +9079,6 @@
           'level' => 1,
           'number' => 'A'
         },
-        'normalized' => 'appendix-sec-float',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -9149,7 +9116,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'warning-in-top',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -9185,7 +9151,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'warning-in-chapter',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
@@ -9223,7 +9188,6 @@
           }
         },
         'float_section' => {},
-        'normalized' => 'theoreme',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/ref_to_float.pl
===================================================================
--- trunk/tp/t/results/float/ref_to_float.pl    2016-10-31 16:12:13 UTC (rev 
7487)
+++ trunk/tp/t/results/float/ref_to_float.pl    2016-11-01 11:20:36 UTC (rev 
7488)
@@ -117,7 +117,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'Label1',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -244,7 +243,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'Label2',
         'spaces_after_command' => {},
         'type' => {
           'normalized' => ''
@@ -475,7 +473,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'Label2',
         'type' => {
           'normalized' => ''
         }
@@ -495,7 +492,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'Label1',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/float/simple.pl
===================================================================
--- trunk/tp/t/results/float/simple.pl  2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/float/simple.pl  2016-11-01 11:20:36 UTC (rev 7488)
@@ -154,7 +154,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'Label',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -242,7 +241,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'Label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/info_tests/error_in_footnote.pl
===================================================================
--- trunk/tp/t/results/info_tests/error_in_footnote.pl  2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/info_tests/error_in_footnote.pl  2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -324,7 +324,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -649,7 +648,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/info_tests/float_long_captions.pl
===================================================================
--- trunk/tp/t/results/info_tests/float_long_captions.pl        2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/info_tests/float_long_captions.pl        2016-11-01 
11:20:36 UTC (rev 7488)
@@ -183,7 +183,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'text1',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -342,7 +341,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'text2',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -588,7 +586,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'text1',
         'type' => {
           'content' => [
             {
@@ -617,7 +614,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'text2',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/invalid_nestings/float_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/float_in_style_command.pl       
2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/invalid_nestings/float_in_style_command.pl       
2016-11-01 11:20:36 UTC (rev 7488)
@@ -184,7 +184,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'B',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -305,7 +304,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'B',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
--- trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2016-11-01 11:20:36 UTC (rev 7488)
@@ -607,7 +607,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'label',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -970,7 +969,6 @@
           'extra' => {},
           'level' => 0
         },
-        'normalized' => 'label',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/paragraph/commands_in_flushright.pl
===================================================================
--- trunk/tp/t/results/paragraph/commands_in_flushright.pl      2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/paragraph/commands_in_flushright.pl      2016-11-01 
11:20:36 UTC (rev 7488)
@@ -1038,7 +1038,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'type',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -1875,7 +1874,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'type',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/sectioning/double_node_anchor_float.pl
===================================================================
--- trunk/tp/t/results/sectioning/double_node_anchor_float.pl   2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/sectioning/double_node_anchor_float.pl   2016-11-01 
11:20:36 UTC (rev 7488)
@@ -576,7 +576,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float1',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -1008,7 +1007,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'float1',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/sectioning/equivalent_labels.pl
===================================================================
--- trunk/tp/t/results/sectioning/equivalent_labels.pl  2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/sectioning/equivalent_labels.pl  2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -221,7 +221,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'floa',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -653,7 +652,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'floa',
         'type' => {
           'content' => [
             {
@@ -716,7 +714,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'floa',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/sectioning/no_element.pl
===================================================================
--- trunk/tp/t/results/sectioning/no_element.pl 2016-10-31 16:12:13 UTC (rev 
7487)
+++ trunk/tp/t/results/sectioning/no_element.pl 2016-11-01 11:20:36 UTC (rev 
7488)
@@ -515,7 +515,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'float-anchor',
         'spaces_after_command' => {},
         'type' => {
           'normalized' => ''
@@ -1014,7 +1013,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'float-anchor',
         'type' => {
           'normalized' => ''
         }

Modified: trunk/tp/t/results/sectioning/placed_things_before_element.pl
===================================================================
--- trunk/tp/t/results/sectioning/placed_things_before_element.pl       
2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/sectioning/placed_things_before_element.pl       
2016-11-01 11:20:36 UTC (rev 7488)
@@ -423,7 +423,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float-anchor',
             'spaces_after_command' => {},
             'type' => {
               'normalized' => ''
@@ -1131,7 +1130,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'float-anchor',
         'type' => {
           'normalized' => ''
         }

Modified: trunk/tp/t/results/sectioning/placed_things_before_node.pl
===================================================================
--- trunk/tp/t/results/sectioning/placed_things_before_node.pl  2016-10-31 
16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/sectioning/placed_things_before_node.pl  2016-11-01 
11:20:36 UTC (rev 7488)
@@ -423,7 +423,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'float-anchor',
             'spaces_after_command' => {},
             'type' => {
               'normalized' => ''
@@ -1226,7 +1225,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'float-anchor',
         'type' => {
           'normalized' => ''
         }

Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -960,7 +960,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'b',
             'shortcaption' => {},
             'spaces_after_command' => {},
             'type' => {
@@ -2809,7 +2808,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'b',
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {

Modified: trunk/tp/t/results/xml_tests/comments_end_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_end_lines.pl  2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/xml_tests/comments_end_lines.pl  2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -1028,7 +1028,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'g',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -1554,7 +1553,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'g',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl     
2016-10-31 16:12:13 UTC (rev 7487)
+++ trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl     
2016-11-01 11:20:36 UTC (rev 7488)
@@ -2044,7 +2044,6 @@
         'node_content' => [
           {}
         ],
-        'normalized' => 'g',
         'spaces_after_command' => {},
         'type' => {
           'content' => [
@@ -2820,7 +2819,6 @@
             'text_arg' => 'float'
           }
         },
-        'normalized' => 'g',
         'type' => {
           'content' => [
             {

Modified: trunk/tp/t/results/xml_tests/image_inline_or_not.pl
===================================================================
--- trunk/tp/t/results/xml_tests/image_inline_or_not.pl 2016-10-31 16:12:13 UTC 
(rev 7487)
+++ trunk/tp/t/results/xml_tests/image_inline_or_not.pl 2016-11-01 11:20:36 UTC 
(rev 7488)
@@ -1706,7 +1706,6 @@
             'node_content' => [
               {}
             ],
-            'normalized' => 'g',
             'spaces_after_command' => {},
             'type' => {
               'content' => [
@@ -2306,7 +2305,6 @@
           'level' => 1,
           'number' => 1
         },
-        'normalized' => 'g',
         'type' => {
           'content' => [
             {




reply via email to

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