separate full file name for texlinks from invocation; sync other stuff

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

6 files changed, 65 insertions, 15 deletions

diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS
index 9909b5aae72..9f07c014e24 100644
--- a/Build/source/texk/kpathsea/NEWS
+++ b/Build/source/texk/kpathsea/NEWS
@@ -1,5 +1,8 @@
 This file records noteworthy changes.  (Public domain.)
 
+(for TeX Live 2015)
+* kpsewhich --help outputs more information the search paths.
+
 6.2.0 (for TeX Live 2014)
 * mktexlsr outputs normal msgs to stdout instead of stderr.
 * do not ignore a non-terminated last line of a file.
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index bbe3bc5e2eb..a44c1057b5f 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-27  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (texlinks_prog): separate out from $(run_texlinks).
+
 2014-07-17  Karl Berry  <karl@tug.org>
 
 	* tcfmgr,
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index 8c3bfabd78a..a457eeffab3 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/
 ##
-## Copyright (C) 2013 Karl Berry <tex-live@tug.org>
+## Copyright 2013-2014 Karl Berry <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## Build lists of scripts.
@@ -120,9 +120,13 @@ EXTRA_DIST += updmap.help2man
 ## fmtutil.cnf file to use for the sake of distro builds.
 ## We pass along the executable extension for the sake of cygwin, so we
 ## don't create dangling symlinks there (even though they work).
-run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
+#
+texlinks_prog = $(DESTDIR)$(bindir)/texlinks
+#
+run_texlinks = $(texlinks_prog) -v
 	-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
 	-e "$(EXEEXT)" $(DESTDIR)$(bindir)
+#
 run-texlinks:
 if !WIN32
 	PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index e4e042f14ef..bdc9ba12439 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -314,10 +314,10 @@ dist_texconfig_DATA = tcfmgr.map
 web2cdir = $(datarootdir)/texmf-dist/web2c
 dist_web2c_DATA = fmtutil.cnf
 updmap_dir = $(top_srcdir)/linked_scripts/texlive
-run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-	-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-	-e "$(EXEEXT)" $(DESTDIR)$(bindir)
-
+#
+texlinks_prog = $(DESTDIR)$(bindir)/texlinks
+#
+run_texlinks = $(texlinks_prog) -v
 all_shell_scripts = $(shell_scripts) $(sh_scripts)
 all: all-am
 
@@ -852,6 +852,9 @@ xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
 	  $(updmap_dir)/updmap.pl >/tmp/$@
 
 .PHONY: run-texlinks
+	-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
+	-e "$(EXEEXT)" $(DESTDIR)$(bindir)
+#
 run-texlinks:
 @WIN32_FALSE@	PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
 
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
index b564a0dbac0..158b61bbd60 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.54",
-%%%     date            = "03 June 2014",
-%%%     time            = "15:12:21 MDT",
+%%%     version         = "3.55",
+%%%     date            = "09 July 2014",
+%%%     time            = "10:56:36 MDT",
 %%%     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        = "08948 16853 68962 677066",
+%%%     checksum        = "36494 16888 69083 678250",
 %%%     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.54, the year coverage looks
+%%%                        At version 3.55, the year coverage looks
 %%%                        like this:
 %%%
 %%%                             1928 (   1)    1957 (   0)    1986 (  42)
@@ -67,12 +67,12 @@
 %%%                             1952 (   0)    1981 (  12)    2010 (   4)
 %%%                             1953 (   0)    1982 (  21)    2011 (   6)
 %%%                             1954 (   0)    1983 (  24)    2012 (   6)
-%%%                             1955 (   0)    1984 (  15)    2013 (   3)
+%%%                             1955 (   0)    1984 (  15)    2013 (   5)
 %%%                             1956 (   0)    1985 (  36)
 %%%                             19xx (   2)
 %%%
 %%%                             Article:        194
-%%%                             Book:           308
+%%%                             Book:           310
 %%%                             Booklet:         12
 %%%                             InCollection:    11
 %%%                             InProceedings:  125
@@ -85,7 +85,7 @@
 %%%                             TechReport:      60
 %%%                             Unpublished:      2
 %%%
-%%%                             Total entries:  798
+%%%                             Total entries:  800
 %%%
 %%%                        The ISBN and ISSN fields will be printed if
 %%%                        the is-alpha.bst or is-plain.bst style
@@ -9425,6 +9425,23 @@
   acknowledgement = ack-nhfb,
 }
 
+@Book{Knuth:2013:EK,
+  author =       "Donald Ervin Knuth and Edgar G. Daylight",
+  title =        "Essential {Knuth}",
+  publisher =    "Lonely Scholar",
+  address =      "????",
+  pages =        "94",
+  year =         "2013",
+  ISBN =         "94-91386-03-4",
+  ISBN-13 =      "978-94-91386-03-9",
+  LCCN =         "????",
+  bibdate =      "Sat Jun 28 19:02:32 MDT 2014",
+  bibsource =    "fsz3950.oclc.org:210/WorldCat;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  acknowledgement = ack-nhfb,
+  author-dates = "1938--",
+}
+
 @Article{Kohlhase:2008:USM,
   author =       "Michael Kohlhase",
   title =        "Using {\LaTeX} as a Semantic Markup Format",
@@ -10418,6 +10435,24 @@
   keywords =     "Computerized typesetting; LaTeX (Computer file)",
 }
 
+@Book{Liu:2013:LRM,
+  author =       "Haiyang `Leo' Liu",
+  title =        "{\LaTeX} Ru men. ({Mandarin Chinese}) [Introduction to
+                 {\LaTeX}]",
+  publisher =    "Dian zi gong ye chu ban she",
+  address =      "Beijing, China",
+  pages =        "xiv + 566",
+  year =         "2013",
+  ISBN =         "7-121-20208-5",
+  ISBN-13 =      "978-7-121-20208-7",
+  LCCN =         "????",
+  bibdate =      "Sat Jun 28 19:05:20 MDT 2014",
+  bibsource =    "fsz3950.oclc.org:210/WorldCat;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  acknowledgement = ack-nhfb,
+  language =     "Mandarin Chinese",
+}
+
 @InProceedings{Lok:2004:EVB,
   author =       "Simon Lok and Steven Feiner and Gary Ngai",
   editor =       "Nuno {Jardim Nunes} and Charles Rich",
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 20f78344126..c4b4f34f382 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -93,7 +93,8 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1',
   'public/cs/' => 1,
   'public/doublestroke/' => 1,
   'public/epiolmec/' => 1,
-  'public/esstix/' => 1,  # 12may11 author fixed some, others will remain
+  'public/ebgaramond/' => 1,	# 9jul14 bug in fontforge/t1lint, not reported
+  'public/esstix/' => 1,	# 12may11 author fixed some, others will remain
   'public/ethiop-t1/' => 1,
   'public/eurosym/' => 1,
   'public/fbb/' => 1,		# 23aug13 bluevalues, not fixable