texinfo ChangeLog contrib/perldoc-all/GNUmakefi...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     13/02/07 18:14:46

Modified files:
        .              : ChangeLog 
        contrib/perldoc-all: GNUmakefile 
        Pod-Simple-Texinfo: pod2texi.pl 

Log message:
        restore insertion of default preamble in all cases

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1542&r2=1.1543
http://cvs.savannah.gnu.org/viewcvs/texinfo/contrib/perldoc-all/GNUmakefile?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/pod2texi.pl?cvsroot=texinfo&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1542
retrieving revision 1.1543
diff -u -b -r1.1542 -r1.1543
--- ChangeLog   5 Feb 2013 01:32:27 -0000       1.1542
+++ ChangeLog   7 Feb 2013 18:14:45 -0000       1.1543
@@ -1,3 +1,9 @@
+2013-02-07  Karl Berry  <address@hidden>
+
+       * Pod-Simple-Texinfo/pod2texi.pl (preamble): back to inserting
+       the default.
+       * contrib/perldoc-all/GNUmakefile (pod2texi_args): omit it.
+
 2013-02-04  Karl Berry  <address@hidden>
 
        * pretest 4.13.96.

Index: contrib/perldoc-all/GNUmakefile
===================================================================
RCS file: /sources/texinfo/texinfo/contrib/perldoc-all/GNUmakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- contrib/perldoc-all/GNUmakefile     5 Feb 2013 00:23:49 -0000       1.2
+++ contrib/perldoc-all/GNUmakefile     7 Feb 2013 18:14:46 -0000       1.3
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.2 2013/02/05 00:23:49 karl Exp $
+# $Id: GNUmakefile,v 1.3 2013/02/07 18:14:46 karl Exp $
 # Sample Makefile to build Texinfo from the Perl POD documentation,
 # using pod2texi.
 #
@@ -20,11 +20,13 @@
 texinfo_srcdir = $(shell cd ../../ && pwd)
 pod2texi = perl $(texinfo_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
 pod2texi_args = --base-level=section
+pod2texi_args += --preamble=''  # we want our own
+pod2texi_args += --subdir=$(texi_pod_subdir)
 
 # Unfortunately have to use --no-validate since not all the names and
 # L<references> match up.  Split HTML by chapter is the natural thing here.
 gendocs_args  = --email address@hidden
-gendocs_args  = --common "--no-warn --no-validate"
+gendocs_args += --common "--no-warn --no-validate"
 gendocs_args += --split chapter
 gendocs_args += --no-ascii
 gendocs_args += --source $(texi_pod_subdir)
@@ -39,7 +41,7 @@
 # we omit the numerous delta pods, which are uninteresting when searching
 # (and take tons of time and space).
        cd $(perl_pod_subdir) \
-       && $(pod2texi) -o $@ --subdir=$(texi_pod_subdir) $(pod2texi_args) \
+       && $(pod2texi) -o $@ $(pod2texi_args) \
          `ls *.pod | fgrep -v delta` \
        && mv $(texi_pod_subdir) $@ ../..
 

Index: Pod-Simple-Texinfo/pod2texi.pl
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/pod2texi.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Pod-Simple-Texinfo/pod2texi.pl      4 Feb 2013 22:52:25 -0000       1.29
+++ Pod-Simple-Texinfo/pod2texi.pl      7 Feb 2013 18:14:46 -0000       1.30
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# $Id: pod2texi.pl,v 1.29 2013/02/04 22:52:25 karl Exp $
+# $Id: pod2texi.pl,v 1.30 2013/02/07 18:14:46 karl Exp $
 # pod2texi -- convert Pod to Texinfo.
 # Copyright 2012, 2013 Free Software Foundation, Inc.
 # 
@@ -448,8 +448,7 @@
   $outfile_name .= '.info';
 
   if (! defined ($preamble)) {
-    $preamble = ($base_level > 0) ? ""
-                : '\input texinfo
+    $preamble = '\input texinfo
 @setfilename ' . Pod::Simple::Texinfo::_protect_text($outfile_name) . "
 address@hidden utf-8
 address@hidden $top
@@ -554,12 +553,9 @@
 
 =item B<--preamble>=I<STR>
 
-Insert I<STR> as top boilerplate before includes.  For standalone
-documents (C<--base-level> is 0), the default is a minimal beginning for
-a Texinfo document, and sets C<@documentencoding> to C<utf-8>.  For
-included documents (C<--base-level> is nonzero), it is the empty string,
-under the assumption that you will want your own top-level material,
-and to C<@include> the generated files.
+Insert I<STR> as top boilerplate before includes.  The default is a
+minimal beginning for a Texinfo document, and sets C<@documentencoding>
+to C<utf-8> (because the output is written that way).
 
 =item B<--subdir>=I<NAME>