sync

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

5 files changed, 497 insertions, 106 deletions

diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 6c30198cff2..aca30855ad5 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,11 +1,12 @@
+# $Id: TLUtils.pm 49855 2019-01-28 22:47:02Z karl $
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2018 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2019 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 49226 $';
+my $svnrev = '$Revision: 49855 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -3475,12 +3476,13 @@ sub tlwarn {
 
 =item C<tldie ($str1, $str2, ...)>
 
-Uses C<tlwarn> to issue a warning, then exits with exit code 1.
+Uses C<tlwarn> to issue a warning for @_ preceded by a newline, then
+exits with exit code 1.
 
 =cut
 
 sub tldie {
-  tlwarn(@_);
+  tlwarn("\n", @_);
   if ($::gui_mode) {
     Tk::exit(1);
   } else {
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 3356ed09dd9..0f94c5603aa 100755
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
 
 
-local svnrevision = string.match("$Revision: 48877 $", "%d+") or "0"
-local svndate     = string.match("$Date: 2018-10-10 09:25:30 +0200 (Wed, 10 Oct 2018) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 49485 $", "%d+") or "0"
+local svndate     = string.match("$Date: 2018-12-23 16:28:08 +0100 (Sun, 23 Dec 2018) $", "[-%d]+") or "2009-12-04"
 local bannerstr   = "runscript wrapper utility (rev. " ..
                     svnrevision .. ", " .. svndate .. ")\n" .. 
                     "usage:   runscript script-name [arguments]\n" ..
@@ -31,11 +31,12 @@ local helpstr = [[
     installed packages.  This should minimize problems when using them 
     with TeX Live. 
     
-    First, make sure that there is an interpreter program available on 
-    your system for the script you want to use.  Interpreters for Perl 
-    and Lua are bundled with TeX Live, all others have to be installed 
-    independently.  Lua scripts are the most efficient to run, so if you
-    consider writing a new script, that would be the recommended choice.
+    First, make sure that there is an interpreter program available
+    on your system for the script you want to use.  Interpreters for
+    Perl, Lua and Tcl/Tk (GUI scripts only) are bundled with TeX
+    Live, all others have to be installed independently.  Lua
+    scripts are the most efficient to run, so if you consider
+    writing a new script, that would be the recommended choice.
     
     The following script types and their file extensions are currently 
     supported and searched in that order:
@@ -44,7 +45,7 @@ local helpstr = [[
       Perl     (.pl)               --  included
       Ruby     (.rb)               --  requires installation
       Python   (.py)               --  requires installation
-      Tcl      (.tcl)              --  requires installation
+      Tcl      (.tcl)              --  included (GUI scripts only)
       Java     (.jar)              --  requires installation
       VBScript (.vbs)              --  part of Windows
       JScript  (.js)               --  part of Windows
@@ -120,7 +121,7 @@ local docstr = [[
     batch scripts, of course).  If the located script happens to be 
     a (tex)lua script, it is loaded and called internally from within 
     this script, i.e. no new process is spawned.  Execution is done 
-    using a protected call, so any compile or runtime errors are catched.
+    using a protected call, so any compile or runtime errors are caught.
     
   Source files
   
@@ -272,11 +273,29 @@ local docstr = [[
           https://tug.org/pipermail/tex-live/2018-June/041922.html
     2018/10/10
         - support cluttex scripts
+    2018/11/08
+        - use included tcltk interpreter
 
 ]]
 
 -- HELPER SUBROUTINES --
 
+local TEXDIR
+local guimode
+
+local function show_error(msg)
+  if guimode then
+    os.setenv('RUNSCRIPT_ERROR_MESSAGE', msg)
+    if lfs.isfile(TEXDIR..'/tlpkg/tltcl/tclkit.exe') and
+        lfs.isfile(TEXDIR..'/tlpkg/tltcl/gui_err.tcl') then
+      os.spawn{TEXDIR..'/tlpkg/tltcl/tclkit.exe',
+          TEXDIR..'/tlpkg/tltcl/gui_err.tcl'}
+    end
+  else
+    io.stderr:write(msg, '\n')
+  end
+end
+
 -- quotes string with spaces
 local function _q(str)
   str = string.gsub(str, '"', '') -- disallow embedded double quotes
@@ -421,13 +440,13 @@ local function gettexmfdist()
   str = string.gsub(str, "\\","/")
   str = string.reverse(str)
   local a, b
--- remove /runscript.dll
+-- remove '/runscript.dll'
   a, b = string.find(str, '/', 1, true)
   str = string.sub(str,a+1)
--- remove /win32
+-- remove '/win32'
   a, b = string.find(str, '/', 1, true)
   str = string.sub(str,a+1)
--- remove /bin
+-- remove '/bin'
   a, b = string.find(str, '/', 1, true)
   str = string.sub(str,a+1)
   str = string.reverse(str)
@@ -461,13 +480,57 @@ end
 
 local function MAIN_CHUNK()
 
+--[[
+
+OVERVIEW OF MAIN_CHUNK
+
+We start out with a lot of housekeeping, especially with respect to
+perl and ghostscript: if we are going to use the built-in versions,
+then the search path and other environment variables must be set or
+unset to make these findable and working right.
+
+Next we compose an ARGV table for os.spawn, unless the script turns
+out to be a [tex]lua script; see further down this comment block.
+
+The parameter table ARGV can have the following elements (see the
+luatex manual on os.exec and os.spawn):
+
+- ARGV[0]: the full path to the interpreter
+- ARGV[1]: the filename part of the interpreter. The interpreter choice
+  depends on the detected script extension and also on gui mode.
+- ARGV[2]: progfulname, the full path to the script
+- ARGV[3]: argline, i.e. the unparsed arguments for the script.
+  This is normally the last argument passed to runscript.tlu.
+  See the actual code for when this is not the case.
+
+ARGV[0] gets priority over ARGV[1] if it is present.
+
+After everything has been set up, a call os.spawn(ARGV) runs the
+right program with the right arguments.
+
+But in case the script to be run is a texlua script, we run the script
+in the current texlua process using the dofile function. The original arg
+argument table may have been modified before then.
+
+Some variables:
+
+- ARGV, see above
+- arg, the texlua argument table of runscript.tlu
+- progname, the name under which [w]runscript.exe was called
+- progfullname, the full path of the script to be run. This variable
+  is introduced only after some special cases have been dealt with.
+- argline, unparsed arguments to the script; may get modified
+
+--]]
+
 -- set the system-default value for LC_CTYPE
 -- http://tug.org/pipermail/tex-live/2018-May/041628.html
 os.setlocale("", "ctype")
 
--- preprocess arguments
+-- preprocess arguments: arg[-1] => texlua.exe, arg[0] => scriptname
 
-local guimode = false
+-- guimode already declared local
+guimode = false
 local argline = ''
 -- check for the sentinel argment coming from the .exe stub 
 if arg[#arg-2] and ( string.sub(arg[#arg-2], -1) == '\n' ) then
@@ -546,7 +609,8 @@ local lua_binary = arg[k]
 kpse.set_program_name(lua_binary, progname)
 
 -- various dir-vars
-local TEXDIR = kpse.var_value('SELFAUTOPARENT')
+-- TEXDIR already declared local
+TEXDIR = kpse.var_value('SELFAUTOPARENT')
 -- local TEXMFDIST = kpse.var_value('TEXMFDIST')
 -- use a new function to obtain TEXMFDIST
 local TEXMFDIST = gettexmfdist()
@@ -660,18 +724,18 @@ end
 -- Adobe Reader crash case: make sure USERPROFILE is not "slashed"
 os.setenv("USERPROFILE", os.getenv("USERPROFILE"):gsub('/', '\\'))
 
--- extension to interpeter mapping
+-- extension to interpreter mapping
 
--- the extension is mapped to argv table
--- the command to execute is given as the first element of the table  
--- (it can be a whitespace separated list of names to try)
+-- the extension is mapped to an argument table.
+-- the command to execute is given as the first element of the table,
+-- which can be a whitespace separated list of names to try.
 local extension_map = {
   ['.bat'] = {'cmd', '/c', 'call'},
   ['.jar'] = {'java.exe', '-jar'},
   ['.pl' ] = {'perl.exe'},
   ['.py' ] = {'python.exe'},
   ['.rb' ] = {'ruby.exe'},
-  ['.tcl'] = {'tclsh.exe tclsh85.exe tclsh84.exe'},
+  ['.tcl'] = {'tclsh.exe tclsh86.exe tclsh85.exe tclkitsh.exe'},
   ['.vbs'] = {'cscript.exe', '-nologo'},
 }
 if guimode then
@@ -680,13 +744,14 @@ if guimode then
   extension_map['.pl' ][1] = 'wperl.exe '   .. extension_map['.pl' ][1]
   extension_map['.py' ][1] = 'pythonw.exe ' .. extension_map['.py' ][1]
   extension_map['.rb' ][1] = 'rubyw.exe '   .. extension_map['.rb' ][1]
-  extension_map['.tcl'][1] = 'wish.exe wish85.exe wish84.exe ' .. extension_map['.tcl'][1]
+  -- gui tcl shares no interpreters with non-gui tcl
+  extension_map['.tcl'] = {'wish.exe wish86.exe wish85.exe tclkit.exe'}
   extension_map['.vbs'][1] = 'wscript.exe ' .. extension_map['.vbs'][1]
 end
 extension_map['.cmd'] = extension_map['.bat']
 extension_map['.js']  = extension_map['.vbs']
 
--- set up argv table
+-- set up ARGV table
 
 local ARGV = nil
 
@@ -782,15 +847,40 @@ if not ARGV then
                        find_texmfscript(progname, extlist)
   os.setenv('TEXMF', nil)
   if progfullname == nil then
--- scripts in $TEXMFLOCAL etc. can't be found without the following
--- line !!
+    -- scripts in $TEXMFLOCAL etc. can't be found without the following
+    -- line !!
     kpse.set_program_name('runscript')
     progfullname = assert(find_texmfscript(progname, extlist))
   end
   local ext = string.match(string.lower(progfullname), '%.[^\\/.]*$') or ''
   if (ext == '.lua') or (ext == '.tlu') or (ext == '.texlua') then -- lua script
     arg[0] = progfullname
-  else
+  elseif (ext == '.tcl' and guimode) then -- tcl script; use built-in tclkit?
+    local try_extern_tcl =
+        (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_TCL') == '1') and
+        not is_restricted_progname
+    local TCLEXENAME, TCLEXE
+    if try_extern_tcl then
+      TCLEXENAME, TCLEXE = check_command(extension_map['.tcl'][1], PATH)
+    end
+    if try_extern_tcl and not TCLEXENAME then
+      local exttcl_warn = [[
+External Tcl missing or outdated. Please install a recent Tcl, or configure
+TeX Live to always use the builtin Tcl for gui scripts:
+  tlmgr conf texmf TEXLIVE_WINDOWS_TRY_EXTERNAL_TCL 0
+Meanwhile, continuing with built-in Tcl...
+]]
+      show_error(exttcl_warn)
+    else -- did find something
+      ARGV = {[0]=TCLEXE, TCLEXENAME}
+    end
+    if not TCLEXENAME then
+      ARGV = {[0]=TEXDIR..'/tlpkg/tltcl/tclkit.exe', 'tclkit.exe'}
+      PATH = prepend_path(PATH, TEXDIR:gsub('/','\\')..'\\tlpkg\\tltcl')
+    end
+    table.insert(ARGV, _q(progfullname:gsub('/','\\')))
+    if (argline and argline ~= '') then argline = '-- '..argline end
+  else -- not gui tcl or not tcl at all
     ARGV = extension_map[ext] or assert(shebang_to_argv(progfullname)) 
     -- [w|c]script, for one, mistakes a forward-slashed UNC script path
     -- for an option even when quoted
@@ -807,7 +897,7 @@ if ARGV then
   table.insert(ARGV, argline) -- pass through original arguments
   if string.find (table.concat(ARGV, ' '), 'perl.exe') and extperl_warn then
 
-    io.stderr:write(extperl_warn)
+    show_error(extperl_warn)
   end
   local ret = assert(os.spawn(ARGV))
   if ret ~= 0 then
@@ -815,8 +905,7 @@ if ARGV then
     local errormsg = string.format("%s:%d: command failed with exit code %d:\n%s",  
                                    dbginfo.short_src, dbginfo.currentline - 2, 
                                    ret, table.concat(ARGV, ' ') )
-    os.setenv('RUNSCRIPT_ERROR_MESSAGE', errormsg)
-    io.stderr:write(errormsg, '\n')
+    show_error(errormsg)
   end
   os.exit(ret)
 else -- must be a lua script
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
index aec232f6033..58a4967efaf 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
@@ -5,9 +5,9 @@
 %%% ====================================================================
 %%% BibTeX-file{
 %%%     author          = "Nelson H. F. Beebe",
-%%%     version         = "2.11",
-%%%     date            = "04 October 2016",
-%%%     time            = "08:04:41 MDT",
+%%%     version         = "2.12",
+%%%     date            = "08 January 2019",
+%%%     time            = "10:42:14 MST",
 %%%     filename        = "texbook2.bib",
 %%%     address         = "University of Utah
 %%%                        Department of Mathematics, 110 LCB
@@ -16,7 +16,7 @@
 %%%                        USA",
 %%%     telephone       = "+1 801 581 5254",
 %%%     FAX             = "+1 801 581 4148",
-%%%     checksum        = "52752 9786 36686 357107",
+%%%     checksum        = "51612 9860 36992 360656",
 %%%     email           = "beebe at math.utah.edu, beebe at acm.org,
 %%%                        beebe at computer.org (Internet)",
 %%%     codetable       = "ISO/ASCII",
@@ -32,7 +32,7 @@
 %%%                        printed if the is-alpha.bst or is-plain.bst
 %%%                        style files are used.
 %%%
-%%%                        At version 2.11, the year coverage looked
+%%%                        At version 2.12, the year coverage looked
 %%%                        like this:
 %%%
 %%%                             1985 (   1)    1996 (   5)    2007 (   1)
@@ -7408,14 +7408,31 @@
   address =      pub-SV:adr,
   pages =        "xvi + 460",
   year =         "2006",
-  ISBN =         "0-387-24196-5 , 0-387-28452-4 (e-book)",
+  ISBN =         "0-387-24196-5, 0-387-28452-4 (e-book)",
   ISBN-13 =      "978-0-387-24196-8, 978-0-387-28452-1 (e-book)",
   LCCN =         "T385 .S2434 2005",
-  bibdate =      "Tue Oct 25 17:30:56 2005",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook2.bib;
+  bibdate =      "Sat Jan 26 12:46:16 MST 2013",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/datacompression.bib;
+                 http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook2.bib;
                  z3950.loc.gov:7090/Voyager",
-  acknowledgement = ack-nhfb,
+  acknowledgement = ack-ds # " and " # ack-nhfb,
+  rawdata =      "Salomon, David (2006) {\it Curves and Surfaces for
+                 Computer Graphics}, New York, Springer.",
   subject =      "Computer graphics; Mathematical models",
+  tableofcontents = "1. Basic theory \\
+                 2. Linear interpolation \\
+                 3. Polynomial interpolation \\
+                 4. Hermite interpolation \\
+                 5. Spline interpolation \\
+                 6. B{\'e}zier approximation \\
+                 7. B-spline approximation \\
+                 8. Subdivision methods \\
+                 9. Sweep surfaces \\
+                 A. Conic sections \\
+                 B. Approximate circles \\
+                 C. Graphics gallery \\
+                 D. Mathematica notes",
 }
 
 @Book{Salomon:2005:FCS,
@@ -7472,12 +7489,69 @@
   year =         "2006",
   ISBN =         "1-84628-392-2",
   ISBN-13 =      "978-1-84628-392-5",
-  LCCN =         "????",
+  LCCN =         "T385 .S2439 2006",
   bibdate =      "Fri Aug 25 14:38:27 2006",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook2.bib;
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook2.bib;
+                 prodorbis.library.yale.edu:7090/voyager;
                  z3950.loc.gov:7090/Voyager",
   price =        "US\$59.95",
+  abstract =     "Computer graphics are part of everyone's lives via
+                 feature films, advertisements, computers, PDAs, mobile
+                 phones, and more. This book introduces perspective and
+                 discusses the mathematics of perspective. It also
+                 discusses nonlinear projections in depth, including the
+                 fisheye, panorama, and map projections used to enhance
+                 digital images.",
   acknowledgement = ack-nhfb,
+  shorttableofcontents = "1. Transformations \\
+                 2. Parallel projections \\
+                 3. Perspective projection \\
+                 4. Nonlinear projections \\
+                 A. Vector products \\
+                 B. Quaternions \\
+                 C. Color figures",
+  tableofcontents = "1: Transformations \\
+                 Introduction \\
+                 Two-Dimensional Transformations \\
+                 Three-Dimensional Coordinate Systems \\
+                 Three-Dimensional Transformations \\
+                 Transforming the Coordinate System \\
+                 2: Parallel Projections \\
+                 Orthographic Projections \\
+                 Axonometric Projections \\
+                 Oblique Projections \\
+                 3: Perspective Projection \\
+                 One Two Three \ldots{} Infinity \\
+                 History of Perspective \\
+                 Perspective in Curved Objects \\
+                 The Mathematics of Perspective \\
+                 General Perspective \\
+                 Transforming The Object \\
+                 Viewer At An Arbitrary Location \\
+                 Coordinate-Free Approach \\
+                 The Viewing Volume \\
+                 Stereoscopic Images \\
+                 Creating a Stereoscopic Image \\
+                 Viewing a Stereoscopic Image \\
+                 4: Nonlinear Projections \\
+                 False Perspective \\
+                 Fisheye Projection \\
+                 Circle Inversion \\
+                 Panoramic Projections \\
+                 Cylindrical Panoramic Projection \\
+                 Spherical Panoramic Projection \\
+                 Cubic Panoramic Projection \\
+                 Six-Point Perspective \\
+                 Other Panoramic Projections \\
+                 Panoramic Cameras \\
+                 Telescopic Projection \\
+                 Microscopic Projection \\
+                 Anamorphosis \\
+                 Map Projections \\
+                 A. Vector products \\
+                 B. Quaternions \\
+                 C. Color figures",
 }
 
 @Book{Salomon:2007:DCC,
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
index b5671a1ce24..acc8fc3106c 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.69",
-%%%     date            = "04 December 2018",
-%%%     time            = "16:31:52 MST",
+%%%     version         = "3.70",
+%%%     date            = "05 January 2019",
+%%%     time            = "17:12:44 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        = "34979 17881 73437 722450",
+%%%     checksum        = "41693 18059 74365 731828",
 %%%     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.69, the year coverage looks
+%%%                        At version 3.70, the year coverage looks
 %%%                        like this:
 %%%
 %%%                             1928 (   1)    1959 (   0)    1990 (  54)
@@ -51,8 +51,8 @@
 %%%                             1936 (   0)    1967 (   1)    1998 (   7)
 %%%                             1937 (   0)    1968 (   1)    1999 (  10)
 %%%                             1938 (   0)    1969 (   1)    2000 (   6)
-%%%                             1939 (   0)    1970 (   2)    2001 (   9)
-%%%                             1940 (   0)    1971 (   1)    2002 (   4)
+%%%                             1939 (   0)    1970 (   2)    2001 (  10)
+%%%                             1940 (   0)    1971 (   1)    2002 (   5)
 %%%                             1941 (   0)    1972 (   2)    2003 (  12)
 %%%                             1942 (   0)    1973 (   1)    2004 (  37)
 %%%                             1943 (   0)    1974 (   3)    2005 (  13)
@@ -73,7 +73,7 @@
 %%%                             1958 (   0)    1989 (  55)
 %%%                             19xx (   2)
 %%%
-%%%                             Article:        208
+%%%                             Article:        210
 %%%                             Book:           324
 %%%                             Booklet:         12
 %%%                             InCollection:    13
@@ -87,7 +87,7 @@
 %%%                             TechReport:      60
 %%%                             Unpublished:      2
 %%%
-%%%                             Total entries:  830
+%%%                             Total entries:  832
 %%%
 %%%                        The ISBN and ISSN fields will be printed if
 %%%                        the is-alpha.bst or is-plain.bst style
@@ -6077,7 +6077,7 @@
 @Book{Goossens:2008:LGC,
   editor =       "Michel Goossens and Frank Mittelbach and Sebastian
                  Rahtz and Denis Roegel and Herbert Vo{\ss}",
-  title =        "The {\LaTeX} graphics companion",
+  title =        "The {\LaTeX} Graphics Companion",
   publisher =    pub-AW,
   address =      pub-AW:adr,
   edition =      "Second",
@@ -6086,11 +6086,36 @@
   ISBN-13 =      "978-0-321-50892-8",
   LCCN =         "Z253.4.L38G663 2008",
   bibdate =      "Thu Sep 20 12:02:17 MDT 2007",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook3.bib;
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib;
                  z3950.bibsys.no:2100/BIBSYS",
   series =       "Addison-Wesley series on tools and techniques for
                  computer typesetting",
-  acknowledgement = ack-nhfb,
+  abstract =     "The LaTeX typesetting system remains a popular choice
+                 for typesetting a wide variety of documents, from
+                 papers, journal articles, and presentations, to books -
+                 especially those that include technical text or demand
+                 high-quality composition. This book is the most
+                 comprehensive guide to making illustrations in LaTeX
+                 documents, and it has been completely revised and
+                 expanded to include the latest developments in LaTeX
+                 graphics. The authors describe the most widely used
+                 packages and provide hundreds of solutions to the most
+                 commonly encountered LaTeX illustration problems.",
+  acknowledgement = ack-nhfb,
+  tableofcontents = "Graphics with LaTeX \\
+                 Standard LaTeX interfaces \\
+                 The METAFONT and METAPOST: TeX's mates \\
+                 METAPOST applications \\
+                 Harnessing PostScript inside LaTeX: PSTricks \\
+                 The main PSTricks packages \\
+                 The XY-pic package \\
+                 Applications in science, technique and medicine \\
+                 Preparing music scores \\
+                 Playing games \\
+                 The world of color \\
+                 Appendix A. Producing PDF from various sources \\
+                 Appendix B. LaTeX software and user group information",
 }
 
 @Article{Gourlay:1986:LMP,
@@ -7052,6 +7077,30 @@
   printermarks = "yes",
 }
 
+@Article{Hartley:2002:HA,
+  author =       "James Hartley",
+  title =        "Here's the Address: Improving Information in
+                 Abstracting Journals and Databases",
+  journal =      j-SOC-STUD-SCI,
+  volume =       "32",
+  number =       "4",
+  pages =        "637--638",
+  day =          "1",
+  month =        aug,
+  year =         "2002",
+  CODEN =        "SSSCDH",
+  DOI =          "https://doi.org/10.1177/0306312702032004007",
+  ISSN =         "0306-3127 (print), 1460-3659 (electronic)",
+  ISSN-L =       "0306-3127",
+  bibdate =      "Mon Dec 3 09:13:14 MST 2018",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/socstudsci.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  URL =          "https://journals.sagepub.com/doi/pdf/10.1177/0306312702032004007",
+  acknowledgement = ack-nhfb,
+  fjournal =     "Social Studies of Science",
+  journal-URL =  "http://sss.sagepub.com/content/by/year",
+}
+
 @Article{Hartz:1993:M,
   author =       "David Hartz",
   title =        "{MathType 3.0}",
@@ -10094,14 +10143,43 @@
   edition =      "Fourth",
   pages =        "xii + 597",
   year =         "2004",
-  ISBN =         "0-321-17385-6",
-  ISBN-13 =      "978-0-321-17385-0",
+  ISBN =         "0-321-17385-6 (paperback)",
+  ISBN-13 =      "978-0-321-17385-0 (paperback)",
   LCCN =         "Z253.4.L38 K66 2004",
   bibdate =      "Wed Jan 21 05:16:54 2004",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
   note =         "Includes CD-ROM.",
   price =        "US\$49.99, CAN\$75.99",
-  acknowledgement = ack-nhfb,
+  abstract =     "\LaTeX{} is the text-preparation system of choice for
+                 scientists and academics, and is especially useful for
+                 typesetting technical materials. This popular book
+                 shows you how to begin using \LaTeX{} to create
+                 high-quality documents. The book also serves as a handy
+                 reference of all \LaTeX{} users. In this completely
+                 revised edition, the authors cover the \LaTeX$_{2
+                 \epsilon }$ standard and offer more details, examples,
+                 exercises, tips, and tricks. They go beyond the core
+                 installation to describe the key contributed packages
+                 that have become essential to \LaTeX{} processing.",
+  acknowledgement = ack-nhfb,
+  tableofcontents = "Text, symbols, and commands \\
+                 Document layout and organization \\
+                 Displaying text \\
+                 Text in boxes \\
+                 Tables \\
+                 Mathematical formulas \\
+                 Graphics inclusion and color \\
+                 Floating tables and figures \\
+                 User customizations \\
+                 Document management \\
+                 Bibliographic databases and BibTeX \\
+                 PostScript and PDF \\
+                 Multilingual LaTeX \\
+                 Math extensions with AMS-LaTeX \\
+                 Drawing with LaTeX\\
+                 Presentation material \\
+                 Letters.",
 }
 
 @Book{Kottwitz:2011:LBG,
@@ -11637,18 +11715,43 @@
   edition =      "Second",
   pages =        "xxvii + 1090",
   year =         "2004",
-  ISBN =         "0-201-36299-6",
-  ISBN-13 =      "978-0-201-36299-2",
+  ISBN =         "0-201-36299-6 (paperback), 0-321-51443-2 (hardcover)",
+  ISBN-13 =      "978-0-201-36299-2 (paperback), 978-0-321-51443-1
+                 (hardcover)",
   LCCN =         "Z253.4.L38 G66 2004",
   bibdate =      "Thu May 20 13:23:24 2004",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
   price =        "US\$59.99, CAN\$86.99",
   series =       "Tools and Techniques for Computer Typesetting",
+  abstract =     "Written by the core LaTeX developers and maintainers,
+                 this essential reference contains more than 900
+                 self-contained ready-to-run examples that can
+                 immediately be reused by readers.",
   acknowledgement = ack-nhfb,
   remark =       "Authors listed as: Frank Mittelbach and Michel
                  Goossens with Johannes Braams, David Carlisle, and
                  Chris Rowley, and with contributions by Christine Detig
                  and Joachim Schrod.",
+  tableofcontents = "1: Introduction \\
+                 2: structure of a \LaTeX{} document \\
+                 3: Basic formatting tools \\
+                 4: layout of the page \\
+                 5: Tabular material \\
+                 6: Mastering floats \\
+                 7: Fonts and encodings \\
+                 8: Higher mathematics \\
+                 9: \LaTeX{} in a multilingual environment \\
+                 10: Graphics generation and manipulation \\
+                 11: Index generation \\
+                 12: Managing citations \\
+                 13: Bibliography generation \\
+                 14: \LaTeX{} package documentation tools \\
+                 A: \LaTeX{} overview for preamble, package, and class
+                 writers \\
+                 B: Tracing and resolving problems \\
+                 C: \LaTeX{} software and user group information \\
+                 D: TLC2 \TeX{} CD",
 }
 
 @Article{Molnar:1993:TGT,
@@ -15952,6 +16055,30 @@
   fjournal =     "Collegiate Microcomputer",
 }
 
+@Article{Wise:2001:RR,
+  author =       "Steve Wise",
+  title =        "Revolution in References: Give Readers a Chance By
+                 Putting Page Numbers",
+  journal =      j-SOC-STUD-SCI,
+  volume =       "31",
+  number =       "2",
+  pages =        "309--310",
+  day =          "1",
+  month =        apr,
+  year =         "2001",
+  CODEN =        "SSSCDH",
+  DOI =          "https://doi.org/10.1177/0306312701031002009",
+  ISSN =         "0306-3127 (print), 1460-3659 (electronic)",
+  ISSN-L =       "0306-3127",
+  bibdate =      "Mon Dec 3 09:13:11 MST 2018",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/socstudsci.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  URL =          "https://journals.sagepub.com/doi/pdf/10.1177/0306312701031002009",
+  acknowledgement = ack-nhfb,
+  fjournal =     "Social Studies of Science",
+  journal-URL =  "http://sss.sagepub.com/content/by/year",
+}
+
 @InProceedings{Wittbecker:1986:GTB,
   author =       "Alan E. Wittbecker",
   booktitle =    "Conference proceedings: setting the direction / ACM
@@ -17718,16 +17845,16 @@
   editor =       "Apostolos Syropoulos and Karl Berry and Yannis
                  Haralambous and Baden Hughes and Steven Peter and John
                  Plaice",
-  booktitle =    "{\TeX}, {XML}, and Digital Typography: International
-                 Conference on {\TeX}, XML, and Digital Typography, held
-                 jointly with the 25th Annual Meeting of the TeX Users
-                 Group, TUG 2004, Xanthi, Greece, August 30--September
-                 3, 2004: Proceedings",
-  title =        "{\TeX}, {XML}, and Digital Typography: International
-                 Conference on {\TeX}, {XML}, and Digital Typography,
-                 held jointly with the 25th Annual Meeting of the {TeX}
-                 Users Group, {TUG 2004}, Xanthi, Greece, August
-                 30--September 3, 2004: Proceedings",
+  booktitle =    "{{\TeX}, XML, and Digital Typography: International
+                 Conference on \TeX, XML, and Digital Typography, held
+                 jointly with the 25th Annual Meeting of the \TeX{}
+                 Users Group, TUG 2004, Xanthi, Greece, August
+                 30--September 3, 2004: Proceedings}",
+  title =        "{{\TeX}, XML, and Digital Typography: International
+                 Conference on \TeX, XML, and Digital Typography, held
+                 jointly with the 25th Annual Meeting of the \TeX{}
+                 Users Group, TUG 2004, Xanthi, Greece, August
+                 30--September 3, 2004: Proceedings}",
   volume =       "3130",
   publisher =    pub-SV,
   address =      pub-SV:adr,
@@ -17735,17 +17862,68 @@
   year =         "2004",
   CODEN =        "LNCSD9",
   DOI =          "https://doi.org/10.1007/b99374",
-  ISBN =         "3-540-22801-2",
-  ISBN-13 =      "978-3-540-22801-1",
+  ISBN =         "3-540-22801-2 (paperback)",
+  ISBN-13 =      "978-3-540-22801-1 (paperback)",
   ISSN =         "0302-9743 (print), 1611-3349 (electronic)",
   LCCN =         "Z253.3 I58 2004",
   bibdate =      "Tue Nov 16 08:40:30 2004",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/java2000.bib;
+                 http://www.math.utah.edu/pub/tex/bib/lncs.bib;
+                 http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texgraph.bib",
   series =       ser-LNCS,
   URL =          "http://link.springer-ny.com/link/service/series/0558/tocs/t3130.htm;
                  http://www.springerlink.com/openurl.asp?genre=issue&issn=0302-9743&volume=3130;
                  http://www.springerlink.com/openurl.asp?genre=volume&id=doi:10.1007/b99374",
   acknowledgement = ack-nhfb,
+  tableofcontents = "Digital Typography in the New Millennium: Flexible
+                 Documents by a Flexible Engine / Christos K. K.
+                 Loverdos and Apostolos Syropoulos / 1--16 \\
+                 Moving $\Omega$ to an Object-Oriented Platform / John
+                 Plaice, Yannis Haralambous, Paul Swoboda, and G{\'a}bor
+                 Bella / 17--26 \\
+                 Basque: A Case Study in Generalizing LaTeX Language
+                 Support / Jagoba Arias P{\'e}rez, Jes{\'u}s L{\'a}zaro,
+                 and Juan M. Aguirregabiria / 27--33 \\
+                 $\mu o \nu o 2 \pi o \lambda \nu$: Java-Based
+                 Conversion of Monotonic to Polytonic Greek / Johannes
+                 Likos / 34--54 \\
+                 Using LaTeX to Typeset a
+                 Mar{\=a}{\d{t}}h{\=\i}--English Dictionary / Manasi
+                 Athale and Rahul Athale / 55--58 \\
+                 Hyphenation Patterns for Ancient and Modern Greek /
+                 Dimitrios Filippou / 59--67 \\
+                 Typesetting the Deseret Alphabet with LaTeX and
+                 METAFONT / Kenneth R. Beasley / 68--111 \\
+                 FEATPOST and a Review of 3D METAPOST Packages / Luis
+                 Nobre Gon{\c{c}}alves / 112--124 \\
+                 Interactive Editing of MathML Markup Using TeX Syntax /
+                 Luca Padovani / 125--139 \\
+                 Typesetting CJK Languages with $\Omega$ / Jin-Hwan Cho
+                 / 139--139 \\
+                 Dynamic Arabic Mathematical Fonts / Mustapha Eddahibi,
+                 Azzeddine Lazrek, and Khalid Sami / 149--157 \\
+                 Arabic Mathematical e-Documents / Mustapha Eddahibi,
+                 Azzeddine Lazrek, and Khalid Sami / 158--168 \\
+                 Migrating to XML: The Case of the GUST Bulletin Archive
+                 / W{\l}odzimierz Bzyl and Tomasz Przechlewski /
+                 169--178 \\
+                 Animations in pdfTeX-Generated PDF / Jan Hole{\c{c}}ek
+                 and Petr Sojka / 179--191 \\
+                 iTeXMac: An Integrated TeX Environment for Mac OS X /
+                 J{\'e}r{\^o}ne Laurens / 192--202 \\
+                 MlBibTeX: Beyond LaTeX / Jan-Michel Hufflen / 203--215
+                 \\
+                 Managing TeX Resources with XML Topic Maps / Tomasz
+                 Przechlewski / 216--228 \\
+                 {\c{S}}{\"a}ferTeX: Source Code Esthetics for Automated
+                 Typesetting / Frank-Rene Schaefer / 229--239 \\
+                 Creating Type 1 Fonts from metafont Sources / Karel
+                 P{\'\i}{\v{s}}ka / 240--256 \\
+                 Beyond Glyphs, Advanced Typographic Features of Fonts /
+                 George Williams / 257--263 \\
+                 Author Index / / 256--256",
 }
 
 @Proceedings{Vanoirbeek:1992:EPE,
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib b/Master/texmf-dist/bibtex/bib/beebe/texgraph.bib
index 180290964c2..de6db937f60 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.09",
-%%%     date            = "14 October 2017",
-%%%     time            = "10:26:47 MDT",
+%%%     version         = "2.10",
+%%%     date            = "08 January 2019",
+%%%     time            = "10:18:17 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        = "26967 3081 11517 114558",
+%%%     checksum        = "59852 3129 11807 117424",
 %%%     email           = "beebe at math.utah.edu, beebe at acm.org,
 %%%                        beebe at computer.org (Internet)",
 %%%     codetable       = "ISO/ASCII",
@@ -39,22 +39,19 @@
 %%%                        printed if the is-alpha.bst or is-plain.bst
 %%%                        style files are used.
 %%%
-%%%                        At version 2.09, the year coverage looked
+%%%                        At version 2.10, the year coverage looked
 %%%                        like this:
 %%%
-%%%                             1967 (   1)    1980 (   1)    1993 (   0)
-%%%                             1968 (   0)    1981 (   4)    1994 (   1)
-%%%                             1969 (   1)    1982 (   3)    1995 (   3)
-%%%                             1970 (   1)    1983 (   6)    1996 (   4)
-%%%                             1971 (   0)    1984 (   4)    1997 (   9)
-%%%                             1972 (   1)    1985 (   7)    1998 (   2)
-%%%                             1973 (   0)    1986 (  10)    1999 (   2)
-%%%                             1974 (   0)    1987 (  21)    2000 (   0)
-%%%                             1975 (   0)    1988 (  20)    2001 (   1)
-%%%                             1976 (   1)    1989 (  20)    2002 (   0)
-%%%                             1977 (   1)    1990 (  16)    2003 (   1)
-%%%                             1978 (   0)    1991 (   8)    2004 (   5)
-%%%                             1979 (   2)    1992 (   5)
+%%%                             1976 (   1)    1986 (   1)    1996 (   1)
+%%%                             1977 (   0)    1987 (   0)    1997 (   5)
+%%%                             1978 (   0)    1988 (   1)    1998 (   1)
+%%%                             1979 (   0)    1989 (   0)    1999 (   2)
+%%%                             1980 (   0)    1990 (   3)    2000 (   0)
+%%%                             1981 (   1)    1991 (   1)    2001 (   1)
+%%%                             1982 (   0)    1992 (   2)    2002 (   0)
+%%%                             1983 (   1)    1993 (   0)    2003 (   1)
+%%%                             1984 (   0)    1994 (   0)    2004 (   5)
+%%%                             1985 (   1)    1995 (   2)
 %%%
 %%%                             Article:         89
 %%%                             Book:            33
@@ -2946,16 +2943,16 @@
   editor =       "Apostolos Syropoulos and Karl Berry and Yannis
                  Haralambous and Baden Hughes and Steven Peter and John
                  Plaice",
-  booktitle =    "{\TeX}, {XML}, and Digital Typography: International
-                 Conference on {\TeX}, XML, and Digital Typography, held
-                 jointly with the 25th Annual Meeting of the TeX Users
-                 Group, TUG 2004, Xanthi, Greece, August 30--September
-                 3, 2004: Proceedings",
-  title =        "{\TeX}, {XML}, and Digital Typography: International
-                 Conference on {\TeX}, {XML}, and Digital Typography,
-                 held jointly with the 25th Annual Meeting of the {TeX}
-                 Users Group, {TUG 2004}, Xanthi, Greece, August
-                 30--September 3, 2004: Proceedings",
+  booktitle =    "{{\TeX}, XML, and Digital Typography: International
+                 Conference on \TeX, XML, and Digital Typography, held
+                 jointly with the 25th Annual Meeting of the \TeX{}
+                 Users Group, TUG 2004, Xanthi, Greece, August
+                 30--September 3, 2004: Proceedings}",
+  title =        "{{\TeX}, XML, and Digital Typography: International
+                 Conference on \TeX, XML, and Digital Typography, held
+                 jointly with the 25th Annual Meeting of the \TeX{}
+                 Users Group, TUG 2004, Xanthi, Greece, August
+                 30--September 3, 2004: Proceedings}",
   volume =       "3130",
   publisher =    pub-SV,
   address =      pub-SV:adr,
@@ -2963,17 +2960,68 @@
   year =         "2004",
   CODEN =        "LNCSD9",
   DOI =          "https://doi.org/10.1007/b99374",
-  ISBN =         "3-540-22801-2",
-  ISBN-13 =      "978-3-540-22801-1",
+  ISBN =         "3-540-22801-2 (paperback)",
+  ISBN-13 =      "978-3-540-22801-1 (paperback)",
   ISSN =         "0302-9743 (print), 1611-3349 (electronic)",
   LCCN =         "Z253.3 I58 2004",
   bibdate =      "Tue Nov 16 08:40:30 2004",
-  bibsource =    "http://www.math.utah.edu/pub/tex/bib/texgraph.bib",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/java2000.bib;
+                 http://www.math.utah.edu/pub/tex/bib/lncs.bib;
+                 http://www.math.utah.edu/pub/tex/bib/master.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texbook3.bib;
+                 http://www.math.utah.edu/pub/tex/bib/texgraph.bib",
   series =       ser-LNCS,
   URL =          "http://link.springer-ny.com/link/service/series/0558/tocs/t3130.htm;
                  http://www.springerlink.com/openurl.asp?genre=issue&issn=0302-9743&volume=3130;
                  http://www.springerlink.com/openurl.asp?genre=volume&id=doi:10.1007/b99374",
   acknowledgement = ack-nhfb,
+  tableofcontents = "Digital Typography in the New Millennium: Flexible
+                 Documents by a Flexible Engine / Christos K. K.
+                 Loverdos and Apostolos Syropoulos / 1--16 \\
+                 Moving $\Omega$ to an Object-Oriented Platform / John
+                 Plaice, Yannis Haralambous, Paul Swoboda, and G{\'a}bor
+                 Bella / 17--26 \\
+                 Basque: A Case Study in Generalizing LaTeX Language
+                 Support / Jagoba Arias P{\'e}rez, Jes{\'u}s L{\'a}zaro,
+                 and Juan M. Aguirregabiria / 27--33 \\
+                 $\mu o \nu o 2 \pi o \lambda \nu$: Java-Based
+                 Conversion of Monotonic to Polytonic Greek / Johannes
+                 Likos / 34--54 \\
+                 Using LaTeX to Typeset a
+                 Mar{\=a}{\d{t}}h{\=\i}--English Dictionary / Manasi
+                 Athale and Rahul Athale / 55--58 \\
+                 Hyphenation Patterns for Ancient and Modern Greek /
+                 Dimitrios Filippou / 59--67 \\
+                 Typesetting the Deseret Alphabet with LaTeX and
+                 METAFONT / Kenneth R. Beasley / 68--111 \\
+                 FEATPOST and a Review of 3D METAPOST Packages / Luis
+                 Nobre Gon{\c{c}}alves / 112--124 \\
+                 Interactive Editing of MathML Markup Using TeX Syntax /
+                 Luca Padovani / 125--139 \\
+                 Typesetting CJK Languages with $\Omega$ / Jin-Hwan Cho
+                 / 139--139 \\
+                 Dynamic Arabic Mathematical Fonts / Mustapha Eddahibi,
+                 Azzeddine Lazrek, and Khalid Sami / 149--157 \\
+                 Arabic Mathematical e-Documents / Mustapha Eddahibi,
+                 Azzeddine Lazrek, and Khalid Sami / 158--168 \\
+                 Migrating to XML: The Case of the GUST Bulletin Archive
+                 / W{\l}odzimierz Bzyl and Tomasz Przechlewski /
+                 169--178 \\
+                 Animations in pdfTeX-Generated PDF / Jan Hole{\c{c}}ek
+                 and Petr Sojka / 179--191 \\
+                 iTeXMac: An Integrated TeX Environment for Mac OS X /
+                 J{\'e}r{\^o}ne Laurens / 192--202 \\
+                 MlBibTeX: Beyond LaTeX / Jan-Michel Hufflen / 203--215
+                 \\
+                 Managing TeX Resources with XML Topic Maps / Tomasz
+                 Przechlewski / 216--228 \\
+                 {\c{S}}{\"a}ferTeX: Source Code Esthetics for Automated
+                 Typesetting / Frank-Rene Schaefer / 229--239 \\
+                 Creating Type 1 Fonts from metafont Sources / Karel
+                 P{\'\i}{\v{s}}ka / 240--256 \\
+                 Beyond Glyphs, Advanced Typographic Features of Fonts /
+                 George Williams / 257--263 \\
+                 Author Index / / 256--256",
 }
 
 @Proceedings{USENIX:1997:PCD,