* doc/texinfo.tex: New upstream version.
This commit is contained in:
Alexandre Duret-Lutz
parent
4aea8548d3
commit
3aec630540
2 changed files with 418 additions and 202 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
2004-03-08 Alexandre Duret-Lutz <adl@src.lip6.fr>
|
||||||
|
|
||||||
|
* doc/texinfo.tex: New upstream version.
|
||||||
|
|
||||||
2004-02-11 Alexandre Duret-Lutz <adl@src.lip6.fr>
|
2004-02-11 Alexandre Duret-Lutz <adl@src.lip6.fr>
|
||||||
|
|
||||||
* src/ExternalTranslator.cc: Include sys/wait.h.
|
* src/ExternalTranslator.cc: Include sys/wait.h.
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
% Load plain if necessary, i.e., if running under initex.
|
% Load plain if necessary, i.e., if running under initex.
|
||||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||||
%
|
%
|
||||||
\def\texinfoversion{2004-01-05.16}
|
\def\texinfoversion{2004-02-25.17}
|
||||||
%
|
%
|
||||||
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
% 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 Free Software
|
||||||
|
|
@ -174,11 +174,14 @@
|
||||||
\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
|
\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
|
||||||
|
|
||||||
% Hyphenation fixes.
|
% Hyphenation fixes.
|
||||||
\hyphenation{ap-pen-dix}
|
\hyphenation{
|
||||||
\hyphenation{eshell}
|
Flor-i-da Ghost-script Ghost-view Mac-OS ap-pen-dix bit-map bit-maps
|
||||||
\hyphenation{mini-buf-fer mini-buf-fers}
|
data-base data-bases eshell fall-ing half-way long-est man-u-script
|
||||||
\hyphenation{time-stamp}
|
man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
|
||||||
\hyphenation{white-space}
|
par-a-digms rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
|
||||||
|
stand-alone strong-est time-stamp time-stamps which-ever white-space
|
||||||
|
wide-spread wrap-around
|
||||||
|
}
|
||||||
|
|
||||||
% Margin to add to right of even pages, to left of odd pages.
|
% Margin to add to right of even pages, to left of odd pages.
|
||||||
\newdimen\bindingoffset
|
\newdimen\bindingoffset
|
||||||
|
|
@ -603,7 +606,7 @@
|
||||||
% The \TeX{} logo, as in plain, but resetting the spacing so that a
|
% The \TeX{} logo, as in plain, but resetting the spacing so that a
|
||||||
% period following counts as ending a sentence. (Idea found in latex.)
|
% period following counts as ending a sentence. (Idea found in latex.)
|
||||||
%
|
%
|
||||||
\def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor=3000 }
|
\edef\TeX{\TeX \spacefactor=3000 }
|
||||||
|
|
||||||
% @LaTeX{} logo. Not quite the same results as the definition in
|
% @LaTeX{} logo. Not quite the same results as the definition in
|
||||||
% latex.ltx, since we use a different font for the raised A; it's most
|
% latex.ltx, since we use a different font for the raised A; it's most
|
||||||
|
|
@ -972,8 +975,6 @@ where each line of input produces a line of output.}
|
||||||
% By default, we suppress indentation.
|
% By default, we suppress indentation.
|
||||||
%
|
%
|
||||||
\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
|
\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
|
||||||
\newdimen\currentparindent
|
|
||||||
%
|
|
||||||
\def\insertword{insert}
|
\def\insertword{insert}
|
||||||
%
|
%
|
||||||
\parseargdef\firstparagraphindent{%
|
\parseargdef\firstparagraphindent{%
|
||||||
|
|
@ -1110,14 +1111,14 @@ where each line of input produces a line of output.}
|
||||||
% So open here the files we need to have open while reading the input.
|
% So open here the files we need to have open while reading the input.
|
||||||
% This makes it possible to make a .fmt file for texinfo.
|
% This makes it possible to make a .fmt file for texinfo.
|
||||||
\def\setfilename{%
|
\def\setfilename{%
|
||||||
|
\fixbackslash % Turn off hack to swallow `\input texinfo'.
|
||||||
\iflinks
|
\iflinks
|
||||||
\tryauxfile
|
\tryauxfile
|
||||||
% Open the new aux file. TeX will close it automatically at exit.
|
% Open the new aux file. TeX will close it automatically at exit.
|
||||||
\immediate\openout\auxfile=\jobname.aux
|
\immediate\openout\auxfile=\jobname.aux
|
||||||
\fi % \openindices needs to do some work in any case.
|
\fi % \openindices needs to do some work in any case.
|
||||||
\openindices
|
\openindices
|
||||||
\fixbackslash % Turn off hack to swallow `\input texinfo'.
|
\let\setfilename=\comment % Ignore extra @setfilename cmds.
|
||||||
\global\let\setfilename=\comment % Ignore extra @setfilename cmds.
|
|
||||||
%
|
%
|
||||||
% If texinfo.cnf is present on the system, read it.
|
% If texinfo.cnf is present on the system, read it.
|
||||||
% Useful for site-wide @afourpaper, etc.
|
% Useful for site-wide @afourpaper, etc.
|
||||||
|
|
@ -1279,7 +1280,15 @@ where each line of input produces a line of output.}
|
||||||
\def\numsubsubsecentry##1##2##3##4{% count is always zero
|
\def\numsubsubsecentry##1##2##3##4{% count is always zero
|
||||||
\dopdfoutline{##1}{}{##3}{##4}}%
|
\dopdfoutline{##1}{}{##3}{##4}}%
|
||||||
%
|
%
|
||||||
% Make special characters normal for writing to the pdf file.
|
% PDF outlines are displayed using system fonts, instead of
|
||||||
|
% document fonts. Therefore we cannot use special characters,
|
||||||
|
% since the encoding is unknown. For example, the eogonek from
|
||||||
|
% Latin 2 (0xea) gets translated to a | character. Info from
|
||||||
|
% Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
|
||||||
|
%
|
||||||
|
% xx to do this right, we have to translate 8-bit characters to
|
||||||
|
% their "best" equivalent, based on the @documentencoding. Right
|
||||||
|
% now, I guess we'll just let the pdf reader have its way.
|
||||||
\indexnofonts
|
\indexnofonts
|
||||||
\turnoffactive
|
\turnoffactive
|
||||||
\input \jobname.toc
|
\input \jobname.toc
|
||||||
|
|
@ -1316,7 +1325,6 @@ where each line of input produces a line of output.}
|
||||||
\def\ppn#1{\pgn=#1\gobble}
|
\def\ppn#1{\pgn=#1\gobble}
|
||||||
\def\ppnn{\pgn=\first}
|
\def\ppnn{\pgn=\first}
|
||||||
\def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
|
\def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
|
||||||
\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
|
|
||||||
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
|
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
|
||||||
\ifx\PP\D\let\nextsp\relax
|
\ifx\PP\D\let\nextsp\relax
|
||||||
\else\let\nextsp\skipspaces
|
\else\let\nextsp\skipspaces
|
||||||
|
|
@ -1338,14 +1346,13 @@ where each line of input produces a line of output.}
|
||||||
\leavevmode\Red
|
\leavevmode\Red
|
||||||
\startlink attr{/Border [0 0 0]}%
|
\startlink attr{/Border [0 0 0]}%
|
||||||
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
|
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
|
||||||
% #1
|
|
||||||
\endgroup}
|
\endgroup}
|
||||||
\def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
|
\def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
|
||||||
\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
|
\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
|
||||||
\def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
|
\def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
|
||||||
\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
|
\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
|
||||||
\def\maketoks{%
|
\def\maketoks{%
|
||||||
\expandafter\poptoks\the\toksA|ENDTOKS|
|
\expandafter\poptoks\the\toksA|ENDTOKS|\relax
|
||||||
\ifx\first0\adn0
|
\ifx\first0\adn0
|
||||||
\else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
|
\else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
|
||||||
\else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
|
\else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
|
||||||
|
|
@ -2029,11 +2036,12 @@ where each line of input produces a line of output.}
|
||||||
}
|
}
|
||||||
|
|
||||||
% @author should come last, but may come many times.
|
% @author should come last, but may come many times.
|
||||||
|
% It can also be used inside @quotation.
|
||||||
|
%
|
||||||
\parseargdef\author{%
|
\parseargdef\author{%
|
||||||
\def\temp{\quotation}%
|
\def\temp{\quotation}%
|
||||||
\ifx\thisenv\temp
|
\ifx\thisenv\temp
|
||||||
This edition of the manual is dedicated to Karl Berry who should
|
\def\quotationauthor{#1}% printed in \Equotation.
|
||||||
really make affiliations work.
|
|
||||||
\else
|
\else
|
||||||
\checkenv\titlepage
|
\checkenv\titlepage
|
||||||
\ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
|
\ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
|
||||||
|
|
@ -2314,11 +2322,9 @@ where each line of input produces a line of output.}
|
||||||
|
|
||||||
\newcount \itemno
|
\newcount \itemno
|
||||||
|
|
||||||
\envdef\itemize{%
|
\envdef\itemize{\parsearg\doitemize}
|
||||||
\parsearg\itemizey
|
|
||||||
}
|
|
||||||
|
|
||||||
\def\itemizey#1{%
|
\def\doitemize#1{%
|
||||||
\aboveenvbreak
|
\aboveenvbreak
|
||||||
\itemmax=\itemindent
|
\itemmax=\itemindent
|
||||||
\advance\itemmax by -\itemmargin
|
\advance\itemmax by -\itemmargin
|
||||||
|
|
@ -2333,6 +2339,27 @@ where each line of input produces a line of output.}
|
||||||
\let\item=\itemizeitem
|
\let\item=\itemizeitem
|
||||||
}
|
}
|
||||||
|
|
||||||
|
% Definition of @item while inside @itemize and @enumerate.
|
||||||
|
%
|
||||||
|
\def\itemizeitem{%
|
||||||
|
\advance\itemno by 1 % for enumerations
|
||||||
|
{\let\par=\endgraf \smallbreak}% reasonable place to break
|
||||||
|
{%
|
||||||
|
% If the document has an @itemize directly after a section title, a
|
||||||
|
% \nobreak will be last on the list, and \sectionheading will have
|
||||||
|
% done a \vskip-\parskip. In that case, we don't want to zero
|
||||||
|
% parskip, or the item text will crash with the heading. On the
|
||||||
|
% other hand, when there is normal text preceding the item (as there
|
||||||
|
% usually is), we do want to zero parskip, or there would be too much
|
||||||
|
% space. In that case, we won't have a \nobreak before. At least
|
||||||
|
% that's the theory.
|
||||||
|
\ifnum\lastpenalty<10000 \parskip=0in \fi
|
||||||
|
\noindent
|
||||||
|
\hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
|
||||||
|
\vadjust{\penalty 1200}}% not good to break after first line of item.
|
||||||
|
\flushcr
|
||||||
|
}
|
||||||
|
|
||||||
% \splitoff TOKENS\endmark defines \first to be the first token in
|
% \splitoff TOKENS\endmark defines \first to be the first token in
|
||||||
% TOKENS, and \rest to be the remainder.
|
% TOKENS, and \rest to be the remainder.
|
||||||
%
|
%
|
||||||
|
|
@ -2414,13 +2441,13 @@ where each line of input produces a line of output.}
|
||||||
}%
|
}%
|
||||||
}
|
}
|
||||||
|
|
||||||
% Call itemizey, adding a period to the first argument and supplying the
|
% Call \doitemize, adding a period to the first argument and supplying the
|
||||||
% common last two arguments. Also subtract one from the initial value in
|
% common last two arguments. Also subtract one from the initial value in
|
||||||
% \itemno, since @item increments \itemno.
|
% \itemno, since @item increments \itemno.
|
||||||
%
|
%
|
||||||
\def\startenumeration#1{%
|
\def\startenumeration#1{%
|
||||||
\advance\itemno by -1
|
\advance\itemno by -1
|
||||||
\itemizey{#1.}\flushcr
|
\doitemize{#1.}\flushcr
|
||||||
}
|
}
|
||||||
|
|
||||||
% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
|
% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
|
||||||
|
|
@ -2431,16 +2458,6 @@ where each line of input produces a line of output.}
|
||||||
\def\Ealphaenumerate{\Eenumerate}
|
\def\Ealphaenumerate{\Eenumerate}
|
||||||
\def\Ecapsenumerate{\Eenumerate}
|
\def\Ecapsenumerate{\Eenumerate}
|
||||||
|
|
||||||
% Definition of @item while inside @itemize.
|
|
||||||
|
|
||||||
\def\itemizeitem{%
|
|
||||||
\advance\itemno by 1
|
|
||||||
{\let\par=\endgraf \smallbreak}%
|
|
||||||
\ifhmode \errmessage{In hmode at itemizeitem}\fi
|
|
||||||
{\parskip=0in \hskip 0pt
|
|
||||||
\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
|
|
||||||
\vadjust{\penalty 1200}}%
|
|
||||||
\flushcr}
|
|
||||||
|
|
||||||
% @multitable macros
|
% @multitable macros
|
||||||
% Amy Hendrickson, 8/18/94, 3/6/96
|
% Amy Hendrickson, 8/18/94, 3/6/96
|
||||||
|
|
@ -2518,13 +2535,12 @@ where each line of input produces a line of output.}
|
||||||
\def\xcolumnfractions{\columnfractions}
|
\def\xcolumnfractions{\columnfractions}
|
||||||
\newif\ifsetpercent
|
\newif\ifsetpercent
|
||||||
|
|
||||||
% #1 is the part of the @columnfraction before the decimal point, which
|
% #1 is the @columnfraction, usually a decimal number like .5, but might
|
||||||
% is presumably either 0 or the empty string (but we don't check, we
|
% be just 1. We just use it, whatever it is.
|
||||||
% just throw it away). #2 is the decimal part, which we use as the
|
%
|
||||||
% percent of \hsize for this column.
|
\def\pickupwholefraction#1 {%
|
||||||
\def\pickupwholefraction#1.#2 {%
|
|
||||||
\global\advance\colcount by 1
|
\global\advance\colcount by 1
|
||||||
\expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
|
\expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
|
||||||
\setuptable
|
\setuptable
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3073,8 +3089,8 @@ width0pt\relax} \fi
|
||||||
\definedummyword{ss}%
|
\definedummyword{ss}%
|
||||||
\definedummyword{exclamdown}%
|
\definedummyword{exclamdown}%
|
||||||
\definedummyword{questiondown}%
|
\definedummyword{questiondown}%
|
||||||
\definedummyword{ordm}%
|
|
||||||
\definedummyword{ordf}%
|
\definedummyword{ordf}%
|
||||||
|
\definedummyword{ordm}%
|
||||||
%
|
%
|
||||||
% Although these internal commands shouldn't show up, sometimes they do.
|
% Although these internal commands shouldn't show up, sometimes they do.
|
||||||
\definedummyword{bf}%
|
\definedummyword{bf}%
|
||||||
|
|
@ -3088,7 +3104,6 @@ width0pt\relax} \fi
|
||||||
%
|
%
|
||||||
\definedummyword{LaTeX}%
|
\definedummyword{LaTeX}%
|
||||||
\definedummyword{TeX}%
|
\definedummyword{TeX}%
|
||||||
\definedummyword{dots}%
|
|
||||||
%
|
%
|
||||||
% Assorted special characters.
|
% Assorted special characters.
|
||||||
\definedummyword{bullet}%
|
\definedummyword{bullet}%
|
||||||
|
|
@ -3123,13 +3138,19 @@ width0pt\relax} \fi
|
||||||
\catcode`\~=\other
|
\catcode`\~=\other
|
||||||
\gdef\commondummiesnofonts{%
|
\gdef\commondummiesnofonts{%
|
||||||
% Control letters and accents.
|
% Control letters and accents.
|
||||||
\definedummyletter{,}%
|
\definedummyletter{!}%
|
||||||
\definedummyletter{"}%
|
\definedummyletter{"}%
|
||||||
\definedummyletter{`}%
|
|
||||||
\definedummyletter{'}%
|
\definedummyletter{'}%
|
||||||
\definedummyletter{^}%
|
\definedummyletter{*}%
|
||||||
\definedummyletter{~}%
|
\definedummyletter{,}%
|
||||||
|
\definedummyletter{.}%
|
||||||
|
\definedummyletter{/}%
|
||||||
|
\definedummyletter{:}%
|
||||||
\definedummyletter{=}%
|
\definedummyletter{=}%
|
||||||
|
\definedummyletter{?}%
|
||||||
|
\definedummyletter{^}%
|
||||||
|
\definedummyletter{`}%
|
||||||
|
\definedummyletter{~}%
|
||||||
\definedummyword{u}%
|
\definedummyword{u}%
|
||||||
\definedummyword{v}%
|
\definedummyword{v}%
|
||||||
\definedummyword{H}%
|
\definedummyword{H}%
|
||||||
|
|
@ -3147,6 +3168,7 @@ width0pt\relax} \fi
|
||||||
\definedummyword{sc}%
|
\definedummyword{sc}%
|
||||||
\definedummyword{t}%
|
\definedummyword{t}%
|
||||||
%
|
%
|
||||||
|
% Commands that take arguments.
|
||||||
\definedummyword{acronym}%
|
\definedummyword{acronym}%
|
||||||
\definedummyword{cite}%
|
\definedummyword{cite}%
|
||||||
\definedummyword{code}%
|
\definedummyword{code}%
|
||||||
|
|
@ -3161,6 +3183,7 @@ width0pt\relax} \fi
|
||||||
\definedummyword{option}%
|
\definedummyword{option}%
|
||||||
\definedummyword{samp}%
|
\definedummyword{samp}%
|
||||||
\definedummyword{strong}%
|
\definedummyword{strong}%
|
||||||
|
\definedummyword{tie}%
|
||||||
\definedummyword{uref}%
|
\definedummyword{uref}%
|
||||||
\definedummyword{url}%
|
\definedummyword{url}%
|
||||||
\definedummyword{var}%
|
\definedummyword{var}%
|
||||||
|
|
@ -3211,7 +3234,22 @@ width0pt\relax} \fi
|
||||||
%
|
%
|
||||||
\def\LaTeX{LaTeX}%
|
\def\LaTeX{LaTeX}%
|
||||||
\def\TeX{TeX}%
|
\def\TeX{TeX}%
|
||||||
|
%
|
||||||
|
% Assorted special characters.
|
||||||
|
% (The following {} will end up in the sort string, but that's ok.)
|
||||||
|
\def\bullet{bullet}%
|
||||||
|
\def\copyright{copyright}%
|
||||||
|
\def\registeredsymbol{R}%
|
||||||
\def\dots{...}%
|
\def\dots{...}%
|
||||||
|
\def\enddots{...}%
|
||||||
|
\def\equiv{==}%
|
||||||
|
\def\error{error}%
|
||||||
|
\def\expansion{==>}%
|
||||||
|
\def\minus{-}%
|
||||||
|
\def\pounds{pounds}%
|
||||||
|
\def\point{.}%
|
||||||
|
\def\print{-|}%
|
||||||
|
\def\result{=>}%
|
||||||
}
|
}
|
||||||
|
|
||||||
\let\indexbackslash=0 %overridden during \printindex.
|
\let\indexbackslash=0 %overridden during \printindex.
|
||||||
|
|
@ -3460,12 +3498,12 @@ width0pt\relax} \fi
|
||||||
% then page number (#2) flushed to the right margin. It is used for index
|
% then page number (#2) flushed to the right margin. It is used for index
|
||||||
% and table of contents entries. The paragraph is indented by \leftskip.
|
% and table of contents entries. The paragraph is indented by \leftskip.
|
||||||
%
|
%
|
||||||
% A straigtforward implementation would start like this:
|
% A straightforward implementation would start like this:
|
||||||
% \def\entry#1#2{...
|
% \def\entry#1#2{...
|
||||||
% But this frozes the catcodes in the argument, and can cause problems to
|
% But this frozes the catcodes in the argument, and can cause problems to
|
||||||
% @code, which set's active ``-''. This problem was fixed by a kludge---
|
% @code, which sets - active. This problem was fixed by a kludge---
|
||||||
% ``-'' was active throughout whole index, but this isn't what we really
|
% ``-'' was active throughout whole index, but this isn't really right.
|
||||||
% want.
|
%
|
||||||
% The right solution is to prevent \entry from swallowing the whole text.
|
% The right solution is to prevent \entry from swallowing the whole text.
|
||||||
% --kasal, 21nov03
|
% --kasal, 21nov03
|
||||||
\def\entry{%
|
\def\entry{%
|
||||||
|
|
@ -3536,7 +3574,8 @@ width0pt\relax} \fi
|
||||||
% part of (the primitive) \par. Without it, a spurious underfull
|
% part of (the primitive) \par. Without it, a spurious underfull
|
||||||
% \hbox ensues.
|
% \hbox ensues.
|
||||||
\ifpdf
|
\ifpdf
|
||||||
\pdfgettoks#1.\ \the\toksA
|
\pdfgettoks#1.%
|
||||||
|
\ \the\toksA
|
||||||
\else
|
\else
|
||||||
\ #1%
|
\ #1%
|
||||||
\fi
|
\fi
|
||||||
|
|
@ -3783,53 +3822,88 @@ width0pt\relax} \fi
|
||||||
\def\lowersections{\global\advance\secbase by 1}
|
\def\lowersections{\global\advance\secbase by 1}
|
||||||
\let\down=\lowersections % original BFox name
|
\let\down=\lowersections % original BFox name
|
||||||
|
|
||||||
% Choose a numbered-heading macro
|
% we only have subsub.
|
||||||
% #1 is heading level if unmodified by @raisesections or @lowersections
|
\chardef\maxseclevel = 3
|
||||||
% #2 is text for heading
|
%
|
||||||
\def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
|
% A numbered section within an unnumbered changes to unnumbered too.
|
||||||
\ifcase\absseclevel
|
% To achive this, remember the "biggest" unnum. sec. we are currently in:
|
||||||
\chapterzzz{#2}%
|
\chardef\unmlevel = \maxseclevel
|
||||||
\or \seczzz{#2}%
|
%
|
||||||
\or \numberedsubseczzz{#2}%
|
% Trace whether the current chapter is an appendix or not:
|
||||||
\or \numberedsubsubseczzz{#2}%
|
% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
|
||||||
\else
|
\def\chapheadtype{N}
|
||||||
\ifnum \absseclevel<0 \chapterzzz{#2}%
|
|
||||||
\else \numberedsubsubseczzz{#2}%
|
|
||||||
\fi
|
|
||||||
\fi
|
|
||||||
\suppressfirstparagraphindent
|
|
||||||
}
|
|
||||||
|
|
||||||
% like \numhead, but chooses appendix heading levels
|
% Choose a heading macro
|
||||||
\def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
|
% #1 is heading type
|
||||||
\ifcase\absseclevel
|
% #2 is heading level
|
||||||
\appendixzzz{#2}%
|
% #3 is text for heading
|
||||||
\or \appendixsectionzzz{#2}%
|
\def\genhead#1#2#3{%
|
||||||
\or \appendixsubseczzz{#2}%
|
% Compute the abs. sec. level:
|
||||||
\or \appendixsubsubseczzz{#2}%
|
\absseclevel=#2
|
||||||
|
\advance\absseclevel by \secbase
|
||||||
|
% Make sure \absseclevel doesn't fall outside the range:
|
||||||
|
\ifnum \absseclevel < 0
|
||||||
|
\absseclevel = 0
|
||||||
\else
|
\else
|
||||||
\ifnum \absseclevel<0 \appendixzzz{#2}%
|
\ifnum \absseclevel > 3
|
||||||
\else \appendixsubsubseczzz{#2}%
|
\absseclevel = 3
|
||||||
\fi
|
\fi
|
||||||
\fi
|
\fi
|
||||||
\suppressfirstparagraphindent
|
% The heading type:
|
||||||
}
|
\def\headtype{#1}%
|
||||||
|
\if \headtype U%
|
||||||
% like \numhead, but chooses numberless heading levels
|
\ifnum \absseclevel < \unmlevel
|
||||||
\def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
|
\chardef\unmlevel = \absseclevel
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
% Check for appendix sections:
|
||||||
|
\ifnum \absseclevel = 0
|
||||||
|
\edef\chapheadtype{\headtype}%
|
||||||
|
\else
|
||||||
|
\if \headtype A\if \chapheadtype N%
|
||||||
|
\errmessage{@appendix... within a non-appendix chapter}%
|
||||||
|
\fi\fi
|
||||||
|
\fi
|
||||||
|
% Check for numbered within unnumbered:
|
||||||
|
\ifnum \absseclevel > \unmlevel
|
||||||
|
\def\headtype{U}%
|
||||||
|
\else
|
||||||
|
\chardef\unmlevel = 3
|
||||||
|
\fi
|
||||||
|
\fi
|
||||||
|
% Now print the heading:
|
||||||
|
\if \headtype U%
|
||||||
\ifcase\absseclevel
|
\ifcase\absseclevel
|
||||||
\unnumberedzzz{#2}%
|
\unnumberedzzz{#3}%
|
||||||
\or \unnumberedseczzz{#2}%
|
\or \unnumberedseczzz{#3}%
|
||||||
\or \unnumberedsubseczzz{#2}%
|
\or \unnumberedsubseczzz{#3}%
|
||||||
\or \unnumberedsubsubseczzz{#2}%
|
\or \unnumberedsubsubseczzz{#3}%
|
||||||
|
\fi
|
||||||
\else
|
\else
|
||||||
\ifnum \absseclevel<0 \unnumberedzzz{#2}%
|
\if \headtype A%
|
||||||
\else \unnumberedsubsubseczzz{#2}%
|
\ifcase\absseclevel
|
||||||
|
\appendixzzz{#3}%
|
||||||
|
\or \appendixsectionzzz{#3}%
|
||||||
|
\or \appendixsubseczzz{#3}%
|
||||||
|
\or \appendixsubsubseczzz{#3}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\ifcase\absseclevel
|
||||||
|
\chapterzzz{#3}%
|
||||||
|
\or \seczzz{#3}%
|
||||||
|
\or \numberedsubseczzz{#3}%
|
||||||
|
\or \numberedsubsubseczzz{#3}%
|
||||||
|
\fi
|
||||||
\fi
|
\fi
|
||||||
\fi
|
\fi
|
||||||
\suppressfirstparagraphindent
|
\suppressfirstparagraphindent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
% an interface:
|
||||||
|
\def\numhead{\genhead N}
|
||||||
|
\def\apphead{\genhead A}
|
||||||
|
\def\unnmhead{\genhead U}
|
||||||
|
|
||||||
% @chapter, @appendix, @unnumbered. Increment top-level counter, reset
|
% @chapter, @appendix, @unnumbered. Increment top-level counter, reset
|
||||||
% all lower-level sectioning counters to zero.
|
% all lower-level sectioning counters to zero.
|
||||||
%
|
%
|
||||||
|
|
@ -3876,9 +3950,6 @@ width0pt\relax} \fi
|
||||||
\global\let\subsubsection = \appendixsubsubsec
|
\global\let\subsubsection = \appendixsubsubsec
|
||||||
}
|
}
|
||||||
|
|
||||||
% @centerchap is like @unnumbered, but the heading is centered.
|
|
||||||
\outer\parseargdef\centerchap{{\unnumberedyyy{#1}}}
|
|
||||||
|
|
||||||
\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
|
\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
|
||||||
\def\unnumberedzzz#1{%
|
\def\unnumberedzzz#1{%
|
||||||
\global\secno=0 \global\subsecno=0 \global\subsubsecno=0
|
\global\secno=0 \global\subsecno=0 \global\subsubsecno=0
|
||||||
|
|
@ -3909,6 +3980,16 @@ width0pt\relax} \fi
|
||||||
\global\let\subsubsection = \unnumberedsubsubsec
|
\global\let\subsubsection = \unnumberedsubsubsec
|
||||||
}
|
}
|
||||||
|
|
||||||
|
% @centerchap is like @unnumbered, but the heading is centered.
|
||||||
|
\outer\parseargdef\centerchap{%
|
||||||
|
% Well, we could do the following in a group, but that would break
|
||||||
|
% an assumption that \chapmacro is called at the outermost level.
|
||||||
|
% Thus we are safer this way: --kasal, 24feb04
|
||||||
|
\let\centerparametersmaybe = \centerparameters
|
||||||
|
\unnmhead0{#1}%
|
||||||
|
\let\centerparametersmaybe = \relax
|
||||||
|
}
|
||||||
|
|
||||||
% @top is like @unnumbered.
|
% @top is like @unnumbered.
|
||||||
\let\top\unnumbered
|
\let\top\unnumbered
|
||||||
|
|
||||||
|
|
@ -3975,24 +4056,6 @@ width0pt\relax} \fi
|
||||||
{\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
|
{\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
|
||||||
}
|
}
|
||||||
|
|
||||||
% These are variants which are not "outer", so they can appear in @ifinfo.
|
|
||||||
% Actually, they are now be obsolete; ordinary section commands should work.
|
|
||||||
\def\infotop{\parsearg\unnumberedzzz}
|
|
||||||
\def\infounnumbered{\parsearg\unnumberedzzz}
|
|
||||||
\def\infounnumberedsec{\parsearg\unnumberedseczzz}
|
|
||||||
\def\infounnumberedsubsec{\parsearg\unnumberedsubseczzz}
|
|
||||||
\def\infounnumberedsubsubsec{\parsearg\unnumberedsubsubseczzz}
|
|
||||||
|
|
||||||
\def\infoappendix{\parsearg\appendixzzz}
|
|
||||||
\def\infoappendixsec{\parsearg\appendixseczzz}
|
|
||||||
\def\infoappendixsubsec{\parsearg\appendixsubseczzz}
|
|
||||||
\def\infoappendixsubsubsec{\parsearg\appendixsubsubseczzz}
|
|
||||||
|
|
||||||
\def\infochapter{\parsearg\chapterzzz}
|
|
||||||
\def\infosection{\parsearg\sectionzzz}
|
|
||||||
\def\infosubsection{\parsearg\subsectionzzz}
|
|
||||||
\def\infosubsubsection{\parsearg\subsubsectionzzz}
|
|
||||||
|
|
||||||
% These macros control what the section commands do, according
|
% These macros control what the section commands do, according
|
||||||
% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
|
% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
|
||||||
% Define them by default for a numbered chapter.
|
% Define them by default for a numbered chapter.
|
||||||
|
|
@ -4040,8 +4103,6 @@ width0pt\relax} \fi
|
||||||
%%% Args are the skip and penalty (usually negative)
|
%%% Args are the skip and penalty (usually negative)
|
||||||
\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
|
\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
|
||||||
|
|
||||||
\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
|
|
||||||
|
|
||||||
%%% Define plain chapter starts, and page on/off switching for it
|
%%% Define plain chapter starts, and page on/off switching for it
|
||||||
% Parameter controlling skip before chapter headings (if needed)
|
% Parameter controlling skip before chapter headings (if needed)
|
||||||
|
|
||||||
|
|
@ -4072,11 +4133,7 @@ width0pt\relax} \fi
|
||||||
|
|
||||||
\CHAPPAGon
|
\CHAPPAGon
|
||||||
|
|
||||||
\def\CHAPFplain{%
|
% Chapter opening.
|
||||||
\global\let\chapmacro=\chfplain
|
|
||||||
\global\let\centerchapmacro=\centerchfplain}
|
|
||||||
|
|
||||||
% Normal chapter opening.
|
|
||||||
%
|
%
|
||||||
% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
|
% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
|
||||||
% Yappendix, Yomitfromtoc), #3 the chapter number.
|
% Yappendix, Yomitfromtoc), #3 the chapter number.
|
||||||
|
|
@ -4086,7 +4143,7 @@ width0pt\relax} \fi
|
||||||
\def\Yomitfromtockeyword{Yomitfromtoc}
|
\def\Yomitfromtockeyword{Yomitfromtoc}
|
||||||
\def\Yappendixkeyword{Yappendix}
|
\def\Yappendixkeyword{Yappendix}
|
||||||
%
|
%
|
||||||
\def\chfplain#1#2#3{%
|
\def\chapmacro#1#2#3{%
|
||||||
\pchapsepmacro
|
\pchapsepmacro
|
||||||
{%
|
{%
|
||||||
\chapfonts \rm
|
\chapfonts \rm
|
||||||
|
|
@ -4147,40 +4204,35 @@ width0pt\relax} \fi
|
||||||
|
|
||||||
% @centerchap -- centered and unnumbered.
|
% @centerchap -- centered and unnumbered.
|
||||||
\let\centerparametersmaybe = \relax
|
\let\centerparametersmaybe = \relax
|
||||||
\def\centerchfplain#1{{%
|
\def\centerparameters{%
|
||||||
\def\centerparametersmaybe{%
|
|
||||||
\advance\rightskip by 3\rightskip
|
\advance\rightskip by 3\rightskip
|
||||||
\leftskip = \rightskip
|
\leftskip = \rightskip
|
||||||
\parfillskip = 0pt
|
\parfillskip = 0pt
|
||||||
}%
|
}
|
||||||
\chfplain{#1}{Ynothing}{}%
|
|
||||||
}}
|
|
||||||
|
|
||||||
\CHAPFplain % The default
|
|
||||||
|
|
||||||
% I don't think this chapter style is supported any more, so I'm not
|
% I don't think this chapter style is supported any more, so I'm not
|
||||||
% updating it with the new noderef stuff. We'll see. --karl, 11aug03.
|
% updating it with the new noderef stuff. We'll see. --karl, 11aug03.
|
||||||
%
|
%
|
||||||
|
\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
|
||||||
|
%
|
||||||
\def\unnchfopen #1{%
|
\def\unnchfopen #1{%
|
||||||
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
||||||
\parindent=0pt\raggedright
|
\parindent=0pt\raggedright
|
||||||
\rm #1\hfill}}\bigskip \par\nobreak
|
\rm #1\hfill}}\bigskip \par\nobreak
|
||||||
}
|
}
|
||||||
|
|
||||||
\def\chfopen #1#2{\chapoddpage {\chapfonts
|
\def\chfopen #1#2{\chapoddpage {\chapfonts
|
||||||
\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
|
\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
|
||||||
\par\penalty 5000 %
|
\par\penalty 5000 %
|
||||||
}
|
}
|
||||||
|
|
||||||
\def\centerchfopen #1{%
|
\def\centerchfopen #1{%
|
||||||
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
||||||
\parindent=0pt
|
\parindent=0pt
|
||||||
\hfill {\rm #1}\hfill}}\bigskip \par\nobreak
|
\hfill {\rm #1}\hfill}}\bigskip \par\nobreak
|
||||||
}
|
}
|
||||||
|
|
||||||
\def\CHAPFopen{%
|
\def\CHAPFopen{%
|
||||||
\global\let\chapmacro=\chfopen
|
\global\let\chapmacro=\chfopen
|
||||||
\global\let\centerchapmacro=\centerchfopen}
|
\global\let\centerchapmacro=\centerchfopen}
|
||||||
|
|
||||||
|
|
||||||
% Section titles. These macros combine the section number parts and
|
% Section titles. These macros combine the section number parts and
|
||||||
|
|
@ -4467,7 +4519,8 @@ width0pt\relax} \fi
|
||||||
\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
|
\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
|
||||||
|
|
||||||
% This parameter controls the indentation of the various levels.
|
% This parameter controls the indentation of the various levels.
|
||||||
\newdimen\tocindent \tocindent = 2pc
|
% Same as \defaultparindent.
|
||||||
|
\newdimen\tocindent \tocindent = 15pt
|
||||||
|
|
||||||
% Now for the actual typesetting. In all these, #1 is the text and #2 is the
|
% Now for the actual typesetting. In all these, #1 is the text and #2 is the
|
||||||
% page number.
|
% page number.
|
||||||
|
|
@ -4619,7 +4672,7 @@ width0pt\relax} \fi
|
||||||
\removelastskip
|
\removelastskip
|
||||||
% it's not a good place to break if the last penalty was \nobreak
|
% it's not a good place to break if the last penalty was \nobreak
|
||||||
% or better ...
|
% or better ...
|
||||||
\ifnum\lastpenalty>10000 \else \penalty-50 \fi
|
\ifnum\lastpenalty<10000 \penalty-50 \fi
|
||||||
\vskip\envskipamount
|
\vskip\envskipamount
|
||||||
\fi
|
\fi
|
||||||
\fi
|
\fi
|
||||||
|
|
@ -4795,7 +4848,9 @@ width0pt\relax} \fi
|
||||||
|
|
||||||
|
|
||||||
% @quotation does normal linebreaking (hence we can't use \nonfillstart)
|
% @quotation does normal linebreaking (hence we can't use \nonfillstart)
|
||||||
% and narrows the margins.
|
% and narrows the margins. We keep \parskip nonzero in general, since
|
||||||
|
% we're doing normal filling. So, when using \aboveenvbreak and
|
||||||
|
% \afterenvbreak, temporarily make \parskip 0.
|
||||||
%
|
%
|
||||||
\envdef\quotation{%
|
\envdef\quotation{%
|
||||||
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
|
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
|
||||||
|
|
@ -4812,8 +4867,16 @@ width0pt\relax} \fi
|
||||||
}
|
}
|
||||||
|
|
||||||
% We have retained a nonzero parskip for the environment, since we're
|
% We have retained a nonzero parskip for the environment, since we're
|
||||||
% doing normal filling. So to avoid extra space below the environment...
|
% doing normal filling.
|
||||||
\def\Equotation{\parskip = 0pt \afterenvbreak}
|
%
|
||||||
|
\def\Equotation{%
|
||||||
|
\par
|
||||||
|
\ifx\quotationauthor\undefined\else
|
||||||
|
% indent a bit.
|
||||||
|
\leftline{\kern 2\leftskip \sl ---\quotationauthor}%
|
||||||
|
\fi
|
||||||
|
{\parskip=0pt \afterenvbreak}%
|
||||||
|
}
|
||||||
|
|
||||||
% If we're given an argument, typeset it in bold with a colon after.
|
% If we're given an argument, typeset it in bold with a colon after.
|
||||||
\def\quotationlabel#1{%
|
\def\quotationlabel#1{%
|
||||||
|
|
@ -5132,7 +5195,7 @@ width0pt\relax} \fi
|
||||||
% \deffngeneral {subind}category name args
|
% \deffngeneral {subind}category name args
|
||||||
%
|
%
|
||||||
\def\deffngeneral#1#2 #3 #4\endheader{%
|
\def\deffngeneral#1#2 #3 #4\endheader{%
|
||||||
% Remember that \dosubin{fn}{xxx}{} is equivalent to \doind{fn}{xxx}.
|
% Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
|
||||||
\dosubind{fn}{\code{#3}}{#1}%
|
\dosubind{fn}{\code{#3}}{#1}%
|
||||||
\defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
|
\defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
|
||||||
}
|
}
|
||||||
|
|
@ -5262,15 +5325,16 @@ width0pt\relax} \fi
|
||||||
% arguments will be output next, if any.
|
% arguments will be output next, if any.
|
||||||
}
|
}
|
||||||
|
|
||||||
% Print arguments in slanted typewriter, prevent hyphenation at `-' chars.
|
% Print arguments in slanted roman (not ttsl), inconsistently with using
|
||||||
|
% tt for the name. This is because literal text is sometimes needed in
|
||||||
|
% the argument list (groff manual), and ttsl and tt are not very
|
||||||
|
% distinguishable. Prevent hyphenation at `-' chars.
|
||||||
%
|
%
|
||||||
\def\defunargs#1{%
|
\def\defunargs#1{%
|
||||||
% use sl by default (not ttsl), inconsistently with using tt for the
|
% use sl by default (not ttsl),
|
||||||
% name. This is because literal text is sometimes needed in the
|
|
||||||
% argument list (groff manual), and ttsl and tt are not very
|
|
||||||
% distinguishable.
|
|
||||||
% tt for the names.
|
% tt for the names.
|
||||||
\df \sl \hyphenchar\font=0
|
\df \sl \hyphenchar\font=0
|
||||||
|
%
|
||||||
% On the other hand, if an argument has two dashes (for instance), we
|
% 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.
|
% want a way to get ttsl. Let's try @var for that.
|
||||||
\let\var=\ttslanted
|
\let\var=\ttslanted
|
||||||
|
|
@ -5700,16 +5764,15 @@ width0pt\relax} \fi
|
||||||
|
|
||||||
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
|
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
|
||||||
% anchor), which consists of three parts:
|
% anchor), which consists of three parts:
|
||||||
% 1) NAME-title - the current sectioning name, taken from \thissection;
|
% 1) NAME-title - the current sectioning name taken from \thissection,
|
||||||
% 2) NAME-snt - section number and type, defined as the SNT arg;
|
% or the anchor name.
|
||||||
|
% 2) NAME-snt - section number and type, passed as the SNT arg, or
|
||||||
|
% empty for anchors.
|
||||||
% 3) NAME-pg - the page number.
|
% 3) NAME-pg - the page number.
|
||||||
% This is called from \donoderef, \anchor, and \dofloat.
|
|
||||||
%
|
%
|
||||||
% We take care not to fully expand the title, since it may contain
|
% This is called from \donoderef, \anchor, and \dofloat. In the case of
|
||||||
% arbitrary macros.
|
% floats, there is an additional part, which is not written here:
|
||||||
%
|
% 4) NAME-lof - the text as it should appear in a @listoffloats.
|
||||||
% Use \turnoffactive so that punctuation chars such as underscore
|
|
||||||
% and backslash work in node names.
|
|
||||||
%
|
%
|
||||||
\def\setref#1#2{%
|
\def\setref#1#2{%
|
||||||
\pdfmkdest{#1}%
|
\pdfmkdest{#1}%
|
||||||
|
|
@ -5793,9 +5856,9 @@ width0pt\relax} \fi
|
||||||
\turnoffactive
|
\turnoffactive
|
||||||
\otherbackslash
|
\otherbackslash
|
||||||
\expandafter\global\expandafter\let\expandafter\Xthisreftitle
|
\expandafter\global\expandafter\let\expandafter\Xthisreftitle
|
||||||
\csname X#1-title\endcsname
|
\csname XR#1-title\endcsname
|
||||||
}%
|
}%
|
||||||
\ifx \Xthisreftitle \floatmagic
|
\iffloat\Xthisreftitle
|
||||||
% If the user specified the print name (third arg) to the ref,
|
% If the user specified the print name (third arg) to the ref,
|
||||||
% print it instead of our usual "Figure 1.2".
|
% print it instead of our usual "Figure 1.2".
|
||||||
\ifdim\wd0 = 0pt
|
\ifdim\wd0 = 0pt
|
||||||
|
|
@ -5888,7 +5951,7 @@ width0pt\relax} \fi
|
||||||
\indexnofonts
|
\indexnofonts
|
||||||
\otherbackslash
|
\otherbackslash
|
||||||
\expandafter\global\expandafter\let\expandafter\thisrefX
|
\expandafter\global\expandafter\let\expandafter\thisrefX
|
||||||
\csname X#1\endcsname
|
\csname XR#1\endcsname
|
||||||
}%
|
}%
|
||||||
\ifx\thisrefX\relax
|
\ifx\thisrefX\relax
|
||||||
% If not defined, say something at least.
|
% If not defined, say something at least.
|
||||||
|
|
@ -5910,9 +5973,32 @@ width0pt\relax} \fi
|
||||||
#2% Output the suffix in any case.
|
#2% Output the suffix in any case.
|
||||||
}
|
}
|
||||||
|
|
||||||
% This is the macro invoked by entries in the aux file.
|
% This is the macro invoked by entries in the aux file. Usually it's
|
||||||
|
% just a \def (we prepend XR to the control sequence name to avoid
|
||||||
|
% collisions). But if this is a float type, we have more work to do.
|
||||||
%
|
%
|
||||||
\def\xrdef#1{\expandafter\gdef\csname X#1\endcsname}
|
\def\xrdef#1#2{%
|
||||||
|
\expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
|
||||||
|
%
|
||||||
|
% Was that xref control sequence that we just defined for a float?
|
||||||
|
\expandafter\iffloat\csname XR#1\endcsname
|
||||||
|
% it was a float, and we have the (safe) float type in \iffloattype.
|
||||||
|
\expandafter\let\expandafter\floatlist
|
||||||
|
\csname floatlist\iffloattype\endcsname
|
||||||
|
%
|
||||||
|
% Is this the first time we've seen this float type?
|
||||||
|
\expandafter\ifx\floatlist\relax
|
||||||
|
\toks0 = {\do}% yes, so just \do
|
||||||
|
\else
|
||||||
|
% had it before, so preserve previous elements in list.
|
||||||
|
\toks0 = \expandafter{\floatlist\do}%
|
||||||
|
\fi
|
||||||
|
%
|
||||||
|
% Remember this xref in the control sequence \floatlistFLOATTYPE,
|
||||||
|
% for later use in \listoffloats.
|
||||||
|
\expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
|
||||||
|
\fi
|
||||||
|
}
|
||||||
|
|
||||||
% Read the last existing aux file, if any. No error if none exists.
|
% Read the last existing aux file, if any. No error if none exists.
|
||||||
%
|
%
|
||||||
|
|
@ -5983,7 +6069,16 @@ width0pt\relax} \fi
|
||||||
\catcode`\%=\other
|
\catcode`\%=\other
|
||||||
\catcode`+=\other % avoid \+ for paranoia even though we've turned it off
|
\catcode`+=\other % avoid \+ for paranoia even though we've turned it off
|
||||||
%
|
%
|
||||||
% Make the characters 128-255 be printing characters
|
% This is to support \ in node names and titles, since the \
|
||||||
|
% characters end up in a \csname. It's easier than
|
||||||
|
% leaving it active and making its active definition an actual \
|
||||||
|
% character. What I don't understand is why it works in the *value*
|
||||||
|
% of the xrdef. Seems like it should be a catcode12 \, and that
|
||||||
|
% should not typeset properly. But it works, so I'm moving on for
|
||||||
|
% now. --karl, 15jan04.
|
||||||
|
\catcode`\\=\other
|
||||||
|
%
|
||||||
|
% Make the characters 128-255 be printing characters.
|
||||||
{%
|
{%
|
||||||
\count 1=128
|
\count 1=128
|
||||||
\def\loop{%
|
\def\loop{%
|
||||||
|
|
@ -5993,7 +6088,7 @@ width0pt\relax} \fi
|
||||||
}%
|
}%
|
||||||
}%
|
}%
|
||||||
%
|
%
|
||||||
% @ is our escape character in .aux files.
|
% @ is our escape character in .aux files, and we need braces.
|
||||||
\catcode`\{=1
|
\catcode`\{=1
|
||||||
\catcode`\}=2
|
\catcode`\}=2
|
||||||
\catcode`\@=0
|
\catcode`\@=0
|
||||||
|
|
@ -6100,7 +6195,7 @@ width0pt\relax} \fi
|
||||||
\fi
|
\fi
|
||||||
}
|
}
|
||||||
|
|
||||||
% This \insert replacements works for both \insert\footins{foo} and
|
% This \insert replacement works for both \insert\footins{foo} and
|
||||||
% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
|
% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
|
||||||
%
|
%
|
||||||
\def\saveinsert#1{%
|
\def\saveinsert#1{%
|
||||||
|
|
@ -6232,16 +6327,23 @@ width0pt\relax} \fi
|
||||||
\let\resetallfloatnos=\empty
|
\let\resetallfloatnos=\empty
|
||||||
%
|
%
|
||||||
\def\dofloat#1,#2,#3,#4\finish{%
|
\def\dofloat#1,#2,#3,#4\finish{%
|
||||||
|
\let\thiscaption=\empty
|
||||||
|
\let\thisshortcaption=\empty
|
||||||
|
%
|
||||||
% don't lose footnotes inside @float.
|
% don't lose footnotes inside @float.
|
||||||
\startsavinginserts
|
\startsavinginserts
|
||||||
%
|
%
|
||||||
|
% We can't be used inside a paragraph.
|
||||||
|
\par
|
||||||
|
%
|
||||||
\vtop\bgroup
|
\vtop\bgroup
|
||||||
\def\floattype{#1}%
|
\def\floattype{#1}%
|
||||||
\def\floatlabel{#2}%
|
\def\floatlabel{#2}%
|
||||||
\def\floatloc{#3}% we do nothing with this yet.
|
\def\floatloc{#3}% we do nothing with this yet.
|
||||||
% xx should we indent the whole thing? center it?
|
|
||||||
%
|
%
|
||||||
\ifx\floattype\empty \else
|
\ifx\floattype\empty
|
||||||
|
\let\safefloattype=\empty
|
||||||
|
\else
|
||||||
{%
|
{%
|
||||||
% the floattype might have accents or other special characters,
|
% the floattype might have accents or other special characters,
|
||||||
% but we need to use it in a control sequence name.
|
% but we need to use it in a control sequence name.
|
||||||
|
|
@ -6249,68 +6351,119 @@ width0pt\relax} \fi
|
||||||
\turnoffactive
|
\turnoffactive
|
||||||
\xdef\safefloattype{\floattype}%
|
\xdef\safefloattype{\floattype}%
|
||||||
}%
|
}%
|
||||||
|
\fi
|
||||||
|
%
|
||||||
|
% If label is given but no type, we handle that as the empty type.
|
||||||
|
\ifx\floatlabel\empty \else
|
||||||
% We want each FLOATTYPE to be numbered separately (Figure 1,
|
% We want each FLOATTYPE to be numbered separately (Figure 1,
|
||||||
% Table 1, Figure 2, ...).
|
% Table 1, Figure 2, ...). (And if no label, no number.)
|
||||||
%
|
%
|
||||||
\expandafter\getfloatno\csname\safefloattype floatno\endcsname
|
\expandafter\getfloatno\csname\safefloattype floatno\endcsname
|
||||||
\global\advance\floatno by 1
|
\global\advance\floatno by 1
|
||||||
%
|
%
|
||||||
\ifx\floatlabel\empty \else
|
|
||||||
{%
|
{%
|
||||||
% This magic value for \thissection is output by \setref as the
|
% This magic value for \thissection is output by \setref as the
|
||||||
% XREFLABEL-title value. \xrefX uses it to distinguish float
|
% XREFLABEL-title value. \xrefX uses it to distinguish float
|
||||||
% labels (which have a completely different output format) from
|
% labels (which have a completely different output format) from
|
||||||
% node and anchor labels.
|
% node and anchor labels. And \xrdef uses it to construct the
|
||||||
|
% lists of floats.
|
||||||
%
|
%
|
||||||
\let\thissection=\floatmagic
|
\edef\thissection{\floatmagic=\safefloattype}%
|
||||||
\setref{\floatlabel}{Yfloat}%
|
\setref{\floatlabel}{Yfloat}%
|
||||||
}%
|
}%
|
||||||
\fi
|
\fi
|
||||||
\fi
|
%
|
||||||
|
% start with \parskip glue, I guess.
|
||||||
|
\vskip\parskip
|
||||||
|
%
|
||||||
|
% Don't suppress indentation if a float happens to start a section.
|
||||||
|
\restorefirstparagraphindent
|
||||||
}
|
}
|
||||||
|
|
||||||
% we have four possibilities:
|
% we have these possibilities:
|
||||||
% @float Foo & @caption{Cap}: Foo 1.1: Cap
|
% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
|
||||||
% @float Foo & no caption: Foo 1.1
|
% @float Foo,lbl & no caption: Foo 1.1
|
||||||
|
% @float Foo & @caption{Cap}: Foo: Cap
|
||||||
|
% @float Foo & no caption: Foo
|
||||||
|
% @float ,lbl & Caption{Cap}: 1.1: Cap
|
||||||
|
% @float ,lbl & no caption: 1.1
|
||||||
% @float & @caption{Cap}: Cap
|
% @float & @caption{Cap}: Cap
|
||||||
% @float & no caption:
|
% @float & no caption:
|
||||||
%
|
%
|
||||||
\def\Efloat{%
|
\def\Efloat{%
|
||||||
\let\printedsomething = \empty
|
\let\floatident = \empty
|
||||||
%
|
%
|
||||||
\ifx\floattype\empty \else
|
% In all cases, if we have a float type, it comes first.
|
||||||
\vskip.5\parskip % space above caption
|
\ifx\floattype\empty \else \def\floatident{\floattype}\fi
|
||||||
%
|
%
|
||||||
% Print the float number preceded by the chapter-level number
|
% If we have an xref label, the number comes next.
|
||||||
% (empty in the case of unnumbered). Although there are other
|
\ifx\floatlabel\empty \else
|
||||||
% styles of float numbering, we hardwire this one.
|
\ifx\floattype\empty \else % if also had float type, need tie first.
|
||||||
\floattype\space\chaplevelprefix\the\floatno
|
\appendtomacro\floatident{\tie}%
|
||||||
\let\printedsomething = t%
|
|
||||||
\fi
|
\fi
|
||||||
|
% the number.
|
||||||
|
\appendtomacro\floatident{\chaplevelprefix\the\floatno}%
|
||||||
|
\fi
|
||||||
|
%
|
||||||
|
% Start the printed caption with what we've constructed in
|
||||||
|
% \floatident, but keep it separate; we need \floatident again.
|
||||||
|
\let\captionline = \floatident
|
||||||
%
|
%
|
||||||
\ifx\thiscaption\empty \else
|
\ifx\thiscaption\empty \else
|
||||||
\ifx\printedsomething\empty
|
\ifx\floatident\empty \else
|
||||||
\vskip.5\parskip % space above caption
|
\appendtomacro\captionline{: }% had ident, so need a colon between
|
||||||
\else
|
|
||||||
:\space % had a number, so print a colon before the caption.
|
|
||||||
\fi
|
\fi
|
||||||
%
|
%
|
||||||
% Print caption text.
|
% caption text.
|
||||||
\thiscaption
|
\appendtomacro\captionline\thiscaption
|
||||||
\let\printedsomething = t%
|
\fi
|
||||||
|
%
|
||||||
|
% If we have anything to print, print it, with space before.
|
||||||
|
% Eventually this needs to become an \insert.
|
||||||
|
\ifx\captionline\empty \else
|
||||||
|
\vskip.5\parskip
|
||||||
|
\captionline
|
||||||
|
\fi
|
||||||
|
%
|
||||||
|
% If have an xref label, write the list of floats info. Do this
|
||||||
|
% after the caption, to avoid chance of it being a breakpoint.
|
||||||
|
\ifx\floatlabel\empty \else
|
||||||
|
% Write the text that goes in the lof to the aux file as
|
||||||
|
% \floatlabel-lof. Besides \floatident, we include the short
|
||||||
|
% 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
|
||||||
|
}}%
|
||||||
|
}%
|
||||||
\fi
|
\fi
|
||||||
%
|
%
|
||||||
% Space below caption, if we printed anything.
|
% Space below caption, if we printed anything.
|
||||||
\ifx\printedsomething\empty \else \vskip\parskip \fi
|
\ifx\printedsomething\empty \else \vskip\parskip \fi
|
||||||
%
|
|
||||||
\egroup % end of \vtop
|
\egroup % end of \vtop
|
||||||
\checkinserts
|
\checkinserts
|
||||||
}
|
}
|
||||||
|
|
||||||
\def\caption#1{\checkenv\float \def\thiscaption{#1}}
|
% Append the tokens #2 to the definition of macro #1, not expanding either.
|
||||||
|
%
|
||||||
|
\newtoks\appendtomacroAtoks
|
||||||
|
\newtoks\appendtomacroBtoks
|
||||||
|
\def\appendtomacro#1#2{%
|
||||||
|
\appendtomacroAtoks = \expandafter{#1}%
|
||||||
|
\appendtomacroBtoks = {#2}%
|
||||||
|
\edef#1{\the\appendtomacroAtoks \the\appendtomacroBtoks}%
|
||||||
|
}
|
||||||
|
|
||||||
|
% @caption, @shortcaption are easy.
|
||||||
|
%
|
||||||
|
\long\def\caption#1{\checkenv\float \def\thiscaption{#1}}
|
||||||
\def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}}
|
\def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}}
|
||||||
\let\thiscaption=\empty
|
|
||||||
\let\thisshortcaption=\empty
|
|
||||||
|
|
||||||
% The parameter is the control sequence identifying the counter we are
|
% The parameter is the control sequence identifying the counter we are
|
||||||
% going to use. Create it if it doesn't exist and assign it to \floatno.
|
% going to use. Create it if it doesn't exist and assign it to \floatno.
|
||||||
|
|
@ -6330,16 +6483,74 @@ width0pt\relax} \fi
|
||||||
% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we
|
% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we
|
||||||
% first read the @float command.
|
% first read the @float command.
|
||||||
%
|
%
|
||||||
\def\Yfloat{\floattype @tie{}\chaplevelprefix\the\floatno}%
|
\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
|
||||||
|
|
||||||
% Magic string used for the XREFLABEL-title value, so \xrefX can
|
% Magic string used for the XREFLABEL-title value, so \xrefX can
|
||||||
% distinguish floats from other xref types.
|
% distinguish floats from other xref types.
|
||||||
\def\floatmagic{!!float!!}
|
\def\floatmagic{!!float!!}
|
||||||
|
|
||||||
% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
|
% #1 is the control sequence we are passed; we expand into a conditional
|
||||||
\parseargdef\listoffloats{%xx
|
% which is true if #1 represents a float ref. That is, the magic
|
||||||
|
% \thissection value which we \setref above.
|
||||||
|
%
|
||||||
|
\def\iffloat#1{\expandafter\doiffloat#1==\finish}
|
||||||
|
%
|
||||||
|
% #1 is (maybe) the \floatmagic string. If so, #2 will be the
|
||||||
|
% (safe) float type for this float. We set \iffloattype to #2.
|
||||||
|
%
|
||||||
|
\def\doiffloat#1=#2=#3\finish{%
|
||||||
|
\def\temp{#1}%
|
||||||
|
\def\iffloattype{#2}%
|
||||||
|
\ifx\temp\floatmagic
|
||||||
}
|
}
|
||||||
|
|
||||||
|
% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
|
||||||
|
%
|
||||||
|
\parseargdef\listoffloats{%
|
||||||
|
\def\floattype{#1}% floattype
|
||||||
|
{%
|
||||||
|
% the floattype might have accents or other special characters,
|
||||||
|
% but we need to use it in a control sequence name.
|
||||||
|
\indexnofonts
|
||||||
|
\turnoffactive
|
||||||
|
\xdef\safefloattype{\floattype}%
|
||||||
|
}%
|
||||||
|
%
|
||||||
|
% \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
|
||||||
|
\expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
|
||||||
|
\ifhavexrefs
|
||||||
|
% if the user said @listoffloats foo but never @float foo.
|
||||||
|
\message{\linenumber No `\safefloattype' floats to list.}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\begingroup
|
||||||
|
\leftskip=\tocindent % indent these entries like a toc
|
||||||
|
\let\do=\listoffloatsdo
|
||||||
|
\csname floatlist\safefloattype\endcsname
|
||||||
|
\endgroup
|
||||||
|
\fi
|
||||||
|
}
|
||||||
|
|
||||||
|
% This is called on each entry in a list of floats. We're passed the
|
||||||
|
% xref label, in the form LABEL-title, which is how we save it in the
|
||||||
|
% aux file. We strip off the -title and look up \XRLABEL-lof, which
|
||||||
|
% has the text we're supposed to typeset here.
|
||||||
|
%
|
||||||
|
% Figures without xref labels will not be included in the list (since
|
||||||
|
% they won't appear in the aux file).
|
||||||
|
%
|
||||||
|
\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
|
||||||
|
\def\listoffloatsdoentry#1-title\finish{{%
|
||||||
|
% Can't fully expand XR#1-lof because it can contain anything. Just
|
||||||
|
% pass the control sequence. On the other hand, XR#1-pg is just the
|
||||||
|
% page number, and we want to fully expand that so we can get a link
|
||||||
|
% in pdf output.
|
||||||
|
\toksA = \expandafter{\csname XR#1-lof\endcsname}%
|
||||||
|
%
|
||||||
|
% use the same \entry macro we use to generate the TOC and index.
|
||||||
|
\edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
|
||||||
|
\writeentry
|
||||||
|
}}
|
||||||
|
|
||||||
\message{localization,}
|
\message{localization,}
|
||||||
% and i18n.
|
% and i18n.
|
||||||
|
|
@ -6649,6 +6860,7 @@ should work if nowhere else does.}
|
||||||
% \backslashcurfont outputs one backslash character in current font,
|
% \backslashcurfont outputs one backslash character in current font,
|
||||||
% as in \char`\\.
|
% as in \char`\\.
|
||||||
\global\chardef\backslashcurfont=`\\
|
\global\chardef\backslashcurfont=`\\
|
||||||
|
\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
|
||||||
|
|
||||||
% \rawbackslash defines an active \ to do \backslashcurfont.
|
% \rawbackslash defines an active \ to do \backslashcurfont.
|
||||||
% \otherbackslash defines an active \ to be a literal `\' character with
|
% \otherbackslash defines an active \ to be a literal `\' character with
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue