gnulib: build-aux/texinfo.tex comparison

comparison build-aux/texinfo.tex @ 10833:63a17fa9fd6a

update from texinfo

author	Karl Berry <karl@freefriends.org>
date	Thu, 20 Nov 2008 06:19:42 -0800
parents	c7e606884d6d
children	65e9a6275a83

comparison

equal deleted inserted replaced

-:83b5f7b59a35
+:63a17fa9fd6a
 % texinfo.tex -- TeX macros to handle Texinfo files.
 %
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2008-11-09.14}
+\def\texinfoversion{2008-11-17.21}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 % 2007, 2008 Free Software Foundation, Inc.
 %
 \let\ptexrbrace=\}
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
 \let\ptextop=\top
+{\catcode`\'=\active
+\global\let\ptexquoteright'}% Math-mode def from plain.tex.
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
 \newlinechar = `^^J
 \catcode`|=\other
 \catcode`<=\other
 \catcode`>=\other
 \catcode`+=\other
 \catcode`-=\other
+\catcode`\`=\other
+\catcode`\'=\other
 }
 \def\pushthisfilestack{%
 \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
 }
 {
 \catcode`^ = \active
 \catcode`< = \active
 \catcode`> = \active
 \catcode`+ = \active
+\catcode`' = \active
 \gdef\mathactive{%
 \let^ = \ptexhat
 \let< = \ptexless
 \let> = \ptexgtr
 \let+ = \ptexplus
+\let' = \ptexquoteright
 }
 }
 % Some math mode symbols.
 \def\bullet{$\ptexbullet$}
 % ttsl for book titles, do we?
 \def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
 \let\i=\smartitalic
 \let\slanted=\smartslanted
-\let\var=\smartslanted
+\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 % @b, explicit bold.
 \def\b#1{{\bf #1}}
 \def\t#1{%
 {\tt \rawbackslash \plainfrenchspacing #1}%
 \null
 }
-\def\samp#1{`\tclose{#1}'\null}
+\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
 \setfont\keyrm\rmshape{8}{1000}{OT1}
 \font\keysy=cmsy9
 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
 \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
 \vbox{\hrule\kern-0.4pt
 \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
 \kern-0.4pt\hrule}%
 \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-\def\key #1{{\nohyphenation \uppercase{#1}}\null}
+\def\key #1{{\setupmarkupstyle{key}\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
 % @file, @option are the same as @samp.
 \catcode`\-=\active \catcode`\_=\active
 \catcode`\'=\active \catcode`\`=\active
 \global\let'=\rq \global\let`=\lq  % default definitions
 %
 \global\def\code{\begingroup
-\catcode\rquoteChar=\active \catcode\lquoteChar=\active
+\setupmarkupstyle{code}%
-\let'\codequoteright \let`\codequoteleft
+% The following should really be moved into \setupmarkupstyle handlers.
-%
 \catcode\dashChar=\active  \catcode\underChar=\active
 \ifallowcodebreaks
 \let-\codedash
 \let_\codeunder
 \else
 \kbdinputstyle distinct
 \def\xkey{\key}
 \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
 \ifx\one\xkey\ifx\threex\three \key{#2}%
-\else{\tclose{\kbdfont\look}}\fi
+\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-\else{\tclose{\kbdfont\look}}\fi}
+\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
 % For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
 \let\indicateurl=\code
 \let\env=\code
 \let\command=\code
 % 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}
+\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
 % @l was never documented to mean ``switch to the Lisp font'',
 % and it is not used as such in any manual I can find.  We need it for
 % Polish suppressed-l.  --karl, 22sep96.
 %\def\l#1{{\li #1}\null}
 \message{environments,}
 % @foo ... @end foo.
+% Markup style infrastructure.  \defmarkupstylesetup\INITMACRO will
+% define and register \INITMACRO to be called on markup style changes.
+% \INITMACRO can check \currentmarkupstyle for the innermost
+% style and the set of \ifmarkupSTYLE switches for all styles
+% currently in effect.
+\newif\ifmarkupvar
+\newif\ifmarkupsamp
+\newif\ifmarkupkey
+%\newif\ifmarkupfile % @file == @samp.
+%\newif\ifmarkupoption % @option == @samp.
+\newif\ifmarkupcode
+\newif\ifmarkupkbd
+%\newif\ifmarkupenv % @env == @code.
+%\newif\ifmarkupcommand % @command == @code.
+\newif\ifmarkuptex % @tex (and part of @math, for now).
+\newif\ifmarkupexample
+\newif\ifmarkupverb
+\newif\ifmarkupverbatim
+\let\currentmarkupstyle\empty
+\def\setupmarkupstyle#1{%
+\csname markup#1true\endcsname
+\def\currentmarkupstyle{#1}%
+\markupstylesetup
+}
+\let\markupstylesetup\empty
+\def\defmarkupstylesetup#1{%
+\expandafter\def\expandafter\markupstylesetup
+\expandafter{\markupstylesetup #1}%
+\def#1%
+}
+% Markup style setup for left and right quotes.
+\defmarkupstylesetup\markupsetuplq{%
+\expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
+\ifx\temp\relax \markupsetuplqdefault \else \temp \fi
+}
+\defmarkupstylesetup\markupsetuprq{%
+\expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
+\ifx\temp\relax \markupsetuprqdefault \else \temp \fi
+}
+{
+\catcode`\'=\active
+\catcode`\`=\active
+\gdef\markupsetuplqdefault{\let`\lq}
+\gdef\markupsetuprqdefault{\let'\rq}
+\gdef\markupsetcodequoteleft{\let`\codequoteleft}
+\gdef\markupsetcodequoteright{\let'\codequoteright}
+\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
+}
+\let\markupsetuplqcode \markupsetcodequoteleft
+\let\markupsetuprqcode \markupsetcodequoteright
+\let\markupsetuplqexample \markupsetcodequoteleft
+\let\markupsetuprqexample \markupsetcodequoteright
+\let\markupsetuplqverb \markupsetcodequoteleft
+\let\markupsetuprqverb \markupsetcodequoteright
+\let\markupsetuplqverbatim \markupsetcodequoteleft
+\let\markupsetuprqverbatim \markupsetcodequoteright
+\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
+\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report.  xpdf does work with the
+% regular 0x27.
+%
+\def\codequoteright{%
+\expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+\expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+'%
+\else \char'15 \fi
+\else \char'15 \fi
+}
+%
+% and a similar option for the left quote char vs. a grave accent.
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
+% the code environments to do likewise.
+%
+\def\codequoteleft{%
+\expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+\expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+% [Knuth] pp. 380,381,391
+% \relax disables Spanish ligatures ?` and !` of \tt font.
+\relax`%
+\else \char'22 \fi
+\else \char'22 \fi
+}
+% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
+\def\noligaturesquoteleft{\relax\lq}
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
 % Since these characters are used in examples, they should be an even number of
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
 %
 % @tex ... @end tex    escapes into raw Tex temporarily.
 % One exception: @ is still an escape character, so that @end tex works.
 % But \@ or @@ will get a plain tex @ character.
 \envdef\tex{%
+\setupmarkupstyle{tex}%
 \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
 \catcode `\%=14
 \catcode `\+=\other
 \catcode `\"=\other
 \catcode `\|=\other
 \catcode `\<=\other
 \catcode `\>=\other
+\catcode`\`=\other
+\catcode`\'=\other
 \escapechar=`\\
 %
 \let\b=\ptexb
 \let\bullet=\ptexbullet
 \let\c=\ptexc
 % @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
 %
 \maketwodispenvs {lisp}{example}{%
 \nonfillstart
-\tt\quoteexpand
+\tt\setupmarkupstyle{example}%
 \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
 \gobble       % eat return
 }
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 % verbatim line.
 \def\dospecials{%
 \do\ \do\\\do\{\do\}\do\$\do\&%
 \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
 \do\<\do\>\do\|\do\@\do+\do\"%
+% Don't do the quotes -- if we do, @set txicodequoteundirected and
+% @set txicodequotebacktick will not have effect on @verb and
+% @verbatim, and ?` and !` ligatures won't get disabled.
+%\do\`\do\'%
 }
 %
 % [Knuth] p. 380
 \def\uncatcodespecials{%
 \def\do##1{\catcode`##1=\other}\dospecials}
 \endgroup
 %
 \def\setupverb{%
 \tt  % easiest (and conventionally used) font for verbatim
 \def\par{\leavevmode\endgraf}%
-\catcode`\`=\active
+\setupmarkupstyle{verb}%
 \tabeightspaces
 % Respect line breaks,
 % print special symbols as themselves, and
 % make each space count
 % must do in this order:
 %
 % Real tab expansion
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
-% Allow an option to not replace quotes with a regular directed right
-% quote/apostrophe (char 0x27), but instead use the undirected quote
-% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
-% the default, but it works for pasting with more pdf viewers (at least
-% evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.
-%
-\def\codequoteright{%
-\expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
-\expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-'%
-\else \char'15 \fi
-\else \char'15 \fi
-}
-%
-% and a similar option for the left quote char vs. a grave accent.
-% Modern fonts display ASCII 0x60 as a grave accent, so some people like
-% the code environments to do likewise.
-%
-\def\codequoteleft{%
-\expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
-\expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-\relax`% the \relax disables the `! and `? ligatures
-\else \char'22 \fi
-\else \char'22 \fi
-}
 %
 \begingroup
 \catcode`\^^I=\active
 \gdef\tabexpand{%
 \catcode`\^^I=\active
 \multiply\dimen0 by\tabw % compute previous multiple of \tabw
 \advance\dimen0 by\tabw  % advance to next multiple of \tabw
 \wd0=\dimen0 \box0 \starttabbox
 }%
 }
-\catcode`\'=\active
-\gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
-%
-\catcode`\`=\active
-\gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
-%
-\gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
 \endgroup
 % start the verbatim environment.
 \def\setupverbatim{%
 \let\nonarrowing = t%
 \nonfillstart
 % Easiest (and conventionally used) font for verbatim
 \tt
 \def\par{\leavevmode\egroup\box0\endgraf}%
-\catcode`\`=\active
 \tabexpand
-\quoteexpand
+\setupmarkupstyle{verbatim}%
 % Respect line breaks,
 % print special symbols as themselves, and
 % make each space count
 % must do in this order:
 \obeylines \uncatcodespecials \sepspaces
 % tt for the names.
 \df \sl \hyphenchar\font=0
 %
 % On the other hand, if an argument has two dashes (for instance), we
 % want a way to get ttsl.  Let's try @var for that.
-\let\var=\ttslanted
+\def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
 #1%
 \sl\hyphenchar\font=45
 }
 % We want ()&[] to print specially on the defun line.
 @let|=@normalverticalbar
 @let<=@normalless
 @let>=@normalgreater
 @let+=@normalplus
 @let$=@normaldollar %$ font-lock fix
+@markupsetuplqdefault
+@markupsetuprqdefault
 @unsepspaces
 }
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @c Finally, make ` and ' active, so that txicodequoteundirected and
 @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}.  If we
 @c don't make ` and ' active, @code will not get them as active chars.
 @c Do this last of all since we use ` in the previous @catcode assignments.
-@c (not ready yet, sigh)
+@catcode`@'=@active
-@c atcode`@'=@active @let'@rq
+@catcode`@`=@active
-@c atcode`@`=@active @let`@lq
+@markupsetuplqdefault
+@markupsetuprqdefault
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
 @c page-delimiter: "^\\\\message"
 @c time-stamp-start: "def\\\\texinfoversion{"

Mercurial > gnulib

comparison build-aux/texinfo.tex @ 10833:63a17fa9fd6a