# HG changeset patch # User Karl Berry # Date 1196086627 28800 # Node ID 57c865858db0a389c1c07d3868348f12427a452a # Parent d98bd7cfa47325e8b6a79d045f0210dfefe6f343 autoupdate diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh old mode 100755 new mode 100644 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,7 +2,7 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2007-07-01.15 +scriptversion=2007-10-24.16 # Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # @@ -37,7 +37,9 @@ : ${DOCBOOK2PS="docbook2ps"} : ${DOCBOOK2TXT="docbook2txt"} : ${GENDOCS_TEMPLATE_DIR="."} +: ${TEXI2HTML="texi2html"} unset CDPATH +unset use_texi2html version="gendocs.sh $scriptversion @@ -55,7 +57,8 @@ Options: -o OUTDIR write files into OUTDIR, instead of manual/. --docbook convert to DocBook too (xml, txt, html, pdf and ps). - --html ARG pass indicated ARG to makeinfo for HTML targets. + --html ARG pass indicated ARG to makeinfo or texi2html for HTML targets. + --texi2html use texi2html to generate HTML targets. --help display this help and exit successfully. --version display version information and exit successfully. @@ -118,6 +121,8 @@ -o) shift; outdir=$1;; --docbook) docbook=yes;; --html) shift; html=$1;; + --texi2html) use_texi2html=1 + html="$html --node-files";; -*) echo "$0: Unknown or ambiguous option \`$1'." >&2 echo "$0: Try \`--help' for more information." >&2 @@ -193,28 +198,60 @@ ascii_gz_size=`calcsize $outdir/$PACKAGE.txt.gz` mv $PACKAGE.txt $outdir/ -cmd="$SETLANG $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` -mv $PACKAGE.html $outdir/ +html_split() { + cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html --split=$1 $html \"$srcfile\"" + echo "Generating html by $1... ($cmd)" + eval "$cmd" + split_html_dir=$PACKAGE.html + ( + cd ${split_html_dir} || exit 1 + ln -sf ${PACKAGE}.html index.html + tar -czf ../$outdir/${PACKAGE}.html_$1.tar.gz -- *.html + ) + eval html_$1_tgz_size=`calcsize $outdir/${PACKAGE}.html_$1.tar.gz` + rm -f $outdir/html_$1/*.html + mkdir -p $outdir/html_$1/ + mv ${split_html_dir}/*.html $outdir/html_$1/ + rmdir ${split_html_dir} +} + +if test -z "$use_texi2html"; then + cmd="$SETLANG $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` + mv $PACKAGE.html $outdir/ -cmd="$SETLANG $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 - tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html -) -html_node_tgz_size=`calcsize $outdir/${PACKAGE}.html_node.tar.gz` -rm -f $outdir/html_node/*.html -mkdir -p $outdir/html_node/ -mv ${split_html_dir}/*.html $outdir/html_node/ -rmdir ${split_html_dir} + cmd="$SETLANG $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 + tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html + ) + html_node_tgz_size=`calcsize $outdir/${PACKAGE}.html_node.tar.gz` + rm -f $outdir/html_node/*.html + mkdir -p $outdir/html_node/ + mv ${split_html_dir}/*.html $outdir/html_node/ + rmdir ${split_html_dir} +else + cmd="$SETLANG $TEXI2HTML --output $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` + mv $PACKAGE.html $outdir/ + + html_split node + html_split chapter + html_split section +fi echo Making .tar.gz for sources... srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` @@ -265,6 +302,12 @@ fi echo Writing index file... +if test -z "$use_texi2html"; then + CONDS="/%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;\ + /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d" +else + CONDS="/%%ENDIF.*%%/d;/%%IF *HTML_SECTION%%/d;/%%IF *HTML_CHAPTER%%/d" +fi curdate=`date '+%B %d, %Y'` sed \ -e "s!%%TITLE%%!$MANUAL_TITLE!g" \ @@ -273,6 +316,8 @@ -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!%%HTML_SECTION_TGZ_SIZE%%!$html_section_tgz_size!g" \ + -e "s!%%HTML_CHAPTER_TGZ_SIZE%%!$html_chapter_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" \ @@ -288,6 +333,7 @@ -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \ -e "s,%%SCRIPTURL%%,$scripturl,g" \ -e "s!%%SCRIPTNAME%%!$prog!g" \ + -e "$CONDS" \ $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html echo "Done! See $outdir/ subdirectory for new files." diff --git a/doc/gendocs_template b/doc/gendocs_template --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -19,12 +19,30 @@ (%%HTML_MONO_SIZE%%K bytes) - entirely on one web page.
  • HTML - with one web page per node.
    • +%%IF HTML_SECTION%% +
  • HTML - with one web page per + section.
    • +%%ENDIF HTML_SECTION%% +%%IF HTML_CHAPTER%% +
  • HTML - with one web page per + chapter.
    • +%%ENDIF HTML_CHAPTER%%
  • HTML compressed - (%%HTML_MONO_GZ_SIZE%%K bytes gzipped) - entirely on + (%%HTML_MONO_GZ_SIZE%%K gzipped characters) - entirely on one web page.
  • HTML compressed (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file) - with one web page per node.
    • +%%IF HTML_SECTION%% +
  • HTML compressed + (%%HTML_SECTION_TGZ_SIZE%%K gzipped tar file) - + with one web page per section.
    • +%%ENDIF HTML_SECTION%% +%%IF HTML_CHAPTER%% +
  • HTML compressed + (%%HTML_CHAPTER_TGZ_SIZE%%K gzipped tar file) - + with one web page per chapter.
    • +%%ENDIF HTML_CHAPTER%%
  • Info document (%%INFO_TGZ_SIZE%%K bytes gzipped tar file).
  • ASCII text diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min --- a/doc/gendocs_template_min +++ b/doc/gendocs_template_min @@ -37,12 +37,30 @@ (%%HTML_MONO_SIZE%%K bytes) - entirely on one web page.
  • HTML - with one web page per node.
    • +%%IF HTML_SECTION%% +
  • HTML - with one web page per + section.
    • +%%ENDIF HTML_SECTION%% +%%IF HTML_CHAPTER%% +
  • HTML - with one web page per + chapter.
    • +%%ENDIF HTML_CHAPTER%%
  • HTML compressed - (%%HTML_MONO_GZ_SIZE%%K bytes gzipped) - entirely on + (%%HTML_MONO_GZ_SIZE%%K gzipped characters) - entirely on one web page.
  • HTML compressed (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file) - with one web page per node.
    • +%%IF HTML_SECTION%% +
  • HTML compressed + (%%HTML_SECTION_TGZ_SIZE%%K gzipped tar file) - + with one web page per section.
    • +%%ENDIF HTML_SECTION%% +%%IF HTML_CHAPTER%% +
  • HTML compressed + (%%HTML_CHAPTER_TGZ_SIZE%%K gzipped tar file) - + with one web page per chapter.
    • +%%ENDIF HTML_CHAPTER%%
  • Info document (%%INFO_TGZ_SIZE%%K bytes gzipped tar file).
  • ASCII text