• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンf5d6703cfff4009b2dd9c203822cb631dc8d9d2b (tree)
日時2020-03-21 07:50:59
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

more lltjfont.sty (and expanded tests)

変更サマリ

差分

--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -580,13 +580,11 @@
580580 {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
581581 \else
582582 \ltj@@latex@plv=300
583- \unless\ifx\bfseries@previous\@undefined % 2020-03-19 (+gh306)
584- \ltj@@latex@plv=550
585- \else\unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
583+ \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
586584 \ltj@@latex@plv=501
587585 \else\unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5
588586 \ltj@@latex@plv=500
589- \fi\fi\fi
587+ \fi\fi
590588 \fi
591589 %%%%%%
592590
@@ -768,14 +766,11 @@
768766 \patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
769767 \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
770768
771-\ifnum\ltj@@latex@plv>549 % !!! pl5 + gh306
772-\ifnum\expandafter\patchcmd\csname bfseries \endcsname{%
773- \let\bfseries@previous\bfdefault
769+\expandafter\patchcmd\csname bfseries \endcsname{%
774770 \let\bfseries@rm\bfdef@ult
775771 \let\bfseries@sf\bfdef@ult
776772 \let\bfseries@tt\bfdef@ult
777773 }{%
778- \let\bfseries@previous\bfdefault
779774 \let\bfseries@rm\bfdef@ult
780775 \let\bfseries@sf\bfdef@ult
781776 \let\bfseries@tt\bfdef@ult
@@ -784,12 +779,10 @@
784779 \let\bfseries@jtt\bfdef@ult
785780 }{}{}
786781 \expandafter\patchcmd\csname mdseries \endcsname{%
787- \let\mdseries@previous\mddefault
788782 \let\mdseries@rm\mddef@ult
789783 \let\mdseries@sf\mddef@ult
790784 \let\mdseries@tt\mddef@ult
791785 }{%
792- \let\mdseries@previous\mddefault
793786 \let\mdseries@rm\mddef@ult
794787 \let\mdseries@sf\mddef@ult
795788 \let\mdseries@tt\mddef@ult
@@ -797,7 +790,6 @@
797790 \let\mdseries@gt\mddef@ult
798791 \let\mdseries@jtt\mddef@ult
799792 }{}{}
800-\fi
801793 \expandafter\patchcmd\csname bfseries \endcsname{\selectfont}%
802794 {%
803795 \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc
Binary files /dev/null and b/test/test31-nfss20200202.pdf differ
--- a/test/test31-nfss20200202.tex
+++ b/test/test31-nfss20200202.tex
@@ -1,35 +1,49 @@
11 \documentclass{ltjarticle}
22 \makeatletter
3+%\DeclareFontSeriesDefault[sf]{md}{b}
34 \def\mdseries@mc{el}
45 \def\bfseries@mc{sb}
56 \def\mdseries@gt{l}
67 \def\bfseries@gt{k}
7-\DeclareFontShape{JY3}{gt}{k}{n}{<-> KozGoPr6N-Heavy.otf:jfm=ujis}{}
8-\DeclareFontShape{JT3}{gt}{k}{n}{<-> KozGoPr6N-Heavy.otf:jfm=ujisv}{}
9-\DeclareFontShape{JY3}{gt}{l}{n}{<-> KozGoPr6N-ExtraLight.otf:jfm=ujis}{}
10-\DeclareFontShape{JT3}{gt}{l}{n}{<-> KozGoPr6N-ExtraLight.otf:jfm=ujisv}{}
11-\DeclareFontShape{JY3}{mc}{el}{n}{<-> KozMinPr6N-ExtraLight.otf:jfm=ujis}{}
12-\DeclareFontShape{JT3}{mc}{el}{n}{<-> KozMinPr6N-ExtraLight.otf:jfm=ujisv}{}
13-\DeclareFontShape{JY3}{mc}{sb}{n}{<-> KozMinPr6N-Bold.otf:jfm=ujis}{}
14-\DeclareFontShape{JT3}{mc}{sb}{n}{<-> KozMinPr6N-Bold.otf:jfm=ujisv}{}
8+\DeclareFontShape{JY3}{gt}{k}{n}{<-> HaranoAjiGothic-Heavy.otf:jfm=ujis}{}
9+\DeclareFontShape{JT3}{gt}{k}{n}{<-> HaranoAjiGothic-Heavy.otf:jfm=ujisv}{}
10+\DeclareFontShape{JY3}{gt}{l}{n}{<-> HaranoAjiGothic-ExtraLight.otf:jfm=ujis}{}
11+\DeclareFontShape{JT3}{gt}{l}{n}{<-> HaranoAjiGothic-ExtraLight.otf:jfm=ujisv}{}
12+\DeclareFontShape{JY3}{mc}{el}{n}{<-> HaranoAjiMincho-ExtraLight.otf:jfm=ujis}{}
13+\DeclareFontShape{JT3}{mc}{el}{n}{<-> HaranoAjiMincho-ExtraLight.otf:jfm=ujisv}{}
14+\DeclareFontShape{JY3}{mc}{sb}{n}{<-> HaranoAjiMincho-Bold.otf:jfm=ujis}{}
15+\DeclareFontShape{JT3}{mc}{sb}{n}{<-> HaranoAjiMincho-Bold.otf:jfm=ujisv}{}
1516 \def\TEST{%
1617 \par
1718 A: \f@encoding/\f@family/\f@series/\f@shape.
1819 K: \k@encoding/\k@family/\k@series/\k@shape.
1920 あいうABC
2021 }
22+\def\TESTA{%
23+ \TEST NORMAL
24+ \emph{\TEST} EMPH
25+ \textsf{\TEST} SF
26+ \textbf{\TEST} BF
27+ \textgt{\TEST} GT
28+ \textbf{\textgt{\TEST}} BF+GT
29+ \textbf{\textgt{\textmd{\TEST}}} BF+GT+MD
30+ \par
31+ \textsc{\textit{\TEST}} SC+IT
32+ \par
33+ {\fontseries{b}\selectfont \TEST} B
34+ {\fontseries{bx}\selectfont \TEST} BX
35+}
2136 \begin{document}
22-\TEST NORMAL
23-\emph{\TEST} EMPH
24-\textsf{\TEST} SF
25-\textbf{\TEST} BF
26-\textgt{\TEST} GT
27-\textbf{\textgt{\TEST}} BF+GT
28-\textbf{\textgt{\textmd{\TEST}}} BF+GT+MD
37+%{\ttfamily\expandafter\meaning\csname bfdefault\endcsname::%
38+% \expandafter\meaning\csname bfdefault@previous\endcsname}\par
2939
30-\textsc{\textit{\TEST}} SC+IT
40+{\ttfamily ======DEFAULT======\par}
41+\TESTA
42+\def\bfdefault{b}\newpage
43+{\ttfamily ======\detokenize{\def\bfdefault{bx}}======\par}
3144
32-{\fontseries{b}\selectfont \TEST} B
33-{\fontseries{bx}\selectfont \TEST} BX
45+\TESTA
3446
35-\end{document}
\ No newline at end of file
47+%\ttfamily
48+%\expandafter\meaning\csname bfseries \endcsname
49+\end{document}
Binary files /dev/null and b/test/test31a-nfss_kshape.pdf differ
旧リポジトリブラウザで表示