Revert \ajHankaku in luatexja-ajmacros.sty back to \aj半角.

diff --git a/src/addons/luatexja-ajmacros.sty b/src/addons/luatexja-ajmacros.sty
index 0cd516c..007f042 100644 (file)
--- a/src/addons/luatexja-ajmacros.sty
+++ b/src/addons/luatexja-ajmacros.sty
@@ -70,7 +70,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-ajmacros}[2011/09/19 v0.1]
+  \ProvidesPackage{luatexja-ajmacros}[2012/05/08 v0.1a]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -326,21 +326,21 @@
 %2/3 9376 12892 9696 13212
 %
 %
-\def\@ajHankakudef#1{\ifx\@nil#1\else
-       \expandafter\xdef\csname ajHankaku@#1\endcsname{\noexpand\CID
+\def\@aj半角def#1{\ifx\@nil#1\else
+       \expandafter\xdef\csname aj半角@#1\endcsname{\noexpand\CID
                {\noexpand\ifydir\number\@tempcnta\noexpand\else\number\@tempcntb\noexpand\fi}}%
        \advance\@tempcnta\@ne\advance\@tempcntb\@ne
-       \expandafter\@ajHankakudef\fi}
+       \expandafter\@aj半角def\fi}
 \@tempcnta326
 \@tempcntb9084
-\@ajHankakudef 　。「」、・ヲァィゥェォャュョッーアイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン゛゜｀ヰヱヮヵヶヴガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポ\@nil
+\@aj半角def 　。「」、・ヲァィゥェォャュョッーアイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン゛゜｀ヰヱヮヵヶヴガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポ\@nil
 \@tempcnta516
-\@ajHankakudef をぁぃぅぇぉゃゅょっあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわんゐゑゎがぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽ\@nil
-\gdef\ajHankaku#1{\aj@Hankaku#1\@nil}
-\gdef\aj@Hankaku#1{\ifx\@nil#1\else
-       \expandafter\ifx\csname ajHankaku@#1\endcsname\relax
-          #1\else\csname ajHankaku@#1\endcsname\fi
-   \expandafter\aj@Hankaku\fi}
+\@aj半角def をぁぃぅぇぉゃゅょっあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわんゐゑゎがぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽ\@nil
+\gdef\aj半角#1{\aj@半角#1\@nil}
+\gdef\aj@半角#1{\ifx\@nil#1\else
+       \expandafter\ifx\csname aj半角@#1\endcsname\relax
+          #1\else\csname aj半角@#1\endcsname\fi
+   \expandafter\aj@半角\fi}
 %
 %
 \def\@ajligdef#1#2{\expandafter\xdef\csname ajLig\@ajmojifam#1\endcsname{\noexpand\CID{#2}}}

diff --git a/test/test10-otf.pdf b/test/test10-otf.pdf
index b08ad86..127ba6a 100644 (file)
Binary files a/test/test10-otf.pdf and b/test/test10-otf.pdf differ

diff --git a/test/test10-otf.tex b/test/test10-otf.tex
index c6b5b63..0f28fcd 100644 (file)
--- a/test/test10-otf.tex
+++ b/test/test10-otf.tex
@@ -39,7 +39,7 @@
 
 {\bf（速報）}世界陸上\CID{20660}，\ajLig{ボルト}がフライングで失格．
 
-\ajHankaku{半角カタカナひらがな} %←JFM の問題か，半角ひらがなが全角幅で出てしまう．
+\aj半角{半角カタカナひらがな} %←JFM の問題か，半角ひらがなが全角幅で出てしまう．
 ←luatexja-otf.sty内で，JFMの文法拡張を行いました．