[8204] no _trim_spaces_comment_from_content

[gavinsmith0123]

Revision: 8204
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8204
Author:   gavin
Date:     2018-09-22 09:30:50 -0400 (Sat, 22 Sep 2018)
Log Message:
-----------
no _trim_spaces_comment_from_content

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/XS/parsetexi/separator.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-22 13:07:01 UTC (rev 8203)
+++ trunk/ChangeLog     2018-09-22 13:30:50 UTC (rev 8204)
@@ -1,5 +1,10 @@
 2018-09-22  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <@sortas>: Don't call
+       _trim_spaces_comment_from_content.
+
+2018-09-22  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <@U>: Don't call
        _trim_spaces_comment_from_content.
        * t/02coverage.t (invalid_U): Add use of @U with whitespace 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-09-22 13:07:01 UTC (rev 8203)
+++ trunk/tp/Texinfo/Parser.pm  2018-09-22 13:30:50 UTC (rev 8204)
@@ -5173,8 +5173,7 @@
                   = $current->{'parent'};
             } elsif ($current->{'parent'}->{'cmdname'} eq 'sortas') {
               my @contents = @{$current->{'contents'}};
-              _trim_spaces_comment_from_content (address@hidden);
-              my $arg = $contents[0]->{'text'};
+              my $arg = $current->{'contents'}->[0]->{'text'};
               if (defined($arg)) {
                 my $index_element = 
$current->{'parent'}->{'parent'}->{'parent'};
                 if ($index_element and $index_element->{'cmdname'}

Modified: trunk/tp/Texinfo/XS/parsetexi/separator.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/separator.c   2018-09-22 13:07:01 UTC (rev 
8203)
+++ trunk/tp/Texinfo/XS/parsetexi/separator.c   2018-09-22 13:30:50 UTC (rev 
8204)
@@ -482,28 +482,19 @@
       else if (current->parent->cmd == CM_sortas)
         {
           int i;
-          for (i = 0; i < current->contents.number; i++)
+          ELEMENT *e = current->contents.list[0];
+
+          if (e->text.end > 0)
             {
-              ELEMENT *e = current->contents.list[i];
-
-              if (e->type == ET_empty_line_after_command
-                  || e->type == ET_empty_spaces_after_command
-                  || e->type == ET_empty_spaces_before_argument
-                  || e->type == ET_empty_spaces_after_close_brace)
-                continue;
-
-              if (e->text.end > 0)
+              ELEMENT *index_elt;
+              if (current->parent->parent
+                  && current->parent->parent->parent
+                  && (command_flags(current->parent->parent->parent)
+                      & CF_index_entry_command))
                 {
-                  ELEMENT *index_elt;
-                  if (current->parent->parent
-                      && current->parent->parent->parent
-                      && (command_flags(current->parent->parent->parent)
-                          & CF_index_entry_command))
-                    {
-                      index_elt = current->parent->parent->parent;
-                      add_extra_string_dup (index_elt, "sortas",
-                                            e->text.text);
-                    }
+                  index_elt = current->parent->parent->parent;
+                  add_extra_string_dup (index_elt, "sortas",
+                                        e->text.text);
                 }
             }
         }