[5958] parsetexi update

[Gavin D. Smith]

Revision: 5958
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5958
Author:   gavin
Date:     2014-12-12 18:08:35 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/parsetexi/ChangeLog
    trunk/parsetexi/Parsetexi/lib/Parsetexi.pm
    trunk/parsetexi/makeinfo

Modified: trunk/parsetexi/ChangeLog
===================================================================
--- trunk/parsetexi/ChangeLog   2014-12-12 17:20:59 UTC (rev 5957)
+++ trunk/parsetexi/ChangeLog   2014-12-12 18:08:35 UTC (rev 5958)
@@ -1,6 +1,13 @@
 2014-12-12  Gavin Smith  <address@hidden>
 
        * Parsetexi/lib/Parsetexi.pm (parse_texi_file): Set 
+       'node_content' extra key on each node element as well as in the 
+       elements in the 'node_manuals' array.  This means that node 
+       names appear in the node information line in the Info output.
+
+2014-12-12  Gavin Smith  <address@hidden>
+
+       * Parsetexi/lib/Parsetexi.pm (parse_texi_file): Set 
        'input_file_name' in document information.  This allows running 
        "./makeinfo test-files/hello.texi", and getting an output file 
        "hello.info".

Modified: trunk/parsetexi/Parsetexi/lib/Parsetexi.pm
===================================================================
--- trunk/parsetexi/Parsetexi/lib/Parsetexi.pm  2014-12-12 17:20:59 UTC (rev 
5957)
+++ trunk/parsetexi/Parsetexi/lib/Parsetexi.pm  2014-12-12 18:08:35 UTC (rev 
5958)
@@ -191,6 +191,11 @@
                    and $child->{'type'} ne 'spaces_at_end')) {
          push $child->{'extra'}->{'nodes_manuals'},
            {'node_content' => $node_arg->{'contents'}};
+
+         # Set 'node_content' on the node element itself.
+         if (!defined($child->{'extra'}->{'node_content'})) {
+           $child->{'extra'}->{'node_content'} = $node_arg->{'contents'};
+         }
        }
       }
     }

Modified: trunk/parsetexi/makeinfo
===================================================================
--- trunk/parsetexi/makeinfo    2014-12-12 17:20:59 UTC (rev 5957)
+++ trunk/parsetexi/makeinfo    2014-12-12 18:08:35 UTC (rev 5958)
@@ -2,5 +2,6 @@
 
 #DEBUG=perl -d
 #OPTIONS='-c DEBUG=1'
+COMMAND=${COMMAND:-./texi2any-C.pl}
 
-PERL5LIB=../tp:../tp/maintain/lib/libintl-perl/lib:../tp/maintain/lib/Text-Unidecode/lib/:../tp/maintain/lib/Unicode-EastAsianWidth/lib:./Parsetexi/lib:./Parsetexi/blib/lib:./Parsetexi/blib/arch/auto/Parsetexi
 ${DEBUG} ./texi2any-C.pl ${OPTIONS} "$@"
+PERL5LIB=../tp:../tp/maintain/lib/libintl-perl/lib:../tp/maintain/lib/Text-Unidecode/lib/:../tp/maintain/lib/Unicode-EastAsianWidth/lib:./Parsetexi/lib:./Parsetexi/blib/lib:./Parsetexi/blib/arch/auto/Parsetexi
 ${DEBUG} ${COMMAND} ${OPTIONS} "$@"