[7872] remove INLINE_INSERTCOPYING

[gavinsmith0123]

Revision: 7872
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7872
Author:   gavin
Date:     2017-06-28 17:08:26 -0400 (Wed, 28 Jun 2017)
Log Message:
-----------
remove INLINE_INSERTCOPYING

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/plaintext_tests.t

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-06-28 19:48:58 UTC (rev 7871)
+++ trunk/ChangeLog     2017-06-28 21:08:26 UTC (rev 7872)
@@ -1,3 +1,18 @@
+2017-06-28  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_end_line) <@copying>: Removing handling
+       of INLINE_INSERTCOPYING variable.  Also remove from the module 
+       documentation section at the end of the file.
+       (%default_customization_variables): Remove INLINE_INSERTCOPYING.
+       * tp/Texinfo/Parser.pm (@variable_string_settables)
+       (@obsolete_variables): Move 'INLINE_INSERTCOPYING' to 
+       @obsolete_variables.
+       * tp/t/plaintext_tests.t (inline_copying_inline_and_paragraph):
+       Remove.
+       * NEWS: Mention removal.
+       * doc/texinfo.texi (Other Customization Variables) 
+       <INLINE_INSERTCOPYING>: Remove.
+
 2017-06-27  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_text_to_lines): Do not return an array 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2017-06-28 19:48:58 UTC (rev 7871)
+++ trunk/NEWS  2017-06-28 21:08:26 UTC (rev 7872)
@@ -16,6 +16,9 @@
   . do not fall back to a man page if following a cross-reference in an
     info file failed
 
+* texi2any
+  . `INLINE_INSERTCOPYING' removed as a customization variable
+
 
 6.4 (23 June 2017)
 * texi2any:

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2017-06-28 19:48:58 UTC (rev 7871)
+++ trunk/tp/Texinfo/Common.pm  2017-06-28 21:08:26 UTC (rev 7872)
@@ -206,7 +206,8 @@
   'USE_UP_FOR_ADJACENT_NODES', 'SEPARATE_DESCRIPTION', 
   'NEW_CROSSREF_STYLE', 'SHORT_REF', 'IGNORE_PREAMBLE_TEXT',
   'OUT_ENCODING', 'IN_ENCODING', 'DEFAULT_ENCODING',
-  'MACRO_BODY_IGNORES_LEADING_SPACE');
+  'MACRO_BODY_IGNORES_LEADING_SPACE', 'INLINE_INSERTCOPYING'
+);
 
 my @variable_settables_not_used = ('COMPLETE_IMAGE_PATHS', 'TOC_FILE',
   'SPLIT_INDEX');
@@ -222,7 +223,7 @@
   'L2H_HTML_VERSION', 'EXTERNAL_DIR', 'USE_ISO',
   'VERTICAL_HEAD_NAVIGATION', 'INLINE_CONTENTS', 'NODE_FILE_EXTENSION',
   'NO_CSS', 'INLINE_CSS_STYLE', 'USE_TITLEPAGE_FOR_TITLE',
-  'SIMPLE_MENU', 'EXTENSION', 'INLINE_INSERTCOPYING', 'USE_NUMERIC_ENTITY',
+  'SIMPLE_MENU', 'EXTENSION', 'USE_NUMERIC_ENTITY',
   'ENABLE_ENCODING_USE_ENTITY', 'ICONS',
   'USE_UNIDECODE', 'DATE_IN_HEADER', 'OPEN_QUOTE_SYMBOL',
   'CLOSE_QUOTE_SYMBOL', 'TOP_NODE_UP', 'TOP_NODE_UP_URL', 'TOP_NODE_FILE',

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-06-28 19:48:58 UTC (rev 7871)
+++ trunk/tp/Texinfo/Parser.pm  2017-06-28 21:08:26 UTC (rev 7872)
@@ -119,7 +119,6 @@
   'DEBUG' => 0,     # if >= 10, tree is printed in texi2any.pl after parsing.
                     # If >= 100 tree is printed every line.
   'SHOW_MENU' => 1,             # if false no menu error related.
-  'INLINE_INSERTCOPYING' => 0,
   'IGNORE_BEFORE_SETFILENAME' => 1,
   'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME' => 1,
   'INPUT_PERL_ENCODING' => undef, # input perl encoding name, set from 
@@ -3211,27 +3210,6 @@
           _close_command_cleanup($self, $closed_command);
           $end->{'parent'} = $closed_command;
 
-          # register @insertcopying as a macro if INLINE_INSERTCOPYING is set.
-          if ($end_command eq 'copying' and $self->{'INLINE_INSERTCOPYING'}) {
-            # remove the end of line following @copying.
-            my @contents = @{$closed_command->{'contents'}};
-            shift @contents if ($contents[0] and $contents[0]->{'type'}
-               and ($contents[0]->{'type'} eq 'empty_line_after_command'
-                    or $contents[0]->{'type'} eq 
'empty_spaces_after_command'));
-            # the macrobody is the @copying content converted to Texinfo.
-            my $body = Texinfo::Convert::Texinfo::convert(
-                         {'contents' => address@hidden);
-            
-            #chomp ($body);
-            $self->{'macros'}->{'insertcopying'} =
-            { 'element' => {
-                    'args' => [{'text' => 'insertcopying', 'type' => 
'macro_name'}],
-                    'cmdname' => 'macro', },
-              'macrobody' => $body
-            };
-            $inline_copying = 1;
-            print STDERR "INLINE_INSERTCOPYING as macro\n" if 
($self->{'DEBUG'});
-          }
           push @{$closed_command->{'contents'}}, $end;
 
           # closing a menu command, but still in a menu. Open a menu_comment
@@ -5968,12 +5946,6 @@
 An array reference of directories in which C<@include> files should be 
 searched for.  Default contains the working directory, F<.>.
 
-=item INLINE_INSERTCOPYING
-
-If set, C<@insertcopying> is replaced by the C<@copying> content as if
-C<@insertcopying> was a user-defined macro.  In the default case, it is 
-considered to be a simple @-command and kept as-is in the tree.
-
 =item IGNORE_BEFORE_SETFILENAME
 
 If set, and C<@setfilename> exists, everything before C<@setfilename>

Modified: trunk/tp/t/plaintext_tests.t
===================================================================
--- trunk/tp/t/plaintext_tests.t        2017-06-28 19:48:58 UTC (rev 7871)
+++ trunk/tp/t/plaintext_tests.t        2017-06-28 21:08:26 UTC (rev 7872)
@@ -638,9 +638,6 @@
 
 push @test_cases, ['insert_copying_and_paragraph', 
                     $insert_copying_and_paragraph];
-push @test_cases, ['insert_copying_inline_and_paragraph', 
-                    $insert_copying_and_paragraph, 
-                    {'INLINE_INSERTCOPYING' => 1}];
 
 my $at_commands_glued_text = 'at@@.
 address@hidden