\CID for vertical form glyphs of non-AJ1 fonts

[luatex-ja/luatexja.git] / src / addons / luatexja-ajmacros.sty

diff --git a/src/addons/luatexja-ajmacros.sty b/src/addons/luatexja-ajmacros.sty
index e7cb900..ca187cc 100644 (file)
--- a/src/addons/luatexja-ajmacros.sty
+++ b/src/addons/luatexja-ajmacros.sty
@@ -2,7 +2,7 @@
 % luatexja-ajmacros.sty
 %
 % Original:
-% \ProvidesPackage{ajmacros}[2005/12/25 13:52 iNOUE Koich! <inoue@ma.ns.musashi-tech.ac.jp>]
+% \ProvidesPackage{ajmacros}[2019/04/01 21:00 iNOUE Koich! <inoue@ma.ns.musashi-tech.ac.jp>]
 %
 
 
@@ -68,7 +68,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-ajmacros}[2014/07/02]
+  \ProvidesPackage{luatexja-ajmacros}[2017/05/05]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -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