texinfo update (Wed Sep 1 07:44:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.386
retrieving revision 1.387
diff -c -r1.386 -r1.387
*** ChangeLog   30 Aug 2004 22:11:39 -0000      1.386
--- ChangeLog   1 Sep 2004 11:40:20 -0000       1.387
***************
*** 1,3 ****
--- 1,7 ----
+ 2004-09-01  Karl Berry  <address@hidden>
+ 
+       * util/gendocs.sh: show commands, allow / in description.
+ 
  2004-08-30  Karl Berry  <address@hidden>
  
        * makeinfo/makeinfo.c (maybe_escaped_expansion): new routine, like
Index: makeinfo/.gdbinit
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/.gdbinit,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** makeinfo/.gdbinit   26 Jul 2004 13:10:51 -0000      1.28
--- makeinfo/.gdbinit   1 Sep 2004 11:37:50 -0000       1.29
***************
*** 232,234 ****
--- 232,238 ----
  
  # stray null bytes
  set args -I /u/karl/gnu/src/groff/doc -o /dev/null -E groff.out groff.texinfo
+ 
+ # Unknown command `&quot;urgen'.
+ set args --html --force -o /tmp/i.out --no-split $ttests/idxaccent.tex
+ #set args --force -o /tmp/i.out --no-split $ttests/idxangle.tex
Index: util/gendocs.sh
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/gendocs.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** util/gendocs.sh     17 May 2004 12:57:58 -0000      1.12
--- util/gendocs.sh     1 Sep 2004 11:40:20 -0000       1.13
***************
*** 1,7 ****
  #!/bin/sh
  # gendocs.sh -- generate a GNU manual in many formats.  This script is
  #   mentioned in maintain.texi.  See the help message below for usage details.
! # $Id: gendocs.sh,v 1.12 2004/05/17 12:57:58 karl Exp $
  # 
  # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
  #
--- 1,7 ----
  #!/bin/sh
  # gendocs.sh -- generate a GNU manual in many formats.  This script is
  #   mentioned in maintain.texi.  See the help message below for usage details.
! # $Id: gendocs.sh,v 1.13 2004/09/01 11:40:20 karl Exp $
  # 
  # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
  #
***************
*** 39,45 ****
  : ${GENDOCS_TEMPLATE_DIR="."}
  unset CDPATH
  
! rcs_revision='$Revision: 1.12 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="gendocs.sh $rcs_version
--- 39,45 ----
  : ${GENDOCS_TEMPLATE_DIR="."}
  unset CDPATH
  
! rcs_revision='$Revision: 1.13 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="gendocs.sh $rcs_version
***************
*** 146,161 ****
  
  echo Generating output formats for $srcfile
  
! echo Generating info files...
! ${MAKEINFO} -o $PACKAGE.info $srcfile
  mkdir -p $outdir/
  tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info*
  info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`"
  # do not mv the info files, there's no point in having them available
  # separately on the web.
  
! echo Generating dvi ...
! ${TEXI2DVI} $srcfile
  
  # now, before we compress dvi:
  echo Generating postscript...
--- 146,163 ----
  
  echo Generating output formats for $srcfile
  
! cmd="${MAKEINFO} -o $PACKAGE.info $srcfile"
! echo "Generating info files... ($cmd)"
! $cmd
  mkdir -p $outdir/
  tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info*
  info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`"
  # do not mv the info files, there's no point in having them available
  # separately on the web.
  
! cmd="${TEXI2DVI} $srcfile"
! echo "Generating dvi ... ($cmd)"
! $cmd
  
  # now, before we compress dvi:
  echo Generating postscript...
***************
*** 169,196 ****
  dvi_gz_size="`calcsize $PACKAGE.dvi.gz`"
  mv $PACKAGE.dvi.gz $outdir/
  
! echo Generating pdf ...
! ${TEXI2DVI} --pdf $srcfile
  pdf_size="`calcsize $PACKAGE.pdf`"
  mv $PACKAGE.pdf $outdir/
  
! echo Generating ASCII...
! ${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile
  ascii_size="`calcsize $PACKAGE.txt`"
  gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz
  ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`"
  mv $PACKAGE.txt $outdir/
  
! echo Generating monolithic html...
  rm -rf $PACKAGE.html  # in case a directory is left over
! ${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile
  html_mono_size="`calcsize $PACKAGE.html`"
  gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz
  html_mono_gz_size="`calcsize $outdir/$PACKAGE.html.gz`"
  mv $PACKAGE.html $outdir/
  
! echo Generating html by node...
! ${MAKEINFO} --html -o $PACKAGE.html $html $srcfile
  split_html_dir=$PACKAGE.html
  (
    cd ${split_html_dir} || exit 1
--- 171,202 ----
  dvi_gz_size="`calcsize $PACKAGE.dvi.gz`"
  mv $PACKAGE.dvi.gz $outdir/
  
! cmd="${TEXI2DVI} --pdf $srcfile"
! echo "Generating pdf ... ($cmd)"
! $cmd
  pdf_size="`calcsize $PACKAGE.pdf`"
  mv $PACKAGE.pdf $outdir/
  
! cmd="${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile"
! echo "Generating ASCII... ($cmd)"
! $cmd
  ascii_size="`calcsize $PACKAGE.txt`"
  gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz
  ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`"
  mv $PACKAGE.txt $outdir/
  
! cmd="${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile"
! echo "Generating monolithic html... ($cmd)"
  rm -rf $PACKAGE.html  # in case a directory is left over
! $cmd
  html_mono_size="`calcsize $PACKAGE.html`"
  gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz
  html_mono_gz_size="`calcsize $outdir/$PACKAGE.html.gz`"
  mv $PACKAGE.html $outdir/
  
! cmd="${MAKEINFO} --html -o $PACKAGE.html $html $srcfile"
! echo "Generating html by node... ($cmd)"
! $cmd
  split_html_dir=$PACKAGE.html
  (
    cd ${split_html_dir} || exit 1
***************
*** 203,223 ****
  rmdir ${split_html_dir}
  
  echo Making .tar.gz for sources...
! srcfiles=`ls *.texinfo *.texi *.txi 2>/dev/null`
! tar czfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
  texi_tgz_size="`calcsize $outdir/$PACKAGE.texi.tar.gz`"
  
  if test -n "$docbook"; then
!   echo Generating docbook XML...
!   ${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml
    docbook_xml_size="`calcsize $PACKAGE-db.xml`"
    gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz
    docbook_xml_gz_size="`calcsize $outdir/$PACKAGE-db.xml.gz`"
    mv $PACKAGE-db.xml $outdir/
  
!   echo Generating docbook HTML...
    split_html_db_dir=html_node_db
-   ${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml
    (
      cd ${split_html_db_dir} || exit 1
      tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html
--- 209,231 ----
  rmdir ${split_html_dir}
  
  echo Making .tar.gz for sources...
! srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null`
! tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
  texi_tgz_size="`calcsize $outdir/$PACKAGE.texi.tar.gz`"
  
  if test -n "$docbook"; then
!   cmd="${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml"
!   echo "Generating docbook XML... $(cmd)"
!   eval $cmd
    docbook_xml_size="`calcsize $PACKAGE-db.xml`"
    gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz
    docbook_xml_gz_size="`calcsize $outdir/$PACKAGE-db.xml.gz`"
    mv $PACKAGE-db.xml $outdir/
  
!   cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml"
!   echo "Generating docbook HTML... ($cmd)"
!   $cmd
    split_html_db_dir=html_node_db
    (
      cd ${split_html_db_dir} || exit 1
      tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html
***************
*** 228,246 ****
    mv ${split_html_db_dir}/*.html $outdir/html_node_db/
    rmdir ${split_html_db_dir}
  
!   echo Generating docbook ASCII...
!   ${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml
    docbook_ascii_size="`calcsize $PACKAGE-db.txt`"
    mv $PACKAGE-db.txt $outdir/
  
!   echo Generating docbook PS...
!   ${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml
    gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz
    docbook_ps_gz_size="`calcsize $outdir/$PACKAGE-db.ps.gz`"
    mv $PACKAGE-db.ps $outdir/
  
!   echo Generating docbook PDF...
!   ${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml
    docbook_pdf_size="`calcsize $PACKAGE-db.pdf`"
    mv $PACKAGE-db.pdf $outdir/
  fi
--- 236,257 ----
    mv ${split_html_db_dir}/*.html $outdir/html_node_db/
    rmdir ${split_html_db_dir}
  
!   cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml"
!   echo "Generating docbook ASCII... ($cmd)"
!   $cmd
    docbook_ascii_size="`calcsize $PACKAGE-db.txt`"
    mv $PACKAGE-db.txt $outdir/
  
!   cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml"
!   echo "Generating docbook PS... $(cmd)"
!   $cmd
    gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz
    docbook_ps_gz_size="`calcsize $outdir/$PACKAGE-db.ps.gz`"
    mv $PACKAGE-db.ps $outdir/
  
!   cmd="${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml"
!   echo "Generating docbook PDF... ($cmd)"
!   $cmd
    docbook_pdf_size="`calcsize $PACKAGE-db.pdf`"
    mv $PACKAGE-db.pdf $outdir/
  fi
***************
*** 248,274 ****
  echo Writing index file...
  curdate="`date '+%B %d, %Y'`"
  sed \
!    -e "s/%%TITLE%%/$MANUAL_TITLE/g" \
!    -e "s/%%DATE%%/$curdate/g" \
!    -e "s/%%PACKAGE%%/$PACKAGE/g" \
!    -e "s/%%HTML_MONO_SIZE%%/$html_mono_size/g" \
!    -e "s/%%HTML_MONO_GZ_SIZE%%/$html_mono_gz_size/g" \
!    -e "s/%%HTML_NODE_TGZ_SIZE%%/$html_node_tgz_size/g" \
!    -e "s/%%INFO_TGZ_SIZE%%/$info_tgz_size/g" \
!    -e "s/%%DVI_GZ_SIZE%%/$dvi_gz_size/g" \
!    -e "s/%%PDF_SIZE%%/$pdf_size/g" \
!    -e "s/%%PS_GZ_SIZE%%/$ps_gz_size/g" \
!    -e "s/%%ASCII_SIZE%%/$ascii_size/g" \
!    -e "s/%%ASCII_GZ_SIZE%%/$ascii_gz_size/g" \
!    -e "s/%%TEXI_TGZ_SIZE%%/$texi_tgz_size/g" \
!    -e "s/%%DOCBOOK_HTML_NODE_TGZ_SIZE%%/$html_node_db_tgz_size/g" \
!    -e "s/%%DOCBOOK_ASCII_SIZE%%/$docbook_ascii_size/g" \
!    -e "s/%%DOCBOOK_PS_GZ_SIZE%%/$docbook_ps_gz_size/g" \
!    -e "s/%%DOCBOOK_PDF_SIZE%%/$docbook_pdf_size/g" \
!    -e "s/%%DOCBOOK_XML_SIZE%%/$docbook_xml_size/g" \
!    -e "s/%%DOCBOOK_XML_GZ_SIZE%%/$docbook_xml_gz_size/g" \
     -e "s,%%SCRIPTURL%%,$scripturl,g" \
!    -e "s/%%SCRIPTNAME%%/$prog/g" \
  $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
  
  echo "Done!  See $outdir/ subdirectory for new files."
--- 259,285 ----
  echo Writing index file...
  curdate="`date '+%B %d, %Y'`"
  sed \
!    -e "s!%%TITLE%%!$MANUAL_TITLE!g" \
!    -e "s!%%DATE%%!$curdate!g" \
!    -e "s!%%PACKAGE%%!$PACKAGE!g" \
!    -e "s!%%HTML_MONO_SIZE%%!$html_mono_size!g" \
!    -e "s!%%HTML_MONO_GZ_SIZE%%!$html_mono_gz_size!g" \
!    -e "s!%%HTML_NODE_TGZ_SIZE%%!$html_node_tgz_size!g" \
!    -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \
!    -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \
!    -e "s!%%PDF_SIZE%%!$pdf_size!g" \
!    -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \
!    -e "s!%%ASCII_SIZE%%!$ascii_size!g" \
!    -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \
!    -e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \
!    -e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \
!    -e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \
!    -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \
!    -e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \
!    -e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \
!    -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \
     -e "s,%%SCRIPTURL%%,$scripturl,g" \
!    -e "s!%%SCRIPTNAME%%!$prog!g" \
  $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
  
  echo "Done!  See $outdir/ subdirectory for new files."
P ChangeLog
P makeinfo/.gdbinit
P util/gendocs.sh