xemacs-beta: man/texinfo.tex comparison

comparison man/texinfo.tex @ 175:2d532a89d707 r20-3b14

Import from CVS: tag r20-3b14

author	cvs
date	Mon, 13 Aug 2007 09:50:14 +0200
parents	360340f9fd5f
children	bfd6434d15b3

comparison

equal deleted inserted replaced

-:bb3568571b84
+:2d532a89d707
-%% TeX macros to handle texinfo files
+%% TeX macros to handle Texinfo files.
+%% $Id: texinfo.tex,v 1.3 1997/07/19 22:11:48 steve Exp $
 %  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
-%                94, 95, 1996 Free Software Foundation, Inc.
+%                94, 95, 96, 97 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
 %published by the Free Software Foundation; either version 2, or (at
 %your option) any later version.
 % Added by gildea November 1993.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.2 $
+\deftexinfoversion$Revision: 1.3 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 % If in a .fmt file, print the version number
 % and turn on active characters that we couldn't do earlier because
 % they might have appeared in the input file name.
 \let\ptexi=\i
 \let\ptexlbrace=\{
 \let\ptexrbrace=\}
 \let\ptexstar=\*
 \let\ptext=\t
-\let\ptextilde=\~
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
 % since \penalty is valid in vertical mode, we'd end up putting the
 % Avoid using \@M directly, because that causes trouble
 % if the definition is written into an index file.
 \global\let\tiepenalty = \@M
 \gdef\tie{\leavevmode\penalty\tiepenalty\ }
 }
-\let\~ = \tie                  % And make it available as @~.
 \message{Basics,}
 \chardef\other=12
 \def\gobble#1{}
 \hyphenation{ap-pen-dix}
 \hyphenation{mini-buf-fer mini-buf-fers}
 \hyphenation{eshell}
+\hyphenation{white-space}
 % Margin to add to right of even pages, to left of odd pages.
 \newdimen \bindingoffset
 \newdimen \normaloffset
 \newdimen\pagewidth \newdimen\pageheight
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
 % since that produces some useless output on the terminal.
 \tracingpages1 \tracingoutput1 \tracinglostchars1
 \tracingmacros2 \tracingparagraphs1 \tracingrestores1
 \showboxbreadth\maxdimen\showboxdepth\maxdimen
 }%
-%---------------------Begin change-----------------------
+% For @cropmarks command.
-%
+% Do @cropmarks to get crop marks.
-%%%% For @cropmarks command.
+%
-% Dimensions to add cropmarks at corners Added by P. A. MacKay, 12 Nov. 1986
+\newif\ifcropmarks
+\let\cropmarks = \cropmarkstrue
+%
+% Dimensions to add cropmarks at corners.
+% Added by P. A. MacKay, 12 Nov. 1986
 %
 \newdimen\cornerlong \newdimen\cornerthick
-\newdimen \topandbottommargin
+\newdimen\topandbottommargin
-\newdimen \outerhsize \newdimen \outervsize
+\newdimen\outerhsize \newdimen\outervsize
 \cornerlong=1pc\cornerthick=.3pt        % These set size of cropmarks
 \outerhsize=7in
 %\outervsize=9.5in
 % Alternative @smallbook page size is 9.25in
 \outervsize=9.25in
 \topandbottommargin=.75in
-%
-%---------------------End change-----------------------
+% Main output routine.
+\chardef\PAGE = 255
+\output = {\onepageout{\pagecontents\PAGE}}
+\newbox\headlinebox
+\newbox\footlinebox
 % \onepageout takes a vbox as an argument.  Note that \pagecontents
 % does insertions, but you have to call it yourself.
-\chardef\PAGE=255  \output={\onepageout{\pagecontents\PAGE}}
 \def\onepageout#1{%
-\hoffset=\normaloffset
+\ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
+%
 \ifodd\pageno  \advance\hoffset by \bindingoffset
 \else \advance\hoffset by -\bindingoffset\fi
+%
+% Do this outside of the \shipout so @code etc. will be expanded in
+% the headline as they should be, not taken literally (outputting ''code).
+\setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+\setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
+%
 {%
-\escapechar = `\\ % use backslash in output files.
+% Have to do this stuff outside the \shipout because we want it to
-\indexdummies
+% take effect in \write's, yet the group defined by the \vbox ends
+% before the \shipout runs.
+%
+\escapechar = `\\     % use backslash in output files.
+\indexdummies         % don't expand commands in the output.
+\normalturnoffactive  % \ in index entries must not stay \, e.g., if
+% the page break happens to be in the middle of an example.
 \shipout\vbox{%
-{\let\hsize=\pagewidth \makeheadline}%
+\ifcropmarks \vbox to \outervsize\bgroup
+\hsize = \outerhsize
+\line{\ewtop\hfil\ewtop}%
+\nointerlineskip
+\line{%
+\vbox{\moveleft\cornerthick\nstop}%
+\hfill
+\vbox{\moveright\cornerthick\nstop}%
+}%
+\vskip\topandbottommargin
+\line\bgroup
+\hfil % center the page within the outer (page) hsize.
+\ifodd\pageno\hskip\bindingoffset\fi
+\vbox\bgroup
+\fi
+%
+\unvbox\headlinebox
 \pagebody{#1}%
-{\let\hsize=\pagewidth \makefootline}%
+\ifdim\ht\footlinebox > 0pt
-}%
+% Only leave this space if the footline is nonempty.
-}%
+% (We lessened \vsize for it in \oddfootingxxx.)
+% The \baselineskip=24pt in plain's \makefootline has no effect.
+\vskip 2\baselineskip
+\unvbox\footlinebox
+\fi
+%
+\ifcropmarks
+\egroup % end of \vbox\bgroup
+\hfil\egroup % end of (centering) \line\bgroup
+\vskip\topandbottommargin plus1fill minus1fill
+\boxmaxdepth = \cornerthick
+\line{%
+\vbox{\moveleft\cornerthick\nsbot}%
+\hfill
+\vbox{\moveright\cornerthick\nsbot}%
+}%
+\nointerlineskip
+\line{\ewbot\hfil\ewbot}%
+\egroup % \vbox from first cropmarks clause
+\fi
+}% end of \shipout\vbox
+}% end of group with \turnoffactive
 \advancepageno
 \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
-%%%% For @cropmarks command %%%%
-% Here is a modification of the main output routine for Near East Publications
-% This provides right-angle cropmarks at all four corners.
-% The contents of the page are centerlined into the cropmarks,
-% and any desired binding offset is added as an \hskip on either
-% site of the centerlined box.  (P. A. MacKay, 12 November, 1986)
-%
-\def\croppageout#1{\hoffset=0pt % make sure this doesn't mess things up
-{\escapechar=`\\\relax % makes sure backslash is used in output files.
-\shipout
-\vbox to \outervsize{\hsize=\outerhsize
-\vbox{\line{\ewtop\hfill\ewtop}}
-\nointerlineskip
-\line{\vbox{\moveleft\cornerthick\nstop}
-\hfill
-\vbox{\moveright\cornerthick\nstop}}
-\vskip \topandbottommargin
-\centerline{\ifodd\pageno\hskip\bindingoffset\fi
-\vbox{
-{\let\hsize=\pagewidth \makeheadline}
-\pagebody{#1}
-{\let\hsize=\pagewidth \makefootline}}
-\ifodd\pageno\else\hskip\bindingoffset\fi}
-\vskip \topandbottommargin plus1fill minus1fill
-\boxmaxdepth\cornerthick
-\line{\vbox{\moveleft\cornerthick\nsbot}
-\hfill
-\vbox{\moveright\cornerthick\nsbot}}
-\nointerlineskip
-\vbox{\line{\ewbot\hfill\ewbot}}
-}}
-\advancepageno
-\ifnum\outputpenalty>-20000 \else\dosupereject\fi}
-%
-% Do @cropmarks to get crop marks
-\def\cropmarks{\let\onepageout=\croppageout }
 \newinsert\margin \dimen\margin=\maxdimen
 \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
 {\catcode`\@ =11
 \dimen@=\dp#1 \unvbox#1
 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
 \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
 }
-%
 % Here are the rules for the cropmarks.  Note that they are
 % offset so that the space between them is truly \outerhsize or \outervsize
 % (P. A. MacKay, 12 November, 1986)
 %
 \def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
 % Ignore @ignore ... @end ignore.
 %
 \def\ignore{\doignore{ignore}}
-% Also ignore @ifinfo, @ifhtml, @html, @menu, and @direntry text.
+% Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text.
 %
 \def\ifinfo{\doignore{ifinfo}}
 \def\ifhtml{\doignore{ifhtml}}
+\def\ifnottex{\doignore{ifnottex}}
 \def\html{\doignore{html}}
 \def\menu{\doignore{menu}}
 \def\direntry{\doignore{direntry}}
 % Also ignore @macro ... @end macro.  The user must run texi2dvi,
 % Define a command to swallow text until we reach `@end #1'.
 \long\def\doignoretext##1\end #1{\enddoignore}%
 %
 % Make sure that spaces turn into tokens that match what \doignoretext wants.
 \catcode32 = 10
+%
+% Ignore braces, too, so mismatched braces don't cause trouble.
+\catcode`\{ = 9
+\catcode`\} = 9
 %
 % And now expand that command.
 \doignoretext
 }
 %
 % Do minimal line-breaking.
 \pretolerance = 10000
 %
 % Do not execute instructions in @tex
-\def\tex{\doignore{tex}}
+\def\tex{\doignore{tex}}%
 }
 % @set VAR sets the variable VAR to an empty value.
 % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
 %
 % empty), we can't just use \parsearg; we have to insert a space of our
 % own to delimit the rest of the line, and then take it out again if we
 % didn't need it.  Make sure the catcode of space is correct to avoid
 % losing inside @example, for instance.
 %
-\def\set{\begingroup\catcode` =10 \parsearg\setxxx}
+\def\set{\begingroup\catcode` =10
+\catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
+\parsearg\setxxx}
 \def\setxxx#1{\setyyy#1 \endsetyyy}
 \def\setyyy#1 #2\endsetyyy{%
 \def\temp{#2}%
 \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
 \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
 \def\clear{\parsearg\clearxxx}
 \def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
 % @value{foo} gets the text saved in variable foo.
 %
-\def\value#1{\expandafter
+\def\value{\begingroup
-\ifx\csname SET#1\endcsname\relax
+\catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
-{\{No value for ``#1''\}}
+\valuexxx}
-\else \csname SET#1\endcsname \fi}
+\def\valuexxx#1{%
+\expandafter\ifx\csname SET#1\endcsname\relax
+{\{No value for ``#1''\}}%
+\else
+\csname SET#1\endcsname
+\fi
+\endgroup}
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
 %
 \def\ifset{\parsearg\ifsetxxx}
 }
 \def\ifclearsucceed{\conditionalsucceed{ifclear}}
 \def\ifclearfail{\nestedignore{ifclear}}
 \defineunmatchedend{ifclear}
-% @iftex always succeeds; we read the text following, through @end
+% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text
-% iftex).  But `@end iftex' should be valid only after an @iftex.
+% following, through the first @end iftex (etc.).  Make `@end iftex'
+% (etc.) valid only after an @iftex.
 %
 \def\iftex{\conditionalsucceed{iftex}}
+\def\ifnothtml{\conditionalsucceed{ifnothtml}}
+\def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
 \defineunmatchedend{iftex}
+\defineunmatchedend{ifnothtml}
+\defineunmatchedend{ifnotinfo}
 % We can't just want to start a group at @iftex (for example) and end it
 % at @end iftex, since then @set commands inside the conditional have no
 % effect (they'd get reverted at the end of the group).  So we must
 % define \Eiftex to redefine itself to be its previous value.  (We can't
 \readauxfile
 \opencontents
 \openindices
 \fixbackslash  % Turn off hack to swallow `\input texinfo'.
 \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
+%
+% If texinfo.cnf is present on the system, read it.
+% Useful for site-wide @afourpaper, etc.
+% Just to be on the safe side, close the input stream before the \input.
+\openin 1 texinfo.cnf
+\ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi
+\closein1
+\temp
+%
 \comment % Ignore the actual filename.
 }
 % @bye.
 \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
 \let\li = \sf % Sometimes we call it \li, not \sf.
 % We don't need math for this one.
 \def\ttsl{\tenttsl}
-%% Try out Computer Modern fonts at \magstephalf
+% Use Computer Modern fonts at \magstephalf (11pt).
-\let\mainmagstep=\magstephalf
+\newcount\mainmagstep
+\mainmagstep=\magstephalf
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
 % #3 is the font's design size, #4 is a scale factor
 \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
 \let\indbf=\indrm
 \setfont\indsc\scshape{10}{900}
 \font\indi=cmmi9
 \font\indsy=cmsy9
+% Fonts for title page:
+\setfont\titlerm\rmbshape{12}{\magstep3}
+\setfont\titleit\itbshape{10}{\magstep4}
+\setfont\titlesl\slbshape{10}{\magstep4}
+\setfont\titlett\ttbshape{12}{\magstep3}
+\setfont\titlettsl\ttslshape{10}{\magstep4}
+\setfont\titlesf\sfbshape{17}{\magstep1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
 % Chapter (and unnumbered) fonts (17.28pt).
 \setfont\chaprm\rmbshape{12}{\magstep2}
 \setfont\chapit\itbshape{10}{\magstep3}
 \setfont\chapsl\slbshape{10}{\magstep3}
 \setfont\chaptt\ttbshape{12}{\magstep2}
 \setfont\chapttsl\ttslshape{10}{\magstep3}
-\setfont\chapsf\sfbshape{12}{\magstep2}
+\setfont\chapsf\sfbshape{17}{1000}
 \let\chapbf=\chaprm
 \setfont\chapsc\scbshape{10}{\magstep3}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
 % Subsection fonts (13.15pt).
 \setfont\ssecrm\rmbshape{12}{\magstephalf}
 \setfont\ssecit\itbshape{10}{1315}
 \setfont\ssecsl\slbshape{10}{1315}
 \setfont\ssectt\ttbshape{12}{\magstephalf}
-\setfont\ssecttsl\ttslshape{10}{\magstep1}
+\setfont\ssecttsl\ttslshape{10}{1315}
 \setfont\ssecsf\sfbshape{12}{\magstephalf}
 \let\ssecbf\ssecrm
 \setfont\ssecsc\scbshape{10}{\magstep1}
 \font\sseci=cmmi12 scaled \magstephalf
-\font\ssecsy=cmsy10 scaled \magstep1
+\font\ssecsy=cmsy10 scaled 1315
 % The smallcaps and symbol fonts should actually be scaled \magstep1.5,
 % but that is not a standard magnification.
-% Fonts for title page:
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\let\authorrm = \secrm
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
 % texinfo doesn't allow for producing subscripts and superscripts, we
 % don't bother to reset \scriptfont and \scriptscriptfont (which would
 \def\textfonts{%
 \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
 \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
 \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
 \resetmathfonts}
+\def\titlefonts{%
+\let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
+\let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
+\let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
+\let\tenttsl=\titlettsl
+\resetmathfonts \setleading{25pt}}
+\def\titlefont#1{{\titlefonts #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
 \resetmathfonts \setleading{19pt}}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
 \let\file=\samp
-\let\url=\samp % perhaps include a hypertex \special eventually
-\def\email#1{$\langle${\tt #1}$\rangle$}
 % @code is a modification of @t,
 % which makes spaces the same size as normal in the surrounding text.
 \def\tclose#1{%
 {%
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
 \catcode`\-=\active
 \catcode`\_=\active
+\catcode`\|=\active
 \global\def\code{\begingroup \catcode`\-=\active \let-\codedash \catcode`\_=\active \let_\codeunder \codex}
 % The following is used by \doprintindex to insure that long function names
 % wrap around.  It is necessary for - and _ to be active before the index is
 % read from the file, as \entry parses the arguments long before \code is
 % ever called.  -- mycroft
-\global\def\indexbreaks{\catcode`\-=\active \let-\realdash \catcode`\_=\active \let_\realunder}
+% _ is always active; and it shouldn't be \let = to an _ that is a
+% subscript character anyway. Then, @cindex @samp{_} (for example)
+% fails.  --karl
+\global\def\indexbreaks{%
+\catcode`\-=\active \let-\realdash
+}
 }
 \def\realdash{-}
-\def\realunder{_}
 \def\codedash{-\discretionary{}{}{}}
-\def\codeunder{\normalunderscore\discretionary{}{}{}}
+\def\codeunder{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}}
 \def\codex #1{\tclose{#1}\endgroup}
 %\let\exp=\tclose  %Was temporary
 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
-%
+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
+%   `example' (@kbd uses ttsl only inside of @example and friends),
+%   or `code' (@kbd uses normal tty font always).
+\def\kbdinputstyle{\parsearg\kbdinputstylexxx}
+\def\kbdinputstylexxx#1{%
+\def\arg{#1}%
+\ifx\arg\worddistinct
+\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
+\else\ifx\arg\wordexample
+\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
+\else\ifx\arg\wordcode
+\gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+\fi\fi\fi
+}
+\def\worddistinct{distinct}
+\def\wordexample{example}
+\def\wordcode{code}
+% Default is kbdinputdistinct.  (Too much of a hassle to call the macro,
+% the catcodes are wrong for parsearg to work.)
+\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}
 \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{\ttsl\look}}\fi
+\else{\tclose{\kbdfont\look}}\fi
-\else{\tclose{\ttsl\look}}\fi}
+\else{\tclose{\kbdfont\look}}\fi}
+% @url, @email.  Quotes do not seem necessary.
+\let\url=\code % perhaps include a hypertex \special eventually
+% rms does not like the angle brackets --karl, 17may97.
+%\def\email#1{$\langle${\tt #1}$\rangle$}
+\let\email=\code
+% @uref (abbreviation for `urlref') takes an optional second argument
+% specifying the text to display.  First (mandatory) arg is the url.
+%
+\def\uref#1{\urefxxx #1,,\finish}
+\def\urefxxx#1,#2,#3\finish{%
+\setbox0 = \hbox{\ignorespaces #2}%
+\ifdim\wd0 > 0pt
+\unhbox0\ (\code{#1})%
+\else
+\code{#1}%
+\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.
 \newskip\titlepagetopglue \titlepagetopglue = 1.5in
 \newskip\titlepagebottomglue \titlepagebottomglue = 2pc
 % First the title page.  Must do @settitle before @titlepage.
-\def\titlefont#1{{\titlerm #1}}
 \newif\ifseenauthor
 \newif\iffinishedtitlepage
 \def\shorttitlepage{\parsearg\shorttitlepagezzz}
 \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
 % Leave some space at the very top of the page.
 \vglue\titlepagetopglue
 %
 % Now you can print the title using @title.
 \def\title{\parsearg\titlezzz}%
-\def\titlezzz##1{\leftline{\titlefont{##1}}
+\def\titlezzz##1{\leftline{\titlefonts\rm ##1}
 % print a rule at the page bottom also.
 \finishedtitlepagefalse
 \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
 % No rule at page bottom unless we print one at the top with @title.
 \finishedtitlepagetrue
 \gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish}
 \gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{%
 \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-\gdef\everyheadingxxx #1{\everyheadingyyy #1@|@|@|@|\finish}
+\gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
-\gdef\everyheadingyyy #1@|#2@|#3@|#4\finish{%
-\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
-\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 \gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
 \gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{%
 \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 \gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
 \gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
-\global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+\global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
+%
-\gdef\everyfootingxxx #1{\everyfootingyyy #1@|@|@|@|\finish}
+% Leave some space for the footline.  Hopefully ok to assume
-\gdef\everyfootingyyy #1@|#2@|#3@|#4\finish{%
+% @evenfooting will not be used by itself.
-\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
+\global\advance\pageheight by -\baselineskip
-\global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+\global\advance\vsize by -\baselineskip
+}
+\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
 %
 }% unbind the catcode of @.
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
 % Definition of @item while inside @itemize.
 \def\itemizeitem{%
 \advance\itemno by 1
 {\let\par=\endgraf \smallbreak}%
-\ifhmode \errmessage{\in hmode at itemizeitem}\fi
+\ifhmode \errmessage{In hmode at itemizeitem}\fi
 {\parskip=0in \hskip 0pt
 \hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
 \vadjust{\penalty 1200}}%
 \flushcr}
 % Table can continue over pages but will only break between lines.
 % To make preamble:
 %
 % Either define widths of columns in terms of percent of \hsize:
 %   @multitable @columnfractions .25 .3 .45
 %   @item ...
 %
 %   Numbers following @columnfractions are the percent of the total
 %   current hsize to be used for each column. You may use as many
 %
 % For those who want to use more than one line's worth of words in
 % the preamble, break the line within one argument and it
 % will parse correctly, i.e.,
 %
 %     @multitable {Column 1 template} {Column 2 template} {Column 3
 %      template}
 % Not:
 %     @multitable {Column 1 template} {Column 2 template}
 %      {Column 3 template}
 % Each new table line starts with @item, each subsequent new column
 % starts with @tab. Empty columns may be produced by supplying @tab's
 % with nothing between them for as many times as empty columns are needed,
 % ie, @tab@tab@tab will produce two empty columns.
 % @item, @tab, @multitable or @end multitable do not need to be on their
 % Sample multitable:
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item first col stuff @tab second col stuff @tab third col
 %   @item
 %   first col stuff
 %   @tab
 %   second col stuff
 %   @tab
 %   third col
 %   @item first col stuff @tab second col stuff
 %   @tab Many paragraphs of text may be used in any column.
 %
 %         They will wrap at the width determined by the template.
 %   @item@tab@tab This will be in third column.
 %   @end multitable
 % Default dimensions may be reset by user.
 % @multitablelinespace is space to leave between table items, baseline
 %                                                            to baseline.
 %   0pt means it depends on current normal line spacing.
 %%%%
 % Dimensions
 \newskip\multitableparskip
 \newskip\multitableparindent
 \newdimen\multitablecolspace
 \newskip\multitablelinespace
 \global\colcount=0\relax%
 \def\Emultitable{\global\setpercentfalse\global\everycr{}\cr\egroup\egroup}%
 % To parse everything between @multitable and @item :
 \setuptable#1 \endsetuptable
 % Need to reset this to 0 after \setuptable.
 \global\colcount=0\relax%
 %
 % This preamble sets up a generic column definition, which will
 % be used as many times as user calls for columns.
 % \vtop will set a single line and will also let text wrap and
 % continue for many paragraphs if desired.
 \halign\bgroup&\global\advance\colcount by 1\relax%
 \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
 % In order to keep entries from bumping into each other
 % we will add a \leftskip of \multitablecolspace to all columns after
 % the first one.
 %  If a template has been used, we will add \multitablecolspace
 % to the width of each template entry.
 %  If user has set preamble in terms of percent of \hsize
 % we will use that dimension as the width of the column, and
 % the \leftskip will keep entries from bumping into each other.
 % Table will start at left margin and final column will justify at
 \ifnum\colcount=1
 \else
 \ifsetpercent
 \else
 % If user has <not> set preamble in terms of percent of \hsize
 % we will advance \hsize by \multitablecolspace
 \advance\hsize by \multitablecolspace
 \fi
 % In either case we will make \leftskip=\multitablecolspace:
 \leftskip=\multitablecolspace
 \fi
-\noindent##\multistrut}\cr%
+% Ignoring space at the beginning and end avoids an occasional spurious
+% blank line, when TeX decides to break the line at the space before the
+% box from the multistrut, so the strut ends up on a line by itself.
+% For example:
+% @multitable @columnfractions .11 .89
+% @item @code{#}
+% @tab Legal holiday which is valid in major parts of the whole country.
+% Is automatically provided with highlighting sequences respectively marking
+% characters.
+\noindent\ignorespaces##\unskip\multistrut}\cr
 % \everycr will reset column counter, \colcount, at the end of
 % each line. Every column  entry will cause \colcount to advance by one.
 % The table preamble
 % looks at the current \colcount to find the correct column width.
 \global\everycr{\noalign{%
-\filbreak%% keeps underfull box messages off when table breaks over pages.
+% \filbreak%% keeps underfull box messages off when table breaks over pages.
+% Maybe so, but it also creates really weird page breaks when the table
+% breaks over pages Wouldn't \vfil be better?  Wait until the problem
+% manifests itself, so it can be fixed for real --karl.
 \global\colcount=0\relax}}
 }
 \def\setmultitablespacing{% test to see if user has set \multitablelinespace.
 % If so, do nothing. If not, give it an appropriate dimension based on
 \ifdim\multitablelinespace=0pt
 %% strut to put in table in case some entry doesn't have descenders,
 %% to keep lines equally spaced
 \let\multistrut = \strut
 %% 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.
 \else
 \gdef\multistrut{\vrule height\multitablelinespace depth\dp0
 width0pt\relax} \fi
 \ifdim\multitableparskip>\multitablelinespace
 \def\less{\realbackslash less}%
 \def\hat{\realbackslash hat}%
 %\def\char{\realbackslash char}%
 \def\TeX{\realbackslash TeX}%
 \def\dots{\realbackslash dots }%
-\def\copyright{\realbackslash copyright }%
+\def\result{\realbackslash result}%
+\def\equiv{\realbackslash equiv}%
+\def\expansion{\realbackslash expansion}%
+\def\print{\realbackslash print}%
+\def\error{\realbackslash error}%
+\def\point{\realbackslash point}%
+\def\copyright{\realbackslash copyright}%
 \def\tclose##1{\realbackslash tclose {##1}}%
 \def\code##1{\realbackslash code {##1}}%
 \def\dotless##1{\realbackslash dotless {##1}}%
 \def\samp##1{\realbackslash samp {##1}}%
 \def\,##1{\realbackslash ,{##1}}%
 \def\t##1{\realbackslash t {##1}}%
 \def\r##1{\realbackslash r {##1}}%
 \def\i##1{\realbackslash i {##1}}%
 \def\b##1{\realbackslash b {##1}}%
+\def\sc##1{\realbackslash sc {##1}}%
 \def\cite##1{\realbackslash cite {##1}}%
 \def\key##1{\realbackslash key {##1}}%
 \def\file##1{\realbackslash file {##1}}%
 \def\var##1{\realbackslash var {##1}}%
 \def\kbd##1{\realbackslash kbd {##1}}%
 \def\dfn##1{\realbackslash dfn {##1}}%
 \def\emph##1{\realbackslash emph {##1}}%
+\def\value##1{\realbackslash value {##1}}%
 \unsepspaces
 }
 % If an index command is used in an @example environment, any spaces
 % therein should become regular spaces in the raw index file, not the
 \count255=\lastpenalty
 {%
 \indexdummies % Must do this here, since \bf, etc expand at this stage
 \escapechar=`\\
 {%
-\let\folio=0 % We will expand all macros now EXCEPT \folio.
+\let\folio=0% We will expand all macros now EXCEPT \folio.
 \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
 % so it will be output as is; and it will print as backslash.
 %
 % First process the index-string with all font commands turned off
 % to get the string to sort by.
 \gdef\cindexsub "#1" #2^^M{\endgroup %
 \dosubind{cp}{#2}{#1}}}
 % Define the macros used in formatting output of the sorted index material.
-% This is what you call to cause a particular index to get printed.
+% @printindex causes a particular index (the ??s file) to get printed.
-% Write
+% It does not print any chapter heading (usually an @unnumbered).
-% @unnumbered Function Index
+%
-% @printindex fn
 \def\printindex{\parsearg\doprintindex}
 \def\doprintindex#1{\begingroup
 \dobreak \chapheadingskip{10000}%
 %
 \indexfonts \rm
 \tolerance = 9500
 \indexbreaks
-\def\indexbackslash{\rawbackslashxx}%
-% Index files are almost Texinfo source, but we use \ as the escape
-% character.  It would be better to use @, but that's too big a change
-% to make right now.
-\catcode`\\ = 0
-\catcode`\@ = 11
-\escapechar = `\\
-\begindoublecolumns
 %
 % See if the index file exists and is nonempty.
 \openin 1 \jobname.#1s
 \ifeof 1
 % \enddoublecolumns gets confused if there is no text in the index,
 % it can discover if there is anything in it.
 \read 1 to \temp
 \ifeof 1
 (Index is empty)
 \else
+% Index files are almost Texinfo source, but we use \ as the escape
+% character.  It would be better to use @, but that's too big a change
+% to make right now.
+\def\indexbackslash{\rawbackslashxx}%
+\catcode`\\ = 0
+\catcode`\@ = 11
+\escapechar = `\\
+\begindoublecolumns
 \input \jobname.#1s
+\enddoublecolumns
 \fi
 \fi
 \closein 1
-\enddoublecolumns
 \endgroup}
 % These macros are used by the sorted index file itself.
 % Change them to control the appearance of the index.
 \newbox\partialpage
 \newdimen\doublecolumnhsize
 \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
 % Grab any single-column material above us.
-\output = {\global\setbox\partialpage
+\output = {\global\setbox\partialpage = \vbox{%
-=\vbox{\unvbox255\kern -\topskip \kern \baselineskip}}%
+%
+% Here is a possibility not foreseen in manmac: if we accumulate a
+% whole lot of material, we might end up calling this \output
+% routine twice in a row (see the doublecol-lose test, which is
+% essentially a couple of indexes with @setchapternewpage off).  In
+% that case, we must prevent the second \partialpage from
+% simply overwriting the first, causing us to lose the page.
+% This will preserve it until a real output routine can ship it
+% out.  Generally, \partialpage will be empty when this runs and
+% this will be a no-op.
+\unvbox\partialpage
+%
+% Unvbox the main output page.
+\unvbox255
+\kern-\topskip \kern\baselineskip
+}}%
 \eject
 %
-% Now switch to the double-column output routine.
+% Use the double-column output routine for subsequent pages.
-\output={\doublecolumnout}%
+\output = {\doublecolumnout}%
 %
 % Change the page size parameters.  We could do this once outside this
 % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
 % format, but then we repeat the same computation.  Repeating a couple
 % of assignments once per index is clearly meaningless for the
-% execution time, so we may as well do it once.
+% execution time, so we may as well do it in one place.
 %
 % First we halve the line length, less a little for the gutter between
 % the columns.  We compute the gutter based on the line length, so it
 % changes automatically with the paper format.  The magic constant
-% below is chosen so that the gutter has the same value (well, +- <
+% below is chosen so that the gutter has the same value (well, +-<1pt)
-% 1pt) as it did when we hard-coded it.
+% as it did when we hard-coded it.
 %
 % We put the result in a separate register, \doublecolumhsize, so we
 % can restore it in \pagesofar, after \hsize itself has (potentially)
 % been clobbered.
 %
 \splittopskip=\topskip \splitmaxdepth=\maxdepth
 % Get the available space for the double columns -- the normal
 % (undoubled) page height minus any material left over from the
 % previous page.
 \dimen@=\pageheight \advance\dimen@ by-\ht\partialpage
-% box0 will be the left-hand column, box1 the right.
+% box0 will be the left-hand column, box2 the right.
 \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
 \onepageout\pagesofar
-\unvbox255 \penalty\outputpenalty
+\unvbox255
+\penalty\outputpenalty
 }
 \def\pagesofar{%
-% The contents of the output page -- any previous material,
+% Re-output the contents of the output page -- any previous material,
 % followed by the two boxes we just split.
 \unvbox\partialpage
 \hsize = \doublecolumnhsize
 \wd0=\hsize \wd2=\hsize \hbox to\pagewidth{\box0\hfil\box2}%
 }
 \def\enddoublecolumns{%
-\output={\balancecolumns}\eject % split what we have
+\output = {\balancecolumns}\eject % split what we have
-\endgroup
+\endgroup % started in \begindoublecolumns
+%
 % Back to normal single-column typesetting, but take account of the
 % fact that we just accumulated some stuff on the output page.
-\pagegoal=\vsize
+\pagegoal = \vsize
 }
 \def\balancecolumns{%
-% Called on the last page of the double column material.
+% Called at the end of the double column material.
-\setbox0=\vbox{\unvbox255}%
+\setbox0 = \vbox{\unvbox255}%
 \dimen@ = \ht0
 \advance\dimen@ by \topskip
 \advance\dimen@ by-\baselineskip
 \divide\dimen@ by 2
 \splittopskip = \topskip
 % Loop until we get a decent breakpoint.
-{\vbadness=10000 \loop \global\setbox3=\copy0
+{\vbadness=10000 \loop
+\global\setbox3=\copy0
 \global\setbox1=\vsplit3 to\dimen@
-\ifdim\ht3>\dimen@ \global\advance\dimen@ by1pt \repeat}%
+\ifdim\ht3>\dimen@ \global\advance\dimen@ by1pt
+\repeat}%
 \setbox0=\vbox to\dimen@{\unvbox1}%
 \setbox2=\vbox to\dimen@{\unvbox3}%
 \pagesofar
 }
-\catcode `\@=\other
+\catcode`\@ = \other
 \message{sectioning,}
 % Define chapters, sections, etc.
-\newcount \chapno
+\newcount\chapno
-\newcount \secno        \secno=0
+\newcount\secno        \secno=0
-\newcount \subsecno     \subsecno=0
+\newcount\subsecno     \subsecno=0
-\newcount \subsubsecno  \subsubsecno=0
+\newcount\subsubsecno  \subsubsecno=0
 % This counter is funny since it counts through charcodes of letters A, B, ...
-\newcount \appendixno  \appendixno = `\@
+\newcount\appendixno  \appendixno = `\@
 \def\appendixletter{\char\the\appendixno}
-\newwrite \contentsfile
+\newwrite\contentsfile
 % This is called from \setfilename.
-\def\opencontents{\openout \contentsfile = \jobname.toc}
+\def\opencontents{\openout\contentsfile = \jobname.toc }
 % Each @chapter defines this as the name of the chapter.
 % page headings and footings can use it.  @section does likewise
 \def\thischapter{} \def\thissection{}
-\def\seccheck#1{\if \pageno<0 %
+\def\seccheck#1{\ifnum \pageno<0
-\errmessage{@#1 not allowed after generating table of contents}\fi
+\errmessage{@#1 not allowed after generating table of contents}%
-%
+\fi}
-}
 \def\chapternofonts{%
-\let\rawbackslash=\relax%
+\let\rawbackslash=\relax
-\let\frenchspacing=\relax%
+\let\frenchspacing=\relax
-\def\result{\realbackslash result}
+\def\result{\realbackslash result}%
-\def\equiv{\realbackslash equiv}
+\def\equiv{\realbackslash equiv}%
-\def\expansion{\realbackslash expansion}
+\def\expansion{\realbackslash expansion}%
-\def\print{\realbackslash print}
+\def\print{\realbackslash print}%
-\def\TeX{\realbackslash TeX}
+\def\TeX{\realbackslash TeX}%
-\def\dots{\realbackslash dots}
+\def\dots{\realbackslash dots}%
-\def\copyright{\realbackslash copyright}
+\def\result{\realbackslash result}%
-\def\tt{\realbackslash tt}
+\def\equiv{\realbackslash equiv}%
-\def\bf{\realbackslash bf }
+\def\expansion{\realbackslash expansion}%
-\def\w{\realbackslash w}
+\def\print{\realbackslash print}%
-\def\less{\realbackslash less}
+\def\error{\realbackslash error}%
-\def\gtr{\realbackslash gtr}
+\def\point{\realbackslash point}%
-\def\hat{\realbackslash hat}
+\def\copyright{\realbackslash copyright}%
-\def\char{\realbackslash char}
+\def\tt{\realbackslash tt}%
-\def\tclose##1{\realbackslash tclose {##1}}
+\def\bf{\realbackslash bf}%
-\def\code##1{\realbackslash code {##1}}
+\def\w{\realbackslash w}%
-\def\samp##1{\realbackslash samp {##1}}
+\def\less{\realbackslash less}%
-\def\r##1{\realbackslash r {##1}}
+\def\gtr{\realbackslash gtr}%
-\def\b##1{\realbackslash b {##1}}
+\def\hat{\realbackslash hat}%
-\def\key##1{\realbackslash key {##1}}
+\def\char{\realbackslash char}%
-\def\file##1{\realbackslash file {##1}}
+\def\tclose##1{\realbackslash tclose{##1}}%
-\def\kbd##1{\realbackslash kbd {##1}}
+\def\code##1{\realbackslash code{##1}}%
-% These are redefined because @smartitalic wouldn't work inside xdef.
+\def\samp##1{\realbackslash samp{##1}}%
-\def\i##1{\realbackslash i {##1}}
+\def\r##1{\realbackslash r{##1}}%
-\def\cite##1{\realbackslash cite {##1}}
+\def\b##1{\realbackslash b{##1}}%
-\def\var##1{\realbackslash var {##1}}
+\def\key##1{\realbackslash key{##1}}%
-\def\emph##1{\realbackslash emph {##1}}
+\def\file##1{\realbackslash file{##1}}%
-\def\dfn##1{\realbackslash dfn {##1}}
+\def\kbd##1{\realbackslash kbd{##1}}%
+% These are redefined because @smartitalic wouldn't work inside xdef.
+\def\i##1{\realbackslash i{##1}}%
+\def\cite##1{\realbackslash cite{##1}}%
+\def\var##1{\realbackslash var{##1}}%
+\def\emph##1{\realbackslash emph{##1}}%
+\def\dfn##1{\realbackslash dfn{##1}}%
 }
 \newcount\absseclevel % used to calculate proper heading level
 \newcount\secbase\secbase=0 % @raise/lowersections modify this count
 \gdef\thischaptername{#1}%
 % We don't substitute the actual chapter name into \thischapter
 % because we don't want its macros evaluated now.
 \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
 {\chapternofonts%
-\edef\temp{{\realbackslash chapentry {#1}{\the\chapno}{\noexpand\folio}}}%
+\toks0 = {#1}%
+\edef\temp{{\realbackslash chapentry{\the\toks0}{\the\chapno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp  %
 \donoderef %
 \global\let\section = \numberedsec
 \global\let\subsection = \numberedsubsec
 \chapmacro {#1}{\putwordAppendix{} \appendixletter}%
 \gdef\thissection{#1}%
 \gdef\thischaptername{#1}%
 \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
 {\chapternofonts%
-\edef\temp{{\realbackslash chapentry
+\toks0 = {#1}%
-{#1}{\putwordAppendix{} \appendixletter}{\noexpand\folio}}}%
+\edef\temp{{\realbackslash chapentry{\the\toks0}%
+{\putwordAppendix{} \appendixletter}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp  %
 \appendixnoderef %
 \global\let\section = \appendixsec
 \global\let\subsection = \appendixsubsec
 \toks0 = {#1}\message{(\the\toks0)}%
 %
 \unnumbchapmacro {#1}%
 \gdef\thischapter{#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\edef\temp{{\realbackslash unnumbchapentry {#1}{\noexpand\folio}}}%
+\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbchapentry{\the\toks0}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp  %
 \unnumbnoderef %
 \global\let\section = \unnumberedsec
 \global\let\subsection = \unnumberedsubsec
 \def\secyyy #1{\numhead1{#1}} % normally calls seczzz
 \def\seczzz #1{\seccheck{section}%
 \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
 \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
 {\chapternofonts%
+\toks0 = {#1}%
 \edef\temp{{\realbackslash secentry %
-{#1}{\the\chapno}{\the\secno}{\noexpand\folio}}}%
+{\the\toks0}{\the\chapno}{\the\secno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \donoderef %
 \penalty 10000 %
 }}
 \def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
 \def\appendixsectionzzz #1{\seccheck{appendixsection}%
 \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
 \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
 {\chapternofonts%
+\toks0 = {#1}%
 \edef\temp{{\realbackslash secentry %
-{#1}{\appendixletter}{\the\secno}{\noexpand\folio}}}%
+{\the\toks0}{\appendixletter}{\the\secno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \appendixnoderef %
 \penalty 10000 %
 }}
 \outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
 \def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
 \def\unnumberedseczzz #1{\seccheck{unnumberedsec}%
 \plainsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\edef\temp{{\realbackslash unnumbsecentry{#1}{\noexpand\folio}}}%
+\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbsecentry{\the\toks0}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \unnumbnoderef %
 \penalty 10000 %
 }}
 \def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
 \def\numberedsubseczzz #1{\seccheck{subsection}%
 \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
 \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
 {\chapternofonts%
+\toks0 = {#1}%
 \edef\temp{{\realbackslash subsecentry %
-{#1}{\the\chapno}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
+{\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \donoderef %
 \penalty 10000 %
 }}
 \def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
 \def\appendixsubseczzz #1{\seccheck{appendixsubsec}%
 \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
 \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
 {\chapternofonts%
+\toks0 = {#1}%
 \edef\temp{{\realbackslash subsecentry %
-{#1}{\appendixletter}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
+{\the\toks0}{\appendixletter}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \appendixnoderef %
 \penalty 10000 %
 }}
 \outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
 \def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
 \def\unnumberedsubseczzz #1{\seccheck{unnumberedsubsec}%
 \plainsubsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\edef\temp{{\realbackslash unnumbsubsecentry{#1}{\noexpand\folio}}}%
+\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbsubsecentry{\the\toks0}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \unnumbnoderef %
 \penalty 10000 %
 }}
 \def\numberedsubsubseczzz #1{\seccheck{subsubsection}%
 \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
 \subsubsecheading {#1}
 {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
 {\chapternofonts%
-\edef\temp{{\realbackslash subsubsecentry %
+\toks0 = {#1}%
-{#1}
+\edef\temp{{\realbackslash subsubsecentry{\the\toks0}
 {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}
 {\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \donoderef %
 \def\appendixsubsubseczzz #1{\seccheck{appendixsubsubsec}%
 \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
 \subsubsecheading {#1}
 {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
 {\chapternofonts%
-\edef\temp{{\realbackslash subsubsecentry{#1}%
+\toks0 = {#1}%
+\edef\temp{{\realbackslash subsubsecentry{\the\toks0}%
 {\appendixletter}
 {\the\secno}{\the\subsecno}{\the\subsubsecno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \appendixnoderef %
 \outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
 \def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
 \def\unnumberedsubsubseczzz #1{\seccheck{unnumberedsubsubsec}%
 \plainsubsubsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\edef\temp{{\realbackslash unnumbsubsubsecentry{#1}{\noexpand\folio}}}%
+\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbsubsubsecentry{\the\toks0}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \unnumbnoderef %
 \penalty 10000 %
 }}
 \def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
 \def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
 % Print any size section title.
 %
 % #1 is the section type (sec/subsec/subsubsec), #2 is the section
 % number (maybe empty), #3 the text.
 \def\sectionheading#1#2#3{%
 {%
 \expandafter\advance\csname #1headingskip\endcsname by \parskip
 % Don't need to put `Contents' or `Short Contents' in the headline.
 % It is abundantly clear what they are.
 \unnumbchapmacro{#1}\def\thischapter{}%
 \begingroup                  % Set up to handle contents files properly.
 \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
+% We can't do this, because then an actual ^ in a section
+% title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
+%\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
 \raggedbottom             % Worry more about breakpoints than the bottom.
 \advance\hsize by -\contentsrightmargin % Don't use the full line length.
 }
 \catcode`\<=12
 \catcode`\>=12
 \escapechar=`\\
 %
 \let\,=\ptexcomma
-\let\~=\ptextilde
 \let\{=\ptexlbrace
 \let\}=\ptexrbrace
 \let\.=\ptexdot
 \let\*=\ptexstar
 \let\dots=\ptexdots
-\def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}
+\def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-\def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}
+\def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
 \def\@{@}%
 \let\bullet=\ptexbullet
 \let\b=\ptexb \let\c=\ptexc \let\i=\ptexi \let\t=\ptext
 %
 \let\Etex=\endgroup}
 % will be inserted at the beginning of the next paragraph in the
 % document, after the environment.
 %
 \def\nonfillfinish{\afterenvbreak\endgroup}%
-% This macro is
 \def\lisp{\begingroup
 \nonfillstart
 \let\Elisp = \nonfillfinish
 \tt
+% Make @kbd do something special, if requested.
+\let\kbdfont\kbdexamplefont
 \rawbackslash % have \ input char produce \ char from current font
 \gobble
 }
 % Define the \E... control sequence only if we are inside the
 % but make & act ordinary (given that it's active).
 \gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr}
 % Definitions of (, ) and & used in args for functions.
 % This is the definition of ( outside of all parentheses.
-\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested %
+\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested
-\global\advance\parencount by 1 }
+\global\advance\parencount by 1
+}
 %
 % This is the definition of ( when already inside a level of parens.
 \gdef\opnested{\char`\(\global\advance\parencount by 1 }
 %
 \gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
 % also in that case restore the outer-level definition of (.
 \ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
 \global\advance \parencount by -1 }
 % If we encounter &foo, then turn on ()-hacking afterwards
 \gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
 %
 \gdef\normalparens{\boldbrax\let&=\ampnr}
 } % End of definition inside \activeparens
 %% These parens (in \boldbrax) actually are a little bolder than the
 %% contained text.  This is especially needed for [ and ]
-\def\opnr{{\sf\char`\(}} \def\clnr{{\sf\char`\)}} \def\ampnr{\&}
+\def\opnr{{\sf\char`\(}\global\advance\parencount by 1 }
-\def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}}
+\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
+\def\ampnr{\&}
+\def\lbrb{{\bf\char`\[}}
+\def\rbrb{{\bf\char`\]}}
 % First, defname, which formats the header line itself.
 % #1 should be the function name.
 % #2 should be the type of definition, such as "Function".
 \catcode 61=\active %
 \obeylines\spacesplit#3}
 % This is used for \def{tp,vr}parsebody.  It could probably be used for
 % some of the others, too, with some judicious conditionals.
 %
 \def\parsebodycommon#1#2#3{%
 \begingroup\inENV %
 \medbreak %
 % Define the end token that this defining construct specifies
 % so that it will exit this group.
 \parsebodycommon{#1}{#2}{#3}%
 \spacesplit{\parsetpheaderline{#3{#4}}}\empty
 }
 % Fine, but then we have to eventually remove the \empty *and* the
-% braces (if any).  That's what this does, putting the result in \tptemp.
+% braces (if any).  That's what this does.
 %
-\def\removeemptybraces\empty#1\relax{\def\tptemp{#1}}%
+\def\removeemptybraces\empty#1\relax{#1}
 % After \spacesplit has done its work, this is called -- #1 is the final
 % thing to call, #2 the type name (which starts with \empty), and #3
 % (which might be empty) the arguments.
 %
 \def\parsetpheaderline#1#2#3{%
-\removeemptybraces#2\relax
+#1{\removeemptybraces#2\relax}{#3}%
-#1{\tptemp}{#3}%
 }%
 \def\defopvarparsebody #1#2#3#4#5 {\begingroup\inENV %
 \medbreak %
 % Define the end token that this defining construct specifies
 % Expand, preventing hyphenation at `-' chars.
 % Note that groups don't affect changes in \hyphenchar.
 \hyphenchar\tensl=0
 #1%
 \hyphenchar\tensl=45
-\ifnum\parencount=0 \else \errmessage{unbalanced parens in @def arguments}\fi%
+\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
 \interlinepenalty=10000
 \advance\rightskip by 0pt plus 1fil
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000%
 }
 \def\deffnx #1 {\errmessage{@deffnx in invalid context}}
 \def\defunx #1 {\errmessage{@defunx in invalid context}}
 \def\defmacx #1 {\errmessage{@defmacx in invalid context}}
 \def\defspecx #1 {\errmessage{@defspecx in invalid context}}
 \def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}}
+\def\deftypemethodx #1 {\errmessage{@deftypemethodx in invalid context}}
 \def\deftypeunx #1 {\errmessage{@deftypeunx in invalid context}}
 % @defmethod, and so on
 % @defop {Funny Method} foo-class frobnicate argument
 \def\defopheader #1#2#3{%
 \dosubind {fn}{\code{#2}}{on #1}% Make entry in function index
 \begingroup\defname {#2}{\defoptype{} on #1}%
 \defunargs {#3}\endgroup %
+}
+% @deftypemethod foo-class return-type foo-method args
+%
+\def\deftypemethod{%
+\defmethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader}
+%
+% #1 is the class name, #2 the data type, #3 the method name, #4 the args.
+\def\deftypemethodheader#1#2#3#4{%
+\deftypefnheaderx{Method on #1}{#2}#3 #4\relax
 }
 % @defmethod == @defop Method
 \def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
 % @deftypevar int foobar
 \def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader}
-% #1 is the data type.  #2 is the name.
+% #1 is the data type.  #2 is the name, perhaps followed by text that
+% is actually part of the data type, which should not be put into the index.
 \def\deftypevarheader #1#2{%
-\doind {vr}{\code{#2}}% Make entry in variables index
+\dovarind#2 \relax% Make entry in variables index
 \begingroup\defname {\defheaderxcond#1\relax$$$#2}{Variable}%
 \interlinepenalty=10000
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000
 \endgroup}
+\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}}
 % @deftypevr {Global Flag} int enable
 \def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
-\def\deftypevrheader #1#2#3{\doind {vr}{\code{#3}}%
+\def\deftypevrheader #1#2#3{\dovarind#3 \relax%
 \begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1}
 \interlinepenalty=10000
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000
 \endgroup}
 % \dosetq is the interface for calls from other macros
 % Use \turnoffactive so that punctuation chars such as underscore
 % work in node names.
-\def\dosetq #1#2{{\let\folio=0 \turnoffactive \auxhat%
+\def\dosetq #1#2{{\let\folio=0 \turnoffactive
 \edef\next{\write\auxfile{\internalsetq {#1}{#2}}}%
 \next}}
 % \internalsetq {foo}{page} expands into
 % CHARACTERS 'xrdef {foo}{...expansion of \Ypage...}
 \csname X#1\endcsname
 \fi
 #2% Output the suffix in any case.
 }
+% This is the macro invoked by entries in the aux file.
+\def\xrdef #1#2{{%
+\catcode`\'=\other
+\expandafter\gdef\csname X#1\endcsname{#2}%
+}}
 % Read the last existing aux file, if any.  No error if none exists.
+\def\readauxfile{\begingroup
-% This is the macro invoked by entries in the aux file.
+\catcode`\^^@=\other
-\def\xrdef #1#2{
+\catcode`\^^A=\other
-{\catcode`\'=\other\expandafter \gdef \csname X#1\endcsname {#2}}}
+\catcode`\^^B=\other
+\catcode`\^^C=\other
-\def\readauxfile{%
+\catcode`\^^D=\other
-\begingroup
+\catcode`\^^E=\other
-\catcode `\^^@=\other
+\catcode`\^^F=\other
-\catcode `\=\other
+\catcode`\^^G=\other
-\catcode `\=\other
+\catcode`\^^H=\other
-\catcode `\^^C=\other
+\catcode`\^^K=\other
-\catcode `\^^D=\other
+\catcode`\^^L=\other
-\catcode `\^^E=\other
+\catcode`\^^N=\other
-\catcode `\^^F=\other
+\catcode`\^^P=\other
-\catcode `\^^G=\other
+\catcode`\^^Q=\other
-\catcode `\^^H=\other
+\catcode`\^^R=\other
-\catcode `\=\other
+\catcode`\^^S=\other
-\catcode `\^^L=\other
+\catcode`\^^T=\other
-\catcode `\=\other
+\catcode`\^^U=\other
-\catcode `\=\other
+\catcode`\^^V=\other
-\catcode `\=\other
+\catcode`\^^W=\other
-\catcode `\=\other
+\catcode`\^^X=\other
-\catcode `\=\other
+\catcode`\^^Z=\other
-\catcode `\=\other
+\catcode`\^^[=\other
-\catcode `\=\other
+\catcode`\^^\=\other
-\catcode `\=\other
+\catcode`\^^]=\other
-\catcode `\=\other
+\catcode`\^^^=\other
-\catcode `\=\other
+\catcode`\^^_=\other
-\catcode `\=\other
+\catcode`\@=\other
-\catcode `\=\other
+\catcode`\^=\other
-\catcode 26=\other
+% It was suggested to define this as 7, which would allow ^^e4 etc.
-\catcode `\^^[=\other
+% in xref tags, i.e., node names.  But since ^^e4 notation isn't
-\catcode `\^^\=\other
+% supported in the main text, it doesn't seem desirable.  Furthermore,
-\catcode `\^^]=\other
+% that is not enough: for node names that actually contain a ^
-\catcode `\^^^=\other
+% character, we would end up writing a line like this: 'xrdef {'hat
-\catcode `\^^_=\other
+% b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
-\catcode `\@=\other
+% argument, and \hat is not an expandable control sequence.  It could
-\catcode `\^=\other
+% all be worked out, but why?  Either we support ^^ or we don't.
-\catcode `\~=\other
+%
-\catcode `\[=\other
+% The other change necessary for this was to define \auxhat:
-\catcode `\]=\other
+% \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
-\catcode`\"=\other
+% and then to call \auxhat in \setq.
-\catcode`\_=\other
+%
-\catcode`\|=\other
+\catcode`\~=\other
-\catcode`\<=\other
+\catcode`\[=\other
-\catcode`\>=\other
+\catcode`\]=\other
-\catcode `\$=\other
+\catcode`\"=\other
-\catcode `\#=\other
+\catcode`\_=\other
-\catcode `\&=\other
+\catcode`\|=\other
-% `\+ does not work, so use 43.
+\catcode`\<=\other
-\catcode 43=\other
+\catcode`\>=\other
-% Make the characters 128-255 be printing characters
+\catcode`\$=\other
-{%
+\catcode`\#=\other
-\count 1=128
+\catcode`\&=\other
-\def\loop{%
+% `\+ does not work, so use 43.
-\catcode\count 1=\other
+\catcode43=\other
-\advance\count 1 by 1
+% Make the characters 128-255 be printing characters
-\ifnum \count 1<256 \loop \fi
+{%
+\count 1=128
+\def\loop{%
+\catcode\count 1=\other
+\advance\count 1 by 1
+\ifnum \count 1<256 \loop \fi
+}%
 }%
-}%
+% The aux file uses ' as the escape (for now).
-% the aux file uses ' as the escape.
+% Turn off \ as an escape so we do not lose on
-% Turn off \ as an escape so we do not lose on
+% entries which were dumped with control sequences in their names.
-% entries which were dumped with control sequences in their names.
+% For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
-% For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
+% Reference to such entries still does not work the way one would wish,
-% Reference to such entries still does not work the way one would wish,
+% but at least they do not bomb out when the aux file is read in.
-% but at least they do not bomb out when the aux file is read in.
+\catcode`\{=1
-\catcode `\{=1 \catcode `\}=2
+\catcode`\}=2
-\catcode `\%=\other
+\catcode`\%=\other
-\catcode `\'=0
+\catcode`\'=0
-\catcode`\^=7 % to make ^^e4 etc usable in xref tags
+\catcode`\\=\other
-\catcode `\\=\other
+%
 \openin 1 \jobname.aux
-\ifeof 1 \else \closein 1 \input \jobname.aux \global\havexrefstrue
+\ifeof 1 \else
-\global\warnedobstrue
+\closein 1
-\fi
+\input \jobname.aux
-% Open the new aux file.  Tex will close it automatically at exit.
+\global\havexrefstrue
-\openout \auxfile=\jobname.aux
+\global\warnedobstrue
+\fi
+% Open the new aux file.  TeX will close it automatically at exit.
+\openout\auxfile=\jobname.aux
 \endgroup}
 % Footnotes.
 % pagealignmacro call if that space before the closing brace is
 % removed. (Generally, numeric constants should always be followed by a
 % space to prevent strange expansion errors.)
 \def\supereject{\par\penalty -20000\footnoteno =0 }
-% @footnotestyle is meaningful for info output only..
+% @footnotestyle is meaningful for info output only.
 \let\footnotestyle=\comment
 \let\ptexfootnote=\footnote
 {\catcode `\@=11
 }%
 % Don't bother with the trickery in plain.tex to not require the
 % footnote text as a parameter.  Our footnotes don't need to be so general.
 %
-\long\gdef\footnotezzz#1{\insert\footins{%
+% Oh yes, they do; otherwise, @ifset and anything else that uses
+% \parseargline fail inside footnotes because the tokens are fixed when
+% the footnote is read.  --karl, 16nov96.
+%
+\long\gdef\footnotezzz{\insert\footins\bgroup
 % We want to typeset this text as a normal paragraph, even if the
 % footnote reference occurs in (for example) a display environment.
 % So reset some parameters.
 \interlinepenalty\interfootnotelinepenalty
 \splittopskip\ht\strutbox % top baseline for broken footnotes
 %
 % Don't crash into the line above the footnote text.  Since this
 % expands into a box, it must come within the paragraph, lest it
 % provide a place where TeX can split the footnote.
 \footstrut
-#1\strut}%
+\futurelet\next\fo@t
 }
+\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
+\else\let\next\f@t\fi \next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+\def\f@t#1{#1\@foot}
+\def\@foot{\strut\egroup}
 }%end \catcode `\@=11
 % Set the baselineskip to #1, and the lineskip and strut size
 % correspondingly.  There is no deep meaning behind these magic numbers
 % that mark overfull boxes (in case you have decided
 % that the text looks ok even though it passes the margin).
 %
 \def\finalout{\overfullrule=0pt}
+% @image.  We use the macros from epsf.tex to support this.
+% If epsf.tex is not installed and @image is used, we complain.
+%
+% Check for and read epsf.tex up front.  If we read it only at @image
+% time, we might be inside a group, and then its definitions would get
+% undone and the next image would fail.
+\openin 1 = xepsf.tex
+\ifeof 1 \else
+\closein 1
+\def\epsfannounce{\toks0 = }% do not bother showing banner
+\input epsf.tex
+\fi
+%
+\newif\ifwarnednoepsf
+\newhelp\noepsfhelp{epsf.tex must be installed for images to
+work.  It is also included in the Texinfo distribution, or you can get
+it from ftp://ftp.tug.org/tex/epsf.tex.}
+%
+% Only complain once about lack of epsf.tex.
+\def\image#1{%
+\ifx\epsfbox\undefined
+\ifwarnednoepsf \else
+\errhelp = \noepsfhelp
+\errmessage{epsf.tex not found, images will be ignored}%
+\global\warnednoepsftrue
+\fi
+\else
+\imagexxx #1,,,\finish
+\fi
+}
+%
+% Arguments to @image:
+% #1 is (mandatory) image filename; we tack on .eps extension.
+% #2 is (optional) width, #3 is (optional) height.
+% #4 is just the usual extra ignored arg for parsing this stuff.
+\def\imagexxx#1,#2,#3,#4\finish{%
+% \epsfbox itself resets \epsf?size at each figure.
+\setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
+\setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
+\epsfbox{#1.eps}%
+}
 % End of control word definitions.
 \message{and turning on texinfo input format.}
 \def\openindices{%
 \newindex{cp}%
 \let"=\activedoublequote
 \catcode`\~=\active
 \def~{{\tt \char '176}}
 \chardef\hat=`\^
 \catcode`\^=\active
-\def\auxhat{\def^{'hat}}
 \def^{{\tt \hat}}
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
 % Subroutine for the previous macro.

Mercurial > hg > xemacs-beta

comparison man/texinfo.tex @ 175:2d532a89d707 r20-3b14