xemacs-beta: man/texinfo.tex comparison

comparison man/texinfo.tex @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	ee648375d8d6
children	360340f9fd5f

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
-%% TeX macros to handle Texinfo files.
+%% TeX macros to handle texinfo files
-%% $Id: texinfo.tex,v 1.3 1997/08/30 03:56:39 steve Exp $
+%   Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 1994 Free Software Foundation, Inc.
-%  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
-%                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.
 %of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %General Public License for more details.
 %You should have received a copy of the GNU General Public License
 %along with this texinfo.tex file; see the file COPYING.  If not, write
-%to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+%to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
-%Boston, MA 02111-1307, USA.
+%USA.
 %In other words, you are welcome to use, share and improve this program.
 %You are forbidden to forbid anyone else to use, share and improve
 %what you give them.   Help stamp out software-hoarding!
 % 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.3 $
+\deftexinfoversion$Revision: 1.1.1.1 $
 \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.
 \everyjob{\message{[Texinfo version \texinfoversion]}\message{}
 \catcode`+=\active \catcode`\_=\active}
 % Save some parts of plain tex whose names we will redefine.
-\let\ptexb=\b
+\let\ptextilde=\~
-\let\ptexbullet=\bullet
-\let\ptexc=\c
-\let\ptexcomma=\,
-\let\ptexdot=\.
-\let\ptexdots=\dots
-\let\ptexend=\end
-\let\ptexequiv = \equiv
-\let\ptexi=\i
 \let\ptexlbrace=\{
 \let\ptexrbrace=\}
+\let\ptexdots=\dots
+\let\ptexdot=\.
 \let\ptexstar=\*
+\let\ptexend=\end
+\let\ptexbullet=\bullet
+\let\ptexb=\b
+\let\ptexc=\c
+\let\ptexi=\i
 \let\ptext=\t
+\let\ptexl=\l
+\let\ptexL=\L
 % 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
 % penalty on the vertical list instead of in the new paragraph.
 {\catcode`@ = 11
-% Avoid using \@M directly, because that causes trouble
+\gdef\tie{\leavevmode\penalty\@M\ }
-% if the definition is written into an index file.
+}
-\global\let\tiepenalty = \@M
+\let\~ = \tie                  % And make it available as @~.
-\gdef\tie{\leavevmode\penalty\tiepenalty\ }
-}
 \message{Basics,}
 \chardef\other=12
 % If this character appears in an error message or help string, it
 \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 \bindingoffset  \bindingoffset=0pt
-\newdimen \normaloffset
+\newdimen \normaloffset   \normaloffset=\hoffset
 \newdimen\pagewidth \newdimen\pageheight
+\pagewidth=\hsize \pageheight=\vsize
 % 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
 }%
-% For @cropmarks command.
+%---------------------Begin change-----------------------
-% Do @cropmarks to get crop marks.
+%
-%
+%%%% For @cropmarks command.
-\newif\ifcropmarks
+% Dimensions to add cropmarks at corners Added by P. A. MacKay, 12 Nov. 1986
-\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
+\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
+%
-% Main output routine.
+%---------------------End change-----------------------
-\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.
+% does insertions itself, but you have to call it yourself.
-\def\onepageout#1{%
+\chardef\PAGE=255  \output={\onepageout{\pagecontents\PAGE}}
-\ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
+\def\onepageout#1{\hoffset=\normaloffset
-%
+\ifodd\pageno  \advance\hoffset by \bindingoffset
-\ifodd\pageno  \advance\hoffset by \bindingoffset
+\else \advance\hoffset by -\bindingoffset\fi
-\else \advance\hoffset by -\bindingoffset\fi
+{\escapechar=`\\\relax % makes sure backslash is used in output files.
-%
+\shipout\vbox{{\let\hsize=\pagewidth \makeheadline} \pagebody{#1}%
-% Do this outside of the \shipout so @code etc. will be expanded in
+{\let\hsize=\pagewidth \makefootline}}}%
-% the headline as they should be, not taken literally (outputting ''code).
+\advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi}
-\setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
-\setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
+%%%% For @cropmarks command %%%%
-%
-{%
+% Here is a modification of the main output routine for Near East Publications
-% Have to do this stuff outside the \shipout because we want it to
+% This provides right-angle cropmarks at all four corners.
-% take effect in \write's, yet the group defined by the \vbox ends
+% The contents of the page are centerlined into the cropmarks,
-% before the \shipout runs.
+% and any desired binding offset is added as an \hskip on either
-%
+% site of the centerlined box.  (P. A. MacKay, 12 November, 1986)
-\escapechar = `\\     % use backslash in output files.
+%
-\indexdummies         % don't expand commands in the output.
+\def\croppageout#1{\hoffset=0pt % make sure this doesn't mess things up
-\normalturnoffactive  % \ in index entries must not stay \, e.g., if
+{\escapechar=`\\\relax % makes sure backslash is used in output files.
-% the page break happens to be in the middle of an example.
+		 \shipout
-\shipout\vbox{%
+		 \vbox to \outervsize{\hsize=\outerhsize
-\ifcropmarks \vbox to \outervsize\bgroup
+\vbox{\line{\ewtop\hfill\ewtop}}
-\hsize = \outerhsize
+\nointerlineskip
-\line{\ewtop\hfil\ewtop}%
+\line{\vbox{\moveleft\cornerthick\nstop}
-\nointerlineskip
+\hfill
-\line{%
+\vbox{\moveright\cornerthick\nstop}}
-\vbox{\moveleft\cornerthick\nstop}%
+\vskip \topandbottommargin
-\hfill
+\centerline{\ifodd\pageno\hskip\bindingoffset\fi
-\vbox{\moveright\cornerthick\nstop}%
+			\vbox{
-}%
+			{\let\hsize=\pagewidth \makeheadline}
-\vskip\topandbottommargin
+			\pagebody{#1}
-\line\bgroup
+			{\let\hsize=\pagewidth \makefootline}}
-\hfil % center the page within the outer (page) hsize.
+			\ifodd\pageno\else\hskip\bindingoffset\fi}
-\ifodd\pageno\hskip\bindingoffset\fi
+		 \vskip \topandbottommargin plus1fill minus1fill
-\vbox\bgroup
+\boxmaxdepth\cornerthick
-\fi
+\line{\vbox{\moveleft\cornerthick\nsbot}
-%
+\hfill
-\unvbox\headlinebox
+\vbox{\moveright\cornerthick\nsbot}}
-\pagebody{#1}%
+\nointerlineskip
-\ifdim\ht\footlinebox > 0pt
+\vbox{\line{\ewbot\hfill\ewbot}}
-% 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
+\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}
 %% but suppressing ligatures.
 %\def\`{{`}}
 %\def\'{{'}}
 % Used to generate quoted braces.
 \def\mylbrace {{\tt \char '173}}
 \def\myrbrace {{\tt \char '175}}
 \let\{=\mylbrace
 \let\}=\myrbrace
-\begingroup
-% Definitions to produce actual \{ & \} command in an index.
-\catcode`\{ = 12 \catcode`\} = 12
-\catcode`\[ = 1 \catcode`\] = 2
-\catcode`\@ = 0 \catcode`\\ = 12
-@gdef@lbracecmd[\{]%
-@gdef@rbracecmd[\}]%
-@endgroup
-% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @v @H.
-\let\, = \c
-\let\dotaccent = \.
-\def\ringaccent#1{{\accent23 #1}}
-\let\tieaccent = \t
-\let\ubaraccent = \b
-\let\udotaccent = \d
-% Other special characters: @questiondown @exclamdown
-% Plain TeX defines: @AA @AE @O @OE @L (and lowercase versions) @ss.
-\def\questiondown{?`}
-\def\exclamdown{!`}
-% Dotless i and dotless j, used for accents.
-\def\imacro{i}
-\def\jmacro{j}
-\def\dotless#1{%
-\def\temp{#1}%
-\ifx\temp\imacro \ptexi
-\else\ifx\temp\jmacro \j
-\else \errmessage{@dotless can be used only with i or j}%
-\fi\fi
-}
 % @: forces normal size whitespace following.
 \def\:{\spacefactor=1000 }
 % @* forces a line break.
 % This defn is used inside nofill environments such as @example.
 \def\nofillexdent{\parsearg\nofillexdentyyy}
 \def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
 \leftline{\hskip\leftskip{\rm#1}}}}
-% @inmargin{TEXT} puts TEXT in the margin next to the current paragraph.
-\def\inmargin#1{%
-\strut\vadjust{\nobreak\kern-\strutdepth
-\vtop to \strutdepth{\baselineskip\strutdepth\vss
-\llap{\rightskip=\inmarginspacing \vbox{\noindent #1}}\null}}}
-\newskip\inmarginspacing \inmarginspacing=1cm
-\def\strutdepth{\dp\strutbox}
 %\hbox{{\rm#1}}\hfil\break}}
 % @include file    insert text of that file as input.
-% Allow normal characters that  we make active in the argument (a file name).
-\def\include{\begingroup
+\def\include{\parsearg\includezzz}
-\catcode`\\=12
+%Use \input\thisfile to avoid blank after \input, which may be an active
-\catcode`~=12
+%char (in which case the blank would become the \input argument).
-\catcode`^=12
+%The grouping keeps the value of \thisfile correct even when @include
-\catcode`_=12
+%is nested.
-\catcode`|=12
+\def\includezzz #1{\begingroup
-\catcode`<=12
+\def\thisfile{#1}\input\thisfile
-\catcode`>=12
-\catcode`+=12
-\parsearg\includezzz}
-% Restore active chars for included file.
-\def\includezzz#1{\endgroup\begingroup
-% Read the included file in a group so nested @include's work.
-\def\thisfile{#1}%
-\input\thisfile
 \endgroup}
 \def\thisfile{}
 % @center line   outputs that line, centered
 \centerline{#1}}}
 % @sp n   outputs n lines of vertical space
 \def\sp{\parsearg\spxxx}
-\def\spxxx #1{\vskip #1\baselineskip}
+\def\spxxx #1{\par \vskip #1\baselineskip}
 % @comment ...line which is ignored...
 % @c is the same as @comment
 % @ignore ... @end ignore  is another way to write a comment
 \parsearg \commentxxx}
 \def\commentxxx #1{\catcode 64=0 \catcode 123=1 \catcode 125=2 }
 \let\c=\comment
-% @paragraphindent  is defined for the Info formatting commands only.
-\let\paragraphindent=\comment
 % Prevent errors for section commands.
 % Used in @ignore and in failing conditionals.
 \def\ignoresections{%
 \let\chapter=\relax
 % Used in nested conditionals, where we have to parse the Texinfo source
 % and so want to turn off most commands, in case they are used
 % incorrectly.
 %
 \def\ignoremorecommands{%
-\let\defcodeindex = \relax
 \let\defcv = \relax
 \let\deffn = \relax
 \let\deffnx = \relax
 \let\defindex = \relax
 \let\defivar = \relax
 \let\ref = \relax
 \let\xref = \relax
 \let\printindex = \relax
 \let\pxref = \relax
 \let\settitle = \relax
-\let\setchapternewpage = \relax
-\let\setchapterstyle = \relax
-\let\everyheading = \relax
-\let\evenheading = \relax
-\let\oddheading = \relax
-\let\everyfooting = \relax
-\let\evenfooting = \relax
-\let\oddfooting = \relax
-\let\headings = \relax
 \let\include = \relax
 \let\lowersections = \relax
 \let\down = \relax
 \let\raisesections = \relax
 \let\up = \relax
 \let\set = \relax
 \let\clear = \relax
 \let\item = \relax
+\let\message = \relax
 }
 % Ignore @ignore ... @end ignore.
 %
 \def\ignore{\doignore{ignore}}
-% Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text.
+% Also ignore @ifinfo, @ifhtml, @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,
-% which runs makeinfo to do macro expansion.  Ignore @unmacro, too.
-\def\macro{\doignore{macro}}
-\let\unmacro = \comment
-% @dircategory CATEGORY  -- specify a category of the dir file
-% which this file should belong to.  Ignore this in TeX.
-\let\dircategory = \comment
 % Ignore text until a line `@end #1'.
 %
 \def\doignore#1{\begingroup
 % Don't complain about control sequences we have declared \outer.
 % 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
 }
 \immediate\write16{***WARNING*** for users of Unix TeX 3.0!}
 \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
 \immediate\write16{If you are running another version of TeX, relax.}
 \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
 \immediate\write16{  Then upgrade your TeX installation if you can.}
-\immediate\write16{  (See ftp://ftp.gnu.ai.mit.edu/pub/gnu/TeX.README.)}
 \immediate\write16{If you are stuck with version 3.0, run the}
 \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
 \immediate\write16{  to use a workaround.}
 \immediate\write16{}
-\global\warnedobstrue
+\warnedobstrue
 \fi
 }
 % **In TeX 3.0, setting text in \nullfont hangs tex.  For a
 % workaround (which requires the file ``dummy.tfm'' to be installed),
 %
 % 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.
 %
 % Since we want to separate VAR from REST-OF-LINE (which might be
 % 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
+% didn't need it.
-% losing inside @example, for instance.
+%
-%
+\def\set{\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.
 \fi
-\endgroup
 }
 % Can't use \xdef to pre-expand #2 and save some time, since \temp or
 % \next or other control sequences that we've defined might get us into
 % an infinite loop. Consider `@set foo @cite{bar}'.
 \def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
 \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{\begingroup
+\def\value#1{\expandafter
-\catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
+		\ifx\csname SET#1\endcsname\relax
-\valuexxx}
+			{\{No value for ``#1''\}}
-\def\valuexxx#1{%
+		\else \csname SET#1\endcsname \fi}
-\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, @ifnothtml, @ifnotinfo always succeed; we read the text
+% @iftex always succeeds; we read the text following, through @end
-% following, through the first @end iftex (etc.).  Make `@end iftex'
+% iftex).  But `@end iftex' should be valid only after an @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
 \def\appendixnoderef{\ifx\lastnode\relax\else
 \expandafter\expandafter\expandafter\appendixsetref{\lastnode}\fi
 \global\let\lastnode=\relax}
-% @refill is a no-op.
 \let\refill=\relax
 % @setfilename is done at the beginning of every texinfo file.
 % 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.
 \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}
-% \def\macro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\macroxxx}
+\def\inforef #1{\inforefzzz #1,,,,**}
-% \def\macroxxx#1#2 \end macro{%
+\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-% \expandafter\gdef\macrotemp#1{#2}%
+node \samp{\ignorespaces#1{}}}
-% \endgroup}
-%\def\linemacro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\linemacroxxx}
-%\def\linemacroxxx#1#2 \end linemacro{%
-%\let\parsearg=\relax
-%\edef\macrotempx{\csname M\butfirst\expandafter\string\macrotemp\endcsname}%
-%\expandafter\xdef\macrotemp{\parsearg\macrotempx}%
-%\expandafter\gdef\macrotempx#1{#2}%
-%\endgroup}
-%\def\butfirst#1{}
 \message{fonts,}
 % Font-change commands.
 % So we set up a \sf analogous to plain's \rm, etc.
 \newfam\sffam
 \def\sf{\fam=\sffam \tensf}
 \let\li = \sf % Sometimes we call it \li, not \sf.
-% We don't need math for this one.
+%% Try out Computer Modern fonts at \magstephalf
-\def\ttsl{\tenttsl}
+\let\mainmagstep=\magstephalf
-% Use Computer Modern fonts at \magstephalf (11pt).
-\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{\font#1=\fontprefix#2}
-\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
 % before you read in texinfo.tex.
 \ifx\fontprefix\undefined
 \def\fontprefix{cm}
 \fi
-% Support font families that don't use the same naming scheme as CM.
-\def\rmshape{r}
-\def\rmbshape{bx}               %where the normal face is bold
-\def\bfshape{b}
-\def\bxshape{bx}
-\def\ttshape{tt}
-\def\ttbshape{tt}
-\def\ttslshape{sltt}
-\def\itshape{ti}
-\def\itbshape{bxti}
-\def\slshape{sl}
-\def\slbshape{bxsl}
-\def\sfshape{ss}
-\def\sfbshape{ss}
-\def\scshape{csc}
-\def\scbshape{csc}
 \ifx\bigger\relax
 \let\mainmagstep=\magstep1
-\setfont\textrm\rmshape{12}{1000}
+\setfont\textrm{r12}
-\setfont\texttt\ttshape{12}{1000}
+\setfont\texttt{tt12}
 \else
-\setfont\textrm\rmshape{10}{\mainmagstep}
+\setfont\textrm{r10 scaled \mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
+\setfont\texttt{tt10 scaled \mainmagstep}
 \fi
 % Instead of cmb10, you many want to use cmbx10.
 % cmbx10 is a prettier font on its own, but cmb10
 % looks better when embedded in a line with cmr10.
-\setfont\textbf\bfshape{10}{\mainmagstep}
+\setfont\textbf{b10 scaled \mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
+\setfont\textit{ti10 scaled \mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
+\setfont\textsl{sl10 scaled \mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
+\setfont\textsf{ss10 scaled \mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
+\setfont\textsc{csc10 scaled \mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
 % A few fonts for @defun, etc.
-\setfont\defbf\bxshape{10}{\magstep1} %was 1314
+\setfont\defbf{bx10 scaled \magstep1} %was 1314
-\setfont\deftt\ttshape{10}{\magstep1}
+\setfont\deftt{tt10 scaled \magstep1}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
-% Fonts for indices and small examples (9pt).
+% Fonts for indices and small examples.
 % We actually use the slanted font rather than the italic,
 % because texinfo normally uses the slanted fonts for that.
 % Do not make many font distinctions in general in the index, since they
 % aren't very useful.
-\setfont\ninett\ttshape{9}{1000}
+\setfont\ninett{tt9}
-\setfont\indrm\rmshape{9}{1000}
+\setfont\indrm{r9}
-\setfont\indit\slshape{9}{1000}
+\setfont\indit{sl9}
 \let\indsl=\indit
 \let\indtt=\ninett
-\let\indttsl=\ninett
 \let\indsf=\indrm
 \let\indbf=\indrm
-\setfont\indsc\scshape{10}{900}
+\setfont\indsc{csc10 at 9pt}
 \font\indi=cmmi9
 \font\indsy=cmsy9
-% Fonts for title page:
+% Fonts for headings
-\setfont\titlerm\rmbshape{12}{\magstep3}
+\setfont\chaprm{bx12 scaled \magstep2}
-\setfont\titleit\itbshape{10}{\magstep4}
+\setfont\chapit{ti12 scaled \magstep2}
-\setfont\titlesl\slbshape{10}{\magstep4}
+\setfont\chapsl{sl12 scaled \magstep2}
-\setfont\titlett\ttbshape{12}{\magstep3}
+\setfont\chaptt{tt12 scaled \magstep2}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
+\setfont\chapsf{ss12 scaled \magstep2}
-\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{17}{1000}
 \let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}
+\setfont\chapsc{csc10 scaled\magstep3}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
-% Section fonts (14.4pt).
+\setfont\secrm{bx12 scaled \magstep1}
-\setfont\secrm\rmbshape{12}{\magstep1}
+\setfont\secit{ti12 scaled \magstep1}
-\setfont\secit\itbshape{10}{\magstep2}
+\setfont\secsl{sl12 scaled \magstep1}
-\setfont\secsl\slbshape{10}{\magstep2}
+\setfont\sectt{tt12 scaled \magstep1}
-\setfont\sectt\ttbshape{12}{\magstep1}
+\setfont\secsf{ss12 scaled \magstep1}
-\setfont\secttsl\ttslshape{10}{\magstep2}
+\setfont\secbf{bx12 scaled \magstep1}
-\setfont\secsf\sfbshape{12}{\magstep1}
+\setfont\secsc{csc10 scaled\magstep2}
-\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
-% \setfont\ssecrm\bxshape{10}{\magstep1}    % This size an font looked bad.
+% \setfont\ssecrm{bx10 scaled \magstep1}    % This size an font looked bad.
-% \setfont\ssecit\itshape{10}{\magstep1}    % The letters were too crowded.
+% \setfont\ssecit{cmti10 scaled \magstep1}    % The letters were too crowded.
-% \setfont\ssecsl\slshape{10}{\magstep1}
+% \setfont\ssecsl{sl10 scaled \magstep1}
-% \setfont\ssectt\ttshape{10}{\magstep1}
+% \setfont\ssectt{tt10 scaled \magstep1}
-% \setfont\ssecsf\sfshape{10}{\magstep1}
+% \setfont\ssecsf{ss10 scaled \magstep1}
-%\setfont\ssecrm\bfshape{10}{1315}      % Note the use of cmb rather than cmbx.
+%\setfont\ssecrm{b10 scaled 1315}	% Note the use of cmb rather than cmbx.
-%\setfont\ssecit\itshape{10}{1315}      % Also, the size is a little larger than
+%\setfont\ssecit{ti10 scaled 1315}	% Also, the size is a little larger than
-%\setfont\ssecsl\slshape{10}{1315}      % being scaled magstep1.
+%\setfont\ssecsl{sl10 scaled 1315}	% being scaled magstep1.
-%\setfont\ssectt\ttshape{10}{1315}
+%\setfont\ssectt{tt10 scaled 1315}
-%\setfont\ssecsf\sfshape{10}{1315}
+%\setfont\ssecsf{ss10 scaled 1315}
 %\let\ssecbf=\ssecrm
-% Subsection fonts (13.15pt).
+\setfont\ssecrm{bx12 scaled \magstephalf}
-\setfont\ssecrm\rmbshape{12}{\magstephalf}
+\setfont\ssecit{ti12 scaled \magstephalf}
-\setfont\ssecit\itbshape{10}{1315}
+\setfont\ssecsl{sl12 scaled \magstephalf}
-\setfont\ssecsl\slbshape{10}{1315}
+\setfont\ssectt{tt12 scaled \magstephalf}
-\setfont\ssectt\ttbshape{12}{\magstephalf}
+\setfont\ssecsf{ss12 scaled \magstephalf}
-\setfont\ssecttsl\ttslshape{10}{1315}
+\setfont\ssecbf{bx12 scaled \magstephalf}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\setfont\ssecsc{csc10 scaled \magstep1}
-\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{\magstep1}
 \font\sseci=cmmi12 scaled \magstephalf
-\font\ssecsy=cmsy10 scaled 1315
+\font\ssecsy=cmsy10 scaled \magstep1
 % The smallcaps and symbol fonts should actually be scaled \magstep1.5,
 % but that is not a standard magnification.
+% Fonts for title page:
+\setfont\titlerm{bx12 scaled \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
 % The font-changing commands redefine the meanings of \tenSTYLE, instead
 % of just \STYLE.  We do this so that font changes will continue to work
 % in math mode, where it is the current \fam that is relevant in most
-% cases, not the current font.  Plain TeX does \def\bf{\fam=\bffam
+% cases, not the current.  Plain TeX does, for example,
-% \tenbf}, for example.  By redefining \tenbf, we obviate the need to
+% \def\bf{\fam=\bffam \tenbf}  By redefining \tenbf, we obviate the need
-% redefine \bf itself.
+% to redefine \bf itself.
 \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
+\let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
 \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
+\let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
-\resetmathfonts \setleading{19pt}}
+\resetmathfonts}
 \def\secfonts{%
 \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
 \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-\let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl
+\let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
-\resetmathfonts \setleading{16pt}}
+\resetmathfonts}
 \def\subsecfonts{%
 \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
 \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-\let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl
+\let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
-\resetmathfonts \setleading{15pt}}
+\resetmathfonts}
-\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
 \def\indexfonts{%
 \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl
 \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc
-\let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy \let\tenttsl=\indttsl
+\let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy
-\resetmathfonts \setleading{12pt}}
+\resetmathfonts}
 % Set up the default fonts, so we can use them for creating boxes.
 %
 \textfonts
 % Count depth in font-changes, for error checks
 \newcount\fontdepth \fontdepth=0
 % Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}
+\setfont\shortcontrm{r12}
-\setfont\shortcontbf\bxshape{12}{1000}
+\setfont\shortcontbf{bx12}
-\setfont\shortcontsl\slshape{12}{1000}
+\setfont\shortcontsl{sl12}
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
 % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
 %
 \def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
 \def\restorehyphenation{\hyphenchar\font = `- }
 \def\t#1{%
-{\tt \rawbackslash \frenchspacing #1}%
+{\tt \nohyphenation \rawbackslash \frenchspacing #1}%
 \null
 }
-\let\ttfont=\t
+\let\ttfont = \t
+%\def\samp #1{`{\tt \rawbackslash \frenchspacing #1}'\null}
 \def\samp #1{`\tclose{#1}'\null}
-\setfont\smallrm\rmshape{8}{1000}
+\def\key #1{{\tt \nohyphenation \uppercase{#1}}\null}
-\font\smallsy=cmsy9
-\def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
-\raise0.4pt\hbox{$\langle$}\kern-.08em\vtop{%
-\vbox{\hrule\kern-0.4pt
-\hbox{\raise0.4pt\hbox{\vphantom{$\langle$}}#1}}%
-\kern-0.4pt\hrule}%
-\kern-.06em\raise0.4pt\hbox{$\rangle$}}}}
-% The old definition, with no lozenge:
-%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
 \let\file=\samp
 % @code is a modification of @t,
 }%
 \null
 }
 % We *must* turn on hyphenation at `-' and `_' in \code.
-% Otherwise, it is too hard to avoid overfull hboxes
+% Otherwise, it is too hard to avoid overful hboxes
 % in the Emacs manual, the Library manual, etc.
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
+% and arrange explicitly to hyphenate an 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
-% _ is always active; and it shouldn't be \let = to an _ that is a
+\global\def\indexbreaks{\catcode`\-=\active \let-\realdash \catcode`\_=\active \let_\realunder}
-% 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{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}}
+\def\codeunder{\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{\kbdfont\look}}\fi
+\else\tclose{\look}\fi
-\else{\tclose{\kbdfont\look}}\fi}
+\else\tclose{\look}\fi}
-% @url.  Quotes do not seem necessary, so use \code.
-\let\url=\code
-% @uref (abbreviation for `urlref') takes an optional second argument
-% specifying the text to display.  First (mandatory) arg is the url.
-% Perhaps eventually put in a hypertex \special here.
-%
-\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
-}
-% rms does not like the angle brackets --karl, 17may97.
-% So now @email is just like @uref.
-%\def\email#1{$\langle${\tt #1}$\rangle$}
-\let\email=\uref
-% Check if we are currently using a typewriter font.  Since all the
-% Computer Modern typewriter fonts have zero interword stretch (and
-% shrink), and it is reasonable to expect all typewriter fonts to have
-% this property, we can check that font parameter.
-%
-\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
 % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
 % argument is to make the input look right: @dmn{pt} instead of
 % @dmn{}pt.
 %
 \def\dmn#1{\thinspace #1}
 \def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
-% @l was never documented to mean ``switch to the Lisp font'',
+\def\l#1{{\li #1}\null}		%
-% and it is not used as such in any manual I can find.  We need it for
-% Polish suppressed-l.  --karl, 22sep96.
+\def\r#1{{\rm #1}}		% roman font
-%\def\l#1{{\li #1}\null}
-\def\r#1{{\rm #1}}              % roman font
 % Use of \lowercase was suggested.
-\def\sc#1{{\smallcaps#1}}       % smallcaps font
+\def\sc#1{{\smallcaps#1}}	% smallcaps font
-\def\ii#1{{\it #1}}             % italic font
+\def\ii#1{{\it #1}}		% italic font
-% @pounds{} is a sterling sign.
-\def\pounds{{\it\$}}
 \message{page headings,}
 \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}%
-\endgroup\page\hbox{}\page}
+	\endgroup\page\hbox{}\page}
 \def\titlepage{\begingroup \parindent=0pt \textfonts
 \let\subtitlerm=\tenrm
 % I deinstalled the following change because \cmr12 is undefined.
 % This change was not in the ChangeLog anyway.  --rms.
 % 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{\titlefonts\rm ##1}
+\def\titlezzz##1{\leftline{\titlefont{##1}}
-% print a rule at the page bottom also.
+		    % print a rule at the page bottom also.
-\finishedtitlepagefalse
+		    \finishedtitlepagefalse
-\vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
+		    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
 % No rule at page bottom unless we print one at the top with @title.
 \finishedtitlepagetrue
 %
 % Now you can put text using @subtitle.
 \def\subtitle{\parsearg\subtitlezzz}%
 % Most title ``pages'' are actually two pages long, with space
 % at the top of the second.  We don't want the ragged left on the second.
 \let\oldpage = \page
 \def\page{%
 \iffinishedtitlepage\else
-\finishtitlepage
+	 \finishtitlepage
 \fi
 \oldpage
 \let\page = \oldpage
 \hbox{}}%
 %   \def\page{\oldpage \hbox{}}
 \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{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
+\gdef\everyheadingxxx #1{\everyheadingyyy #1@|@|@|@|\finish}
+\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}}}
-%
-% Leave some space for the footline.  Hopefully ok to assume
+\gdef\everyfootingxxx #1{\everyfootingyyy #1@|@|@|@|\finish}
-% @evenfooting will not be used by itself.
+\gdef\everyfootingyyy #1@|#2@|#3@|#4\finish{%
-\global\advance\pageheight by -\baselineskip
+\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
-\global\advance\vsize by -\baselineskip
+\global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-}
-\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
 %
 }% unbind the catcode of @.
-% @headings double      turns headings on for double-sided printing.
+% @headings double	turns headings on for double-sided printing.
-% @headings single      turns headings on for single-sided printing.
+% @headings single	turns headings on for single-sided printing.
-% @headings off         turns them off.
+% @headings off		turns them off.
-% @headings on          same as @headings double, retained for compatibility.
+% @headings on		same as @headings double, retained for compatibility.
-% @headings after       turns on double-sided headings after this page.
+% @headings after	turns on double-sided headings after this page.
-% @headings doubleafter turns on double-sided headings after this page.
+% @headings doubleafter	turns on double-sided headings after this page.
 % @headings singleafter turns on single-sided headings after this page.
-% By default, they are off at the start of a document,
+% By default, they are off.
-% and turned `on' after @end titlepage.
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 \def\HEADINGSoff{
 \global\evenheadline={\hfil} \global\evenfootline={\hfil}
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
 \def\HEADINGSdouble{
+%\pagealignmacro
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chapoddpage
+}
-}
-\let\contentsalignmacro = \chappager
 % For single-sided printing, chapter title goes across top left of page,
 % page number on top right.
 \def\HEADINGSsingle{
+%\pagealignmacro
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chappager
 }
 \def\HEADINGSon{\HEADINGSdouble}
 \def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
 \let\HEADINGSdoubleafter=\HEADINGSafter
 \def\HEADINGSdoublex{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chapoddpage
 }
 \def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
 \def\HEADINGSsinglex{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chappager
 }
 % Subroutines used in generating headings
 % Produces Day Month Year style of output.
 \def\today{\number\day\space
 \def\thistitle{No Title}
 \def\settitle{\parsearg\settitlezzz}
 \def\settitlezzz #1{\gdef\thistitle{#1}}
 \message{tables,}
 % @tabs -- simple alignment
 % These don't work.  For one thing, \+ is defined as outer.
 % They also define \itemindex
 % to index the item name in whatever manner is desired (perhaps none).
 \newif\ifitemxneedsnegativevskip
-\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
+\def\itemxpar{\par\ifitemxneedsnegativevskip\vskip-\parskip\nobreak\fi}
 \def\internalBitem{\smallbreak \parsearg\itemzzz}
 \def\internalBitemx{\itemxpar \parsearg\itemzzz}
 \def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz}
 \tablez{#1}{#2}{#3}{#4}{#5}{#6}}}
 \def\tablez #1#2#3#4#5#6{%
 \aboveenvbreak %
 \begingroup %
-\def\Edescription{\Etable}% Necessary kludge.
+\def\Edescription{\Etable}% Neccessary kludge.
 \let\itemindex=#1%
 \ifnum 0#3>0 \advance \leftskip by #3\mil \fi %
 \ifnum 0#4>0 \tableindent=#4\mil \fi %
 \ifnum 0#5>0 \advance \rightskip by #5\mil \fi %
 \def\itemfont{#2}%
 % 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}
 % @multitable macros
-% Amy Hendrickson, 8/18/94, 3/6/96
+% Amy Hendrickson, 8/18/94
 %
-% @multitable ... @end multitable will make as many columns as desired.
+% @multitable ... @endmultitable will make as many columns as desired.
-% Contents of each column will wrap at width given in preamble.  Width
+% Contents of each column will wrap at width given in preamble. Width
 % can be specified either with sample text given in a template line,
 % or in percent of \hsize, the current width of text on page.
 % 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
+%   @multitable @percentofhsize .2 .3 .5
 %   @item ...
 %
-%   Numbers following @columnfractions are the percent of the total
+%   Numbers following @percentofhsize are the percent of the total
 %   current hsize to be used for each column. You may use as many
 %   columns as desired.
 % Or use a template:
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item ...
 %   using the widest term desired in each column.
-%
-% 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
+% Each new table line starts with @item, each subsequent new column
-% 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
+% @item, @tab, @multicolumn or @endmulticolumn do not need to be on their
 % own lines, but it will not hurt if they are.
 % 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
+%   @endmultitable
 % Default dimensions may be reset by user.
-% @multitableparskip is vertical space between paragraphs in table.
+% @intableparskip will set vertical space between paragraphs in table.
-% @multitableparindent is paragraph indent in table.
+% @intableparindent will set paragraph indent in table.
-% @multitablecolmargin is horizontal space to be left between columns.
+% @spacebetweencols will set horizontal space to be left between columns.
-% @multitablelinespace is space to leave between table items, baseline
+% @spacebetweenlines will set vertical space to be left between lines.
-%                                                            to baseline.
-%   0pt means it depends on current normal line spacing.
 %%%%
 % Dimensions
-\newskip\multitableparskip
+\newdimen\intableparskip
-\newskip\multitableparindent
+\newdimen\intableparindent
-\newdimen\multitablecolspace
+\newdimen\spacebetweencols
-\newskip\multitablelinespace
+\newdimen\spacebetweenlines
-\multitableparskip=0pt
+\intableparskip=0pt
-\multitableparindent=6pt
+\intableparindent=6pt
-\multitablecolspace=12pt
+\spacebetweencols=12pt
-\multitablelinespace=0pt
+\spacebetweenlines=12pt
 %%%%
 % Macros used to set up halign preamble:
 \let\endsetuptable\relax
 \def\xendsetuptable{\endsetuptable}
-\let\columnfractions\relax
+\let\percentofhsize\relax
-\def\xcolumnfractions{\columnfractions}
+\def\xpercentofhsize{\percentofhsize}
 \newif\ifsetpercent
-%% 2/1/96, to allow fractions to be given with more than one digit.
-\def\pickupwholefraction#1 {\global\advance\colcount by1 %
-\expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
-\setuptable}
 \newcount\colcount
 \def\setuptable#1{\def\firstarg{#1}%
 \ifx\firstarg\xendsetuptable\let\go\relax%
 \else
-\ifx\firstarg\xcolumnfractions\global\setpercenttrue%
+\ifx\firstarg\xpercentofhsize\global\setpercenttrue%
 \else
 \ifsetpercent
-\let\go\pickupwholefraction   % In this case arg of setuptable
+\if#1.\else%
-% is the decimal point before the
+\global\advance\colcount by1 %
-% number given in percent of hsize.
+\expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
-% We don't need this so we don't use it.
+\fi
 \else
 \global\advance\colcount by1
-\setbox0=\hbox{#1 }% Add a normal word space as a separator;
+\setbox0=\hbox{#1}%
-% typically that is always in the input, anyway.
 \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
 \fi%
 \fi%
-\ifx\go\pickupwholefraction\else\let\go\setuptable\fi%
+\let\go\setuptable%
 \fi\go}
 %%%%
 % multitable syntax
-\def\tab{&\hskip1sp\relax} % 2/2/96
+\def\tab{&}
-% tiny skip here makes sure this column space is
-% maintained, even if it is never used.
 %%%%
-% @multitable ... @end multitable definitions:
+% @multitable ... @endmultitable definitions:
-\def\multitable{\parsearg\dotable}
+\def\multitable#1\item{\bgroup
-\def\dotable#1{\bgroup
 \let\item\cr
 \tolerance=9500
 \hbadness=9500
-\setmultitablespacing
+\parskip=\intableparskip
-\parskip=\multitableparskip
+\parindent=\intableparindent
-\parindent=\multitableparindent
 \overfullrule=0pt
 \global\colcount=0\relax%
 \def\Emultitable{\global\setpercentfalse\global\everycr{}\cr\egroup\egroup}%
 % To parse everything between @multitable and @item :
-\setuptable#1 \endsetuptable
+\def\one{#1}\expandafter\setuptable\one\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
+\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
+% we will add a \leftskip of \spacebetweencols to all columns after
 % the first one.
-%  If a template has been used, we will add \multitablecolspace
+%  If a template has been used, we will add \spacebetweencols
 % 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
+% we will advance \hsize by \spacebetweencols
-\advance\hsize by \multitablecolspace
+\advance\hsize by \spacebetweencols
 \fi
-% In either case we will make \leftskip=\multitablecolspace:
+% In either case we will make \leftskip=\spacebetweencols:
-\leftskip=\multitablecolspace
+\leftskip=\spacebetweencols
 \fi
-% Ignoring space at the beginning and end avoids an occasional spurious
+\noindent##}\cr%
-% 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{%
+\global\everycr{\noalign{\nointerlineskip\vskip\spacebetweenlines
-% \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
+\global\colcount=0\relax}}}
-% 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
-% current baselineskip.
-\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
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-%% than skip between lines in the table.
-\fi%
-\ifdim\multitableparskip=0pt
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-%% than skip between lines in the table.
-\fi}
 \message{indexing,}
 % Index generation facilities
 % Define \newwrite to be identical to plain tex's \newwrite
 % \newindex {foo} defines an index named foo.
 % It automatically defines \fooindex such that
 % \fooindex ...rest of line... puts an entry in the index foo.
 % It also defines \fooindfile to be the number of the output channel for
-% the file that accumulates this index.  The file's extension is foo.
+% the file that	accumulates this index.  The file's extension is foo.
 % The name of an index should be no more than 2 characters long
 % for the sake of vms.
 \def\newindex #1{
 \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file
-\openout \csname#1indfile\endcsname \jobname.#1 % Open the file
+\openout \csname#1indfile\endcsname \jobname.#1	% Open the file
-\expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
+\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
 \noexpand\doindex {#1}}
 }
 % @defindex foo  ==  \newindex{foo}
 % Define @defcodeindex, like @defindex except put all entries in @code.
 \def\newcodeindex #1{
 \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file
-\openout \csname#1indfile\endcsname \jobname.#1 % Open the file
+\openout \csname#1indfile\endcsname \jobname.#1	% Open the file
-\expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
+\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
 \noexpand\docodeindex {#1}}
 }
 \def\defcodeindex{\parsearg\newcodeindex}
 % @synindex foo bar    makes index foo feed into index bar.
 % Do this instead of @defindex foo if you don't want it as a separate index.
 \def\synindex #1 #2 {%
 \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
 \expandafter\let\csname#1indfile\endcsname=\synindexfoo
-\expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
+\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
 \noexpand\doindex {#2}}%
 }
 % @syncodeindex foo bar   similar, but put all entries made for index foo
 % inside @code.
 \def\syncodeindex #1 #2 {%
 \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
 \expandafter\let\csname#1indfile\endcsname=\synindexfoo
-\expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
+\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
 \noexpand\docodeindex {#2}}%
 }
 % Define \doindex, the driver for all \fooindex macros.
 % Argument #1 is generated by the calling \fooindex macro,
 \def\O{\realbackslash O}%
 \def\l{\realbackslash l}%
 \def\L{\realbackslash L}%
 \def\ss{\realbackslash ss}%
 % Take care of texinfo commands likely to appear in an index entry.
-% (Must be a way to avoid doing expansion at all, and thus not have to
-% laboriously list every single command here.)
-\def\@{@}% will be @@ when we switch to @ as escape char.
-%\let\{ = \lbracecmd
-%\let\} = \rbracecmd
 \def\_{{\realbackslash _}}%
 \def\w{\realbackslash w }%
 \def\bf{\realbackslash bf }%
-%\def\rm{\realbackslash rm }%
+\def\rm{\realbackslash rm }%
 \def\sl{\realbackslash sl }%
 \def\sf{\realbackslash sf}%
 \def\tt{\realbackslash tt}%
 \def\gtr{\realbackslash gtr}%
 \def\less{\realbackslash less}%
 \def\hat{\realbackslash hat}%
-%\def\char{\realbackslash char}%
+\def\char{\realbackslash char}%
 \def\TeX{\realbackslash TeX}%
 \def\dots{\realbackslash dots }%
-\def\result{\realbackslash result}%
+\def\copyright{\realbackslash copyright }%
-\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 r {##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
-% expansion of \tie (\\leavevmode \penalty \@M \ ).
-{\obeyspaces
-\gdef\unsepspaces{\obeyspaces\let =\space}}
 % \indexnofonts no-ops all font-change commands.
 % This is used when outputting the strings to sort the index by.
 \def\indexdummyfont#1{#1}
 \def\indexdummytex{TeX}
 \def\indexdummydots{...}
 \def\indexnofonts{%
 % Just ignore accents.
-\let\,=\indexdummyfont
 \let\"=\indexdummyfont
 \let\`=\indexdummyfont
 \let\'=\indexdummyfont
 \let\^=\indexdummyfont
 \let\~=\indexdummyfont
 \let\c=\indexdummyfont
 \let\d=\indexdummyfont
 \let\u=\indexdummyfont
 \let\v=\indexdummyfont
 \let\H=\indexdummyfont
-\let\dotless=\indexdummyfont
 % Take care of the plain tex special European modified letters.
 \def\oe{oe}%
 \def\ae{ae}%
 \def\aa{aa}%
 \def\OE{OE}%
 \let\kbd=\indexdummyfont
 \let\key=\indexdummyfont
 \let\var=\indexdummyfont
 \let\TeX=\indexdummytex
 \let\dots=\indexdummydots
-\def\@{@}%
 }
 % To define \realbackslash, we must make \ not be an escape.
 % We must first make another character (@) an escape
 % so we do not become unable to do a definition.
 \let\SETmarginindex=\relax %initialize!
 % workhorse for all \fooindexes
 % #1 is name of index, #2 is stuff to put there
 \def\doind #1#2{%
 % Put the index entry in the margin if desired.
-\ifx\SETmarginindex\relax\else
+\ifx\SETmarginindex\relax\else%
 \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}%
-\fi
+\fi%
-{%
+{\count10=\lastpenalty %
-\count255=\lastpenalty
+{\indexdummies % Must do this here, since \bf, etc expand at this stage
-{%
+\escapechar=`\\%
-\indexdummies % Must do this here, since \bf, etc expand at this stage
+{\let\folio=0% Expand all macros now EXCEPT \folio
-\escapechar=`\\
+\def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
-{%
+% so it will be output as is; and it will print as backslash in the indx.
-\let\folio=0% We will expand all macros now EXCEPT \folio.
+%
-\def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
+% Now process the index-string once, with all font commands turned off,
-% so it will be output as is; and it will print as backslash.
+% to get the string to sort the index by.
-%
+{\indexnofonts
-% First process the index-string with all font commands turned off
+\xdef\temp1{#2}%
-% to get the string to sort by.
+}%
-{\indexnofonts \xdef\indexsorttmp{#2}}%
+% Now produce the complete index entry.  We process the index-string again,
-%
+% this time with font commands expanded, to get what to print in the index.
-% Now produce the complete index entry, with both the sort key and the
+\edef\temp{%
-% original text, including any font commands.
+\write \csname#1indfile\endcsname{%
-\toks0 = {#2}%
+\realbackslash entry {\temp1}{\folio}{#2}}}%
-\edef\temp{%
+\temp }%
-\write\csname#1indfile\endcsname{%
+}\penalty\count10}}
-\realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
-}%
-\temp
-}%
-}%
-\penalty\count255
-}%
-}
 \def\dosubind #1#2#3{%
 {\count10=\lastpenalty %
 {\indexdummies % Must do this here, since \bf, etc expand at this stage
 \escapechar=`\\%
 \gdef\cindexsub "#1" #2^^M{\endgroup %
 \dosubind{cp}{#2}{#1}}}
 % Define the macros used in formatting output of the sorted index material.
-% @printindex causes a particular index (the ??s file) to get printed.
+% This is what you call to cause a particular index to get printed.
-% It does not print any chapter heading (usually an @unnumbered).
+% Write
-%
+% @unnumbered Function Index
+% @printindex fn
 \def\printindex{\parsearg\doprintindex}
-\def\doprintindex#1{\begingroup
-\dobreak \chapheadingskip{10000}%
+\def\doprintindex#1{%
+\tex
+\dobreak \chapheadingskip {10000}
+\catcode`\%=\other\catcode`\&=\other\catcode`\#=\other
+\catcode`\$=\other
+\catcode`\~=\other
+\indexbreaks
 %
-\indexfonts \rm
+% The following don't help, since the chars were translated
-\tolerance = 9500
+% when the raw index was written, and their fonts were discarded
-\indexbreaks
+% due to \indexnofonts.
+%\catcode`\"=\active
+%\catcode`\^=\active
+%\catcode`\_=\active
+%\catcode`\|=\active
+%\catcode`\<=\active
+%\catcode`\>=\active
+% %
+\def\indexbackslash{\rawbackslashxx}
+\indexfonts\rm \tolerance=9500 \advance\baselineskip -1pt
+\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,
 % and it loses the chapter title and the aux file entries for the
 % index.  The easiest way to prevent this problem is to make sure
 % there is some text.
 (Index is nonexistent)
 \else
 %
 % If the index file exists but is empty, then \openin leaves \ifeof
 % false.  We have to make TeX try to read something from the file, so
 % 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
-\endgroup}
+\enddoublecolumns
+\Etex
+}
 % These macros are used by the sorted index file itself.
 % Change them to control the appearance of the index.
 % Same as \bigskipamount except no shrink.
 % parameters we've set above will have an effect.
 \noindent
 %
 % Insert the text of the index entry.  TeX will do line-breaking on it.
 #1%
-% The following is kludged to not output a line of dots in the index if
+% The following is kluged to not output a line of dots in the index if
 % there are no page numbers.  The next person who breaks this will be
 % cursed by a Unix daemon.
 \def\tempa{{\rm }}%
 \def\tempb{#2}%
 \edef\tempc{\tempa}%
 {\parfillskip=0in \parskip=0in
 \hangindent =1in \hangafter=1
 \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill #2\par
 }}
-% Define two-column mode, which we use to typeset indexes.
+%% Define two-column mode, which is used in indexes.
-% Adapted from the TeXbook, page 416, which is to say,
+%% Adapted from the TeXbook, page 416.
-% the manmac.tex format used to print the TeXbook itself.
+\catcode `\@=11
-\catcode`\@=11
 \newbox\partialpage
 \newdimen\doublecolumnhsize
-\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
+\def\begindoublecolumns{\begingroup
 % Grab any single-column material above us.
-\output = {\global\setbox\partialpage = \vbox{%
+\output = {\global\setbox\partialpage
-%
+=\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
 %
-% Use the double-column output routine for subsequent pages.
+% Now switch to the double-column output routine.
-\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 in one place.
+% execution time, so we may as well do it once.
 %
 % 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, +-<1pt)
+% below is chosen so that the gutter has the same value (well, +- <
-% as it did when we hard-coded it.
+% 1pt) 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.
 %
 \hsize = \doublecolumnhsize
 %
 % Double the \vsize as well.  (We don't need a separate register here,
 % since nobody clobbers \vsize.)
 \vsize = 2\vsize
-}
+\doublecolumnpagegoal
+}
+\def\enddoublecolumns{\eject \endgroup \pagegoal=\vsize \unvbox\partialpage}
+\def\doublecolumnsplit{\splittopskip=\topskip \splitmaxdepth=\maxdepth
+\global\dimen@=\pageheight \global\advance\dimen@ by-\ht\partialpage
+\global\setbox1=\vsplit255 to\dimen@ \global\setbox0=\vbox{\unvbox1}
+\global\setbox3=\vsplit255 to\dimen@ \global\setbox2=\vbox{\unvbox3}
+\ifdim\ht0>\dimen@ \setbox255=\vbox{\unvbox0\unvbox2} \global\setbox255=\copy5 \fi
+\ifdim\ht2>\dimen@ \setbox255=\vbox{\unvbox0\unvbox2} \global\setbox255=\copy5 \fi
+}
+\def\doublecolumnpagegoal{%
+\dimen@=\vsize \advance\dimen@ by-2\ht\partialpage \global\pagegoal=\dimen@
+}
+\def\pagesofar{\unvbox\partialpage %
+\hsize=\doublecolumnhsize % have to restore this since output routine
+\wd0=\hsize \wd2=\hsize \hbox to\pagewidth{\box0\hfil\box2}}
 \def\doublecolumnout{%
-\splittopskip=\topskip \splitmaxdepth=\maxdepth
+\setbox5=\copy255
-% Get the available space for the double columns -- the normal
+{\vbadness=10000 \doublecolumnsplit}
-% (undoubled) page height minus any material left over from the
+\ifvbox255
-% previous page.
+\setbox0=\vtop to\dimen@{\unvbox0}
-\dimen@=\pageheight \advance\dimen@ by-\ht\partialpage
+\setbox2=\vtop to\dimen@{\unvbox2}
-% box0 will be the left-hand column, box2 the right.
+\onepageout\pagesofar \unvbox255 \penalty\outputpenalty
-\setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
+\else
-\onepageout\pagesofar
+\setbox0=\vbox{\unvbox5}
-\unvbox255
+\ifvbox0
-\penalty\outputpenalty
+\dimen@=\ht0 \advance\dimen@ by\topskip \advance\dimen@ by-\baselineskip
-}
+\divide\dimen@ by2 \splittopskip=\topskip \splitmaxdepth=\maxdepth
-\def\pagesofar{%
+{\vbadness=10000
-% Re-output the contents of the output page -- any previous material,
+	\loop \global\setbox5=\copy0
-% followed by the two boxes we just split.
+\setbox1=\vsplit5 to\dimen@
-\unvbox\partialpage
+\setbox3=\vsplit5 to\dimen@
-\hsize = \doublecolumnhsize
+\ifvbox5 \global\advance\dimen@ by1pt \repeat
-\wd0=\hsize \wd2=\hsize \hbox to\pagewidth{\box0\hfil\box2}%
+\setbox0=\vbox to\dimen@{\unvbox1}
-}
+\setbox2=\vbox to\dimen@{\unvbox3}
-\def\enddoublecolumns{%
+\global\setbox\partialpage=\vbox{\pagesofar}
-\output = {\balancecolumns}\eject % split what we have
+\doublecolumnpagegoal
-\endgroup % started in \begindoublecolumns
+}
-%
+\fi
-% Back to normal single-column typesetting, but take account of the
+\fi
-% fact that we just accumulated some stuff on the output page.
+}
-\pagegoal = \vsize
-}
+\catcode `\@=\other
-\def\balancecolumns{%
-% Called at the end of the double column material.
-\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
-\global\setbox1=\vsplit3 to\dimen@
-\ifdim\ht3>\dimen@ \global\advance\dimen@ by1pt
-\repeat}%
-\setbox0=\vbox to\dimen@{\unvbox1}%
-\setbox2=\vbox to\dimen@{\unvbox3}%
-\pagesofar
-}
-\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{\ifnum \pageno<0
+\def\seccheck#1{\if \pageno<0 %
-\errmessage{@#1 not allowed after generating table of contents}%
+\errmessage{@#1 not allowed after generating table of contents}\fi
-\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\result{\realbackslash result}%
+\def\copyright{\realbackslash copyright}
-\def\equiv{\realbackslash equiv}%
+\def\tt{\realbackslash tt}
-\def\expansion{\realbackslash expansion}%
+\def\bf{\realbackslash bf }
-\def\print{\realbackslash print}%
+\def\w{\realbackslash w}
-\def\error{\realbackslash error}%
+\def\less{\realbackslash less}
-\def\point{\realbackslash point}%
+\def\gtr{\realbackslash gtr}
-\def\copyright{\realbackslash copyright}%
+\def\hat{\realbackslash hat}
-\def\tt{\realbackslash tt}%
+\def\char{\realbackslash char}
-\def\bf{\realbackslash bf}%
+\def\tclose##1{\realbackslash tclose {##1}}
-\def\w{\realbackslash w}%
+\def\code##1{\realbackslash code {##1}}
-\def\less{\realbackslash less}%
+\def\samp##1{\realbackslash samp {##1}}
-\def\gtr{\realbackslash gtr}%
+\def\r##1{\realbackslash r {##1}}
-\def\hat{\realbackslash hat}%
+\def\b##1{\realbackslash b {##1}}
-\def\char{\realbackslash char}%
+\def\key##1{\realbackslash key {##1}}
-\def\tclose##1{\realbackslash tclose{##1}}%
+\def\file##1{\realbackslash file {##1}}
-\def\code##1{\realbackslash code{##1}}%
+\def\kbd##1{\realbackslash kbd {##1}}
-\def\samp##1{\realbackslash samp{##1}}%
+% These are redefined because @smartitalic wouldn't work inside xdef.
-\def\r##1{\realbackslash r{##1}}%
+\def\i##1{\realbackslash i {##1}}
-\def\b##1{\realbackslash b{##1}}%
+\def\cite##1{\realbackslash cite {##1}}
-\def\key##1{\realbackslash key{##1}}%
+\def\var##1{\realbackslash var {##1}}
-\def\file##1{\realbackslash file{##1}}%
+\def\emph##1{\realbackslash emph {##1}}
-\def\kbd##1{\realbackslash kbd{##1}}%
+\def\dfn##1{\realbackslash dfn {##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%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash chapentry {#1}{\the\chapno}{\noexpand\folio}}}%
-\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%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash chapentry
-\edef\temp{{\realbackslash chapentry{\the\toks0}%
+{#1}{\putwordAppendix{} \appendixletter}{\noexpand\folio}}}%
-{\putwordAppendix{} \appendixletter}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp  %
 \appendixnoderef %
 \global\let\section = \appendixsec
 \global\let\subsection = \appendixsubsec
 \global\let\subsubsection = \appendixsubsubsec
 }}
-% @centerchap is like @unnumbered, but the heading is centered.
-\outer\def\centerchap{\parsearg\centerchapyyy}
-\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
 \outer\def\top{\parsearg\unnumberedyyy}
 \outer\def\unnumbered{\parsearg\unnumberedyyy}
 \def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
 \def\unnumberedzzz #1{\seccheck{unnumbered}%
 \secno=0 \subsecno=0 \subsubsecno=0
 \toks0 = {#1}\message{(\the\toks0)}%
 %
 \unnumbchapmacro {#1}%
 \gdef\thischapter{#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbchapentry {#1}{\noexpand\folio}}}%
-\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 %
-{\the\toks0}{\the\chapno}{\the\secno}{\noexpand\folio}}}%
+{#1}{\the\chapno}{\the\secno}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \donoderef %
 \penalty 10000 %
 }}
-\outer\def\appendixsection{\parsearg\appendixsecyyy}
+\outer\def\appenixsection{\parsearg\appendixsecyyy}
 \outer\def\appendixsec{\parsearg\appendixsecyyy}
 \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 %
-{\the\toks0}{\appendixletter}{\the\secno}{\noexpand\folio}}}%
+{#1}{\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%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbsecentry{#1}{\noexpand\folio}}}%
-\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 %
-{\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
+{#1}{\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 %
-{\the\toks0}{\appendixletter}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
+{#1}{\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}%
+\plainsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbsubsecentry{#1}{\noexpand\folio}}}%
-\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%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash subsubsecentry %
-\edef\temp{{\realbackslash subsubsecentry{\the\toks0}
+{#1}
 {\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%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash subsubsecentry{#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}%
+\plainsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
-\toks0 = {#1}%
+\edef\temp{{\realbackslash unnumbsubsubsecentry{#1}{\noexpand\folio}}}%
-\edef\temp{{\realbackslash unnumbsubsubsecentry{\the\toks0}{\noexpand\folio}}}%
 \escapechar=`\\%
 \write \contentsfile \temp %
 \unnumbnoderef %
 \penalty 10000 %
 }}
 % Define @majorheading, @heading and @subheading
 % NOTE on use of \vbox for chapter headings, section headings, and
 % such:
-%       1) We use \vbox rather than the earlier \line to permit
+%	1) We use \vbox rather than the earlier \line to permit
-%          overlong headings to fold.
+%	   overlong headings to fold.
-%       2) \hyphenpenalty is set to 10000 because hyphenation in a
+%	2) \hyphenpenalty is set to 10000 because hyphenation in a
-%          heading is obnoxious; this forbids it.
+%	   heading is obnoxious; this forbids it.
 %       3) Likewise, headings look best if no \parindent is used, and
 %          if justification is not attempted.  Hence \raggedright.
 \def\majorheading{\parsearg\majorheadingzzz}
 \def\chapheadingzzz #1{\chapbreak %
 {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
 \parindent=0pt\raggedright
 \rm #1\hfill}}\bigskip \par\penalty 200}
-% @heading, @subheading, @subsubheading.
+\def\heading{\parsearg\secheadingi}
-\def\heading{\parsearg\plainsecheading}
-\def\subheading{\parsearg\plainsubsecheading}
+\def\subheading{\parsearg\subsecheadingi}
-\def\subsubheading{\parsearg\plainsubsubsecheading}
+\def\subsubheading{\parsearg\subsubsecheadingi}
 % These macros generate a chapter, section, etc. heading only
 % (including whitespace, linebreaking, etc. around it),
 % given all the information in convenient, parsed form.
 \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
 %%% Define plain chapter starts, and page on/off switching for it
 % Parameter controlling skip before chapter headings (if needed)
-\newskip\chapheadingskip
+\newskip \chapheadingskip \chapheadingskip = 30pt plus 8pt minus 4pt
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
 \def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 \def\CHAPPAGoff{
-\global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chapbreak
 \global\let\pagealignmacro=\chappager}
 \def\CHAPPAGon{
-\global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chappager
 \global\let\pagealignmacro=\chappager
 \global\def\HEADINGSon{\HEADINGSsingle}}
 \def\CHAPPAGodd{
-\global\let\contentsalignmacro = \chapoddpage
 \global\let\pchapsepmacro=\chapoddpage
 \global\let\pagealignmacro=\chapoddpage
 \global\def\HEADINGSon{\HEADINGSdouble}}
 \CHAPPAGon
 \def\CHAPFplain{
 \global\let\chapmacro=\chfplain
-\global\let\unnumbchapmacro=\unnchfplain
+\global\let\unnumbchapmacro=\unnchfplain}
-\global\let\centerchapmacro=\centerchfplain}
+\def\chfplain #1#2{%
-% Plain chapter opening.
-% #1 is the text, #2 the chapter number or empty if unnumbered.
-\def\chfplain#1#2{%
 \pchapsepmacro
 {%
-\chapfonts \rm
+\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-\def\chapnum{#2}%
+\parindent=0pt\raggedright
-\setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
+\rm #2\enspace #1}%
-\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-\hangindent = \wd0 \centerparametersmaybe
-\unhbox0 #1\par}%
 }%
-\nobreak\bigskip % no page break after a chapter title
+\bigskip
-\nobreak
+\penalty5000
 }
-% Plain opening for unnumbered.
+\def\unnchfplain #1{%
-\def\unnchfplain#1{\chfplain{#1}{}}
+\pchapsepmacro %
+{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-% @centerchap -- centered and unnumbered.
+\parindent=0pt\raggedright
-\let\centerparametersmaybe = \relax
+\rm #1\hfill}}\bigskip \par\penalty 10000 %
-\def\centerchfplain#1{{%
+}
-\def\centerparametersmaybe{%
-\advance\rightskip by 3\rightskip
-\leftskip = \rightskip
-\parfillskip = 0pt
-}%
-\chfplain{#1}{}%
-}}
 \CHAPFplain % The default
 \def\unnchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
 \parindent=0pt\raggedright
 \def\chfopen #1#2{\chapoddpage {\chapfonts
 \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
 \par\penalty 5000 %
 }
-\def\centerchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-\parindent=0pt
-\hfill {\rm #1}\hfill}}\bigskip \par\penalty 10000 %
-}
 \def\CHAPFopen{
 \global\let\chapmacro=\chfopen
-\global\let\unnumbchapmacro=\unnchfopen
+\global\let\unnumbchapmacro=\unnchfopen}
-\global\let\centerchapmacro=\centerchfopen}
+% Parameter controlling skip before section headings.
-% Section titles.
+\newskip \subsecheadingskip  \subsecheadingskip = 17pt plus 8pt minus 4pt
-\newskip\secheadingskip
+\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
+\newskip \secheadingskip  \secheadingskip = 21pt plus 8pt minus 4pt
 \def\secheadingbreak{\dobreak \secheadingskip {-1000}}
-\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}}
-\def\plainsecheading#1{\sectionheading{sec}{}{#1}}
+% @paragraphindent  is defined for the Info formatting commands only.
+\let\paragraphindent=\comment
-% Subsection titles.
-\newskip \subsecheadingskip
+% Section fonts are the base font at magstep2, which produces
-\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
+% a size a bit more than 14 points in the default situation.
-\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}}
-\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}}
+\def\secheading #1#2#3{\secheadingi {#2.#3\enspace #1}}
+\def\plainsecheading #1{\secheadingi {#1}}
-% Subsubsection titles.
+\def\secheadingi #1{{\advance \secheadingskip by \parskip %
-\let\subsubsecheadingskip = \subsecheadingskip
+\secheadingbreak}%
-\let\subsubsecheadingbreak = \subsecheadingbreak
+{\secfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
+\parindent=0pt\raggedright
-\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
+\rm #1\hfill}}%
+\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 }
-% Print any size section title.
-%
+% Subsection fonts are the base font at magstep1,
-% #1 is the section type (sec/subsec/subsubsec), #2 is the section
+% which produces a size of 12 points.
-% number (maybe empty), #3 the text.
-\def\sectionheading#1#2#3{%
+\def\subsecheading #1#2#3#4{\subsecheadingi {#2.#3.#4\enspace #1}}
-{%
+\def\subsecheadingi #1{{\advance \subsecheadingskip by \parskip %
-\expandafter\advance\csname #1headingskip\endcsname by \parskip
+\subsecheadingbreak}%
-\csname #1headingbreak\endcsname
+{\subsecfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-}%
+\parindent=0pt\raggedright
-{%
+\rm #1\hfill}}%
-% Switch to the right set of fonts.
+\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 }
-\csname #1fonts\endcsname \rm
-%
+\def\subsubsecfonts{\subsecfonts} % Maybe this should change:
-% Only insert the separating space if we have a section number.
+				  % Perhaps make sssec fonts scaled
-\def\secnum{#2}%
+				  % magstep half
-\setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
+\def\subsubsecheading #1#2#3#4#5{\subsubsecheadingi {#2.#3.#4.#5\enspace #1}}
-%
+\def\subsubsecheadingi #1{{\advance \subsecheadingskip by \parskip %
-\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+\subsecheadingbreak}%
-\hangindent = \wd0 % zero if no section number
+{\subsubsecfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-\unhbox0 #3}%
+\parindent=0pt\raggedright
-}%
+\rm #1\hfill}}%
-\ifdim\parskip<10pt \nobreak\kern10pt\nobreak\kern-\parskip\fi \nobreak
+\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000}
-}
 \message{toc printing,}
 % Finish up the main text and prepare to read what we've written
 % to \contentsfile.
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \def\startcontents#1{%
-% If @setchapternewpage on, and @headings double, the contents should
+\pagealignmacro
-% start on an odd page, unlike chapters.  Thus, we maintain
-% \contentsalignmacro in parallel with \pagealignmacro.
-% From: Torbjorn Granlund <tege@matematik.su.se>
-\contentsalignmacro
 \immediate\closeout \contentsfile
 \ifnum \pageno>0
-\pageno = -1              % Request roman numbered pages.
+\pageno = -1		% Request roman numbered pages.
 \fi
 % 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.
+\begingroup   		% Set up to handle contents files properly.
 \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-% We can't do this, because then an actual ^ in a section
+\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
-% 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.
 }
 \let\unnumbchapentry = \shortunnumberedentry
 % We want a true roman here for the page numbers.
 \secfonts
 \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl
 \rm
-\hyphenpenalty = 10000
 \advance\baselineskip by 1pt % Open it up a little.
 \def\secentry ##1##2##3##4{}
 \def\unnumbsecentry ##1##2{}
 \def\subsecentry ##1##2##3##4##5{}
 \def\unnumbsubsecentry ##1##2{}
 \dimen0 = \ifdim\wd0 > \shortappendixwidth \shortappendixwidth \else 0pt \fi
 %
 % This space should be plenty, since a single number is .5em, and the
 % widest letter (M) is 1em, at least in the Computer Modern fonts.
 % (This space doesn't include the extra space that gets added after
-% the label; that gets put in by \shortchapentry above.)
+% the label; that gets put in in \shortchapentry above.)
 \advance\dimen0 by 1.1em
 \hbox to \dimen0{#1\hfil}%
 }
 \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
 % And subsubsections.
 \def\subsubsecentry#1#2#3#4#5#6{%
 \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
 \def\unnumbsubsubsecentry#1#2{\dosubsubsecentry{#1}{#2}}
 % This parameter controls the indentation of the various levels.
 \newdimen\tocindent \tocindent = 3pc
 % Now for the actual typesetting. In all these, #1 is the text and #2 is the
 % page number.
 %
-% If the toc has to be broken over pages, we want it to be at chapters
+% If the toc has to be broken over pages, we would want to be at chapters
 % if at all possible; hence the \penalty.
 \def\dochapentry#1#2{%
-\penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
+\penalty-300 \vskip\baselineskip
 \begingroup
 \chapentryfonts
 \tocentry{#1}{\dopageno{#2}}%
 \endgroup
-\nobreak\vskip .25\baselineskip plus.1\baselineskip
+\nobreak\vskip .25\baselineskip
 }
 \def\dosecentry#1#2{\begingroup
 \secentryfonts \leftskip=\tocindent
 \tocentry{#1}{\dopageno{#2}}%
 % Final typesetting of a toc entry; we use the same \entry macro as for
 % the index entries, but we want to suppress hyphenation here.  (We
 % can't do that in the \entry macro, since index entries might consist
 % of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
 %
-% \turnoffactive is for the sake of @" used for umlauts.
 \def\tocentry#1#2{\begingroup
-\vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
+\hyphenpenalty = 10000
-\entry{\turnoffactive #1}{\turnoffactive #2}%
+\entry{#1}{#2}%
 \endgroup}
 % Space between chapter (or whatever) number and the title.
 \def\labelspace{\hskip1em \relax}
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
 % Furthermore, these definitions must come after we define our fonts.
 \newbox\dblarrowbox    \newbox\longdblarrowbox
 \newbox\pushcharbox    \newbox\bullbox
 \newbox\equivbox       \newbox\errorbox
+\let\ptexequiv = \equiv
 %{\tentt
 %\global\setbox\dblarrowbox = \hbox to 1em{\hfil$\Rightarrow$\hfil}
 %\global\setbox\longdblarrowbox = \hbox to 1em{\hfil$\mapsto$\hfil}
 %\global\setbox\pushcharbox = \hbox to 1em{\hfil$\dashv$\hfil}
 % Adapted from the manmac format (p.420 of TeXbook)
 %\global\setbox\bullbox = \hbox to 1em{\kern.15em\vrule height .75ex width .85ex
 %                                      depth .1ex\hfil}
 %}
-% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 \def\point{$\star$}
 \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
 \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
 \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 % Adapted from the TeXbook's \boxit.
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 \def\tex{\begingroup
 \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
 \catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
 \catcode `\%=14
-\catcode 43=12 % plus
+\catcode 43=12
 \catcode`\"=12
 \catcode`\==12
 \catcode`\|=12
 \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\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\b=\ptexb \let\c=\ptexc \let\i=\ptexi \let\t=\ptext \let\l=\ptexl
+\let\L=\ptexL
 %
 \let\Etex=\endgroup}
 % Define @lisp ... @endlisp.
 % @lisp does a \begingroup so it can rebind things,
 \def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
 \def\ctr{{\hskip 6pt\circle\char'010}}
 \def\cbl{{\circle\char'012\hskip -6pt}}
 \def\cbr{{\hskip 6pt\circle\char'011}}
 \def\carttop{\hbox to \cartouter{\hskip\lskip
-\ctl\leaders\hrule height\circthick\hfil\ctr
+	\ctl\leaders\hrule height\circthick\hfil\ctr
-\hskip\rskip}}
+	\hskip\rskip}}
 \def\cartbot{\hbox to \cartouter{\hskip\lskip
-\cbl\leaders\hrule height\circthick\hfil\cbr
+	\cbl\leaders\hrule height\circthick\hfil\cbr
-\hskip\rskip}}
+	\hskip\rskip}}
 %
 \newskip\lskip\newskip\rskip
 \long\def\cartouche{%
 \begingroup
-\lskip=\leftskip \rskip=\rightskip
+	\lskip=\leftskip \rskip=\rightskip
-\leftskip=0pt\rightskip=0pt %we want these *outside*.
+	\leftskip=0pt\rightskip=0pt %we want these *outside*.
-\cartinner=\hsize \advance\cartinner by-\lskip
+	\cartinner=\hsize \advance\cartinner by-\lskip
-\advance\cartinner by-\rskip
+		 	  \advance\cartinner by-\rskip
-\cartouter=\hsize
+	\cartouter=\hsize
-\advance\cartouter by 18pt % allow for 3pt kerns on either
+	\advance\cartouter by 18pt % allow for 3pt kerns on either
-%                                    side, and for 6pt waste from
+%				     side, and for 6pt waste from
-%                                    each corner char
+%				     each corner char
-\normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
+	\normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-% Flag to tell @lisp, etc., not to narrow margin.
+	% Flag to tell @lisp, etc., not to narrow margin.
-\let\nonarrowing=\comment
+	\let\nonarrowing=\comment
-\vbox\bgroup
+	\vbox\bgroup
-\baselineskip=0pt\parskip=0pt\lineskip=0pt
+		\baselineskip=0pt\parskip=0pt\lineskip=0pt
-\carttop
+		\carttop
-\hbox\bgroup
+		\hbox\bgroup
-\hskip\lskip
+			\hskip\lskip
-\vrule\kern3pt
+			\vrule\kern3pt
-\vbox\bgroup
+			\vbox\bgroup
-\hsize=\cartinner
+				\hsize=\cartinner
-\kern3pt
+				\kern3pt
-\begingroup
+				\begingroup
-\baselineskip=\normbskip
+					\baselineskip=\normbskip
-\lineskip=\normlskip
+					\lineskip=\normlskip
-\parskip=\normpskip
+					\parskip=\normpskip
-\vskip -\parskip
+					\vskip -\parskip
 \def\Ecartouche{%
-\endgroup
+				\endgroup
-\kern3pt
+				\kern3pt
-\egroup
+			\egroup
-\kern3pt\vrule
+			\kern3pt\vrule
-\hskip\rskip
+			\hskip\rskip
-\egroup
+		\egroup
-\cartbot
+		\cartbot
-\egroup
+	\egroup
 \endgroup
 }}
 % This macro is called at the beginning of all the @example variants,
 % 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
 \def\smalllispx{\begingroup
 \nonfillstart
 \let\Esmalllisp = \nonfillfinish
 \let\Esmallexample = \nonfillfinish
 %
-% Smaller fonts for small examples.
+% Smaller interline space and fonts for small examples.
+\setleading{10pt}%
 \indexfonts \tt
 \rawbackslash % make \ output the \ character from the current font (tt)
 \gobble
 }
 % 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`\(}\global\advance\parencount by 1 }
+\def\opnr{{\sf\char`\(}} \def\clnr{{\sf\char`\)}} \def\ampnr{\&}
-\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
+\def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}}
-\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.
+% braces (if any).  That's what this does, putting the result in \tptemp.
 %
-\def\removeemptybraces\empty#1\relax{#1}
+\def\removeemptybraces\empty#1\relax{\def\tptemp{#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{%
-#1{\removeemptybraces#2\relax}{#3}%
+\removeemptybraces#2\relax
+#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 parentheses in @def}\fi%
+\ifnum\parencount=0 \else \errmessage{unbalanced parens in @def arguments}\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, perhaps followed by text that
+% #1 is the data type.  #2 is the name.
-% is actually part of the data type, which should not be put into the index.
 \def\deftypevarheader #1#2{%
-\dovarind#2 \relax% Make entry in variables index
+\doind {vr}{\code{#2}}% 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{\dovarind#3 \relax%
+\def\deftypevrheader #1#2#3{\doind {vr}{\code{#3}}%
 \begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1}
 \interlinepenalty=10000
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000
 \endgroup}
 % This definition is run if you use @deftpx, etc
 % anywhere other than immediately after a @deftp, etc.
 \def\deftpx #1 {\errmessage{@deftpx in invalid context}}
 \message{cross reference,}
 % Define cross-reference macros
 \newwrite \auxfile
 \newif\ifhavexrefs  % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
-% @inforef is simple.
-\def\inforef #1{\inforefzzz #1,,,,**}
-\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-node \samp{\ignorespaces#1{}}}
 % \setref{foo} defines a cross-reference point named foo.
 \def\setref#1{%
 \dosetq{#1-title}{Ytitle}%
 \def\printednodename{\ignorespaces #3}%
 \setbox1=\hbox{\printedmanual}%
 \setbox0=\hbox{\printednodename}%
 \ifdim \wd0 = 0pt
 % No printed node name was explicitly given.
-\expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
+\ifx\SETxref-automatic-section-title\relax %
-% Use the node name inside the square brackets.
-\def\printednodename{\ignorespaces #1}%
-\else
 % Use the actual chapter/section title appear inside
 % the square brackets.  Use the real section title if we have it.
 \ifdim \wd1>0pt%
 % It is in another manual, so we don't have it.
 \def\printednodename{\ignorespaces #1}%
 \else
 \ifhavexrefs
 % We know the real title if we have the xref values.
-\def\printednodename{\refx{#1-title}{}}%
+\def\printednodename{\refx{#1-title}}%
 \else
 % Otherwise just copy the Info node name.
 \def\printednodename{\ignorespaces #1}%
 \fi%
 \fi
+\def\printednodename{#1-title}%
+\else
+% Use the node name inside the square brackets.
+\def\printednodename{\ignorespaces #1}%
 \fi
 \fi
 %
 % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
 % insert empty discretionaries after hyphens, which means that it will
 % \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
+\def\dosetq #1#2{{\let\folio=0 \turnoffactive \auxhat%
 \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.
 }
+% Read the last existing aux file, if any.  No error if none exists.
 % This is the macro invoked by entries in the aux file.
-\def\xrdef #1#2{{%
+\def\xrdef #1#2{
-\catcode`\'=\other
+{\catcode`\'=\other\expandafter \gdef \csname X#1\endcsname {#2}}}
-\expandafter\gdef\csname X#1\endcsname{#2}%
-}}
+\def\readauxfile{%
+\begingroup
-% Read the last existing aux file, if any.  No error if none exists.
+\catcode `\^^@=\other
-\def\readauxfile{\begingroup
+\catcode `\=\other
-\catcode`\^^@=\other
+\catcode `\=\other
-\catcode`\^^A=\other
+\catcode `\^^C=\other
-\catcode`\^^B=\other
+\catcode `\^^D=\other
-\catcode`\^^C=\other
+\catcode `\^^E=\other
-\catcode`\^^D=\other
+\catcode `\^^F=\other
-\catcode`\^^E=\other
+\catcode `\^^G=\other
-\catcode`\^^F=\other
+\catcode `\^^H=\other
-\catcode`\^^G=\other
+\catcode `\=\other
-\catcode`\^^H=\other
+\catcode `\^^L=\other
-\catcode`\^^K=\other
+\catcode `\=\other
-\catcode`\^^L=\other
+\catcode `\=\other
-\catcode`\^^N=\other
+\catcode `\=\other
-\catcode`\^^P=\other
+\catcode `\=\other
-\catcode`\^^Q=\other
+\catcode `\=\other
-\catcode`\^^R=\other
+\catcode `\=\other
-\catcode`\^^S=\other
+\catcode `\=\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 26=\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
-% 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.
+% `\+ does not work, so use 43.
-%
+\catcode 43=\other
-\catcode`\~=\other
+% Make the characters 128-255 be printing characters
-\catcode`\[=\other
+{%
-\catcode`\]=\other
+\count 1=128
-\catcode`\"=\other
+\def\loop{%
-\catcode`\_=\other
+\catcode\count 1=\other
-\catcode`\|=\other
+\advance\count 1 by 1
-\catcode`\<=\other
+\ifnum \count 1<256 \loop \fi
-\catcode`\>=\other
-\catcode`\$=\other
-\catcode`\#=\other
-\catcode`\&=\other
-% `\+ does not work, so use 43.
-\catcode43=\other
-% Make the characters 128-255 be printing characters
-{%
-\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).
+}%
-% Turn off \ as an escape so we do not lose on
+% the aux file uses ' as the escape.
-% entries which were dumped with control sequences in their names.
+% Turn off \ as an escape so we do not lose on
-% For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
+% entries which were dumped with control sequences in their names.
-% Reference to such entries still does not work the way one would wish,
+% For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
-% but at least they do not bomb out when the aux file is read in.
+% Reference to such entries still does not work the way one would wish,
-\catcode`\{=1
+% but at least they do not bomb out when the aux file is read in.
-\catcode`\}=2
+\catcode `\{=1 \catcode `\}=2
-\catcode`\%=\other
+\catcode `\%=\other
-\catcode`\'=0
+\catcode `\'=0
-\catcode`\\=\other
+\catcode`\^=7 % to make ^^e4 etc usable in xref tags
-%
+\catcode `\\=\other
 \openin 1 \jobname.aux
-\ifeof 1 \else
+\ifeof 1 \else \closein 1 \input \jobname.aux \global\havexrefstrue
-\closein 1
+\global\warnedobstrue
-\input \jobname.aux
+\fi
-\global\havexrefstrue
+% Open the new aux file.  Tex will close it automatically at exit.
-\global\warnedobstrue
+\openout \auxfile=\jobname.aux
-\fi
-% Open the new aux file.  TeX will close it automatically at exit.
-\openout\auxfile=\jobname.aux
 \endgroup}
 % Footnotes.
 \newcount \footnoteno
 % The trailing space in the following definition for supereject is
 % vital for proper filling; pages come out unaligned when you do a
 % pagealignmacro call if that space before the closing brace is
-% removed. (Generally, numeric constants should always be followed by a
+% removed.
-% 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.
 %
-% Oh yes, they do; otherwise, @ifset and anything else that uses
+\long\gdef\footnotezzz#1{\insert\footins{%
-% \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
-\futurelet\next\fo@t
+#1\strut}%
 }
-\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}%
 \newcodeindex{pg}%
 }
 % Set some numeric style parameters, for 8.5 x 11 format.
-\hsize = 6in
+%\hsize = 6.5in
-\hoffset = .25in
 \newdimen\defaultparindent \defaultparindent = 15pt
 \parindent = \defaultparindent
-\parskip 3pt plus 2pt minus 1pt
+\parskip 18pt plus 1pt
-\setleading{13.2pt}
+\setleading{15pt}
 \advance\topskip by 1.2cm
-\chapheadingskip = 15pt plus 4pt minus 2pt
-\secheadingskip = 12pt plus 3pt minus 2pt
-\subsecheadingskip = 9pt plus 2pt minus 2pt
 % Prevent underfull vbox error messages.
 \vbadness=10000
 % Following George Bush, just get rid of widows and orphans.
 \divide\emergencystretch by 45
 \fi
 % Use @smallbook to reset parameters for 7x9.5 format  (or else 7x9.25)
 \def\smallbook{
-\global\chapheadingskip = 15pt plus 4pt minus 2pt
-\global\secheadingskip = 12pt plus 3pt minus 2pt
+% These values for secheadingskip and subsecheadingskip are
-\global\subsecheadingskip = 9pt plus 2pt minus 2pt
+% experiments.  RJC 7 Aug 1992
-%
+\global\secheadingskip = 17pt plus 6pt minus 3pt
-\global\lispnarrowing = 0.3in
+\global\subsecheadingskip = 14pt plus 6pt minus 3pt
-\setleading{12pt}
-\advance\topskip by -1cm
+\global\lispnarrowing = 0.3in
-\global\parskip 2pt plus 1pt
+\setleading{12pt}
-\global\hsize = 5in
+\advance\topskip by -1cm
-\global\vsize=7.5in
+\global\parskip 3pt plus 1pt
-\global\tolerance=700
+\global\hsize = 5in
-\global\hfuzz=1pt
+\global\vsize=7.5in
-\global\contentsrightmargin=0pt
+\global\tolerance=700
-\global\deftypemargin=0pt
+\global\hfuzz=1pt
-\global\defbodyindent=.5cm
+\global\contentsrightmargin=0pt
-%
+\global\deftypemargin=0pt
-\global\pagewidth=\hsize
+\global\defbodyindent=.5cm
-\global\pageheight=\vsize
-%
+\global\pagewidth=\hsize
-\global\let\smalllisp=\smalllispx
+\global\pageheight=\vsize
-\global\let\smallexample=\smalllispx
-\global\def\Esmallexample{\Esmalllisp}
+\global\let\smalllisp=\smalllispx
+\global\let\smallexample=\smalllispx
+\global\def\Esmallexample{\Esmalllisp}
 }
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{
 \global\tolerance=700
 \global\pagewidth=\hsize
 \global\pageheight=\vsize
 }
-\bindingoffset=0pt
-\normaloffset=\hoffset
-\pagewidth=\hsize
-\pageheight=\vsize
 % Allow control of the text dimensions.  Parameters in order: textheight;
-% textwidth; voffset; hoffset; binding offset; topskip.
+% textwidth; \voffset; \hoffset (!); binding offset.  All require a dimension;
-% All require a dimension;
 % header is additional; added length extends the bottom of the page.
-\def\changepagesizes#1#2#3#4#5#6{
+\def\changepagesizes#1#2#3#4#5{
 \global\vsize= #1
-\global\topskip= #6
 \advance\vsize by \topskip
 \global\voffset= #3
 \global\hsize= #2
 \global\outerhsize=\hsize
 \global\advance\outerhsize by 0.5in
 \global\pagewidth=\hsize
 \global\pageheight=\vsize
 \global\normaloffset= #4
 \global\bindingoffset= #5}
-% A specific text layout, 24x15cm overall, intended for A4 paper.  Top margin
+% This layout is compatible with Latex on A4 paper.
-% 29mm, hence bottom margin 28mm, nominal side margin 3cm.
-\def\afourlatex
+\def\afourlatex{\changepagesizes{22cm}{15cm}{7mm}{4.6mm}{5mm}}
-{\global\tolerance=700
-\global\hfuzz=1pt
-\setleading{12pt}
-\global\parskip 15pt plus 1pt
-\advance\baselineskip by 1.6pt
-\changepagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}
-}
 % Use @afourwide to print on European A4 paper in wide format.
 \def\afourwide{\afourpaper
-\changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}}
+\changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}}
 % Define macros to output various characters with catcode for normal text.
 \catcode`\"=\other
 \catcode`\~=\other
 \catcode`\^=\other
 \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.
-\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}}
+\def\_{\lvvmode \kern.06em \vbox{\hrule width.3em height.1ex}}
+% \lvvmode is equivalent in function to \leavevmode.
+% Using \leavevmode runs into trouble when written out to
+% an index file due to the expansion of \leavevmode into ``\unhbox
+% \voidb@x'' ---which looks to TeX like ``\unhbox \voidb\x'' due to our
+% magic tricks with @.
+\def\lvvmode{\vbox to 0pt{}}
 \catcode`\|=\active
 \def|{{\tt \char '174}}
 \chardef \less=`\<
 \catcode`\<=\active

Mercurial > hg > xemacs-beta

comparison man/texinfo.tex @ 70:131b0175ea99 r20-0b30