sync dvipdfmx.cfg

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

3 files changed, 29 insertions, 34 deletions

diff --git a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
index fed46401d5a..afa3b843e16 100644
--- a/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
+++ b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
@@ -201,8 +201,16 @@ f  pdftex.map
 %% MiKTeX 2.2 and 2.3
 %f psfonts.map
 
-%% Put additonal fontmap files here (usually for Type0 fonts)
-f  cid-x.map
+%% Put additional fontmap files here (usually for Type0 fonts)
+%f  cid-x.map
+
+% the following file is generated by updmap(-sys) from the 
+% KanjiMap entries in the updmap.cfg file.
+f kanjix.map
+
+% minimal example for Chinese and Korean users
+% improvements please to tex-live@tug.org
+f ckx.map
 
 %% Include other config files
 %i <filename>
diff --git a/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg b/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg
index dc06856282f..afa3b843e16 100644
--- a/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg
+++ b/Master/texmf-dist/dvipdfmx/dvipdfmx.cfg
@@ -184,6 +184,11 @@ D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityL
 
 %d  5
 
+%% Image cache life in hours
+%%  0 means erase all old images and leave new images
+%% -1 means erase all old images and also erase new images
+%I 48
+
 %% Font Map Files
 %%
 %% teTeX 2.x and TeX Live using updmap (pdfTeX format)
@@ -196,12 +201,13 @@ f  pdftex.map
 %% MiKTeX 2.2 and 2.3
 %f psfonts.map
 
-%% Put additonal fontmap files here (usually for Type0 fonts)
+%% Put additional fontmap files here (usually for Type0 fonts)
 %f  cid-x.map
 
 % the following file is generated by updmap(-sys) from the 
 % KanjiMap entries in the updmap.cfg file.
 f kanjix.map
+
 % minimal example for Chinese and Korean users
 % improvements please to tex-live@tug.org
 f ckx.map
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index ea11327f481..e10cbf80401 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -14,16 +14,16 @@
 # The output will be diffs for any files that are not up to date.
 
 # Basic config files.
-Master/texmf-dist/web2c/texmf.cnf  Build/source/texk/kpathsea/
+Master/texmf-dist/web2c/texmf.cnf   Build/source/texk/kpathsea/
 Master/texmf-dist/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/
 Master/tlpkg/TeXLive/TLConfig.pm Build/source/utils/biber/TeXLive/
 #
 Master/tlpkg/TeXLive/TLUtils.pm  Build/source/texk/tests/TeXLive/
 Master/tlpkg/TeXLive/TLConfig.pm Build/source/texk/tests/TeXLive/
-#
+
 # Glyph lists used by pdftex, now maintained in lcdf-typetools:
 Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphtounicode.tex Master/texmf-dist/tex/generic/pdftex/glyphtounicode.tex
 Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphlist.txt Master/texmf-dist/fonts/map/glyphlist/glyphlist.txt
@@ -32,35 +32,16 @@ Build/source/texk/lcdf-typetools/lcdf-typetools-*/texglyphlist.txt Master/texmf-
 # One more glyph list maintained in dvipdfmx, it seems.
 Build/source/texk/dvipdfmx/data/pdfglyphlist.txt Master/texmf-dist/fonts/map/glyphlist/pdfglyphlist.txt
 
-# should be committed at the same time due to Id expansion, seems preferable?
+# dvipdfmx is maintained as part of TL now, so keep config files the same.
+Build/source/texk/dvipdfmx/data/dvipdfmx.cfg Master/texmf-dist/dvipdfmx/dvipdfmx.cfg 
+
+# Should be committed at the same time due to Id expansion; seems preferable?
 Build/source/texk/texlive/w32_wrapper/runscript.tlu Master/bin/win32/runscript.tlu
-#
-# scripts from GNU packages (locally) installed on the system;
-# see Build/source/build-aux/README.TL.  The version number embedded in
-# the automake path is unfortunate, but automake provides no
-# version-independent access.
+
+# Scripts from GNU packages (locally) installed on the system; see
+# Build/source/build-aux/README.TL.  The version number embedded in the
+# automake path is unfortunate (have to update manually at new automake
+# releases), but automake provides no version-independent access.
 /usr/local/gnu/share/libtool/config/ltmain.sh Build/source/build-aux/ltmain.sh
 /usr/local/gnu/share/automake-1.13/missing Build/source/build-aux/missing
 /usr/local/gnu/share/automake-1.13/ylwrap Build/source/build-aux/ylwrap
-#
-##todo: linked_scripts
-##
-##todo: ConTeXt in TL is in flux again.
-## 
-## ConTeXt .lua vs. w32 stubs.
-#Master/texmf-dist/scripts/context/lua/luatools.lua	Master/texmf-dist/scripts/context/stubs/mswin/
-#Master/texmf-dist/scripts/context/lua/mtxrun.lua	Master/texmf-dist/scripts/context/stubs/mswin/
-##
-## ConTeXt .lua vs. w32 bin.
-#Master/texmf-dist/scripts/context/lua/luatools.lua	Master/bin/win32/luatools.lua
-#Master/texmf-dist/scripts/context/lua/mtxrun.lua	Master/bin/win32/mtxrun.lua
-##
-## ConTeXt unix stubs vs. Build tree.
-#Master/texmf-dist/scripts/context/stubs/unix/context	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/ctxtools	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/luatools	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/mtxrun	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/pstopdf	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/rlxtools	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/texexec	Build/source/texk/texlive/context/
-#Master/texmf-dist/scripts/context/stubs/unix/texmfstart	Build/source/texk/texlive/context/