Mercurial > hg > octave-nkf > gnulib-hg
changeset 4899:991de0f20246
update from texinfo
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Sun, 04 Jan 2004 14:39:23 +0000 |
parents | f148130e3338 |
children | 127f421afc04 |
files | config/texinfo.tex |
diffstat | 1 files changed, 46 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/config/texinfo.tex +++ b/config/texinfo.tex @@ -3,10 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2003-12-21.10} +\def\texinfoversion{2004-01-04.06} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 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 @@ -599,11 +600,16 @@ \fi\fi } -% @LaTeX{} logo. (@TeX{} is defined in plain.tex.) -% Not quite the same results as the definition in latex.ltx, since we -% use a different font for the raised A; it's most convenient for us to -% go two sizes down, rather than using the \scriptstyle font (since we -% don't reset \scriptstyle and \scriptscriptstyle). +% The \TeX{} logo, as in plain, but resetting the spacing so that a +% period following counts as ending a sentence. (Idea found in latex.) +% +\def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor=3000 } + +% @LaTeX{} logo. Not quite the same results as the definition in +% latex.ltx, since we use a different font for the raised A; it's most +% convenient for us to use an explicitly smaller font, rather than using +% the \scriptstyle font (since we don't reset \scriptstyle and +% \scriptscriptstyle). % \def\LaTeX{% L\kern-.36em @@ -4736,17 +4742,36 @@ \let\exdent=\nofillexdent } +% If you want all examples etc. small: @set dispenvsize small. +% If you want even small examples the full size: @set dispenvsize nosmall. +% This affects the following displayed environments: +% @example, @display, @format, @lisp +% +\def\smallword{small} +\def\nosmallword{nosmall} +\let\SETdispenvsize\relax +\def\setnormaldispenv{% + \ifx\SETdispenvsize\smallword + \smallexamplefonts \rm + \fi +} +\def\setsmalldispenv{% + \ifx\SETdispenvsize\nosmallword + \else + \smallexamplefonts \rm + \fi +} + % We often define two environments, @foo and @smallfoo. % Let's do it by one command: \def\makedispenv #1#2{ - \expandafter\envdef\csname#1\endcsname{#2} - \expandafter\envdef\csname small#1\endcsname - {\smallexamplefonts \rm #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 } -% And there are often two synonyms: +% Define two synonyms: \def\maketwodispenvs #1#2#3{ \makedispenv{#1}{#3} \makedispenv{#2}{#3} @@ -4772,14 +4797,21 @@ } % @format/@smallformat: same as @display except don't narrow margins. -% @flushleft (same as @format). (Note: @smallflushleft not documeted.) -% -\maketwodispenvs {format}{flushleft}{% +% +\makedispenv{format}{% \let\nonarrowing = t% \nonfillstart \gobble } +% @flushleft: same as @format, but doesn't obey \SETdispenvsize. +\envdef\flushleft{% + \let\nonarrowing = t% + \nonfillstart + \gobble +} +\let\Eflushleft = \afterenvbreak + % @flushright. % \envdef\flushright{%