texlive[41600] Master/texmf-dist: luatexja (1jul16)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 2 00:05:28 CEST 2016
Revision: 41600
http://tug.org/svn/texlive?view=revision&revision=41600
Author: karl
Date: 2016-07-02 00:05:28 +0200 (Sat, 02 Jul 2016)
Log Message:
-----------
luatexja (1jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2016-07-01 22:05:01 UTC (rev 41599)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2016-07-01 22:05:28 UTC (rev 41600)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20160618.0
+The LuaTeX-ja Package 20160701.0
--------------------------------
Copyright (c) 2011--2016 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -34,9 +34,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20160618.0 in the Git repository by
+ or tagged as 20160701.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20160618.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20160701.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -81,4 +81,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Sat Jun 18 17:43:10 2016 +0900
+Last commit date: Fri Jul 1 21:35:05 2016 +0900
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2016-07-01 22:05:01 UTC (rev 41599)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2016-07-01 22:05:28 UTC (rev 41600)
@@ -6805,11 +6805,14 @@
%<*en>
\paragraph{IVS support}
Recent fonts support Ideographic Variation Selector (IVS).
-It seems that \Pkg{luaotfload} and \Pkg{fontspec} packages do not support
-IVS, so we implemented IVS support in \Pkg{luatexja-otf}.
-\emph{IVS support by the \Pkg{luatexja-otf} package is experimental.
-If you want to enable IVS support, load
-\Pkg{luatexja-otf} and execute the following:}
+\Pkg{luaotfload} and \Pkg{fontspec} packages used to be not supported IVS,
+so we implemented experimental IVS support in \Pkg{luatexja-otf},
+which is activated by
+\begin{lstlisting}
+\directlua{luatexja.otf.enable_ivs()}
+\end{lstlisting}
+However, recent \Pkg{luaotfload} and \Pkg{fontspec} packages seem to support IVS,
+so we don't execute above command anymore.
%</en>
%<*ja>
\paragraph{IVSサポート}
@@ -6818,68 +6821,15 @@
（漢字用異体字セレクタ）を後置することによって
字形を指定する仕組み(IVS)が含まれている．
執筆時点の2013年12月では，\Pkg{luaotfload}や\Pkg{fontspec}パッケージ類は
-IVSに対応してはいないようである．これらのパッケージで対応してくれるのが理想的だが，
-それまでのつなぎとして，\Pkg{luatexja-otf}パッケージ内にIVS対応を仕込んでおいた．
-
-\medskip
-
-\emph{\Pkg{luatexja-otf}によるIVS対応は試験的なものである．
-有効にするには，
-\Pkg{luatexja-otf}パッケージを読み込んだ上で以下の命令を実行する%
-\footnote{この命令を2回以上実行しても意味がない．}：}
-%</ja>
+IVSに対応してはいないようであったため，
+\Pkg{luatexja-otf}パッケージ内に試験的なIVS対応を実装した．これは以下の命令の実行で有効になる：
\begin{lstlisting}
\directlua{luatexja.otf.enable_ivs()}
\end{lstlisting}
-%<ja> すると，上の命令を実行した箇所以降では，以下のようにIVSによる字形指定が有効となる．
-%<en> After executing the command above, you can use IVS like the following:
-\begin{LTXexample}
-\Large
-\jfontspec{KozMinPr6N-Regular}
-奈良県葛��城市と，東京都葛��飾区．\\
-こんにちは，渡
-邉��邉��邉��邉��邉��
-邉��邉��邉��邉��邉��
-邉��邉��邉��邉��邉��
-さん．
-\end{LTXexample}
-%<*ja>
-左上側の入力においては，漢字用異体字セレクタを明示するため，
-例えばVariation~Selector~18 (\texttt{U+E0101})を\IVSB{18}のように表記している．
+しかし，現在の\Pkg{luaotfload}や\Pkg{fontspec}パッケージは
+IVSに対応しているようであるので，もはや上の命令を実行する必要はない．
%</ja>
-\medskip
-%<*en>
-Specifying glyph variants by IVS precedes glyph replacement by font features.
-For example, only ``葛'' in ``葛西'' is changed by font features
-\texttt{jp78}~or~\texttt{jp90}, which does not followed by any variation selector.
-%</en>
-%<*ja>
-また，IVSによる字形指定は，OpenType機能によるそれに優先されることとした．
-下の例において，\texttt{jp78}, \texttt{jp90} 指定で字形が変化した文字は
-異体字セレクタが続いていない「葛西」中の「葛」のみである．
-%</ja>
-\begin{LTXexample}
- \def\TEST#1{%
- {\jfontspec[#1]{KozMinPr6N-Regular}%
- 葛��城市，葛��飾区，葛西}\\}
- 指定なし：\TEST{}
- \texttt{jp78}：\TEST{CJKShape=JIS1978}
- \texttt{jp90}：\TEST{CJKShape=JIS1990}
-\end{LTXexample}
-
-%<*ja>
-現状では，\TeX 側のインターフェースとなる \Pkg{luatexja-otf.sty} は一切変更していない
-ので，ZRさんによる\Pkg{PXipamjm}パッケージ%
-\footnote{\url{https://github.com/zr-tex8r/PXipamjm}. 説明は彼のブログ記事
-「pxipamjm パッケージの説明書のような何か(\url{http://d.hatena.ne.jp/zrbabbler/20131221})」
-にある．}
-にあるような気の利いた命令はまだない．
-異体字の一覧表示を行いたい場合は，gitリポジトリ内の \texttt{test/test19-ivs.tex} 中にある
-Lua・\TeX コードが参考になるだろう．
-%</ja>
-
-
\subsection{\Pkg{luatexja-adjust}}
\label{ssec-adj}
\begin{figure}[t]
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2016-07-01 22:05:01 UTC (rev 41599)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2016-07-01 22:05:28 UTC (rev 41600)
@@ -395,7 +395,10 @@
return true, lp
end
end
-local calc_np_auxtable = {
+local calc_np_auxtable
+do
+local dir_tate = luatexja.dir_table.dir_tate
+calc_np_auxtable = {
[id_glyph] = calc_np_aux_glyph_common,
[id_hlist] = function(lp)
local op, flag
@@ -501,6 +504,7 @@
return false, node_next(lp)
end,
}
+end
calc_np_auxtable[id_rule] = calc_np_auxtable.box_like
calc_np_auxtable[15] = calc_np_auxtable.box_like
calc_np_auxtable[id_ins] = calc_np_auxtable.skip
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2016-07-01 22:05:01 UTC (rev 41599)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2016-07-01 22:05:28 UTC (rev 41600)
@@ -725,56 +725,56 @@
%%%% patch \@text at composite because of {y,t}albaselineshift
-%% \pltx at isletter from plfonts.dtx
-\def\pltx at mark{\pltx at mark@}
-\let\pltx at scanstop\relax
-\long\def\pltx at cond#1\fi{%
- #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\long\def\pltx at isletter#1{%
- \expandafter\pltx at isletter@i\romannumeral-`0#1\pltx at scanstop}
-\long\def\pltx at isletter@i#1\pltx at scanstop{%
- \pltx at cond\ifx\pltx at mark#1\pltx at mark\fi{\@firstoftwo}%
- {\pltx at isletter@ii\pltx at scanstop#1\pltx at scanstop{}#1\pltx at mark}}
-\long\def\pltx at isletter@ii#1\pltx at scanstop#{%
- \pltx at cond\ifx\pltx at mark#1\pltx at mark\fi%
- {\pltx at isletter@iii}{\pltx at isletter@iv}}
-\long\def\pltx at isletter@iii#1\pltx at mark{\@secondoftwo}
-\long\def\pltx at isletter@iv#1#2#3\pltx at mark{%
- \pltx at cond\ifx\pltx at mark#3\pltx at mark\fi{%
- \pltx at cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
- {\@firstoftwo}{\@secondoftwo}%
- }{\@secondoftwo}}
+% %% \pltx at isletter from plfonts.dtx
+% \def\pltx at mark{\pltx at mark@}
+% \let\pltx at scanstop\relax
+% \long\def\pltx at cond#1\fi{%
+% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+% \long\def\pltx at isletter#1{%
+% \expandafter\pltx at isletter@i#1\pltx at scanstop}
+% \long\def\pltx at isletter@i#1\pltx at scanstop{%
+% \pltx at cond\ifx\pltx at mark#1\pltx at mark\fi{\@firstoftwo}%
+% {\pltx at isletter@ii\pltx at scanstop#1\pltx at scanstop{}#1\pltx at mark}}
+% \long\def\pltx at isletter@ii#1\pltx at scanstop#{%
+% \pltx at cond\ifx\pltx at mark#1\pltx at mark\fi%
+% {\pltx at isletter@iii}{\pltx at isletter@iv}}
+% \long\def\pltx at isletter@iii#1\pltx at mark{\@secondoftwo}
+% \long\def\pltx at isletter@iv#1#2#3\pltx at mark{%
+% \pltx at cond\ifx\pltx at mark#3\pltx at mark\fi{%
+% \pltx at cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
+% {\@firstoftwo}{\@secondoftwo}%
+% }{\@secondoftwo}}
+%
+% \def\@text at composite@x#1#2{%
+% \ifx#1\relax
+% #2%
+% \else\pltx at isletter{#1}{#1}{%
+% \begingroup
+% \setbox\z@\hbox\bgroup%
+% \ltj at yablshift\z@ \ltj at tablshift\z@
+% #1%
+% \@tempcntb\directlua{luatexja.pltx_composite_last_node_char()}%)
+% \xdef\pltx at composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
+% \aftergroup\pltx at composite@temp
+% \egroup
+% \ifnum\ltjgetparameter{direction}=3 %
+% \@tempdima=\ltj at tablshift sp\else\@tempdima=\ltj at yablshift sp\fi
+% \ifnum\@tempcntb<\z@\@tempcnta\z@\else
+% \@tempcnta=\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{\@tempcntb}}\relax
+% \ifnum\@tempcnta=\z@\@tempdima\z@\fi
+% \fi
+% \ifnum\@tempcnta>\z@
+% \ifodd\ltjgetparameter{alxspmode}{\@tempcntb}\else\leavevmode\hbox{}\fi
+% \begingroup\mathsurround\z@$%
+% \hbox{\lower\@tempdima\box\z@}
+% $\endgroup%
+% \ifnum\ltjgetparameter{alxspmode}{\@tempcntb}<2\hbox{}\fi
+% \else
+% \ifdim\@tempdima=\z@{\ltj at yablshift\z@ \ltj at tablshift\z@#1}%
+% \else\lower\@tempdima\box\z@\fi
+% \fi
+% \endgroup}%
+% \fi
+% }
-\def\@text at composite@x#1#2{%
- \ifx#1\relax
- #2%
- \else\pltx at isletter{#1}{#1}{%
- \begingroup
- \setbox\z@\hbox\bgroup%
- \ltj at yablshift\z@ \ltj at tablshift\z@
- #1%
- \@tempcntb\directlua{luatexja.pltx_composite_last_node_char()}%)
- \xdef\pltx at composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
- \aftergroup\pltx at composite@temp
- \egroup
- \ifnum\ltjgetparameter{direction}=3 %
- \@tempdima=\ltj at tablshift sp\else\@tempdima=\ltj at yablshift sp\fi
- \ifnum\@tempcntb<\z@\@tempcnta\z@\else
- \@tempcnta=\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{\@tempcntb}}\relax
- \ifnum\@tempcnta=\z@\@tempdima\z@\fi
- \fi
- \ifnum\@tempcnta>\z@
- \ifodd\ltjgetparameter{alxspmode}{\@tempcntb}\else\leavevmode\hbox{}\fi
- \begingroup\mathsurround\z@$%
- \hbox{\lower\@tempdima\box\z@}
- $\endgroup%
- \ifnum\ltjgetparameter{alxspmode}{\@tempcntb}<2\hbox{}\fi
- \else
- \ifdim\@tempdima=\z@{\ltj at yablshift\z@ \ltj at tablshift\z@#1}%
- \else\lower\@tempdima\box\z@\fi
- \fi
- \endgroup}%
- \fi
-}
-
\endinput
More information about the tex-live-commits
mailing list