From 74728e861a713442320663646123dff99487108f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 May 2019 21:10:21 +0000 Subject: luatexja (4may19) git-svn-id: svn://tug.org/texlive/trunk@50978 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty | 6 ++++-- Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons') diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty index 8ca804f8a11..ca187cc900b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty @@ -2,7 +2,7 @@ % luatexja-ajmacros.sty % % Original: -% \ProvidesPackage{ajmacros}[2005/12/25 13:52 iNOUE Koich! ] +% \ProvidesPackage{ajmacros}[2019/04/01 21:00 iNOUE Koich! ] % @@ -347,7 +347,8 @@ \@ajligdef{#1}{\number\@tempcnta}\advance\@tempcnta\@ne \expandafter\@ajligaturedef\fi} \def\@aj@ligdef#1#2#3{\expandafter\xdef\csname ajLig\@ajmojifam#1\endcsname - {\noexpand\CID{\noexpand\unless\noexpand\ifnum\noexpand\ltjgetparameter\noexpand{direction\noexpand}=3 #2\noexpand\else#3\noexpand\fi}}} + {\unexpanded{\unless\ifnum\ltjgetparameter{direction}=3 }% + \noexpand\CID{#2}\noexpand\else\noexpand\CID{#3}\noexpand\fi}} \def\@aj@ligaturedef#1{\ifx\@nil#1\else \@aj@ligdef{#1}{\number\@tempcnta}{\number\@tempcntb}% \advance\@tempcnta\@ne\advance\@tempcntb\@ne @@ -441,6 +442,7 @@ \@ajligdef{より}{12181} \@ajligdef{升}{16194} \@ajligdef{コト}{16195} +\@aj@ligdef{令和}{23058}{23059}%AJ1-7 % \def\@ajmojifam{○} \@tempcnta7613 diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty index 76cfbcd91b9..082468b97bc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty @@ -90,7 +90,7 @@ \protected\def\CID#1{\ifvmode\leavevmode\fi\ltj@tempcnta#1\relax\directlua{luatexja.otf.cid(\the\ltj@tempcnta)}\relax} %% \UTF compatible with the OTF package for pLaTeX -\protected\def\UTF#1{\ifvmode\leavevmode\fi\directlua{luatexja.otf.append_jglyph(0x#1)}} +\protected\def\UTF#1{\ifvmode\leavevmode\fi\directlua{luatexja.otf.utf(0x#1)}} %% Load ajmacros \ifltj@in@latex %<*LaTeX> -- cgit v1.2.3