mirror of
https://https.git.savannah.gnu.org/git/autoconf.git
synced 2026-01-26 15:03:22 +00:00
Maintainer cleanups.
* cfg.mk (web-manual): Use new feature of gendocs. (fetch): Fetch gendocs. * Makefile.am (EXTRA_DIST): Distribute new file. * doc/Makefile.am (EXTRA_DIST): Likewise. * .gitattributes: Ignore whitespace in upstream files. * HACKING (Other web updates): Update Free Software Directory instructions. (Upload): No longer mention xdelta. * maint.mk (xd-delta): Likewise. * build-aux/gendocs.sh: New upstream file. * doc/gendocs_template: Likewise. * build-aux/announce-gen: Resync from upstream. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * build-aux/gnupload: Likewise. * build-aux/texinfo.tex: Likewise. Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake
parent
064ceeafb9
commit
8aa9813801
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -12,3 +12,5 @@ fdl.texi -whitespace
|
||||
fdl-1.3.texi -whitespace
|
||||
make-stds.texi -whitespace
|
||||
standards.texi -whitespace
|
||||
gendocs.sh -whitespace
|
||||
gendocs_template -whitespace
|
||||
|
||||
24
ChangeLog
24
ChangeLog
@ -1,3 +1,23 @@
|
||||
2009-01-06 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Maintainer cleanups.
|
||||
* cfg.mk (web-manual): Use new feature of gendocs.
|
||||
(fetch): Fetch gendocs.
|
||||
* Makefile.am (EXTRA_DIST): Distribute new file.
|
||||
* doc/Makefile.am (EXTRA_DIST): Likewise.
|
||||
* .gitattributes: Ignore whitespace in upstream files.
|
||||
* HACKING (Other web updates): Update Free Software Directory
|
||||
instructions.
|
||||
(Upload): No longer mention xdelta.
|
||||
* maint.mk (xd-delta): Likewise.
|
||||
* build-aux/gendocs.sh: New upstream file.
|
||||
* doc/gendocs_template: Likewise.
|
||||
* build-aux/announce-gen: Resync from upstream.
|
||||
* build-aux/config.guess: Likewise.
|
||||
* build-aux/config.sub: Likewise.
|
||||
* build-aux/gnupload: Likewise.
|
||||
* build-aux/texinfo.tex: Likewise.
|
||||
|
||||
2008-12-30 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Make it easier to track diversion bugs.
|
||||
@ -18628,8 +18648,8 @@
|
||||
coding: utf-8
|
||||
End:
|
||||
|
||||
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free
|
||||
Software Foundation, Inc.
|
||||
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
Copying and distribution of this file, with or without
|
||||
modification, are permitted provided the copyright notice and this
|
||||
|
||||
12
HACKING
12
HACKING
@ -136,7 +136,7 @@ If it fails, run `git tag -d v<version>', fix the problems, and go
|
||||
back to the step of setting the version.
|
||||
|
||||
** Upload
|
||||
Put the tarballs/xdeltas where they should be, using the instructions
|
||||
Put the tarballs where they should be, using the instructions
|
||||
regarding gnupload that were printed during the previous step. Verify
|
||||
that the files are correctly uploaded before sending a release
|
||||
announcement.
|
||||
@ -162,14 +162,14 @@ generated output do not get expanded improperly.
|
||||
|
||||
Post a news blurb on https://savannah.gnu.org/projects/autoconf.
|
||||
|
||||
Update the Free Software Directory: Checkout the CVS source, then
|
||||
after making edits, mail the diff to <bug-directory@gnu.org>.
|
||||
$ cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/directory \
|
||||
co directory/autoconf.txt
|
||||
Update the Free Software Directory: browse to:
|
||||
http://directory.fsf.org/project/autoconf/
|
||||
and send an email to <bug-directory@gnu.org> mentioning any content
|
||||
that needs to be updated.
|
||||
|
||||
-----
|
||||
|
||||
Copyright (C) 2002, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002, 2008, 2009 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,7 +1,7 @@
|
||||
# Make Autoconf.
|
||||
|
||||
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free
|
||||
# Software Foundation, Inc.
|
||||
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008,
|
||||
# 2009 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
|
||||
@ -26,6 +26,7 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
|
||||
BUGS COPYINGv3 \
|
||||
GNUmakefile maint.mk cfg.mk \
|
||||
build-aux/gendocs.sh \
|
||||
build-aux/git-version-gen \
|
||||
build-aux/announce-gen build-aux/gnupload \
|
||||
.prev-version .version
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/perl -w
|
||||
# Generate a release announcement message.
|
||||
|
||||
my $VERSION = '2008-10-10 05:12'; # UTC
|
||||
my $VERSION = '2008-12-02 16:28'; # UTC
|
||||
# The definition above must lie within the first 8 lines in order
|
||||
# for the Emacs time-stamp write hook (at end) to update it.
|
||||
# If you change this file with Emacs, please let the write hook
|
||||
@ -429,11 +429,13 @@ sub get_tool_versions ($$)
|
||||
my $tgz = "$my_distdir.tar.gz";
|
||||
my $tbz = "$my_distdir.tar.bz2";
|
||||
my $lzma = "$my_distdir.tar.lzma";
|
||||
my $xz = "$my_distdir.tar.xz";
|
||||
|
||||
my $xd = "$package_name-$prev_version-$curr_version.xdelta";
|
||||
|
||||
my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma);
|
||||
my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma, $xz);
|
||||
@tarballs
|
||||
or die "$ME: none of $tgz, $tbz, or $lzma were found\n";
|
||||
or die "$ME: none of $tgz, $tbz, $lzma or $xz were found\n";
|
||||
my @sizable = @tarballs;
|
||||
-f $xd
|
||||
and push @sizable, $xd;
|
||||
|
||||
27
build-aux/config.guess
vendored
27
build-aux/config.guess
vendored
@ -4,7 +4,7 @@
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2008-09-28'
|
||||
timestamp='2008-12-19'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@ -331,7 +331,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
eval $set_cc_for_build
|
||||
SUN_ARCH="i386"
|
||||
# If there is a compiler, see if it is configured for 64-bit objects.
|
||||
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
|
||||
# This test works for both compilers.
|
||||
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
grep IS_64BIT_ARCH >/dev/null
|
||||
then
|
||||
SUN_ARCH="x86_64"
|
||||
fi
|
||||
fi
|
||||
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
sun4*:SunOS:6*:*)
|
||||
# According to config.sub, this is the proper way to canonicalize
|
||||
@ -1141,6 +1154,16 @@ EOF
|
||||
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
||||
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||
&& { echo i486-ncr-sysv4; exit; } ;;
|
||||
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
|
||||
OS_REL='.3'
|
||||
test -r /etc/.relid \
|
||||
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||
&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
|
||||
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
|
||||
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; }
|
||||
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
|
||||
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
||||
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
|
||||
echo m68k-unknown-lynxos${UNAME_RELEASE}
|
||||
exit ;;
|
||||
|
||||
10
build-aux/config.sub
vendored
10
build-aux/config.sub
vendored
@ -4,7 +4,7 @@
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2008-09-08'
|
||||
timestamp='2008-12-11'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@ -249,6 +249,7 @@ case $basic_machine in
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| lm32 \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
| maxq | mb | microblaze | mcore | mep | metag \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
@ -279,7 +280,7 @@ case $basic_machine in
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
| score \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
@ -331,6 +332,7 @@ case $basic_machine in
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
| lm32-* \
|
||||
| m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
||||
@ -362,7 +364,7 @@ case $basic_machine in
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
@ -1182,7 +1184,7 @@ case $basic_machine in
|
||||
we32k)
|
||||
basic_machine=we32k-att
|
||||
;;
|
||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||
|
||||
361
build-aux/gendocs.sh
Executable file
361
build-aux/gendocs.sh
Executable file
@ -0,0 +1,361 @@
|
||||
#!/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.
|
||||
|
||||
scriptversion=2009-01-02.08
|
||||
|
||||
# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
||||
# 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
|
||||
# the Free Software Foundation; either version 3 of the License,
|
||||
# or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# Original author: Mohit Agarwal.
|
||||
# Send bug reports and any other correspondence to bug-texinfo@gnu.org.
|
||||
|
||||
prog=`basename "$0"`
|
||||
srcdir=`pwd`
|
||||
|
||||
scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh"
|
||||
templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template"
|
||||
|
||||
: ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
|
||||
: ${MAKEINFO="makeinfo"}
|
||||
: ${TEXI2DVI="texi2dvi -t @finalout"}
|
||||
: ${DVIPS="dvips"}
|
||||
: ${DOCBOOK2HTML="docbook2html"}
|
||||
: ${DOCBOOK2PDF="docbook2pdf"}
|
||||
: ${DOCBOOK2PS="docbook2ps"}
|
||||
: ${DOCBOOK2TXT="docbook2txt"}
|
||||
: ${GENDOCS_TEMPLATE_DIR="."}
|
||||
: ${TEXI2HTML="texi2html"}
|
||||
unset CDPATH
|
||||
unset use_texi2html
|
||||
|
||||
version="gendocs.sh $scriptversion
|
||||
|
||||
Copyright 2009 Free Software Foundation, Inc.
|
||||
There is NO warranty. You may redistribute this software
|
||||
under the terms of the GNU General Public License.
|
||||
For more information about these matters, see the files named COPYING."
|
||||
|
||||
usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
|
||||
|
||||
Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source.
|
||||
See the GNU Maintainers document for a more extensive discussion:
|
||||
http://www.gnu.org/prep/maintain_toc.html
|
||||
|
||||
Options:
|
||||
-o OUTDIR write files into OUTDIR, instead of manual/.
|
||||
--email ADR use ADR as contact in generated web pages.
|
||||
--docbook convert to DocBook too (xml, txt, html, pdf and ps).
|
||||
--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.
|
||||
|
||||
Simple example: $prog --email bug-gnu-emacs@gnu.org emacs \"GNU Emacs Manual\"
|
||||
|
||||
Typical sequence:
|
||||
cd PACKAGESOURCE/doc
|
||||
wget \"$scripturl\"
|
||||
wget \"$templateurl\"
|
||||
$prog --email BUGLIST MANUAL \"GNU MANUAL - One-line description\"
|
||||
|
||||
Output will be in a new subdirectory \"manual\" (by default, use -o OUTDIR
|
||||
to override). Move all the new files into your web CVS tree, as
|
||||
explained in the Web Pages node of maintain.texi.
|
||||
|
||||
Please use the --email ADDRESS option to specify your bug-reporting
|
||||
address in the generated HTML pages.
|
||||
|
||||
MANUAL-TITLE is included as part of the HTML <title> of the overall
|
||||
manual/index.html file. It should include the name of the package being
|
||||
documented. manual/index.html is created by substitution from the file
|
||||
$GENDOCS_TEMPLATE_DIR/gendocs_template. (Feel free to modify the
|
||||
generic template for your own purposes.)
|
||||
|
||||
If you have several manuals, you'll need to run this script several
|
||||
times with different MANUAL values, specifying a different output
|
||||
directory with -o each time. Then write (by hand) an overall index.html
|
||||
with links to them all.
|
||||
|
||||
If a manual's Texinfo sources are spread across several directories,
|
||||
first copy or symlink all Texinfo sources into a single directory.
|
||||
(Part of the script's work is to make a tar.gz of the sources.)
|
||||
|
||||
You can set the environment variables MAKEINFO, TEXI2DVI, and DVIPS to
|
||||
control the programs that get executed, and GENDOCS_TEMPLATE_DIR to
|
||||
control where the gendocs_template file is looked for. (With --docbook,
|
||||
the environment variables DOCBOOK2HTML, DOCBOOK2PDF, DOCBOOK2PS, and
|
||||
DOCBOOK2TXT are also respected.)
|
||||
|
||||
By default, makeinfo is run in the default (English) locale, since
|
||||
that's the language of most Texinfo manuals. If you happen to have a
|
||||
non-English manual and non-English web site, see the SETLANG setting
|
||||
in the source.
|
||||
|
||||
Email bug reports or enhancement requests to bug-texinfo@gnu.org.
|
||||
"
|
||||
|
||||
calcsize()
|
||||
{
|
||||
size=`ls -ksl $1 | awk '{print $1}'`
|
||||
echo $size
|
||||
}
|
||||
|
||||
MANUAL_TITLE=
|
||||
PACKAGE=
|
||||
EMAIL=webmasters@gnu.org # please override with --email
|
||||
htmlarg=
|
||||
outdir=manual
|
||||
|
||||
while test $# -gt 0; do
|
||||
case $1 in
|
||||
--email) shift; EMAIL=$1;;
|
||||
--help) echo "$usage"; exit 0;;
|
||||
--version) echo "$version"; exit 0;;
|
||||
-o) shift; outdir=$1;;
|
||||
--docbook) docbook=yes;;
|
||||
--html) shift; htmlarg=$1;;
|
||||
--texi2html) use_texi2html=1;;
|
||||
-*)
|
||||
echo "$0: Unknown option \`$1'." >&2
|
||||
echo "$0: Try \`--help' for more information." >&2
|
||||
exit 1;;
|
||||
*)
|
||||
if test -z "$PACKAGE"; then
|
||||
PACKAGE=$1
|
||||
elif test -z "$MANUAL_TITLE"; then
|
||||
MANUAL_TITLE=$1
|
||||
else
|
||||
echo "$0: extra non-option argument \`$1'." >&2
|
||||
exit 1
|
||||
fi;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test -s "$srcdir/$PACKAGE.texinfo"; then
|
||||
srcfile=$srcdir/$PACKAGE.texinfo
|
||||
elif test -s "$srcdir/$PACKAGE.texi"; then
|
||||
srcfile=$srcdir/$PACKAGE.texi
|
||||
elif test -s "$srcdir/$PACKAGE.txi"; then
|
||||
srcfile=$srcdir/$PACKAGE.txi
|
||||
else
|
||||
echo "$0: cannot find .texinfo or .texi or .txi for $PACKAGE in $srcdir." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test ! -r $GENDOCS_TEMPLATE_DIR/gendocs_template; then
|
||||
echo "$0: cannot read $GENDOCS_TEMPLATE_DIR/gendocs_template." >&2
|
||||
echo "$0: it is available from $templateurl." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case $outdir in
|
||||
/*) dotdot_outdir="$outdir";;
|
||||
*) dotdot_outdir="../$outdir";;
|
||||
esac
|
||||
|
||||
echo Generating output formats for $srcfile
|
||||
|
||||
cmd="$SETLANG $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`
|
||||
# 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)"
|
||||
eval "$cmd"
|
||||
|
||||
# now, before we compress dvi:
|
||||
echo Generating postscript...
|
||||
${DVIPS} $PACKAGE -o
|
||||
gzip -f -9 $PACKAGE.ps
|
||||
ps_gz_size=`calcsize $PACKAGE.ps.gz`
|
||||
mv $PACKAGE.ps.gz $outdir/
|
||||
|
||||
# compress/finish dvi:
|
||||
gzip -f -9 $PACKAGE.dvi
|
||||
dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
|
||||
mv $PACKAGE.dvi.gz $outdir/
|
||||
|
||||
cmd="${TEXI2DVI} --pdf \"$srcfile\""
|
||||
echo "Generating pdf ... ($cmd)"
|
||||
eval "$cmd"
|
||||
pdf_size=`calcsize $PACKAGE.pdf`
|
||||
mv $PACKAGE.pdf $outdir/
|
||||
|
||||
cmd="$SETLANG $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`
|
||||
mv $PACKAGE.txt $outdir/
|
||||
|
||||
html_split()
|
||||
{
|
||||
opt="--split=$1 $htmlarg --node-files"
|
||||
cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $opt \"$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 $dotdot_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
|
||||
opt="--no-split --html -o $PACKAGE.html $htmlarg"
|
||||
cmd="$SETLANG $MAKEINFO $opt \"$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 $htmlarg \"$srcfile\""
|
||||
echo "Generating html by node... ($cmd)"
|
||||
eval "$cmd"
|
||||
split_html_dir=$PACKAGE.html
|
||||
(
|
||||
cd ${split_html_dir} || exit 1
|
||||
tar -czf $dotdot_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 $htmlarg \"$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`
|
||||
tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
|
||||
texi_tgz_size=`calcsize $outdir/$PACKAGE.texi.tar.gz`
|
||||
|
||||
if test -n "$docbook"; then
|
||||
cmd="$SETLANG $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)"
|
||||
eval "$cmd"
|
||||
split_html_db_dir=html_node_db
|
||||
(
|
||||
cd ${split_html_db_dir} || exit 1
|
||||
tar -czf $dotdot_outdir/${PACKAGE}.html_node_db.tar.gz -- *.html
|
||||
)
|
||||
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}
|
||||
|
||||
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
|
||||
|
||||
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=`$SETLANG date '+%B %d, %Y'`
|
||||
sed \
|
||||
-e "s!%%TITLE%%!$MANUAL_TITLE!g" \
|
||||
-e "s!%%EMAIL%%!$EMAIL!g" \
|
||||
-e "s!%%PACKAGE%%!$PACKAGE!g" \
|
||||
-e "s!%%DATE%%!$curdate!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!%%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" \
|
||||
-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 "$CONDS" \
|
||||
$GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
|
||||
|
||||
echo "Done, see $outdir/ subdirectory for new files."
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-end: "$"
|
||||
# End:
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Sign files and upload them.
|
||||
|
||||
scriptversion=2008-04-02.19
|
||||
scriptversion=2008-11-12.21
|
||||
|
||||
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
|
||||
#
|
||||
@ -24,10 +24,12 @@ set -e
|
||||
|
||||
GPG='gpg --batch --no-tty'
|
||||
to=
|
||||
delete=false
|
||||
|
||||
usage="Usage: $0 [OPTIONS]... FILES...
|
||||
|
||||
Sign all FILES, and upload them to selected destinations, according to
|
||||
Sign all FILES, and upload them to (or delete them from) selected
|
||||
destinations, according to
|
||||
<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>.
|
||||
|
||||
Options:
|
||||
@ -35,6 +37,7 @@ Options:
|
||||
--to DEST specify one destination for FILES
|
||||
(multiple --to options are allowed)
|
||||
--user NAME sign with key NAME
|
||||
--delete delete FILES from destination instead of uploading
|
||||
--version output version information and exit
|
||||
|
||||
Recognized destinations are:
|
||||
@ -45,9 +48,14 @@ Recognized destinations are:
|
||||
build directive files and upload files by FTP
|
||||
[user@]host:DIRECTORY upload files with scp
|
||||
|
||||
Deletion only works for ftp.gnu.org and alpha.gnu.org (using the
|
||||
archive: directive). Otherwise it is a no-op. Deleting a file foo also
|
||||
deletes foo.sig; do not specify the .sig explicitly.
|
||||
|
||||
Simple single-target single-file examples:
|
||||
gnupload --to alpha.gnu.org:automake automake-1.8.2b.tar.gz
|
||||
gnupload --to ftp.gnu.org:automake automake-1.8.3.tar.gz
|
||||
gnupload --to alpha.gnu.org:automake --delete automake-oops.tar.gz
|
||||
|
||||
Multiple-target multiple-file example:
|
||||
gnupload --to sources.redhat.com:~ftp/pub/automake \\
|
||||
@ -59,6 +67,10 @@ Send patches to <automake-patches@gnu.org>."
|
||||
|
||||
while test -n "$1"; do
|
||||
case $1 in
|
||||
--delete)
|
||||
delete=true
|
||||
shift
|
||||
;;
|
||||
--help)
|
||||
echo "$usage"
|
||||
exit $?
|
||||
@ -96,23 +108,25 @@ while test -n "$1"; do
|
||||
done
|
||||
|
||||
if test $# = 0; then
|
||||
echo "$0: No file to upload" 1>&2
|
||||
echo "$0: No file to upload or delete" 1>&2
|
||||
exit 1
|
||||
else
|
||||
:
|
||||
fi
|
||||
|
||||
# Make sure all files exist. We don't want to ask
|
||||
# for the passphrase if the script will fail.
|
||||
for file
|
||||
do
|
||||
if test ! -f $file; then
|
||||
echo "$0: Cannot find \`$file'" 1>&2
|
||||
exit 1
|
||||
else
|
||||
:
|
||||
fi
|
||||
done
|
||||
if $delete; then :; else
|
||||
# Make sure all files exist. We don't want to ask
|
||||
# for the passphrase if the script will fail.
|
||||
for file
|
||||
do
|
||||
if test ! -f $file; then
|
||||
echo "$0: Cannot find \`$file'" 1>&2
|
||||
exit 1
|
||||
else
|
||||
:
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Make sure passphrase is not exported in the environment.
|
||||
unset passphrase
|
||||
@ -129,27 +143,39 @@ read -r passphrase
|
||||
stty echo
|
||||
echo
|
||||
|
||||
for file
|
||||
do
|
||||
echo "Signing $file..."
|
||||
rm -f $file.sig
|
||||
echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file
|
||||
done
|
||||
# Nothing to sign if deleting.
|
||||
if $delete; then :; else
|
||||
for file
|
||||
do
|
||||
echo "Signing $file..."
|
||||
rm -f $file.sig
|
||||
echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file
|
||||
done
|
||||
fi
|
||||
|
||||
for dest in $to
|
||||
do
|
||||
for file
|
||||
do
|
||||
echo "Uploading $file to $dest..."
|
||||
files="$file $file.sig"
|
||||
# Prepare arguments.
|
||||
if $delete; then
|
||||
echo "Removing $file from $dest..."
|
||||
files= # nothing to upload if deleting
|
||||
directive="archive: $file"
|
||||
else
|
||||
echo "Uploading $file to $dest..."
|
||||
files="$file $file.sig"
|
||||
directive="filename: "`basename -- "$file"`
|
||||
fi
|
||||
destdir=`echo $dest | sed 's/[^:]*://'`
|
||||
|
||||
case $dest in
|
||||
alpha.gnu.org:*)
|
||||
rm -f $file.directive $file.directive.asc
|
||||
cat >$file.directive<<EOF
|
||||
version: 1.1
|
||||
directory: $destdir
|
||||
filename: `basename -- "$file"`
|
||||
$directive
|
||||
EOF
|
||||
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
|
||||
ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
|
||||
@ -160,20 +186,24 @@ EOF
|
||||
cat >$file.directive<<EOF
|
||||
version: 1.1
|
||||
directory: $destdir
|
||||
filename: `basename -- "$file"`
|
||||
$directive
|
||||
EOF
|
||||
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
|
||||
ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc
|
||||
rm -f $file.directive $file.directive.asc
|
||||
;;
|
||||
savannah.gnu.org:*)
|
||||
ncftpput savannah.gnu.org /incoming/savannah/$destdir $files
|
||||
# We only know how to implement delete for {ftp,alpha}.gnu.org.
|
||||
$delete \
|
||||
|| ncftpput savannah.gnu.org /incoming/savannah/$destdir $files
|
||||
;;
|
||||
savannah.nongnu.org:*)
|
||||
ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files
|
||||
$delete \
|
||||
|| ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files
|
||||
;;
|
||||
*)
|
||||
scp $files $dest
|
||||
$delete \
|
||||
|| scp $files $dest
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2008-11-09.14}
|
||||
\def\texinfoversion{2009-01-01.14}
|
||||
%
|
||||
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
% 2007, 2008 Free Software Foundation, Inc.
|
||||
% 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||
%
|
||||
% This texinfo.tex file is free software: you can redistribute it and/or
|
||||
% modify it under the terms of the GNU General Public License as
|
||||
@ -98,6 +98,9 @@
|
||||
\let\ptexstar=\*
|
||||
\let\ptext=\t
|
||||
\let\ptextop=\top
|
||||
{\catcode`\'=\active
|
||||
\global\let\ptexquoteright'}% Math-mode def from plain.tex.
|
||||
\let\ptexraggedright=\raggedright
|
||||
|
||||
% If this character appears in an error message or help string, it
|
||||
% starts a new line in the output.
|
||||
@ -945,6 +948,8 @@ where each line of input produces a line of output.}
|
||||
\catcode`>=\other
|
||||
\catcode`+=\other
|
||||
\catcode`-=\other
|
||||
\catcode`\`=\other
|
||||
\catcode`\'=\other
|
||||
}
|
||||
|
||||
\def\pushthisfilestack{%
|
||||
@ -1143,11 +1148,13 @@ where each line of input produces a line of output.}
|
||||
\catcode`< = \active
|
||||
\catcode`> = \active
|
||||
\catcode`+ = \active
|
||||
\catcode`' = \active
|
||||
\gdef\mathactive{%
|
||||
\let^ = \ptexhat
|
||||
\let< = \ptexless
|
||||
\let> = \ptexgtr
|
||||
\let+ = \ptexplus
|
||||
\let' = \ptexquoteright
|
||||
}
|
||||
}
|
||||
|
||||
@ -1329,7 +1336,10 @@ output) for that.)}
|
||||
\def\cmykDarkRed{0.28 1 1 0.35}
|
||||
\def\cmykBlack{0 0 0 1}
|
||||
%
|
||||
\def\pdfsetcolor#1{\pdfliteral{#1 k}}
|
||||
% k sets the color for filling (usual text, etc.);
|
||||
% K sets the color for stroking (thin rules, e.g., normal _'s).
|
||||
\def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}}
|
||||
%
|
||||
% Set color, and create a mark which defines \thiscolor accordingly,
|
||||
% so that \makeheadline knows which color to restore.
|
||||
\def\setcolor#1{%
|
||||
@ -1568,6 +1578,9 @@ output) for that.)}
|
||||
\def\@{@}%
|
||||
\let\/=\empty
|
||||
\makevalueexpandable
|
||||
% \indexnofonts -- is that what we want?
|
||||
\def\var##1{##1}%
|
||||
%
|
||||
\leavevmode\setcolor{\urlcolor}%
|
||||
\startlink attr{/Border [0 0 0]}%
|
||||
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
|
||||
@ -1598,6 +1611,7 @@ output) for that.)}
|
||||
\setcolor{\linkcolor}#1\endlink}
|
||||
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
|
||||
\else
|
||||
% non-pdf mode
|
||||
\let\pdfmkdest = \gobble
|
||||
\let\pdfurl = \gobble
|
||||
\let\endlink = \relax
|
||||
@ -2342,6 +2356,16 @@ end
|
||||
\def\lsize{smaller}\def\lllsize{smaller}%
|
||||
\resetmathfonts \setleading{9.5pt}}
|
||||
|
||||
% Fonts for short table of contents.
|
||||
\setfont\shortcontrm\rmshape{12}{1000}{OT1}
|
||||
\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
|
||||
\setfont\shortcontsl\slshape{12}{1000}{OT1}
|
||||
\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
|
||||
|
||||
% Define these just so they can be easily changed for other fonts.
|
||||
\def\angleleft{$\langle$}
|
||||
\def\angleright{$\rangle$}
|
||||
|
||||
% Set the fonts to use with the @small... environments.
|
||||
\let\smallexamplefonts = \smallfonts
|
||||
|
||||
@ -2355,28 +2379,128 @@ end
|
||||
%
|
||||
% By the way, for comparison, here's what fits with @example (10pt):
|
||||
% 8.5x11=71 smallbook=60 a4=75 a5=58
|
||||
%
|
||||
% I wish the USA used A4 paper.
|
||||
% --karl, 24jan03.
|
||||
|
||||
|
||||
% Set up the default fonts, so we can use them for creating boxes.
|
||||
%
|
||||
\definetextfontsizexi
|
||||
|
||||
% Define these so they can be easily changed for other fonts.
|
||||
\def\angleleft{$\langle$}
|
||||
\def\angleright{$\rangle$}
|
||||
|
||||
\message{markup,}
|
||||
|
||||
% Check if we are currently using a typewriter font. Since all the
|
||||
% Computer Modern typewriter fonts have zero interword stretch (and
|
||||
% shrink), and it is reasonable to expect all typewriter fonts to have
|
||||
% this property, we can check that font parameter.
|
||||
%
|
||||
\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
|
||||
|
||||
% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
|
||||
% define and register \INITMACRO to be called on markup style changes.
|
||||
% \INITMACRO can check \currentmarkupstyle for the innermost
|
||||
% style and the set of \ifmarkupSTYLE switches for all styles
|
||||
% currently in effect.
|
||||
\newif\ifmarkupvar
|
||||
\newif\ifmarkupsamp
|
||||
\newif\ifmarkupkey
|
||||
%\newif\ifmarkupfile % @file == @samp.
|
||||
%\newif\ifmarkupoption % @option == @samp.
|
||||
\newif\ifmarkupcode
|
||||
\newif\ifmarkupkbd
|
||||
%\newif\ifmarkupenv % @env == @code.
|
||||
%\newif\ifmarkupcommand % @command == @code.
|
||||
\newif\ifmarkuptex % @tex (and part of @math, for now).
|
||||
\newif\ifmarkupexample
|
||||
\newif\ifmarkupverb
|
||||
\newif\ifmarkupverbatim
|
||||
|
||||
\let\currentmarkupstyle\empty
|
||||
|
||||
\def\setupmarkupstyle#1{%
|
||||
\csname markup#1true\endcsname
|
||||
\def\currentmarkupstyle{#1}%
|
||||
\markupstylesetup
|
||||
}
|
||||
|
||||
\let\markupstylesetup\empty
|
||||
|
||||
\def\defmarkupstylesetup#1{%
|
||||
\expandafter\def\expandafter\markupstylesetup
|
||||
\expandafter{\markupstylesetup #1}%
|
||||
\def#1%
|
||||
}
|
||||
|
||||
% Markup style setup for left and right quotes.
|
||||
\defmarkupstylesetup\markupsetuplq{%
|
||||
\expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
|
||||
\ifx\temp\relax \markupsetuplqdefault \else \temp \fi
|
||||
}
|
||||
|
||||
\defmarkupstylesetup\markupsetuprq{%
|
||||
\expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
|
||||
\ifx\temp\relax \markupsetuprqdefault \else \temp \fi
|
||||
}
|
||||
|
||||
{
|
||||
\catcode`\'=\active
|
||||
\catcode`\`=\active
|
||||
|
||||
\gdef\markupsetuplqdefault{\let`\lq}
|
||||
\gdef\markupsetuprqdefault{\let'\rq}
|
||||
|
||||
\gdef\markupsetcodequoteleft{\let`\codequoteleft}
|
||||
\gdef\markupsetcodequoteright{\let'\codequoteright}
|
||||
|
||||
\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
|
||||
}
|
||||
|
||||
\let\markupsetuplqcode \markupsetcodequoteleft
|
||||
\let\markupsetuprqcode \markupsetcodequoteright
|
||||
\let\markupsetuplqexample \markupsetcodequoteleft
|
||||
\let\markupsetuprqexample \markupsetcodequoteright
|
||||
\let\markupsetuplqverb \markupsetcodequoteleft
|
||||
\let\markupsetuprqverb \markupsetcodequoteright
|
||||
\let\markupsetuplqverbatim \markupsetcodequoteleft
|
||||
\let\markupsetuprqverbatim \markupsetcodequoteright
|
||||
|
||||
\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
|
||||
\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
|
||||
|
||||
% Allow an option to not replace quotes with a regular directed right
|
||||
% quote/apostrophe (char 0x27), but instead use the undirected quote
|
||||
% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
|
||||
% the default, but it works for pasting with more pdf viewers (at least
|
||||
% evince), the lilypond developers report. xpdf does work with the
|
||||
% regular 0x27.
|
||||
%
|
||||
\def\codequoteright{%
|
||||
\expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
|
||||
\expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
|
||||
'%
|
||||
\else \char'15 \fi
|
||||
\else \char'15 \fi
|
||||
}
|
||||
%
|
||||
% and a similar option for the left quote char vs. a grave accent.
|
||||
% Modern fonts display ASCII 0x60 as a grave accent, so some people like
|
||||
% the code environments to do likewise.
|
||||
%
|
||||
\def\codequoteleft{%
|
||||
\expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
|
||||
\expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
|
||||
% [Knuth] pp. 380,381,391
|
||||
% \relax disables Spanish ligatures ?` and !` of \tt font.
|
||||
\relax`%
|
||||
\else \char'22 \fi
|
||||
\else \char'22 \fi
|
||||
}
|
||||
|
||||
% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
|
||||
\def\noligaturesquoteleft{\relax\lq}
|
||||
|
||||
% Count depth in font-changes, for error checks
|
||||
\newcount\fontdepth \fontdepth=0
|
||||
|
||||
% Fonts for short table of contents.
|
||||
\setfont\shortcontrm\rmshape{12}{1000}{OT1}
|
||||
\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
|
||||
\setfont\shortcontsl\slshape{12}{1000}{OT1}
|
||||
\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
|
||||
|
||||
%% Add scribe-like font environments, plus @l for inline lisp (usually sans
|
||||
%% serif) and @ii for TeX italic
|
||||
|
||||
@ -2391,17 +2515,22 @@ end
|
||||
% @var is set to this for defun arguments.
|
||||
\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
|
||||
|
||||
% like \smartslanted except unconditionally use \sl. We never want
|
||||
% @cite is like \smartslanted except unconditionally use \sl. We never want
|
||||
% ttsl for book titles, do we?
|
||||
\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
|
||||
|
||||
\let\i=\smartitalic
|
||||
\let\slanted=\smartslanted
|
||||
\let\var=\smartslanted
|
||||
\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
|
||||
\let\dfn=\smartslanted
|
||||
\let\emph=\smartitalic
|
||||
|
||||
% @b, explicit bold.
|
||||
% Explicit font changes: @r, @sc, undocumented @ii.
|
||||
\def\r#1{{\rm #1}} % roman font
|
||||
\def\sc#1{{\smallcaps#1}} % smallcaps font
|
||||
\def\ii#1{{\it #1}} % italic font
|
||||
|
||||
% @b, explicit bold. Also @strong.
|
||||
\def\b#1{{\bf #1}}
|
||||
\let\strong=\b
|
||||
|
||||
@ -2433,22 +2562,35 @@ end
|
||||
\catcode`@=\other
|
||||
\def\endofsentencespacefactor{3000}% default
|
||||
|
||||
% @t, explicit typewriter.
|
||||
\def\t#1{%
|
||||
{\tt \rawbackslash \plainfrenchspacing #1}%
|
||||
\null
|
||||
}
|
||||
\def\samp#1{`\tclose{#1}'\null}
|
||||
\setfont\keyrm\rmshape{8}{1000}{OT1}
|
||||
\font\keysy=cmsy9
|
||||
\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
|
||||
\raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
|
||||
\vbox{\hrule\kern-0.4pt
|
||||
\hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
|
||||
\kern-0.4pt\hrule}%
|
||||
\kern-.06em\raise0.4pt\hbox{\angleright}}}}
|
||||
\def\key #1{{\nohyphenation \uppercase{#1}}\null}
|
||||
% The old definition, with no lozenge:
|
||||
%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
|
||||
|
||||
% @samp.
|
||||
\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
|
||||
|
||||
% definition of @key that produces a lozenge. Doesn't adjust to text size.
|
||||
%\setfont\keyrm\rmshape{8}{1000}{OT1}
|
||||
%\font\keysy=cmsy9
|
||||
%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
|
||||
% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
|
||||
% \vbox{\hrule\kern-0.4pt
|
||||
% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
|
||||
% \kern-0.4pt\hrule}%
|
||||
% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
|
||||
|
||||
% definition of @key with no lozenge. If the current font is already
|
||||
% monospace, don't change it; that way, we respect @kbdinputstyle. But
|
||||
% if it isn't monospace, then use \tt.
|
||||
%
|
||||
\def\key#1{{\setupmarkupstyle{key}
|
||||
\nohyphenation
|
||||
\ifmonospace\else\tt\fi
|
||||
#1}\null}
|
||||
|
||||
% ctrl is no longer a Texinfo command.
|
||||
\def\ctrl #1{{\tt \rawbackslash \hat}#1}
|
||||
|
||||
% @file, @option are the same as @samp.
|
||||
@ -2493,9 +2635,8 @@ end
|
||||
\global\let'=\rq \global\let`=\lq % default definitions
|
||||
%
|
||||
\global\def\code{\begingroup
|
||||
\catcode\rquoteChar=\active \catcode\lquoteChar=\active
|
||||
\let'\codequoteright \let`\codequoteleft
|
||||
%
|
||||
\setupmarkupstyle{code}%
|
||||
% The following should really be moved into \setupmarkupstyle handlers.
|
||||
\catcode\dashChar=\active \catcode\underChar=\active
|
||||
\ifallowcodebreaks
|
||||
\let-\codedash
|
||||
@ -2547,6 +2688,7 @@ end
|
||||
|
||||
% @kbd is like @code, except that if the argument is just one @key command,
|
||||
% then @kbd has no effect.
|
||||
\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
|
||||
|
||||
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
|
||||
% `example' (@kbd uses ttsl only inside of @example and friends),
|
||||
@ -2568,14 +2710,14 @@ end
|
||||
\def\wordexample{example}
|
||||
\def\wordcode{code}
|
||||
|
||||
% Default is `distinct.'
|
||||
% Default is `distinct'.
|
||||
\kbdinputstyle distinct
|
||||
|
||||
\def\xkey{\key}
|
||||
\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
|
||||
\ifx\one\xkey\ifx\threex\three \key{#2}%
|
||||
\else{\tclose{\kbdfont\look}}\fi
|
||||
\else{\tclose{\kbdfont\look}}\fi}
|
||||
\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
|
||||
\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
|
||||
|
||||
% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
|
||||
\let\indicateurl=\code
|
||||
@ -2638,30 +2780,16 @@ end
|
||||
\let\email=\uref
|
||||
\fi
|
||||
|
||||
% Check if we are currently using a typewriter font. Since all the
|
||||
% Computer Modern typewriter fonts have zero interword stretch (and
|
||||
% shrink), and it is reasonable to expect all typewriter fonts to have
|
||||
% this property, we can check that font parameter.
|
||||
%
|
||||
\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
|
||||
|
||||
% Typeset a dimension, e.g., `in' or `pt'. The only reason for the
|
||||
% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
|
||||
%
|
||||
\def\dmn#1{\thinspace #1}
|
||||
|
||||
\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
|
||||
|
||||
% @l was never documented to mean ``switch to the Lisp font'',
|
||||
% and it is not used as such in any manual I can find. We need it for
|
||||
% Polish suppressed-l. --karl, 22sep96.
|
||||
%\def\l#1{{\li #1}\null}
|
||||
|
||||
% Explicit font changes: @r, @sc, undocumented @ii.
|
||||
\def\r#1{{\rm #1}} % roman font
|
||||
\def\sc#1{{\smallcaps#1}} % smallcaps font
|
||||
\def\ii#1{{\it #1}} % italic font
|
||||
|
||||
% @acronym for "FBI", "NATO", and the like.
|
||||
% We print this one point size smaller, since it's intended for
|
||||
% all-uppercase.
|
||||
@ -2687,6 +2815,44 @@ end
|
||||
\fi
|
||||
}
|
||||
|
||||
|
||||
\message{glyphs,}
|
||||
|
||||
% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
|
||||
%
|
||||
% Since these characters are used in examples, they should be an even number of
|
||||
% \tt widths. Each \tt character is 1en, so two makes it 1em.
|
||||
%
|
||||
\def\point{$\star$}
|
||||
\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
|
||||
\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
|
||||
\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
|
||||
\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
|
||||
\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
|
||||
|
||||
% The @error{} command.
|
||||
% Adapted from the TeXbook's \boxit.
|
||||
%
|
||||
\newbox\errorbox
|
||||
%
|
||||
{\tentt \global\dimen0 = 3em}% Width of the box.
|
||||
\dimen2 = .55pt % Thickness of rules
|
||||
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
|
||||
\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
|
||||
%
|
||||
\setbox\errorbox=\hbox to \dimen0{\hfil
|
||||
\hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
|
||||
\advance\hsize by -2\dimen2 % Rules.
|
||||
\vbox{%
|
||||
\hrule height\dimen2
|
||||
\hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
|
||||
\vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
|
||||
\kern3pt\vrule width\dimen2}% Space to right.
|
||||
\hrule height\dimen2}
|
||||
\hfil}
|
||||
%
|
||||
\def\error{\leavevmode\lower.7ex\copy\errorbox}
|
||||
|
||||
% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
|
||||
%
|
||||
\def\pounds{{\it\$}}
|
||||
@ -5097,7 +5263,7 @@ end
|
||||
\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
|
||||
\def\chapheadingzzz#1{%
|
||||
{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
||||
\parindent=0pt\raggedright
|
||||
\parindent=0pt\ptexraggedright
|
||||
\rmisbold #1\hfill}}%
|
||||
\bigskip \par\penalty 200\relax
|
||||
\suppressfirstparagraphindent
|
||||
@ -5254,7 +5420,7 @@ end
|
||||
%
|
||||
% Typeset the actual heading.
|
||||
\nobreak % Avoid page breaks at the interline glue.
|
||||
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
|
||||
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
|
||||
\hangindent=\wd0 \centerparametersmaybe
|
||||
\unhbox0 #1\par}%
|
||||
}%
|
||||
@ -5278,7 +5444,7 @@ end
|
||||
%
|
||||
\def\unnchfopen #1{%
|
||||
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
||||
\parindent=0pt\raggedright
|
||||
\parindent=0pt\ptexraggedright
|
||||
\rmisbold #1\hfill}}\bigskip \par\nobreak
|
||||
}
|
||||
\def\chfopen #1#2{\chapoddpage {\chapfonts
|
||||
@ -5357,6 +5523,11 @@ end
|
||||
\fi
|
||||
\fi\fi\fi
|
||||
%
|
||||
% Go into vertical mode. Usually we'll already be there, but we
|
||||
% don't want the following whatsit to end up in a preceding paragraph
|
||||
% if the document didn't happen to have a blank line.
|
||||
\par
|
||||
%
|
||||
% Output the mark. Pass it through \safewhatsit, to take care of
|
||||
% the preceding space.
|
||||
\safewhatsit\domark
|
||||
@ -5406,7 +5577,7 @@ end
|
||||
\nobreak
|
||||
%
|
||||
% Output the actual section heading.
|
||||
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
|
||||
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
|
||||
\hangindent=\wd0 % zero if no section number
|
||||
\unhbox0 #1}%
|
||||
}%
|
||||
@ -5704,46 +5875,12 @@ end
|
||||
\message{environments,}
|
||||
% @foo ... @end foo.
|
||||
|
||||
% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
|
||||
%
|
||||
% Since these characters are used in examples, they should be an even number of
|
||||
% \tt widths. Each \tt character is 1en, so two makes it 1em.
|
||||
%
|
||||
\def\point{$\star$}
|
||||
\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
|
||||
\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
|
||||
\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
|
||||
\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
|
||||
\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
|
||||
|
||||
% The @error{} command.
|
||||
% Adapted from the TeXbook's \boxit.
|
||||
%
|
||||
\newbox\errorbox
|
||||
%
|
||||
{\tentt \global\dimen0 = 3em}% Width of the box.
|
||||
\dimen2 = .55pt % Thickness of rules
|
||||
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
|
||||
\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
|
||||
%
|
||||
\setbox\errorbox=\hbox to \dimen0{\hfil
|
||||
\hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
|
||||
\advance\hsize by -2\dimen2 % Rules.
|
||||
\vbox{%
|
||||
\hrule height\dimen2
|
||||
\hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
|
||||
\vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
|
||||
\kern3pt\vrule width\dimen2}% Space to right.
|
||||
\hrule height\dimen2}
|
||||
\hfil}
|
||||
%
|
||||
\def\error{\leavevmode\lower.7ex\copy\errorbox}
|
||||
|
||||
% @tex ... @end tex escapes into raw Tex temporarily.
|
||||
% One exception: @ is still an escape character, so that @end tex works.
|
||||
% But \@ or @@ will get a plain tex @ character.
|
||||
|
||||
\envdef\tex{%
|
||||
\setupmarkupstyle{tex}%
|
||||
\catcode `\\=0 \catcode `\{=1 \catcode `\}=2
|
||||
\catcode `\$=3 \catcode `\&=4 \catcode `\#=6
|
||||
\catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
|
||||
@ -5753,6 +5890,8 @@ end
|
||||
\catcode `\|=\other
|
||||
\catcode `\<=\other
|
||||
\catcode `\>=\other
|
||||
\catcode`\`=\other
|
||||
\catcode`\'=\other
|
||||
\escapechar=`\\
|
||||
%
|
||||
\let\b=\ptexb
|
||||
@ -5888,6 +6027,7 @@ end
|
||||
|
||||
% This macro is called at the beginning of all the @example variants,
|
||||
% inside a group.
|
||||
\newdimen\nonfillparindent
|
||||
\def\nonfillstart{%
|
||||
\aboveenvbreak
|
||||
\hfuzz = 12pt % Don't be fussy
|
||||
@ -5895,7 +6035,12 @@ end
|
||||
\let\par = \lisppar % don't ignore blank lines
|
||||
\obeylines % each line of input is a line of output
|
||||
\parskip = 0pt
|
||||
% Turn off paragraph indentation but redefine \indent to emulate
|
||||
% the normal \indent.
|
||||
\nonfillparindent=\parindent
|
||||
\parindent = 0pt
|
||||
\let\indent\nonfillindent
|
||||
%
|
||||
\emergencystretch = 0pt % don't try to avoid overfull boxes
|
||||
\ifx\nonarrowing\relax
|
||||
\advance \leftskip by \lispnarrowing
|
||||
@ -5906,6 +6051,24 @@ end
|
||||
\let\exdent=\nofillexdent
|
||||
}
|
||||
|
||||
\begingroup
|
||||
\obeyspaces
|
||||
% We want to swallow spaces (but not other tokens) after the fake
|
||||
% @indent in our nonfill-environments, where spaces are normally
|
||||
% active and set to @tie, resulting in them not being ignored after
|
||||
% @indent.
|
||||
\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
|
||||
\gdef\nonfillindentcheck{%
|
||||
\ifx\temp %
|
||||
\expandafter\nonfillindentgobble%
|
||||
\else%
|
||||
\leavevmode\nonfillindentbox%
|
||||
\fi%
|
||||
}%
|
||||
\endgroup
|
||||
\def\nonfillindentgobble#1{\nonfillindent}
|
||||
\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
|
||||
|
||||
% If you want all examples etc. small: @set dispenvsize small.
|
||||
% If you want even small examples the full size: @set dispenvsize nosmall.
|
||||
% This affects the following displayed environments:
|
||||
@ -5954,7 +6117,7 @@ end
|
||||
%
|
||||
\maketwodispenvs {lisp}{example}{%
|
||||
\nonfillstart
|
||||
\tt\quoteexpand
|
||||
\tt\setupmarkupstyle{example}%
|
||||
\let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
|
||||
\gobble % eat return
|
||||
}
|
||||
@ -5992,6 +6155,30 @@ end
|
||||
\let\Eflushright = \afterenvbreak
|
||||
|
||||
|
||||
% @raggedright does more-or-less normal line breaking but no right
|
||||
% justification. From plain.tex.
|
||||
\envdef\raggedright{%
|
||||
\rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
|
||||
}
|
||||
\let\Eraggedright\par
|
||||
|
||||
\envdef\raggedleft{%
|
||||
\parindent=0pt \leftskip0pt plus2em
|
||||
\spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
|
||||
\hbadness=10000 % Last line will usually be underfull, so turn off
|
||||
% badness reporting.
|
||||
}
|
||||
\let\Eraggedleft\par
|
||||
|
||||
\envdef\raggedcenter{%
|
||||
\parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
|
||||
\spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
|
||||
\hbadness=10000 % Last line will usually be underfull, so turn off
|
||||
% badness reporting.
|
||||
}
|
||||
\let\Eraggedcenter\par
|
||||
|
||||
|
||||
% @quotation does normal linebreaking (hence we can't use \nonfillstart)
|
||||
% and narrows the margins. We keep \parskip nonzero in general, since
|
||||
% we're doing normal filling. So, when using \aboveenvbreak and
|
||||
@ -6058,6 +6245,10 @@ end
|
||||
\do\ \do\\\do\{\do\}\do\$\do\&%
|
||||
\do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
|
||||
\do\<\do\>\do\|\do\@\do+\do\"%
|
||||
% Don't do the quotes -- if we do, @set txicodequoteundirected and
|
||||
% @set txicodequotebacktick will not have effect on @verb and
|
||||
% @verbatim, and ?` and !` ligatures won't get disabled.
|
||||
%\do\`\do\'%
|
||||
}
|
||||
%
|
||||
% [Knuth] p. 380
|
||||
@ -6075,7 +6266,7 @@ end
|
||||
\def\setupverb{%
|
||||
\tt % easiest (and conventionally used) font for verbatim
|
||||
\def\par{\leavevmode\endgraf}%
|
||||
\catcode`\`=\active
|
||||
\setupmarkupstyle{verb}%
|
||||
\tabeightspaces
|
||||
% Respect line breaks,
|
||||
% print special symbols as themselves, and
|
||||
@ -6090,33 +6281,6 @@ end
|
||||
\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
|
||||
%
|
||||
\def\starttabbox{\setbox0=\hbox\bgroup}
|
||||
|
||||
% Allow an option to not replace quotes with a regular directed right
|
||||
% quote/apostrophe (char 0x27), but instead use the undirected quote
|
||||
% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
|
||||
% the default, but it works for pasting with more pdf viewers (at least
|
||||
% evince), the lilypond developers report. xpdf does work with the
|
||||
% regular 0x27.
|
||||
%
|
||||
\def\codequoteright{%
|
||||
\expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
|
||||
\expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
|
||||
'%
|
||||
\else \char'15 \fi
|
||||
\else \char'15 \fi
|
||||
}
|
||||
%
|
||||
% and a similar option for the left quote char vs. a grave accent.
|
||||
% Modern fonts display ASCII 0x60 as a grave accent, so some people like
|
||||
% the code environments to do likewise.
|
||||
%
|
||||
\def\codequoteleft{%
|
||||
\expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
|
||||
\expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
|
||||
\relax`% the \relax disables the `! and `? ligatures
|
||||
\else \char'22 \fi
|
||||
\else \char'22 \fi
|
||||
}
|
||||
%
|
||||
\begingroup
|
||||
\catcode`\^^I=\active
|
||||
@ -6130,13 +6294,6 @@ end
|
||||
\wd0=\dimen0 \box0 \starttabbox
|
||||
}%
|
||||
}
|
||||
\catcode`\'=\active
|
||||
\gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
|
||||
%
|
||||
\catcode`\`=\active
|
||||
\gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
|
||||
%
|
||||
\gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
|
||||
\endgroup
|
||||
|
||||
% start the verbatim environment.
|
||||
@ -6146,9 +6303,8 @@ end
|
||||
% Easiest (and conventionally used) font for verbatim
|
||||
\tt
|
||||
\def\par{\leavevmode\egroup\box0\endgraf}%
|
||||
\catcode`\`=\active
|
||||
\tabexpand
|
||||
\quoteexpand
|
||||
\setupmarkupstyle{verbatim}%
|
||||
% Respect line breaks,
|
||||
% print special symbols as themselves, and
|
||||
% make each space count
|
||||
@ -6487,7 +6643,7 @@ end
|
||||
%
|
||||
% On the other hand, if an argument has two dashes (for instance), we
|
||||
% want a way to get ttsl. Let's try @var for that.
|
||||
\let\var=\ttslanted
|
||||
\def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
|
||||
#1%
|
||||
\sl\hyphenchar\font=45
|
||||
}
|
||||
@ -8892,6 +9048,9 @@ directory should work if nowhere else does.}
|
||||
|
||||
\message{and turning on texinfo input format.}
|
||||
|
||||
% DEL is a comment character, in case @c does not suffice.
|
||||
\catcode`\^^? = 14
|
||||
|
||||
% Define macros to output various characters with catcode for normal text.
|
||||
\catcode`\"=\other
|
||||
\catcode`\~=\other
|
||||
@ -9013,6 +9172,8 @@ directory should work if nowhere else does.}
|
||||
@let>=@normalgreater
|
||||
@let+=@normalplus
|
||||
@let$=@normaldollar %$ font-lock fix
|
||||
@markupsetuplqdefault
|
||||
@markupsetuprqdefault
|
||||
@unsepspaces
|
||||
}
|
||||
|
||||
@ -9051,9 +9212,10 @@ directory should work if nowhere else does.}
|
||||
@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we
|
||||
@c don't make ` and ' active, @code will not get them as active chars.
|
||||
@c Do this last of all since we use ` in the previous @catcode assignments.
|
||||
@c (not ready yet, sigh)
|
||||
@c atcode`@'=@active @let'@rq
|
||||
@c atcode`@`=@active @let`@lq
|
||||
@catcode`@'=@active
|
||||
@catcode`@`=@active
|
||||
@markupsetuplqdefault
|
||||
@markupsetuprqdefault
|
||||
|
||||
@c Local variables:
|
||||
@c eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
|
||||
9
cfg.mk
9
cfg.mk
@ -1,5 +1,6 @@
|
||||
# Customize maint.mk for Autoconf. -*- Makefile -*-
|
||||
# Copyright (C) 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2003, 2004, 2006, 2008, 2009 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
|
||||
@ -49,6 +50,7 @@ fetch:
|
||||
cp $(gnulib_dir)/build-aux/config.guess $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/config.sub $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/elisp-comp $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/gendocs.sh $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/git-version-gen $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/gnupload $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/install-sh $(srcdir)/build-aux
|
||||
@ -57,6 +59,7 @@ fetch:
|
||||
cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
|
||||
cp $(gnulib_dir)/doc/gendocs_template $(srcdir)/doc
|
||||
cp $(gnulib_dir)/doc/gnu-oids.texi $(srcdir)/doc
|
||||
cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc
|
||||
cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc
|
||||
@ -69,7 +72,7 @@ local-checks-to-skip ?= \
|
||||
.PHONY: web-manual
|
||||
web-manual:
|
||||
@cd $(srcdir)/doc ; \
|
||||
GENDOCS_TEMPLATE_DIR=$(gnulib_dir)/doc; export GENDOCS_TEMPLATE_DIR; \
|
||||
$(SHELL) $(gnulib_dir)/build-aux/gendocs.sh autoconf \
|
||||
$(SHELL) ../build-aux/gendocs.sh -o '$(abs_builddir)/doc/manual' \
|
||||
--email $(PACKAGE_BUGREPORT) $(PACKAGE) \
|
||||
"$(PACKAGE_NAME) - Creating Automatic Configuration Scripts"
|
||||
@echo " *** Upload the doc/manual directory to web-cvs."
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Make Autoconf documentation.
|
||||
|
||||
# Copyright (C) 2000, 2001, 2002, 2003, 2007, 2008 Free Software
|
||||
# Copyright (C) 2000, 2001, 2002, 2003, 2007, 2008, 2009 Free Software
|
||||
# Foundation, Inc.
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
@ -24,6 +24,8 @@ info_TEXINFOS = autoconf.texi standards.texi
|
||||
autoconf_TEXINFOS = fdl.texi install.texi
|
||||
standards_TEXINFOS = fdl.texi gnu-oids.texi make-stds.texi
|
||||
|
||||
EXTRA_DIST = gendocs_template
|
||||
|
||||
# Files from texi2dvi that should be removed, but which Automake does
|
||||
# not know.
|
||||
CLEANFILES = autoconf.ACs autoconf.cvs autoconf.MSs autoconf.prs \
|
||||
|
||||
98
doc/gendocs_template
Normal file
98
doc/gendocs_template
Normal file
@ -0,0 +1,98 @@
|
||||
<!--#include virtual="/server/header.html" -->
|
||||
<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
|
||||
<!--#include virtual="/server/banner.html" -->
|
||||
<h2>%%TITLE%%</h2>
|
||||
|
||||
<!-- 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 -->
|
||||
|
||||
<address>Free Software Foundation</address>
|
||||
<address>last updated %%DATE%%</address>
|
||||
|
||||
<p>This manual (%%PACKAGE%%) is available in the following formats:</p>
|
||||
|
||||
<ul>
|
||||
<li><a href="%%PACKAGE%%.html">HTML
|
||||
(%%HTML_MONO_SIZE%%K bytes)</a> - entirely on one web page.</li>
|
||||
<li><a href="html_node/index.html">HTML</a> - with one web page per
|
||||
node.</li>
|
||||
%%IF HTML_SECTION%%
|
||||
<li><a href="html_section/index.html">HTML</a> - with one web page per
|
||||
section.</li>
|
||||
%%ENDIF HTML_SECTION%%
|
||||
%%IF HTML_CHAPTER%%
|
||||
<li><a href="html_chapter/index.html">HTML</a> - with one web page per
|
||||
chapter.</li>
|
||||
%%ENDIF HTML_CHAPTER%%
|
||||
<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>
|
||||
%%IF HTML_SECTION%%
|
||||
<li><a href="%%PACKAGE%%.html_section.tar.gz">HTML compressed
|
||||
(%%HTML_SECTION_TGZ_SIZE%%K gzipped tar file)</a> -
|
||||
with one web page per section.</li>
|
||||
%%ENDIF HTML_SECTION%%
|
||||
%%IF HTML_CHAPTER%%
|
||||
<li><a href="%%PACKAGE%%.html_chapter.tar.gz">HTML compressed
|
||||
(%%HTML_CHAPTER_TGZ_SIZE%%K gzipped tar file)</a> -
|
||||
with one web page per chapter.</li>
|
||||
%%ENDIF HTML_CHAPTER%%
|
||||
<li><a href="%%PACKAGE%%.info.tar.gz">Info document
|
||||
(%%INFO_TGZ_SIZE%%K bytes gzipped tar file)</a>.</li>
|
||||
<li><a href="%%PACKAGE%%.txt">ASCII text
|
||||
(%%ASCII_SIZE%%K bytes)</a>.</li>
|
||||
<li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
|
||||
(%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li>
|
||||
<li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
|
||||
(%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li>
|
||||
<li><a href="%%PACKAGE%%.ps.gz">PostScript file
|
||||
(%%PS_GZ_SIZE%%K bytes gzipped)</a>.</li>
|
||||
<li><a href="%%PACKAGE%%.pdf">PDF file
|
||||
(%%PDF_SIZE%%K bytes)</a>.</li>
|
||||
<li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
|
||||
(%%TEXI_TGZ_SIZE%%K bytes gzipped tar file).</a></li>
|
||||
</ul>
|
||||
|
||||
<p>You can <a href="http://shop.fsf.org/">buy printed copies of
|
||||
some manuals</a> (among other items) from the Free Software Foundation;
|
||||
this helps support FSF activities.</p>
|
||||
|
||||
<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
|
||||
script</a>.)</p>
|
||||
|
||||
<!-- If needed, change the copyright block at the bottom. In general, -->
|
||||
<!-- all pages on the GNU web server should have the section about -->
|
||||
<!-- verbatim copying. Please do NOT remove this without talking -->
|
||||
<!-- with the webmasters first. -->
|
||||
<!-- Please make sure the copyright date is consistent with the document -->
|
||||
<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
|
||||
</div><!-- for id="content", starts in the include above -->
|
||||
<!--#include virtual="/server/footer.html" -->
|
||||
<div id="footer">
|
||||
|
||||
<p>
|
||||
Please send FSF & GNU inquiries to
|
||||
<a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
|
||||
There are also <a href="/contact/">other ways to contact</a>
|
||||
the FSF.
|
||||
<br />
|
||||
Please send broken links and other corrections or suggestions to
|
||||
<a href="mailto:%%EMAIL%%"><em>%%EMAIL%%</em></a>.
|
||||
</p>
|
||||
|
||||
<p>Copyright © 2009 Free Software Foundation, Inc.</p>
|
||||
|
||||
<p>Verbatim copying and distribution of this entire article is
|
||||
permitted in any medium, provided this notice is preserved.</p>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
10
maint.mk
10
maint.mk
@ -2,7 +2,7 @@
|
||||
# This Makefile fragment tries to be general-purpose enough to be
|
||||
# used by at least coreutils, idutils, CPPI, Bison, and Autoconf.
|
||||
|
||||
## Copyright (C) 2001-2008 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2001-2009 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
|
||||
@ -52,7 +52,7 @@ this-vc-tag-regexp = v$(VERSION_REGEXP)
|
||||
my_distdir = $(PACKAGE)-$(VERSION)
|
||||
|
||||
# Old releases are stored here.
|
||||
# Used for diffs and xdeltas.
|
||||
# Used for diffs.
|
||||
release_archive_dir ?= ../release
|
||||
|
||||
# Prevent programs like 'sort' from considering distinct strings to be equal.
|
||||
@ -525,9 +525,8 @@ my-distcheck: $(local-check) $(release_archive_dir)/$(prev-tgz)
|
||||
echo "========================"
|
||||
|
||||
prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
|
||||
xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
|
||||
|
||||
rel-files = $(xd-delta) $(DIST_ARCHIVES)
|
||||
rel-files = $(DIST_ARCHIVES)
|
||||
announcement: NEWS ChangeLog $(rel-files)
|
||||
@$(announce_gen) \
|
||||
--release-type=$(RELEASE_TYPE) \
|
||||
@ -559,9 +558,6 @@ emit_upload_commands:
|
||||
@echo =====================================
|
||||
@echo =====================================
|
||||
|
||||
$(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
|
||||
xdelta delta -9 $^ $@ || :
|
||||
|
||||
.PHONY: alpha beta major
|
||||
alpha beta major: news-date-check changelog-check $(local-check)
|
||||
test $@ = major \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user