pxchfon (30jun17)

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

2 files changed, 44 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index 3a60cf7701a..824b7a6b649 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2017/06/19 v1.0a]
+\ProvidesPackage{pxchfon}[2017/06/29 v1.0b]
 \def\pxcz@pkgname{pxchfon}
 
 %% preparations
@@ -127,7 +127,7 @@
   kozuka-pro,kozuka-pr6,kozuka-pr6n,hiragino-pro,hiragino-pron,%
   hiragino-elcapitan-pro,hiragino-elcapitan-pron,%
   morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-win10+,yu-osx,%
-  sourcehan-otc,sourcehan,noto-otc,noto%
+  sourcehan-otc,sourcehan,noto-otc,noto,%
   %(obsolete)
   ipa-otf,ipa-otf-dx,kozuka4,kozuka6,kozuka6n,hiragino,%
   %(alias)
@@ -414,7 +414,7 @@
 \def\pxcz@NC@otc@dif#1:{%
   :\the\pxcz@entry@type:}
 \def\pxcz@NC@otf@dif#1jp{%
-  #1\ifcase\pxcz@entry@type\or kr\or sc\fi}
+  #1\ifcase\pxcz@entry@type jp\or kr\or sc\fi}
 
 %% \pxcz@YW
 \def\pxcz@YW#1{%
@@ -496,6 +496,9 @@
 \@onlypreamble\pxcz@entry@a
 \def\pxcz@entry@a#1#2{%
   \chardef\pxcz@entry@type=#1\relax
+  \ifnum\pxcz@entry@type=\@ne\ifx\pxcz@cmap@uni\pxcz@cmap@hwuni
+    \let\@l\@gobble
+  \fi\fi
   \pxcz@check@entry \ifpxcz@ok
     \xdef\pxcz@spec{%
       \pxcz@spec\noexpand\special{\pxcz@mapline{#2}}}%
@@ -569,14 +572,14 @@
 \Entry{mgr}1{r-cfjas-r-@PXcjk0@ \UniCMap\            \FONT\@hwid}%
 }
 \pxcz@mapentry{UTF}{%
-\Entry{mnr}0{unijmin-h       \UniJIS-UTF16-H         \FONTs}%
-\Entry{mnr}0{unijmin-v       \UniJIS-UTF16-V         \FONTs\@w}%
+\Entry{mnr}0{unijmin-h       \UniJIS-UTF16-H         \FONTs\@jpXX}%
+\Entry{mnr}0{unijmin-v       \UniJIS-UTF16-V         \FONTs\@w\@jpXX}%
 \Entry{mnr}0{cidmin-h        Identity-H              \FONT/AJ16}%
 \Entry{mnr}0{cidmin-v        Identity-V              \FONT/AJ16}%
 \Entry{mnr}0{hmr             \*H                     \FONTs}%
 \Entry{mnr}0{hmrv            \*V                     \FONTs}%
-\Entry{gtu}0{unijgoth-h      \UniJIS-UTF16-H         \FONTs}%
-\Entry{gtu}0{unijgoth-v      \UniJIS-UTF16-V         \FONTs\@w}%
+\Entry{gtu}0{unijgoth-h      \UniJIS-UTF16-H         \FONTs\@jpXX}%
+\Entry{gtu}0{unijgoth-v      \UniJIS-UTF16-V         \FONTs\@w\@jpXX}%
 \Entry{gtu}0{cidgoth-h       Identity-H              \FONT/AJ16}%
 \Entry{gtu}0{cidgoth-v       Identity-V              \FONT/AJ16}%
 \Entry{gtu}0{hkb             \*H                     \FONTs}%
@@ -707,34 +710,34 @@
 \Entry{tcg}0{upmhm-v         \@+UniCNS-UTF16-V       \FONT\@w}%
 }
 \pxcz@mapentry{UPOTF}{%
-\Entry{mnl}0{uphminl-h       \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{mnl}0{uphminl-v       \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{mnl}0{uphminln-h      \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{mnl}0{uphminln-v      \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
-\Entry{mnr}0{uphminr-h       \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{mnr}0{uphminr-v       \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{mnr}0{uphminrn-h      \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{mnr}0{uphminrn-v      \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
-\Entry{mnb}0{uphminb-h       \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{mnb}0{uphminb-v       \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{mnb}0{uphminbn-h      \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{mnb}0{uphminbn-v      \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
-\Entry{gtr}0{uphgothr-h      \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{gtr}0{uphgothr-v      \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{gtr}0{uphgothrn-h     \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{gtr}0{uphgothrn-v     \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
-\Entry{gtb}0{uphgothb-h      \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{gtb}0{uphgothb-v      \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{gtb}0{uphgothbn-h     \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{gtb}0{uphgothbn-v     \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
-\Entry{gtx}0{uphgotheb-h     \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{gtx}0{uphgotheb-v     \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{gtx}0{uphgothebn-h    \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{gtx}0{uphgothebn-v    \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
-\Entry{mgr}0{uphmgothr-h     \@+UniJIS-UTF16-H       \FONTs\@jp90}%
-\Entry{mgr}0{uphmgothr-v     \@+UniJIS-UTF16-V       \FONTs\@w\@jp90}%
-\Entry{mgr}0{uphmgothrn-h    \@+UniJIS2004-UTF16-H   \FONTs\@jp04}%
-\Entry{mgr}0{uphmgothrn-v    \@+UniJIS2004-UTF16-V   \FONTs\@w\@jp04}%
+\Entry{mnl}0{uphminl-h       \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{mnl}0{uphminl-v       \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{mnl}0{uphminln-h      \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{mnl}0{uphminln-v      \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
+\Entry{mnr}0{uphminr-h       \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{mnr}0{uphminr-v       \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{mnr}0{uphminrn-h      \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{mnr}0{uphminrn-v      \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
+\Entry{mnb}0{uphminb-h       \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{mnb}0{uphminb-v       \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{mnb}0{uphminbn-h      \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{mnb}0{uphminbn-v      \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
+\Entry{gtr}0{uphgothr-h      \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{gtr}0{uphgothr-v      \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{gtr}0{uphgothrn-h     \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{gtr}0{uphgothrn-v     \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
+\Entry{gtb}0{uphgothb-h      \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{gtb}0{uphgothb-v      \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{gtb}0{uphgothbn-h     \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{gtb}0{uphgothbn-v     \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
+\Entry{gtx}0{uphgotheb-h     \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{gtx}0{uphgotheb-v     \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{gtx}0{uphgothebn-h    \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{gtx}0{uphgothebn-v    \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
+\Entry{mgr}0{uphmgothr-h     \@+UniJIS-UTF16-H       \FONTo\@jp90}%
+\Entry{mgr}0{uphmgothr-v     \@+UniJIS-UTF16-V       \FONTo\@w\@jp90}%
+\Entry{mgr}0{uphmgothrn-h    \@+UniJIS2004-UTF16-H   \FONT\@jp04}%
+\Entry{mgr}0{uphmgothrn-v    \@+UniJIS2004-UTF16-V   \FONT\@w\@jp04}%
 }
 \pxcz@mapentry{PXOTF}{%
 }
@@ -1152,8 +1155,7 @@
 
 %% definitions of main preset mappings
 \pxcz@declare@preset{noembed}{%
-  \usecmapforalphabet
-  \pxcz@uniweight{Ryumin-Light}{GothicBBB-Medium}}
+  \pxcz@uniweight{*}{*}}
 %(uniweight)
 \pxcz@declare@preset{ms}{%
   \pxcz@uniweight{:0:msmincho.ttc}{:0:msgothic.ttc}}
@@ -1259,7 +1261,7 @@
    {\pxcz@SH:0:SourceHanSans-Bold.ttc}%
    {\pxcz@SH:0:SourceHanSans-Heavy.ttc}%
    {\pxcz@SH:0:SourceHanSans-Medium.ttc}%
-   {\pxcz@SH:0:SourceHanSans-Heavy.ttc}}
+   {\pxcz@SH:0:SourceHanSans-Medium.ttc}}
 % Source Han Sans/Serif, "Language-specific OTF"
 \pxcz@declare@preset{sourcehan}{%
   \pxcz@multiweight{\pxcz@SH/SourceHanSerif-Light.otf}%
@@ -1269,7 +1271,7 @@
    {\pxcz@SH/SourceHanSans-Bold.otf}%
    {\pxcz@SH/SourceHanSans-Heavy.otf}%
    {\pxcz@SH/SourceHanSans-Medium.otf}%
-   {\pxcz@SH/SourceHanSans-Heavy.otf}}
+   {\pxcz@SH/SourceHanSans-Medium.otf}}
 % Noto Sans/Serif CJK, "OpenType/CFF Collection (OTC)"
 \pxcz@declare@preset{noto-otc}{%
   \pxcz@multiweight{\pxcz@NC:0:NotoSerifCJK-Light.ttc}%
@@ -1279,7 +1281,7 @@
    {\pxcz@NC:0:NotoSansCJK-Bold.ttc}%
    {\pxcz@NC:0:NotoSansCJK-Black.ttc}%
    {\pxcz@NC:0:NotoSansCJK-Medium.ttc}%
-   {\pxcz@NC:0:NotoSansCJK-Black.ttc}}
+   {\pxcz@NC:0:NotoSansCJK-Medium.ttc}}
 % Noto Sans/Serif CJK, "Language-specific OpenType/CFF (OTF)"
 \pxcz@declare@preset{noto}{%
   \pxcz@multiweight{\pxcz@NC/NotoSerifCJKjp-Light.otf}%
@@ -1289,7 +1291,7 @@
    {\pxcz@NC/NotoSansCJKjp-Bold.otf}%
    {\pxcz@NC/NotoSansCJKjp-Black.otf}%
    {\pxcz@NC/NotoSansCJKjp-Medium.otf}%
-   {\pxcz@NC/NotoSansCJKjp-Black.otf}}
+   {\pxcz@NC/NotoSansCJKjp-Medium.otf}}
 %(obsolete)
 \pxcz@declare@depre@preset{ipa-otf}{%
   \pxcz@uniweight{ipam.otf}{ipag.otf}}
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
index dce785b4876..aabce1780dc 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjafont}[2017/06/19 v1.0a]
+\ProvidesPackage{pxjafont}[2017/06/29 v1.0b]
 %% show warning
 \PackageWarning{pxchfon}
  {The package 'pxjafont' is obsolete and its use is\MessageBreak