From 92c0c09db1a4291c5cf027d25557ccb55bbefd2a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Mar 2020 21:30:23 +0000 Subject: luatexja (26mar20) git-svn-id: svn://tug.org/texlive/trunk@54564 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 528742 -> 685487 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 938795 -> 1101328 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 151 ++++++++++----------- .../tex/luatex/luatexja/ltj-lotf_aux.lua | 3 +- Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua | 6 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 2 +- .../tex/luatex/luatexja/patches/lltjp-listings.sty | 21 ++- 8 files changed, 98 insertions(+), 93 deletions(-) diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 4ef0694918a..838db102cf3 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 20200323.0 +The LuaTeX-ja Package 20200326.0 -------------------------------- Copyright (c) 2011--2020 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -45,9 +45,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20200323.0 in the Git repository by + or tagged as 20200326.0 in the Git repository by + ;a=snapshot;h=refs/tags/20200326.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -95,4 +95,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Mar 23 07:51:46 2020 +0900 +Last commit date: Thu Mar 26 10:27:52 2020 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index c850b984cac..386207203a0 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 e82c5aae289..cae4649d223 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 1cf7ea28d73..d2ec828f7e3 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -1,11 +1,6 @@ %<*!showexpl> %#! lualatex -shell-escape -% To typeset this manual, you need following two fonts: -% - KozMinPr6N-Regular.otf -% - KozGoPr6N-Medium.otf -% - KozGoPr6N-Regular.otf - %%%%% section ==> 章 %%%%% subsection => 節 \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} @@ -34,9 +29,9 @@ ]{iosevka-slab-regular} \setsansfont[Scale=MatchLowercase,Ligatures=TeX,RawFeature=-notdef]{Linux Biolinum O} \usepackage[match]{luatexja-fontspec} -\usepackage[kozuka-pr6n]{luatexja-preset} +\usepackage[haranoaji]{luatexja-preset} \usepackage{unicode-math} -\setmonojfont{KozGoPr6N-Regular.otf} +\setmonojfont{HaranoAjiGothic-Regular.otf} \setmathfont[Scale=MatchLowercase]{XITSMath} \setLaTeXa{\scshape a} @@ -94,7 +89,7 @@ basicstyle=\ttfamily\small, pos=r, breaklines=true, numbers=none, rframe={}, basewidth=0.5em, numberstyle=\tiny, numbersep=0.5em, explpreset={numberstyle=\tiny, numbers=left, numbersep=1em, columns=fixed}, - morecomment=[l]{\%}, commentstyle=\color{green}, + morecomment=[l]{\%}, commentstyle=\color{green} } % Suppress output from showexpl to stdout. \makeatletter @@ -1389,8 +1384,8 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\ \item 和文フォントのシェイプを定義するには,通常の \cs{DeclareFontShape} を使えば良い: % \begin{lstlisting} -\DeclareFontShape{JY3}{mc}{b}{n}{<-> s*KozMinPr6N-Bold:jfm=ujis;-kern}{} - % Kozuka Mincho Pr6N Bold +\DeclareFontShape{JY3}{mc}{b}{n}{<-> s*HaranoAjiMincho--Bold:jfm=ujis;-kern}{} + % Harano Aji Mincho Bold \end{lstlisting} %<*ja> 仮名書体を使う場合など,複数の和文フォントを組み合わせて使いたい場合は @@ -1637,10 +1632,12 @@ Below is an example of \cs{jfontspec}. % \begin{LTXexample}[width=0.4\textwidth] -\jfontspec[CJKShape=NLC]{KozMinPr6N-Regular} -JIS~X~0213:2004→辻\par -\jfontspec[CJKShape=JIS1990]{KozMinPr6N-Regular} -JIS~X~0208:1990→辻 +\jfontspec[CJKShape=NLC]{HaranoAjiMincho-Regular} +JIS~X~0213:2004→辻鯵\par +\jfontspec[CJKShape=JIS1990]{HaranoAjiMincho-Regular} +JIS~X~0208-1990→辻鯵\par +\jfontspec[CJKShape=JIS1978]{HaranoAjiMincho-Regular} +JIS~C~6226-1978→辻鯵 \end{LTXexample} %\subsection{Presets of Japanese fonts} @@ -1671,10 +1668,10 @@ The following presets are defined: % 例えば,本ドキュメントでは\Pkg{luatexja-preset}パッケージを % For example, this document loads \Pkg{luatexja-preset} package by \begin{lstlisting} -\usepackage[kozuka-pr6n]{luatexja-preset} +\usepackage[haranoaji]{luatexja-preset} \end{lstlisting} -%として読み込み,小塚書体(Pr6N)を使うことを指定している. -% which means that Kozuka~Pr6N fonts will be used in this document. +%として読み込み,原ノ味フォントを使うことを指定している. +% which means that Harano Aji fonts will be used in this document. %<*en> @@ -1693,15 +1690,13 @@ as an external package \Pkg{luatexja-otf}. 一部を(\Pkg{luatexja-otf}という別のパッケージとして)実装した. % -\begin{LTXexample} -\jfontspec{KozMinPr6N-Regular.otf} -森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に行く。 - +\begin{LTXexample}[width=0.4\textwidth] +森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に\\ \CID{7652}飾区の\CID{13706}野家, -\CID{1481}城市,葛西駅, -高崎と\CID{8705}\UTF{FA11} - -\aj半角{はんかくカタカナ} +\CID{1481}城市,葛西駅,\\ +高崎と\CID{8705}\UTF{FA11},濱と\ajMayuHama\\ +\aj半角{カタカナ}\ajKakko3\ajMaruYobi{2}% +\ajLig{令和}\ajLig{○問}\ajJIS \end{LTXexample} %<*ja> @@ -3441,22 +3436,22 @@ TrueType/OpenTypeフォントにfeatureを指定したものを和文フォン ことができる: % \begin{LTXexample}[width=0.3\textwidth] -\jfont\tradgt={file:KozMinPr6N-Regular.otf:script=latn;% +\jfont\tradmc={IPAexMincho:script=latn;% +trad;-kern;jfm=ujis} at 14pt -\tradgt 当/体/医/区 +\tradmc 当/体/医/区 \end{LTXexample} %<*en> Note that the defined control sequence -(\cs{tradgt} in the example above) using \cs{jfont} is not a +(\cs{tradmc} in the example above) using \cs{jfont} is not a \textit{font\_def} token, but a macro. -Hence the input like \verb+\fontname\tradgt+ +Hence the input like \verb+\fontname\tradmc+ causes a error. We denote control sequences which are defined in \cs{jfont} by . % %<*ja> -なお,\cs{jfont} で定義された制御綴(上の例だと \cs{tradgt}) -は\textit{font\_def}トークンではなくマクロである.従って,\verb+\fontname\tradgt+ のような +なお,\cs{jfont} で定義された制御綴(上の例だと \cs{tradmc}) +は\textit{font\_def}トークンではなくマクロである.従って,\verb+\fontname\tradmc+のような 入力はエラーとなる.以下では \cs{jfont} で定義された 制御綴をで表す. % @@ -3588,9 +3583,9 @@ The difference among these three~JFMs is shown in \autoref{tab-difjfm}. \begin{figure} \begin{LTXexample}[width=0.3\textwidth] \ltjsetparameter{differentjfm=both} -\jfont\F=file:KozMinPr6N-Regular.otf:jfm=ujis -\jfont\G=file:KozGoPr6N-Medium.otf:jfm=ujis -\jfont\H=file:KozGoPr6N-Medium.otf:jfm=ujis;jfmvar=hoge +\jfont\F=HaranoAjiMincho-Regular:jfm=ujis +\jfont\G=HaranoAjiGothic-Medium:jfm=ujis +\jfont\H=HaranoAjiGothic-Medium:jfm=ujis;jfmvar=hoge \F ){\G 【】}( % halfwidth space ){\H 『』}( % fullwidth space @@ -3625,10 +3620,10 @@ JFMもサイズも同じなので,普通に「)【」と入力した時と \begin{figure} \begin{LTXexample}[pos=t] \newcommand\test{\vrule ダイナミックダイクマ\vrule\\} -\jfont\KMFW = KozMinPr6N-Regular:jfm=prop;-kern at 17pt -\jfont\KMFK = KozMinPr6N-Regular:jfm=prop at 17pt % kern is activated -\jfont\KMPW = KozMinPr6N-Regular:jfm=prop;script=dflt;+pwid;-kern at 17pt -\jfont\KMPK = KozMinPr6N-Regular:jfm=prop;script=dflt;+pwid;+kern at 17pt +\jfont\KMFW = HaranoAjiMincho-Regular:jfm=prop;-kern at 17.28pt +\jfont\KMFK = HaranoAjiMincho-Regular:jfm=prop at 17.28pt % kern is activated +\jfont\KMPW = HaranoAjiMincho-Regular:jfm=prop;script=dflt;+palt;-kern at 17.28pt +\jfont\KMPK = HaranoAjiMincho-Regular:jfm=prop;script=dflt;+palt;+kern at 17.28pt \begin{multicols}{2} \ltjsetparameter{kanjiskip=0pt} {\KMFW\test \KMFK\test \KMPW\test \KMPK\test} @@ -3666,8 +3661,8 @@ NFSS2用の命令(\ref{ssec:chgfnt}節,\ref{ssec:nfsspat}節)における カーニング情報は標準で使用する}ことになっているようである. 言い換えれば,カーニング情報を使用しない設定にするには,面倒でも \begin{lstlisting} -\jfont\hoge=KozMinPr6N-Regular:jfm=ujis;-kern at 3.5mm -\DeclareFontShape{JY3}{fuga}{m}{n} {<-> s*KozMinPr6N-Regular:jfm=ujis;-kern}{} +\jfont\hoge=HaranoAjiMincho-Regular:jfm=ujis;-kern at 3.5mm +\DeclareFontShape{JY3}{fuga}{m}{n} {<-> s*HaranoAjiMincho-Regular:jfm=ujis;-kern}{} \end{lstlisting} のように,\texttt{-kern} という指定を自分で追加しなければいけない. \item @@ -3703,11 +3698,9 @@ For example, the following example uses the standard JFM \texttt{jfm-ujis.lua}, letter-spacing and the width of italic correction are not correct: % \begin{LTXexample}[width=0.3\textwidth] -\jfont\E=KozMinPr6N-Regular:extend=1.5;jfm=ujis;-kern -\E あいうえお - -\jfont\S=KozMinPr6N-Regular:slant=1;jfm=ujis;-kern -\S あいう\/ABC +\jfont\E=HaranoAjiMincho-Regular:extend=1.5;jfm=ujis;-kern +\jfont\S=HaranoAjiMincho-Regular:slant=1;jfm=ujis;-kern +\E あいうえお \S あいう\/ABC \end{LTXexample} %<*ja> @@ -3723,16 +3716,15 @@ JFM中における \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\ \begin{LTXexample}[width=16\zw] \leavevmode \ltjsetparameter{kanjiskip=0pt plus 3\zw} -\vrule\hbox to 15\zw{あ「い」う,えお}\vrule - -\jfont\G=file:KozMinPr6N-Regular.otf% - :jfm=ujis;-ltjksp at 9.2487pt +\vrule\hbox to 15\zw{あ「い」う,えお}\vrule\\ +\jfont\G=HaranoAjiMincho-Regular% + :jfm=ujis;-ltjksp at \zw \G\leavevmode% \vrule\hbox to 15\zw{あ「い」う,えお}\vrule \end{LTXexample} なお, \begin{lstlisting} - \jfont\G=file:KozMinPr6N-Regular.otf:jfm=ujis;-ltjksp;+ltjksp at 9.2487pt + \jfont\G=HaranoAjiMincho-Regular:jfm=ujis;-ltjksp;+ltjksp at \zw \end{lstlisting} のように \texttt{+ltjksp} 指定を行った場合は,\texttt{kanjiskip\_natural} など 3キーは再び有効化される.\texttt{-ltjksp}, \texttt{+ltjksp} を複数回指定した場合は, @@ -3750,10 +3742,9 @@ This functionality is disabled by \texttt{-ltjksp} specification. \begin{LTXexample}[width=16\zw] \leavevmode \ltjsetparameter{kanjiskip=0pt plus 3\zw} -\vrule\hbox to 15\zw{あ「い」う,えお}\vrule - -\jfont\G=file:KozMinPr6N-Regular.otf% - :jfm=ujis;-ltjksp at 9.2487pt +\vrule\hbox to 15\zw{あ「い」う,えお}\vrule\\ +\jfont\G=HaranoAjiMincho-Regular% + :jfm=ujis;-ltjksp at \zw \G\leavevmode% \vrule\hbox to 15\zw{あ「い」う,えお}\vrule \end{LTXexample} @@ -3825,8 +3816,8 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont unless \texttt{vert}~and//or~\texttt{vrt2} are explicitly activated or deactivated (as the second line in the example below). \begin{lstlisting} -\tfont\S=file:KozMinPr6N-Regular.otf:jfm=ujisv % vrt2 is automatically activated -\tfont\T=file:KozMinPr6N-Regular.otf:jfm=ujisv;-vert % vert and vrt2 are not activated +\tfont\S=HaranoAjiMincho-Regular:jfm=ujisv % vrt2 is automatically activated +\tfont\T=HaranoAjiMincho-Regular:jfm=ujisv;-vert % vert and vrt2 are not activated \tfont\U=file:ipaexm.ttf:jfm=ujisv % vert is automatically activated, since this font does not have vrt2 \end{lstlisting} @@ -3851,9 +3842,9 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont \end{description} \begin{figure}[!tb] \begin{LTXexample}[pos=b] -\jfont\X=[KozMinPr6N-Regular.otf]:jfm=ujis -\tfont\U=[KozMinPr6N-Regular.otf]:jfm=ujisv -\tfont\V=[KozMinPr6N-Regular.otf]:jfm=ujisv;jpotf +\jfont\X=[HaranoAjiMincho-Regular.otf]:jfm=ujis +\tfont\U=[HaranoAjiMincho-Regular.otf]:jfm=ujisv +\tfont\V=[HaranoAjiMincho-Regular.otf]:jfm=ujisv;jpotf \def\TEST#1#2{\leavevmode\hbox{#1#2\string#2 “引用,と句読点.”}} \ttfamily\centering\TEST\yoko\X \quad \TEST\tate\U \quad \TEST\tate\V \end{LTXexample} @@ -3880,8 +3871,8 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont \footnote{もしフォントが\texttt{vrt2}を定義していなかった場合,代わりに \texttt{vert}を用いる.}. \begin{lstlisting} -\tfont\S=file:KozMinPr6N-Regular.otf:jfm=ujisv % vrt2 is automatically activated -\tfont\T=file:KozMinPr6N-Regular.otf:jfm=ujisv;-vert % vert and vrt2 are not activated +\tfont\S=HaranoAjiMincho-Regular:jfm=ujisv % vrt2 is automatically activated +\tfont\T=HaranoAjiMincho-Regular:jfm=ujisv;-vert % vert and vrt2 are not activated \tfont\U=file:ipaexm.ttf:jfm=ujisv % vert is automatically activated, since this font does not have vrt2 \end{lstlisting} @@ -3914,9 +3905,9 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont \begin{figure}[!tb] \begin{LTXexample}[pos=r,width=.4\textwidth] -\jfont\X=[KozMinPr6N-Regular.otf]:jfm=ujis -\tfont\U=[KozMinPr6N-Regular.otf]:jfm=ujisv -\tfont\V=[KozMinPr6N-Regular.otf]:jfm=ujisv;jpotf +\jfont\X=[HaranoAjiMincho-Regular.otf]:jfm=ujis +\tfont\U=[HaranoAjiMincho-Regular.otf]:jfm=ujisv +\tfont\V=[HaranoAjiMincho-Regular.otf]:jfm=ujisv;jpotf \def\TEST#1#2{\leavevmode \hbox{#1#2\string#2 “引用,と句読点.”}} \ttfamily\centering @@ -4763,9 +4754,8 @@ using \texttt{jfm-test.lua} which contains the following: %ここで,次のような入力とその実行結果を考える: %Now consider the following input/output: \begin{LTXexample}[width=0.3\textwidth] -\jfont\a=file:KozMinPr6N-Regular.otf:jfm=test;+hwid -\setbox0\hbox{\a ヒ漢} -\the\wd0 +\jfont\a=IPAexMincho:jfm=test;+hwid +\setbox0\hbox{\a ヒ漢}\the\wd0 \end{LTXexample} %<*en> Now we look why the above source outputs 15\,pt. @@ -4798,7 +4788,7 @@ The following input is an example. 但し,JFMによって決まる置換後のグリフの文字クラスが0である場合は,置換前の文字クラスを採用する. % \begin{LTXexample}[width=0.3\textwidth] -\jfont\a=file:KozMinPr6N-Regular.otf:jfm=test;+vert +\jfont\a=HaranoAjiMincho-Regular:jfm=test;+vert \a 漢。\inhibitglue 漢 \end{LTXexample} %<*en> @@ -4937,7 +4927,7 @@ See Japanese version of this manual. \texttt{'parbdd'}を入れれば全角下がりとなる. \begin{LTXexample}[width=0.4\textwidth] -\jfont\g=KozMinPr6N-Regular:jfm=test \g +\jfont\g=HaranoAjiMincho-Regular:jfm=test \g \parindent1\zw\noindent{}◆◆◆◆◆ \par 「◆◆←二分下がり \par 【◆◆←全角下がり @@ -6003,7 +5993,7 @@ the beginning of a box and ``あ'', and also between ``あ''~and~``ウ''. % \begin{LTXexample}[width=0.4\textwidth] -\jfont\g=file:KozMinPr6N-Regular.otf:jfm=test \g +\jfont\g=HaranoAjiMincho-Regular:jfm=test \g \fbox{\hbox{あウあ\inhibitglue ウ}} \inhibitglue\par\noindent あ1 \par\inhibitglue\noindent あ2 @@ -6558,9 +6548,9 @@ which is not produced by \cs{fontshape\{it\}}. \begin{figure}[!tb] \begin{LTXexample}[pos=b] \DeclareKanjiFamily{JY3}{edm}{} -\DeclareFontShape{JY3}{edm}{m}{n} {<-> s*KozMinPr6N-Regular:jfm=ujis}{} -\DeclareFontShape{JY3}{edm}{m}{fb} {<-> s*KozGoPr6N-Regular:jfm=ujis;color=003FFF}{} -\DeclareFontShape{JY3}{edm}{m}{fb2} {<-> s*KozGoPr6N-Regular:jfm=ujis;color=FF1900}{} +\DeclareFontShape{JY3}{edm}{m}{n} {<-> s*HaranoAjiMincho-Regular:jfm=ujis}{} +\DeclareFontShape{JY3}{edm}{m}{fb} {<-> s*HaranoAjiGothic-Regular:jfm=ujis;color=003FFF}{} +\DeclareFontShape{JY3}{edm}{m}{fb2} {<-> s*HaranoAjiGothic-Regular:jfm=ujis;color=FF1900}{} \DeclareAlternateKanjiFont{JY3}{edm}{m}{n}{JY3}{edm}{m}{fb}{ "4E00-"67FF,{-2}-{-2}} \DeclareAlternateKanjiFont{JY3}{edm}{m}{n}{JY3}{edm}{m}{fb2}{"6800-"9FFF} {\kanjifamily{edm}\selectfont @@ -6941,8 +6931,8 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec:psft}. \begin{LTXexample}[width=0.25\textwidth] \jfontspec[ YokoFeatures={Color=FF1900}, TateFeatures={Color=003FFF}, - TateFont=KozGoPr6N-Regular -]{KozMinPr6N-Regular} + TateFont=HaranoAjiGothic-Regular +]{HaranoAjiMincho-Regular} \hbox{\yoko 横組のテスト}\hbox{\tate 縦組のテスト} \addjfontfeatures{Color=00AF00} \hbox{\yoko 横組}\hbox{\tate 縦組} @@ -6990,11 +6980,11 @@ A demonstrarion is shown in \autoref{fig:yokotate-fontspec}. \begin{LTXexample}[pos=b] \jfontspec[ AltFont={ - {Range="4E00-"67FF, Font=KozGoPr6N-Regular, Color=003FFF}, + {Range="4E00-"67FF, Font=HaranoAjiGothic-Regular, Color=003FFF}, {Range="6800-"9EFF, Color=FF1900}, - {Range="3040-"306F, Font=KozGoPr6N-Regular, Color=35A16B}, + {Range="3040-"306F, Font=HaranoAjiGothic-Regular, Color=35A16B}, } -]{KozMinPr6N-Regular} +]{HaranoAjiMincho-Regular} 日本国民は、正当に選挙された国会における代表者を通じて行動し、われらとわれらの子孫のために、 諸国民との協和による成果と、わが国全土にわたつて自由のもたらす恵沢を確保し、…… \end{LTXexample} @@ -7134,6 +7124,9 @@ If the Japanese font is neither Adobe-Japan1,~Adobe-GB1, Adobe-CNS1, Adobe-Korea1,~nor~Adobe-KR CID-keyed font, \LuaTeX-ja treats that is a CID number of Adobe-Japan1 character collection, and tries to typeset a ``most suitable glyph''. + +Note that if the Japanese font is loaded using the HarfBuzz library, this \cs{CID} +command does not work. % %<*ja> CID番号がの文字を出力する. @@ -7146,6 +7139,8 @@ CID番号がの文字を出力する. また,フォントにIVDコレクションAdobe-Japan1が含まれていれば,その情報を用いて グリフを選択する. }を出力する. + +なお,現在の和文フォントがHarfBuzzを用いて読み込まれた場合には,\cs{CID}は正しく動作しない. % \item[\cs{UTF}\{\}] diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua index 04cae9d2f15..2efafc06ed1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua @@ -40,8 +40,7 @@ do local nulltable = {} local function get_cidinfo(id) -- table local t = getfont(id) - local a = t and (t.cidinfo or (t.resources and t.resources and t.resources.cidinfo)) or nulltable - return a + return (t and (t.resources and t.resources.cidinfo or t.cidinfo)) or nulltable end aux.get_cidinfo = get_cidinfo end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua index 48fe4bde2ee..f0088944c2c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua @@ -78,7 +78,7 @@ local function get_ucs_from_rmlgbm(c) local tfmdata = font_getfont(curjfnt) if tfmdata and tfmdata.resources then local base, ivs = v % 0x200000, 0xE00FF + math.floor(v/0x200000) - curjfnt = tfmdata and tfmdata.variants + curjfnt = tfmdata.resources.variants curjfnt = curjfnt and curjfnt[ivs] return curjfnt and curjfnt[base] or base else return base @@ -144,7 +144,7 @@ do if key==0 then return append_jglyph(0) end local curjfnt = tex_get_attr((ltjd_get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt) - local cidinfo = ltju.get_cidinfo(cudjfnt) + local cidinfo = ltju.get_cidinfo(curjfnt) if type(cidinfo)~="table" or cidinfo.ordering ~= "Japan1" and cidinfo.ordering ~= "GB1" and @@ -205,7 +205,7 @@ ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf', local function ind_to_uni(fmtable, fn) if fn<0 then return end local cid = ltju.get_cidinfo(fn); - local t = ltjf_font_extra_info[fn].ind_to_uni + local t = ltjf_font_extra_info[fn]; t = t and t.ind_to_uni if t and cid.ordering == "Japan1" then for i, v in pairs(fmtable.chars) do local j = string.match(i, "^AJ1%-([0-9]*)") diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 0af38a01afb..0fbb7d1f39e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -41,7 +41,7 @@ \ProcessOptions\relax \fi % %%%% VERSION -\def\LuaTeXjaversion{20200323.0} +\def\LuaTeXjaversion{20200326.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty index 13f75e302e9..ee3c3aa14ba 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -1,9 +1,9 @@ % -% lltjp-listings.sty 2018-09-17 +% lltjp-listings.sty 2020-03-23 % \NeedsTeXFormat{LaTeX2e} -\RequirePackage{listings,luatexbase-cctb} +\RequirePackage{etoolbox,listings,luatexbase-cctb} %%%%%%%%%%%%%%%% Japanese support %% whether letter-space in a fixed mode box is doubled or not @@ -26,8 +26,19 @@ % override \lst@FillFixed@ % \ltj@hst@hss is \ltj@lst@hss@ivs or \ltj@lst@hss@normal, % according to vsraw = true or not. +\def\lst@FillFixed#1{{\null#1\null}\lst@FillFixed@} \def\lst@FillFixed@#1{% - \ifx\@empty#1\else\ltj@lst@hss#1\expandafter\lst@FillFixed@\fi} + \ifx\@empty#1\else\ltj@lst@hss{\null#1\null}\expandafter\lst@FillFixed@\fi} +\let\lst@FillOutputBox\lst@FillFixed +% [space/full]flexiblemode (not much useful...) +\def\ltj@lst@FillFlex#1\@empty{\null#1\null} +\patchcmd\lst@column@flexible + {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{} +\patchcmd\lst@column@fullflexible + {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{} +\patchcmd\lst@column@spaceflexible + {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{} + \directlua{ local cat_str = luatexbase.catcodetables['string'] @@ -97,7 +108,8 @@ \else \ltj@lst@setletterflag \fi - \lst@Append#1} + \lst@Append#1% +} % 半角カナ処理命令 \def\ltj@lst@ProcessJALetterHalf#1{% @@ -423,7 +435,6 @@ \fi} \endgroup - % \begin{修正事項}{1.3} from jlisting.sty % ちょっとした修正 \gdef\lst@breakProcessOther#1{\lst@ProcessOther#1} -- cgit v1.2.3