diff options
author | Karl Berry <karl@freefriends.org> | 2014-02-07 23:27:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-02-07 23:27:05 +0000 |
commit | 8de6e6ae206c785b6d4a92e617c037917863b96f (patch) | |
tree | 0ef536887e80f197a5411911830ae87796c5e75a /Master/texmf-dist | |
parent | f248fc8685af5b4a4c6bc2c2a2ce3d244f4b281a (diff) |
consistency
git-svn-id: svn://tug.org/texlive/trunk@32911 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texbook3.bib | 84 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texgraph.bib | 86 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 1 | ||||
-rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 110 |
4 files changed, 181 insertions, 100 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib index 9a69b828140..cfe561c7bd2 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.46", -%%% date = "12 August 2013", -%%% time = "15:15:39 MDT", +%%% version = "3.48", +%%% date = "13 November 2013", +%%% time = "10:53:34 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 = "51549 16225 66534 649669", +%%% checksum = "49207 16277 66710 652131", %%% 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.46, the year coverage looks +%%% At version 3.48, the year coverage looks %%% like this: %%% %%% 1928 ( 1) 1957 ( 0) 1986 ( 42) @@ -49,7 +49,7 @@ %%% 1934 ( 0) 1963 ( 0) 1992 ( 83) %%% 1935 ( 0) 1964 ( 0) 1993 ( 46) %%% 1936 ( 0) 1965 ( 0) 1994 ( 37) -%%% 1937 ( 0) 1966 ( 0) 1995 ( 27) +%%% 1937 ( 0) 1966 ( 0) 1995 ( 28) %%% 1938 ( 0) 1967 ( 1) 1996 ( 14) %%% 1939 ( 0) 1968 ( 0) 1997 ( 21) %%% 1940 ( 0) 1969 ( 1) 1998 ( 7) @@ -61,7 +61,7 @@ %%% 1946 ( 0) 1975 ( 1) 2004 ( 36) %%% 1947 ( 0) 1976 ( 3) 2005 ( 13) %%% 1948 ( 0) 1977 ( 2) 2006 ( 5) -%%% 1949 ( 0) 1978 ( 7) 2007 ( 5) +%%% 1949 ( 0) 1978 ( 7) 2007 ( 6) %%% 1950 ( 0) 1979 ( 5) 2008 ( 4) %%% 1951 ( 0) 1980 ( 8) 2009 ( 5) %%% 1952 ( 0) 1981 ( 12) 2010 ( 3) @@ -72,20 +72,20 @@ %%% 19xx ( 2) %%% %%% Article: 188 -%%% Book: 309 +%%% Book: 310 %%% Booklet: 12 %%% InCollection: 10 %%% InProceedings: 125 %%% Manual: 16 %%% MastersThesis: 3 -%%% Misc: 15 +%%% Misc: 16 %%% Periodical: 1 %%% PhdThesis: 10 %%% Proceedings: 38 %%% TechReport: 59 %%% Unpublished: 2 %%% -%%% Total entries: 788 +%%% Total entries: 790 %%% %%% The ISBN and ISSN fields will be printed if %%% the is-alpha.bst or is-plain.bst style @@ -7950,7 +7950,6 @@ bibdate = "Sat Mar 07 09:19:20 1998", bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", price = "29,80 DM", - acknowledgement = ack-nhfb, acknowledgement = ack-rz # " and " # ack-nhfb, xxnote = "When did first edition appear?? Some libraries list this as a second edition, and others as a first @@ -9391,6 +9390,21 @@ acknowledgement = ack-rw, } +@Misc{KTS:2007:AJT, + author = "{Korean {\TeX} Society}", + title = "The {Asian} Journal of {\TeX}", + howpublished = "Online journal in Chinese, English, Japanese, and + Korean.", + year = "2007", + bibdate = "Thu Oct 31 11:32:48 2013", + bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", + ISSN = "1976-1228", + ISSN-L = "1976-1228", + URL = "http://ajt.ktug.org/", + acknowledgement = ack-nhfb, + remark = "Volumes 1 (2007) to 5 (2011) have been published.", +} + @TechReport{Kwong:1991:KKB, author = "Man Kam Kwong", title = "{\tt kxp} and {\tt kxpl}: a Busy Man's {\LaTeX}: @@ -11021,10 +11035,17 @@ month = oct, year = "1995", CODEN = "CPHCBZ", + DOI = "http://dx.doi.org/10.1016/0010-4655(95)90137-S", ISSN = "0010-4655 (print), 1879-2944 (electronic)", - bibdate = "Sat Dec 21 15:45:22 MST 1996", + ISSN-L = "0010-4655", + bibdate = "Mon Feb 13 21:29:59 MST 2012", bibsource = "Compendex database; - http://www.math.utah.edu/pub/tex/bib/texbook3.bib", + ftp://ftp.math.utah.edu/pub/tex/bib/texgraph.bib; + http://www.math.utah.edu/pub/bibnet/authors/f/feynman-richard-p.bib; + http://www.math.utah.edu/pub/tex/bib/compphyscomm1990.bib; + http://www.math.utah.edu/pub/tex/bib/texbook3.bib; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib", + URL = "http://www.sciencedirect.com/science/article/pii/001046559590137S", abstract = "feynMF is a {\LaTeX} package for easy drawing of professional quality Feynman diagrams with METAFONT (or METAPOST). feynMF lays out most diagrams satisfactorily @@ -11036,6 +11057,8 @@ affiliation = "Technische Hochschule Darmstadt", affiliationaddress = "Darmstadt, Ger", classification = "723; 723.1.1; 723.5; 902.1; 921.4; 931.4", + fjournal = "Computer Physics Communications", + journal-URL = "http://www.sciencedirect.com/science/journal/00104655", keywords = "Algorithms; Computer graphics; Computer programming languages; Computer software; Drawing (graphics); Feynman diagrams; Graph theory; latex (programming @@ -12496,7 +12519,7 @@ } @Article{Sherborne:1990:RGC, - author = "B. S. Sherborne and G. E. Stedman", + author = "Brad S. Sherborne and G. E. Stedman", title = "Recursive generation of {Cartesian} angular momentum coupling trees for {${\rm SO}(3)$}", journal = j-COMP-PHYS-COMM, @@ -12506,9 +12529,13 @@ month = jun, year = "1990", CODEN = "CPHCBZ", + DOI = "http://dx.doi.org/10.1016/0010-4655(90)90188-7", ISSN = "0010-4655 (print), 1879-2944 (electronic)", - bibdate = "Fri Dec 18 11:10:49 1998", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib", + ISSN-L = "0010-4655", + bibdate = "Mon Feb 13 21:29:12 MST 2012", + bibsource = "http://www.math.utah.edu/pub/tex/bib/compphyscomm1990.bib; + http://www.math.utah.edu/pub/tex/bib/texbook3.bib", + URL = "http://www.sciencedirect.com/science/article/pii/0010465590901887", abstract = "Two computer algorithms are evaluated for the reduction of angular momentum coupling trees with vector ($j=1$) terminals with a Cartesian choice of @@ -12528,6 +12555,8 @@ classification = "A0210 (Algebra, set theory, and graph theory); A0220 (Group theory); A0270 (Computational techniques); A4265 (Nonlinear optics); C7320 (Physics and Chemistry)", + fjournal = "Computer Physics Communications", + journal-URL = "http://www.sciencedirect.com/science/journal/00104655", keywords = "Cartesian angular momentum coupling trees; Computer algorithms; Diagrammatic approach; Nonlinear optics; Recursive generation; SO(3); Tensor approach; TeX @@ -13331,6 +13360,29 @@ acknowledgement = ack-nhfb, } +@Book{Trzeciak:1995:WMP, + author = "Jerzy Trzeciak", + title = "Writing mathematical papers in {English}: a practical + guide", + publisher = "European Mathematical Society Publishing House, + Seminar for Applied Mathematics", + address = "Z{\"u}rich, Switzerland", + edition = "Revised", + pages = "49", + year = "1995", + ISBN = "3-03719-014-0", + ISBN-13 = "978-3-03719-014-2", + LCCN = "QA42 .T79 1995", + bibdate = "Mon Oct 28 16:58:40 MDT 2013", + bibsource = "fsz3950.oclc.org:210/WorldCat; + http://www.math.utah.edu/pub/tex/bib/master.bib; + http://www.math.utah.edu/pub/tex/bib/texbook3.bib", + URL = "http://www.ems-ph.org/books/book.php?proj_nr=34", + acknowledgement = ack-nhfb, + subject = "Mathematics; Authorship; Technical writing; Handbooks, + manuals, etc", +} + @Book{Tschichold:1928:NTH, author = "Jan Tschichold", title = "Die neue Typographie: ein Handbuch f{\"u}r diff --git a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib index d7d8397d261..6fe9c2e2561 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib @@ -15,7 +15,7 @@ %%% USA", %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", -%%% checksum = "55640 3073 11567 114103", +%%% checksum = "57009 3081 11517 114555", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -439,8 +439,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:07 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "Drivers which support \protect\verb|\special| commands which include CGM files.", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, @@ -459,8 +459,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -552,8 +552,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:09 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "Fig is a public domain drawing program which runs Sunview or X Windows; Transfig is a set of programs to translate Fig format into a variety of formats, @@ -668,8 +668,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:10 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "Picture macros which are implemented with a combination of {\LaTeX} picture and {\EPIC}, and macros for including {\PS} pictures.", @@ -715,8 +715,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -746,8 +746,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:10 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "Discussion of standards for \verb|\special| commands to include external figure files.", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, @@ -787,8 +787,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -817,8 +817,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -849,8 +849,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 07 10:22:13 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -976,8 +976,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1016,8 +1016,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1778,8 +1778,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1796,8 +1796,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1829,8 +1829,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1874,8 +1874,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1892,8 +1892,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -1912,8 +1912,8 @@ ISSN = "0097-8930", LCCN = "????", bibdate = "Sat Dec 21 15:50:08 MST 1996", - bibsource = "Compendex database", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", + bibsource = "Compendex database; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "Juno is a system that harmoniously integrates a language for describing pictures with a what-you-see-is-what-you-get image editor. Two of @@ -1965,8 +1965,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 07 10:22:16 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2022,10 +2022,16 @@ month = oct, year = "1995", CODEN = "CPHCBZ", + DOI = "http://dx.doi.org/10.1016/0010-4655(95)90137-S", ISSN = "0010-4655 (print), 1879-2944 (electronic)", - bibdate = "Sat Dec 21 15:45:22 MST 1996", - bibsource = "Compendex database", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", + ISSN-L = "0010-4655", + bibdate = "Mon Feb 13 21:29:59 MST 2012", + bibsource = "Compendex database; + ftp://ftp.math.utah.edu/pub/tex/bib/texgraph.bib; + http://www.math.utah.edu/pub/bibnet/authors/f/feynman-richard-p.bib; + http://www.math.utah.edu/pub/tex/bib/compphyscomm1990.bib; + http://www.math.utah.edu/pub/tex/bib/texbook3.bib; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "feynMF is a {\LaTeX} package for easy drawing of professional quality Feynman diagrams with METAFONT (or METAPOST). feynMF lays out most diagrams satisfactorily @@ -2037,6 +2043,8 @@ affiliation = "Technische Hochschule Darmstadt", affiliationaddress = "Darmstadt, Ger", classification = "723; 723.1.1; 723.5; 902.1; 921.4; 931.4", + fjournal = "Computer Physics Communications", + journal-URL = "http://www.sciencedirect.com/science/journal/00104655", keywords = "Algorithms; Computer graphics; Computer programming languages; Computer software; Drawing (graphics); Feynman diagrams; Graph theory; latex (programming @@ -2058,8 +2066,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 07 10:22:23 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2089,8 +2097,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:27 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2107,8 +2115,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:29 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2124,8 +2132,8 @@ CODEN = "SPEXBL", ISSN = "0038-0644 (print), 1097-024X (electronic)", bibdate = "Sat Sep 18 18:25:59 MDT 1999", - bibsource = "http://www3.interscience.wiley.com/journalfinder.html", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", + bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib; + http://www3.interscience.wiley.com/journalfinder.html", URL = "http://www3.interscience.wiley.com/cgi-bin/abstract?ID=63501203; http://www3.interscience.wiley.com/cgi-bin/fulltext?ID=63501203&PLACEBO=IE.pdf", acknowledgement = ack-nhfb, @@ -2204,8 +2212,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -2236,8 +2244,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 07 10:22:30 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2290,8 +2298,8 @@ ISSN = "0896-3207", bibdate = "Sat Jul 5 17:27:22 MDT 2003", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", URL = "http://ctan.tug.org/tex-archive/graphics/metapost/contrib/macros/3d/doc/paper1997corrected.pdf", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -2308,8 +2316,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:30 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2326,8 +2334,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -2344,8 +2352,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -2479,8 +2487,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 07 10:22:30 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb # " and " # ack-spqr, } @@ -2529,8 +2537,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:30 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "Describes BM2FONT, a program to turn bitmap pictures (e.g.\ TIFF) into PK files for use by {\TeX}, with some notes on halftoning.", @@ -2568,8 +2576,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -2788,8 +2796,8 @@ ISSN = "0896-3207", bibdate = "Sat Feb 20 18:54:33 MST 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", acknowledgement = ack-bnb # " and " # ack-nhfb, } @@ -2832,8 +2840,8 @@ ISSN = "0896-3207", bibdate = "Wed Apr 7 10:22:30 1999", bibsource = "http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat; + http://www.math.utah.edu/pub/tex/bib/texgraph.bib; http://www.math.utah.edu/pub/tex/bib/tugboat.bib", - bibsource = "http://www.math.utah.edu/pub/tex/bib/texgraph.bib", abstract = "METAPLOT is a program which translates files describing vector graphics (HPGL) into {\MF} code; this code is used to generate a figure as a single character diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index c3403dcc7ef..2389ae95bc4 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -4814,6 +4814,7 @@ sub check_runfiles { |kinsoku\.tex |language\.dat |language\.def + |local\.mf |m-tex4ht\.tex |metatex\.tex |.*-noEmbed\.map diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index bfd765dd211..6acc74f61f8 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{2013-09-11.11} +\def\texinfoversion{2014-02-06.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -1138,10 +1138,12 @@ output) for that.)} \ifpdf % - % Color manipulation macros based on pdfcolor.tex, + % Color manipulation macros using ideas from pdfcolor.tex, % except using rgb instead of cmyk; the latter is said to render as a % very dark gray on-screen and a very dark halftone in print, instead - % of actual black. + % of actual black. The dark red here is dark enough to print on paper as + % nearly black, but still distinguishable for online viewing. We use + % black by default, though. \def\rgbDarkRed{0.50 0.09 0.12} \def\rgbBlack{0 0 0} % @@ -1251,10 +1253,9 @@ output) for that.)} % used to mark target names; must be expandable. \def\pdfmkpgn#1{#1} % - % by default, use a color that is dark enough to print on paper as - % nearly black, but still distinguishable for online viewing. - \def\urlcolor{\rgbDarkRed} - \def\linkcolor{\rgbDarkRed} + % by default, use black for everything. + \def\urlcolor{\rgbBlack} + \def\linkcolor{\rgbBlack} \def\endlink{\setcolor{\maincolor}\pdfendlink} % % Adding outlines to PDF; macros for calculating structure of outlines @@ -2574,37 +2575,21 @@ end \let\file=\code \let\option=\code -% @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. -% (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}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \code{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} +% @uref (abbreviation for `urlref') aka @url 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. + +% TeX-only option to allow changing PDF output to show only the second +% arg (if given), and not the url (which is then just the link target). +\newif\ifurefurlonlylink -% This \urefbreak definition is the active one. +% The main macro is \urefbreak, which allows breaking at expected +% places within the url. (There used to be another version, which +% didn't support automatic breaking.) \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 @@ -2613,12 +2598,19 @@ end \ifdim\wd0 > 0pt \unhbox0 % third arg given, show only that \else - \setbox0 = \hbox{\ignorespaces #2}% + \setbox0 = \hbox{\ignorespaces #2}% look for second arg \ifdim\wd0 > 0pt \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it + \ifurefurlonlylink + % PDF plus option to not display url, show just arg + \unhbox0 + \else + % PDF, normally display both arg and url for consistency, + % visibility, if the pdf is eventually used to print, etc. + \unhbox0\ (\urefcode{#1})% + \fi \else - \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \unhbox0\ (\urefcode{#1})% DVI, always show arg and url \fi \else \urefcode{#1}% only url given, so show it @@ -2658,8 +2650,10 @@ end % 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\urefprestretchamount{.13em} +\def\urefpoststretchamount{.1em} +\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax} +\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax} % \def\urefcodeamp{\urefprestretch \&\urefpoststretch} \def\urefcodedot{\urefprestretch .\urefpoststretch} @@ -3691,7 +3685,7 @@ end \parskip=\smallskipamount \ifdim\parskip=0pt \parskip=2pt \fi % - % Try typesetting the item mark that if the document erroneously says + % Try typesetting the item mark so that if the document erroneously says % something like @itemize @samp (intending @table), there's an error % right away at the @itemize. It's not the best error message in the % world, but it's better than leaving it to the @item. This means if @@ -4657,6 +4651,16 @@ end \definedummyword\verb \definedummyword\w \definedummyword\xref + % + % Consider: + % @macro mkind{arg1,arg2} + % @cindex \arg2\ + % @end macro + % @mkind{foo, bar} + % The space after the comma will end up in the temporary definition + % that we make for arg2 (see \parsemargdef ff.). We want all this to be + % expanded for the sake of the index, so we end up just seeing "bar". + \let\xeatspaces = \eatspaces } % \indexnofonts is used when outputting the strings to sort the index @@ -6587,9 +6591,13 @@ end % @raggedright does more-or-less normal line breaking but no right -% justification. From plain.tex. +% justification. From plain.tex. Don't stretch around special +% characters in urls in this environment, since the stretch at the right +% should be enough. \envdef\raggedright{% - \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax + \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax + \def\urefprestretchamount{0pt}% + \def\urefpoststretchamount{0pt}% } \let\Eraggedright\par @@ -7482,7 +7490,7 @@ end % Parse the optional {params} list. Set up \paramno and \paramlist % so \defmacro knows what to do. Define \macarg.BLAH for each BLAH -% in the params list to some hook where the argument si to be expanded. If +% in the params list to some hook where the argument is to be expanded. If % there are less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be % defined `a la TeX in the macro body. @@ -8344,6 +8352,7 @@ end \gdef\footnote{% \let\indent=\ptexindent \let\noindent=\ptexnoindent + % \global\advance\footnoteno by \@ne \edef\thisfootno{$^{\the\footnoteno}$}% % @@ -8367,6 +8376,11 @@ end % \gdef\dofootnote{% \insert\footins\bgroup + % + % Nested footnotes are not supported in TeX, that would take a lot + % more work. (\startsavinginserts does not suffice.) + \let\footnote=\errfootnote + % % We want to typeset this text as a normal paragraph, even if the % footnote reference occurs in (for example) a display environment. % So reset some parameters. @@ -8404,13 +8418,19 @@ end } }%end \catcode `\@=11 +\def\errfootnote{% + \errhelp=\EMsimple + \errmessage{Nested footnotes not supported in texinfo.tex, + even though they work in makeinfo; sorry} +} + % In case a @footnote appears in a vbox, save the footnote text and create % the real \insert just after the vbox finished. Otherwise, the insertion % would be lost. % Similarly, if a @footnote appears inside an alignment, save the footnote % text to a box and make the \insert when a row of the table is finished. % And the same can be done for other insert classes. --kasal, 16nov03. - +% % Replace the \insert primitive by a cheating macro. % Deeper inside, just make sure that the saved insertions are not spilled % out prematurely. |