From 04dbd87044210791fa8fecaa3c7254779add856b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 Nov 2013 22:23:00 +0000 Subject: japanese-otf-uptex (27nov13) git-svn-id: svn://tug.org/texlive/trunk@32255 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/fonts/japanese-otf-uptex/00otf-uptex.txt | 14 +- .../texmf-dist/doc/fonts/japanese-otf-uptex/README | 8 +- .../doc/fonts/japanese-otf-uptex/fontmap.zip | Bin 0 -> 5606 bytes .../fonts/japanese-otf-uptex/otf-script-gteb.diff | 132 ---- .../fonts/japanese-otf-uptex/test/uplatex/Makefile | 27 +- .../japanese-otf-uptex/test/uplatex/otfscale.tex | 69 ++ .../patch/otfbeta_uptex-0.12.patch | 716 --------------------- .../patch/otfbeta_uptex-0.13.patch | 716 +++++++++++++++++++++ .../tex/platex/japanese-otf-uptex/mlutf.sty | 2 +- .../tex/platex/japanese-otf-uptex/otf.sty | 50 +- 10 files changed, 858 insertions(+), 876 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip delete mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff create mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex delete mode 100644 Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch create mode 100644 Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt index d0cd423b329..2f63da171b5 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt @@ -1,10 +1,10 @@ [ Title ] -otfbeta-uptex (japanese-otf-uptex) Ver.0.12 2013/06/02 +otfbeta-uptex (japanese-otf-uptex) Ver.0.13 2013/11/23 [ Abstract ] This is a package for upLaTeX support of -japanese-otf package "otfbeta (v1.7b5 2012/4/11)" by psitau-san +japanese-otf package "otfbeta (v1.7b6 2013/11/17)" by psitau-san ( http://psitau.kitunebi.com/otf.html ) It requires upTeX-0.20 or later. @@ -218,4 +218,14 @@ to Adobe standard CMap "UniJIS2004-UTF16-{H,V}". Revise. test/uplatex/upjis2004.tex, test/uplatex/Makefile:: Add new test. +2013.11.21 Ver0.13 + sty/otf.sty :: + Add scale option by following otfbeta v1.7b6. + Increment version number. + sty/mlutf.sty :: + Increment version number. + patch/*.patch:: + Revise. + test/uplatex/otfscale.tex, test/uplatex/Makefile:: + Add new test. diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README index dda342b34f6..0a73d782d41 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README @@ -3,12 +3,12 @@ README From 00otf-uptex.txt: [ Title ] -otfbeta-uptex (japanese-otf-uptex) Ver.0.12 2013/06/02 +otfbeta-uptex (japanese-otf-uptex) Ver.0.13 2013/11/23 [ Abstract ] This is a package for upLaTeX support of -japanese-otf package "otfbeta (v1.7b5 2012/4/11)" by psitau-san +japanese-otf package "otfbeta (v1.7b6 2012/11/17)" by psitau-san ( http://psitau.kitunebi.com/otf.html ) It requires upTeX-0.20 or later. @@ -21,11 +21,11 @@ For copyright and licensing, please see COPYRIGHT The original source has been downloaded from http://homepage3.nifty.com/ttk/comp/tex/uptex.html as - http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.12.tar.xz + http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.13.tar.xz After that the scripts run and the generated tfm and vf files included. The scripts were run with the env variable OVP2OVF=wovp2ovf Norbert Preining -2013-11-20 +2013-11-23 diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip new file mode 100644 index 00000000000..7eea5f4fa6b Binary files /dev/null and b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip differ diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff deleted file mode 100644 index d6c16a9cd9e..00000000000 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff +++ /dev/null @@ -1,132 +0,0 @@ -diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl japanese-otf-uptex/script/mktfm_sp.pl ---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl 2012-02-21 00:32:33.000000000 +0900 -+++ japanese-otf-uptex/script/mktfm_sp.pl 2013-03-27 17:41:18.483841871 +0900 -@@ -24,7 +24,7 @@ - - opendir(TFM, "tfm") || mkdir("tfm",0755) || die "cannot mkdir tfm"; - --my @face = qw/mr gr mb gb mgr ml/; -+my @face = qw/mr gr mb gb mgr ml ge/; - my @lang = qw/j t c k/; - my @dir = qw/h v/; - my %font_id = qw/1b g 1d h 1e i 1f j -diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl japanese-otf-uptex/script/mkutfvf_sp.pl ---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl 2012-02-21 00:32:33.000000000 +0900 -+++ japanese-otf-uptex/script/mkutfvf_sp.pl 2013-03-27 17:41:09.147842163 +0900 -@@ -24,7 +24,7 @@ - opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp"; - opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf"; - --my @face = qw/mr gr mb gb mgr ml/; -+my @face = qw/mr gr mb gb mgr ml ge/; - my @lang = qw/j t c k/; ## priority: j > t > c > k - my %lang_id; foreach $_ (0..$#lang) { $lang_id{$lang[$_]}=$_; } - my @dir = qw/h v/; -diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf japanese-otf-uptex/umakeotf ---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf 2012-04-24 08:52:46.000000000 +0900 -+++ japanese-otf-uptex/umakeotf 2013-03-27 17:37:19.275849360 +0900 -@@ -1,8 +1,8 @@ - #!/bin/sh - - #OVP2OVF='omfonts -ovp2ovf' --#OVP2OVF='wovp2ovf' --#export OVP2OVF -+OVP2OVF='wovp2ovf' -+export OVP2OVF - - if test ! -d tfm; then - mkdir tfm -@@ -42,6 +42,10 @@ - #for extra fonts - uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlgotheb-h.tfm - uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlgotheb-v.tfm -+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpgotheb-h.tfm -+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpgotheb-v.tfm -+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubygotheb-v.tfm -+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubygotheb-h.tfm - uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlminl-h.tfm - uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlminl-v.tfm - uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpminl-h.tfm -@@ -62,7 +66,7 @@ - ./umkjvf -ucs -sp 1 -cm -cp upnmlmgothr-v uphmgothr-v - #extra fonts - ./umkjvf -ucs -sp 1 -cq upnmlgotheb-h uphgotheb-h --./umkjvf -ucs -sp 1 -cp upnmlgotheb-v uphgotheb-v -+./umkjvf -ucs -sp 1 -cm -cp upnmlgotheb-v uphgotheb-v - ./umkjvf -ucs -sp 1 -cq upnmlminl-h uphminl-h - ./umkjvf -ucs -sp 1 -cm -cp upnmlminl-v uphminl-v - echo "making alt. kana ..." -@@ -90,6 +94,10 @@ - ./umkjvf -ucs -sp 1 -cm -cp -expert upexpminl-v uphminl-v cidjminl - ./umkjvf -ucs -sp 1 -cq -ruby uprubyminl-h uphminl-h cidjminl - ./umkjvf -ucs -sp 1 -cm -cp -ruby uprubyminl-v uphminl-v cidjminl -+./umkjvf -ucs -sp 1 -cq -expert upexpgotheb-h uphgotheb-h cidjgotheb -+./umkjvf -ucs -sp 1 -cm -cp -expert upexpgotheb-v uphgotheb-v cidjgotheb -+./umkjvf -ucs -sp 1 -cq -ruby uprubygotheb-h uphgotheb-h cidjgotheb -+./umkjvf -ucs -sp 1 -cm -cp -ruby uprubygotheb-v uphgotheb-v cidjgotheb - echo "making tfm for supplementary plane ..." - perl script/mktfm_sp.pl - echo "making vf for supplementary plane ..." -diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg japanese-otf-uptex/umakeotf_brsg ---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg 2012-04-24 08:52:46.000000000 +0900 -+++ japanese-otf-uptex/umakeotf_brsg 2013-03-27 17:36:30.655850882 +0900 -@@ -1,8 +1,8 @@ - #!/bin/sh - - #OVP2OVF='omfonts -ovp2ovf' --#OVP2OVF='wovp2ovf' --#export OVP2OVF -+OVP2OVF='wovp2ovf' -+export OVP2OVF - - if test ! -d tfm; then - mkdir tfm -@@ -31,6 +31,8 @@ - uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpmgothr-v.tfm - uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlgotheb-h.tfm - uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlgotheb-v.tfm -+uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpgotheb-h.tfm -+uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpgotheb-v.tfm - uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlminl-h.tfm - uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlminl-v.tfm - uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpminl-h.tfm -@@ -46,7 +48,7 @@ - ./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlmgothr-h uphmgothr-h - ./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlmgothr-v uphmgothr-v - ./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlgotheb-h uphgotheb-h --./umkjvf -ucs -sp 1 -sage -cp upbrsgnmlgotheb-v uphgotheb-v -+./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlgotheb-v uphgotheb-v - ./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlminl-h uphminl-h - ./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlminl-v uphminl-v - ./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminr-h uphminr-h cidjminr -@@ -59,6 +61,8 @@ - ./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgothb-v uphgothb-v cidjgothb - ./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpmgothr-h uphmgothr-h cidjmgothr - ./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpmgothr-v uphmgothr-v cidjmgothr -+./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpgotheb-h uphgotheb-h cidjgotheb -+./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgotheb-v uphgotheb-v cidjgotheb - ./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminl-h uphminl-h cidjminl - ./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpminl-v uphminl-v cidjminl - -diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf japanese-otf-uptex/umkjvf ---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf 2012-04-24 08:52:46.000000000 +0900 -+++ japanese-otf-uptex/umkjvf 2013-03-27 17:35:31.923852721 +0900 -@@ -554,6 +554,8 @@ - $face="cidjmgr"; - }elsif($kana_font eq "cidjminl"){ - $face="cidjml"; -+ }elsif($kana_font eq "cidjgotheb"){ -+ $face="cidjge"; - }elsif($kana_font eq "cidmin"){ - $face="cidm"; - }elsif($kana_font eq "cidgoth"){ -@@ -567,6 +569,8 @@ - $face="cidjmb"; - }elsif($kanji_font =~ /hgothb/){ - $face="cidjgb"; -+ }elsif($kanji_font =~ /hgotheb/){ -+ $face="cidjge"; - }elsif($kanji_font =~ /hmgothr/){ - $face="cidjmgr"; - }elsif($kanji_font =~ /hminl/){ - diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile index 872b8e1eb80..ef8933cf9a5 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile @@ -6,13 +6,14 @@ DVIPS = dvips DVIPDFMX = dvipdfmx PDVITYPE = pdvitype -all: otf sp art bsrg jis04 +all: otf sp art bsrg jis04 scale otf: uplatex-otf platex-otf sp: uplatex-sp platex-sp art: uplatex-article platex-article brsg: uplatex-brsg platex-brsg jis04: uplatex-jis04 platex-jis04 +scale: uplatex-scale platex-scale uplatex-otf: for opt in default deluxe expert bold noreplace; do \ @@ -120,5 +121,29 @@ platex-jis04: done \ done +uplatex-scale: + for scl in default 0.5 1.0 1.5 2.0; do \ + $(UPLATEX) "\def\scale{$$scl}\def\class{ujarticle}\input" otfscale.tex ; \ + mv otfscale.dvi otfscale-$$scl-uplatex.dvi ; \ + $(DVIPDFMX) otfscale-$$scl-uplatex.dvi ; \ + done + for scl in default 1.0; do \ + $(UPLATEX) "\def\scale{$$scl}\def\class{jsarticle}\input" otfscale.tex ; \ + mv otfscale.dvi otfscale-$$scl-js-uplatex.dvi ; \ + $(DVIPDFMX) otfscale-$$scl-js-uplatex.dvi ; \ + done + +platex-scale: + for scl in default 0.5 1.0 1.5 2.0; do \ + $(PLATEX) "\def\scale{$$scl}\def\class{jarticle}\input" otfscale.tex ; \ + mv otfscale.dvi otfscale-$$scl-platex.dvi ; \ + $(DVIPDFMX) otfscale-$$scl-platex.dvi ; \ + done + for scl in default 1.0; do \ + $(PLATEX) "\def\scale{$$scl}\def\class{jsarticle}\input" otfscale.tex ; \ + mv otfscale.dvi otfscale-$$scl-js-platex.dvi ; \ + $(DVIPDFMX) otfscale-$$scl-js-platex.dvi ; \ + done + clean: rm *.aux *.log *.dvi *.pdf diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex new file mode 100644 index 00000000000..49d42eb1770 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex @@ -0,0 +1,69 @@ +\makeatletter + +\def\@opt@{multi} +\def\@default{default} +\def\@jarticle{jarticle} +\def\@tarticle{tarticle} +\def\@op@cls{} + +\ifx\option\@undefined + \def\option{default} +\fi +\ifx\option\@default +\else + \edef\@opt@{\option,\@opt@} +\fi + +\ifx\scale\@undefined + \edef\scale{default} +\else + \ifx\scale\@default + \else + \edef\@opt@{scale=\scale,\@opt@} + \fi +\fi +\typeout{## scale: \scale ##} + +\ifx\class\@undefined + \def\class{jarticle} +\fi +\ifx\class\@jarticle +\else + \ifx\class\@tarticle + \else + \ifnum\jis"2121="3000 + \edef\@opt@{uplatex,\@opt@} + \def\@op@cls{,uplatex} + \else + \fi + \fi +\fi + +\documentclass[a4paper,titlepage,draft\@op@cls]{\class} + +\usepackage[\@opt@]{otf} +\usepackage{color} +\newcommand{\redframe}[1]{% + \textcolor{red}{\frame{\textcolor{black}{#1}}}} + +\begin{document} +\section{見出し} + +クラス:\texttt{\class}\\ +オプション:\texttt{\option}\\ +スケール:\texttt{\scale} + +\parindent0mm +\xkanjiskip=0pt plus.1pt minus.1pt + +\vbox{\tate +\hbox{\Large \redframe{HMH}\redframe{回□回}\redframe{HMH}\redframe{回□回}\redframe{HMH}} +\hbox{\Large HMH回□回HMH回□回HMH} +} + +\vbox{\yoko +\hbox{\Large \redframe{HMH}\redframe{回□回}\redframe{HMH}\redframe{回□回}\redframe{HMH}} +\hbox{\Large HMH回□回HMH回□回HMH} +} + +\end{document} diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch deleted file mode 100644 index 34a3fd0764c..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch +++ /dev/null @@ -1,716 +0,0 @@ -diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips) ---- otfbeta.orig/fontmap/hiragino.map(for udvips) 2010-03-27 09:38:48 +0900 -+++ otfbeta/fontmap/hiragino.map(for udvips) 2013-06-02 15:49:35 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v HiraMinPro-W3-Identity-V - hminr-h HiraMinPro-W3-H - hminr-v HiraMinPro-W3-V -+uphminr-h HiraMinPro-W3-UniJIS-UTF16-H -+uphminr-v HiraMinPro-W3-UniJIS-UTF16-V - - otf-ujgr-h HiraKakuPro-W3-UniJIS-UTF16-H - otf-ujgr-v HiraKakuPro-W3-UniJIS-UTF16-V -@@ -11,6 +13,8 @@ - otf-cjgr-v HiraKakuPro-W3-Identity-V - hgothr-h HiraKakuPro-W3-H - hgothr-v HiraKakuPro-W3-V -+uphgothr-h HiraKakuPro-W3-UniJIS-UTF16-H -+uphgothr-v HiraKakuPro-W3-UniJIS-UTF16-V - - otf-ujmb-h HiraMinPro-W6-UniJIS-UTF16-H - otf-ujmb-v HiraMinPro-W6-UniJIS-UTF16-V -@@ -18,6 +22,8 @@ - otf-cjmb-v HiraMinPro-W6-Identity-V - hminb-h HiraMinPro-W6-H - hminb-v HiraMinPro-W6-V -+uphminb-h HiraMinPro-W6-UniJIS-UTF16-H -+uphminb-v HiraMinPro-W6-UniJIS-UTF16-V - - otf-cjgb-h HiraKakuPro-W6-Identity-H - otf-cjgb-v HiraKakuPro-W6-Identity-V -@@ -25,9 +31,13 @@ - otf-ujgb-v HiraKakuPro-W6-UniJIS-UTF16-V - hgothb-h HiraKakuPro-W6-H - hgothb-v HiraKakuPro-W6-V -+uphgothb-h HiraKakuPro-W6-UniJIS-UTF16-H -+uphgothb-v HiraKakuPro-W6-UniJIS-UTF16-V - - hgotheb-h HiraKakuStd-W8-H - hgotheb-v HiraKakuStd-W8-V -+uphgotheb-h HiraKakuStd-W8-UniJIS-UTF16-H -+uphgotheb-v HiraKakuStd-W8-UniJIS-UTF16-V - - otf-ujmgr-h HiraMaruPro-W4-UniJIS-UTF16-H - otf-ujmgr-v HiraMaruPro-W4-UniJIS-UTF16-V -@@ -35,6 +45,8 @@ - otf-cjmgr-v HiraMaruPro-W4-Identity-V - hmgothr-h HiraMaruPro-W4-H - hmgothr-v HiraMaruPro-W4-V -+uphmgothr-h HiraMaruPro-W4-UniJIS-UTF16-H -+uphmgothr-v HiraMaruPro-W4-UniJIS-UTF16-V - - otf-ujml-h HiraMinPro-W2-UniJIS-UTF16-H - otf-ujml-v HiraMinPro-W2-UniJIS-UTF16-V -@@ -42,6 +54,8 @@ - otf-cjml-v HiraMinPro-W2-Identity-V - hminl-h HiraMinPro-W2-H - hminl-v HiraMinPro-W2-V -+uphminl-h HiraMinPro-W2-UniJIS-UTF16-H -+uphminl-v HiraMinPro-W2-UniJIS-UTF16-V - - hiramin-w3-h HiraMinPro-W3-Identity-H - hiramin-w6-h HiraMinPro-W6-Identity-H -@@ -59,28 +73,40 @@ - otf-ujmrn-v HiraMinProN-W3-UniJIS2004-UTF16-V - hminrn-h HiraMinProN-W3-H - hminrn-v HiraMinProN-W3-V -+uphminrn-h HiraMinPro-W3-UniJIS2004-UTF16-H -+uphminrn-v HiraMinPro-W3-UniJIS2004-UTF16-V - - otf-ujgrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H - otf-ujgrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V - hgothrn-h HiraKakuProN-W3-H - hgothrn-v HiraKakuProN-W3-V -+uphgothrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H -+uphgothrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V - - otf-ujmbn-h HiraMinProN-W6-UniJIS2004-UTF16-H - otf-ujmbn-v HiraMinProN-W6-UniJIS2004-UTF16-V - hminbn-h HiraMinProN-W6-H - hminbn-v HiraMinProN-W6-V -+uphminbn-h HiraMinProN-W6-UniJIS2004-UTF16-H -+uphminbn-v HiraMinProN-W6-UniJIS2004-UTF16-V - - otf-ujgbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H - otf-ujgbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V - hgothbn-h HiraKakuProN-W6-H - hgothbn-v HiraKakuProN-W6-V -+uphgothbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H -+uphgothbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V - - otf-ujmgrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H - otf-ujmgrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V - hmgothrn-h HiraMaruProN-W4-H - hmgothrn-v HiraMaruProN-W4-V -+uphmgothrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H -+uphmgothrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V - - otf-ujmln-h HiraMinProN-W2-UniJIS2004-UTF16-H - otf-ujmln-v HiraMinProN-W2-UniJIS2004-UTF16-V - hminln-h HiraMinProN-W2-H - hminln-v HiraMinProN-W2-V -+uphminln-h HiraMinProN-W2-UniJIS2004-UTF16-H -+uphminln-v HiraMinProN-W2-UniJIS2004-UTF16-V -diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx) ---- otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) 2010-03-27 09:39:08 +0900 -+++ otfbeta/fontmap/hiraginox.map(for dvipdfmx) 2013-06-02 15:43:07 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v Identity-V HiraMinPro-W3 - hminr-h H HiraMinPro-W3 - hminr-v V HiraMinPro-W3 -+uphminr-h UniJIS-UTF16-H HiraMinPro-W3 -+uphminr-v UniJIS-UTF16-V HiraMinPro-W3 - - otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3 - otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3 -@@ -11,6 +13,8 @@ - otf-cjgr-v Identity-V HiraKakuPro-W3 - hgothr-h H HiraKakuPro-W3 - hgothr-v V HiraKakuPro-W3 -+uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3 -+uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3 - - otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6 - otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6 -@@ -18,6 +22,8 @@ - otf-cjmb-v Identity-V HiraMinPro-W6 - hminb-h H HiraMinPro-W6 - hminb-v V HiraMinPro-W6 -+uphminb-h UniJIS-UTF16-H HiraMinPro-W6 -+uphminb-v UniJIS-UTF16-V HiraMinPro-W6 - - otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6 - otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6 -@@ -25,9 +31,13 @@ - otf-cjgb-v Identity-V HiraKakuPro-W6 - hgothb-h H HiraKakuPro-W6 - hgothb-v V HiraKakuPro-W6 -+uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6 -+uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6 - - hgotheb-h H HiraKakuStd-W8 - hgotheb-v V HiraKakuStd-W8 -+uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8 -+uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8 - - otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4 - otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4 -@@ -35,6 +45,8 @@ - otf-cjmgr-v Identity-V HiraMaruPro-W4 - hmgothr-h H HiraMaruPro-W4 - hmgothr-v V HiraMaruPro-W4 -+uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4 -+uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4 - - otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2 - otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2 -@@ -42,6 +54,8 @@ - otf-cjml-v Identity-V HiraMinPro-W2 - hminl-h H HiraMinPro-W2 - hminl-v V HiraMinPro-W2 -+uphminl-h UniJIS-UTF16-H HiraMinPro-W2 -+uphminl-v UniJIS-UTF16-V HiraMinPro-W2 - - hiramin-w3-h Identity-H HiraMinPro-W3 - hiramin-w6-h Identity-H HiraMinPro-W6 -@@ -59,28 +73,40 @@ - otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3 - hminrn-h H HiraMinProN-W3 - hminrn-v V HiraMinProN-W3 -+uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3 -+uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3 - - otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3 - otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3 - hgothrn-h H HiraKakuProN-W3 - hgothrn-v V HiraKakuProN-W3 -+uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3 -+uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3 - - otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6 - otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6 - hminbn-h H HiraMinProN-W6 - hminbn-v V HiraMinProN-W6 -+uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6 -+uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6 - - otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6 - otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6 - hgothbn-h H HiraKakuProN-W6 - hgothbn-v V HiraKakuProN-W6 -+uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6 -+uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6 - - otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4 - otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4 - hmgothrn-h H HiraMaruProN-W4 - hmgothrn-v V HiraMaruProN-W4 -+uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4 -+uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4 - - otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2 - otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2 - hminln-h H HiraMinProN-W2 - hminln-v V HiraMinProN-W2 -+uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2 -+uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2 -diff -urN otfbeta.orig/fontmap/kozuka.map otfbeta/fontmap/kozuka.map ---- otfbeta.orig/fontmap/kozuka.map 2004-12-23 23:56:18 +0900 -+++ otfbeta/fontmap/kozuka.map 2012-01-01 16:52:24 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v KozMinPro-Regular-Acro-Identity-V - hminr-h KozMinPro-Regular-Acro-H - hminr-v KozMinPro-Regular-Acro-V -+uphminr-h KozMinPro-Regular-Acro-UniJIS-UTF16-H -+uphminr-v KozMinPro-Regular-Acro-UniJIS-UTF16-V - - otf-ujgr-h KozGoStd-Regular-UniJIS-UTF16-H - otf-ujgr-v KozGoStd-Regular-UniJIS-UTF16-V -@@ -11,6 +13,8 @@ - otf-cjgr-v KozGoStd-Regular-Identity-V - hgothr-h KozGoStd-Regular-H - hgothr-v KozGoStd-Regular-V -+uphgothr-h KozGoStd-Regular-UniJIS-UTF16-H -+uphgothr-v KozGoStd-Regular-UniJIS-UTF16-V - - otf-ujmb-h KozMinStd-Bold-UniJIS-UTF16-H - otf-ujmb-v KozMinStd-Bold-UniJIS-UTF16-V -@@ -18,6 +22,8 @@ - otf-cjmb-v KozMinStd-Bold-Identity-V - hminb-h KozMinStd-Bold-H - hminb-v KozMinStd-Bold-V -+uphminb-h KozMinStd-Bold-UniJIS-UTF16-H -+uphminb-v KozMinStd-Bold-UniJIS-UTF16-V - - otf-cjgb-h KozGoStd-Bold-Identity-H - otf-cjgb-v KozGoStd-Bold-Identity-V -@@ -25,6 +31,8 @@ - otf-ujgb-v KozGoStd-Bold-UniJIS-UTF16-V - hgothb-h KozGoStd-Bold-H - hgothb-v KozGoStd-Bold-V -+uphgothb-h KozGoStd-Bold-UniJIS-UTF16-H -+uphgothb-v KozGoStd-Bold-UniJIS-UTF16-V - - otf-ujmgr-h KozGoStd-Heavy-UniJIS-UTF16-H - otf-ujmgr-v KozGoStd-Heavy-UniJIS-UTF16-V -@@ -32,6 +40,8 @@ - otf-cjmgr-v KozGoStd-Heavy-Identity-V - hmgothr-h KozGoStd-Heavy-H - hmgothr-v KozGoStd-Heavy-V -+uphmgothr-h KozGoStd-Heavy-UniJIS-UTF16-H -+uphmgothr-v KozGoStd-Heavy-UniJIS-UTF16-V - - % - %for Adobe Reader 7 -diff -urN otfbeta.orig/fontmap/kozukax.map otfbeta/fontmap/kozukax.map ---- otfbeta.orig/fontmap/kozukax.map 2004-12-23 23:54:40 +0900 -+++ otfbeta/fontmap/kozukax.map 2012-01-01 16:52:55 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v Identity-V KozMinPro-Regular-Acro.otf - hminr-h H KozMinPro-Regular-Acro.otf - hminr-v V KozMinPro-Regular-Acro.otf -+uphminr-h UniJIS-UTF16-H KozMinPro-Regular-Acro.otf -+uphminr-v UniJIS-UTF16-V KozMinPro-Regular-Acro.otf - - otf-ujgr-h UniJIS-UTF16-H KozGoStd-Regular.otf - otf-ujgr-v UniJIS-UTF16-V KozGoStd-Regular.otf -@@ -11,6 +13,8 @@ - otf-cjgr-v Identity-V KozGoStd-Regular.otf - hgothr-h H KozGoStd-Regular.otf - hgothr-v V KozGoStd-Regular.otf -+uphgothr-h UniJIS-UTF16-H KozGoStd-Regular.otf -+uphgothr-v UniJIS-UTF16-V KozGoStd-Regular.otf - - otf-ujmb-h UniJIS-UTF16-H KozMinStd-Bold.otf - otf-ujmb-v UniJIS-UTF16-V KozMinStd-Bold.otf -@@ -18,6 +22,8 @@ - otf-cjmb-v Identity-V KozMinStd-Bold.otf - hminb-h H KozMinStd-Bold.otf - hminb-v V KozMinStd-Bold.otf -+uphminb-h UniJIS-UTF16-H KozMinStd-Bold.otf -+uphminb-v UniJIS-UTF16-V KozMinStd-Bold.otf - - otf-cjgb-h Identity-H KozGoStd-Bold.otf - otf-cjgb-v Identity-V KozGoStd-Bold.otf -@@ -25,6 +31,8 @@ - otf-ujgb-v UniJIS-UTF16-V KozGoStd-Bold.otf - hgothb-h H KozGoStd-Bold.otf - hgothb-v V KozGoStd-Bold.otf -+uphgothb-h UniJIS-UTF16-H KozGoStd-Bold.otf -+uphgothb-v UniJIS-UTF16-V KozGoStd-Bold.otf - - otf-ujmgr-h UniJIS-UTF16-H KozGoStd-Heavy.otf - otf-ujmgr-v UniJIS-UTF16-V KozGoStd-Heavy.otf -@@ -32,6 +40,8 @@ - otf-cjmgr-v Identity-V KozGoStd-Heavy.otf - hmgothr-h H KozGoStd-Heavy.otf - hmgothr-v V KozGoStd-Heavy.otf -+uphmgothr-h UniJIS-UTF16-H KozGoStd-Heavy.otf -+uphmgothr-v UniJIS-UTF16-V KozGoStd-Heavy.otf - - - % -diff -urN otfbeta.orig/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips) ---- otfbeta.orig/fontmap/morisawa.map(for udvips) 2003-12-16 23:43:02 +0900 -+++ otfbeta/fontmap/morisawa.map(for udvips) 2012-01-01 16:47:01 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v RyuminPro-Light-Identity-V - hminr-h RyuminPro-Light-H - hminr-v RyuminPro-Light-V -+uphminr-h RyuminPro-Light-UniJIS-UTF16-H -+uphminr-v RyuminPro-Light-UniJIS-UTF16-V - - otf-ujgr-h GothicBBBPro-Medium-UniJIS-UTF16-H - otf-ujgr-v GothicBBBPro-Medium-UniJIS-UTF16-V -@@ -11,6 +13,8 @@ - otf-cjgr-v GothicBBBPro-Medium-Identity-V - hgothr-h GothicBBBPro-Medium-H - hgothr-v GothicBBBPro-Medium-V -+uphgothr-h GothicBBBPro-Medium-UniJIS-UTF16-H -+uphgothr-v GothicBBBPro-Medium-UniJIS-UTF16-V - - otf-ujmb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H - otf-ujmb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V -@@ -18,6 +22,8 @@ - otf-cjmb-v FutoMinA101Pro-Bold-Identity-V - hminb-h FutoMinA101Pro-Bold-H - hminb-v FutoMinA101Pro-Bold-V -+uphminb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H -+uphminb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V - - otf-cjgb-h FutoGoB101Pro-Bold-Identity-H - otf-cjgb-v FutoGoB101Pro-Bold-Identity-V -@@ -25,6 +31,8 @@ - otf-ujgb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V - hgothb-h FutoGoB101Pro-Bold-H - hgothb-v FutoGoB101Pro-Bold-V -+uphgothb-h FutoGoB101Pro-Bold-UniJIS-UTF16-H -+uphgothb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V - - otf-ujmgr-h Jun101Pro-Light-UniJIS-UTF16-H - otf-ujmgr-v Jun101Pro-Light-UniJIS-UTF16-V -@@ -32,3 +40,5 @@ - otf-cjmgr-v Jun101Pro-Light-Identity-V - hmgothr-h Jun101Pro-Light-H - hmgothr-v Jun101Pro-Light-V -+uphmgothr-h Jun101Pro-Light-UniJIS-UTF16-H -+uphmgothr-v Jun101Pro-Light-UniJIS-UTF16-V -diff -urN otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx) ---- otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) 2004-08-17 21:35:30 +0900 -+++ otfbeta/fontmap/morisawax.map(for dvipdfmx) 2012-01-01 16:47:01 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf - hminr-h H A-OTF-RyuminPro-Light.otf - hminr-v V A-OTF-RyuminPro-Light.otf -+uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf -+uphminr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf - - otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf - otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf -@@ -11,6 +13,8 @@ - otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf - hgothr-h H A-OTF-GothicBBBPro-Medium.otf - hgothr-v V A-OTF-GothicBBBPro-Medium.otf -+uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf -+uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf - - otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf - otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf -@@ -18,6 +22,8 @@ - otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf - hminb-h H A-OTF-FutoMinA101Pro-Bold.otf - hminb-v V A-OTF-FutoMinA101Pro-Bold.otf -+uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf -+uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf - - otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf - otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf -@@ -25,6 +31,8 @@ - otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf - hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf - hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf -+uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf -+uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf - - otf-ujmgr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf - otf-ujmgr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf -@@ -32,3 +40,5 @@ - otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf - hmgothr-h H A-OTF-Jun101Pro-Light.otf - hmgothr-v V A-OTF-Jun101Pro-Light.otf -+uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf -+uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf -diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt ---- otfbeta.orig/fontmap/vfontmap.txt 2003-11-10 19:23:12 +0900 -+++ otfbeta/fontmap/vfontmap.txt 2012-01-01 16:47:01 +0900 -@@ -20,6 +20,8 @@ - otf-cjmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan - hminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf - hminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf -+uphminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode -+uphminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode - - otf-ujgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode - otf-ujgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode -@@ -27,6 +29,8 @@ - otf-cjgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan - hgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf - hgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf -+uphgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode -+uphgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode - - otf-ujmb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode - otf-ujmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode -@@ -34,6 +38,8 @@ - otf-cjmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan - hminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf - hminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf -+uphminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode -+uphminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode - - otf-ujgb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode - otf-ujgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode -@@ -41,6 +47,8 @@ - otf-cjgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan - hgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf - hgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf -+uphgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode -+uphgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode - - otf-ujmgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode - otf-ujmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode -@@ -48,6 +56,8 @@ - otf-cjmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan - hmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf - hmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf -+uphmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode -+uphmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode - - otf-ukmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode - otf-ukmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode -diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty ---- otfbeta.orig/sty/mlutf.sty 2010-03-22 14:50:54 +0900 -+++ otfbeta/sty/mlutf.sty 2013-05-25 18:24:54 +0900 -@@ -1,5 +1,5 @@ - \NeedsTeXFormat{pLaTeX2e} --\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau] -+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 ttk] - %force catcode of \" be 12 - \count@\catcode`\" - \catcode`\"=12 -@@ -27,10 +27,10 @@ - %end of changing catcode of \" - \gdef\Redefine@MLUTF{% - \@ifpackageloaded{hyperref}{% -- \def\hyper@UTFC##1{\ifHy@pdfstring\0x##1\else\csname UTFC \endcsname{##1}\fi} -- \def\hyper@UTFK##1{\ifHy@pdfstring\0x##1\else\csname UTFK \endcsname{##1}\fi} -- \def\hyper@UTFT##1{\ifHy@pdfstring\0x##1\else\csname UTFT \endcsname{##1}\fi} -- \def\hyper@UTFM##1{\ifHy@pdfstring\0x##1\else\csname UTFM \endcsname{##1}\fi} -+ \def\hyper@UTFC##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFC \endcsname{##1}\fi} -+ \def\hyper@UTFK##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFK \endcsname{##1}\fi} -+ \def\hyper@UTFT##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFT \endcsname{##1}\fi} -+ \def\hyper@UTFM##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFM \endcsname{##1}\fi} - \def\UTFC{\protect\hyper@UTFC} - \def\UTFK{\protect\hyper@UTFK} - \def\UTFT{\protect\hyper@UTFT} -@@ -45,14 +45,14 @@ - \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} - \DeclareKanjiFamily{\otf@JYn}{utfc}{} - \DeclareKanjiFamily{\otf@JTn}{utfc}{} --\Declare@FontShape{utfc}{m}{0123456789abcdef}{utfcmr} --\Declare@FontShape{utfc}{bx}{0123456789abcdef}{utfcgr} -+\Declare@FontShape{utfc}{m}{0123456789abcdefjklmnopqrstuvz}{utfcmr} -+\Declare@FontShape{utfc}{bx}{0123456789abcdefjklmnopqrstuvz}{utfcgr} - \DeclareKanjiFamily{\otf@JYn}{utft}{} - \DeclareKanjiFamily{\otf@JTn}{utft}{} --\Declare@FontShape{utft}{m}{0123456789abcdef}{utftmr} --\Declare@FontShape{utft}{bx}{0123456789abcdef}{utftgr} -+\Declare@FontShape{utft}{m}{0123456789abcdefjklmnopqrstuvz}{utftmr} -+\Declare@FontShape{utft}{bx}{0123456789abcdefjklmnopqrstuvz}{utftgr} - \DeclareKanjiFamily{\otf@JYn}{utf}{} - \DeclareKanjiFamily{\otf@JTn}{utf}{} --\Declare@FontShape{utf}{m}{0123456789abcdef}{utfmr} --\Declare@FontShape{utf}{bx}{0123456789abcdef}{utfgr} -+\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr} -+\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr} - \endinput -diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty ---- otfbeta.orig/sty/otf.sty 2012-04-11 13:08:12 +0900 -+++ otfbeta/sty/otf.sty 2013-06-02 09:30:31 +0900 -@@ -1,5 +1,5 @@ - \NeedsTeXFormat{pLaTeX2e} --\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau] -+\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk] - %for processing options - \newif\if@kana \@kanafalse - \newif\if@macro \@macrotrue -@@ -57,9 +57,142 @@ - } - \fi - \gdef\Redefine@UTF{\@ifpackageloaded{hyperref}{% -- \def\hyper@UTF##1{\ifHy@pdfstring\0x##1\else\csname UTF \endcsname{##1}\fi} -+ \def\hyper@UTF##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTF \endcsname{##1}\fi} - \def\UTF{\protect\hyper@UTF}}{} - } -+% support surrogate pair in \hyper@UTF@{} by ZR-san -+\def\otf@end{\otf@end@} -+\def\otf@mark{\otf@mark@} -+\def\otf@triexpandafter{% -+ \expandafter\expandafter\expandafter -+} -+\begingroup \catcode`\|=0 -+\gdef\otf@cond#1|fi{% -+ #1\expandafter\@firstoftwo -+ |else \expandafter\@secondoftwo -+ |fi -+} -+\endgroup -+\def\otf@next#1#2#3#4#5{% -+ \@namedef{otf@qh/#1#2}{#3}% -+ \@namedef{otf@hq/#3}{#1#2}% -+ \@namedef{otf@lhq/#4#5}{#1#2}% -+} -+\@for\otf@x:={% -+ 00001,01102,02203,03304,10405,11506,12607,13708,% -+ 20809,2190A,22A0B,23B0C,30C0D,31D0E,32E0F,33F10}\do{% -+ \expandafter\otf@next\otf@x -+} -+\def\otf@next#1{% -+ \lowercase{\def\otf@y{#1}}% -+ \@namedef{otf@hd/#1}{#1}% -+ \@namedef{otf@hd/\otf@y}{#1}% -+} -+\@tfor\otf@x:=0123456789ABCDEF\do{% -+ \expandafter\otf@next\otf@x -+} -+\def\hyper@UTF@#1{% -+ \expandafter\otf@hy@utf@pre@a#1\relax{}\otf@mark\otf@end -+} -+\def\otf@hy@utf@pre@a{% -+ \expandafter\otf@hy@utf@pre@b\romannumeral-`>% -+} -+\def\otf@hy@utf@pre@b#1#{% -+ \otf@cond \ifx\otf@end#1\otf@end \fi{% -+ \otf@hy@utf@bombout -+ }{% -+ \otf@hy@utf@pre@c#1% -+ }% -+} -+\def\otf@hy@utf@pre@c#1{% -+ \otf@cond \ifx#1\relax \fi{% -+ \otf@hy@utf@pre@end -+ }{% -+ \otf@triexpandafter\otf@hy@utf@pre@d -+ \csname otf@hd/\string#1\endcsname -+ }% -+} -+\def\otf@hy@utf@pre@d#1{% -+ \otf@cond \ifx#1\relax \fi{% -+ \otf@hy@utf@bombout -+ }{% -+ \otf@hy@utf@pre@e#1% -+ }% -+} -+\def\otf@hy@utf@pre@e#1#2\otf@mark#3\otf@end{% -+ \otf@cond \if 0#1\fi{% -+ \otf@cond \ifx\otf@end#3\otf@end \fi{% -+ \otf@hy@utf@pre@f{#2}{#3}% -+ }{% -+ \otf@hy@utf@pre@f{#2}{#3#1}% -+ }% -+ }{% -+ \otf@hy@utf@pre@f{#2}{#3#1}% -+ }% -+} -+\def\otf@hy@utf@pre@f#1#2{% -+ \otf@hy@utf@pre@a#1\otf@mark#2\otf@end -+} -+\def\otf@hy@utf@pre@end#1\otf@mark#2\otf@end{% -+ \otf@cond \ifx\otf@end#1\otf@end \fi{% -+ \otf@hy@utf@sw{#2}% -+ }{% -+ \otf@hy@utf@error -+ }% -+} -+\def\otf@hy@utf@bombout#1\otf@end{% -+ \otf@hy@utf@error -+} -+ -+\def\otf@hy@utf@sw#1{% -+ \otf@cond \ifnum"0#1>"10FFFF \fi{% -+ \otf@hy@utf@error -+ }{% -+ \otf@hy@utf@sw@a{#1}% -+ }% -+} -+\def\otf@hy@utf@sw@a#1{% -+ \otf@cond \ifnum"0#1>"FFFF \fi{% -+ \otf@hy@utf@big#1"000000\otf@end -+ }{% -+ \otf@hy@utf@small#1"0000\otf@end -+ }% -+} -+\def\otf@hy@utf@small#1#2#3#4#5#6\otf@end{% -+ \otf@hy@utf@small@a#1#2#3#4#5\otf@end -+} -+\def\otf@hy@utf@small@a#1"#2\otf@end{% -+ \otf@hy@utf@unit{#2#1}% -+} -+\def\otf@hy@utf@big#1#2#3#4#5#6#7#8\otf@end{% -+ \otf@hy@utf@big@a#1#2#3#4#5#6#7\otf@end -+} -+\def\otf@hy@utf@big@a#1"#2\otf@end{% -+ \otf@hy@utf@big@b#2#1\otf@end -+} -+\def\otf@hy@utf@big@b#1#2#3#4{% -+ \otf@triexpandafter\otf@hy@utf@big@c -+ \csname otf@lhq/#1#2\otf@triexpandafter\endcsname -+ \csname otf@hq/#3\otf@triexpandafter\endcsname -+ \csname otf@hq/#4\endcsname -+} -+\def\otf@hy@utf@big@c#1#2#3#4#5#6{% -+ \otf@triexpandafter\otf@hy@utf@big@d -+ \csname otf@qh/2#1\otf@triexpandafter\endcsname -+ \csname otf@qh/#2#3\otf@triexpandafter\endcsname -+ \csname otf@qh/#4#5\otf@triexpandafter\endcsname -+ \csname otf@qh/3#6\endcsname -+} -+\def\otf@hy@utf@big@d#1#2#3#4#5\otf@end{% -+ \otf@hy@utf@unit{D#1#2#3}% -+ \otf@hy@utf@unit{D#4#5}% -+} -+\def\otf@hy@utf@error{% -+ \otf@hy@utf@unit{FFFD}% -+} -+\def\otf@hy@utf@unit#1{% -+ \0x#1% -+} - \AtBeginDocument{\Redefine@UTF} - %internal macros - %macros by iNOUE Koich! -@@ -67,7 +200,9 @@ - \newcommand\put@character{% - \@tempcntb=\@tempcnta - \divide\@tempcntb by "1000 -- \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi}% -+ \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or -+ \or \or \or \or \or \or \or \or \or \or \or g\or \or h\or i\or j\or -+ k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}% - \selectfont% - \multiply\@tempcntb by "1000 - \advance\@tempcnta by -\@tempcntb -@@ -254,6 +389,8 @@ - \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{} - \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{} - \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{} -+ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{} -+ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{} - \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{} - \else -@@ -262,8 +399,8 @@ - \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{} - \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{} - \fi -- \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-h}{} -- \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-v}{} -+ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{} -+ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{} - \DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{} - \DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{} -@@ -280,34 +417,36 @@ - \DeclareKanjiFamily{\otf@JTn}{utfj}{} - \DeclareKanjiFamily{\otf@JYn}{cidj}{} - \DeclareKanjiFamily{\otf@JTn}{cidj}{} --\Declare@FontShape{utfj}{m}{0123456789abcdef}{utfjmr\nlck@sfx@} -+\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmr\nlck@sfx@} - \Declare@FontShape{cidj}{m}{012345}{cidjmr} - %definition of other utf/cid fonts - \if@deluxe -- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjmb\nlck@sfx@} -+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjmb\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjmb} - \DeclareKanjiFamily{\otf@JYn}{utfjg}{} - \DeclareKanjiFamily{\otf@JTn}{utfjg}{} - \DeclareKanjiFamily{\otf@JYn}{cidjg}{} - \DeclareKanjiFamily{\otf@JTn}{cidjg}{} -- \Declare@FontShape{utfjg}{m}{0123456789abcdef}{utfjgr\nlck@sfx@} -+ \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} - \Declare@FontShape{cidjg}{m}{012345}{cidjgr} -- \Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} -+ \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} - \Declare@FontShape{cidjg}{bx}{012345}{cidjgb} -+ \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} -+ \Declare@FontShape{cidjg}{eb}{012345}{cidjgb} - \DeclareKanjiFamily{\otf@JYn}{utfjmg}{} - \DeclareKanjiFamily{\otf@JTn}{utfjmg}{} - \DeclareKanjiFamily{\otf@JYn}{cidjmg}{} - \DeclareKanjiFamily{\otf@JTn}{cidjmg}{} -- \Declare@FontShape{utfjmg}{m}{0123456789abcdef}{utfjmgr\nlck@sfx@} -+ \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmgr\nlck@sfx@} - \Declare@FontShape{cidjmg}{m}{012345}{cidjmgr} -- \Declare@FontShape{utfj}{l}{0123456789abcdef}{utfjml\nlck@sfx@} -+ \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvz}{utfjml\nlck@sfx@} - \Declare@FontShape{cidj}{l}{012345}{cidjml} - \else - \if@bold -- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} -+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjgb} - \else -- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgr\nlck@sfx@} -+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjgr} - \fi - \fi diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch new file mode 100644 index 00000000000..ea34da1d6fb --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch @@ -0,0 +1,716 @@ +diff -urN otfbeta-1.7b6/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips) +--- otfbeta-1.7b6/fontmap/hiragino.map(for udvips) 2010-03-27 09:38:48.000000000 +0900 ++++ otfbeta/fontmap/hiragino.map(for udvips) 2013-06-02 16:55:51.000000000 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v HiraMinPro-W3-Identity-V + hminr-h HiraMinPro-W3-H + hminr-v HiraMinPro-W3-V ++uphminr-h HiraMinPro-W3-UniJIS-UTF16-H ++uphminr-v HiraMinPro-W3-UniJIS-UTF16-V + + otf-ujgr-h HiraKakuPro-W3-UniJIS-UTF16-H + otf-ujgr-v HiraKakuPro-W3-UniJIS-UTF16-V +@@ -11,6 +13,8 @@ + otf-cjgr-v HiraKakuPro-W3-Identity-V + hgothr-h HiraKakuPro-W3-H + hgothr-v HiraKakuPro-W3-V ++uphgothr-h HiraKakuPro-W3-UniJIS-UTF16-H ++uphgothr-v HiraKakuPro-W3-UniJIS-UTF16-V + + otf-ujmb-h HiraMinPro-W6-UniJIS-UTF16-H + otf-ujmb-v HiraMinPro-W6-UniJIS-UTF16-V +@@ -18,6 +22,8 @@ + otf-cjmb-v HiraMinPro-W6-Identity-V + hminb-h HiraMinPro-W6-H + hminb-v HiraMinPro-W6-V ++uphminb-h HiraMinPro-W6-UniJIS-UTF16-H ++uphminb-v HiraMinPro-W6-UniJIS-UTF16-V + + otf-cjgb-h HiraKakuPro-W6-Identity-H + otf-cjgb-v HiraKakuPro-W6-Identity-V +@@ -25,9 +31,13 @@ + otf-ujgb-v HiraKakuPro-W6-UniJIS-UTF16-V + hgothb-h HiraKakuPro-W6-H + hgothb-v HiraKakuPro-W6-V ++uphgothb-h HiraKakuPro-W6-UniJIS-UTF16-H ++uphgothb-v HiraKakuPro-W6-UniJIS-UTF16-V + + hgotheb-h HiraKakuStd-W8-H + hgotheb-v HiraKakuStd-W8-V ++uphgotheb-h HiraKakuStd-W8-UniJIS-UTF16-H ++uphgotheb-v HiraKakuStd-W8-UniJIS-UTF16-V + + otf-ujmgr-h HiraMaruPro-W4-UniJIS-UTF16-H + otf-ujmgr-v HiraMaruPro-W4-UniJIS-UTF16-V +@@ -35,6 +45,8 @@ + otf-cjmgr-v HiraMaruPro-W4-Identity-V + hmgothr-h HiraMaruPro-W4-H + hmgothr-v HiraMaruPro-W4-V ++uphmgothr-h HiraMaruPro-W4-UniJIS-UTF16-H ++uphmgothr-v HiraMaruPro-W4-UniJIS-UTF16-V + + otf-ujml-h HiraMinPro-W2-UniJIS-UTF16-H + otf-ujml-v HiraMinPro-W2-UniJIS-UTF16-V +@@ -42,6 +54,8 @@ + otf-cjml-v HiraMinPro-W2-Identity-V + hminl-h HiraMinPro-W2-H + hminl-v HiraMinPro-W2-V ++uphminl-h HiraMinPro-W2-UniJIS-UTF16-H ++uphminl-v HiraMinPro-W2-UniJIS-UTF16-V + + hiramin-w3-h HiraMinPro-W3-Identity-H + hiramin-w6-h HiraMinPro-W6-Identity-H +@@ -59,28 +73,40 @@ + otf-ujmrn-v HiraMinProN-W3-UniJIS2004-UTF16-V + hminrn-h HiraMinProN-W3-H + hminrn-v HiraMinProN-W3-V ++uphminrn-h HiraMinPro-W3-UniJIS2004-UTF16-H ++uphminrn-v HiraMinPro-W3-UniJIS2004-UTF16-V + + otf-ujgrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H + otf-ujgrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V + hgothrn-h HiraKakuProN-W3-H + hgothrn-v HiraKakuProN-W3-V ++uphgothrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H ++uphgothrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V + + otf-ujmbn-h HiraMinProN-W6-UniJIS2004-UTF16-H + otf-ujmbn-v HiraMinProN-W6-UniJIS2004-UTF16-V + hminbn-h HiraMinProN-W6-H + hminbn-v HiraMinProN-W6-V ++uphminbn-h HiraMinProN-W6-UniJIS2004-UTF16-H ++uphminbn-v HiraMinProN-W6-UniJIS2004-UTF16-V + + otf-ujgbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H + otf-ujgbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V + hgothbn-h HiraKakuProN-W6-H + hgothbn-v HiraKakuProN-W6-V ++uphgothbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H ++uphgothbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V + + otf-ujmgrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H + otf-ujmgrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V + hmgothrn-h HiraMaruProN-W4-H + hmgothrn-v HiraMaruProN-W4-V ++uphmgothrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H ++uphmgothrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V + + otf-ujmln-h HiraMinProN-W2-UniJIS2004-UTF16-H + otf-ujmln-v HiraMinProN-W2-UniJIS2004-UTF16-V + hminln-h HiraMinProN-W2-H + hminln-v HiraMinProN-W2-V ++uphminln-h HiraMinProN-W2-UniJIS2004-UTF16-H ++uphminln-v HiraMinProN-W2-UniJIS2004-UTF16-V +diff -urN otfbeta-1.7b6/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx) +--- otfbeta-1.7b6/fontmap/hiraginox.map(for dvipdfmx) 2010-03-27 09:39:08.000000000 +0900 ++++ otfbeta/fontmap/hiraginox.map(for dvipdfmx) 2013-06-02 16:55:51.000000000 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v Identity-V HiraMinPro-W3 + hminr-h H HiraMinPro-W3 + hminr-v V HiraMinPro-W3 ++uphminr-h UniJIS-UTF16-H HiraMinPro-W3 ++uphminr-v UniJIS-UTF16-V HiraMinPro-W3 + + otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3 + otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3 +@@ -11,6 +13,8 @@ + otf-cjgr-v Identity-V HiraKakuPro-W3 + hgothr-h H HiraKakuPro-W3 + hgothr-v V HiraKakuPro-W3 ++uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3 ++uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3 + + otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6 + otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6 +@@ -18,6 +22,8 @@ + otf-cjmb-v Identity-V HiraMinPro-W6 + hminb-h H HiraMinPro-W6 + hminb-v V HiraMinPro-W6 ++uphminb-h UniJIS-UTF16-H HiraMinPro-W6 ++uphminb-v UniJIS-UTF16-V HiraMinPro-W6 + + otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6 + otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6 +@@ -25,9 +31,13 @@ + otf-cjgb-v Identity-V HiraKakuPro-W6 + hgothb-h H HiraKakuPro-W6 + hgothb-v V HiraKakuPro-W6 ++uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6 ++uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6 + + hgotheb-h H HiraKakuStd-W8 + hgotheb-v V HiraKakuStd-W8 ++uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8 ++uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8 + + otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4 + otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4 +@@ -35,6 +45,8 @@ + otf-cjmgr-v Identity-V HiraMaruPro-W4 + hmgothr-h H HiraMaruPro-W4 + hmgothr-v V HiraMaruPro-W4 ++uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4 ++uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4 + + otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2 + otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2 +@@ -42,6 +54,8 @@ + otf-cjml-v Identity-V HiraMinPro-W2 + hminl-h H HiraMinPro-W2 + hminl-v V HiraMinPro-W2 ++uphminl-h UniJIS-UTF16-H HiraMinPro-W2 ++uphminl-v UniJIS-UTF16-V HiraMinPro-W2 + + hiramin-w3-h Identity-H HiraMinPro-W3 + hiramin-w6-h Identity-H HiraMinPro-W6 +@@ -59,28 +73,40 @@ + otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3 + hminrn-h H HiraMinProN-W3 + hminrn-v V HiraMinProN-W3 ++uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3 ++uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3 + + otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3 + otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3 + hgothrn-h H HiraKakuProN-W3 + hgothrn-v V HiraKakuProN-W3 ++uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3 ++uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3 + + otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6 + otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6 + hminbn-h H HiraMinProN-W6 + hminbn-v V HiraMinProN-W6 ++uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6 ++uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6 + + otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6 + otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6 + hgothbn-h H HiraKakuProN-W6 + hgothbn-v V HiraKakuProN-W6 ++uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6 ++uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6 + + otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4 + otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4 + hmgothrn-h H HiraMaruProN-W4 + hmgothrn-v V HiraMaruProN-W4 ++uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4 ++uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4 + + otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2 + otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2 + hminln-h H HiraMinProN-W2 + hminln-v V HiraMinProN-W2 ++uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2 ++uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2 +diff -urN otfbeta-1.7b6/fontmap/kozuka.map otfbeta/fontmap/kozuka.map +--- otfbeta-1.7b6/fontmap/kozuka.map 2004-12-23 23:56:18.000000000 +0900 ++++ otfbeta/fontmap/kozuka.map 2012-01-01 16:52:24.000000000 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v KozMinPro-Regular-Acro-Identity-V + hminr-h KozMinPro-Regular-Acro-H + hminr-v KozMinPro-Regular-Acro-V ++uphminr-h KozMinPro-Regular-Acro-UniJIS-UTF16-H ++uphminr-v KozMinPro-Regular-Acro-UniJIS-UTF16-V + + otf-ujgr-h KozGoStd-Regular-UniJIS-UTF16-H + otf-ujgr-v KozGoStd-Regular-UniJIS-UTF16-V +@@ -11,6 +13,8 @@ + otf-cjgr-v KozGoStd-Regular-Identity-V + hgothr-h KozGoStd-Regular-H + hgothr-v KozGoStd-Regular-V ++uphgothr-h KozGoStd-Regular-UniJIS-UTF16-H ++uphgothr-v KozGoStd-Regular-UniJIS-UTF16-V + + otf-ujmb-h KozMinStd-Bold-UniJIS-UTF16-H + otf-ujmb-v KozMinStd-Bold-UniJIS-UTF16-V +@@ -18,6 +22,8 @@ + otf-cjmb-v KozMinStd-Bold-Identity-V + hminb-h KozMinStd-Bold-H + hminb-v KozMinStd-Bold-V ++uphminb-h KozMinStd-Bold-UniJIS-UTF16-H ++uphminb-v KozMinStd-Bold-UniJIS-UTF16-V + + otf-cjgb-h KozGoStd-Bold-Identity-H + otf-cjgb-v KozGoStd-Bold-Identity-V +@@ -25,6 +31,8 @@ + otf-ujgb-v KozGoStd-Bold-UniJIS-UTF16-V + hgothb-h KozGoStd-Bold-H + hgothb-v KozGoStd-Bold-V ++uphgothb-h KozGoStd-Bold-UniJIS-UTF16-H ++uphgothb-v KozGoStd-Bold-UniJIS-UTF16-V + + otf-ujmgr-h KozGoStd-Heavy-UniJIS-UTF16-H + otf-ujmgr-v KozGoStd-Heavy-UniJIS-UTF16-V +@@ -32,6 +40,8 @@ + otf-cjmgr-v KozGoStd-Heavy-Identity-V + hmgothr-h KozGoStd-Heavy-H + hmgothr-v KozGoStd-Heavy-V ++uphmgothr-h KozGoStd-Heavy-UniJIS-UTF16-H ++uphmgothr-v KozGoStd-Heavy-UniJIS-UTF16-V + + % + %for Adobe Reader 7 +diff -urN otfbeta-1.7b6/fontmap/kozukax.map otfbeta/fontmap/kozukax.map +--- otfbeta-1.7b6/fontmap/kozukax.map 2004-12-23 23:54:40.000000000 +0900 ++++ otfbeta/fontmap/kozukax.map 2012-01-01 16:52:55.000000000 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v Identity-V KozMinPro-Regular-Acro.otf + hminr-h H KozMinPro-Regular-Acro.otf + hminr-v V KozMinPro-Regular-Acro.otf ++uphminr-h UniJIS-UTF16-H KozMinPro-Regular-Acro.otf ++uphminr-v UniJIS-UTF16-V KozMinPro-Regular-Acro.otf + + otf-ujgr-h UniJIS-UTF16-H KozGoStd-Regular.otf + otf-ujgr-v UniJIS-UTF16-V KozGoStd-Regular.otf +@@ -11,6 +13,8 @@ + otf-cjgr-v Identity-V KozGoStd-Regular.otf + hgothr-h H KozGoStd-Regular.otf + hgothr-v V KozGoStd-Regular.otf ++uphgothr-h UniJIS-UTF16-H KozGoStd-Regular.otf ++uphgothr-v UniJIS-UTF16-V KozGoStd-Regular.otf + + otf-ujmb-h UniJIS-UTF16-H KozMinStd-Bold.otf + otf-ujmb-v UniJIS-UTF16-V KozMinStd-Bold.otf +@@ -18,6 +22,8 @@ + otf-cjmb-v Identity-V KozMinStd-Bold.otf + hminb-h H KozMinStd-Bold.otf + hminb-v V KozMinStd-Bold.otf ++uphminb-h UniJIS-UTF16-H KozMinStd-Bold.otf ++uphminb-v UniJIS-UTF16-V KozMinStd-Bold.otf + + otf-cjgb-h Identity-H KozGoStd-Bold.otf + otf-cjgb-v Identity-V KozGoStd-Bold.otf +@@ -25,6 +31,8 @@ + otf-ujgb-v UniJIS-UTF16-V KozGoStd-Bold.otf + hgothb-h H KozGoStd-Bold.otf + hgothb-v V KozGoStd-Bold.otf ++uphgothb-h UniJIS-UTF16-H KozGoStd-Bold.otf ++uphgothb-v UniJIS-UTF16-V KozGoStd-Bold.otf + + otf-ujmgr-h UniJIS-UTF16-H KozGoStd-Heavy.otf + otf-ujmgr-v UniJIS-UTF16-V KozGoStd-Heavy.otf +@@ -32,6 +40,8 @@ + otf-cjmgr-v Identity-V KozGoStd-Heavy.otf + hmgothr-h H KozGoStd-Heavy.otf + hmgothr-v V KozGoStd-Heavy.otf ++uphmgothr-h UniJIS-UTF16-H KozGoStd-Heavy.otf ++uphmgothr-v UniJIS-UTF16-V KozGoStd-Heavy.otf + + + % +diff -urN otfbeta-1.7b6/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips) +--- otfbeta-1.7b6/fontmap/morisawa.map(for udvips) 2003-12-16 23:43:02.000000000 +0900 ++++ otfbeta/fontmap/morisawa.map(for udvips) 2012-01-01 16:47:01.000000000 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v RyuminPro-Light-Identity-V + hminr-h RyuminPro-Light-H + hminr-v RyuminPro-Light-V ++uphminr-h RyuminPro-Light-UniJIS-UTF16-H ++uphminr-v RyuminPro-Light-UniJIS-UTF16-V + + otf-ujgr-h GothicBBBPro-Medium-UniJIS-UTF16-H + otf-ujgr-v GothicBBBPro-Medium-UniJIS-UTF16-V +@@ -11,6 +13,8 @@ + otf-cjgr-v GothicBBBPro-Medium-Identity-V + hgothr-h GothicBBBPro-Medium-H + hgothr-v GothicBBBPro-Medium-V ++uphgothr-h GothicBBBPro-Medium-UniJIS-UTF16-H ++uphgothr-v GothicBBBPro-Medium-UniJIS-UTF16-V + + otf-ujmb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H + otf-ujmb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V +@@ -18,6 +22,8 @@ + otf-cjmb-v FutoMinA101Pro-Bold-Identity-V + hminb-h FutoMinA101Pro-Bold-H + hminb-v FutoMinA101Pro-Bold-V ++uphminb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H ++uphminb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V + + otf-cjgb-h FutoGoB101Pro-Bold-Identity-H + otf-cjgb-v FutoGoB101Pro-Bold-Identity-V +@@ -25,6 +31,8 @@ + otf-ujgb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V + hgothb-h FutoGoB101Pro-Bold-H + hgothb-v FutoGoB101Pro-Bold-V ++uphgothb-h FutoGoB101Pro-Bold-UniJIS-UTF16-H ++uphgothb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V + + otf-ujmgr-h Jun101Pro-Light-UniJIS-UTF16-H + otf-ujmgr-v Jun101Pro-Light-UniJIS-UTF16-V +@@ -32,3 +40,5 @@ + otf-cjmgr-v Jun101Pro-Light-Identity-V + hmgothr-h Jun101Pro-Light-H + hmgothr-v Jun101Pro-Light-V ++uphmgothr-h Jun101Pro-Light-UniJIS-UTF16-H ++uphmgothr-v Jun101Pro-Light-UniJIS-UTF16-V +diff -urN otfbeta-1.7b6/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx) +--- otfbeta-1.7b6/fontmap/morisawax.map(for dvipdfmx) 2004-08-17 21:35:30.000000000 +0900 ++++ otfbeta/fontmap/morisawax.map(for dvipdfmx) 2012-01-01 16:47:01.000000000 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf + hminr-h H A-OTF-RyuminPro-Light.otf + hminr-v V A-OTF-RyuminPro-Light.otf ++uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf ++uphminr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf + + otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf + otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf +@@ -11,6 +13,8 @@ + otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf + hgothr-h H A-OTF-GothicBBBPro-Medium.otf + hgothr-v V A-OTF-GothicBBBPro-Medium.otf ++uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf ++uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf + + otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf + otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf +@@ -18,6 +22,8 @@ + otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf + hminb-h H A-OTF-FutoMinA101Pro-Bold.otf + hminb-v V A-OTF-FutoMinA101Pro-Bold.otf ++uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf ++uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf + + otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf + otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf +@@ -25,6 +31,8 @@ + otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf + hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf + hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf ++uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf ++uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf + + otf-ujmgr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf + otf-ujmgr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf +@@ -32,3 +40,5 @@ + otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf + hmgothr-h H A-OTF-Jun101Pro-Light.otf + hmgothr-v V A-OTF-Jun101Pro-Light.otf ++uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf ++uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf +diff -urN otfbeta-1.7b6/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt +--- otfbeta-1.7b6/fontmap/vfontmap.txt 2003-11-10 19:23:12.000000000 +0900 ++++ otfbeta/fontmap/vfontmap.txt 2012-01-01 16:47:01.000000000 +0900 +@@ -20,6 +20,8 @@ + otf-cjmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan + hminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf + hminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf ++uphminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode ++uphminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode + + otf-ujgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode + otf-ujgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode +@@ -27,6 +29,8 @@ + otf-cjgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan + hgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf + hgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf ++uphgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode ++uphgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode + + otf-ujmb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode + otf-ujmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode +@@ -34,6 +38,8 @@ + otf-cjmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan + hminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf + hminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf ++uphminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode ++uphminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode + + otf-ujgb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode + otf-ujgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode +@@ -41,6 +47,8 @@ + otf-cjgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan + hgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf + hgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf ++uphgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode ++uphgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode + + otf-ujmgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode + otf-ujmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode +@@ -48,6 +56,8 @@ + otf-cjmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan + hmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf + hmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf ++uphmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode ++uphmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode + + otf-ukmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode + otf-ukmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode +diff -urN otfbeta-1.7b6/sty/mlutf.sty otfbeta/sty/mlutf.sty +--- otfbeta-1.7b6/sty/mlutf.sty 2010-03-22 14:50:54.000000000 +0900 ++++ otfbeta/sty/mlutf.sty 2013-11-23 22:32:27.000000000 +0900 +@@ -1,5 +1,5 @@ + \NeedsTeXFormat{pLaTeX2e} +-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau] ++\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.13 ttk] + %force catcode of \" be 12 + \count@\catcode`\" + \catcode`\"=12 +@@ -27,10 +27,10 @@ + %end of changing catcode of \" + \gdef\Redefine@MLUTF{% + \@ifpackageloaded{hyperref}{% +- \def\hyper@UTFC##1{\ifHy@pdfstring\0x##1\else\csname UTFC \endcsname{##1}\fi} +- \def\hyper@UTFK##1{\ifHy@pdfstring\0x##1\else\csname UTFK \endcsname{##1}\fi} +- \def\hyper@UTFT##1{\ifHy@pdfstring\0x##1\else\csname UTFT \endcsname{##1}\fi} +- \def\hyper@UTFM##1{\ifHy@pdfstring\0x##1\else\csname UTFM \endcsname{##1}\fi} ++ \def\hyper@UTFC##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFC \endcsname{##1}\fi} ++ \def\hyper@UTFK##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFK \endcsname{##1}\fi} ++ \def\hyper@UTFT##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFT \endcsname{##1}\fi} ++ \def\hyper@UTFM##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFM \endcsname{##1}\fi} + \def\UTFC{\protect\hyper@UTFC} + \def\UTFK{\protect\hyper@UTFK} + \def\UTFT{\protect\hyper@UTFT} +@@ -45,14 +45,14 @@ + \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} + \DeclareKanjiFamily{\otf@JYn}{utfc}{} + \DeclareKanjiFamily{\otf@JTn}{utfc}{} +-\Declare@FontShape{utfc}{m}{0123456789abcdef}{utfcmr} +-\Declare@FontShape{utfc}{bx}{0123456789abcdef}{utfcgr} ++\Declare@FontShape{utfc}{m}{0123456789abcdefjklmnopqrstuvz}{utfcmr} ++\Declare@FontShape{utfc}{bx}{0123456789abcdefjklmnopqrstuvz}{utfcgr} + \DeclareKanjiFamily{\otf@JYn}{utft}{} + \DeclareKanjiFamily{\otf@JTn}{utft}{} +-\Declare@FontShape{utft}{m}{0123456789abcdef}{utftmr} +-\Declare@FontShape{utft}{bx}{0123456789abcdef}{utftgr} ++\Declare@FontShape{utft}{m}{0123456789abcdefjklmnopqrstuvz}{utftmr} ++\Declare@FontShape{utft}{bx}{0123456789abcdefjklmnopqrstuvz}{utftgr} + \DeclareKanjiFamily{\otf@JYn}{utf}{} + \DeclareKanjiFamily{\otf@JTn}{utf}{} +-\Declare@FontShape{utf}{m}{0123456789abcdef}{utfmr} +-\Declare@FontShape{utf}{bx}{0123456789abcdef}{utfgr} ++\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr} ++\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr} + \endinput +diff -urN otfbeta-1.7b6/sty/otf.sty otfbeta/sty/otf.sty +--- otfbeta-1.7b6/sty/otf.sty 2013-11-17 09:30:36.000000000 +0900 ++++ otfbeta/sty/otf.sty 2013-11-23 12:27:24.000000000 +0900 +@@ -1,5 +1,5 @@ + \NeedsTeXFormat{pLaTeX2e} +-\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau] ++\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.13 ttk] + \RequirePackage{keyval} + %for processing options + \newif\if@kana \@kanafalse +@@ -66,9 +66,142 @@ + } + \fi + \gdef\Redefine@UTF{\@ifpackageloaded{hyperref}{% +- \def\hyper@UTF##1{\ifHy@pdfstring\0x##1\else\csname UTF \endcsname{##1}\fi} ++ \def\hyper@UTF##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTF \endcsname{##1}\fi} + \def\UTF{\protect\hyper@UTF}}{} + } ++% support surrogate pair in \hyper@UTF@{} by ZR-san ++\def\otf@end{\otf@end@} ++\def\otf@mark{\otf@mark@} ++\def\otf@triexpandafter{% ++ \expandafter\expandafter\expandafter ++} ++\begingroup \catcode`\|=0 ++\gdef\otf@cond#1|fi{% ++ #1\expandafter\@firstoftwo ++ |else \expandafter\@secondoftwo ++ |fi ++} ++\endgroup ++\def\otf@next#1#2#3#4#5{% ++ \@namedef{otf@qh/#1#2}{#3}% ++ \@namedef{otf@hq/#3}{#1#2}% ++ \@namedef{otf@lhq/#4#5}{#1#2}% ++} ++\@for\otf@x:={% ++ 00001,01102,02203,03304,10405,11506,12607,13708,% ++ 20809,2190A,22A0B,23B0C,30C0D,31D0E,32E0F,33F10}\do{% ++ \expandafter\otf@next\otf@x ++} ++\def\otf@next#1{% ++ \lowercase{\def\otf@y{#1}}% ++ \@namedef{otf@hd/#1}{#1}% ++ \@namedef{otf@hd/\otf@y}{#1}% ++} ++\@tfor\otf@x:=0123456789ABCDEF\do{% ++ \expandafter\otf@next\otf@x ++} ++\def\hyper@UTF@#1{% ++ \expandafter\otf@hy@utf@pre@a#1\relax{}\otf@mark\otf@end ++} ++\def\otf@hy@utf@pre@a{% ++ \expandafter\otf@hy@utf@pre@b\romannumeral-`>% ++} ++\def\otf@hy@utf@pre@b#1#{% ++ \otf@cond \ifx\otf@end#1\otf@end \fi{% ++ \otf@hy@utf@bombout ++ }{% ++ \otf@hy@utf@pre@c#1% ++ }% ++} ++\def\otf@hy@utf@pre@c#1{% ++ \otf@cond \ifx#1\relax \fi{% ++ \otf@hy@utf@pre@end ++ }{% ++ \otf@triexpandafter\otf@hy@utf@pre@d ++ \csname otf@hd/\string#1\endcsname ++ }% ++} ++\def\otf@hy@utf@pre@d#1{% ++ \otf@cond \ifx#1\relax \fi{% ++ \otf@hy@utf@bombout ++ }{% ++ \otf@hy@utf@pre@e#1% ++ }% ++} ++\def\otf@hy@utf@pre@e#1#2\otf@mark#3\otf@end{% ++ \otf@cond \if 0#1\fi{% ++ \otf@cond \ifx\otf@end#3\otf@end \fi{% ++ \otf@hy@utf@pre@f{#2}{#3}% ++ }{% ++ \otf@hy@utf@pre@f{#2}{#3#1}% ++ }% ++ }{% ++ \otf@hy@utf@pre@f{#2}{#3#1}% ++ }% ++} ++\def\otf@hy@utf@pre@f#1#2{% ++ \otf@hy@utf@pre@a#1\otf@mark#2\otf@end ++} ++\def\otf@hy@utf@pre@end#1\otf@mark#2\otf@end{% ++ \otf@cond \ifx\otf@end#1\otf@end \fi{% ++ \otf@hy@utf@sw{#2}% ++ }{% ++ \otf@hy@utf@error ++ }% ++} ++\def\otf@hy@utf@bombout#1\otf@end{% ++ \otf@hy@utf@error ++} ++ ++\def\otf@hy@utf@sw#1{% ++ \otf@cond \ifnum"0#1>"10FFFF \fi{% ++ \otf@hy@utf@error ++ }{% ++ \otf@hy@utf@sw@a{#1}% ++ }% ++} ++\def\otf@hy@utf@sw@a#1{% ++ \otf@cond \ifnum"0#1>"FFFF \fi{% ++ \otf@hy@utf@big#1"000000\otf@end ++ }{% ++ \otf@hy@utf@small#1"0000\otf@end ++ }% ++} ++\def\otf@hy@utf@small#1#2#3#4#5#6\otf@end{% ++ \otf@hy@utf@small@a#1#2#3#4#5\otf@end ++} ++\def\otf@hy@utf@small@a#1"#2\otf@end{% ++ \otf@hy@utf@unit{#2#1}% ++} ++\def\otf@hy@utf@big#1#2#3#4#5#6#7#8\otf@end{% ++ \otf@hy@utf@big@a#1#2#3#4#5#6#7\otf@end ++} ++\def\otf@hy@utf@big@a#1"#2\otf@end{% ++ \otf@hy@utf@big@b#2#1\otf@end ++} ++\def\otf@hy@utf@big@b#1#2#3#4{% ++ \otf@triexpandafter\otf@hy@utf@big@c ++ \csname otf@lhq/#1#2\otf@triexpandafter\endcsname ++ \csname otf@hq/#3\otf@triexpandafter\endcsname ++ \csname otf@hq/#4\endcsname ++} ++\def\otf@hy@utf@big@c#1#2#3#4#5#6{% ++ \otf@triexpandafter\otf@hy@utf@big@d ++ \csname otf@qh/2#1\otf@triexpandafter\endcsname ++ \csname otf@qh/#2#3\otf@triexpandafter\endcsname ++ \csname otf@qh/#4#5\otf@triexpandafter\endcsname ++ \csname otf@qh/3#6\endcsname ++} ++\def\otf@hy@utf@big@d#1#2#3#4#5\otf@end{% ++ \otf@hy@utf@unit{D#1#2#3}% ++ \otf@hy@utf@unit{D#4#5}% ++} ++\def\otf@hy@utf@error{% ++ \otf@hy@utf@unit{FFFD}% ++} ++\def\otf@hy@utf@unit#1{% ++ \0x#1% ++} + \AtBeginDocument{\Redefine@UTF} + %internal macros + %macros by iNOUE Koich! +@@ -76,7 +209,9 @@ + \newcommand\put@character{% + \@tempcntb=\@tempcnta + \divide\@tempcntb by "1000 +- \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi}% ++ \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or ++ \or \or \or \or \or \or \or \or \or \or \or g\or \or h\or i\or j\or ++ k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}% + \selectfont% + \multiply\@tempcntb by "1000 + \advance\@tempcnta by -\@tempcntb +@@ -264,6 +399,8 @@ + \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{} + \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{} + \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{} ++ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{} ++ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{} + \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{} + \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{} + \else +@@ -272,8 +409,8 @@ + \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{} + \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{} + \fi +- \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-h}{} +- \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-v}{} ++ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{} ++ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{} + \DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{} + \DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{} + \DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{} +@@ -290,34 +427,36 @@ + \DeclareKanjiFamily{\otf@JTn}{utfj}{} + \DeclareKanjiFamily{\otf@JYn}{cidj}{} + \DeclareKanjiFamily{\otf@JTn}{cidj}{} +-\Declare@FontShape{utfj}{m}{0123456789abcdef}{utfjmr\nlck@sfx@} ++\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmr\nlck@sfx@} + \Declare@FontShape{cidj}{m}{012345}{cidjmr} + %definition of other utf/cid fonts + \if@deluxe +- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjmb\nlck@sfx@} ++ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjmb\nlck@sfx@} + \Declare@FontShape{cidj}{bx}{012345}{cidjmb} + \DeclareKanjiFamily{\otf@JYn}{utfjg}{} + \DeclareKanjiFamily{\otf@JTn}{utfjg}{} + \DeclareKanjiFamily{\otf@JYn}{cidjg}{} + \DeclareKanjiFamily{\otf@JTn}{cidjg}{} +- \Declare@FontShape{utfjg}{m}{0123456789abcdef}{utfjgr\nlck@sfx@} ++ \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} + \Declare@FontShape{cidjg}{m}{012345}{cidjgr} +- \Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} ++ \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} + \Declare@FontShape{cidjg}{bx}{012345}{cidjgb} ++ \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} ++ \Declare@FontShape{cidjg}{eb}{012345}{cidjgb} + \DeclareKanjiFamily{\otf@JYn}{utfjmg}{} + \DeclareKanjiFamily{\otf@JTn}{utfjmg}{} + \DeclareKanjiFamily{\otf@JYn}{cidjmg}{} + \DeclareKanjiFamily{\otf@JTn}{cidjmg}{} +- \Declare@FontShape{utfjmg}{m}{0123456789abcdef}{utfjmgr\nlck@sfx@} ++ \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmgr\nlck@sfx@} + \Declare@FontShape{cidjmg}{m}{012345}{cidjmgr} +- \Declare@FontShape{utfj}{l}{0123456789abcdef}{utfjml\nlck@sfx@} ++ \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvz}{utfjml\nlck@sfx@} + \Declare@FontShape{cidj}{l}{012345}{cidjml} + \else + \if@bold +- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} ++ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} + \Declare@FontShape{cidj}{bx}{012345}{cidjgb} + \else +- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgr\nlck@sfx@} ++ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} + \Declare@FontShape{cidj}{bx}{012345}{cidjgr} + \fi + \fi diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty index 077153c39f9..f41f813ad6f 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.13 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty index 1e6a0faf9a9..3834fe48458 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty @@ -1,5 +1,6 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk] +\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.13 ttk] +\RequirePackage{keyval} %for processing options \newif\if@kana \@kanafalse \newif\if@macro \@macrotrue @@ -9,6 +10,9 @@ \newif\if@burasage \@burasagefalse \newif\if@newglyph \@newglyphfalse \newif\if@otf@uplatex \@otf@uplatexfalse +\newif\if@otf@scale \@otf@scalefalse +\newif\if@jsclasses \@jsclassesfalse + \DeclareOption{nomacro}{\@macrofalse} \DeclareOption{nomacros}{\@macrofalse} \DeclareOption{noreplace}{\@replacefalse} @@ -19,6 +23,11 @@ \DeclareOption{burasage}{\@burasagetrue} \DeclareOption{uplatex}{\@otf@uplatextrue} \DeclareOption{jis2004}{\@newglyphtrue} +\DeclareOption*{\otfpkg@setkey} +\def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}} +\def\otfpkg@setkey@a{\setkeys{otfpkg}} +\define@key{otfpkg}{scale}{\@otf@scaletrue\def\utf@sc@le{#1}} + \def\otf@JYn{\if@otf@uplatex JY2\else JY1\fi} \def\otf@JTn{\if@otf@uplatex JT2\else JT1\fi} \def\otf@pfx@{\if@otf@uplatex up\else \fi} @@ -227,17 +236,15 @@ \DeclareFontShape{#1}{#2}{#3}{#6}{<->s*[\utf@sc@le]#4#6-#5}{}% \Declare@FontShape@Enc{#1}{#2}{#3}{#4}{#5}\fi} \def\Declare@FontShape@Enc#1\fi{\fi\Declare@FontShapeEnc#1} -%for jsclasses -\newif\if@jsclasses \@jsclassesfalse -\@ifclassloaded{jsarticle}{\@jsclassestrue}{} -\@ifclassloaded{jsbook}{\@jsclassestrue}{} -\if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi +\if@otf@scale + \relax +\else + %for jsclasses + \@ifclassloaded{jsarticle}{\@jsclassestrue}{} + \@ifclassloaded{jsbook}{\@jsclassestrue}{} + \if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi +\fi %definitions of alt-normal font family -\@ifundefined{if@enablejfam}{% - \let\if@jfam@used\iffalse -}{% - \let\if@jfam@used\if@enablejfam -} \if@replace \DeclareErrorKanjiFont{\otf@JYn}{hmc}{m}{n}{10} \DeclareKanjiSubstitution{\otf@JYn}{hmc}{m}{n} @@ -262,16 +269,19 @@ \DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{} \fi \@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}} - \if@jfam@used - \if@compatibility\else - \DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n} - \DeclareSymbolFontAlphabet{\mathmc}{mincho} - \SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n} - \DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n} - \SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n} - \jfam\symmincho + \@ifundefined{if@enablejfam}{%if disablejfam option is not available, do nothing. + }{% + \if@enablejfam + \if@compatibility\else + \DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n} + \DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n} + \SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n} + \jfam\symmincho + \fi \fi - \fi + } \fi \if@kana \DeclareKanjiFamily{\otf@JYn}{ruby}{} -- cgit v1.2.3