diff options
| -rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texbook3.bib | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texgraph.bib | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 57 |
3 files changed, 36 insertions, 41 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib index 1382c7beb11..eb2d4481463 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib @@ -17,7 +17,7 @@ %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", %%% URL = "http://www.math.utah.edu/~beebe", -%%% checksum = "44151 14013 57886 532925", +%%% checksum = "25077 14013 57886 532925", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -2883,7 +2883,7 @@ keywords = "SGML, DTD, document representation", } -@Book{Bryan:1997:DTS, +@Book{Bryan:1996:DTS, author = "Marvin Bryan", title = "Digital typography sourcebook", publisher = pub-WILEY, diff --git a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib index 449f45a4be0..066940c2805 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib @@ -4,9 +4,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "2.01", -%%% date = "23 March 2007", -%%% time = "06:52:28 MDT", +%%% version = "2.02", +%%% date = "14 May 2010", +%%% time = "18:48:47 MDT", %%% filename = "texgraph.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -15,7 +15,7 @@ %%% USA", %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", -%%% checksum = "37931 2840 10824 100006", +%%% checksum = "58746 2840 10824 100006", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -39,7 +39,7 @@ %%% printed if the is-alpha.bst or is-plain.bst %%% style files are used. %%% -%%% At version 2.01, the year coverage looked +%%% At version 2.02, the year coverage looked %%% like this: %%% %%% 1967 ( 1) 1980 ( 1) 1993 ( 0) @@ -1411,7 +1411,7 @@ acknowledgement = ack-nhfb, } -@Unpublished{Karney:1989, +@Unpublished{Karney:1988, author = "Charles Karney", title = "Getting {\TeX} labelling on graphics", year = "1988", @@ -2004,7 +2004,7 @@ acknowledgement = ack-spqr, } -@TechReport{Rahtz:1987, +@TechReport{Rahtz:1987a, author = "Sebastian Rahtz", title = "The right text-processing tools for the job?", type = "CSMAN", @@ -2014,7 +2014,7 @@ acknowledgement = ack-spqr, } -@Article{Rahtz:1988, +@Article{Rahtz:1987b, author = "Sebastian Rahtz", title = "The {Protestant Cemetery, Rome}: a study undertaken under the auspices of the {Unione Internazionale degli diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index 0eb49ce8e96..e16a730d915 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/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{2010-04-23.06} +\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, @@ -2123,7 +2123,7 @@ end \let\tenttsl=\titlettsl \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{25pt}} + \resetmathfonts \setleading{27pt}} \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\entrybreak \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. -% % 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}% + \def\entrybreak{\hfil\break}% % % 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 @@ -5875,7 +5877,7 @@ end \def\shortpartentry#1#2#3#4{% \penalty-300 \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip - \shortchapentry{#1}{\numeralbox}{}{}% + \shortchapentry{{\bf #1}}{\numeralbox}{}{}% } % Chapters, in the main contents. @@ -5967,9 +5969,9 @@ end \message{environments,} % @foo ... @end foo. -% @tex ... @end tex escapes into raw Tex temporarily. +% @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. +% But \@ or @@ will get a plain @ character. \envdef\tex{% \setupmarkupstyle{tex}% @@ -6192,41 +6194,42 @@ end } % 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\makedispenvdef#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 } -% Define two synonyms: -\def\maketwodispenvs #1#2#3{ - \makedispenv{#1}{#3} - \makedispenv{#2}{#3} +% Define two environment synonyms (#1 and #2) for an environment. +\def\maketwodispenvdef#1#2#3{% + \makedispenvdef{#1}{#3}% + \makedispenvdef{#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. % -\maketwodispenvs {lisp}{example}{% +\maketwodispenvdef{lisp}{example}{% \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. % -\makedispenv {display}{% +\makedispenvdef{display}{% \nonfillstart \gobble } % @format/@smallformat: same as @display except don't narrow margins. % -\makedispenv{format}{% +\makedispenvdef{format}{% \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. % +\makedispenvdef{quotation}{\quotationstart} +% \def\quotationstart{% {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip \parindent=0pt @@ -6295,17 +6300,6 @@ end \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. % @@ -6317,6 +6311,7 @@ end \fi {\parskip=0pt \afterenvbreak}% } +\def\Esmallquotation{\Equotation} % If we're given an argument, typeset it in bold with a colon after. \def\quotationlabel#1{% |