[6570] ignore @sortas in makeinfo

[Gavin D. Smith]

Revision: 6570
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6570
Author:   gavin
Date:     2015-08-25 14:53:32 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
ignore @sortas in makeinfo

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/Texinfo/Convert/Plaintext.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-25 10:04:32 UTC (rev 6569)
+++ trunk/ChangeLog     2015-08-25 14:53:32 UTC (rev 6570)
@@ -1,5 +1,13 @@
 2015-08-25  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Common.pm (%brace_commands): Add 'sortas'.
+       * tp/Texinfo/Convert/Plaintext.pm (%ignored_commands): Add 
+       'sortas'.
+       * tp/Texinfo/Convert/HTML.pm (%default_commands_conversion): Set 
+       conversion for @sortas to nothing, so command is ignored.
+
+2015-08-25  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\setfilename): No longer call \openindices.
        (\openindices): Place body inline in texinfo.tex.
        (\requireopenindexfile): New macro.

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2015-08-25 10:04:32 UTC (rev 6569)
+++ trunk/tp/Texinfo/Common.pm  2015-08-25 14:53:32 UTC (rev 6570)
@@ -606,7 +606,7 @@
 }
 
 foreach my $one_arg_command ('U', 'ctrl', 'dmn', 'w', 'key',
-    'titlefont', 'hyphenation', 'anchor', 'errormsg') {
+    'titlefont', 'hyphenation', 'anchor', 'errormsg', 'sortas') {
   $brace_commands{$one_arg_command} = 1;
 }
 
@@ -618,7 +618,7 @@
 }
 
 
-# Commands that enclose full texts
+# Commands that enclose full texts, that can contain multiple paragraphs.
 our %context_brace_commands;
 foreach my $context_brace_command ('footnote', 'caption',
     'shortcaption', 'math') {

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2015-08-25 10:04:32 UTC (rev 6569)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2015-08-25 14:53:32 UTC (rev 6570)
@@ -1169,7 +1169,7 @@
 }
 
 foreach my $ignored_brace_commands ('caption', 'shortcaption', 
-  'hyphenation') {
+  'hyphenation', 'sortas') {
   #$ignored_commands{$ignored_brace_commands} = 1;
   $default_commands_conversion{$ignored_brace_commands} = undef;
 }

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2015-08-25 10:04:32 UTC (rev 
6569)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2015-08-25 14:53:32 UTC (rev 
6570)
@@ -160,7 +160,7 @@
 
 my %ignored_commands = %ignored_misc_commands;
 foreach my $ignored_brace_commands ('caption', 'shortcaption', 
-  'hyphenation') {
+  'hyphenation', 'sortas') {
   $ignored_commands{$ignored_brace_commands} = 1;
 }