new zxjafont (15dec12)

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

6 files changed, 307 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/latex/zxjafont/LICENSE b/Master/texmf-dist/doc/latex/zxjafont/LICENSE
new file mode 100644
index 00000000000..15954156886
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/zxjafont/LICENSE
@@ -0,0 +1,24 @@
+$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#Cx:n8"$O:n<T$G$k!V(BZR$B!W$K(B
+$BB0$7$^$9!#$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B
+
+The MIT License
+
+Copyright (c) 2009 ZR
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Master/texmf-dist/doc/latex/zxjafont/README b/Master/texmf-dist/doc/latex/zxjafont/README
new file mode 100644
index 00000000000..99644ad8eda
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/zxjafont/README
@@ -0,0 +1,52 @@
+==================================================
+== ZXjatype バンドル v0.2  <2009/12/22>         ==
+==           by「ZR」（八登 崇之/Takayuki YATO）==
+==                      <zrbabbler@yahoo.co.jp> ==
+==================================================
+(This file is encoded in UTF-8,)
+XeLaTeX + fontspec でのフォントファミリ名を直接指定する方式は「好きな
+フォントを指定する」という点では、 pLaTeX よりも格段に使い易いが、日本語
+を扱うためには必ず何らかの設定を行う必要があり、これが煩わしく感じられる
+場合もある。本パッケージでは、pLaTeX において一般的に行われている設定を
+予め用意しておいて、簡単に呼び出せるようにしている。
+
+■ 対応環境
+
+    ・TeX 処理系： XeLaTeX
+    ・前提パッケージ： fontspec
+
+■ 本ソフトウェアの一次配布サイト(作者のサイト)
+
+    En toi Pythmeni tes TeXnopoleos ～電脳世界の奥底にて～
+    http://zrbabbler.hp.infoseek.co.jp/
+
+    ※ 以下のページに一部機能の使用例を紹介した。
+    「ZXjafont パッケージ」
+    http://zrbabbler.hp.infoseek.co.jp/zxjafont.html
+
+■ インストール
+
+    TDS 1.1 に従ったシステムでは、各ファイルを次の場所に移動する。
+    ・*.sty   → $TEXMF/tex/xelatex/zxjafont/
+
+    W32TeX を C:\usr\local にインストールした場合は次のようになる。
+    ・*.sty   → C:\usr\local\share\texmf-local\tex\xelatex\zxjafont
+
+----------------------------------------
+  zxjafont パッケージ (v0.2) -- 本体
+----------------------------------------
+
+    まだ解説が書けておりません…。基本的な機能の説明については以下の Web
+    ページで行っていますのでそちらを参照してください。
+
+    ZXjafont パッケージ
+    http://zrbabbler.hp.infoseek.co.jp/zxjafont.html
+
+----------------------------------------
+
+■ 更新履歴
+
+Version 0.2  <2009/12/22>
+  - 最初の公開版。
+
+W# EOF
diff --git a/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty b/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
new file mode 100644
index 00000000000..09eb347f9e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
@@ -0,0 +1,229 @@
+%
+% zxjafont.sty
+%
+%%%% package declaration
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{zxjafont}[2009/12/22 v0.2]
+\RequirePackage{ifxetex}
+\RequireXeTeX
+
+%%%% preparation
+\def\zxjf@pkgname{zxjafont}
+\def\zxjf@error{\PackageError\zxjf@pkgname}
+\def\zxjf@warn{\PackageInfo\zxjf@pkgname}
+\RequirePackage{fontspec}
+\RequirePackage{keyval}
+\ifx\bxUseDebug\relax \let\zxjf@debug\@gobble
+\else \def\zxjf@debug#1{\typeout{\zxjf@pkgname: #1}}
+\fi
+
+%%%% options handling
+%% \zxjf@main@preset
+\def\zxjf@all@main@preset{%
+  ms,ms-dx,ipa,ipa-dx,kozuka4,kozuka6,kozuka6n,hiragino,hiragino-dx}
+\def\zxjf@all@sub@preset{%
+  hg,hiraginomg}
+\let\zxjf@main@preset\relax
+\def\zxjf@do#1{\DeclareOption{#1}{\def\zxjf@main@preset{#1}}}
+\@for\zxjf@x:=\zxjf@all@main@preset\do{%
+  \expandafter\zxjf@do\expandafter{\zxjf@x}}
+\let\zxjf@sub@preset\@empty
+\def\zxjf@do#1{\DeclareOption{#1}{\zxjf@add@sub@preset{#1}}}
+\@for\zxjf@x:=\zxjf@all@sub@preset\do{%
+  \expandafter\zxjf@do\expandafter{\zxjf@x}}
+\def\zxjf@add@sub@preset#1{%
+  \edef\zxjf@sub@preset{\zxjf@sub@preset#1,}}
+% 
+\newif\ifzxjf@prop
+\DeclareOption{prop}{\zxjf@proptrue}
+\define@key{zxjf}{scale}{\def\zxjf@scale{#1}}
+% options using keyval
+\let\zxjf@scale\relax
+\define@key{zxjf}{scale}{\def\zxjf@scale{#1}}
+\let\zxjf@feat\@empty
+\define@key{zxjf}{feature}{\def\zxjf@feat{#1}}
+\DeclareOption*{\def\zxjf@nxt{\setkeys{zxjf}}%
+  \expandafter\zxjf@nxt\expandafter{\CurrentOption}}
+% dispatch
+\let\@org@use@ption\@use@ption
+\def\@use@ption{\csname ds@\CurrentOption \endcsname}
+\ProcessOptions*
+\let\@use@ption\@org@use@ption
+% preset must be given
+\ifx\zxjf@main@preset\relax
+  \zxjf@error{Preset name not specified}
+  {You must give one of the following names as option.\MessageBreak
+   \space\space\zxjf@all@main@preset}
+  \endinput\fi
+
+%%%% detect bxjatype
+\newif\ifzxjf@zxjatype
+\@ifpackageloaded{zxjatype}{\zxjf@zxjatypetrue}{}
+\AtBeginDocument{%
+  \ifzxjf@zxjatype\else\@ifpackageloaded{zxjatype}{%
+      \zxjf@error{zxjatype must be loaded before me}\@ehc
+  }\fi}
+\ifzxjf@zxjatype\ifzxjf@prop
+  \zxjf@error{Option 'prop' cannot be used with zxjatype}\@ehc
+  \zxjf@propfalse
+\fi\fi
+
+%%%% decide scale factor
+\ifx\zxjf@scale\relax
+  \ifzxjf@zxjatype \let\zxjf@scale\zxjt@scale
+  \else\ifx\jsDocClass\@undefined \def\zxjf@scale{1}%
+  \else \let\zxjf@scale\jsScale \fi\fi
+\fi
+\edef\zxjf@xfeat{Scale=\zxjf@scale,\zxjf@feat}
+\zxjf@debug{feat={\zxjf@feat}/preset=\zxjf@main@preset/\zxjf@sub@preset}
+
+%%-------- preset japanese font mappings
+
+%% \zxjf@setmainfont{<attributes>}{<fam_name>}, etc.
+\ifzxjf@zxjatype
+\def\zxjf@setmainfont#1{\setjamainfont[\zxjf@xfeat,#1]}
+\def\zxjf@setsansfont#1{\setjasansfont[\zxjf@xfeat,#1]}
+\def\zxjf@setmonofont#1{\setjamonofont[\zxjf@xfeat,#1]}
+\def\zxjf@newfamily#1#2#3{%
+  \expandafter\def\csname #1family\expandafter\endcsname\expandafter
+   {\csname a#1family\endcsname\CJKfamily{#1}}%
+  \expandafter\newfontfamily\csname a#1family\endcsname[\zxjf@feat,#2]{#3}%
+  \setjafamilyfont{#1}[\zxjf@xfeat,#2]{#3}}
+\else
+\def\zxjf@setmainfont#1{\setmainfont[\zxjf@xfeat,#1]}
+\def\zxjf@setsansfont#1{\setsansfont[\zxjf@xfeat,#1]}
+\def\zxjf@setmonofont#1{\setmonofont[\zxjf@xfeat,#1]}
+\def\zxjf@newfamily#1#2{%
+  \expandafter\newfontfamily\csname #1family\endcsname[\zxjf@xfeat,#2]}
+\fi
+
+%% \zxjf@declare@preset{<name>}{<text>}, etc.
+\def\zxjf@declare@preset#1{%
+  \expandafter\zxjf@decl@preset@a\csname zxjf@the@preset@#1\endcsname}
+\def\zxjf@decl@preset@a#1{\@onlypreamble#1\def#1}
+\@onlypreamble\zxjf@uniweight
+\def\zxjf@uniweight#1#2{%
+  \zxjf@setmainfont{BoldFont=#2}{#1}%
+  \zxjf@setsansfont{}{#2}%
+  \zxjf@setmonofont{}{#2}}
+\@onlypreamble\zxjf@uniweight@opt
+\def\zxjf@uniweight@opt#1#2#3{%
+  \zxjf@setmainfont{#3,BoldFont=#2}{#1}%
+  \zxjf@setsansfont{#3}{#2}%
+  \zxjf@setmonofont{#3}{#2}}
+\@onlypreamble\zxjf@multiweight
+\def\zxjf@multiweight#1#2#3#4{%
+  \zxjf@setmainfont{BoldFont=#2}{#1}%
+  \zxjf@setsansfont{BoldFont=#4}{#3}%
+  \zxjf@setmonofont{BoldFont=#4}{#3}}
+\@onlypreamble\zxjf@multiweight@opt
+\def\zxjf@multiweight@opt#1#2#3#4#5{%
+  \zxjf@setmainfont{#5,BoldFont=#2}{#1}%
+  \zxjf@setsansfont{#5,BoldFont=#4}{#3}%
+  \zxjf@setmonofont{#5,BoldFont=#4}{#3}}
+
+%% \zxjf@use@preset{<name>}
+\def\zxjf@use@preset#1{%
+  \ifzxjf@prop \zxjf@use@preset@a{#1/prop}%
+  \else \let\zxjf@nxt\relax \fi
+  \ifx\zxjf@nxt\relax \zxjf@use@preset@a{#1}\fi
+  \zxjf@nxt}
+\def\zxjf@use@preset@a#1{%
+  \expandafter\let\expandafter\zxjf@nxt
+   \csname zxjf@the@preset@#1\endcsname}
+
+%% definitions of main preset mappings
+\zxjf@declare@preset{ms}{%
+  \zxjf@uniweight{ＭＳ 明朝}{ＭＳ ゴシック}}
+\zxjf@declare@preset{ms/prop}{%
+  \zxjf@uniweight{ＭＳ Ｐ明朝}{ＭＳ Ｐゴシック}}
+\zxjf@declare@preset{ms-dx}{%
+  \zxjf@multiweight{ＭＳ 明朝}{HG明朝E}{HGｺﾞｼｯｸM}{HGｺﾞｼｯｸE}}
+\zxjf@declare@preset{ms-dx/prop}{%
+  \zxjf@multiweight{ＭＳ Ｐ明朝}{HGP明朝E}{HGPｺﾞｼｯｸM}{HGｺﾞｼｯｸE}}
+\zxjf@declare@preset{ipa}{%
+  \zxjf@uniweight{IPA明朝}{IPAゴシック}}
+\zxjf@declare@preset{ipa/prop}{%
+  \zxjf@uniweight{IPA P明朝}{IPA Pゴシック}}
+\zxjf@declare@preset{ipa-dx}{%
+  \zxjf@multiweight{IPA明朝}{HG明朝E}{HGｺﾞｼｯｸM}{HGｺﾞｼｯｸE}}
+\zxjf@declare@preset{ipa-dx/prop}{%
+  \zxjf@multiweight{IPA P明朝}{HGP明朝E}{HGPｺﾞｼｯｸM}{HGｺﾞｼｯｸE}}
+\zxjf@declare@preset{kozuka4}{%
+  \zxjf@uniweight@opt{Kozuka Mincho Pro}{Kozuka Gothic Pro}%
+    {RawFeature=-palt}}
+\zxjf@declare@preset{kozuka4}{%
+  \zxjf@uniweight@opt{Kozuka Mincho Pro}{Kozuka Gothic Pro}%
+    {RawFeature=+palt}}
+\zxjf@declare@preset{kozuka6}{%
+  \zxjf@uniweight@opt{Kozuka Mincho Pro-VI}{Kozuka Gothic Pro-VI}%
+    {RawFeature=-palt}}
+\zxjf@declare@preset{kozuka6/prop}{%
+  \zxjf@uniweight@opt{Kozuka Mincho Pro-VI}{Kozuka Gothic Pro-VI}%
+    {RawFeature=+palt}}
+\zxjf@declare@preset{kozuka6n}{%
+  \zxjf@uniweight@opt{Kozuka Mincho Pr6N}{Kozuka Gothic Pr6NI}%
+    {RawFeature=-palt}}
+\zxjf@declare@preset{kozuka6n/prop}{%
+  \zxjf@uniweight@opt{Kozuka Mincho Pr6N}{Kozuka Gothic Pr6NI}%
+    {RawFeature=+palt}}
+\zxjf@declare@preset{hiragino}{%
+  \zxjf@uniweight@opt{ヒラギノ明朝 Pro W3}{ヒラギノ角ゴ Pro W6}%
+    {RawFeature=-palt}}
+\zxjf@declare@preset{hiragino/prop}{%
+  \zxjf@uniweight@opt{ヒラギノ明朝 Pro W3}{ヒラギノ角ゴ Pro W6}%
+    {RawFeature=+palt}}
+\zxjf@declare@preset{hiragino-dx}{%
+  \zxjf@multiweight@opt{ヒラギノ明朝 Pro W3}{ヒラギノ明朝 Pro W6}%
+    {ヒラギノ角ゴ Pro W3}{ヒラギノ角ゴ Pro W6}%
+    {RawFeature=-palt}}
+\zxjf@declare@preset{hiragino-dx/prop}{%
+  \zxjf@multiweight@opt{ヒラギノ明朝 Pro W3}{ヒラギノ明朝 Pro W6}%
+    {ヒラギノ角ゴ Pro W3}{ヒラギノ角ゴ Pro W6}%
+    {RawFeature=+palt}}
+
+\zxjf@declare@preset{hg}{%
+  \zxjf@newfamily{hgmc}{BoldFont=HGS明朝E}{HGS明朝B}%
+  \zxjf@newfamily{hgpr}{}{HGS創英ﾌﾟﾚｾﾞﾝｽEB}%
+  \zxjf@newfamily{hggt}{BoldFont=HGSｺﾞｼｯｸE}{HGSｺﾞｼｯｸM}%
+  \zxjf@newfamily{hggu}{}{HGS創英角ｺﾞｼｯｸUB}%
+  \zxjf@newfamily{hgmg}{}{HG丸ｺﾞｼｯｸM-PRO}%
+  \zxjf@newfamily{hgkk}{}{HGS教科書体}%
+  \zxjf@newfamily{hgks}{}{HG正楷書体-PRO}%
+  \zxjf@newfamily{hggs}{}{HGS行書体}%
+  \zxjf@newfamily{hgpp}{}{HGS創英角ﾎﾟｯﾌﾟ体}%
+}
+\zxjf@declare@preset{hg/prop}{%
+  \zxjf@newfamily{hgmc}{BoldFont=HGP明朝E}{HGP明朝B}%
+  \zxjf@newfamily{hgpr}{}{HGP創英ﾌﾟﾚｾﾞﾝｽEB}%
+  \zxjf@newfamily{hggt}{BoldFont=HGPｺﾞｼｯｸE}{HGPｺﾞｼｯｸM}%
+  \zxjf@newfamily{hggu}{}{HGP創英角ｺﾞｼｯｸUB}%
+  \zxjf@newfamily{hgmg}{}{HG丸ｺﾞｼｯｸM-PRO}%
+  \zxjf@newfamily{hgkk}{}{HGP教科書体}%
+  \zxjf@newfamily{hgks}{}{HG正楷書体-PRO}%
+  \zxjf@newfamily{hggs}{}{HGP行書体}%
+  \zxjf@newfamily{hgpp}{}{HGP創英角ﾎﾟｯﾌﾟ体}%
+}
+\zxjf@declare@preset{hiraginomg}{%
+  \zxjf@newfamily{hmg}{RawFeature=-palt}{ヒラギノ丸ゴ Pro W4}%
+}
+\zxjf@declare@preset{hiraginomg/prop}{%
+  \zxjf@newfamily{hmg}{RawFeature=+palt}{ヒラギノ丸ゴ Pro W4}%
+}
+
+
+%%%% ... and invokes the specified one!
+\zxjf@use@preset{\zxjf@main@preset}
+\@for\zxjf@x:=\zxjf@sub@preset\do{\zxjf@use@preset\zxjf@x}
+
+%%------ and some extras
+
+\def\useeasyjapanesesettings{%
+\XeTeXlinebreaklocale "ja"\relax
+\XeTeXlinebreakskip=0pt plus 1pt minus 0.1pt\relax
+\XeTeXlinebreakpenalty=0\relax
+}
+
+%%------ all done
+\endinput
+%% EOF
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 820ebf55857..45aa5a8824d 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -466,7 +466,7 @@ my @TLP_working = qw(
     xwatermark xyling xypic xypic-tut-pt xytree
   yafoot yagusylo yannisgr yax ydoc yfonts york-thesis youngtab yplan ytableau
   zed-csp zhnumber ziffer zhmetrics zhspacing zwgetfdate zwpagelayout
-    zxjafbfont
+    zxjafbfont zxjafont
 ); 
 
 
diff --git a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
index 66301b0a27b..1422d69a059 100644
--- a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
@@ -41,3 +41,4 @@ depend zhmetrics
 depend zhnumber
 depend zhspacing
 depend zxjafbfont
+depend zxjafont
diff --git a/Master/tlpkg/tlpsrc/zxjafont.tlpsrc b/Master/tlpkg/tlpsrc/zxjafont.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/zxjafont.tlpsrc