Integrate updates to the GNU info conversion.

This includes SF patch #590352 and additional support for more of the custom
markup.

1 files changed, 13 insertions, 4 deletions

diff --git a/Doc/tools/mkinfo b/Doc/tools/mkinfo
index 65add7c..d952730 100755
--- a/Doc/tools/mkinfo
+++ b/Doc/tools/mkinfo
@@ -2,8 +2,10 @@
 #  -*- Ksh -*-
 
 #  Script to drive the HTML-info conversion process.
-#  Pass in a single parameter: the name of the top-level HTML file
-#  generated by LaTeX2HTML.
+#  Pass in upto three parameters:
+#  - the name of the main tex file
+#  - the name of the output file in texi format (optional)
+#  - the name of the output file in info format (optional)
 #
 #  Written by Fred L. Drake, Jr. <fdrake@acm.org>
 
@@ -18,7 +20,12 @@ DOCDIR=`dirname "$FILENAME"`
 DOCFILE=`basename "$FILENAME"`
 DOCNAME=`basename "$FILENAME" .tex`
 if [ $# -gt 1 ]; then
-    INFONAME="$2"
+    TEXINAME="$2"
+else
+    TEXINAME="python-$DOCNAME.texi"
+fi
+if [ $# -gt 2 ]; then
+    INFONAME="$3"
 else
     INFONAME="python-$DOCNAME.info"
 fi
@@ -43,6 +50,8 @@ run() {
 
 run $EMACS -batch -q --no-site-file -l $TOOLSDIR/py2texi.el \
     --eval "(setq py2texi-dirs '(\"./\" \"../texinputs/\" \"$DOCDIR\"))" \
+    --eval "(setq py2texi-texi-file-name \"$TEXINAME\")" \
+    --eval "(setq py2texi-info-file-name \"$INFONAME\")" \
     --eval "(py2texi \"$DOCDIR/$DOCFILE\")" \
     -f kill-emacs
 echo Done
@@ -51,4 +60,4 @@ echo Done
 # generate the .info files:
 
 run $MAKEINFO --footnote-style end --fill-column 72 \
-	      --paragraph-indent 0 --output=$INFONAME $DOCNAME.texi
+	      --paragraph-indent 0 --output=$INFONAME $TEXINAME