uptex-fonts[.tds.zip] now uses uptex-fonts/ subdir, so remove special cases

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

88 files changed, 1 insertions, 138 deletions

diff --git a/Master/texmf-dist/doc/fonts/uptex/LICENSE b/Master/texmf-dist/doc/fonts/uptex-fonts/LICENSE
index 8fd0a777126..8fd0a777126 100644
--- a/Master/texmf-dist/doc/fonts/uptex/LICENSE
+++ b/Master/texmf-dist/doc/fonts/uptex-fonts/LICENSE
diff --git a/Master/texmf-dist/doc/fonts/uptex/README.md b/Master/texmf-dist/doc/fonts/uptex-fonts/README.md
index 60495c63fab..e50d1f093c2 100644
--- a/Master/texmf-dist/doc/fonts/uptex/README.md
+++ b/Master/texmf-dist/doc/fonts/uptex-fonts/README.md
@@ -18,6 +18,6 @@ this redistribution also follows it (see LICENSE).
 
 ## Release Date
 
-2016-05-05
+2016-05-12
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/fonts/uptex/README_ASCII_Corp.txt b/Master/texmf-dist/doc/fonts/uptex-fonts/README_ASCII_Corp.txt
index 119f1f206e7..119f1f206e7 100644
--- a/Master/texmf-dist/doc/fonts/uptex/README_ASCII_Corp.txt
+++ b/Master/texmf-dist/doc/fonts/uptex-fonts/README_ASCII_Corp.txt
diff --git a/Master/texmf-dist/doc/fonts/uptex/README_uptex_font.txt b/Master/texmf-dist/doc/fonts/uptex-fonts/README_uptex_font.txt
index ad71ee68346..ad71ee68346 100644
--- a/Master/texmf-dist/doc/fonts/uptex/README_uptex_font.txt
+++ b/Master/texmf-dist/doc/fonts/uptex-fonts/README_uptex_font.txt
diff --git a/Master/texmf-dist/fonts/cmap/uptex/UTF8-UTF16 b/Master/texmf-dist/fonts/cmap/uptex-fonts/UTF8-UTF16
index e4184cb727e..e4184cb727e 100644
--- a/Master/texmf-dist/fonts/cmap/uptex/UTF8-UTF16
+++ b/Master/texmf-dist/fonts/cmap/uptex-fonts/UTF8-UTF16
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upgbm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upgbm-h.tfm
index be901880036..be901880036 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upgbm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upgbm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upgbm-hq.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upgbm-hq.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upgbm-hq.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upgbm-hq.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upgbm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upgbm-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upgbm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upgbm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uphygt-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphygt-h.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uphygt-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphygt-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uphygt-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphygt-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uphygt-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphygt-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uphysmjm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphysmjm-h.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uphysmjm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphysmjm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uphysmjm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphysmjm-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uphysmjm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uphysmjm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisg-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisg-h.tfm
index a55e5f42679..a55e5f42679 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisg-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisg-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisg-hq.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisg-hq.tfm
index 8dbf787b3ec..8dbf787b3ec 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisg-hq.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisg-hq.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisg-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisg-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisg-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisg-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisr-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisr-h.tfm
index a55e5f42679..a55e5f42679 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisr-hq.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisr-hq.tfm
index 8dbf787b3ec..8dbf787b3ec 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisr-hq.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisr-hq.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisr-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisr-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjisr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjisr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpngt-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpngt-h.tfm
index a55e5f42679..a55e5f42679 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpngt-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpngt-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpngt-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpngt-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpngt-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpngt-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpnrm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpnrm-h.tfm
index a55e5f42679..a55e5f42679 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpnrm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpnrm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpnrm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpnrm-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upjpnrm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upjpnrm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorgt-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorgt-h.tfm
index 9bd5ceb2611..9bd5ceb2611 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorgt-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorgt-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorgt-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorgt-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorgt-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorgt-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorrm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorrm-h.tfm
index 9bd5ceb2611..9bd5ceb2611 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorrm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorrm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorrm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorrm-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upkorrm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upkorrm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upmhm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmhm-h.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upmhm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmhm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upmhm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmhm-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upmhm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmhm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upmsl-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmsl-h.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upmsl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmsl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upmsl-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmsl-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upmsl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upmsl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uprml-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uprml-h.tfm
index be901880036..be901880036 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uprml-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uprml-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uprml-hq.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uprml-hq.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uprml-hq.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uprml-hq.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uprml-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uprml-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uprml-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uprml-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upschgt-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschgt-h.tfm
index 9bd5ceb2611..9bd5ceb2611 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upschgt-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschgt-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upschgt-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschgt-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upschgt-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschgt-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upschrm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschrm-h.tfm
index 9bd5ceb2611..9bd5ceb2611 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upschrm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschrm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upschrm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschrm-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upschrm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upschrm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upstht-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstht-h.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upstht-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstht-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upstht-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstht-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upstht-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstht-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upstsl-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstsl-h.tfm
index aae38f12edf..aae38f12edf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upstsl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstsl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/upstsl-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstsl-v.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/upstsl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/upstsl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchgt-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchgt-h.tfm
index 9bd5ceb2611..9bd5ceb2611 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchgt-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchgt-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchgt-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchgt-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchgt-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchgt-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchrm-h.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchrm-h.tfm
index 9bd5ceb2611..9bd5ceb2611 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchrm-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchrm-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchrm-v.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchrm-v.tfm
index be43e8b8157..be43e8b8157 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/jis/uptchrm-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/jis/uptchrm-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/ugbm.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/ugbm.tfm
index 8dbf787b3ec..8dbf787b3ec 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/ugbm.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/ugbm.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/ugbmv.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/ugbmv.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/ugbmv.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/ugbmv.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/ugoth10.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/ugoth10.tfm
index c8c226a721f..c8c226a721f 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/ugoth10.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/ugoth10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/umin10.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/umin10.tfm
index 443fcaeb845..443fcaeb845 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/umin10.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/umin10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/urml.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/urml.tfm
index 8dbf787b3ec..8dbf787b3ec 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/urml.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/urml.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/urmlv.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/urmlv.tfm
index dddd9776408..dddd9776408 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/urmlv.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/urmlv.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/utgoth10.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/utgoth10.tfm
index 04716a56a65..04716a56a65 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/utgoth10.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/utgoth10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/uptex/min/utmin10.tfm b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/utmin10.tfm
index 007fa132baf..007fa132baf 100644
--- a/Master/texmf-dist/fonts/tfm/uptex/min/utmin10.tfm
+++ b/Master/texmf-dist/fonts/tfm/uptex-fonts/min/utmin10.tfm
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjisg-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisg-h.vf
index 159dce3571d..159dce3571d 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjisg-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisg-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjisg-hq.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisg-hq.vf
index 406061f76f2..406061f76f2 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjisg-hq.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisg-hq.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjisg-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisg-v.vf
index e09dd3a68ef..e09dd3a68ef 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjisg-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisg-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjisr-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisr-h.vf
index 546413b258e..546413b258e 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjisr-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisr-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjisr-hq.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisr-hq.vf
index e432a42272c..e432a42272c 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjisr-hq.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisr-hq.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjisr-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisr-v.vf
index 520069aedec..520069aedec 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjisr-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjisr-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjpngt-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpngt-h.vf
index 89199ac5170..89199ac5170 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjpngt-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpngt-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjpngt-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpngt-v.vf
index bc69cd9ed97..bc69cd9ed97 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjpngt-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpngt-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjpnrm-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpnrm-h.vf
index 65a1e5449c3..65a1e5449c3 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjpnrm-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpnrm-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upjpnrm-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpnrm-v.vf
index b479daa4632..b479daa4632 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upjpnrm-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upjpnrm-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upkorgt-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorgt-h.vf
index 955cc99318d..955cc99318d 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upkorgt-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorgt-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upkorgt-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorgt-v.vf
index bd855798e40..bd855798e40 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upkorgt-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorgt-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upkorrm-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorrm-h.vf
index c00c9dc872c..c00c9dc872c 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upkorrm-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorrm-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upkorrm-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorrm-v.vf
index 50d66f569a6..50d66f569a6 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upkorrm-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upkorrm-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upschgt-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschgt-h.vf
index fe01764a2e2..fe01764a2e2 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upschgt-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschgt-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upschgt-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschgt-v.vf
index 9af54aae735..9af54aae735 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upschgt-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschgt-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upschrm-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschrm-h.vf
index c7d786b45e9..c7d786b45e9 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upschrm-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschrm-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/upschrm-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschrm-v.vf
index df072b04d97..df072b04d97 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/upschrm-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/upschrm-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/uptchgt-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchgt-h.vf
index 9b9ca281889..9b9ca281889 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/uptchgt-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchgt-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/uptchgt-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchgt-v.vf
index efd4fce11b9..efd4fce11b9 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/uptchgt-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchgt-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/uptchrm-h.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchrm-h.vf
index 8dd117949eb..8dd117949eb 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/uptchrm-h.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchrm-h.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/jis/uptchrm-v.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchrm-v.vf
index 61cf044dce7..61cf044dce7 100644
--- a/Master/texmf-dist/fonts/vf/uptex/jis/uptchrm-v.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/jis/uptchrm-v.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/min/ugoth10.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/min/ugoth10.vf
index 496bb0f5988..496bb0f5988 100644
--- a/Master/texmf-dist/fonts/vf/uptex/min/ugoth10.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/min/ugoth10.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/min/umin10.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/min/umin10.vf
index e2157d2e48d..e2157d2e48d 100644
--- a/Master/texmf-dist/fonts/vf/uptex/min/umin10.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/min/umin10.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/min/utgoth10.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/min/utgoth10.vf
index 733dde67a32..733dde67a32 100644
--- a/Master/texmf-dist/fonts/vf/uptex/min/utgoth10.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/min/utgoth10.vf
diff --git a/Master/texmf-dist/fonts/vf/uptex/min/utmin10.vf b/Master/texmf-dist/fonts/vf/uptex-fonts/min/utmin10.vf
index 6e7c925fc30..6e7c925fc30 100644
--- a/Master/texmf-dist/fonts/vf/uptex/min/utmin10.vf
+++ b/Master/texmf-dist/fonts/vf/uptex-fonts/min/utmin10.vf
diff --git a/Master/texmf-dist/source/fonts/uptex/Makefile b/Master/texmf-dist/source/fonts/uptex-fonts/Makefile
index 41f40d61eb1..41f40d61eb1 100644
--- a/Master/texmf-dist/source/fonts/uptex/Makefile
+++ b/Master/texmf-dist/source/fonts/uptex-fonts/Makefile
diff --git a/Master/texmf-dist/source/fonts/uptex/upjisr-h-hk.pl b/Master/texmf-dist/source/fonts/uptex-fonts/upjisr-h-hk.pl
index c686791ecf1..c686791ecf1 100644
--- a/Master/texmf-dist/source/fonts/uptex/upjisr-h-hk.pl
+++ b/Master/texmf-dist/source/fonts/uptex-fonts/upjisr-h-hk.pl
diff --git a/Master/texmf-dist/source/fonts/uptex/upjisr-h.pl b/Master/texmf-dist/source/fonts/uptex-fonts/upjisr-h.pl
index c69b5518a0a..c69b5518a0a 100644
--- a/Master/texmf-dist/source/fonts/uptex/upjisr-h.pl
+++ b/Master/texmf-dist/source/fonts/uptex-fonts/upjisr-h.pl
diff --git a/Master/texmf-dist/source/fonts/uptex/upjisr-v.pl b/Master/texmf-dist/source/fonts/uptex-fonts/upjisr-v.pl
index 97732934770..97732934770 100644
--- a/Master/texmf-dist/source/fonts/uptex/upjisr-v.pl
+++ b/Master/texmf-dist/source/fonts/uptex-fonts/upjisr-v.pl
diff --git a/Master/texmf-dist/source/fonts/uptex/uprml-h-hk.pl b/Master/texmf-dist/source/fonts/uptex-fonts/uprml-h-hk.pl
index de65b31996a..de65b31996a 100644
--- a/Master/texmf-dist/source/fonts/uptex/uprml-h-hk.pl
+++ b/Master/texmf-dist/source/fonts/uptex-fonts/uprml-h-hk.pl
diff --git a/Master/texmf-dist/source/fonts/uptex/uprml-h.pl b/Master/texmf-dist/source/fonts/uptex-fonts/uprml-h.pl
index e4fbf0313a1..e4fbf0313a1 100644
--- a/Master/texmf-dist/source/fonts/uptex/uprml-h.pl
+++ b/Master/texmf-dist/source/fonts/uptex-fonts/uprml-h.pl
diff --git a/Master/texmf-dist/source/fonts/uptex/makepl.perl b/Master/texmf-dist/source/fonts/uptex/makepl.perl
deleted file mode 100644
index cc06e7a5db9..00000000000
--- a/Master/texmf-dist/source/fonts/uptex/makepl.perl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/perl -n -s
-
-use utf8;
-
-$hankana=$hk; # option -hk
-
-if (/CHARWD|FONTAT|MOVERIGHT|QUAD|GLUE/) {
-    s/0\.96221\d/1.000000/g; # 
-    s/0\.72166\d/0.750000/g; # 
-    s/0\.48110\d/0.500000/g; # 
-    s/0\.24055\d/0.250000/g; # 
-} elsif (/CHAR(HT|DP)|XHEIGHT|\(STRETCH|EXTRASPACE|EXTRASTRE|EXTRASHRINK/) {
-    s/0\.09164\d/0.100000/; # 0.100000 STRETCH
-    s/0\.91644\d/1.000000/; # 1.000000 XHEIGHT
-    s/0\.22910\d/0.250000/; # 0.250000 EXTRASPACE
-    s/0\.18328\d/0.200000/; # 0.200000 EXTRASTRETCH
-    s/0\.11455\d/0.125000/; # 0.125000 EXTRASHRINK
-    s/0\.77758\d/0.880000/; # 0.880000 CHARHT
-    s/0\.13885\d/0.120000/; # 0.120000 CHARDP
-    s/0\.45822\d/0.500000/; # 0.500000 CHARHT, CHARDP (vertical)
-} elsif (/FAMILY/) {
-    s/ JIS / UPJIS /;
-} elsif (/CHARSINTYPE\s+\S+\s+(\d+)/) {
-    $charsintype=$1;
-} elsif (/LABEL\s+\S+\s+(\d+)/) {
-    $label=$1;
-} elsif (/TYPE\s+\S+\s+(\d+)/) {
-    $type=$1;
-}
-
-if ($charsintype==1 && /\)/) {
-    print <<END;
-   UFF5F U3018 U3016 U301D 
-END
-    $charsintype=undef;
-}
-if ($charsintype==2 && /\)/) {
-    print <<END;
-   UFF60 U3019 U3017 U301F 
-END
-    $charsintype=undef;
-}
-if ($charsintype==5) {
-    s/\x{2014}|\x{2015}/\x{2014} \x{2015}/g;
-}
-
-if ($hankana) {
-
-if ($label==2 && /STOP\)/) {
-    print <<END;
-   (GLUE O 6 R 0.500000 R 0.0 R 0.500000)
-END
-}
-if ($label==3 && /STOP\)/) {
-    print <<END;
-   (GLUE O 6 R 0.250000 R 0.0 R 0.250000)
-END
-}
-if ($label==4 && /STOP\)/) {
-    print <<END;
-   (GLUE O 6 R 0.500000 R 0.0 R 0.0)
-END
-}
-if ($type==2 && /^      \)/) {
-    print <<END;
-      (GLUE O 6 R 0.500000 R 0.0 R 0.500000)
-END
-}
-if ($type==3 && /^      \)/) {
-    print <<END;
-      (GLUE O 6 R 0.250000 R 0.0 R 0.250000)
-END
-}
-if ($type==4 && /^      \)/) {
-    print <<END;
-      (GLUE O 6 R 0.500000 R 0.0 R 0.0)
-END
-}
-
-} # if $hankana
-
-print;
-
-next unless ($hankana);
-
-if ($charsintype==5 && /\)/) {
-    print <<END;
-(CHARSINTYPE O 6
-   UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67
-   UFF68 UFF69 UFF6A UFF6B UFF6C UFF6D UFF6E UFF6F
-   UFF70 UFF71 UFF72 UFF73 UFF74 UFF75 UFF76 UFF77
-   UFF78 UFF79 UFF7A UFF7B UFF7C UFF7D UFF7E UFF7F
-   UFF80 UFF81 UFF82 UFF83 UFF84 UFF85 UFF86 UFF87
-   UFF88 UFF89 UFF8A UFF8B UFF8C UFF8D UFF8E UFF8F
-   UFF90 UFF91 UFF92 UFF93 UFF94 UFF95 UFF96 UFF97
-   UFF98 UFF99 UFF9A UFF9B UFF9C UFF9D UFF9E UFF9F
-   )
-END
-    $charsintype=undef;
-}
-if ($label==5 && /STOP\)/) {
-    print <<END;
-   (LABEL O 6)
-   (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
-   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
-   (STOP)
-END
-    $label=undef;
-}
-if ($type==5 && /^   \)/) {
-    print <<END;
-(TYPE O 6
-   (CHARWD R 0.500000)
-   (CHARHT R 0.880000)
-   (CHARDP R 0.120000)
-   (COMMENT
-      (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
-      (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
-      )
-   )
-END
-    $type=undef;
-}
diff --git a/Master/tlpkg/tlpsrc/uptex-fonts.tlpsrc b/Master/tlpkg/tlpsrc/uptex-fonts.tlpsrc
index 572fe7a5c54..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/uptex-fonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex-fonts.tlpsrc
@@ -1,7 +0,0 @@
-runpattern d texmf-dist/fonts/tfm/uptex
-runpattern d texmf-dist/fonts/vf/uptex
-runpattern d texmf-dist/fonts/cmap/uptex
-#
-srcpattern d texmf-dist/source/fonts/uptex
-#
-docpattern d texmf-dist/doc/fonts/uptex
diff --git a/Master/tlpkg/tlpsrc/uptex.tlpsrc b/Master/tlpkg/tlpsrc/uptex.tlpsrc
index cfbecc4a609..9f7b9a40acf 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -34,13 +34,6 @@ binpattern f bin/${ARCH}/wovp2ovf
 #
 docpattern +d texmf-dist/doc/upmendex
 
-# uptex-fonts excludes:
-runpattern +!d texmf-dist/fonts/tfm/uptex
-runpattern +!d texmf-dist/fonts/vf/uptex
-runpattern +!d texmf-dist/fonts/cmap/uptex
-srcpattern +!d texmf-dist/source/fonts/uptex
-docpattern +!d texmf-dist/doc/fonts/uptex
-
 # uptex-base excludes:
 runpattern +!d texmf-dist/tex/uptex/uptex-base
 docpattern +!d texmf-dist/doc/uptex/uptex-base