texinfo update (Tue Jan 11 17:22:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.446
retrieving revision 1.447
diff -c -r1.446 -r1.447
*** ChangeLog   31 Dec 2004 21:43:12 -0000      1.446
--- ChangeLog   11 Jan 2005 22:06:56 -0000      1.447
***************
*** 1,3 ****
--- 1,10 ----
+ 2005-01-11  Karl Berry  <address@hidden>
+ 
+       * util/gendocs.sh: eval $cmd instead of just $cmd, so allow for
+               embedded quotes.
+       From: Sergey Poznyakoff <address@hidden>,
+       11 Jan 2005 16:16:32 +0200.
+ 
  2004-12-31  Karl Berry  <address@hidden>
  
        * Version 4.8.
Index: util/gendocs.sh
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/gendocs.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** util/gendocs.sh     1 Sep 2004 11:40:20 -0000       1.13
--- util/gendocs.sh     11 Jan 2005 22:06:56 -0000      1.14
***************
*** 1,9 ****
  #!/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.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,9 ----
  #!/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.14 2005/01/11 22:06:56 karl Exp $
  # 
! # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 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
--- 39,45 ----
  : ${GENDOCS_TEMPLATE_DIR="."}
  unset CDPATH
  
! rcs_revision='$Revision: 1.14 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="gendocs.sh $rcs_version
***************
*** 148,154 ****
  
  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`"
--- 148,154 ----
  
  cmd="${MAKEINFO} -o $PACKAGE.info $srcfile"
  echo "Generating info files... ($cmd)"
! eval $cmd
  mkdir -p $outdir/
  tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info*
  info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`"
***************
*** 157,163 ****
  
  cmd="${TEXI2DVI} $srcfile"
  echo "Generating dvi ... ($cmd)"
! $cmd
  
  # now, before we compress dvi:
  echo Generating postscript...
--- 157,163 ----
  
  cmd="${TEXI2DVI} $srcfile"
  echo "Generating dvi ... ($cmd)"
! eval $cmd
  
  # now, before we compress dvi:
  echo Generating postscript...
***************
*** 173,185 ****
  
  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`"
--- 173,185 ----
  
  cmd="${TEXI2DVI} --pdf $srcfile"
  echo "Generating pdf ... ($cmd)"
! eval $cmd
  pdf_size="`calcsize $PACKAGE.pdf`"
  mv $PACKAGE.pdf $outdir/
  
  cmd="${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile"
  echo "Generating ASCII... ($cmd)"
! eval $cmd
  ascii_size="`calcsize $PACKAGE.txt`"
  gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz
  ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`"
***************
*** 188,194 ****
  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`"
--- 188,194 ----
  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
! eval $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`"
***************
*** 196,202 ****
  
  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
--- 196,202 ----
  
  cmd="${MAKEINFO} --html -o $PACKAGE.html $html $srcfile"
  echo "Generating html by node... ($cmd)"
! eval $cmd
  split_html_dir=$PACKAGE.html
  (
    cd ${split_html_dir} || exit 1
***************
*** 224,230 ****
  
    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
--- 224,230 ----
  
    cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml"
    echo "Generating docbook HTML... ($cmd)"
!   eval $cmd
    split_html_db_dir=html_node_db
    (
      cd ${split_html_db_dir} || exit 1
***************
*** 238,257 ****
  
    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
--- 238,257 ----
  
    cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml"
    echo "Generating docbook ASCII... ($cmd)"
!   eval $cmd
    docbook_ascii_size="`calcsize $PACKAGE-db.txt`"
    mv $PACKAGE-db.txt $outdir/
  
    cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml"
    echo "Generating docbook PS... $(cmd)"
!   eval $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)"
!   eval $cmd
    docbook_pdf_size="`calcsize $PACKAGE-db.pdf`"
    mv $PACKAGE-db.pdf $outdir/
  fi
P ChangeLog
P util/gendocs.sh