texinfo-commits
[Top][All Lists]
Advanced

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

[8410] list @sortas as a simple text command


From: gavinsmith0123
Subject: [8410] list @sortas as a simple text command
Date: Thu, 25 Oct 2018 16:46:54 -0400 (EDT)

Revision: 8410
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8410
Author:   gavin
Date:     2018-10-25 16:46:53 -0400 (Thu, 25 Oct 2018)
Log Message:
-----------
list @sortas as a simple text command

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-25 20:22:21 UTC (rev 8409)
+++ trunk/ChangeLog     2018-10-25 20:46:53 UTC (rev 8410)
@@ -1,3 +1,9 @@
+2018-10-25  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (%simple_text_commands): Add 'sortas'.
+       (%full_text_commands): No special case for 'sortas'.
+       (_parse_texi) <@copying in @insertcopying>: Undefine a variable.
+
 2018-10-24  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_isolate_last_space): Set 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-10-25 20:22:21 UTC (rev 8409)
+++ trunk/tp/Texinfo/Parser.pm  2018-10-25 20:46:53 UTC (rev 8410)
@@ -432,7 +432,7 @@
 foreach my $command ('titlefont', 'anchor', 'xref','ref', 'pxref', 
                      'inforef', 'shortcaption', 'math', 'indicateurl',
                      'email', 'uref', 'url', 'image', 'abbr', 'acronym', 
-                     'dmn', 'errormsg', 'U') {
+                     'dmn', 'errormsg', 'U', 'sortas') {
   $simple_text_commands{$command} = 1;
 }
 
@@ -447,7 +447,6 @@
 foreach my $brace_command (keys (%brace_commands)) {  
   if ($brace_commands{$brace_command} == 1 
       and !$simple_text_commands{$brace_command} 
-      and $brace_command ne 'sortas'
       and !$context_brace_commands{$brace_command}
       and !$accent_commands{$brace_command}) {
     $full_text_commands{$brace_command} = 1;
@@ -4339,7 +4338,9 @@
                       'parent' => $current->{'contents'}->[-1] };
                 }
                 $misc->{'extra'}->{'misc_args'} = $args 
-                if (scalar(@$args) and $arg_spec ne 'skipline');
+                  if (scalar(@$args) and $arg_spec ne 'skipline');
+              } else {
+                $misc = undef;
               }
             }
             if ($command eq 'raisesections') {
@@ -4349,7 +4350,8 @@
             } elsif ($command eq 'novalidate') {
               $self->{'info'}->{'novalidate'} = 1;
             }
-            _register_global_command($self, $misc, $line_nr);
+            _register_global_command($self, $misc, $line_nr)
+              if $misc;
             # the end of line is ignored for special commands
             if ($arg_spec ne 'special' or !$has_comment) {
               $current = _end_line($self, $current, $line_nr);




reply via email to

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