tex-ini-files (14apr16)

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

9 files changed, 16 insertions, 24 deletions

diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini
index 3779819e1e1..fab2324984d 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: dvilualatex.ini
+% tex-ini-files 2016-04-14: dvilualatex.ini
 
 \let\dvimode\relax
 \input lualatex.ini
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini
index e60ec1eb65f..5511d4144b7 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: dvilualatex.ini
+% tex-ini-files 2016-04-14: dvilualatex.ini
 
 \let\dvimode\relax
 \input luatex.ini
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/lualatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/lualatex.ini
index 2de7eda514d..3bcdbc197f5 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/lualatex.ini
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/lualatex.ini
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: lualatex.ini
+% tex-ini-files 2016-04-14: lualatex.ini
 
 % Originally written 2008 by Karl Berry. Public domain.
 
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini
index 3da734be83c..4dafd459375 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: luatex.ini
+% tex-ini-files 2016-04-14: luatex.ini
 
 % Karl Berry, originally written 2008. Public domain.
 % PDF output by default.
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex b/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex
index fa9f81a3b9e..aa9cb55af96 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: luatexconfig.tex
+% tex-ini-files 2016-04-14: luatexconfig.tex
 
 % Load shared (PDF) settings in LuaTeX
 
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.dat b/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.dat
index 482b32ae4b6..3bd403e5d3d 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.dat
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.dat
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: pdftexconfig.dat
+% tex-ini-files 2016-04-14: pdftexconfig.dat
 
 % Shared configuration for pdfTeX/LuaTeX low-level settings
 
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex b/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex
index 6ab04b81193..a3f7b6eca23 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: pdftexconfig.tex
+% tex-ini-files 2016-04-14: pdftexconfig.tex
 
 % Load shared (PDF) settings in pdfTeX
 
@@ -7,25 +7,17 @@
   \catcode`\{=1 %
   \catcode`\}=2 %
   \catcode`\#=6 %
-  % From plain.tex
-  \def\loop#1\repeat{\def\body{#1}\iterate}%
-  \def\iterate{%
-    \body
-      \let\next\iterate
-    \else
-      \let\next\relax
-    \fi
-    \next
-  }%
-  \let\repeat\fi
+  % From apnum.tex
+  \def\loop#1\repeat{\def\body{#1\relax\expandafter\body\fi}\body}%
+  \let\repeat\fi 
   % The format of the data lines themselves is simple
   \def\parse#1 = #2\relax{\expandafter\global\csname pdf#1\endcsname = #2 }%
   \def\storedpar{\par}%
   % Read the raw data
   \openin0=pdftexconfig.dat %
-  \loop\unless\ifeof0 %
+  \loop\ifeof0 \else
     \read0 to \line
-    \unless\ifx\line\storedpar
+    \ifx\line\storedpar\else
       \if\relax\line\relax
       \else
         \expandafter\parse\line\relax
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/xelatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/xelatex.ini
index 8e34b9c95ee..da3501908d8 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/xelatex.ini
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/xelatex.ini
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: xelatex.ini
+% tex-ini-files 2016-04-14: xelatex.ini
 
 % Public domain.  Originally by Jonathan Kew.
 
@@ -10,8 +10,8 @@
   \catcode`\{=1 %
   \catcode`\}=2 %
   \catcode`\#=6 %
-  \protected\gdef\pdfmapfile#1{\special{pdf:mapfile #1}}%
-  \protected\gdef\pdfmapline#1{\special{pdf:mapline #1}}%
+  \csname protected\endcsname\gdef\pdfmapfile#1{\special{pdf:mapfile #1}}%
+  \csname protected\endcsname\gdef\pdfmapline#1{\special{pdf:mapline #1}}%
 \endgroup
 
 \input latex.ltx
diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini
index 15f0fb7b7ea..bc74c985fd6 100644
--- a/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini
+++ b/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini
@@ -1,4 +1,4 @@
-% tex-ini-files 2016-02-27: xetex.ini
+% tex-ini-files 2016-04-14: xetex.ini
 
 % Public domain.  Originally by Jonathan Kew.