From f8ec550b6e3ef741c5fedbf0e3fc2cd192a7392b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Apr 2019 21:04:45 +0000 Subject: japanese-otf-uptex (2apr19) git-svn-id: svn://tug.org/texlive/trunk@50707 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/fonts/japanese-otf-uptex/00otf-uptex.txt | 21 +++- .../doc/fonts/japanese-otf-uptex/COPYRIGHT | 4 +- .../texmf-dist/doc/fonts/japanese-otf-uptex/README | 8 +- .../fonts/japanese-otf-uptex/test/uplatex/era.tex | 111 +++++++++++++++++++++ .../japanese-otf-uptex/test/uplatex/sp_jp_text.tex | 2 +- .../japanese-otf-uptex/test/uplatex/sp_jp_utf.tex | 2 +- .../japanese-otf-uptex/script/CheckDVICode.pm | 13 ++- .../fonts/japanese-otf-uptex/script/umkpkana.pl | 4 +- .../fonts/japanese-otf-uptex/script/umkvpkana.pl | 4 +- .../tex/platex/japanese-otf-uptex/mlutf.sty | 2 +- .../tex/platex/japanese-otf-uptex/otf.sty | 2 +- 11 files changed, 153 insertions(+), 20 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/era.tex 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 c15bc122bcb..4247e89f2fa 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 ] -japanese-otf-uptex Ver.0.22 2018/12/08 +japanese-otf-uptex Ver.0.23 2019/04/01 [ Abstract ] This package provides upLaTeX support of -japanese-otf package "otfbeta (v1.7b7 2018/02/01)" by psitau-san +japanese-otf package "otfbeta (v1.7b8 2019/04/01)" by psitau-san ( http://psitau.kitunebi.com/otf.html ) @@ -304,7 +304,7 @@ https://github.com/t-tk/japanese-otf-uptex and Adobe-CNS1-6 cid2code.txt (Version 12/04/2015). script/umk{,v}pkana.pl, test/uplatex/upkanatest1.tex :: Add more proportional kana support: - 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ (in UTF-8) + 〃〆ゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ (in UTF-8) Latest uppltotf (TeX Live r43143 or later) is required. patch/*.patch:: Remove. @@ -367,3 +367,18 @@ https://github.com/t-tk/japanese-otf-uptex Adobe-Japan1-7 cid2code.txt (Version 07/30/2018). test/uplatex/paren0.tex :: Fix typo. +2019.04.01 Ver0.23 + sty/otf.sty, sty/mlutf.sty :: + Increment version number. + script/CheckDVICode.pm, script/umk{,v}pkana.pl :: + Add more proportional kana support: + ヿゟ (in UTF-8) + Previously, they did not work due to a bug. + script/CheckDVICode.pm, test/uplatex/sp_jp_{utf,text}.tex :: + Update references: + Unicode Blocks-12.0.0.txt (Date: 2018-07-30, 19:40:00 GMT [KW]) + Adobe-Japan1-7 cid2code.txt (Version 07/30/2018). + test/uplatex/era.tex :: + Added. + COPYRIGHT :: + Update year. diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT index 1a3342bc9ca..7ccde031af5 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT @@ -1,5 +1,5 @@ -Copyright (C) 2003--2018 SAITO Shuzaburo and INOUE Koichi -Copyright (C) 2007--2018 TANAKA Takuji +Copyright (C) 2003--2019 SAITO Shuzaburo and INOUE Koichi +Copyright (C) 2007--2019 TANAKA Takuji All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README index 3741ea04f1a..959114ee1fa 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 ] -japanese-otf-uptex Ver.0.22 2018/12/08 +japanese-otf-uptex Ver.0.23 2019/04/01 [ Abstract ] This package provides upLaTeX support of -japanese-otf package "otfbeta (v1.7b7 2018/02/01)" by psitau-san +japanese-otf package "otfbeta (v1.7b8 2019/04/01)" by psitau-san ( http://psitau.kitunebi.com/otf.html ) -------------------- @@ -22,11 +22,11 @@ Ref. http://opensource.org/licenses/BSD-3-Clause The original source has been downloaded from https://github.com/t-tk/japanese-otf-uptex as - https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.22 + https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.23 After that the scripts run and the generated tfm and vf files included. Norbert Preining TANAKA Takuji -2018-12-08 +2019-04-02 diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/era.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/era.tex new file mode 100644 index 00000000000..65be6c52452 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/era.tex @@ -0,0 +1,111 @@ +% -*- coding: utf-8 -*- + +%%%%%%%% +% ①,②,③,④,⑤,⑥ のどれかを実行すればよい。 +% ① platex, 新元号なし +% $ platex era.tex +% ② uplatex, 新元号なし +% $ uplatex era.tex +% ③ platex, 新元号あり +% $ platex "\def\era{true}\input" era.tex +% ④ uplatex, 新元号あり +% $ uplatex "\def\era{true}\input" era.tex +% ⑤ platex, 新元号あり、\ajLig{令和}も含む +% $ platex "\def\era{full}\input" era.tex +% ⑥ uplatex, 新元号あり、\ajLig{令和}も含む +% $ uplatex "\def\era{full}\input" era.tex +%%%%%% + +\newif\ifuptexmode\uptexmodefalse +\ifnum\jis"2121="3000 \uptexmodetrue\fi + +\makeatletter + +\def\@opt@{multi} +\def\@default{default} +\def\@full{full} + +\ifx\option\@undefined + \def\option{default} +\fi +\ifx\option\@default +\else + \edef\@opt@{\option,\@opt@} +\fi + +\ifx\class\@undefined + \ifuptexmode + \def\engine{upLaTeX} + \else + \def\engine{pLaTeX} + \fi +\fi + +\newif\ifnewera\newerafalse +\ifx\era\@undefined + \edef\era{なし} +\else + \neweratrue + \ifx\era\@full + \def\ligNewEra{\ajLig{令和}} + \edef\era{あり (ajLigも含む)} + \else + \def\ligNewEra{\relax} + \edef\era{あり} + \fi +\fi +\typeout{## 新元号:\era ##} + +\documentclass[a4paper,draft,autodetect-engine]{jsarticle} + +\usepackage{plext} +\usepackage[\@opt@]{otf} + +\makeatother +\edef\bs{$\backslash$\kern0em} + +\begin{document} +\parindent0pt + +エンジン:\texttt{\engine}\\ +オプション:\texttt{\option}\\ +新元号:\era + +\vskip1zh + +\bs{}ajLig: \ajLig{明治}\ajLig{大正}\ajLig{昭和}\ajLig{平成}\ifnewera\ligNewEra\fi + +\bs{}UTF: \UTF{337E}\UTF{337D}\UTF{337C}\UTF{337B}\ifnewera\UTF{32FF}\fi + +\bs{}CID: \CID{7621}\CID{7622}\CID{7623}\CID{8323}\ifnewera\CID{23058}\fi + +\ifuptexmode + +UTF-8: ㍾㍽㍼㍻\ifnewera ㋿\fi + +\bs{}kchar: \kchar"337E\kchar"337D\kchar"337C\kchar"337B\ifnewera\kchar"32FF\fi + +\fi + +\vskip1zh + +\parbox{25.0zw}{ + +\bs{}ajLig: \ajLig{明治}\ajLig{大正}\ajLig{昭和}\ajLig{平成}\ifnewera\ligNewEra\fi + +\bs{}UTF: \UTF{337E}\UTF{337D}\UTF{337C}\UTF{337B}\ifnewera\UTF{32FF}\fi + +\bs{}CID: \CID{12041}\CID{12042}\CID{12043}\CID{12044}\ifnewera\CID{23059}\fi + +\ifuptexmode + +UTF-8: ㍾㍽㍼㍻\ifnewera ㋿\fi + +\bs{}kchar: \kchar"337E\kchar"337D\kchar"337C\kchar"337B\ifnewera\kchar"32FF\fi + +\fi + +} + +\end{document} + diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex index c3ddf9712e2..e77167987b5 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex @@ -1,6 +1,6 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 07/30/2018) +% in cid2code.txt (Version 02/05/2019) % for Adobe-Japan1-7 % % Reference: diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex index 4e105a847e9..b1d08c6c899 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex @@ -1,6 +1,6 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 07/30/2018) +% in cid2code.txt (Version 02/05/2019) % for Adobe-Japan1-7 % % Reference: diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm index 0b42516a873..6e98ae866f2 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm @@ -159,6 +159,10 @@ sub is_dvicode($){ if ($key eq 'open') { return &is_ucs_open; } if ($key eq 'close') { return (!&is_ucs_open); } + # ucs only + if ($key eq 'hira-yori'){ return ($code == 0x309F);} # yori + if ($key eq 'kata-koto'){ return ($code == 0x30FF);} # koto + die "illegal keyname ($key)\n"; } } @@ -182,7 +186,7 @@ sub is_ucs_kigo{ return 1 if ($dvicode>=0x201C && $dvicode<=0x201D); return 1 if ($dvicode>=0x2329 && $dvicode<=0x232A); return 1 if ($dvicode>=0x3001 && $dvicode<=0x301F); - return 1 if ($dvicode>=0x3097 && $dvicode<=0x309F); + return 1 if ($dvicode>=0x3097 && $dvicode<=0x309E); return 1 if ($dvicode>=0x30FB && $dvicode<=0x30FE); return 1 if ($dvicode>=0xFF08 && $dvicode<=0xFF60); @@ -192,6 +196,7 @@ sub is_ucs_kigo{ sub is_ucs_hira{ return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093); return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke +# return 1 if ($dvicode==0x309F); # Yori :: It is omitted because it is not included in "Tuned" in AJ1-6 return 0; } @@ -199,6 +204,7 @@ sub is_ucs_kata{ return 1 if ($dvicode>=0x30A1 && $dvicode<=0x30F6); return 1 if ($dvicode>=0x30F7 && $dvicode<=0x30FA); # Va, Vi, Ve, Vo return 1 if ($dvicode>=0x31F0 && $dvicode<=0x31FF); # small Ku, small Shi, ... , Small Re, Small Ro +# return 1 if ($dvicode==0x30FF); # Koto :: It is omitted because it is not included in "Tuned" in AJ1-6 return 0; } @@ -209,8 +215,8 @@ sub is_ucs_hankana{ # Reference: # http://www.unicode.org/Public/UNIDATA/Blocks.txt -# Blocks-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [KW] +# Blocks-12.0.0.txt +# Date: 2018-07-30, 19:40:00 GMT [KW] sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x04FF); # Cyrillic @@ -256,6 +262,7 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0x1B000); return 1 if ($dvicode<=0x1B0FF); # Kana Supplement return 1 if ($dvicode<=0x1B12F); # Kana Extended-A + return 1 if ($dvicode<=0x1B16F); # Small Kana Extension return 0 if ($dvicode< 0x1F100); return 1 if ($dvicode<=0x1F1FF); # Enclosed Alphanumeric Supplement diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl index 09d0c095a95..4c14fd45593 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl @@ -257,8 +257,8 @@ sub write_char { next unless ($exist_char{sprintf("%X",$ucscode)}); } if (&is_ucs_kigo){&print_kigo_char;} - elsif(&is_ucs_hira){&print_kana_char;} - elsif(&is_ucs_kata){&print_kana_char;} + elsif(&is_ucs_hira || &is_dvicode('hira-yori')){&print_kana_char;} + elsif(&is_ucs_kata || &is_dvicode('kata-koto')){&print_kana_char;} elsif(&is_ucs_hankana && $hk_mode){&print_hankana_char;} else{&print_char;} } diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl index c9f39bffe83..f1ff477518b 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl @@ -232,8 +232,8 @@ sub write_char { next unless ($exist_char{sprintf("%X",$ucscode)}); } if (&is_ucs_kigo){&print_kigo_char;} - elsif(&is_ucs_hira){&print_kana_char;} - elsif(&is_ucs_kata){&print_kana_char;} + elsif(&is_ucs_hira || &is_dvicode('hira-yori')){&print_kana_char;} + elsif(&is_ucs_kata || &is_dvicode('kata-koto')){&print_kana_char;} # elsif(&is_ucs_hankana && $hk_mode){&print_hankana_char;} else{&print_char;} } 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 4510442163c..3cfc9e122e3 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.22 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.23 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 70e3dc24183..fa4decec4ba 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,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2018/02/01 v1.7b7 psitau, u0.22 ttk] +\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.23 ttk] \RequirePackage{keyval} %for processing options \newif\if@kana \@kanafalse -- cgit v1.2.3