Merge branch 'jotf-uptex-0.22'

DEVELOPMENT.md

@@ -39,7 +39,7 @@ hiraprop は Makefile のインストール対象に含めていません（準
 
 ### japanese-otf-uptex
 
-- Obtain and extract `http://www.t-lab.opal.ne.jp/tex/otfbeta-uptex-0.21.tar.xz`
+- Obtain and extract `https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.22`
 - `make` (at top directory)
 - Add `README` (almost same as `00otf-uptex.txt`)
 

README.md

@@ -9,7 +9,7 @@ This bundle is an unofficial mirror of the followings:
 - japanese-otf-uptex
  (upLaTeX support of japanese-otf by Takuji Tanaka)
  - upstream: http://www.t-lab.opal.ne.jp/tex/uptex_en.html
- - currently otfbeta-uptex Ver.0.21 (2018/05/13)
+ - currently japanese-otf-uptex Ver.0.22 (2018/12/08)
 - hiraprop
  (LaTeX and TFM/VF support for Hiragino Proportional Alphabet)
  - upstream: http://psitau.kitunebi.com/experiment.html

japanese-otf-uptex/00otf-uptex.txt

@@ -1,12 +1,11 @@
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.21 2018/05/13
+japanese-otf-uptex Ver.0.22 2018/12/08
 
 
 [ Abstract ]
-This is a package for upLaTeX support of
+This package provides upLaTeX support of
 japanese-otf package "otfbeta (v1.7b7 2018/02/01)" by psitau-san
 ( http://psitau.kitunebi.com/otf.html )
-It requires upTeX-0.20 or later.
 
 
 [ Contents ]
@@ -47,6 +46,20 @@ COPYRIGHT : copyright notice of this package.
 Beta version.
 
 
+[ To Build ]
+## From source files
+The source distribution of japanese-otf-uptex does not contain tfm, vf files.
+To ganerate them, uppltotf and ovp2ovf (TeX Live r43143 or later) are required and
+we run scripts as follows:
+ $ ./umakeotf
+ $ ./umakeotf_brsg
+ $ ./umakeotf_jis04
+ $ ./umakeotf_prop
+
+## CTAN distribution
+The CTAN distribution contains tfm, vf files.
+
+
 [ About jis2004 option ]
 otfbeta-uptex (japanese-otf-uptex) Ver.0.12 or later supports
 combination of "jis2004" and "uplatex" option.
@@ -71,6 +84,11 @@ proportional kana at deluxe option and \propshape.
 To build tfm files, uppltotf in TeX Live r43143 or TeX Live 2017 or later is required.
 
 
+[ Repository ]
+japanese-otf-uptex is maintained on GitHub:
+https://github.com/t-tk/japanese-otf-uptex
+
+
 [ History ]
 2007.12.09 Ver0.00
  Initial version.
@@ -311,7 +329,7 @@ To build tfm files, uppltotf in TeX Live r43143 or TeX Live 2017 or later is req
  Update references:
  Adobe-CNS1-7 cid2code.txt (Version 10/24/2017), and
  Adobe-Japan1-6 cid2code.txt (Version 10/24/2017).
- script/CheckDVICode.pm, basepl/u{base,brsg}-{h,v}.pl ::
+ script/CheckDVICode.pm, script/umk{,v}pkana.pl, basepl/u{base,brsg}-{h,v}.pl ::
  Add U+00B7 to char_type 3.
  COPYRIGHT ::
  Update year.
@@ -334,4 +352,18 @@ To build tfm files, uppltotf in TeX Live r43143 or TeX Live 2017 or later is req
  Remove feature 'switch'
  test/uplatex/{exclam,upkanatest1}.tex, test/uplatex/Makefile ::
  Add a new test for punctuations and halfwidth katakana.
-
+2018.12.08 Ver0.22
+ ## Thank @aminophen san, 柳田 Ryo san and @Man-Ting-Fan san for many contributions.
+ sty/otf.sty, sty/mlutf.sty ::
+ Increment version number.
+ script/CheckDVICode.pm ::
+ Bug fix on U+3090..3093.
+ script/mkutf32list.pl ::
+ Replace encoding pragma to binmode.
+ script/mktfm_sp.pl, script/mkutfvf_sp.pl ::
+ Apply FindBin module.
+ script/mkutf32list.pl, script/sp_list_j.txt, test/uplatex/sp_jp_{utf,text}.tex ::
+ Update references:
+ Adobe-Japan1-7 cid2code.txt (Version 07/30/2018).
+ test/uplatex/paren0.tex ::
+ Fix typo.

japanese-otf-uptex/README

@@ -3,14 +3,13 @@ README
 
 From 00otf-uptex.txt:
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.21 2018/05/13
+japanese-otf-uptex Ver.0.22 2018/12/08
 
 
 [ Abstract ]
-This is a package for upLaTeX support of
+This package provides upLaTeX support of
 japanese-otf package "otfbeta (v1.7b7 2018/02/01)" by psitau-san
 ( http://psitau.kitunebi.com/otf.html )
-It requires upTeX-0.20 or later.
 
 --------------------
 
@@ -21,13 +20,13 @@ Ref. http://opensource.org/licenses/BSD-3-Clause
 --------------------
 
 The original source has been downloaded from
- http://www.t-lab.opal.ne.jp/tex/uptex_en.html
+ https://github.com/t-tk/japanese-otf-uptex
 as
- http://www.t-lab.opal.ne.jp/tex/otfbeta-uptex-0.21.tar.xz
+ https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.22
 
 After that the scripts run and the generated tfm and vf files included.
 
 Norbert Preining <preining@logic.at>
 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
-2018-05-13
+2018-12-08
 

japanese-otf-uptex/README.nonfree

@@ -1,12 +1,12 @@
-package name: otfbeta-uptex-nonfree or japanese-otf-uptex-nonfree
+package name: japanese-otf-uptex-nonfree
 
 This package is a companion to `japanese-otf-uptex' including
 support for nonfree Hiragino fonts, which we decided not to be
 included in TeX Live. Current version of this package used is
 based on
- otfbeta-uptex Ver.0.21 2018/05/13
+ japanese-otf-uptex Ver.0.22 2018/12/08
 
-The contents of this package is under the license given in the 
+The contents of this package is under the license given in the
 COPYRIGHT file, which is more or less BSD license.
 
 Norbert Preining

japanese-otf-uptex/script/CheckDVICode.pm

@@ -182,7 +182,6 @@ 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>=0x3090 && $dvicode<=0x3093);
  return 1 if ($dvicode>=0x3097 && $dvicode<=0x309F);
  return 1 if ($dvicode>=0x30FB && $dvicode<=0x30FE);
  return 1 if ($dvicode>=0xFF08 && $dvicode<=0xFF60);
@@ -191,7 +190,7 @@ sub is_ucs_kigo{
 }
 
 sub is_ucs_hira{
- return 1 if ($dvicode>=0x3041 && $dvicode<=0x308F);
+ return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093);
  return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke
  return 0;
 }

japanese-otf-uptex/script/mktfm_sp.pl

@@ -14,7 +14,9 @@ =head1 NOTE
 
 =cut
 
-use script::MakeSPList;
+use FindBin;
+use lib "$FindBin::Bin";
+use MakeSPList;
 
 $multi=3;
 @tex_tfm_h=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x2B, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x0E, 0x54, 0x45, 0x58, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x20, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4F, 0x54, 0x46, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x14, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEB, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x33, 0x33, 0x00, 0x02, 0x00, 0x00);

japanese-otf-uptex/script/mkutf32list.pl

@@ -24,7 +24,7 @@ =head1 NOTE
 =cut
 
 use strict;
-use encoding 'utf8';
+binmode(STDOUT, ":utf8");
 
 our ($style, $allrange);
 our (@count, %reset_ch, $icollec, $cid2code, $line);
@@ -62,9 +62,9 @@ BEGIN
  $utfmac="UTFK"; $cmap="UniKS-UTF32";
  $source="Adobe-Korea1-2/cid2code.txt"; }
  else {
- @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/;
+ @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057 23059/;
  $utfmac="UTF"; $cmap="UniJIS-UTF32";
- $source="Adobe-Japan1-6/cid2code.txt"; }
+ $source="Adobe-Japan1-7/cid2code.txt"; }
 }
 
 next if (/^#/);

japanese-otf-uptex/script/mkutfvf_sp.pl

@@ -16,7 +16,9 @@ =head1 NOTE
 
 =cut
 
-use script::MakeSPList;
+use FindBin;
+use lib "$FindBin::Bin";
+use MakeSPList;
 
 if (!defined($ovp2ovf)) { ## check option '-ovp2ovf=????'
  $ovp2ovf = defined($ENV{'OVP2OVF'}) ? $ENV{'OVP2OVF'} : 'ovp2ovf';

japanese-otf-uptex/script/sp_list_j.txt

@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 10/24/2017)
-% for Adobe-Japan1-6
+% in cid2code.txt (Version 07/30/2018)
+% for Adobe-Japan1-7
 %
 % Reference:
 % https://github.com/adobe-type-tools/cmap-resources/
-% Adobe-Japan1-6/cid2code.txt
+% Adobe-Japan1-7/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %

japanese-otf-uptex/sty/mlutf.sty

@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.21 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.22 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12

japanese-otf-uptex/sty/otf.sty

@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2018/02/01 v1.7b7 psitau, u0.21 ttk]
+\ProvidesPackage{otf}[2018/02/01 v1.7b7 psitau, u0.22 ttk]
 \RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse

japanese-otf-uptex/test/uplatex/sp_jp_text.tex

@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 10/24/2017)
-% for Adobe-Japan1-6
+% in cid2code.txt (Version 07/30/2018)
+% for Adobe-Japan1-7
 %
 % Reference:
 % https://github.com/adobe-type-tools/cmap-resources/
-% Adobe-Japan1-6/cid2code.txt
+% Adobe-Japan1-7/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %

japanese-otf-uptex/test/uplatex/sp_jp_utf.tex

@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 10/24/2017)
-% for Adobe-Japan1-6
+% in cid2code.txt (Version 07/30/2018)
+% for Adobe-Japan1-7
 %
 % Reference:
 % https://github.com/adobe-type-tools/cmap-resources/
-% Adobe-Japan1-6/cid2code.txt
+% Adobe-Japan1-7/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %