shishi-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS shishi/doc

From: shishi-commit
Subject: CVS shishi/doc
Date: Tue, 09 Nov 2004 19:38:06 +0100 
Update of /home/cvs/shishi/doc
In directory dopio:/tmp/cvs-serv4490

Modified Files:
        gendocs_template gendocs.sh 
Log Message:
Update.

--- /home/cvs/shishi/doc/gendocs_template       2004/09/08 15:58:04     1.5
+++ /home/cvs/shishi/doc/gendocs_template       2004/11/09 18:38:06     1.6
@@ -1,75 +1,108 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: gendocs_template,v 1.2 2004/01/08 19:39:06 karl Exp $ -->
-<HTML>
-<HEAD>
-<TITLE>%%TITLE%% manual - GNU Project - Free Software Foundation (FSF)</TITLE>
-<LINK REV="made" HREF="mailto:address@hidden";>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" 
VLINK="#9900DD">
-<H1>%%TITLE%% manual</H1>
-<ADDRESS>Free Software Foundation</ADDRESS>
-<ADDRESS>last updated %%DATE%%</ADDRESS>
-<P>
-<A HREF="/graphics/gnu-head.jpg"><IMG SRC="/graphics/gnu-head-sm.jpg"
-   ALT=" [image of the head of a GNU] "
-   WIDTH="129" HEIGHT="122"></A>
-<A HREF="/philosophy/gif.html">(no gifs due to patent problems)</A>
-<HR>
-
-<P>This manual (for %%PACKAGE%%) is available in the following formats:
-
-<P>
-<UL>
-  <LI><A HREF="%%PACKAGE%%.html">HTML 
-      (%%HTML_MONO_SIZE%%K characters)</A> - entirely on one web page.
-  <LI><A HREF="html_node/index.html">HTML</a> - with one web page per node.
-  <LI><A HREF="%%PACKAGE%%.html.gz">HTML compressed
-      (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</A> - entirely on 
-      one web page.
-  <LI><A HREF="%%PACKAGE%%_html_node.tar.gz">HTML compressed
-       (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
-       with one web page per node.
-  <LI><A HREF="%%PACKAGE%%-info.tar.gz">Info document
-      (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</A>.
-  <LI><A HREF="%%PACKAGE%%.txt">ASCII text
-      (%%ASCII_SIZE%%K characters)</A>.
-  <LI><A HREF="%%PACKAGE%%.txt.gz">ASCII text compressed
-      (%%ASCII_GZ_SIZE%%K gzipped characters)</A>.
-  <LI><A HREF="%%PACKAGE%%.dvi.gz">TeX dvi file
-      (%%DVI_GZ_SIZE%%K characters gzipped)</A>.
-  <LI><A href="%%PACKAGE%%.ps.gz">PostScript file
-      (%%PS_GZ_SIZE%%K characters gzipped)</a>.
-  <LI><A href="%%PACKAGE%%.pdf">PDF file
-      (%%PDF_SIZE%%K characters)</a>.
-  <LI><A HREF="%%PACKAGE%%.texi.tar.gz">Texinfo source
-      (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</A>
-  <P>
-</UL>
-
-<P>Documentation is also available in a few experimental formats:
-
-<P>
-<UL>
-  <LI><A HREF="../reference/c4.html">GTK-DOC HTML</A>.
-  <LI><A HREF="../components.png">Image with developer and API information, in 
PNG</A>.
-</UL>
-
-<P><SMALL>(This page generated by the <A
-HREF="%%SCRIPTURL%%">%%SCRIPTNAME%%</A> script.)</SMALL>
-
-<HR>
-Return to the <A HREF="/home.html">GNU Project home page</A>.
-
-<P>Comments and corrections for these web pages to
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-send other FSF &amp; GNU questions and inquiries to
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-<A HREF="/home.html#ContactInfo">Other ways to contact the FSF</A>.
-
-<P>Copyright (C) 2003 Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA  02111,  USA
-
-<P>Verbatim copying and distribution of this entire article is
-permitted in any medium, provided this notice is preserved.<HR>
-</BODY>
-</HTML>
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- $Id: gendocs_template,v 1.6 2004/09/23 13:16:19 karl Exp $ -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
+
+<head>
+<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
+<meta http-equiv="content-type" content='text/html; charset=utf-8' />
+<link rel="stylesheet" type="text/css" href="/gnu.css" />
+<link rev="made" href="address@hidden" />
+</head>
+
+<!-- This document is in XML, and xhtml 1.0 -->
+<!-- Please make sure to properly nest your tags -->
+<!-- and ensure that your final document validates -->
+<!-- consistent with W3C xhtml 1.0 and CSS standards -->
+<!-- See validator.w3.org -->
+
+<body>
+
+<h3>%%TITLE%%</h3>
+
+<address>Free Software Foundation</address>
+<address>last updated %%DATE%%</address>
+<p>
+<a href="/graphics/gnu-head.jpg">
+       <img src="/graphics/gnu-head-sm.jpg"
+       alt=" [image of the head of a GNU] "
+       width="129" height="122" />
+</a>
+<a href="/philosophy/gif.html">(no gifs due to patent problems)</a>
+</p>
+<hr />
+
+<p>This manual (%%PACKAGE%%) is available in the following formats:</p>
+
+<ul>
+  <li><a href="%%PACKAGE%%.html">HTML 
+      (%%HTML_MONO_SIZE%%K characters)</a> - entirely on one web page.</li>
+  <li><a href="html_node/index.html">HTML</a> - with one web page per
+      node.</li>
+  <li><a href="%%PACKAGE%%.html.gz">HTML compressed
+      (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on 
+      one web page.</li>
+  <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed
+      (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
+      with one web page per node.</li>
+  <li><a href="%%PACKAGE%%.info.tar.gz">Info document
+      (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</a>.</li>
+  <li><a href="%%PACKAGE%%.txt">ASCII text
+      (%%ASCII_SIZE%%K characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
+      (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
+      (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
+  <li><a href="%%PACKAGE%%.ps.gz">PostScript file
+      (%%PS_GZ_SIZE%%K characters gzipped)</a>.</li>
+  <li><a href="%%PACKAGE%%.pdf">PDF file
+      (%%PDF_SIZE%%K characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
+      (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</a></li>
+</ul>
+
+<p>Documentation is also available in a few experimental formats:
+
+<ul>
+  <li><a href="../reference/">HTML API Reference Manual (GTK-DOC)</a>.</li>
+  <li><a href="../reference/gsasl.devhelp">DevHelp API Reference Manual 
(GTK-DOC)</a>.</li>
+  <li><a href="../components.png">PNG image with developer and API 
information</a>.</li>
+</ul>
+
+<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
+script</a>.)</p>
+
+<div class="copyright">
+<p>
+Return to the <a href="/home.html">GNU Project home page</a>.
+</p>
+
+<p>
+Please send FSF &amp; GNU inquiries to 
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
+the FSF.
+<br />
+Please send broken links and other corrections (or suggestions) to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Copyright (C) 2004 Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111, USA
+<br />
+Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2004/09/23 13:16:19 $ $Author: karl $
+<!-- timestamp end -->
+</p>
+</div>
+
+</body>
+</html>
--- /home/cvs/shishi/doc/gendocs.sh     2004/01/22 17:44:05     1.6
+++ /home/cvs/shishi/doc/gendocs.sh     2004/11/09 18:38:06     1.7
@@ -1,7 +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.3 2004/01/14 16:54:25 karl Exp $
+# $Id: gendocs.sh,v 1.13 2004/09/01 11:40:20 karl Exp $
 # 
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 #
@@ -39,7 +39,7 @@
 : ${GENDOCS_TEMPLATE_DIR="."}
 unset CDPATH
 
-rcs_revision='$Revision: 1.3 $'
+rcs_revision='$Revision: 1.13 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 version="gendocs.sh $rcs_version
@@ -146,16 +146,18 @@
 
 echo Generating output formats for $srcfile
 
-echo Generating info files...
-${MAKEINFO} -o $PACKAGE.info $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`"
+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
+cmd="${TEXI2DVI} $srcfile"
+echo "Generating dvi ... ($cmd)"
+$cmd
 
 # now, before we compress dvi:
 echo Generating postscript...
@@ -169,84 +171,87 @@
 dvi_gz_size="`calcsize $PACKAGE.dvi.gz`"
 mv $PACKAGE.dvi.gz $outdir/
 
-echo Generating pdf ...
-${TEXI2DVI} --pdf $srcfile
+cmd="${TEXI2DVI} --pdf $srcfile"
+echo "Generating pdf ... ($cmd)"
+$cmd
 pdf_size="`calcsize $PACKAGE.pdf`"
 mv $PACKAGE.pdf $outdir/
 
-echo Generating ASCII...
-${MAKEINFO} -o - --no-split --no-headers $srcfile > ${srcdir}/$PACKAGE.txt
+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/
 
-echo Generating monolithic html...
+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
-${MAKEINFO} --no-split --html $html $srcfile
+$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/
 
-echo Generating html by node...
-${MAKEINFO} --html $html $srcfile
-if test -d $PACKAGE; then
-  split_html_dir=$PACKAGE
-elif test -d $PACKAGE.html; then
-  split_html_dir=$PACKAGE.html
-else 
-  echo "$0: can't find split html dir for $srcfile." >&2
-fi
+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
-  tar -czf ../$outdir/${PACKAGE}_html_node.tar.gz -- *.html
+  tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html
 )
-html_node_tgz_size="`calcsize $outdir/${PACKAGE}_html_node.tar.gz`"
+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}
 
 echo Making .tar.gz for sources...
-srcfiles=`ls *.texinfo *.texi *.txi 2>/dev/null`
-tar czfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
+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
-  echo Generating docbook XML...
-  ${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml
+  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/
 
-  echo Generating docbook HTML...
+  cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml"
+  echo "Generating docbook HTML... ($cmd)"
+  $cmd
   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
+    tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html
   )
-  html_node_db_tgz_size="`calcsize $outdir/${PACKAGE}_html_node_db.tar.gz`"
+  html_node_db_tgz_size="`calcsize $outdir/${PACKAGE}.html_node_db.tar.gz`"
   rm -f $outdir/html_node_db/*.html
   mkdir -p $outdir/html_node_db
   mv ${split_html_db_dir}/*.html $outdir/html_node_db/
   rmdir ${split_html_db_dir}
 
-  echo Generating docbook ASCII...
-  ${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml
+  cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml"
+  echo "Generating docbook ASCII... ($cmd)"
+  $cmd
   docbook_ascii_size="`calcsize $PACKAGE-db.txt`"
   mv $PACKAGE-db.txt $outdir/
 
-  echo Generating docbook PS...
-  ${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml
+  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/
 
-  echo Generating docbook PDF...
-  ${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml
+  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
@@ -254,27 +259,27 @@
 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!%%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" \
+   -e "s!%%SCRIPTNAME%%!$prog!g" \
 $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
 
 echo "Done!  See $outdir/ subdirectory for new files."
reply via email to
[Prev in Thread] Current Thread [Next in Thread]