mirror of
git://git.sv.gnu.org/autoconf
synced 2024-11-21 01:01:48 +08:00
Sync from gnulib.
This commit is contained in:
Paul Eggert
parent
8cc997c106
commit
b79e402506
18
config/config.guess
vendored
18
config/config.guess
vendored
@ -3,7 +3,7 @@
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2004-08-13'
|
||||
timestamp='2004-11-12'
|
||||
|
||||
# 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
|
||||
@ -319,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
*:OS/390:*:*)
|
||||
echo i370-ibm-openedition
|
||||
exit 0 ;;
|
||||
*:z/VM:*:*)
|
||||
echo s390-ibm-zvmoe
|
||||
exit 0 ;;
|
||||
*:OS400:*:*)
|
||||
echo powerpc-ibm-os400
|
||||
exit 0 ;;
|
||||
@ -342,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
DRS?6000:unix:4.0:6*)
|
||||
echo sparc-icl-nx6
|
||||
exit 0 ;;
|
||||
DRS?6000:UNIX_SV:4.2*:7*)
|
||||
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
|
||||
case `/usr/bin/uname -p` in
|
||||
sparc) echo sparc-icl-nx7 && exit 0 ;;
|
||||
esac ;;
|
||||
@ -824,6 +827,12 @@ EOF
|
||||
cris:Linux:*:*)
|
||||
echo cris-axis-linux-gnu
|
||||
exit 0 ;;
|
||||
crisv32:Linux:*:*)
|
||||
echo crisv32-axis-linux-gnu
|
||||
exit 0 ;;
|
||||
frv:Linux:*:*)
|
||||
echo frv-unknown-linux-gnu
|
||||
exit 0 ;;
|
||||
ia64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit 0 ;;
|
||||
@ -1241,7 +1250,10 @@ EOF
|
||||
A*) echo alpha-dec-vms && exit 0 ;;
|
||||
I*) echo ia64-dec-vms && exit 0 ;;
|
||||
V*) echo vax-dec-vms && exit 0 ;;
|
||||
esac
|
||||
esac ;;
|
||||
*:XENIX:*:SysV)
|
||||
echo i386-pc-xenix
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
|
||||
26
config/config.sub
vendored
26
config/config.sub
vendored
@ -3,7 +3,7 @@
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2004-06-24'
|
||||
timestamp='2004-11-30'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@ -237,7 +237,7 @@ case $basic_machine in
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| m32r | m32rle | m68000 | m68k | m88k | mcore \
|
||||
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@ -267,7 +267,7 @@ case $basic_machine in
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
| we32k \
|
||||
| x86 | xscale | xstormy16 | xtensa \
|
||||
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
@ -310,7 +310,7 @@ case $basic_machine in
|
||||
| ip2k-* | iq2000-* \
|
||||
| m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | mcore-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
| mips16-* \
|
||||
| mips64-* | mips64el-* \
|
||||
@ -343,8 +343,8 @@ case $basic_machine in
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
|
||||
| xtensa-* \
|
||||
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
@ -457,6 +457,9 @@ case $basic_machine in
|
||||
crds | unos)
|
||||
basic_machine=m68k-crds
|
||||
;;
|
||||
crisv32 | crisv32-* | etraxfs*)
|
||||
basic_machine=crisv32-axis
|
||||
;;
|
||||
cris | cris-* | etrax*)
|
||||
basic_machine=cris-axis
|
||||
;;
|
||||
@ -486,6 +489,10 @@ case $basic_machine in
|
||||
basic_machine=m88k-motorola
|
||||
os=-sysv3
|
||||
;;
|
||||
djgpp)
|
||||
basic_machine=i586-pc
|
||||
os=-msdosdjgpp
|
||||
;;
|
||||
dpx20 | dpx20-*)
|
||||
basic_machine=rs6000-bull
|
||||
os=-bosx
|
||||
@ -1026,6 +1033,10 @@ case $basic_machine in
|
||||
basic_machine=hppa1.1-winbond
|
||||
os=-proelf
|
||||
;;
|
||||
xbox)
|
||||
basic_machine=i686-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
xps | xps100)
|
||||
basic_machine=xps100-honeywell
|
||||
;;
|
||||
@ -1294,6 +1305,9 @@ case $os in
|
||||
-kaos*)
|
||||
os=-kaos
|
||||
;;
|
||||
-zvmoe)
|
||||
os=-zvmoe
|
||||
;;
|
||||
-none)
|
||||
;;
|
||||
*)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# install - install a program, script, or datafile
|
||||
|
||||
scriptversion=2004-07-05.00
|
||||
scriptversion=2004-12-17.09
|
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||
@ -213,7 +213,7 @@ do
|
||||
fi
|
||||
|
||||
# This sed command emulates the dirname command.
|
||||
dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
||||
dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
|
||||
|
||||
# Make sure that the destination directory exists.
|
||||
|
||||
@ -226,7 +226,8 @@ do
|
||||
oIFS=$IFS
|
||||
# Some sh's can't handle IFS=/ for some reason.
|
||||
IFS='%'
|
||||
set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
|
||||
set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
|
||||
shift
|
||||
IFS=$oIFS
|
||||
|
||||
pathcomp=
|
||||
@ -260,7 +261,7 @@ do
|
||||
rmtmp=$dstdir/_rm.$$_
|
||||
|
||||
# Trap to clean up those temp files at exit.
|
||||
trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
|
||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||
trap '(exit $?); exit' 1 2 13 15
|
||||
|
||||
# Copy the file name to the temp name.
|
||||
@ -295,7 +296,7 @@ do
|
||||
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|
||||
|| {
|
||||
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
|
||||
(exit 1); exit
|
||||
(exit 1); exit 1
|
||||
}
|
||||
else
|
||||
:
|
||||
@ -306,12 +307,12 @@ do
|
||||
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
|
||||
}
|
||||
}
|
||||
fi || { (exit 1); exit; }
|
||||
fi || { (exit 1); exit 1; }
|
||||
done
|
||||
|
||||
# The final little trick to "correctly" pass the exit status to the exit trap.
|
||||
{
|
||||
(exit 0); exit
|
||||
(exit 0); exit 0
|
||||
}
|
||||
|
||||
# Local variables:
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
#! /bin/sh
|
||||
# Common stub for a few missing GNU programs while installing.
|
||||
|
||||
scriptversion=2003-09-02.23
|
||||
scriptversion=2004-09-07.08
|
||||
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
|
||||
# Free Software Foundation, Inc.
|
||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
@ -60,11 +60,6 @@ case "$1" in
|
||||
msg="probably too old"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# If it does not exist, or fails to run (possibly an outdated version),
|
||||
# try to emulate it.
|
||||
case "$1" in
|
||||
|
||||
-h|--h|--he|--hel|--help)
|
||||
echo "\
|
||||
@ -92,10 +87,12 @@ Supported PROGRAM values:
|
||||
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||
|
||||
Send bug reports to <bug-automake@gnu.org>."
|
||||
exit 0
|
||||
;;
|
||||
|
||||
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
||||
echo "missing $scriptversion (GNU Automake)"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
-*)
|
||||
@ -104,12 +101,42 @@ Send bug reports to <bug-automake@gnu.org>."
|
||||
exit 1
|
||||
;;
|
||||
|
||||
aclocal*)
|
||||
esac
|
||||
|
||||
# Now exit if we have it, but it failed. Also exit now if we
|
||||
# don't have it and --version was passed (most likely to detect
|
||||
# the program).
|
||||
case "$1" in
|
||||
lex|yacc)
|
||||
# Not GNU programs, they don't have --version.
|
||||
;;
|
||||
|
||||
tar)
|
||||
if test -n "$run"; then
|
||||
echo 1>&2 "ERROR: \`tar' requires --run"
|
||||
exit 1
|
||||
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||
# Could not run --version or --help. This is probably someone
|
||||
# running `$TOOL --version' or `$TOOL --help' to check whether
|
||||
# $TOOL exists and not knowing $TOOL uses missing.
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# If it does not exist, or fails to run (possibly an outdated version),
|
||||
# try to emulate it.
|
||||
case "$1" in
|
||||
aclocal*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
||||
@ -119,11 +146,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
;;
|
||||
|
||||
autoconf)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`${configure_ac}'. You might want to install the
|
||||
@ -133,11 +155,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
;;
|
||||
|
||||
autoheader)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
||||
@ -157,11 +174,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
;;
|
||||
|
||||
automake*)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
||||
@ -173,11 +185,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
;;
|
||||
|
||||
autom4te)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is needed, but is $msg.
|
||||
You might have modified some files without having the
|
||||
@ -254,11 +261,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
;;
|
||||
|
||||
help2man)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified a dependency of a manual page. You may need the
|
||||
@ -279,11 +281,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
;;
|
||||
|
||||
makeinfo)
|
||||
if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
|
||||
# We have makeinfo, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified a \`.texi' or \`.texinfo' file, or any other file
|
||||
@ -301,10 +298,6 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||
|
||||
tar)
|
||||
shift
|
||||
if test -n "$run"; then
|
||||
echo 1>&2 "ERROR: \`tar' requires --run"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# We have already tried tar in the generic part.
|
||||
# Look for gnutar/gtar before invocation to avoid ugly error
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2004-08-20.06}
|
||||
\def\texinfoversion{2005-01-30.17}
|
||||
%
|
||||
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
|
||||
% Foundation, Inc.
|
||||
%
|
||||
% This texinfo.tex file is free software; you can redistribute it and/or
|
||||
@ -89,10 +89,11 @@
|
||||
\let\ptexhat=^
|
||||
\let\ptexi=\i
|
||||
\let\ptexindent=\indent
|
||||
\let\ptexnoindent=\noindent
|
||||
\let\ptexinsert=\insert
|
||||
\let\ptexlbrace=\{
|
||||
\let\ptexless=<
|
||||
\let\ptexnewwrite\newwrite
|
||||
\let\ptexnoindent=\noindent
|
||||
\let\ptexplus=+
|
||||
\let\ptexrbrace=\}
|
||||
\let\ptexslash=\/
|
||||
@ -1242,13 +1243,13 @@ where each line of input produces a line of output.}
|
||||
% Read toc silently, to get counts of subentries for \pdfoutline.
|
||||
\def\numchapentry##1##2##3##4{%
|
||||
\def\thischapnum{##2}%
|
||||
\let\thissecnum\empty
|
||||
\let\thissubsecnum\empty
|
||||
\def\thissecnum{0}%
|
||||
\def\thissubsecnum{0}%
|
||||
}%
|
||||
\def\numsecentry##1##2##3##4{%
|
||||
\advancenumber{chap\thischapnum}%
|
||||
\def\thissecnum{##2}%
|
||||
\let\thissubsecnum\empty
|
||||
\def\thissubsecnum{0}%
|
||||
}%
|
||||
\def\numsubsecentry##1##2##3##4{%
|
||||
\advancenumber{sec\thissecnum}%
|
||||
@ -1257,9 +1258,9 @@ where each line of input produces a line of output.}
|
||||
\def\numsubsubsecentry##1##2##3##4{%
|
||||
\advancenumber{subsec\thissubsecnum}%
|
||||
}%
|
||||
\let\thischapnum\empty
|
||||
\let\thissecnum\empty
|
||||
\let\thissubsecnum\empty
|
||||
\def\thischapnum{0}%
|
||||
\def\thissecnum{0}%
|
||||
\def\thissubsecnum{0}%
|
||||
%
|
||||
% use \def rather than \let here because we redefine \chapentry et
|
||||
% al. a second time, below.
|
||||
@ -1406,7 +1407,7 @@ where each line of input produces a line of output.}
|
||||
\def\rm{\fam=0 \setfontstyle{rm}}
|
||||
\def\it{\fam=\itfam \setfontstyle{it}}
|
||||
\def\sl{\fam=\slfam \setfontstyle{sl}}
|
||||
\def\bf{\fam=\bffam \setfontstyle{bf}}
|
||||
\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
|
||||
\def\tt{\fam=\ttfam \setfontstyle{tt}}
|
||||
|
||||
% Texinfo sort of supports the sans serif font style, which plain TeX does not.
|
||||
@ -1468,17 +1469,10 @@ where each line of input produces a line of output.}
|
||||
\def\scbshape{csc}
|
||||
|
||||
% Text fonts (11.2pt, magstep1).
|
||||
\newcount\mainmagstep
|
||||
\ifx\bigger\relax
|
||||
% not really supported.
|
||||
\mainmagstep=\magstep1
|
||||
\setfont\textrm\rmshape{12}{1000}
|
||||
\setfont\texttt\ttshape{12}{1000}
|
||||
\else
|
||||
\mainmagstep=\magstephalf
|
||||
\setfont\textrm\rmshape{10}{\mainmagstep}
|
||||
\setfont\texttt\ttshape{10}{\mainmagstep}
|
||||
\fi
|
||||
\def\textnominalsize{11pt}
|
||||
\edef\mainmagstep{\magstephalf}
|
||||
\setfont\textrm\rmshape{10}{\mainmagstep}
|
||||
\setfont\texttt\ttshape{10}{\mainmagstep}
|
||||
\setfont\textbf\bfshape{10}{\mainmagstep}
|
||||
\setfont\textit\itshape{10}{\mainmagstep}
|
||||
\setfont\textsl\slshape{10}{\mainmagstep}
|
||||
@ -1495,6 +1489,7 @@ where each line of input produces a line of output.}
|
||||
\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
|
||||
|
||||
% Fonts for indices, footnotes, small examples (9pt).
|
||||
\def\smallnominalsize{9pt}
|
||||
\setfont\smallrm\rmshape{9}{1000}
|
||||
\setfont\smalltt\ttshape{9}{1000}
|
||||
\setfont\smallbf\bfshape{10}{900}
|
||||
@ -1507,6 +1502,7 @@ where each line of input produces a line of output.}
|
||||
\font\smallsy=cmsy9
|
||||
|
||||
% Fonts for small examples (8pt).
|
||||
\def\smallernominalsize{8pt}
|
||||
\setfont\smallerrm\rmshape{8}{1000}
|
||||
\setfont\smallertt\ttshape{8}{1000}
|
||||
\setfont\smallerbf\bfshape{10}{800}
|
||||
@ -1519,6 +1515,7 @@ where each line of input produces a line of output.}
|
||||
\font\smallersy=cmsy8
|
||||
|
||||
% Fonts for title page (20.4pt):
|
||||
\def\titlenominalsize{20pt}
|
||||
\setfont\titlerm\rmbshape{12}{\magstep3}
|
||||
\setfont\titleit\itbshape{10}{\magstep4}
|
||||
\setfont\titlesl\slbshape{10}{\magstep4}
|
||||
@ -1533,6 +1530,7 @@ where each line of input produces a line of output.}
|
||||
\def\authortt{\sectt}
|
||||
|
||||
% Chapter (and unnumbered) fonts (17.28pt).
|
||||
\def\chapnominalsize{17pt}
|
||||
\setfont\chaprm\rmbshape{12}{\magstep2}
|
||||
\setfont\chapit\itbshape{10}{\magstep3}
|
||||
\setfont\chapsl\slbshape{10}{\magstep3}
|
||||
@ -1545,6 +1543,7 @@ where each line of input produces a line of output.}
|
||||
\font\chapsy=cmsy10 scaled \magstep3
|
||||
|
||||
% Section fonts (14.4pt).
|
||||
\def\secnominalsize{14pt}
|
||||
\setfont\secrm\rmbshape{12}{\magstep1}
|
||||
\setfont\secit\itbshape{10}{\magstep2}
|
||||
\setfont\secsl\slbshape{10}{\magstep2}
|
||||
@ -1557,6 +1556,7 @@ where each line of input produces a line of output.}
|
||||
\font\secsy=cmsy10 scaled \magstep2
|
||||
|
||||
% Subsection fonts (13.15pt).
|
||||
\def\ssecnominalsize{13pt}
|
||||
\setfont\ssecrm\rmbshape{12}{\magstephalf}
|
||||
\setfont\ssecit\itbshape{10}{1315}
|
||||
\setfont\ssecsl\slbshape{10}{1315}
|
||||
@ -1569,6 +1569,7 @@ where each line of input produces a line of output.}
|
||||
\font\ssecsy=cmsy10 scaled 1315
|
||||
|
||||
% Reduced fonts for @acro in text (10pt).
|
||||
\def\reducednominalsize{10pt}
|
||||
\setfont\reducedrm\rmshape{10}{1000}
|
||||
\setfont\reducedtt\ttshape{10}{1000}
|
||||
\setfont\reducedbf\bfshape{10}{1000}
|
||||
@ -1608,6 +1609,7 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
|
||||
\let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
|
||||
\let\tenttsl=\textttsl
|
||||
\def\curfontsize{text}%
|
||||
\def\lsize{reduced}\def\lllsize{smaller}%
|
||||
\resetmathfonts \setleading{\textleading}}
|
||||
\def\titlefonts{%
|
||||
@ -1615,13 +1617,16 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
|
||||
\let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
|
||||
\let\tenttsl=\titlettsl
|
||||
\def\curfontsize{title}%
|
||||
\def\lsize{chap}\def\lllsize{subsec}%
|
||||
\resetmathfonts \setleading{25pt}}
|
||||
\def\titlefont#1{{\titlefonts\rm #1}}
|
||||
\def\chapfonts{%
|
||||
\let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
|
||||
\let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
|
||||
\let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
|
||||
\let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
|
||||
\let\tenttsl=\chapttsl
|
||||
\def\curfontsize{chap}%
|
||||
\def\lsize{sec}\def\lllsize{text}%
|
||||
\resetmathfonts \setleading{19pt}}
|
||||
\def\secfonts{%
|
||||
@ -1629,6 +1634,7 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
|
||||
\let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
|
||||
\let\tenttsl=\secttsl
|
||||
\def\curfontsize{sec}%
|
||||
\def\lsize{subsec}\def\lllsize{reduced}%
|
||||
\resetmathfonts \setleading{16pt}}
|
||||
\def\subsecfonts{%
|
||||
@ -1636,6 +1642,7 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
|
||||
\let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
|
||||
\let\tenttsl=\ssecttsl
|
||||
\def\curfontsize{ssec}%
|
||||
\def\lsize{text}\def\lllsize{small}%
|
||||
\resetmathfonts \setleading{15pt}}
|
||||
\let\subsubsecfonts = \subsecfonts
|
||||
@ -1644,6 +1651,7 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
|
||||
\let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
|
||||
\let\tenttsl=\reducedttsl
|
||||
\def\curfontsize{reduced}%
|
||||
\def\lsize{small}\def\lllsize{smaller}%
|
||||
\resetmathfonts \setleading{10.5pt}}
|
||||
\def\smallfonts{%
|
||||
@ -1651,6 +1659,7 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
|
||||
\let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
|
||||
\let\tenttsl=\smallttsl
|
||||
\def\curfontsize{small}%
|
||||
\def\lsize{smaller}\def\lllsize{smaller}%
|
||||
\resetmathfonts \setleading{10.5pt}}
|
||||
\def\smallerfonts{%
|
||||
@ -1658,6 +1667,7 @@ where each line of input produces a line of output.}
|
||||
\let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
|
||||
\let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
|
||||
\let\tenttsl=\smallerttsl
|
||||
\def\curfontsize{smaller}%
|
||||
\def\lsize{smaller}\def\lllsize{smaller}%
|
||||
\resetmathfonts \setleading{9.5pt}}
|
||||
|
||||
@ -1720,9 +1730,13 @@ where each line of input produces a line of output.}
|
||||
\let\dfn=\smartslanted
|
||||
\let\emph=\smartitalic
|
||||
|
||||
% @b, explicit bold.
|
||||
\def\b#1{{\bf #1}}
|
||||
\let\strong=\b
|
||||
|
||||
% @sansserif, explicit sans.
|
||||
\def\sansserif#1{{\sf #1}}
|
||||
|
||||
% We can't just use \exhyphenpenalty, because that only has effect at
|
||||
% the end of a paragraph. Restore normal hyphenation at the end of the
|
||||
% group within which \nohyphenation is presumably called.
|
||||
@ -1959,6 +1973,54 @@ where each line of input produces a line of output.}
|
||||
%
|
||||
\def\pounds{{\it\$}}
|
||||
|
||||
% @euro{} comes from a separate font, depending on the current style.
|
||||
% We use the free feym* fonts from the eurosym package by Henrik
|
||||
% Theiling, which support regular, slanted, bold and bold slanted (and
|
||||
% "outlined" (blackboard board, sort of) versions, which we don't need).
|
||||
% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
|
||||
%
|
||||
% Although only regular is the truly official Euro symbol, we ignore
|
||||
% that. The Euro is designed to be slightly taller than the regular
|
||||
% font height.
|
||||
%
|
||||
% feymr - regular
|
||||
% feymo - slanted
|
||||
% feybr - bold
|
||||
% feybo - bold slanted
|
||||
%
|
||||
% There is no good (free) typewriter version, to my knowledge.
|
||||
% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
|
||||
% Hmm.
|
||||
%
|
||||
% Also doesn't work in math. Do we need to do math with euro symbols?
|
||||
% Hope not.
|
||||
%
|
||||
%
|
||||
\def\euro{{\eurofont e}}
|
||||
\def\eurofont{%
|
||||
% We set the font at each command, rather than predefining it in
|
||||
% \textfonts and the other font-switching commands, so that
|
||||
% installations which never need the symbol don't have to have the
|
||||
% font installed.
|
||||
%
|
||||
% There is only one designed size (nominal 10pt), so we always scale
|
||||
% that to the current nominal size.
|
||||
%
|
||||
% By the way, simply using "at 1em" works for cmr10 and the like, but
|
||||
% does not work for cmbx10 and other extended/shrunken fonts.
|
||||
%
|
||||
\def\eurosize{\csname\curfontsize nominalsize\endcsname}%
|
||||
%
|
||||
\ifx\curfontstyle\bfstylename
|
||||
% bold:
|
||||
\font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
|
||||
\else
|
||||
% regular:
|
||||
\font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
|
||||
\fi
|
||||
\thiseurofont
|
||||
}
|
||||
|
||||
% @registeredsymbol - R in a circle. The font for the R should really
|
||||
% be smaller yet, but lllsize is the best we can do for now.
|
||||
% Adapted from the plain.tex definition of \copyright.
|
||||
@ -2314,15 +2376,26 @@ where each line of input produces a line of output.}
|
||||
% @table, @ftable, @vtable.
|
||||
\envdef\table{%
|
||||
\let\itemindex\gobble
|
||||
\tablex
|
||||
\tablecheck{table}%
|
||||
}
|
||||
\envdef\ftable{%
|
||||
\def\itemindex ##1{\doind {fn}{\code{##1}}}%
|
||||
\tablex
|
||||
\tablecheck{ftable}%
|
||||
}
|
||||
\envdef\vtable{%
|
||||
\def\itemindex ##1{\doind {vr}{\code{##1}}}%
|
||||
\tablex
|
||||
\tablecheck{vtable}%
|
||||
}
|
||||
\def\tablecheck#1{%
|
||||
\ifnum \the\catcode`\^^M=\active
|
||||
\endgroup
|
||||
\errmessage{This command won't work in this context; perhaps the problem is
|
||||
that we are \inenvironment\thisenv}%
|
||||
\def\next{\doignore{#1}}%
|
||||
\else
|
||||
\let\next\tablex
|
||||
\fi
|
||||
\next
|
||||
}
|
||||
\def\tablex#1{%
|
||||
\def\itemindicate{#1}%
|
||||
@ -2721,19 +2794,17 @@ where each line of input produces a line of output.}
|
||||
\global\setpercentfalse
|
||||
}
|
||||
|
||||
\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
|
||||
% If so, do nothing. If not, give it an appropriate dimension based on
|
||||
% current baselineskip.
|
||||
\def\setmultitablespacing{%
|
||||
\def\multistrut{\strut}% just use the standard line spacing
|
||||
%
|
||||
% Compute \multitablelinespace (if not defined by user) for use in
|
||||
% \multitableparskip calculation. We used define \multistrut based on
|
||||
% this, but (ironically) that caused the spacing to be off.
|
||||
% See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
|
||||
\ifdim\multitablelinespace=0pt
|
||||
\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
|
||||
\global\advance\multitablelinespace by-\ht0
|
||||
%% strut to put in table in case some entry doesn't have descenders,
|
||||
%% to keep lines equally spaced
|
||||
\let\multistrut = \strut
|
||||
\else
|
||||
%% FIXME: what is \box0 supposed to be?
|
||||
\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
|
||||
width0pt\relax} \fi
|
||||
\fi
|
||||
%% Test to see if parskip is larger than space between lines of
|
||||
%% table. If not, do nothing.
|
||||
%% If so, set to same dimension as multitablelinespace.
|
||||
@ -2963,9 +3034,8 @@ width0pt\relax} \fi
|
||||
% Index generation facilities
|
||||
|
||||
% Define \newwrite to be identical to plain tex's \newwrite
|
||||
% except not \outer, so it can be used within \newindex.
|
||||
{\catcode`\@=11
|
||||
\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}}
|
||||
% except not \outer, so it can be used within macros and \if's.
|
||||
\edef\newwrite{\makecsname{ptexnewwrite}}
|
||||
|
||||
% \newindex {foo} defines an index named foo.
|
||||
% It automatically defines \fooindex such that
|
||||
@ -3157,6 +3227,7 @@ width0pt\relax} \fi
|
||||
\definedummyword{enddots}%
|
||||
\definedummyword{equiv}%
|
||||
\definedummyword{error}%
|
||||
\definedummyword{euro}%
|
||||
\definedummyword{expansion}%
|
||||
\definedummyword{minus}%
|
||||
\definedummyword{pounds}%
|
||||
@ -3295,6 +3366,7 @@ width0pt\relax} \fi
|
||||
\def\enddots{...}%
|
||||
\def\equiv{==}%
|
||||
\def\error{error}%
|
||||
\def\euro{euro}%
|
||||
\def\expansion{==>}%
|
||||
\def\minus{-}%
|
||||
\def\pounds{pounds}%
|
||||
@ -3533,7 +3605,10 @@ width0pt\relax} \fi
|
||||
\removelastskip
|
||||
%
|
||||
% We like breaks before the index initials, so insert a bonus.
|
||||
\penalty -300
|
||||
\nobreak
|
||||
\vskip 0pt plus 3\baselineskip
|
||||
\penalty 0
|
||||
\vskip 0pt plus -3\baselineskip
|
||||
%
|
||||
% Typeset the initial. Making this add up to a whole number of
|
||||
% baselineskips increases the chance of the dots lining up from column
|
||||
@ -3543,10 +3618,9 @@ width0pt\relax} \fi
|
||||
% No shrink because it confuses \balancecolumns.
|
||||
\vskip 1.67\baselineskip plus .5\baselineskip
|
||||
\leftline{\secbf #1}%
|
||||
\vskip .33\baselineskip plus .1\baselineskip
|
||||
%
|
||||
% Do our best not to break after the initial.
|
||||
\nobreak
|
||||
\vskip .33\baselineskip plus .1\baselineskip
|
||||
}}
|
||||
|
||||
% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
|
||||
@ -4215,11 +4289,11 @@ width0pt\relax} \fi
|
||||
\ifx\temptype\Ynothingkeyword
|
||||
\setbox0 = \hbox{}%
|
||||
\def\toctype{unnchap}%
|
||||
\def\thischapter{#1}%
|
||||
\gdef\thischapter{#1}%
|
||||
\else\ifx\temptype\Yomitfromtockeyword
|
||||
\setbox0 = \hbox{}% contents like unnumbered, but no toc entry
|
||||
\def\toctype{omit}%
|
||||
\xdef\thischapter{}%
|
||||
\gdef\thischapter{}%
|
||||
\else\ifx\temptype\Yappendixkeyword
|
||||
\setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
|
||||
\def\toctype{app}%
|
||||
@ -6478,6 +6552,9 @@ width0pt\relax} \fi
|
||||
\ifx\captionline\empty \else
|
||||
\vskip.5\parskip
|
||||
\captionline
|
||||
%
|
||||
% Space below caption.
|
||||
\vskip\parskip
|
||||
\fi
|
||||
%
|
||||
% If have an xref label, write the list of floats info. Do this
|
||||
@ -6488,19 +6565,22 @@ width0pt\relax} \fi
|
||||
% caption if specified, else the full caption if specified, else nothing.
|
||||
{%
|
||||
\atdummies \turnoffactive \otherbackslash
|
||||
\immediate\write\auxfile{@xrdef{\floatlabel-lof}{%
|
||||
\floatident
|
||||
\ifx\thisshortcaption\empty
|
||||
\ifx\thiscaption\empty \else : \thiscaption \fi
|
||||
\else
|
||||
: \thisshortcaption
|
||||
\fi
|
||||
}}%
|
||||
% since we read the caption text in the macro world, where ^^M
|
||||
% is turned into a normal character, we have to scan it back, so
|
||||
% we don't write the literal three characters "^^M" into the aux file.
|
||||
\scanexp{%
|
||||
\xdef\noexpand\gtemp{%
|
||||
\ifx\thisshortcaption\empty
|
||||
\thiscaption
|
||||
\else
|
||||
\thisshortcaption
|
||||
\fi
|
||||
}%
|
||||
}%
|
||||
\immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
|
||||
\ifx\gtemp\empty \else : \gtemp \fi}}%
|
||||
}%
|
||||
\fi
|
||||
%
|
||||
% Space below caption, if we printed anything.
|
||||
\ifx\printedsomething\empty \else \vskip\parskip \fi
|
||||
\egroup % end of \vtop
|
||||
%
|
||||
% place the captured inserts
|
||||
|
||||
Loading…
Reference in New Issue
Block a user