mirror of
https://github.com/mirror/make.git
synced 2025-01-14 22:30:39 +08:00
* texinfo.tex (\imagexxx): Equalize space above and below if in
vmode. From rms. .,
This commit is contained in:
Karl Berry
parent
ecb3bca9f5
commit
0798a61169
103
texinfo.tex
103
texinfo.tex
@ -3,7 +3,7 @@
|
||||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{1999-03-23.17}%
|
||||
\def\texinfoversion{1999-03-26.17}%
|
||||
%
|
||||
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
|
||||
% Free Software Foundation, Inc.
|
||||
@ -103,6 +103,7 @@
|
||||
\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
|
||||
\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
|
||||
\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi
|
||||
\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
|
||||
\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi
|
||||
\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi
|
||||
\ifx\putwordof\undefined \gdef\putwordof{of}\fi
|
||||
@ -130,7 +131,6 @@
|
||||
%
|
||||
\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi
|
||||
\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi
|
||||
\ifx\putwordDefivar\undefined \gdef\putwordDefivar{Instance Variable}\fi
|
||||
\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi
|
||||
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
|
||||
\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
|
||||
@ -2062,6 +2062,7 @@ width0pt\relax} \fi
|
||||
\let\deftp = \relax
|
||||
\let\deftypefn = \relax
|
||||
\let\deftypefun = \relax
|
||||
\let\deftypeivar = \relax
|
||||
\let\deftypevar = \relax
|
||||
\let\deftypevr = \relax
|
||||
\let\defun = \relax
|
||||
@ -4391,24 +4392,11 @@ width0pt\relax} \fi
|
||||
\catcode 61=\other % Turn off change made in \defparsebody
|
||||
}
|
||||
|
||||
% This definition is run if you use @defunx
|
||||
% anywhere other than immediately after a @defun or @defunx.
|
||||
|
||||
\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\deftypefunx #1 {\errmessage{@deftypefunx in invalid context}}
|
||||
|
||||
% @defmethod, and so on
|
||||
|
||||
% @defop CATEGORY CLASS OPERATION ARG...
|
||||
|
||||
%
|
||||
\def\defop #1 {\def\defoptype{#1}%
|
||||
\defopparsebody\Edefop\defopx\defopheader\defoptype}
|
||||
|
||||
%
|
||||
\def\defopheader #1#2#3{%
|
||||
\dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index
|
||||
\begingroup\defname {#2}{\defoptype{}\putwordon\ #1}%
|
||||
@ -4429,6 +4417,20 @@ width0pt\relax} \fi
|
||||
\endgroup
|
||||
}
|
||||
|
||||
% @deftypeivar CLASS TYPE VARNAME
|
||||
%
|
||||
\def\deftypeivar{%
|
||||
\deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader}
|
||||
%
|
||||
% #1 is the class name, #2 the data type, #3 the variable name.
|
||||
\def\deftypeivarheader#1#2#3{%
|
||||
\dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
|
||||
\begingroup
|
||||
\defname{#3}{\putwordInstanceVariableof\ \code{#1}}%
|
||||
\defvarargs{#3}%
|
||||
\endgroup
|
||||
}
|
||||
|
||||
% @defmethod == @defop Method
|
||||
%
|
||||
\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
|
||||
@ -4453,26 +4455,19 @@ width0pt\relax} \fi
|
||||
\defvarargs {#3}\endgroup %
|
||||
}
|
||||
|
||||
% @defivar == @defcv {Instance Variable}
|
||||
|
||||
% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
|
||||
%
|
||||
\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
|
||||
|
||||
\def\defivarheader #1#2#3{%
|
||||
\dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index
|
||||
\begingroup\defname {#2}{\putwordDefivar\ \putwordof\ #1}%
|
||||
\defvarargs {#3}\endgroup %
|
||||
%
|
||||
\def\defivarheader#1#2#3{%
|
||||
\dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index
|
||||
\begingroup
|
||||
\defname{#2}{\putwordInstanceVariableof\ #1}%
|
||||
\defvarargs{#3}%
|
||||
\endgroup
|
||||
}
|
||||
|
||||
% These definitions are run if you use @defmethodx, etc.,
|
||||
% anywhere other than immediately after a @defmethod, etc.
|
||||
|
||||
\def\defopx #1 {\errmessage{@defopx in invalid context}}
|
||||
\def\defmethodx #1 {\errmessage{@defmethodx in invalid context}}
|
||||
\def\defcvx #1 {\errmessage{@defcvx in invalid context}}
|
||||
\def\defivarx #1 {\errmessage{@defivarx in invalid context}}
|
||||
|
||||
% Now @defvar
|
||||
|
||||
% @defvar
|
||||
% First, define the processing that is wanted for arguments of @defvar.
|
||||
% This is actually simple: just print them in roman.
|
||||
% This must expand the args and terminate the paragraph they make up
|
||||
@ -4529,15 +4524,6 @@ width0pt\relax} \fi
|
||||
\endgraf\nobreak\vskip -\parskip\nobreak
|
||||
\endgroup}
|
||||
|
||||
% This definition is run if you use @defvarx
|
||||
% anywhere other than immediately after a @defvar or @defvarx.
|
||||
|
||||
\def\defvrx #1 {\errmessage{@defvrx in invalid context}}
|
||||
\def\defvarx #1 {\errmessage{@defvarx in invalid context}}
|
||||
\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
|
||||
\def\deftypevarx #1 {\errmessage{@deftypevarx in invalid context}}
|
||||
\def\deftypevrx #1 {\errmessage{@deftypevrx in invalid context}}
|
||||
|
||||
% Now define @deftp
|
||||
% Args are printed in bold, a slight difference from @defvar.
|
||||
|
||||
@ -4550,10 +4536,27 @@ width0pt\relax} \fi
|
||||
\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}%
|
||||
\begingroup\defname {#2}{#1}\deftpargs{#3}\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}}
|
||||
% These definitions are used if you use @defunx (etc.)
|
||||
% anywhere other than immediately after a @defun or @defunx.
|
||||
%
|
||||
\def\defcvx#1 {\errmessage{@defcvx in invalid context}}
|
||||
\def\deffnx#1 {\errmessage{@deffnx in invalid context}}
|
||||
\def\defivarx#1 {\errmessage{@defivarx in invalid context}}
|
||||
\def\defmacx#1 {\errmessage{@defmacx in invalid context}}
|
||||
\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}}
|
||||
\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
|
||||
\def\defopx#1 {\errmessage{@defopx in invalid context}}
|
||||
\def\defspecx#1 {\errmessage{@defspecx in invalid context}}
|
||||
\def\deftpx#1 {\errmessage{@deftpx in invalid context}}
|
||||
\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}}
|
||||
\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}}
|
||||
\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}}
|
||||
\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}}
|
||||
\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}}
|
||||
\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}}
|
||||
\def\defunx#1 {\errmessage{@defunx in invalid context}}
|
||||
\def\defvarx#1 {\errmessage{@defvarx in invalid context}}
|
||||
\def\defvrx#1 {\errmessage{@defvrx in invalid context}}
|
||||
|
||||
|
||||
\message{macros,}
|
||||
@ -5324,7 +5327,11 @@ width0pt\relax} \fi
|
||||
\catcode`\^^M = 5 % in case we're inside an example
|
||||
% If the image is by itself, center it.
|
||||
\ifvmode
|
||||
\nobreak\medskip
|
||||
\nobreak\bigskip
|
||||
% Usually we'll have text after the image which will insert
|
||||
% \parskip glue, so insert it here too to equalize the space
|
||||
% above and below.
|
||||
\nobreak\vskip\parskip
|
||||
\nobreak
|
||||
\centerline{\epsfbox{#1.eps}}%
|
||||
\bigbreak
|
||||
|
||||
Loading…
Reference in New Issue
Block a user