• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: Commit

ソースコードの管理場所


Commit MetaInfo

Revisãofeb2b2911873ea42aa4e691d545d901921bfa36f (tree)
Hora2020-03-27 23:24:14
AutorHironori Kitagawa <h_kitagawa2001@yaho...>
CommiterHironori Kitagawa

Mensagem de Log

lltjfont.sty: more fix

Mudança Sumário

Diff

--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -227,10 +227,18 @@
227227 \def\default@k@series{#3}%
228228 \def\default@k@shape{#4}}%
229229 \fi}
230-\let\wrong@kfontshape\wrong@fontshape
231-\patchcmd\wrong@kfontshape{\default@shape}{\default@k@shape}{}{}
232-\patchcmd\wrong@kfontshape{\default@series}{\default@k@series}{}{}
233-\patchcmd\wrong@kfontshape{\default@family}{\default@k@family}{}{}
230+\let\wrong@ja@fontshape\wrong@fontshape
231+\let\wrong@al@fontshape\wrong@fontshape
232+\patchcmd\wrong@ja@fontshape{\default@shape}{\default@k@shape}{}{}
233+\patchcmd\wrong@ja@fontshape{\default@series}{\default@k@series}{}{}
234+\patchcmd\wrong@ja@fontshape{\default@family}{\default@k@family}{}{}
235+\def\wrong@fontshape{%
236+ \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}\ifin@%
237+ \wrong@ja@fontshape
238+ \else
239+ \wrong@al@fontshape
240+ \fi
241+}
234242 \@onlypreamble\DeclareKanjiSubstitution
235243 \def\DeclareErrorKanjiFont#1#2#3#4#5{%
236244 \xdef\error@kfontshape{%
@@ -353,8 +361,6 @@
353361 \directlua{luatexja.base.start_time_measure('selectfont')}%
354362 \let\tmp@error@fontshape\error@fontshape
355363 \let\error@fontshape\error@kfontshape
356- \let\tmp@wrong@fontshape\wrong@fontshape
357- \let\wrong@fontshape\wrong@kfontshape
358364 \directlua{luatexja.jfont.is_kyenc('\luatexluaescapestring{\k@encoding}')}\ifin@%
359365 \let\cy@encoding\k@encoding
360366 \ensure@KanjiEncodingPair{t}%
@@ -375,7 +381,6 @@
375381 \kenc@update
376382 \global\let\font@name=\ltj@afont@name
377383 \let\error@fontshape\tmp@error@fontshape
378- \let\wrong@fontshape\tmp@wrong@fontshape
379384 \if@knjcmd \@knjcmdfalse
380385 \expandafter\ifx
381386 \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
--- /dev/null
+++ b/test/test31b-nfss_subst.tex
@@ -0,0 +1,17 @@
1+\documentclass{ltjarticle}
2+\usepackage[OT1]{fontenc}
3+\DeclareSymbolFont{hogemath}{OT1}{hoge}{m}{n}
4+\SetSymbolFont{hogemath}{bold}{OT1}{hoge}{bx}{n}
5+\DeclareSymbolFont{piyomath}{JY3}{piyo}{m}{n}
6+\SetSymbolFont{piyomath}{bold}{JY3}{piyo}{bx}{n}
7+%
8+\DeclareFontFamily{OT1}{guha}{}
9+\DeclareFontShape{OT1}{guha}{m}{n}{<-> cmfi10}{}
10+\DeclareFontShape{JY3}{gt}{l}{it}{<-> file:HaranoAjiMincho-Heavy.otf:jfm=ujis}{}
11+\DeclareFontSubstitution{OT1}{guha}{m}{n}
12+\DeclareKanjiSubstitution{JY3}{gt}{l}{it}
13+%
14+\begin{document}
15+\romanfamily{fuga}\kanjifamily{fuga}\selectfont abcあいうえお
16+\setbox0=\hbox{$\empty$}%
17+\end{document}
Show on old repository browser