| Revisão | 053a051fcaf1772071e024dc4d0f611ba2dc0dea (tree) |
|---|---|
| Hora | 2020-04-04 07:29:15 |
| Autor | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| Commiter | Hironori Kitagawa |
lltjfont.sty: fix \bfseries and \mdseries
src/addons/luatexja-fontspec-27c.sty (diff) src/patches/lltjfont.sty (diff)| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{luatexja-fontspec-27c}[2020/01/26 fontspec support of LuaTeX-ja] | |
| 6 | +\ProvidesPackage{luatexja-fontspec-27c}[2020-04-04 fontspec support of LuaTeX-ja] | |
| 7 | 7 | \RequirePackage{l3keys2e} |
| 8 | 8 | \ExplSyntaxOn |
| 9 | 9 |
| @@ -314,6 +314,9 @@ | ||
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | \DeclareDocumentCommand \setmainjfont { O{} m O{} } { |
| 317 | + \ifdefined\DeclareFontSeriesDefault | |
| 318 | + \DeclareFontSeriesDefault[mc]{bf}{\bfdefault} | |
| 319 | + \fi | |
| 317 | 320 | \__ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2} |
| 318 | 321 | \unless\ifltj@disablejfam |
| 319 | 322 | \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n} |
| @@ -323,6 +326,9 @@ | ||
| 323 | 326 | } |
| 324 | 327 | |
| 325 | 328 | \DeclareDocumentCommand \setsansjfont { O{} m O{} } { |
| 329 | + \ifdefined\DeclareFontSeriesDefault | |
| 330 | + \DeclareFontSeriesDefault[gt]{bf}{\bfdefault} | |
| 331 | + \fi | |
| 326 | 332 | \__ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2} |
| 327 | 333 | \unless\ifltj@disablejfam |
| 328 | 334 | \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n} |
| @@ -331,6 +337,9 @@ | ||
| 331 | 337 | } |
| 332 | 338 | |
| 333 | 339 | \DeclareDocumentCommand \setmonojfont { O{} m O{} } { |
| 340 | + \ifdefined\DeclareFontSeriesDefault | |
| 341 | + \DeclareFontSeriesDefault[jtt]{bf}{\bfdefault} | |
| 342 | + \fi | |
| 334 | 343 | \__ltj_fontspec_set_family:Nnn \jttdefault {#1,#3}{#2} |
| 335 | 344 | \normalfont |
| 336 | 345 | } |
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{lltjfont}[2020-04-01 Patch to NFSS2 for LuaTeX-ja] | |
| 6 | +\ProvidesPackage{lltjfont}[2020-04-04 Patch to NFSS2 for LuaTeX-ja] | |
| 7 | 7 | |
| 8 | 8 | %% patching \DeclareTextComposite |
| 9 | 9 | \def\ltj@chardef@text@cmd#1{% |
| @@ -833,6 +833,32 @@ | ||
| 833 | 833 | \let\mdseries@gt\mddef@ult |
| 834 | 834 | \let\mdseries@jtt\mddef@ult |
| 835 | 835 | }{}{} |
| 836 | +\expandafter\patchcmd\csname bfseries \endcsname{% | |
| 837 | + \ifx\f@family\rmdef@ult \fontseries\bfseries@rm | |
| 838 | + \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf | |
| 839 | + \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt | |
| 840 | + \else \fontseries\bfdefault | |
| 841 | + \fi\fi\fi | |
| 842 | +}{% | |
| 843 | + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm | |
| 844 | + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf | |
| 845 | + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt | |
| 846 | + \else \romanseries\bfdefault | |
| 847 | + \fi\fi\fi | |
| 848 | +}{}{} | |
| 849 | +\expandafter\patchcmd\csname mdseries \endcsname{% | |
| 850 | + \ifx\f@family\rmdef@ult \fontseries\mdseries@rm | |
| 851 | + \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf | |
| 852 | + \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt | |
| 853 | + \else \fontseries\mddefault | |
| 854 | + \fi\fi\fi | |
| 855 | +}{% | |
| 856 | + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm | |
| 857 | + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf | |
| 858 | + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt | |
| 859 | + \else \romanseries\mddefault | |
| 860 | + \fi\fi\fi | |
| 861 | +}{}{} | |
| 836 | 862 | \expandafter\patchcmd\csname bfseries \endcsname{\selectfont}% |
| 837 | 863 | {% |
| 838 | 864 | \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc |
Fork