sync

git-svn-id: svn://tug.org/texlive/trunk@28549 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 48 insertions, 41 deletions

diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
index fdf0136b938..2106f242fec 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.36",
-%%%     date            = "26 May 2012",
-%%%     time            = "15:20:01 MDT",
+%%%     version         = "3.37",
+%%%     date            = "13 December 2012",
+%%%     time            = "17:52:21 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        = "52982 15313 62804 611473",
+%%%     checksum        = "02325 15314 62803 611533",
 %%%     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.36, the year coverage looks
+%%%                        At version 3.37, the year coverage looks
 %%%                        like this:
 %%%
 %%%                             1007 (   1)    1343 (   0)    1679 (   0)
@@ -196,7 +196,7 @@
 # "\ifx \undefined \pdfTeX \def \pdfTeX {pdf\TeX}\fi"
 # "\def \toenglish #1\endtoenglish{[{\em English:} #1\unskip]} "
 # "\hyphenation{
-		An-wen-der-ver-ei-ni-gung
+                An-wen-der-ver-ei-ni-gung
                 Bie-mes-der-fer
                 Co-lo-phon
                 Deutsch-spra-chi-ge
@@ -3644,15 +3644,16 @@
 }
 
 @InProceedings{daSilva:2005:SAR,
-  author =       "A. C. B. da Silva and de Oliveira. J. B. S and F. Mano
-                 and T. M. and T. B. Silva and Meirelles L. L. and F. R.
-                 Meneguzzi and F. Giannetti",
+  author =       "Ana Cristina B. da Silva and Joao B. S. de Oliveira
+                 and Fernando T. M. Mano and Thiago B. Silva and
+                 Leonardo L. Meirelles and Felipe R. Meneguzzi and Fabio
+                 Giannetti",
   title =        "Support for arbitrary regions in {XSL-FO}",
   crossref =     "King:2005:DPA",
   pages =        "64--73",
   year =         "2005",
   DOI =          "http://dx.doi.org/10.1145/1096601.1096622",
-  bibdate =      "Sat May 26 15:10:23 2012",
+  bibdate =      "Thu Dec 13 17:55:03 2012",
   bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
   acknowledgement = ack-nhfb,
 }
@@ -13732,7 +13733,7 @@
   abstract =     "Since its first edition was published in 1956, this
                  book has been recognised as a classic work, and has
                  become a basic tool for the practising book designer.
-                 \missing{} Writing for authors, booksellers,
+                 \ldots{} Writing for authors, booksellers,
                  librarians, and the general reader, as well as for
                  teachers and students of printing design and for
                  publishers and printers, the author assumes no
@@ -13746,7 +13747,7 @@
                  designer, of computer-centered digital
                  photo-composition, based on his first-hand experience
                  as a printer and typographer, is of particular interest
-                 and value. \missing{} The third edition has been
+                 and value. \ldots{} The third edition has been
                  completely rewritten to cover innovations in book
                  production tendencies and techniques over the last
                  twenty years, in the light of the author's continued
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib
index 4111dcc5df2..229270dca6a 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.05",
-%%%     date            = "02 December 2011",
-%%%     time            = "06:14:14 MDT",
+%%%     version         = "2.06",
+%%%     date            = "13 December 2012",
+%%%     time            = "17:57:29 MST",
 %%%     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        = "58185 2907 11060 102372",
+%%%     checksum        = "17931 2907 11060 102369",
 %%%     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.05, the year coverage looked
+%%%                        At version 2.06, the year coverage looked
 %%%                        like this:
 %%%
 %%%                             1967 (   1)    1980 (   1)    1993 (   0)
@@ -2403,7 +2403,7 @@
 
 @Article{Spivak:TB10-2-164-165,
   author =       "Michael Spivak and Michael Ballantyne and Yoke Lee",
-  title =        "{{HI-\TeX\ cutting \& pasting}}",
+  title =        "{HI-\TeX} cutting \& pasting",
   journal =      j-TUGboat,
   volume =       "10",
   number =       "2",
diff --git a/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib b/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib
index c9102a7c6b3..c59d207efd8 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib
@@ -2,9 +2,9 @@
 %%% ====================================================================
 %%%  BibTeX-file{
 %%%     author          = "Nelson H. F. Beebe",
-%%%     version         = "1.37",
-%%%     date            = "29 November 2011",
-%%%     time            = "17:09:47 MDT",
+%%%     version         = "1.40",
+%%%     date            = "15 December 2012",
+%%%     time            = "09:28:31 MST",
 %%%     filename        = "tugboat.bib",
 %%%     address         = "University of Utah
 %%%                        Department of Mathematics, 110 LCB
@@ -14,7 +14,7 @@
 %%%     telephone       = "+1 801 581 5254",
 %%%     FAX             = "+1 801 581 4148",
 %%%     URL             = "http://www.math.utah.edu/~beebe",
-%%%     checksum        = "59482 46550 158739 1604129",
+%%%     checksum        = "20460 46550 158739 1604169",
 %%%     email           = "beebe at math.utah.edu, beebe at acm.org,
 %%%                        beebe at computer.org (Internet)",
 %%%     codetable       = "ISO/ASCII",
@@ -26,7 +26,7 @@
 %%%                        TUGboat (ISSN 0896-3207, LCCN Z253.4.T47T83),
 %%%                        the Communications of the TeX Users Group.
 %%%
-%%%                        At version 1.37, the year coverage looked
+%%%                        At version 1.40, the year coverage looked
 %%%                        like this:
 %%%
 %%%                             1980 (  11)    1991 ( 190)    2002 (  71)
@@ -10491,9 +10491,9 @@
   acknowledgement = ack-bnb # " and " # ack-nhfb,
 }
 
-@Article{Boston:TB8-2-220,
-  author =       "Boston and Mass. and 22--24 October 1987",
-  title =        "{PROTEXT IV}",
+@Article{Anonymou:TB8-2-220,
+  author =       "Anonymous",
+  title =        "{PROTEXT IV, Boston, Mass., 22--24 October 1987}",
   journal =      j-TUGboat,
   volume =       "8",
   number =       "2",
@@ -10507,9 +10507,9 @@
   acknowledgement = ack-bnb # " and " # ack-nhfb,
 }
 
-@Article{Munster:TB8-2-221,
-  author =       "University of M{\"u}nster and 8--9 October 1987",
-  title =        "{6th German \TeX\ meeting}",
+@Article{Anonymous:TB8-2-221,
+  author =       "Anonymous",
+  title =        "{6th German \TeX\ meeting, University of M{\"u}nster, 8--9 October 1987}",
   journal =      j-TUGboat,
   volume =       "8",
   number =       "2",
@@ -17152,7 +17152,7 @@
 
 @Article{Mittelbach:TB11-3-337,
   author =       "Frank Mittelbach",
-  title =        "{E-{\TeX}: Guidelines for future {\TeX}}",
+  title =        "{E-{\TeX}}: Guidelines for future {\TeX} extensions",
   journal =      j-TUGboat,
   volume =       "11",
   number =       "3",
@@ -17160,7 +17160,7 @@
   month =        sep,
   year =         "1990",
   ISSN =         "0896-3207",
-  bibdate =      "Fri Jul 13 10:24:20 MDT 2007",
+  bibdate =      "Wed Nov 28 17:08:08 2012",
   bibsource =    "ftp://ftp.math.utah.edu/pub/tex/bib/tugboat.bib;
                  http://www.math.utah.edu/pub/tex/bib/index-table-t.html#tugboat",
   acknowledgement = ack-bnb # " and " # ack-nhfb,
@@ -35517,7 +35517,7 @@
 }
 
 @Article{Grimm:TB20-3-317,
-  author =       "Prof. Alban Grimm",
+  author =       "Alban Grimm",
   title =        "{{Text of \,{\rm The Apocalypse\/} as graphics}}",
   journal =      j-TUGboat,
   volume =       "20",
@@ -40813,9 +40813,9 @@
   acknowledgement = ack-bnb # " and " # ack-nhfb,
 }
 
-@Article{conference:TB24-1-c3,
-  author =       "TUG 2004 conference",
-  title =        "{Xanthi, Greece, August 30--September 3, 2004}",
+@Article{Anonymous:TB24-1-c3,
+  author =       "Anonymous",
+  title =        "{TUG 2004 conference, Xanthi, Greece, August 30--September 3, 2004}",
   journal =      j-TUGboat,
   volume =       "24",
   number =       "1",
@@ -40828,9 +40828,9 @@
   acknowledgement = ack-bnb # " and " # ack-nhfb,
 }
 
-@Article{conference:TB24-1-154,
-  author =       "TUG 2005 conference",
-  title =        "{Wuhan, China, August 23--25, 2005}",
+@Article{Anonymous:TB24-1-154,
+  author =       "Anonymous",
+  title =        "{TUG 2005 conference, Wuhan, China, August 23--25, 2005}",
   journal =      j-TUGboat,
   volume =       "24",
   number =       "1",
@@ -41849,7 +41849,7 @@
   author =       "Fabien Dagnat and Ronan Keryell and Laura Barrero
                  Sastre and Emmanuel Donin de Rosi{\`e}re and Nicolas
                  Torneri",
-  title =        "{{\sl {BibTeX\raise.25ex\hbox{\sl c++}}}}: Toward
+  title =        "{{\sl {BibTeX{\raise.25ex\hbox{\sl c++}}}}}: Toward
                  higher-order {{\sl BibTeX}}ing",
   journal =      j-TUGboat,
   volume =       "24",
diff --git a/Master/texmf/scripts/texlive/NEWS b/Master/texmf/scripts/texlive/NEWS
index 9b9bd01e02e..5cd9121f29c 100644
--- a/Master/texmf/scripts/texlive/NEWS
+++ b/Master/texmf/scripts/texlive/NEWS
@@ -1,6 +1,9 @@
 (This file public domain.  Originally written by Norbert Preining and
 Karl Berry, 2010.)
 
+<li>new tlperl (version 5.16.2) for Windows, compiled without
+    optimization and with debugging
+
 <p><b>tlmgr revision 28216 (released 09nov12):</b><br>
 <li>menu shortcuts are installed unconditionally, the desktop_integration
     option only controls shortcuts on the desktop (W32)
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 007c99d153e..5470ae1b753 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -35,6 +35,8 @@ use TeXLive::TLPDB;
 my $exclude_pdf = {
      # 14nov11 author cannot fix:
   'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1,
+     # 15dec12 derekn says will be fixed in next xpdf after 3.03:
+  'texmf-dist/doc/latex/ocgx/demo-ocgx.pdf' => 1,
   'texmf/dvips/tetex/config.pdf' => 2, # not a PDF file
 };
 
@@ -155,7 +157,7 @@ my $exclude_tfm = { '*base*' => 'texmf-dist/fonts/tfm',
   'public/chess/' => 1,		# original has extra bytes, not worth fixing
   'public/cmcyr/' => 1,
   'public/dozenal/' => 1,	# wrote author 31oct12
-  'public/gfsbodoni/' => 1,
+  'public/gfsbodoni/' => 1,	# wrote author 12dec12
   'public/malayalam/' => 1,
   'public/japanese-otf/' => 1,	# japanese tfm's
   'public/japanese-otf-uptex/' => 1, # japanese tfm's
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index 45d7564d799..a8f0da92d1f 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -15,7 +15,7 @@
 
 # Basic config files.
 ##(until needed) Master/texmf/web2c/texmf.cnf  Build/source/texk/kpathsea/
-Master/texmf/web2c/fmtutil.cnf Build/source/texk/tetex/
+Master/texmf/web2c/fmtutil.cnf Build/source/texk/texlive/linked_scripts/tetex/fmtutil.cnf
 #
 # Platform detection for biber and tests:
 Master/tlpkg/TeXLive/TLUtils.pm  Build/source/utils/biber/TeXLive/
diff --git a/Master/tlpkg/tlpsrc/cs.tlpsrc b/Master/tlpkg/tlpsrc/cs.tlpsrc
index bc16563f3cc..a19f876f4d2 100644
--- a/Master/tlpkg/tlpsrc/cs.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cs.tlpsrc
@@ -1,2 +1,3 @@
+catalogue cspsfonts
 execute addMixedMap csother.map
 execute addMixedMap cstext.map