diff options
author | Norbert Preining <preining@logic.at> | 2013-11-20 20:22:00 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2013-11-20 20:22:00 +0000 |
commit | 26b9004d022b2cb66d7ea5907bd998b2f110d19a (patch) | |
tree | 30dec290ef35ce8fd91f8921ed85439f42c2e0b0 /Master/texmf-dist/source/fonts/japanese-otf-uptex/patch | |
parent | 491c2e872f08f182d1a918daeefcd5225188cf2d (diff) |
update japanese-otf-uptex, missing part of the fonts part
git-svn-id: svn://tug.org/texlive/trunk@32193 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/fonts/japanese-otf-uptex/patch')
-rw-r--r-- | Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch (renamed from Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch) | 279 |
1 files changed, 271 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch index b636427e64f..34a3fd0764c 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch @@ -1,6 +1,6 @@ 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) 2012-01-01 16:47:01 +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 @@ -60,9 +60,50 @@ diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino 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) 2012-01-01 16:47:01 +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 @@ -122,6 +163,47 @@ diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hirag 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 @@ -358,14 +440,29 @@ diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt 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 2012-04-15 07:53:43 +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.10 ttk] ++\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}{} @@ -389,15 +486,159 @@ diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty \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 2012-04-15 07:51:44 +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.10 ttk] ++\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk] %for processing options \newif\if@kana \@kanafalse \newif\if@macro \@macrotrue -@@ -67,7 +67,9 @@ +@@ -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 @@ -408,7 +649,27 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty \selectfont% \multiply\@tempcntb by "1000 \advance\@tempcnta by -\@tempcntb -@@ -280,34 +282,34 @@ +@@ -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}{} @@ -430,6 +691,8 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty - \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}{} |