texinfo ChangeLog doc/texinfo.txi doc/tp_api/Ma...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/26 01:45:40

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        doc/tp_api     : Makefile.am 
        tp             : TODO texi2any.pl 
        tp/Texinfo     : Common.pm Structuring.pm 

Log message:
                * doc/texinfo.txi (Configuration Variables), 
tp/Texinfo/Common.pm,
                tp/texi2any.pl: new transformations 
insert_nodes_for_sectioning_commands
                and complete_tree_nodes_menus.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1334&r2=1.1335
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.427&r2=1.428
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/tp_api/Makefile.am?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.271&r2=1.272
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.119&r2=1.120

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1334
retrieving revision 1.1335
diff -u -b -r1.1334 -r1.1335
--- ChangeLog   23 Feb 2012 22:14:41 -0000      1.1334
+++ ChangeLog   26 Feb 2012 01:45:39 -0000      1.1335
@@ -1,3 +1,9 @@
+2012-02-26  Patrice Dumas  <address@hidden>
+
+       * doc/texinfo.txi (Configuration Variables), tp/Texinfo/Common.pm,
+       tp/texi2any.pl: new transformations insert_nodes_for_sectioning_commands
+       and complete_tree_nodes_menus.
+
 2012-02-23  Patrice Dumas  <address@hidden>
 
        * configure.ac, tp/t/test_utils.pl, tp/README: use Storable::dclone 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -b -r1.427 -r1.428
--- doc/texinfo.txi     23 Feb 2012 19:04:56 -0000      1.427
+++ doc/texinfo.txi     26 Feb 2012 01:45:39 -0000      1.428
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.427 2012/02/23 19:04:56 karl Exp $
address@hidden $Id: texinfo.txi,v 1.428 2012/02/26 01:45:39 pertusus Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -17662,6 +17662,13 @@
 appearing just before @code{@@item} after the @code{@@item}.  Comment lines 
 between index entries are moved too.  Always done for HTML and DocBook outputs.
 
address@hidden insert_nodes_for_sectioning_commands
+Insert nodes for sectioning commands without node.
+
address@hidden complete_tree_nodes_menus
+Add menu entries or whole menus for nodes associated with sections,
+based on the sectioning tree.
+
 @end table
 
 @item USE_ACCESSKEY
@@ -21785,7 +21792,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.427 2012/02/23 19:04:56 karl Exp $
+$Id: texinfo.txi,v 1.428 2012/02/26 01:45:39 pertusus Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}

Index: doc/tp_api/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/tp_api/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/tp_api/Makefile.am      12 Feb 2012 23:06:06 -0000      1.2
+++ doc/tp_api/Makefile.am      26 Feb 2012 01:45:40 -0000      1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.2 2012/02/12 23:06:06 pertusus Exp $
+# $Id: Makefile.am,v 1.3 2012/02/26 01:45:40 pertusus Exp $
 # Makefile.am for texinfo/doc/tp_api.
 #
 # Copyright 2012
@@ -38,9 +38,9 @@
   $(top_srcdir)/tp/Texinfo/Convert/XML.pm \
   $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm \
   $(top_srcdir)/tp/Texinfo/Convert/HTML.pm
-       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --top 
'Texinfo perl module' --subdir=api_includes -o $@ $^
+       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --top 
'Texinfo perl module' --subdir=api_includes --section-nodes -o $@ $^
 
 tp_api.texi: tp_api_main.texi
-       $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl 
--set-init-var PLAINTEXINFO --set-init-var 
TREE_TRANSFORMATIONS=fill_gaps_in_sectioning $< > $@
+       $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl 
--set-init-var PLAINTEXINFO --set-init-var 
TREE_TRANSFORMATIONS=complete_tree_nodes_menus,fill_gaps_in_sectioning $< > $@
 
 EXTRA_DIST = api_includes tp_api_main.texi tp_api.texi

Index: tp/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -b -r1.271 -r1.272
--- tp/TODO     25 Feb 2012 23:11:46 -0000      1.271
+++ tp/TODO     26 Feb 2012 01:45:40 -0000      1.272
@@ -7,6 +7,8 @@
 
 Document TEXTCONTENT_COMMENT.
 
+protect leading ( when adding nodes.
+
 
 Bugs
 ====

Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- tp/texi2any.pl      21 Feb 2012 22:36:16 -0000      1.119
+++ tp/texi2any.pl      26 Feb 2012 01:45:40 -0000      1.120
@@ -1064,11 +1064,20 @@
     Texinfo::Common::move_index_entries_after_items_in_tree($tree);
   }
 
+  if ($tree_transformations{'insert_nodes_for_sectioning_commands'}) {
+    Texinfo::Structuring::insert_nodes_for_sectioning_commands($parser, $tree);
+  }
+
   Texinfo::Structuring::associate_internal_references($parser);
   # every format needs the sectioning structure
   # FIXME this adjusts the level of sectioning commands.  Maybe should be
   # done before dumping the tree?
   my $structure = Texinfo::Structuring::sectioning_structure($parser, $tree);
+
+  if ($tree_transformations{'complete_tree_nodes_menus'}) {
+    Texinfo::Structuring::complete_tree_nodes_menus($parser, $tree);
+  }
+
   # this can be done for every format, since information is already gathered
   my $floats = $parser->floats_information();
 

Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- tp/Texinfo/Common.pm        25 Feb 2012 13:13:04 -0000      1.134
+++ tp/Texinfo/Common.pm        26 Feb 2012 01:45:40 -0000      1.135
@@ -228,7 +228,9 @@
 
 my %valid_tree_transformations;
 foreach my $valid_transformation ('simple_menus', 
-    'fill_gaps_in_sectioning', 'move_index_entries_after_items') {
+    'fill_gaps_in_sectioning', 'move_index_entries_after_items',
+    'insert_nodes_for_sectioning_commands',
+    'complete_tree_nodes_menus') {
   $valid_tree_transformations{$valid_transformation} = 1;
 }
 

Index: tp/Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- tp/Texinfo/Structuring.pm   25 Feb 2012 23:11:48 -0000      1.119
+++ tp/Texinfo/Structuring.pm   26 Feb 2012 01:45:40 -0000      1.120
@@ -1536,7 +1536,7 @@
         and $content->{'extra'} 
         and $content->{'extra'}->{'associated_section'}
         and $content->{'extra'}->{'associated_section'}->{'section_childs'}
-        and 
@{$content->{'extra'}->{'associated_section'}->{'section_childs'}}) {
+        and 
scalar(@{$content->{'extra'}->{'associated_section'}->{'section_childs'}})) {
       complete_node_menu($self, $content);
     }
   }