doc,sync

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

3 files changed, 48 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/generic/beebe/tugboat.def b/Master/texmf-dist/tex/generic/beebe/tugboat.def
index a133505596d..1fe2f0ecde2 100644
--- a/Master/texmf-dist/tex/generic/beebe/tugboat.def
+++ b/Master/texmf-dist/tex/generic/beebe/tugboat.def
@@ -2,7 +2,8 @@
 % The following macros are used in TUGboat tables of contents.
 % This file may be automatically extended by tugboat.awk.
 % It may be used by plain TeX, LaTeX, or AmSTeX.
-% [04-Jun-1999]
+% [23-May-2015] -- update for up to TUGboat volume 35 (2014)
+% [04-Jun-1999] -- original version
 
 \ifx\makeatletter\undefined
     \def\makeatletter{\catcode`\@=11\relax}
@@ -3604,8 +3605,46 @@
 \def\ringhalfrighti{'}
 \def\postissno{TUG 2011 Conference Proceedings}
 
-%%% [27-Nov-2011]: new definitions for volumes 31--date
+%%% [27-Nov-2011]: new definitions for volumes 31--32
 \def \DVD {{\acro{DVD}}}
 \def \tug {{\acro{TUG}}}
 \def \TeXworks {{\TeX}works}
 
+\font\slnine = cmsl9
+\def\postissno{TUG 2010 Conference Proceedings}
+\def\ringhalfrighti{'}
+\def\postissno{TUG 2011 Conference Proceedings}
+\def\postissno{TUG 2012 Conference Proceedings}
+\def\CS{{\the\textfont2 C\kern-.1em\lower.4ex\hbox{S}\kern.1em}}
+\def\postissno{TUG 2013 Conference Proceedings}
+\def\postissno{TUG 2014 Conference Proceedings}
+
+%%% [29-Jul-2015]: TENTATIVE (subject to bnb's approval) new definitions for volumes 33--date
+
+\def \AcroFLeX          {Acro\acro{FL}eX}
+\def \acrosl            {\small \sl}
+\def \Bib               {Bib}
+\def \CSS               {\acro{CSS}}
+\def \DVI               {\acro{DVI}}
+\def \ExTeX             {Ex\TeX}
+\def \gmLaTeXplain      {gm\LaTeX{}plain}
+\def \GNU               {\acro{GNU}}
+\def \origLaTeX         {\LaTeX}
+\def \TikZ              {Ti\emph{k}Z}
+\def \VnTeX             {Vn\TeX}
+\def \Xe                {Xe}
+\def \XeLaTeX           {Xe{\LaTeX}}
+\def\postissno{TUG 2014 Conference Proceedings}
+\def\postissno{Proceedings}
+\def\postissno{TUG 2016 Conference Proceedings}
+\def\postissno{TUG 2016 Conference Proceedings}
+
+\def \bibtexcpp         {{\sl \BibTeX{\raise.25ex\hbox{\sl c++}}}}
+\def \dvitosvg          {{{\acrosl DVI\/}}2\/{{\acrosl SVG}}}
+
+\def \LuaTeX            {Lua\TeX{}}
+
+\ifx \undefined \file      \def \file      #1{{{\tt #1}}} \fi
+\ifx \undefined \pgm       \def \pgm       #1{{{\tt #1}}} \fi
+\ifx \undefined \pkg       \def \pkg       #1{{{\sf #1}}} \fi
+\ifx \undefined \url       \def \url       #1{{{\tt #1}}} \fi
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index 6d858529b69..76f92254edb 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -695,6 +695,12 @@ parse_first_line = t
 parse_first_line.tex = f
 parse_first_line.initex = f
 
+% Normally we mention files created by \openout in the log file,
+% but again, trip-compatibility forbids this for (ini)tex.
+log_openout = t
+log_openout.tex = f
+log_openout.initex = f
+
 % Control file:line:error style messages.
 file_line_error_style = f
 
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 1475bb0fa87..62f3ce20fc1 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -69,11 +69,10 @@ elif test "x$1" = x--build; then
   ./configure --prefix=/tmp/ainst \
     --with-latex=/tmp/ainst/latex --with-context=/tmp/ainst/context \
     --disable-fftw --disable-gl --disable-gsl \
-    --enable-texlive-build CFLAGS=-g CXXFLAGS=-std=c++11
+    --enable-texlive-build CFLAGS=-g CXXFLAGS="-std=c++11 -DNOHASH" #-ansi
   make
   make check
   make install-prebuilt
-  test ! -r .git || mv dot.git .git
   exit 0