| | @@ -712,19 +712,6 @@ |
| 712 | 712 | \fi |
| 713 | 713 | \fi |
| 714 | 714 | } |
| 715 | | -\def\set@safe@kanji@shape#1#2{% |
| 716 | | - \edef\reserved@b{\k@encoding /\k@family /\k@series/#1}% |
| 717 | | - \ifcsname \reserved@b\endcsname |
| 718 | | - \edef\k@shape{#1}% |
| 719 | | - #2% |
| 720 | | - \else |
| 721 | | - \@kanji@shape@nochange@info{\reserved@b}% |
| 722 | | - \fi |
| 723 | | -} |
| 724 | | -\def\@kanji@shape@nochange@info#1{% |
| 725 | | - \@font@info{Kanji font shape `#1' undefined\MessageBreak |
| 726 | | - No change}% |
| 727 | | -} |
| 728 | 715 | \ifnum\ltj@@latex@plv=300 % !!! pl3, 4 |
| 729 | 716 | \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} |
| 730 | 717 | \DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} |
| | @@ -768,7 +755,7 @@ |
| 768 | 755 | \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} |
| 769 | 756 | \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} |
| 770 | 757 | \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} |
| 771 | | -\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} |
| 758 | +\DeclareRobustCommand\fontshape[1]{\set@safe@kanji@shape{#1}{}\romanshape{#1}} |
| 772 | 759 | \DeclareRobustCommand\usekanji[4]{% |
| 773 | 760 | \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% |
| 774 | 761 | \selectfont\ignorespaces} |
| | @@ -778,6 +765,21 @@ |
| 778 | 765 | %%%% LaTeX 2019-10-01 END |
| 779 | 766 | \fi |
| 780 | 767 | %%%% |
| 768 | + |
| 769 | +\def\set@safe@kanji@shape#1#2{% |
| 770 | + \edef\reserved@b{\k@encoding /\k@family /\k@series/#1}% |
| 771 | + \ifcsname \reserved@b\endcsname |
| 772 | + \edef\k@shape{#1}% |
| 773 | + #2% |
| 774 | + \else |
| 775 | + \@kanji@shape@nochange@info{\reserved@b}% |
| 776 | + \fi |
| 777 | +} |
| 778 | +\def\@kanji@shape@nochange@info#1{% |
| 779 | + \@font@info{Kanji font shape `#1' undefined\MessageBreak |
| 780 | + No change}% |
| 781 | +} |
| 782 | + |
| 781 | 783 | \protected\def\usefont#1#2#3#4{% |
| 782 | 784 | \ltj@@is@kenc{#1}\ifin@\usekanji{#1}{#2}{#3}{#4}% |
| 783 | 785 | \else\useroman{#1}{#2}{#3}{#4}% |
Fork
src/patches/lltjfont.sty