From 7a4f2bc6dacee73c333eb5850b1787694ffbd91f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Sep 2013 23:19:04 +0000 Subject: luatexja (9sep13) git-svn-id: svn://tug.org/texlive/trunk@31609 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +-- .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 537782 -> 540488 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 857671 -> 862060 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 58 ++++++++++++++++++--- .../luatex/luatexja/addons/luatexja-fontspec.sty | 25 +++++++-- .../tex/luatex/luatexja/addons/luatexja-preset.sty | 19 +++++-- .../texmf-dist/tex/luatex/luatexja/ltj-plain.sty | 2 +- .../tex/luatex/luatexja/patches/lltjdefs.sty | 2 +- 8 files changed, 90 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 5eee451c9b8..45dd8a29a0f 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20130711.0 +The LuaTeX-ja Package 20130909.0 -------------------------------- Copyright (c) 2011--2013 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -35,9 +35,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20130711.0 in the Git repository by + or tagged as 20130909.0 in the Git repository by + ;a=snapshot;h=refs/tags/20130909.0;sf=tgz> b1. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -82,4 +82,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Thu Jul 11 08:55:45 2013 +0900 +Last commit date: Mon Sep 9 16:27:13 2013 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 381464652f9..27a46b10356 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 4a3522224ff..b7b601744e4 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index 4599eb8f682..f76a663a2c0 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -654,12 +654,34 @@ Note that \texttt{*.\{dtx,ins\}} and \texttt{ltj-kinsoku\_make.tex} are not need 従来日本語の文字コードとして用いられてきたEUC-JPやShift-JISは使用できない. % %<*en> -\item \LuaTeX-ja is very slower than \pTeX. Using LuaJIT\TeX slightly improve the situation. +\item \LuaTeX-ja is very slower than \pTeX. Using LuaJIT\TeX\ slightly improve the situation. % %<*ja> \item \LuaTeX-jaは動作が\pTeX に比べて非常に遅い.コードを変更して徐々に速くしているが, まだ満足できる速度ではない.LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようである. % + +%<*en> +\item \emph{Note for MiK\TeX\ users:} \LuaTeX-ja requires that two CMap files, +\texttt{UniJIS2004-UTF32-H} and \texttt{Adobe-Japan1-UCS2}, must be found +by Kpathsearch. +You can check this by \texttt{kpsewhich} command (the output may be changed): +% +%<*ja> +\item \textbf{MiK\TeX 利用者への注意:}\LuaTeX-jaが動作するためには, +\texttt{UniJIS2004-UTF32-H}, \texttt{Adobe-Japan1-UCS2}という2つのCMapが +Kpathsearchによって見つけられることが必要である.\TeX\ LiveやW32\TeX ユーザは +普通にインストールすればそのようになっているはずである. + +確認するには,以下のように \texttt{kpsewhich} コマンドを実行すればよい: +% +\begin{verbatim} +$ kpsewhich -format=cmap UniJIS2004-UTF32-H +/opt/texlive/2013/texmf-dist/fonts/cmap/adobemapping/aj16/CMap/UniJIS2004-UTF32-H +$ kpsewhich -format=cmap Adobe-Japan1-UCS2 +/opt/texlive/2013/texmf-dist/fonts/cmap/adobemapping/ToUnicode/Adobe-Japan1-UCS2 +\end{verbatim} + \end{itemize} %\subsection{Using in plain \TeX} @@ -1114,14 +1136,27 @@ featureが\textbf{JAglue}と衝突するためである(\ref{para-kern}節を To use standard Japanese font settings easily, one can load \Pkg{luatexja-preset} package with several options. This package provides functions in a part of \Pkg{otf} package and a part of \Pkg{PXchfon} package by Takayuki Yato, -and loads \Pkg{luatexja-fontspec} internally. +and loads \Pkg{luatexja-fontspec}, hence \Pkg{fontspec} internally. + +If you need to pass some options to \Pkg{fontspec}, load \Pkg{fontspec} manually +before \Pkg{luatexja-preset}: % %<*ja> よく使われている和文フォント設定を一行で指定できるようにしたのが \Pkg{luatexja-preset}パッケージである.このパッケージは, \Pkg{otf}パッケージの一部機能と八登崇之氏による\Pkg{PXchfon}パッケージの一部機能とを -合わせたような格好をしており,内部で\Pkg{luatexja-fontspec}を読み込んでいる. +合わせたような格好をしており,内部で\Pkg{luatexja-fontspec},従って +\Pkg{fontspec}を読み込んでいる. + +もし\Pkg{fontspec}パッケージに何らかのオプションを渡す必要がある +\footnote{例えば,数式フォントまで置換されてしまい,\texttt{\char92mathit}によってギリシャ文字の +斜体大文字が出なくなる,など.}場合は, +次のように\Pkg{luatexja-preset}の前に\Pkg{fontspec}を手動で読みこめば良い: % +\begin{verbatim} +\usepackage[no-math]{fontspec} +\usepackage[...]{luatexja-preset} +\end{verbatim} %\paragraph{General options} %\paragraph{一般的なオプション} @@ -1143,16 +1178,18 @@ This means that \verb+\mcfamily\bfseries+, \verb+\gtfamily\bfseries+ and %<*en> Use \textit{mincho} with two weights (medium~and~bold), \textit{gothic} with three weights (medium,~bold and~heavy), and \textit{rounded gothic}% -\footnote{Provided by \texttt{\char92mgfamily}, +\footnote{Provided by \texttt{\char92mgfamily} and \texttt{\char92textmg\{...\}}, because \textit{rounded gothic} is called \textit{maru gothic} (丸ゴシック) in Japanese.}. The heavy weight of \textit{gothic} can be used by ``changing the family'' \verb+\gtebfamily+, -because \Pkg{fontspec} package can handle only medium (\verb+\mdseries+) and +or \verb+\textgteb{...}+. +This is because \Pkg{fontspec} package can handle only medium (\verb+\mdseries+) and bold (\verb+\bfseries+). % %<*ja> 明朝体2ウェイト・ゴシック体3ウェイトと, -丸ゴシック体 (\verb+\mgfamily+) を使用可能とする. -ゴシック体は細字・太字・極太の3ウェイトがあるが,極太ゴシック体はファミリの切り替え (\verb+\gtebfamily+) % +丸ゴシック体 (\verb+\mgfamily+, \verb+\textmg{...}+) を使用可能とする. +ゴシック体は細字・太字・極太の3ウェイトがあるが, +極太ゴシック体はファミリの切り替え (\verb+\gtebfamily+, \verb+\textgteb{...}+) % で実現している.\Pkg{fontspec}では通常 (\verb+\mdseries+) と太字 (\verb+\bfseries+) しか扱えないために このような中途半端な実装になっている. % @@ -2080,7 +2117,12 @@ JFMの名前を指定する.もし以前に指定されたJFMが読み込ま % %<*ja> \item[jfmvar=] 標準では,JFMとサイズが同じで, - 実フォントだけが異なる2つの和文フォントは…… + 実フォントだけが異なる2つの和文フォントは「区別されない」.例えば +下の例において,最初の「)」と「【」の実フォントは異なるが, +JFMもサイズも同じなので,普通に「)【」と入力した時と同じように半角空きとなる. + +しかし,時には…… + % \begin{LTXexample}[width=0.3\textwidth] \ltjsetparameter{differentjfm=both} diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty index c368215ffec..b1a9b4aa5c0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2013/05/14 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2013/08/17 fontspec support of LuaTeX-ja] \RequirePackage{fontspec,luatexja} \ExplSyntaxOn @@ -81,6 +81,7 @@ } \tl_set:Nx \g_fontspec_default_fontopts_tl {JFM=ujis,Scale=\fp_use:N \g_ltj_fontspec_scale_fp,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl} + \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily \fontspec_select:nn{#1}{#2} \group_end: @@ -127,11 +128,25 @@ \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3} } -\DeclareDocumentCommand \defaultjfontfeatures {m} { +\tl_new:N \g_ltj_fontspec_default_fontopts_tl +\prop_new:N \g__ltj_fontspec_fontopts_prop +\DeclareDocumentCommand \defaultjfontfeatures { o m } + { + \IfNoValueTF {#1} + { \__ltj_fontspec_set_default_features:n {#2} } + { \__ltj_fontspec_set_font_default_features:nn {#1} {#2} } + } +\cs_new:Nn \__ltj_fontspec_set_default_features:n + { \tl_set:Nn \g_ltj_fontspec_default_fontopts_tl {#1,} -} - -\tl_clear:N \g_ltj_fontspec_default_fontopts_tl + } +\cs_new:Nn \__ltj_fontspec_set_font_default_features:nn + { + \__fontspec_sanitise_fontname:Nn \l__fontspec_tmp_tl {#1} + \tl_if_empty:nTF {#2} + { \prop_gremove:NV \g__ltj_fontspec_fontopts_prop \l__fontspec_tmp_tl } + { \prop_gput:NVn \g__ltj_fontspec_fontopts_prop \l__fontspec_tmp_tl {#2} } + } \DeclareDocumentCommand \addjfontfeatures {m} { \ifcsname zf@family@fontdef\k@family\endcsname diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty index d3b32e0419a..0134a784564 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -6,7 +6,6 @@ \RequirePackage{luatexja-fontspec} \ExplSyntaxOn -%%%% message \bool_new:N \l_ltjpreset_bold_bool % bold \bool_set_false:N \l_ltjpreset_bold_bool @@ -20,7 +19,7 @@ \int_new:N \l_ltjpreset_deluxe_int % expert \int_set:Nn \l_ltjpreset_deluxe_int { 0 } -\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }} % 7 fonts +\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }} % 6 fonts \DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts % scale @@ -38,8 +37,12 @@ % 漢字字形 \tl_new:N \l_ltjpreset_kanji_shape_tl -\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis -\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004 +\DeclareOption{90jis}{ + \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 } +} % 90jis +\DeclareOption{jis2004}{ + \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 } +} % jis2004 % font preset \bool_new:N \l_ltjpreset_office_bool % MS Office の HG 系フォントを使っているか @@ -304,16 +307,22 @@ %%%% (丸)ゴシック体の設定: bold option もここで \int_compare:nTF { \l_ltjpreset_deluxe_int == 2 } { +%%% mg \newjfontfamily \mgfamily [ + BoldFont = \ltjpreset_font_mg:, \tl_use:N \l_ltjpreset_add_features_tl \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_mg: } + \DeclareTextFontCommand{\textmg}{\mgfamily} +%%% gteb \newjfontfamily \gtebfamily [ + BoldFont = \ltjpreset_font_gt_eb:, \tl_use:N \l_ltjpreset_add_features_tl \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_gt_eb: } + \DeclareTextFontCommand{\textgteb}{\gtebfamily} \bool_if:NT \l_ltjpreset_bold_bool { \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx: } @@ -331,7 +340,6 @@ %%%% 実際の fontspec の呼びだし \defaultjfontfeatures{ Kerning=Off } - \setmainjfont [ BoldFont = \ltjpreset_font_mc_bx: \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, @@ -343,5 +351,6 @@ \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_gt_m: } + \ExplSyntaxOff \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index d372c55281d..7f48ff85897 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty @@ -23,7 +23,7 @@ %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ % LuaTeX-ja macros against plain TeX -\def\ltj@stdmcfont{psft:Ryumin-Right} +\def\ltj@stdmcfont{psft:Ryumin-Light} \def\ltj@stdgtfont{psft:GothicBBB-Medium} \newread\ltj@@cfgread \openin\ltj@@cfgread{luatexja.cfg}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 57b3bc8154c..03f4aaf170d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -5,7 +5,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{lltjdefs}[2013/06/12 Default font settings of LuaTeX-ja] -\def\ltj@stdmcfont{psft:Ryumin-Right} +\def\ltj@stdmcfont{psft:Ryumin-Light} \def\ltj@stdgtfont{psft:GothicBBB-Medium} \InputIfFileExists{luatexja.cfg}{}{} -- cgit v1.2.3