• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンa7bde4c19e99ab38e3795e919f2cc51beb0e99c2 (tree)
日時2020-01-13 13:59:01
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

ltj-math.lua and lltjfont.sty: typo

変更サマリ

差分

--- a/src/ltj-math.lua
+++ b/src/ltj-math.lua
@@ -166,7 +166,6 @@ function (p, sty)
166166 end
167167
168168 do
169- local mlist_to_hlist = node.mlist_to_hlist
170169 local function mlist_callback_ltja(n)
171170 local n = to_direct(n); list_dir = ltjd_get_dir_count()
172171 if getid(n)==id_whatsit and getsubtype(n)==sid_user and
@@ -176,11 +175,12 @@ do
176175 end
177176 return to_node(conv_jchar_to_hbox(n, 0))
178177 end
179- -- LaTeX 2020-02-02 seems to have pre_mlist_to_hlist callback
180- if luatexbase.callbacktypes['pre_mlist_to_hlist'] then
181- luatexbase.add_to_callback('pre_mlist_to_hlist',
182- mlist_callback_ltja(n), 'ltj.mlist_to_hlist_pre', 1)
178+ -- LaTeX 2020-02-02 seems to have pre_mlist_to_hlist_filter callback
179+ if luatexbase.callbacktypes['pre_mlist_to_hlist_filter'] then
180+ luatexbase.add_to_callback('pre_mlist_to_hlist_filter',
181+ mlist_callback_ltja, 'ltj.mlist_to_hlist_pre', 1)
183182 else
183+ local mlist_to_hlist = node.mlist_to_hlist
184184 luatexbase.add_to_callback('mlist_to_hlist',
185185 function (n, display_type, penalties)
186186 return mlist_to_hlist(mlist_callback_ltja(n),display_type, penalties)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -732,7 +732,8 @@
732732 \else\ifx\kanjidef@ult\jttdef@ult \jttfamily
733733 \fi\fi\fi
734734 }
735-\else
735+\fi
736+\ifdefined\prepare@family@series@update@kanji\else
736737 %%%% LaTeX 2019-10-01
737738 \def\prepare@family@series@update@kanji#1{\kanjifamily}
738739 \fi
Binary files a/test/test09-fontspec.pdf and b/test/test09-fontspec.pdf differ
--- a/test/test09-fontspec.tex
+++ b/test/test09-fontspec.tex
@@ -1,18 +1,9 @@
11 %#! lualatex
22 \documentclass{article}
3-
4-\makeatletter
5-\let\ltj@orig@DeclareFontShape@=\DeclareFontShape@
6-\def\DeclareFontShape@#1#2#3#4#5#6{%
7-\immediate\typeout{DFS |#1|#2|#3|#4|#5|#6|}%
8-\ltj@orig@DeclareFontShape@{#1}{#2}{#3}{#4}{#5}{#6}%
9-}
10-\makeatother
11-
3+\usepackage[margin=15mm]{geometry}
124
135 \usepackage{luatexja}
146 \usepackage{luatexja-fontspec}
15-\usepackage{booktabs,array,lltjext}
167
178 \defaultfontfeatures{Numbers=OldStyle}
189 \setmainfont{TeXGyreTermes}
@@ -22,10 +13,7 @@
2213 \setmainjfont[BoldFont=IPAexGothic]{IPAexMincho} % default: JFM=ujis
2314 \setsansjfont{IPAexGothic}
2415
25-\setjfontfamily\ipajisninety[CJKShape=JIS1990]{IPAexMincho}
26-
27-\normalsize
28-\usepackage[margin=25mm,a4paper]{geometry}
16+\newjfontfamily\ipajisninety[CJKShape=JIS1990]{IPAexMincho}
2917
3018 \begin{document}
3119
@@ -35,12 +23,11 @@
3523
3624 \noindent 通常:「あいうえお」、(かきくけこ)。{\bf 太字}と{\gt ゴシック}。
3725
38-%{\addjfontfeatures{JFM=mono}
39-%\noindent 等幅:「あいうえお」、(かきくけこ)。{\bf 太字}と{\gt ゴシック}。
40-%}
41-
26+{\addjfontfeatures{JFM=mono}
27+\noindent 等幅:「あいうえお」、(かきくけこ)。{\bf 太字}と{\gt ゴシック}。
28+}
4229
43-\def\R{%
30+\subsection{JIS2004}
4431 逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄釜翰翫徽
4532 祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽鍵諺巷梗膏鵠甑叉
4633 榊薩鯖錆鮫餐杓灼酋楯薯藷哨鞘杖蝕訊逗摺撰煎煽穿箭
@@ -48,29 +35,27 @@
4835 瀞遁謎灘楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
4936 蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢冤叟咬嘲
5037 囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔蜃蠅訝靄靱騙鴉
51-}
52-
53-\subsection{JIS2004}
54-\R
55-
56-\medskip\hrule\medskip
57-\vbox{\hsize=7\zw\tate\parindent1\zw\R}
58-
59-
6038
6139 \subsection{JIS1990}
6240 {\ipajisninety
63-\R
41+逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄釜翰翫徽
42+祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽鍵諺巷梗膏鵠甑叉
43+榊薩鯖錆鮫餐杓灼酋楯薯藷哨鞘杖蝕訊逗摺撰煎煽穿箭
44+詮噌遡揃遜腿蛸辿樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭
45+瀞遁謎灘楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
46+蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢冤叟咬嘲
47+囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔蜃蠅訝靄靱騙鴉
48+}
6449
65-\medskip\hrule\medskip
66-\vbox{\hsize=7\zw\tate\parindent1\zw\R}}
50+\vspace{1\zw}
6751
6852 \subsection{Kerning}
69-{\jfontspec{KozMinPr6N-Regular}
53+{\jfontspec[NoEmbed]{Ryumin-Light}
54+
7055 アノ ← Kerning=Off
7156
7257 \noindent{\addjfontfeatures{Kerning=On} アノ ← Kerning=On}
73-\par}
58+}
7459
7560 \subsection{unicode}
7661
@@ -78,7 +63,7 @@
7863 常に和文:「\ltjjachar"201C」「\ltjjachar"010F」%"
7964 常に欧文:「\ltjalchar"201C」「\ltjalchar"010F」%"
8065
81-{\let\char=\ltjalchar\textquotedblleft}あ\textquotedblleft あ%
66+{\tracingall\let\char=\ltjalchar\textquotedblleft}あ\textquotedblleft あ%
8267 {\let\char=\ltjjachar\textquotedblleft}あ“あ
8368
8469 \begin{itemize}
@@ -94,45 +79,11 @@
9479 \end{itemize}
9580 \end{itemize}
9681
97-\newpage
98-\section{fontspecによる非埋め込みフォント}
99-\setjfontfamily\test[BoldFont=GothicBBB-Medium, NoEmbed]{Ryumin-Light}
100-
101-%{\test
102-%\begin{tabular}<y>{ll>{\itshape}l>{\slshape}l}
103-%\toprule
104-%&Upright&Italic&Slanted\\
105-%\midrule
106-%Regular&あいうえお&あいうえお&あいうえお\
107-%Bold &\textbf{あいうえお}&\textbf{あいうえお}&\textbf{あいうえお}\\
108-%\bottomrule
109-%\end{tabular}}
110-
111-\section{JFMの違い}
112-\setjfontfamily\test[ TateFont=KozGoPr6N-Light ]{KozMinPr6N-Bold}
113-
114-\def\yttest{\leavevmode%
115-\parbox<y>{20\zw}{%
116-「ちょっと」,“チェック”しちゃった!あいう
117-}%
118-\parbox<t>{20\zw}{%
119-「ちょっと」,“チェック”しちゃった!あいう}%
120-}
121-
122-\test
123-\addjfontfeatures{CJKShape=JIS1990,Color=FF0000}
124-\yttest
125-\noindent
126-
127-%\vskip-\dimexpr20\zw+\lineskip\relax
128-\noindent
129-\addjfontfeatures{Color=0000FF, YokoFeatures={ Color=0080FF, JFM=min}, TateFeatures={JFM=tmin}}
130-\yttest
131-
132-
133-\section{match}
134-
135-\normalfont
136-\sffamily aiuあいう\rmfamily aiuあいう \ttfamily aiuあいう
82+\addfontfeatures{Color=BD6D8F}
83+\addjfontfeatures{Color=28AFCB,CJKShape=JIS1990}
84+あいうえお芦漢字ABC
85+\[
86+あいうえお芦\int_0^∞ e^{-x^2}\,dx\mathrm{ABC}\textrm{ABC}\textsf{ABC}
87+\]
13788
138-\end{document}
\ No newline at end of file
89+\end{document}
旧リポジトリブラウザで表示