summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-19 00:46:00 +0000
committerKarl Berry <karl@freefriends.org>2011-02-19 00:46:00 +0000
commiteaad65ef80d2ec4e63ac6c2d61bd60bf4a97548c (patch)
tree0360af76879d41f5106bb779b96ab87dff33a3b0 /Master
parent52e500014dd326e0b82000df453d5b640f9859b8 (diff)
consistency
git-svn-id: svn://tug.org/texlive/trunk@21464 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bib/beebe/texbook3.bib58
-rw-r--r--Master/texmf-dist/doc/latex/edfnotes/README.pdfbin0 -> 13766 bytes
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex280
3 files changed, 207 insertions, 131 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
index 805f8614d67..4805003d4b3 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
@@ -5,9 +5,9 @@
%%% ====================================================================
%%% BibTeX-file{
%%% author = "Nelson H. F. Beebe",
-%%% version = "3.23",
-%%% date = "11 November 2010",
-%%% time = "15:38:13 MDT",
+%%% version = "3.24",
+%%% date = "14 February 2011",
+%%% time = "14:51:55 MST",
%%% filename = "texbook3.bib",
%%% address = "University of Utah
%%% Department of Mathematics, 110 LCB
@@ -17,7 +17,7 @@
%%% telephone = "+1 801 581 5254",
%%% FAX = "+1 801 581 4148",
%%% URL = "http://www.math.utah.edu/~beebe",
-%%% checksum = "08318 14013 57885 532957",
+%%% checksum = "14474 14049 58016 534293",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -37,7 +37,7 @@
%%% covered in separate bibliographies
%%% (ep.bib, epodd.bib, and sgml.bib).
%%%
-%%% At version 3.23, the year coverage looks
+%%% At version 3.24, the year coverage looks
%%% like this:
%%%
%%% 1928 ( 1) 1956 ( 0) 1984 ( 15)
@@ -52,8 +52,8 @@
%%% 1937 ( 0) 1965 ( 0) 1993 ( 46)
%%% 1938 ( 0) 1966 ( 0) 1994 ( 36)
%%% 1939 ( 0) 1967 ( 1) 1995 ( 27)
-%%% 1940 ( 0) 1968 ( 0) 1996 ( 11)
-%%% 1941 ( 0) 1969 ( 1) 1997 ( 21)
+%%% 1940 ( 0) 1968 ( 0) 1996 ( 12)
+%%% 1941 ( 0) 1969 ( 1) 1997 ( 20)
%%% 1942 ( 0) 1970 ( 2) 1998 ( 7)
%%% 1943 ( 0) 1971 ( 1) 1999 ( 10)
%%% 1944 ( 0) 1972 ( 2) 2000 ( 4)
@@ -66,12 +66,12 @@
%%% 1951 ( 0) 1979 ( 5) 2007 ( 3)
%%% 1952 ( 0) 1980 ( 6) 2008 ( 4)
%%% 1953 ( 0) 1981 ( 12) 2009 ( 2)
-%%% 1954 ( 0) 1982 ( 21)
-%%% 1955 ( 0) 1983 ( 24)
+%%% 1954 ( 0) 1982 ( 21) 2010 ( 0)
+%%% 1955 ( 0) 1983 ( 24) 2011 ( 2)
%%% 19xx ( 2)
%%%
%%% Article: 170
-%%% Book: 295
+%%% Book: 297
%%% Booklet: 12
%%% InCollection: 7
%%% InProceedings: 113
@@ -84,7 +84,7 @@
%%% TechReport: 54
%%% Unpublished: 2
%%%
-%%% Total entries: 731
+%%% Total entries: 733
%%%
%%% The ISBN and ISSN fields will be printed if
%%% the is-alpha.bst or is-plain.bst style
@@ -968,6 +968,9 @@
@String{pub-U-CHICAGO = "University of Chicago Press"}
@String{pub-U-CHICAGO:adr = "Chicago, IL, USA"}
+@String{pub-UIT-CAMBRIDGE = "UIT Cambridge"}
+@String{pub-UIT-CAMBRIDGE:adr = "Cambridge CB5 8AF, UK"}
+
@String{pub-UNIC = "UNI{$\bullet$}C"}
@String{pub-UNIC:adr = "Danmarks EDB-Center for Forskning og
Uddannelse, Copenhagen, Denmark"}
@@ -13122,6 +13125,39 @@
acknowledgement = ack-nhfb,
}
+@Book{Voss:2011:TML,
+ author = "Herbert Vo{\ss}",
+ title = "Typesetting mathematics with {{\LaTeX}}",
+ publisher = pub-UIT-CAMBRIDGE,
+ address = pub-UIT-CAMBRIDGE:adr,
+ pages = "vi + 282",
+ year = "2011",
+ ISBN = "1-906860-17-3 (paperback)",
+ ISBN-13 = "978-1-906860-17-2 (paperback)",
+ LCCN = "Z253.4.L38 V6713 2011",
+ bibdate = "Mon Feb 14 14:33:50 MST 2011",
+ bibsource = "fsz3950.oclc.org:210/WorldCat",
+ URL = "http://www.uit.co.uk/BK-TMWL/",
+ acknowledgement = ack-nhfb,
+ subject = "LaTeX (computer file); AMS-LaTeX; mathematics
+ printing; computer programs; computerized typesetting",
+}
+
+@Book{Voss:2011:TTL,
+ author = "Herbert Vo{\ss}",
+ title = "Typesetting tables with {{\LaTeX}}",
+ publisher = pub-UIT-CAMBRIDGE,
+ address = pub-UIT-CAMBRIDGE:adr,
+ year = "2011",
+ ISBN = "1-906860-25-4",
+ ISBN-13 = "978-1-906860-25-7",
+ LCCN = "????",
+ bibdate = "Mon Feb 14 14:31:20 MST 2011",
+ bibsource = "library.ox.ac.uk:210/ADVANCE",
+ URL = "http://www.uit.co.uk/BK-TTWL/",
+ acknowledgement = ack-nhfb,
+}
+
%%% =====================================================================
%%% We put all Proceedings entries at the end so they can be
%%% cross-referenced by earlier entries. This order is regrettably
diff --git a/Master/texmf-dist/doc/latex/edfnotes/README.pdf b/Master/texmf-dist/doc/latex/edfnotes/README.pdf
new file mode 100644
index 00000000000..877146e7119
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/edfnotes/README.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 1fe8a1872f6..4467c1e860f 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{2011-02-07.16}
+\def\texinfoversion{2011-02-14.11}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -158,6 +158,7 @@
\def\spaceisspace{\catcode`\ =\spacecat}
% sometimes characters are active, so we need control sequences.
+\chardef\ampChar = `\&
\chardef\colonChar = `\:
\chardef\commaChar = `\,
\chardef\dashChar = `\-
@@ -547,7 +548,7 @@
}
\def\inenvironment#1{%
\ifx#1\empty
- out of any environment%
+ outside of any environment%
\else
in environment \expandafter\string#1%
\fi
@@ -2491,22 +2492,8 @@ end
\codex
}
}
-% Handle @url similarly to \code, but allows line breaks after .#?/ (only).
-{
- \catcode`\.=\active \catcode`\#=\active
- \catcode`\?=\active \catcode`\/=\active
- %
- \global\def\urefcode{\begingroup
- \setupmarkupstyle{code}%
- \catcode\dotChar=\active \catcode\hashChar=\active
- \catcode\questChar=\active \catcode\slashChar=\active
- \let.\urefcodedot
- \let#\urefcodehash
- \let?\urefcodequestion
- \let/\urefcodeslash
- \codex
- }
-}
+
+\def\codex #1{\tclose{#1}\endgroup}
\def\realdash{-}
\def\codedash{-\discretionary{}{}{}}
@@ -2521,25 +2508,6 @@ end
\discretionary{}{}{}}%
{\_}%
}
-% we put a little stretch before and after the breakable chars, to help
-% line breaking of long url's. The unequal skips make look better in
-% cmtt at least, especially for dots.
-\def\urefprestretch{\nobreak \hskip0pt plus.13em }
-\def\urefpoststretch{\allowbreak \hskip0pt plus.1em }
-\def\urefcodedot{\urefprestretch .\urefpoststretch}
-\def\urefcodehash{\urefprestretch \#\urefpoststretch}
-\def\urefcodequestion{\urefprestretch ?\urefpoststretch}
-\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
-{
- \catcode`\/=\active
- \global\def\urefcodeslashfinish{%
- \urefprestretch \slashChar
- % Allow line break only after the final / in a sequence of
- % slashes, to avoid line break between the slashes in http://.
- \ifx\next/\else \urefpoststretch \fi
- }
-}
-\def\codex #1{\tclose{#1}\endgroup}
% An additional complication: the above will allow breaks after, e.g.,
% each of the four underscores in __typeof__. This is undesirable in
@@ -2563,59 +2531,14 @@ end
\fi\fi
}
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
-
-% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
-% `example' (@kbd uses ttsl only inside of @example and friends),
-% or `code' (@kbd uses normal tty font always).
-\parseargdef\kbdinputstyle{%
- \def\txiarg{#1}%
- \ifx\txiarg\worddistinct
- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
- \else\ifx\txiarg\wordexample
- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
- \else\ifx\txiarg\wordcode
- \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
- \else
- \errhelp = \EMsimple
- \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
- \fi\fi\fi
-}
-\def\worddistinct{distinct}
-\def\wordexample{example}
-\def\wordcode{code}
-
-% Default is `distinct'.
-\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\setupmarkupstyle{kbd}\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
-
-% @clicksequence{File @click{} Open ...}
-\def\clicksequence#1{\begingroup #1\endgroup}
-
-% @clickstyle @arrow (by default)
-\parseargdef\clickstyle{\def\click{#1}}
-\def\click{\arrow}
-
% @uref (abbreviation for `urlref') takes an optional (comma-separated)
% second argument specifying the text to display and an optional third
% arg as text to display instead of (rather than in addition to) the url
-% itself. First (mandatory) arg is the url. Perhaps eventually put in
-% a hypertex \special here.
-%
-\def\uref#1{\douref #1,,,\finish}
-\def\douref#1,#2,#3,#4\finish{\begingroup
+% itself. First (mandatory) arg is the url.
+% (This \urefnobreak definition isn't used now, leaving it for a while
+% for comparison.)
+\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
+\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
\unsepspaces
\pdfurl{#1}%
\setbox0 = \hbox{\ignorespaces #3}%
@@ -2636,7 +2559,11 @@ end
\endlink
\endgroup}
-\def\nouref#1,#2,#3,#4\finish{\begingroup % doesn't work in @example
+% This \urefbreak definition is the active one.
+\def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
+\let\uref=\urefbreak
+\def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
+\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
\unsepspaces
\pdfurl{#1}%
\setbox0 = \hbox{\ignorespaces #3}%
@@ -2648,18 +2575,87 @@ end
\ifpdf
\unhbox0 % PDF: 2nd arg given, show only it
\else
- % \empty at the end of \scantokens arg gets rid of
- % trailing newline (and ultimate spurious whitespace).
- \unhbox0\ (\urefcode{\scantokens{#1\empty}})% DVI: 2nd arg given,
- % show both it and url
+ \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
\fi
\else
- \urefcode{\scantokens{#1\empty}}% only url given, so show it
+ \urefcode{#1}% only url given, so show it
\fi
\fi
\endlink
\endgroup}
+% Allow line breaks around only a few characters (only).
+\def\urefcatcodes{%
+ \catcode\ampChar=\active \catcode\dotChar=\active
+ \catcode\hashChar=\active \catcode\questChar=\active
+ \catcode\slashChar=\active
+}
+{
+ \urefcatcodes
+ %
+ \global\def\urefcode{\begingroup
+ \setupmarkupstyle{code}%
+ \urefcatcodes
+ \let&\urefcodeamp
+ \let.\urefcodedot
+ \let#\urefcodehash
+ \let?\urefcodequest
+ \let/\urefcodeslash
+ \codex
+ }
+ %
+ % By default, they are just regular characters.
+ \global\def&{\normalamp}
+ \global\def.{\normaldot}
+ \global\def#{\normalhash}
+ \global\def?{\normalquest}
+ \global\def/{\normalslash}
+}
+
+% we put a little stretch before and after the breakable chars, to help
+% line breaking of long url's. The unequal skips make look better in
+% cmtt at least, especially for dots.
+\def\urefprestretch{\urefprebreak \hskip0pt plus.13em }
+\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
+%
+\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
+\def\urefcodedot{\urefprestretch .\urefpoststretch}
+\def\urefcodehash{\urefprestretch \#\urefpoststretch}
+\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
+{
+ \catcode`\/=\active
+ \global\def\urefcodeslashfinish{%
+ \urefprestretch \slashChar
+ % Allow line break only after the final / in a sequence of
+ % slashes, to avoid line break between the slashes in http://.
+ \ifx\next/\else \urefpoststretch \fi
+ }
+}
+
+% One more complication: by default we'll break after the special
+% characters, but some people like to break before the special chars, so
+% allow that. Also allow no breaking at all, for manual control.
+%
+\parseargdef\urefbreakstyle{%
+ \def\txiarg{#1}%
+ \ifx\txiarg\wordnone
+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
+ \else\ifx\txiarg\wordbefore
+ \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+ \else\ifx\txiarg\wordafter
+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
+ \fi\fi\fi
+}
+\def\wordafter{after}
+\def\wordbefore{before}
+\def\wordnone{none}
+
+\urefbreakstyle after
+
% @url synonym for @uref, since that's how everyone uses it.
%
\let\url=\uref
@@ -2681,6 +2677,51 @@ end
\let\email=\uref
\fi
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
+
+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
+% `example' (@kbd uses ttsl only inside of @example and friends),
+% or `code' (@kbd uses normal tty font always).
+\parseargdef\kbdinputstyle{%
+ \def\txiarg{#1}%
+ \ifx\txiarg\worddistinct
+ \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
+ \else\ifx\txiarg\wordexample
+ \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
+ \else\ifx\txiarg\wordcode
+ \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @kbdinputstyle setting `\txiarg'}%
+ \fi\fi\fi
+}
+\def\worddistinct{distinct}
+\def\wordexample{example}
+\def\wordcode{code}
+
+% Default is `distinct'.
+\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\setupmarkupstyle{kbd}\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
+
+% @clicksequence{File @click{} Open ...}
+\def\clicksequence#1{\begingroup #1\endgroup}
+
+% @clickstyle @arrow (by default)
+\parseargdef\clickstyle{\def\click{#1}}
+\def\click{\arrow}
+
% 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.
%
@@ -5677,6 +5718,8 @@ end
%
\def\sectionheading#1#2#3#4{%
{%
+ \checkenv{}% should not be in an environment.
+ %
% Switch to the right set of fonts.
\csname #2fonts\endcsname \rmisbold
%
@@ -9305,24 +9348,15 @@ directory should work if nowhere else does.}
\catcode`\^^? = 14
% Define macros to output various characters with catcode for normal text.
-\catcode`\"=\other
-\catcode`\~=\other
-\catcode`\^=\other
-\catcode`\_=\other
-\catcode`\|=\other
-\catcode`\<=\other
-\catcode`\>=\other
-\catcode`\+=\other
-\catcode`\$=\other
-\def\normaldoublequote{"}
-\def\normaltilde{~}
-\def\normalcaret{^}
-\def\normalunderscore{_}
-\def\normalverticalbar{|}
-\def\normalless{<}
-\def\normalgreater{>}
-\def\normalplus{+}
-\def\normaldollar{$}%$ font-lock fix
+\catcode`\"=\other \def\normaldoublequote{"}
+\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix
+\catcode`\+=\other \def\normalplus{+}
+\catcode`\<=\other \def\normalless{<}
+\catcode`\>=\other \def\normalgreater{>}
+\catcode`\^=\other \def\normalcaret{^}
+\catcode`\_=\other \def\normalunderscore{_}
+\catcode`\|=\other \def\normalverticalbar{|}
+\catcode`\~=\other \def\normaltilde{~}
% This macro is used to make a character print one way in \tt
% (where it can probably be output as-is), and another way in other fonts,
@@ -9415,16 +9449,16 @@ directory should work if nowhere else does.}
% the literal character `\'.
%
@def@normalturnoffactive{%
- @let\=@normalbackslash
@let"=@normaldoublequote
- @let~=@normaltilde
+ @let$=@normaldollar %$ font-lock fix
+ @let+=@normalplus
+ @let<=@normalless
+ @let>=@normalgreater
+ @let\=@normalbackslash
@let^=@normalcaret
@let_=@normalunderscore
@let|=@normalverticalbar
- @let<=@normalless
- @let>=@normalgreater
- @let+=@normalplus
- @let$=@normaldollar %$ font-lock fix
+ @let~=@normaltilde
@markupsetuplqdefault
@markupsetuprqdefault
@unsepspaces
@@ -9456,10 +9490,16 @@ directory should work if nowhere else does.}
% Say @foo, not \foo, in error messages.
@escapechar = `@@
+% These (along with & and #) are made active for url-breaking, so need
+% active definitions as the normal characters.
+@def@normaldot{.}
+@def@normalquest{?}
+@def@normalslash{/}
+
% These look ok in all fonts, so just make them not special.
-@catcode`@& = @other
-@catcode`@# = @other
-@catcode`@% = @other
+@catcode`@& = @other @def@normalamp{&}
+@catcode`@# = @other @def@normalhash{#}
+@catcode`@% = @other @def@normalpercent{%}
@c Finally, make ` and ' active, so that txicodequoteundirected and
@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we