diff options
author | Karl Berry <karl@freefriends.org> | 2018-09-22 21:00:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-09-22 21:00:30 +0000 |
commit | 11b17670348e1e440d1a3e2891671f87be10abf5 (patch) | |
tree | a43550cdf6d83bb6fbce79fa323a205d31a9fea8 /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | f2735cd0c7d339056ebced0b410c14666b2e4812 (diff) |
luatexja (22sep18)
git-svn-id: svn://tug.org/texlive/trunk@48736 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 0c4cfb5f7e6..09c54eaf94e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,10 +3,10 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2018/06/15 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2018/09/05 Default font settings of LuaTeX-ja] -\def\ltj@stdmcfont{IPAExMincho} -\def\ltj@stdgtfont{IPAExGothic} +\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi +\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi \InputIfFileExists{luatexja.cfg}{% \typeout{*************************^^J% * Loading luatexja.cfg.^^J% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty index abcf05b9e79..3f7c2208d1b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -1,5 +1,5 @@ % -% lltjp-listings.sty 2018-08-25 +% lltjp-listings.sty 2018-09-17 % \NeedsTeXFormat{LaTeX2e} @@ -367,11 +367,13 @@ #3\catcode\ltjlineendcomment=9\lst@escapebegin\expandafter\lst@next%" \fi}% {}} +\def\ltj@lst@emptygrp{{}} \def\ltj@lst@escape@setup#1{% \begingroup\lccode`\~=`#1\lowercase{% \gdef\lst@next##1~{% \let\lst@arg\@empty\ltj@lst@remove@jacmd{##1}% - \expandafter\expandafter\expandafter\scantokens\expandafter{\lst@arg}% + \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter + \scantokens\expandafter\expandafter\expandafter{\expandafter\ltj@lst@emptygrp\lst@arg\empty}% ~}% }\endgroup } |