texinfo-commits
[Top][All Lists]
Advanced

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

[8131] change type of inserted elements on def line


From: gavinsmith0123
Subject: [8131] change type of inserted elements on def line
Date: Sun, 26 Aug 2018 10:35:04 -0400 (EDT)

Revision: 8131
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8131
Author:   gavin
Date:     2018-08-26 10:35:03 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
change type of inserted elements on def line

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/TexinfoXML.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/converters_tests/complex_nestings.pl
    trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
    trunk/tp/t/results/def/all_commands.pl
    trunk/tp/t/results/def/all_commands_delimiters.pl
    trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
    trunk/tp/t/results/def/all_commands_printindex.pl
    trunk/tp/t/results/def/def_defx_mismatch.pl
    trunk/tp/t/results/def/empty_deftype.pl
    trunk/tp/t/results/def/not_closed.pl
    trunk/tp/t/results/indices/empty_string_index_entry.pl
    trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
    
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
    trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
    trunk/tp/t/results/languages/multiple.pl
    trunk/tp/t/results/languages/multiple_lang_chapters.pl
    trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
    trunk/tp/t/results/languages/simple.pl
    trunk/tp/t/results/languages/unknown_region.pl
    trunk/tp/t/results/preformatted/def_in_example.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/ChangeLog     2018-08-26 14:35:03 UTC (rev 8131)
@@ -1,5 +1,13 @@
 2018-08-26  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_def, _split_def_args),
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert): Give inserted 
+       elements at front of def line the types 'bracketed_inserted'
+       and 'spaces_inserted' instead of 'bracketed_def_content' and
+       'spaces'.
+
+2018-08-26  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/Text.pm (_convert),
        * tp/Texinfo/Convert/Plaintext.pm (_convert),
        * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type):

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-08-26 14:35:03 UTC (rev 
8131)
@@ -1521,7 +1521,8 @@
               $element = $type;
             }
             if ($arg->[1]->{'type'}
-                and $arg->[1]->{'type'} eq 'bracketed_def_content') {
+                and ($arg->[1]->{'type'} eq 'bracketed_def_content'
+                  or ($arg->[1]->{'type'} eq 'bracketed_inserted'))) {
               push @$attribute, ('bracketed', 'on');
               push @$attribute, _leading_spaces_before_argument($arg->[1]);
             }

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/tp/Texinfo/Parser.pm  2018-08-26 14:35:03 UTC (rev 8131)
@@ -2305,7 +2305,9 @@
 {
   my ($self, $root) = @_;
 
-  if (defined $root->{'text'}) {
+  if ($root->{'type'} and $root->{'type'} eq 'spaces_inserted') {
+    return $root;
+  } elsif (defined $root->{'text'}) {
     my @elements;
     my $type;
     my @split_text = split /(?<=\s)(?=\S)|(?<=\S)(?=\s)/, $root->{'text'};
@@ -2351,7 +2353,7 @@
     my $prepended = $def_map{$command}->{$real_command};
 
 
-    my $bracketed = { 'type' => 'bracketed' };
+    my $bracketed = { 'type' => 'bracketed_inserted' };
     my $content = { 'text' => $prepended, 'parent' => $bracketed };
     if ($self->{'documentlanguage'}) {
       $content->{'type'} = 'untranslated';
@@ -2358,7 +2360,8 @@
       $content->{'extra'}->{'documentlanguage'} = $self->{'documentlanguage'};
     }
     @{$bracketed->{'contents'}} = ($content);
-    @prepended_content = ($bracketed, { 'text' => ' ' });
+    @prepended_content = ($bracketed,
+      { 'text' => ' ', 'type' => 'spaces_inserted'});
 
     unshift @contents, @prepended_content;
 
@@ -2399,7 +2402,9 @@
     # finish previous item
     if ( $token->{'type'}
         and ($token->{'type'} eq 'spaces'
+               or $token->{'type'} eq 'spaces_inserted'
                or $token->{'type'} eq 'bracketed_def_content'
+               or $token->{'type'} eq 'bracketed_inserted'
                or $token->{'type'} eq 'delimiter')) {
       # we create a {'contents' =>} only if there is more than one
       # content gathered.
@@ -2418,18 +2423,22 @@
           push @result, [$arg, $argument_content->[0]];
         }
         $argument_content = [];
-        if ($token->{'type'} eq 'spaces') {
+        if ($token->{'type'} eq 'spaces'
+            or $token->{'type'} eq 'spaces_inserted') {
           $arg = shift (@args);
         }
       }
     }
 
-    if ($token->{'type'} and $token->{'type'} eq 'bracketed') {
+    if ($token->{'type'} and ($token->{'type'} eq 'bracketed_def_content'
+                                or $token->{'type'} eq 'bracketed_inserted')) {
       push @result, [$arg, $token];
       shift @contents;
       $arg = shift (@args);
-    } elsif ($token->{'type'} and $token->{'type'} eq 'spaces') {
-      if ($token->{'text'}) {#  and $token->{'text'} ne "\n") {
+    } elsif ($token->{'type'}
+        and ($token->{'type'} eq 'spaces'
+               or $token->{'type'} eq 'spaces_inserted')) {
+      if ($token->{'text'}) {
         if ($token->{'text'} =~ /\n$/) {
           $token->{'type'} = 'spaces_at_end';
         }

Modified: trunk/tp/t/results/converters_tests/complex_nestings.pl
===================================================================
--- trunk/tp/t/results/converters_tests/complex_nestings.pl     2018-08-26 
12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/converters_tests/complex_nestings.pl     2018-08-26 
14:35:03 UTC (rev 8131)
@@ -185,7 +185,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -195,7 +195,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [
@@ -339,7 +339,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -349,7 +349,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [
@@ -673,7 +673,7 @@
                                           'extra' => {
                                             'def_role' => 'category'
                                           },
-                                          'type' => 'bracketed_def_content'
+                                          'type' => 'bracketed_inserted'
                                         }
                                       ],
                                       [
@@ -683,7 +683,7 @@
                                             'def_role' => 'spaces'
                                           },
                                           'text' => ' ',
-                                          'type' => 'spaces'
+                                          'type' => 'spaces_inserted'
                                         }
                                       ],
                                       [
@@ -816,7 +816,7 @@
                                           'extra' => {
                                             'def_role' => 'category'
                                           },
-                                          'type' => 'bracketed_def_content'
+                                          'type' => 'bracketed_inserted'
                                         }
                                       ],
                                       [
@@ -826,7 +826,7 @@
                                             'def_role' => 'spaces'
                                           },
                                           'text' => ' ',
-                                          'type' => 'spaces'
+                                          'type' => 'spaces_inserted'
                                         }
                                       ],
                                       [

Modified: trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
--- trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl        
2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl        
2018-08-26 14:35:03 UTC (rev 8131)
@@ -160,7 +160,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -170,7 +170,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -575,7 +575,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -585,7 +585,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/def/all_commands.pl
===================================================================
--- trunk/tp/t/results/def/all_commands.pl      2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/t/results/def/all_commands.pl      2018-08-26 14:35:03 UTC (rev 
8131)
@@ -1424,7 +1424,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -1434,7 +1434,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -1610,7 +1610,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -1620,7 +1620,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -1796,7 +1796,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -1806,7 +1806,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -1969,7 +1969,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -1979,7 +1979,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -2134,7 +2134,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -2144,7 +2144,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -2325,7 +2325,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -2335,7 +2335,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -2520,7 +2520,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -2530,7 +2530,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -2707,7 +2707,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -2717,7 +2717,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -2915,7 +2915,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -2925,7 +2925,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -3132,7 +3132,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -3142,7 +3142,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -3361,7 +3361,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -3371,7 +3371,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [

Modified: trunk/tp/t/results/def/all_commands_delimiters.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters.pl   2018-08-26 12:15:54 UTC 
(rev 8130)
+++ trunk/tp/t/results/def/all_commands_delimiters.pl   2018-08-26 14:35:03 UTC 
(rev 8131)
@@ -9756,7 +9756,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -9766,7 +9766,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [

Modified: trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters_printindex.pl        
2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/def/all_commands_delimiters_printindex.pl        
2018-08-26 14:35:03 UTC (rev 8131)
@@ -9813,7 +9813,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -9823,7 +9823,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/def/all_commands_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_printindex.pl   2018-08-26 12:15:54 UTC 
(rev 8130)
+++ trunk/tp/t/results/def/all_commands_printindex.pl   2018-08-26 14:35:03 UTC 
(rev 8131)
@@ -1462,7 +1462,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1472,7 +1472,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -1649,7 +1649,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1659,7 +1659,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -1836,7 +1836,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1846,7 +1846,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -2010,7 +2010,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -2020,7 +2020,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -2176,7 +2176,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -2186,7 +2186,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -2368,7 +2368,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -2378,7 +2378,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -2564,7 +2564,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -2574,7 +2574,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -2752,7 +2752,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -2762,7 +2762,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -2961,7 +2961,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -2971,7 +2971,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -3179,7 +3179,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -3189,7 +3189,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -3409,7 +3409,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -3419,7 +3419,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/def/def_defx_mismatch.pl
===================================================================
--- trunk/tp/t/results/def/def_defx_mismatch.pl 2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/t/results/def/def_defx_mismatch.pl 2018-08-26 14:35:03 UTC (rev 
8131)
@@ -128,7 +128,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -138,7 +138,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [

Modified: trunk/tp/t/results/def/empty_deftype.pl
===================================================================
--- trunk/tp/t/results/def/empty_deftype.pl     2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/t/results/def/empty_deftype.pl     2018-08-26 14:35:03 UTC (rev 
8131)
@@ -125,7 +125,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -135,7 +135,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -380,7 +380,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -390,7 +390,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -663,7 +663,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -673,7 +673,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [
@@ -948,7 +948,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -958,7 +958,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [

Modified: trunk/tp/t/results/def/not_closed.pl
===================================================================
--- trunk/tp/t/results/def/not_closed.pl        2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/t/results/def/not_closed.pl        2018-08-26 14:35:03 UTC (rev 
8131)
@@ -307,7 +307,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -317,7 +317,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [

Modified: trunk/tp/t/results/indices/empty_string_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/empty_string_index_entry.pl      2018-08-26 
12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/indices/empty_string_index_entry.pl      2018-08-26 
14:35:03 UTC (rev 8131)
@@ -369,7 +369,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -379,7 +379,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -530,7 +530,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -540,7 +540,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
--- trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl     
2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl     
2018-08-26 14:35:03 UTC (rev 8131)
@@ -139,7 +139,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -149,7 +149,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [
@@ -256,7 +256,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -266,7 +266,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [

Modified: 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
--- 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    2018-08-26 12:15:54 UTC (rev 8130)
+++ 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    2018-08-26 14:35:03 UTC (rev 8131)
@@ -139,7 +139,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -149,7 +149,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [
@@ -256,7 +256,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -266,7 +266,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [

Modified: trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
===================================================================
--- trunk/tp/t/results/indices/same_index_entry_merged_indices.pl       
2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/indices/same_index_entry_merged_indices.pl       
2018-08-26 14:35:03 UTC (rev 8131)
@@ -387,7 +387,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -397,7 +397,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2018-08-26 
12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2018-08-26 
14:35:03 UTC (rev 8131)
@@ -94,7 +94,7 @@
                   'extra' => {
                     'def_role' => 'category'
                   },
-                  'type' => 'bracketed_def_content'
+                  'type' => 'bracketed_inserted'
                 }
               ],
               [
@@ -104,7 +104,7 @@
                     'def_role' => 'spaces'
                   },
                   'text' => ' ',
-                  'type' => 'spaces'
+                  'type' => 'spaces_inserted'
                 }
               ],
               [

Modified: trunk/tp/t/results/languages/multiple.pl
===================================================================
--- trunk/tp/t/results/languages/multiple.pl    2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/t/results/languages/multiple.pl    2018-08-26 14:35:03 UTC (rev 
8131)
@@ -135,7 +135,7 @@
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_inserted'
                         }
                       ],
                       [
@@ -145,7 +145,7 @@
                             'def_role' => 'spaces'
                           },
                           'text' => ' ',
-                          'type' => 'spaces'
+                          'type' => 'spaces_inserted'
                         }
                       ],
                       [
@@ -424,7 +424,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -434,7 +434,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -690,7 +690,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -700,7 +700,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/languages/multiple_lang_chapters.pl
===================================================================
--- trunk/tp/t/results/languages/multiple_lang_chapters.pl      2018-08-26 
12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/languages/multiple_lang_chapters.pl      2018-08-26 
14:35:03 UTC (rev 8131)
@@ -770,7 +770,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -780,7 +780,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -1150,7 +1150,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1160,7 +1160,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -1484,7 +1484,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1494,7 +1494,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
===================================================================
--- trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl    
2018-08-26 12:15:54 UTC (rev 8130)
+++ trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl    
2018-08-26 14:35:03 UTC (rev 8131)
@@ -770,7 +770,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -780,7 +780,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -1150,7 +1150,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1160,7 +1160,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [
@@ -1484,7 +1484,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -1494,7 +1494,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/languages/simple.pl
===================================================================
--- trunk/tp/t/results/languages/simple.pl      2018-08-26 12:15:54 UTC (rev 
8130)
+++ trunk/tp/t/results/languages/simple.pl      2018-08-26 14:35:03 UTC (rev 
8131)
@@ -162,7 +162,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -172,7 +172,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/languages/unknown_region.pl
===================================================================
--- trunk/tp/t/results/languages/unknown_region.pl      2018-08-26 12:15:54 UTC 
(rev 8130)
+++ trunk/tp/t/results/languages/unknown_region.pl      2018-08-26 14:35:03 UTC 
(rev 8131)
@@ -162,7 +162,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -172,7 +172,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [

Modified: trunk/tp/t/results/preformatted/def_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/def_in_example.pl   2018-08-26 12:15:54 UTC 
(rev 8130)
+++ trunk/tp/t/results/preformatted/def_in_example.pl   2018-08-26 14:35:03 UTC 
(rev 8131)
@@ -74,7 +74,7 @@
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     }
                   ],
                   [
@@ -84,7 +84,7 @@
                         'def_role' => 'spaces'
                       },
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     }
                   ],
                   [




reply via email to

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