zhmetrics-uptex (24apr16)

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

48 files changed, 499 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/README.md b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/README.md
new file mode 100644
index 00000000000..e8d0637b5e0
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/README.md
@@ -0,0 +1,74 @@
+zhmetrics-uptex
+===============================================
+
+**2016/04/23 Ver 1.0**
+
+The `zhmetrics-uptex` package contains some Chinese font metrics (JFM, VF, etc) for upTeX engine, together with a simple DVIPDFMx font mapping of Fandol fonts for DVIPDFMx.
+
+The font mapping can be loaded in the TeX source file, or changed in the document to use other fonts.
+
+Files
+-----
+
+* `upzh*-{h,v}.tfm` are the JFM files used by upTeX.
+* `upzh*-{h,v}.vf` are the virtual fonts used by the output driver (dvipdfmx).
+* `up*-{h,v}.tfm` are the PS TFM files used by the output driver.
+* `upzhfandolfonts.tex` contains the font mappings of Fandol fonts for DVIPDFMx.
+* `upzhfandolfonts-test.tex` is a small LaTeX test file.
+* `upzhm-{h,v}.pl` are the JPL source files used to produce JFM files.
+* `makemetrics.lua` is the build script.
+
+Build
+-----
+
+To create the metric files, just run:
+```shell
+texlua makemetrics.lua
+```
+in the source directory.
+
+Contributing
+------------
+
+This font package is a part of the [ctex-kit](https://github.com/CTeX-org/ctex-kit) project.
+
+Issues and pull requests are welcome.
+
+Copyright and Licence
+---------------------
+
+Copyright (C) 2016 by Leo Liu <leoliu.pku@gmail.com>
+
+This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Leo Liu.
+
+This work consists of the files
+        makemetrics.lua
+        upzhm-{h,v}.pl
+        upzhfandolfonts.tex
+        upzhfandolfongs-test.tex
+        README.md
+and the derived files
+        upzhserif-{h,v}.tfm
+        upzhserifit-{h,v}.tfm
+        upzhserifb-{h,v}.tfm
+        upzhsans-{h,v}.tfm
+        upzhsnasb-{h,v}.tfm
+        upzhmono-{h,v}.tfm
+        upzhserif-{h,v}.vf
+        upzhserifit-{h,v}.vf
+        upzhserifb-{h,v}.vf
+        upzhsans-{h,v}.vf
+        upzhsnasb-{h,v}.vf
+        upzhmono-{h,v}.vf
+        upserif-{h,v}.tfm
+        upserifit-{h,v}.tfm
+        upserifb-{h,v}.tfm
+        upsans-{h,v}.tfm
+        upsnasb-{h,v}.tfm
+        upmono-{h,v}.tfm
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/doc/README.md b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/doc/README.md
new file mode 100644
index 00000000000..e8d0637b5e0
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/doc/README.md
@@ -0,0 +1,74 @@
+zhmetrics-uptex
+===============================================
+
+**2016/04/23 Ver 1.0**
+
+The `zhmetrics-uptex` package contains some Chinese font metrics (JFM, VF, etc) for upTeX engine, together with a simple DVIPDFMx font mapping of Fandol fonts for DVIPDFMx.
+
+The font mapping can be loaded in the TeX source file, or changed in the document to use other fonts.
+
+Files
+-----
+
+* `upzh*-{h,v}.tfm` are the JFM files used by upTeX.
+* `upzh*-{h,v}.vf` are the virtual fonts used by the output driver (dvipdfmx).
+* `up*-{h,v}.tfm` are the PS TFM files used by the output driver.
+* `upzhfandolfonts.tex` contains the font mappings of Fandol fonts for DVIPDFMx.
+* `upzhfandolfonts-test.tex` is a small LaTeX test file.
+* `upzhm-{h,v}.pl` are the JPL source files used to produce JFM files.
+* `makemetrics.lua` is the build script.
+
+Build
+-----
+
+To create the metric files, just run:
+```shell
+texlua makemetrics.lua
+```
+in the source directory.
+
+Contributing
+------------
+
+This font package is a part of the [ctex-kit](https://github.com/CTeX-org/ctex-kit) project.
+
+Issues and pull requests are welcome.
+
+Copyright and Licence
+---------------------
+
+Copyright (C) 2016 by Leo Liu <leoliu.pku@gmail.com>
+
+This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Leo Liu.
+
+This work consists of the files
+        makemetrics.lua
+        upzhm-{h,v}.pl
+        upzhfandolfonts.tex
+        upzhfandolfongs-test.tex
+        README.md
+and the derived files
+        upzhserif-{h,v}.tfm
+        upzhserifit-{h,v}.tfm
+        upzhserifb-{h,v}.tfm
+        upzhsans-{h,v}.tfm
+        upzhsnasb-{h,v}.tfm
+        upzhmono-{h,v}.tfm
+        upzhserif-{h,v}.vf
+        upzhserifit-{h,v}.vf
+        upzhserifb-{h,v}.vf
+        upzhsans-{h,v}.vf
+        upzhsnasb-{h,v}.vf
+        upzhmono-{h,v}.vf
+        upserif-{h,v}.tfm
+        upserifit-{h,v}.tfm
+        upserifb-{h,v}.tfm
+        upsans-{h,v}.tfm
+        upsnasb-{h,v}.tfm
+        upmono-{h,v}.tfm
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/makemetrics.lua b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/makemetrics.lua
new file mode 100644
index 00000000000..8b55ee50f2a
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/makemetrics.lua
@@ -0,0 +1,19 @@
+#!/usr/bin/env texlua
+
+-- zhmetrics-uptex v1.0
+-- Copyright (C) 2016 by Leo Liu <leoliu.pku@gmail.com>
+
+local fonts = {'serif', 'serifit', 'serifb', 'sans', 'sansb', 'mono'}
+local pltopf = 'uppltotf -kanji=uptex'
+local makejvf = 'makejvf -i -u gb'
+
+for _, hv in pairs({'h', 'v'}) do
+	for _, fnt in pairs(fonts) do
+		local pl = string.format('upzhm-%s.pl', hv)
+		local jfm = string.format('upzh%s-%s.tfm', fnt, hv)
+		local vf = string.format('upzh%s-%s.vf', fnt, hv)
+		local pstfm = string.format('up%s-%s.tfm', fnt, hv)
+		os.execute(string.format('%s %s %s', pltopf, pl, jfm))
+		os.execute(string.format('%s %s %s', makejvf, jfm, pstfm))
+	end
+end
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts-test.pdf b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts-test.pdf
new file mode 100644
index 00000000000..cf34ea81eb1
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts-test.pdf
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts-test.tex b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts-test.tex
new file mode 100644
index 00000000000..fa44b52b490
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts-test.tex
@@ -0,0 +1,42 @@
+\documentclass{article}
+
+\usepackage[dvipdfm,a5paper,margin=1in]{geometry}
+\newcommand\vertical{%
+  \clearpage
+  \newgeometry{width=\textheight,height=\textwidth,left=1in,top=1in}%
+  \tate}
+
+\font\rm=upzhserif-h
+\font\it=upzhserifit-h
+\font\bf=upzhserifb-h
+\font\sf=upzhsans-h
+\font\sfbf=upzhsansb-h
+\font\tt=upzhmono-h
+\font\vrm=upzhserif-v
+\font\vit=upzhserifit-v
+\font\vbf=upzhserifb-v
+\font\vsf=upzhsans-v
+\font\vsfbf=upzhsansb-v
+\font\vtt=upzhmono-v
+
+\AtBeginDvi{\input{upzhfandolfonts}}
+
+\begin{document}
+
+\makeatletter
+\@for\fnt:=\rm,\it,\bf,\sf,\sfbf,\tt \do{%
+  {\fnt
+    庄子曰：“吾生也有涯，而知也无涯。以有涯随无涯，殆已！已而为知者，殆而已矣！
+    为善无近名，为恶无近刑，缘督以为经，可以保身，可以全生，可以养亲，可以尽年。”
+   \par}
+}
+
+\vertical
+
+\@for\fnt:=\vrm,\vit,\vbf,\vsf,\vsfbf,\vtt \do{%
+  {\fnt
+    庄子曰：「吾生也有涯，而知也无涯。以有涯随无涯，殆已！已而为知者，殆而已矣！
+    为善无近名，为恶无近刑，缘督以为经，可以保身，可以全生，可以养亲，可以尽年。」
+   \par}
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts.tex b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts.tex
new file mode 100644
index 00000000000..107014aff6e
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhfandolfonts.tex
@@ -0,0 +1,17 @@
+% Fandol font mapping for dvipdfmx
+
+\special{pdf:mapline upserif-h   UniGB-UTF16-H FandolSong-Regular.otf}
+\special{pdf:mapline upserifit-h UniGB-UTF16-H FandolKai-Regular.otf}
+\special{pdf:mapline upserifb-h  UniGB-UTF16-H FandolSong-Bold.otf}
+\special{pdf:mapline upsans-h    UniGB-UTF16-H FandolHei-Regular.otf}
+\special{pdf:mapline upsansb-h   UniGB-UTF16-H FandolHei-Bold.otf}
+\special{pdf:mapline upmono-h    UniGB-UTF16-H FandolFang-Regular.otf}
+
+\special{pdf:mapline upserif-v   UniGB-UTF16-V FandolSong-Regular.otf}
+\special{pdf:mapline upserifit-v UniGB-UTF16-V FandolKai-Regular.otf}
+\special{pdf:mapline upserifb-v  UniGB-UTF16-V FandolSong-Bold.otf}
+\special{pdf:mapline upsans-v    UniGB-UTF16-V FandolHei-Regular.otf}
+\special{pdf:mapline upsansb-v   UniGB-UTF16-V FandolHei-Bold.otf}
+\special{pdf:mapline upmono-v    UniGB-UTF16-V FandolFang-Regular.otf}
+
+\endinput
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhm-h.pl b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhm-h.pl
new file mode 100644
index 00000000000..48f3f4f4106
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhm-h.pl
@@ -0,0 +1,135 @@
+(COMMENT Chinese Font Metrics for upTeX Horizontal Typesetting)
+(DIRECTION YOKO)
+(FAMILY UPZHM HANZI)
+(FACE F MRR)
+(CODINGSCHEME TEX KANJI TEXT)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM O 0)
+(FONTDIMEN
+   (SLANT R 0.0)
+   (SPACE R 0.0)
+   (STRETCH R 0.100000)
+   (SHRINK R 0.0)
+   (XHEIGHT R 1.000000)
+   (QUAD R 1.000000)
+   (EXTRASPACE R 0.250000)
+   (EXTRASTRETCH R 0.200000)
+   (EXTRASHRINK R 0.125000)
+   )
+(GLUEKERN
+   (LABEL O 0)
+   (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)
+   (LABEL O 1)
+   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+   (STOP)
+   (LABEL O 2)
+   (GLUE O 0 R 0.500000 R 0.0 R 0.500000)
+   (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
+   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 5 R 0.500000 R 0.0 R 0.500000)
+   (STOP)
+   (LABEL O 3)
+   (GLUE O 0 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 1 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 2 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 3 R 0.500000 R 0.0 R 0.250000)
+   (GLUE O 4 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 5 R 0.250000 R 0.0 R 0.250000)
+   (STOP)
+   (LABEL O 4)
+   (GLUE O 0 R 0.500000 R 0.0 R 0.0)
+   (GLUE O 1 R 0.500000 R 0.0 R 0.0)
+   (GLUE O 3 R 0.750000 R 0.0 R 0.250000)
+   (GLUE O 5 R 0.500000 R 0.0 R 0.0)
+   (STOP)
+   (LABEL O 5)
+   (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
+   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+   (KRN O 5 R 0.0)
+   (STOP)
+   )
+(CHARSINTYPE O 1
+   ‘ “ （ 〔 ［ ｛ 〈 《 「 『
+   【
+   UFF5F U3018 U3016 U301D
+   )
+(CHARSINTYPE O 2
+   、 ， ’ ” ） 〕 ］ ｝ 〉 》
+   」 』 】
+   UFF60 U3019 U3017 U301F
+   )
+(CHARSINTYPE O 3
+   ・ ： ；
+   )
+(CHARSINTYPE O 4
+   。 ．
+   )
+(CHARSINTYPE O 5
+   — ― … ‥
+   )
+(TYPE O 0
+   (CHARWD R 1.000000)
+   (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)
+      )
+   )
+(TYPE O 1
+   (CHARWD R 0.500000)
+   (CHARHT R 0.880000)
+   (CHARDP R 0.120000)
+   (COMMENT
+      (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+      )
+   )
+(TYPE O 2
+   (CHARWD R 0.500000)
+   (CHARHT R 0.880000)
+   (CHARDP R 0.120000)
+   (COMMENT
+      (GLUE O 0 R 0.500000 R 0.0 R 0.500000)
+      (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
+      (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 5 R 0.500000 R 0.0 R 0.500000)
+      )
+   )
+(TYPE O 3
+   (CHARWD R 0.500000)
+   (CHARHT R 0.880000)
+   (CHARDP R 0.120000)
+   (COMMENT
+      (GLUE O 0 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 1 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 2 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 3 R 0.500000 R 0.0 R 0.250000)
+      (GLUE O 4 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 5 R 0.250000 R 0.0 R 0.250000)
+      )
+   )
+(TYPE O 4
+   (CHARWD R 0.500000)
+   (CHARHT R 0.880000)
+   (CHARDP R 0.120000)
+   (COMMENT
+      (GLUE O 0 R 0.500000 R 0.0 R 0.0)
+      (GLUE O 1 R 0.500000 R 0.0 R 0.0)
+      (GLUE O 3 R 0.750000 R 0.0 R 0.250000)
+      (GLUE O 5 R 0.500000 R 0.0 R 0.0)
+      )
+   )
+(TYPE O 5
+   (CHARWD R 1.000000)
+   (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)
+      (KRN O 5 R 0.0)
+      )
+   )
diff --git a/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhm-v.pl b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhm-v.pl
new file mode 100644
index 00000000000..53d04f3a1d5
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/zhmetrics-uptex/upzhm-v.pl
@@ -0,0 +1,135 @@
+(COMMENT Chinese Font Metrics for upTeX Vertical Typesetting)
+(DIRECTION TATE)
+(FAMILY UPZHM HANZI)
+(FACE F MRR)
+(CODINGSCHEME TEX KANJI TEXT)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM O 0)
+(FONTDIMEN
+   (SLANT R 0.0)
+   (SPACE R 0.0)
+   (STRETCH R 0.100000)
+   (SHRINK R 0.0)
+   (XHEIGHT R 1.000000)
+   (QUAD R 1.000000)
+   (EXTRASPACE R 0.250000)
+   (EXTRASTRETCH R 0.200000)
+   (EXTRASHRINK R 0.125000)
+   )
+(GLUEKERN
+   (LABEL O 0)
+   (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)
+   (LABEL O 1)
+   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+   (STOP)
+   (LABEL O 2)
+   (GLUE O 0 R 0.500000 R 0.0 R 0.500000)
+   (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
+   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 5 R 0.500000 R 0.0 R 0.500000)
+   (STOP)
+   (LABEL O 3)
+   (GLUE O 0 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 1 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 2 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 3 R 0.500000 R 0.0 R 0.250000)
+   (GLUE O 4 R 0.250000 R 0.0 R 0.250000)
+   (GLUE O 5 R 0.250000 R 0.0 R 0.250000)
+   (STOP)
+   (LABEL O 4)
+   (GLUE O 0 R 0.500000 R 0.0 R 0.0)
+   (GLUE O 1 R 0.500000 R 0.0 R 0.0)
+   (GLUE O 3 R 0.750000 R 0.0 R 0.250000)
+   (GLUE O 5 R 0.500000 R 0.0 R 0.0)
+   (STOP)
+   (LABEL O 5)
+   (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
+   (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+   (KRN O 5 R 0.0)
+   (STOP)
+   )
+(CHARSINTYPE O 1
+   ‘ “ （ 〔 ［ ｛ 〈 《 「 『
+   【
+   UFF5F U3018 U3016 U301D
+   )
+(CHARSINTYPE O 2
+   、 ， ’ ” ） 〕 ］ ｝ 〉 》
+   」 』 】
+   UFF60 U3019 U3017 U301F
+   )
+(CHARSINTYPE O 3
+   ・ ： ；
+   )
+(CHARSINTYPE O 4
+   。 ．
+   )
+(CHARSINTYPE O 5
+   — ― … ‥
+   )
+(TYPE O 0
+   (CHARWD R 1.000000)
+   (CHARHT R 0.500000)
+   (CHARDP R 0.500000)
+   (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)
+      )
+   )
+(TYPE O 1
+   (CHARWD R 0.500000)
+   (CHARHT R 0.500000)
+   (CHARDP R 0.500000)
+   (COMMENT
+      (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+      )
+   )
+(TYPE O 2
+   (CHARWD R 0.500000)
+   (CHARHT R 0.500000)
+   (CHARDP R 0.500000)
+   (COMMENT
+      (GLUE O 0 R 0.500000 R 0.0 R 0.500000)
+      (GLUE O 1 R 0.500000 R 0.0 R 0.500000)
+      (GLUE O 3 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 5 R 0.500000 R 0.0 R 0.500000)
+      )
+   )
+(TYPE O 3
+   (CHARWD R 0.500000)
+   (CHARHT R 0.500000)
+   (CHARDP R 0.500000)
+   (COMMENT
+      (GLUE O 0 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 1 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 2 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 3 R 0.500000 R 0.0 R 0.250000)
+      (GLUE O 4 R 0.250000 R 0.0 R 0.250000)
+      (GLUE O 5 R 0.250000 R 0.0 R 0.250000)
+      )
+   )
+(TYPE O 4
+   (CHARWD R 0.500000)
+   (CHARHT R 0.500000)
+   (CHARDP R 0.500000)
+   (COMMENT
+      (GLUE O 0 R 0.500000 R 0.0 R 0.0)
+      (GLUE O 1 R 0.500000 R 0.0 R 0.0)
+      (GLUE O 3 R 0.750000 R 0.0 R 0.250000)
+      (GLUE O 5 R 0.500000 R 0.0 R 0.0)
+      )
+   )
+(TYPE O 5
+   (CHARWD R 1.000000)
+   (CHARHT R 0.500000)
+   (CHARDP R 0.500000)
+   (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)
+      (KRN O 5 R 0.0)
+      )
+   )
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upmono-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upmono-h.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upmono-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upmono-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upmono-v.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upmono-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsans-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsans-h.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsans-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsans-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsans-v.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsans-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsansb-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsansb-h.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsansb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsansb-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsansb-v.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upsansb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserif-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserif-h.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserif-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserif-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserif-v.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserif-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifb-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifb-h.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifb-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifb-v.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifit-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifit-h.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifit-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifit-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifit-v.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upserifit-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhmono-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhmono-h.tfm
new file mode 100644
index 00000000000..012a6d7958a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhmono-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhmono-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhmono-v.tfm
new file mode 100644
index 00000000000..382995477fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhmono-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsans-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsans-h.tfm
new file mode 100644
index 00000000000..012a6d7958a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsans-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsans-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsans-v.tfm
new file mode 100644
index 00000000000..382995477fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsans-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsansb-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsansb-h.tfm
new file mode 100644
index 00000000000..012a6d7958a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsansb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsansb-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsansb-v.tfm
new file mode 100644
index 00000000000..382995477fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhsansb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserif-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserif-h.tfm
new file mode 100644
index 00000000000..012a6d7958a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserif-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserif-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserif-v.tfm
new file mode 100644
index 00000000000..382995477fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserif-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifb-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifb-h.tfm
new file mode 100644
index 00000000000..012a6d7958a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifb-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifb-v.tfm
new file mode 100644
index 00000000000..382995477fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifit-h.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifit-h.tfm
new file mode 100644
index 00000000000..012a6d7958a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifit-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifit-v.tfm b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifit-v.tfm
new file mode 100644
index 00000000000..382995477fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/zhmetrics-uptex/upzhserifit-v.tfm
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhmono-h.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhmono-h.vf
new file mode 100644
index 00000000000..5d8b02dc78d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhmono-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhmono-v.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhmono-v.vf
new file mode 100644
index 00000000000..8b10ee6793e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhmono-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsans-h.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsans-h.vf
new file mode 100644
index 00000000000..35643f7a7dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsans-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsans-v.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsans-v.vf
new file mode 100644
index 00000000000..4d1a8c23b64
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsans-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsansb-h.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsansb-h.vf
new file mode 100644
index 00000000000..4caf36e1065
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsansb-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsansb-v.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsansb-v.vf
new file mode 100644
index 00000000000..d0b8151773d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhsansb-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserif-h.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserif-h.vf
new file mode 100644
index 00000000000..c03828d2b64
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserif-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserif-v.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserif-v.vf
new file mode 100644
index 00000000000..eca41e1ff6e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserif-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifb-h.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifb-h.vf
new file mode 100644
index 00000000000..27186bcabfe
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifb-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifb-v.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifb-v.vf
new file mode 100644
index 00000000000..16cfc14ae2d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifb-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifit-h.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifit-h.vf
new file mode 100644
index 00000000000..3f04602829c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifit-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifit-v.vf b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifit-v.vf
new file mode 100644
index 00000000000..8d212be38ee
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/zhmetrics-uptex/upzhserifit-v.vf
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 61614b2f38c..54fb03e3e4a 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -627,7 +627,7 @@ my @TLP_working = qw(
     xwatermark xyling xymtex xypic xypic-tut-pt xytree
   yafoot yagusylo yannisgr yathesis yax ycbook ydoc yfonts yfonts-t1 yhmath
     yinit-otf york-thesis youngtab yplan ytableau
-  zed-csp zhnumber ziffer zhmetrics zhspacing zlmtt
+  zed-csp zhnumber ziffer zhmetrics zhmetrics-uptex zhspacing zlmtt
     zwgetfdate zwpagelayout
     zxjafbfont zxjafont zxjatype
 ); 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 38c39f6f3da..95a49f1854f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1155,6 +1155,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'zefonts',     "die 'skipping, noinfo license'", #&MAKEflatten",
  'zhmakeindex',	"die 'skipping, go seems too much to ask'",
  'zhmetrics',   "&MAKEcopy",
+ 'zhmetrics-uptex',	"&MAKEflatten",
  'zhmcjk',      "die 'skipping, sorry, 8000 tfm files, (7feb12)'",
  'zwgetfdate',  "&MAKEcopy",
  'zwpagelayout',"&MAKEcopy",
diff --git a/Master/tlpkg/tlpsrc/collection-langchinese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langchinese.tlpsrc
index 86d9d3065fa..5cda65524de 100644
--- a/Master/tlpkg/tlpsrc/collection-langchinese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langchinese.tlpsrc
@@ -19,5 +19,6 @@ depend lshort-chinese
 depend texlive-zh-cn
 depend xpinyin
 depend zhmetrics
+depend zhmetrics-uptex
 depend zhnumber
 depend zhspacing
diff --git a/Master/tlpkg/tlpsrc/zhmetrics-uptex.tlpsrc b/Master/tlpkg/tlpsrc/zhmetrics-uptex.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/zhmetrics-uptex.tlpsrc