• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンfafb8d6293abc613328733adf52158c9fbef93ad (tree)
日時2020-01-31 18:58:04
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

lltjfont.sty: renamed several internal commands, and bugfix

変更サマリ

差分

--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
33 %
44
55 \NeedsTeXFormat{LaTeX2e}
6-\ProvidesPackage{lltjdefs}[2019/09/26 Default font settings of LuaTeX-ja]
6+\ProvidesPackage{lltjdefs}[2020/01/31 Default font settings of LuaTeX-ja]
77
88 \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
99 \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
@@ -105,7 +105,7 @@
105105 \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
106106 \else
107107 \PackageWarningNoLine{luatexja}{%
108- Patching to \expandafter\string\csname #1\endcsname\space failed
108+ Patching to \expandafter\string\csname #1\endcsname\space failed%
109109 }%
110110 \fi
111111 \fi
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
33 %
44
55 \NeedsTeXFormat{LaTeX2e}
6-\ProvidesPackage{lltjfont}[2020/01/26 Patch to NFSS2 for LuaTeX-ja]
6+\ProvidesPackage{lltjfont}[2020/01/31 Patch to NFSS2 for LuaTeX-ja]
77
88 %% patching \DeclareTextComposite
99 \def\ltj@chardef@text@cmd#1{%
@@ -577,46 +577,46 @@
577577 \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
578578 \DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}}
579579
580-\def\merge@font@kanji@series#1{%
580+\def\merge@kanji@series#1{%
581581 \expandafter\expandafter\expandafter
582- \merge@font@kanji@series@
582+ \merge@kanji@series@
583583 \csname series@\k@series @#1\endcsname
584584 {#1}%
585585 \@nil
586586 }
587-\def\set@target@kanji@series#1{%
587+\def\set@target@series@kanji#1{%
588588 \edef\k@series{#1}%
589589 \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
590590 }
591-\def\merge@font@kanji@series@#1#2#3\@nil{%
591+\def\merge@kanji@series@#1#2#3\@nil{%
592592 \def\@reserveda{#3}%
593593 \ifx\@reserveda\@empty
594- \set@target@kanji@series{#2}%
594+ \set@target@series@kanji{#2}%
595595 \else
596596 \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
597597 \maybe@load@fontshape\endgroup
598598 \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}%
599599 \ifcsname \@reserveda \endcsname
600- \set@target@kanji@series{#1}%
600+ \set@target@series@kanji{#1}%
601601 \else
602602 \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname
603- \set@target@kanji@series{#2}%
603+ \set@target@series@kanji{#2}%
604604 {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
605605 \else
606- \set@target@kanji@series{#3}%
606+ \set@target@series@kanji{#3}%
607607 {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
608608 \fi
609609 \fi
610610 \fi
611611 }
612-\def\merge@font@kanji@shape#1{%
612+\def\merge@kanji@shape#1{%
613613 \expandafter\expandafter\expandafter
614- \merge@font@kanji@shape@
614+ \merge@kanji@shape@
615615 \csname shape@\k@shape @#1\endcsname
616616 {#1}%
617617 \@nil
618618 }
619-\def\merge@font@kanji@shape@#1#2#3\@nil{%
619+\def\merge@kanji@shape@#1#2#3\@nil{%
620620 \def\@reserveda{#3}%
621621 \ifx\@reserveda\@empty
622622 \edef\k@shape{#2}%
@@ -637,13 +637,19 @@
637637 \fi
638638 }
639639 \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}}
640-\DeclareRobustCommand\kanjiseries[1]{\merge@font@kanji@series{#1}}
640+\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}}
641641 \DeclareRobustCommand\fontseries[1]{%
642- \merge@font@series{#1}\merge@font@kanji@series{#1}}
642+ \merge@font@series{#1}\merge@kanji@series{#1}}
643643 \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
644-\DeclareRobustCommand\kanjishape[1]{\merge@font@kanji@shape{#1}}
644+\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
645645 \DeclareRobustCommand\fontshape[1]{%
646- \merge@font@shape{#1}\merge@font@kanji@shape{#1}}
646+ \merge@font@shape{#1}\merge@kanji@shape{#1}}
647+\DeclareRobustCommand\usekanji[4]{%
648+ \kanjiencoding{#1}\edef\k@family{#2}\edef\k@series{#3}\edef\k@shape{#4}%
649+ \selectfont\ignorespaces}
650+\DeclareRobustCommand\useroman[4]{%
651+ \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}%
652+ \selectfont\ignorespaces}
647653 \else
648654 %%%% LaTeX 2019-10-01
649655 \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
@@ -652,14 +658,14 @@
652658 \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
653659 \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}
654660 \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}}
655-\fi
656-%%%%
657661 \DeclareRobustCommand\usekanji[4]{%
658662 \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
659663 \selectfont\ignorespaces}
660664 \DeclareRobustCommand\useroman[4]{%
661665 \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
662666 \selectfont\ignorespaces}
667+\fi
668+%%%%
663669 \protected\def\usefont#1#2#3#4{%
664670 \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{#1}')}\ifin@%
665671 \usekanji{#1}{#2}{#3}{#4}%
@@ -675,13 +681,18 @@
675681 %%%% LaTeX 2020-02-02
676682 \let\prepare@family@series@update@kanji=\prepare@family@series@update
677683 \patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}
684+\patchcmd\prepare@family@series@update@kanji{\update@series@target@value}{\update@series@target@value@kanji}{}{}
685+\patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@list@kanji}{}{}
678686 \patchcmd\prepare@family@series@update@kanji{\fontfamily}{\kanjifamily}{}{}
679-\patchcmd\prepare@family@series@update@kanji{\f@series}{\k@series}{}{}
680687 \patchcmd\prepare@family@series@update@kanji{\maybe@load@fontshape}
681688 {\begingroup\let\f@encoding\k@encoding\let\f@family\k@family
682689 \maybe@load@fontshape\endgroup}{}{}
683-\patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@kanji@list}{}{}
684-\def\@meta@family@kanji@list{\@elt{mc}\@elt{gt}\@elt{jtt}}
690+\patchcmd\prepare@family@series@update@kanji{\f@series}{\k@series}{}{}
691+\let\update@series@target@value@kanji=\update@series@target@value
692+\patchcmd\update@series@target@value@kanji{\f@family}{\k@family}{}{}
693+\patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
694+
695+\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
685696 \DeclareRobustCommand\bfseries{%
686697 \not@math@alphabet\bfseries\mathbf
687698 \expand@font@defaults
旧リポジトリブラウザで表示