projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50cbc9d
)
update from texinfo
author
Karl Berry
<karl@freefriends.org>
Fri, 14 May 2010 17:27:58 +0000
(10:27 -0700)
committer
Karl Berry
<karl@freefriends.org>
Fri, 14 May 2010 17:27:58 +0000
(10:27 -0700)
build-aux/texinfo.tex
patch
|
blob
|
history
diff --git
a/build-aux/texinfo.tex
b/build-aux/texinfo.tex
index
d971304
..
e16a730
100644
(file)
--- a/
build-aux/texinfo.tex
+++ b/
build-aux/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
%
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2010-05-
08.16
}
+\def\texinfoversion{2010-05-
14.10
}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@
-2123,7
+2123,7
@@
end
\let\tenttsl=\titlettsl
\def\curfontsize{title}%
\def\lsize{chap}\def\lllsize{subsec}%
\let\tenttsl=\titlettsl
\def\curfontsize{title}%
\def\lsize{chap}\def\lllsize{subsec}%
- \resetmathfonts \setleading{2
5
pt}}
+ \resetmathfonts \setleading{2
7
pt}}
\def\titlefont#1{{\titlefonts\rmisbold #1}}
\def\chapfonts{%
\let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
\def\titlefont#1{{\titlefonts\rmisbold #1}}
\def\chapfonts{%
\let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
@@
-4257,6
+4257,7
@@
end
\definedummyword\registeredsymbol
\definedummyword\dots
\definedummyword\enddots
\definedummyword\registeredsymbol
\definedummyword\dots
\definedummyword\enddots
+ \definedummyword\entrybreak
\definedummyword\equiv
\definedummyword\error
\definedummyword\euro
\definedummyword\equiv
\definedummyword\error
\definedummyword\euro
@@
-4699,7
+4700,6
@@
end
% But this freezes the catcodes in the argument, and can cause problems to
% @code, which sets - active. This problem was fixed by a kludge---
% ``-'' was active throughout whole index, but this isn't really right.
% But this freezes the catcodes in the argument, and can cause problems to
% @code, which sets - active. This problem was fixed by a kludge---
% ``-'' was active throughout whole index, but this isn't really right.
-%
% The right solution is to prevent \entry from swallowing the whole text.
% --kasal, 21nov03
\def\entry{%
% The right solution is to prevent \entry from swallowing the whole text.
% --kasal, 21nov03
\def\entry{%
@@
-4740,11
+4740,13
@@
end
% from @* into spaces. The user might give these in long section
% titles, for instance.
\def\*{\unskip\space\ignorespaces}%
% from @* into spaces. The user might give these in long section
% titles, for instance.
\def\*{\unskip\space\ignorespaces}%
+ \def\entrybreak{\hfil\break}%
%
% Swallow the left brace of the text (first parameter):
\afterassignment\doentry
\let\temp =
}
%
% Swallow the left brace of the text (first parameter):
\afterassignment\doentry
\let\temp =
}
+\def\entrybreak{\unskip\space\ignorespaces}%
\def\doentry{%
\bgroup % Instead of the swallowed brace.
\noindent
\def\doentry{%
\bgroup % Instead of the swallowed brace.
\noindent
@@
-5967,9
+5969,9
@@
end
\message{environments,}
% @foo ... @end foo.
\message{environments,}
% @foo ... @end foo.
-% @tex ... @end tex escapes into raw Te
x
temporarily.
+% @tex ... @end tex escapes into raw Te
X
temporarily.
% One exception: @ is still an escape character, so that @end tex works.
% One exception: @ is still an escape character, so that @end tex works.
-% But \@ or @@ will get a plain
tex
@ character.
+% But \@ or @@ will get a plain @ character.
\envdef\tex{%
\setupmarkupstyle{tex}%
\envdef\tex{%
\setupmarkupstyle{tex}%
@@
-6192,41
+6194,42
@@
end
}
% We often define two environments, @foo and @smallfoo.
}
% We often define two environments, @foo and @smallfoo.
-% Let's do it
by one command:
-\def\makedispenv
#1#2{
- \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
- \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
+% Let's do it
in one command. #1 is the env name, #2 the definition.
+\def\makedispenv
def#1#2{%
+ \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
%
+ \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
%
\expandafter\let\csname E#1\endcsname \afterenvbreak
\expandafter\let\csname Esmall#1\endcsname \afterenvbreak
}
\expandafter\let\csname E#1\endcsname \afterenvbreak
\expandafter\let\csname Esmall#1\endcsname \afterenvbreak
}
-% Define two
synonyms:
-\def\maketwodispenv
s #1#2#3{
- \makedispenv
{#1}{#3}
- \makedispenv
{#2}{#3}
+% Define two
environment synonyms (#1 and #2) for an environment.
+\def\maketwodispenv
def#1#2#3{%
+ \makedispenv
def{#1}{#3}%
+ \makedispenv
def{#2}{#3}%
}
}
-
-% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+%
+% @lisp: indented, narrowed, typewriter font;
+% @example: same as @lisp.
%
% @smallexample and @smalllisp: use smaller fonts.
% Originally contributed by Pavel@xerox.
%
%
% @smallexample and @smalllisp: use smaller fonts.
% Originally contributed by Pavel@xerox.
%
-\maketwodispenv
s
{lisp}{example}{%
+\maketwodispenv
def
{lisp}{example}{%
\nonfillstart
\tt\setupmarkupstyle{example}%
\let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
\nonfillstart
\tt\setupmarkupstyle{example}%
\let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
- \gobble
% eat return
+ \gobble % eat return
}
% @display/@smalldisplay: same as @lisp except keep current font.
%
}
% @display/@smalldisplay: same as @lisp except keep current font.
%
-\makedispenv
{display}{%
+\makedispenv
def
{display}{%
\nonfillstart
\gobble
}
% @format/@smallformat: same as @display except don't narrow margins.
%
\nonfillstart
\gobble
}
% @format/@smallformat: same as @display except don't narrow margins.
%
-\makedispenv{format}{%
+\makedispenv
def
{format}{%
\let\nonarrowing = t%
\nonfillstart
\gobble
\let\nonarrowing = t%
\nonfillstart
\gobble
@@
-6280,6
+6283,8
@@
end
% we're doing normal filling. So, when using \aboveenvbreak and
% \afterenvbreak, temporarily make \parskip 0.
%
% we're doing normal filling. So, when using \aboveenvbreak and
% \afterenvbreak, temporarily make \parskip 0.
%
+\makedispenvdef{quotation}{\quotationstart}
+%
\def\quotationstart{%
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
\parindent=0pt
\def\quotationstart{%
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
\parindent=0pt
@@
-6295,17
+6300,6
@@
end
\parsearg\quotationlabel
}
\parsearg\quotationlabel
}
-\envdef\quotation{%
- \setnormaldispenv
- \quotationstart
-}
-
-\envdef\smallquotation{%
- \setsmalldispenv
- \quotationstart
-}
-\let\Esmallquotation = \Equotation
-
% We have retained a nonzero parskip for the environment, since we're
% doing normal filling.
%
% We have retained a nonzero parskip for the environment, since we're
% doing normal filling.
%
@@
-6317,6
+6311,7
@@
end
\fi
{\parskip=0pt \afterenvbreak}%
}
\fi
{\parskip=0pt \afterenvbreak}%
}
+\def\Esmallquotation{\Equotation}
% If we're given an argument, typeset it in bold with a colon after.
\def\quotationlabel#1{%
% If we're given an argument, typeset it in bold with a colon after.
\def\quotationlabel#1{%