Renamed control sequences and parameters. (e.g. yabaselineshift => yalbaselineshift)

.

diff --git a/doc/s1sty.tex b/doc/s1sty.tex
index ef7b53d..9c2baa6 100644 (file)
--- a/doc/s1sty.tex
+++ b/doc/s1sty.tex
@@ -55,7 +55,7 @@
   \let\sc=\eightsc \def\tt{\eighttt\eightjtt}%
   \let\mc=\eightmc \let\gt=\eightgt%
   \rm\mc\xkanjiskip=0.25\zw plus 1pt minus 1pt%
-  \ltjsetparameter{ykbaselineshift=-0.76pt, yabaselineshift=-0.76pt}
+  \ltjsetparameter{yjabaselineshift=-0.76pt, yalbaselineshift=-0.76pt}
 }
 
 
@@ -117,6 +117,6 @@
 \def\enum{\par\medskip\advance\enumi1\leftskip=2\zw\noindent\hskip-1\zw\hbox to 1\zw{\hss\the\enumi.\kern0.5\zw}}
 \def\enditem{\medskip\par\enumi=0\leftskip=0pt\parskip=0pt\noindent}
 
-\ltjsetparameter{cjkxspmode={`★,0}}
+\ltjsetparameter{jaxspmode={`★,0}}
 
 \endinput

diff --git a/doc/sample1.log b/doc/sample1.log
index dd95159..c75c38a 100644 (file)
--- a/doc/sample1.log
+++ b/doc/sample1.log
@@ -1,4 +1,4 @@
-This is LuaTeX, Version beta-0.66.0-2011032121 (rev 4093)  (format=luatex 2011.4.20)  23 APR 2011 12:48
+This is LuaTeX, Version beta-0.66.0-2011043022 (rev 4141)  (format=luatex 2011.4.27)  1 MAY 2011 11:44
  restricted \write18 enabled.
 **sample1
 (./sample1.tex (./s1sty.tex
@@ -156,7 +156,10 @@ Module luatexbase-mcb info: inserting 'luaotfload.define_font'
 (luatexbase-mcb)            at position 1 in 'define_font'
 Module luatexbase-mcb info: inserting 'luaotfload.find_vf_file'
 (luatexbase-mcb)            at position 1 in 'find_vf_file'
-) (/opt/texlive/p2010/texmf-dist/tex/generic/xkeyval/xkeyval.tex
+) (/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+Package: ltxcmds 2010/04/26 v1.7 LaTeX kernel commands for general use (HO)
+)
+(/opt/texlive/p2010/texmf-dist/tex/generic/xkeyval/xkeyval.tex
 \XKV@toks=\toks13
 \XKV@tempa@toks=\toks14
 \XKV@depth=\count280
@@ -168,12 +171,12 @@ Module luatexbase-mcb info: inserting 'luaotfload.find_vf_file'
 (/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/infwarerr.sty
 Package: infwarerr 2010/04/08 v1.3 Providing info/warning/message (HO)
 )
-\luatexja@tempcnta=\count281
-\luatexja@tempcntb=\count282
-\luatexja@tempcntc=\count283
-\luatexja@tempdima=\dimen256
-\luatexja@autospc=\count284
-\luatexja@autoxspc=\count285
+\ltj@tempcnta=\count281
+\ltj@tempcntb=\count282
+\ltj@tempcntc=\count283
+\ltj@tempdima=\dimen256
+\ltj@autospc=\count284
+\ltj@autoxspc=\count285
 \jcharwidowpenalty=\count286
 \kanjiskip=\skip256
 \xkanjiskip=\skip257
@@ -181,38 +184,39 @@ Package: infwarerr 2010/04/08 v1.3 Providing info/warning/message (HO)
 \zh=\dimen258
 \jQ=\dimen259
 \jH=\dimen260
-\luatexja@curjfnt=\luatexattribute9
-\luatexja@charclass=\luatexattribute10
-\luatexja@yablshift=\luatexattribute11
-\luatexja@ykblshift=\luatexattribute12
-\luatexja@icflag=\luatexattribute13
-\luatexja@japanese=\language87
+\ltj@curjfnt=\luatexattribute9
+\ltj@charclass=\luatexattribute10
+\ltj@yablshift=\luatexattribute11
+\ltj@ykblshift=\luatexattribute12
+\ltj@icflag=\luatexattribute13
+\ltj@japanese=\language87
 
 (/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-rmlgbm.lua)
 (/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-rmlgbm-data.lu
 a)
+(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-jfont.lua)
 (/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-core.lua)
 Module luatexbase-mcb info: inserting 'ltj.process_input_buffer'
 (luatexbase-mcb)            at position 1 in 'process_input_buffer'
-Module luatexbase-mcb info: inserting 'ltj.pre_linebreak_filter'
-(luatexbase-mcb)            at position 2 in 'pre_linebreak_filter'
-Module luatexbase-mcb info: inserting 'ltj.hpack_filter'
-(luatexbase-mcb)            at position 2 in 'hpack_filter'
 Module luatexbase-mcb info: inserting 'ltj.hpack_filter_pre'
 (luatexbase-mcb)            at position 1 in 'hpack_filter'
 Module luatexbase-mcb info: inserting 'ltj.hyphenate'
 (luatexbase-mcb)            at position 1 in 'hyphenate'
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-jfont.lua)
+Module luatexbase-mcb info: inserting 'ltj.pre_linebreak_filter'
+(luatexbase-mcb)            at position 2 in 'pre_linebreak_filter'
+Module luatexbase-mcb info: inserting 'ltj.hpack_filter'
+(luatexbase-mcb)            at position 2 in 'hpack_filter'
+(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-xkanji.lua)
 (/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-core-aux.lua)
-\luatexja@kcat0=\luatexattribute14
-\luatexja@kcat1=\luatexattribute15
-\luatexja@kcat2=\luatexattribute16
-\luatexja@kcat3=\luatexattribute17
-\luatexja@kcat4=\luatexattribute18
-\luatexja@kcat5=\luatexattribute19
-\luatexja@kcat6=\luatexattribute20
-\ltj@stack@pbp=\count287
-\ltj@group@level@pbp=\count288
+\ltj@kcat0=\luatexattribute14
+\ltj@kcat1=\luatexattribute15
+\ltj@kcat2=\luatexattribute16
+\ltj@kcat3=\luatexattribute17
+\ltj@kcat4=\luatexattribute18
+\ltj@kcat5=\luatexattribute19
+\ltj@kcat6=\luatexattribute20
+\ltj@@stack=\count287
+\ltj@@group@level=\count288
 
 plain format: loading luatexja-plain.tex
 (/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-plain.tex
@@ -221,9 +225,9 @@ plain format: loading luatexja-plain.tex
 (/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/jfm-mono.lua)
 \vspbox=\box256
 \enumi=\count289
-) BB AA
-特徴 制限 ファイル構成 使用方法 [1{/opt/texlive/p2010/texmf-var/f
-onts/map/pdftex/updmap/pdftex.map
+) 特徴
+制限 ファイル構成 [1{/opt/texlive/p2010/texmf-var/fonts/map/pdftex/updm
+ap/pdftex.map
 LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
 x.map): fontmap entry for `bchb8r' already exists, duplicates ignored
 
@@ -241,14 +245,36 @@ x.map): fontmap entry for `bchri8r' already exists, duplicates ignored
 
 LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
 x.map): fontmap entry for `bchro8r' already exists, duplicates ignored
-}] 和文フォントの定義 「和文文字の範囲」の設定 [2]
-組版パラメタの調整 [3] 組版パラメタの取得 [4]
-その他の命令 JFMについて [5] 大まかな処理の流れ [6] [7]
-名称について 表記法 読み方 機能 [8] 数式の表示例
-生い立ち T\kern -.1667em\lower .5ex\hbox {E}\kern -.125emXの日本語化
-[9]
+}] 使用方法 和文フォントの定義 [2]
+「和文文字の範囲」の設定 組版パラメタの調整 [3]
+Overfull \hbox (2.29878pt too wide) in paragraph at lines 215--220
+ [] []\tentt yjabaselineshift=$\tensy h$\tenit di-men$\tensy i$\tenrm : \tenmin
+ 和 文 文 字 の ベ ー ス ラ イ ン 補 正 量 を \tenrm di-men-sion
+ \tenmin で 指 定 す る [] \tenrm pT[]X
+
+\hbox(8.45029+2.5)x412.9118, glue set - 1.0, direction TLT
+.\glue(\leftskip) 19.2052
+.\whatsit
+..\localinterlinepenalty=0
+..\localbrokenpenalty=0
+..\localleftbox=null
+..\localrightbox=null
+.\glue -9.6026
+.\hbox(4.44444+0.0)x9.6026, glue set 2.3013fil, direction TLT
+..\glue 0.0 plus 1.0fil minus 1.0fil
+..\mathon
+..\tensy \ f
+..\mathoff
+..\glue 0.0 plus 1.0fil minus 1.0fil
+.\tentt y
+.etc.
+
+組版パラメタの取得 [4] その他の命令 JFMについて [5]
+大まかな処理の流れ [6] [7] [8] 名称について 表記法 読み方
+機能 [9] 数式の表示例 生い立ち
+T\kern -.1667em\lower .5ex\hbox {E}\kern -.125emXの日本語化 [10]
 T\kern -.1667em\lower .5ex\hbox {E}\kern -.125emXによる組版の作業工
-程 [10] GUI環境とT\kern -.1667em\lower .5ex\hbox {E}\kern -.125emX [11] )</
+程 [11] GUI環境とT\kern -.1667em\lower .5ex\hbox {E}\kern -.125emX [12] )</
 opt/texlive/p2010/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx10.pfb></opt/te
 xlive/p2010/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></opt/texlive/
 p2010/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx7.pfb></opt/texlive/p2010/t
@@ -264,9 +290,9 @@ opt/texlive/p2010/texmf-dist/fonts/type1/public/amsfonts/cm/cmti10.pfb></opt/te
 xlive/p2010/texmf-dist/fonts/type1/public/amsfonts/cm/cmtt10.pfb></opt/texlive/
 p2010/texmf-dist/fonts/type1/public/amsfonts/cm/cmtt8.pfb></opt/texlive/p2010/t
 exmf-dist/fonts/type1/hoekwater/manfnt/manfnt.pfb>
-Output written on sample1.pdf (11 pages, 218012 bytes).
-PDF statistics: 114 PDF objects out of 1000 (max. 8388607)
- 82 compressed objects within 1 object stream
+Output written on sample1.pdf (12 pages, 222125 bytes).
+PDF statistics: 117 PDF objects out of 1000 (max. 8388607)
+ 84 compressed objects within 1 object stream
  0 named destinations out of 1000 (max. 131072)
  1 words of extra memory for PDF output out of 10000 (max. 10000000)
 

diff --git a/doc/sample1.pdf b/doc/sample1.pdf
index 91d5a02..b34a0f5 100644 (file)
Binary files a/doc/sample1.pdf and b/doc/sample1.pdf differ

diff --git a/doc/sample1.tex b/doc/sample1.tex
index 05f18ec..13bfbf2 100644 (file)
--- a/doc/sample1.tex
+++ b/doc/sample1.tex
@@ -93,8 +93,8 @@ JFM は和文文字の幅や，和文文字間の空白の入り方などを規
 \TeX の|\font| primitiveと同様の書式を持った次の命令を用いて和文フォントを定義する：
 
 \begintt
-  \jfont<font>={<font_name>:<features>} <size>  % local に定義
-  \gjfont<font>={<font_name>:<features>} <size> % global に定義
+  \jfont<font>={<font_name>:<features>} <size>       % local に定義
+  \globaljfont<font>={<font_name>:<features>} <size> % global に定義
 \endtt
 
 
@@ -145,13 +145,13 @@ PSフォント名<PSfont_name>を直接指定することもでき，
 \item デフォルトでは，|U+0100|以降の文字は全部和文扱いであり，さらに文字範囲として，
 \begintt
   \defcharrange{1}{"80-"FF}
-  \ltjsetparameter{jcharrange={-1}}
+  \ltjsetparameter{jacharrange={-1}}
 \endtt
 と指定している{\small（つまりLatin-1 Supplementの範囲は欧文扱い）\inhibitglue}．
 
-TODO: 「{\ltjsetparameter{jcharrange={1}}× (|U+00D7|)}」等，ISO 8859-1領域
+TODO: 「{\ltjsetparameter{jacharrange={1}}× (|U+00D7|)}」等，ISO 8859-1領域
 にマッピングされた文字の扱い．
-「{\ltjsetparameter{jcharrange={1}}¢ (|U+00A2|)}」はHalfwidth and
+「{\ltjsetparameter{jacharrange={1}}¢ (|U+00A2|)}」はHalfwidth and
 Fullwidth Formsに全角形（\char"FFE0）があるから%"
 luaotfloadの置換処理に割り込めばよいが……．
 \enditem
@@ -162,7 +162,7 @@ luaotfloadの置換処理に割り込めばよいが……．
 日本語組版用の各種パラメタの調整には，次の命令を用いる．
 \begintt
   \ltjsetparameter{<key>=<value>, ...}       % local に変更
-  \globalltjsetparameter{<key>=<value>, ...} % global に変更
+  \ltjglobalsetparameter{<key>=<value>, ...} % global に変更
 \endtt
 
 <key> に許される値は次の通りである．
@@ -193,13 +193,13 @@ p\TeX では，同一文字に対して|\prebreakpenalty|, |\postbreakpenalty|
 \itemT |U+3000|--|U+303F| (CJK Symbols and Punctuation)
 \itemT |U+FF00|--|U+FFEF| (Halfwidth and Fullwidth Forms)
 
-\item |cjkxspmode={<chr_code>, <mode>}|★\par\noindent
+\item |jaxspmode={<chr_code>, <mode>}|★\par\noindent
 p\TeX の|\inhibitxspcode|に対応した設定項目である．<mode>で許される値は，
 \itemitem |0|, |inhibit|: 前後の欧文文字との間の|\xkanjiskip|自動挿入を禁止．
 \itemitem |2|, |preonly|: 前の欧文文字との間の|\xkanjiskip|自動挿入のみを許可．
 \itemitem |1|, |postonly|: 後の欧文文字との間の|\xkanjiskip|自動挿入のみを許可．
 \itemitem |3|, |allow|: 前後の欧文文字との間の|\xkanjiskip|自動挿入を許可．
-\item |asciixspmode={<chr_code>, <mode>}|★\par\noindent
+\item |alxspmode={<chr_code>, <mode>}|★\par\noindent
 同様に，p\TeX の|\xspcode|に対応した設定項目である．
 <mode>で許される値は，
 \itemitem |0|, |inhibit|: 前後の和文文字との間の|\xkanjiskip|自動挿入を禁止．
@@ -207,12 +207,12 @@ p\TeX の|\inhibitxspcode|に対応した設定項目である．<mode>で許さ
 \itemitem |2|, |postonly|: 後の和文文字との間の|\xkanjiskip|自動挿入のみを許可．
 \itemitem |3|, |allow|: 前後の和文文字との間の|\xkanjiskip|自動挿入を許可．
 
-\item |yabaselineshift=<dimen>|:
-p\TeX の|\yabaselineshift|に対応したものであり，欧文文字のベースライン補正量をdimensionで指定する．
+\item |yalbaselineshift=<dimen>|:
+p\TeX の|\baselineshift|に対応したものであり，欧文文字のベースライン補正量をdimensionで指定する．
 \itemitem 正の値を指定すると，その分だけ欧文文字は下にずれることとなる．
 \itemitem 数式中では，boxやruleもこの量だけずれる\hfil\break
-（よって，行中数式は全体が|\yabaselineshift|だけずれたように見える）．
-\item |ykbaselineshift=<dimen>|:
+（よって，行中数式は全体が|yalbaselineshift|だけずれたように見える）．
+\item |yjabaselineshift=<dimen>|:
 和文文字のベースライン補正量をdimensionで指定する．
 p\TeX では「和文が主」という考えからか，常に和文文字のベースラインが基準であり，
 欧文文字の方をずらすことになっていた．しかし，「欧文の中に和文をちょっと入れる」ような場合では，
@@ -241,7 +241,7 @@ glue/kernの計算方法を設定する．
 \itemitem {\tt average}: 両者の相加平均．
 \itemitem {\tt both}: 両者の合計値の幅をもつglue/kernを挿入する．
 
-\item |jcharrange={<range_num>,<range_num>,...}|: 
+\item |jacharrange={<range_num>,<range_num>,...}|: 
 $\lvert\hbox{<range_num>}\rvert$番の文字範囲の文字を和文扱いするか欧文扱いするかを設定する．
 \itemitem $\lvert\hbox{<range_num>}\rvert>216$の場合，
 「どの文字範囲にも属さない|U+0100|以降の文字」に
@@ -261,19 +261,19 @@ $\lvert\hbox{<range_num>}\rvert$番の文字範囲の文字を和文扱いする
 
 <key>に指定できる値は，説明がない限りは|\ltjsetparameter|で指定できる<key>と同じで，次の通りである，
 
-\item |kanjiskip|, |xkanjiskip|, |yabaselineshift|, |ykbaselineshift|, |jcharwidowpenalty|%
+\item |kanjiskip|, |xkanjiskip|, |yalbaselineshift|, |yjabaselineshift|, |jcharwidowpenalty|%
 \par\noindent
 それぞれ値を表現する文字列を返す．
 
 \item |differentjfm|: 戻り値は{\tt large}, {\tt small}, {\tt average}, {\tt both}の
 4つの文字列のいずれか．
 
-\item |prebreakpenalty|, |postbreakpenalty|, |kcatcode|, |cjkxspmode|, |asciixspmode|
+\item |prebreakpenalty|, |postbreakpenalty|, |kcatcode|, |jaxspmode|, |alxspmode|
 \par\noindent
 これらは各文字コード別に設定される値であるので，文字コード<chr_code>を第2引数にとる．
 指定されている整数値を表す文字列を返す．
 
-\item |jcharrange|: 文字範囲の番号$n$を第2引数にとり，$n$番の文字範囲が
+\item |jacharrange|: 文字範囲の番号$n$を第2引数にとり，$n$番の文字範囲が
 和文文字扱いされていれば|0|，欧文文字扱いされていれば|1|を返す．
 $n\notin [1,216]$の場合は，「どの文字範囲にも属さない|U+0100|以降の文字」に対しての結果を返す．
 
@@ -370,13 +370,13 @@ Lua\TeX-jaパッケージでは，次のような流れで実際の処理を行
 
 この段階の前では，和文文字であっても，それを内部で表している|glyph_node|~$p$は，
 「|\tenrm あ|」のように，欧文フォントが指定されている状態になっている．しかし，
-$p$は「現在の和文フォント」の番号もattribute |\luatexja@curjfnt|として保持している．そのため，
+$p$は「現在の和文フォント」の番号もattribute |\ltj@curjfnt|として保持している．そのため，
 この段階では，「和文文字が格納されている」|glyph_node|~$p$に対して，次を行う．
 
-\itemitem $p$のフォントをattribute |\luatexja@curjfnt|の値に置換．
-\itemitem $p$の|language| fieldを|\luatexja@japanese|の値に置換．
+\itemitem $p$のフォントをattribute |\ltj@curjfnt|の値に置換．
+\itemitem $p$の|language| fieldを|\ltj@japanese|の値に置換．
 誤って和文文字間でハイフネーションがされてしまうのを防止するため．
-\itemitem $p$の文字の文字クラスを計算し，その値をattribute |\luatexja@charclass|に格納．
+\itemitem $p$の文字の文字クラスを計算し，その値をattribute |\ltj@charclass|に格納．
 これにより，|jp90|等のfeatureによりグリフが置換されても，文字クラスの値は保たれる．
 
 \item {\bf （luaotfloadパッケージによるグリフ置換等の処理はこの位置で）}
@@ -428,9 +428,9 @@ p\TeX では数字{\tt 0}との間に挿入するかどうかで判定してい
 この段階では，（主として）欧文文字のベースラインをずらす作業を行う．幸いにして，
 Lua\TeX で文字を表す|glyph_node|には|y_offset| fieldがあるので，作業は楽である．
 
-補正量は，attribute |\luatexja@yablshift|の値（先も書いた通り，sp単位）である．和文文字の
-補正量は|\luatexja@ykblshift|の値で指定されるが，以前の「和文フォントへの置換」処理において，
-|\luatexja@yablshift|へと値を移し変えているので，この段階では|\luatexja@yablshift|の値のみを気にしている．
+補正量は，attribute |\ltj@yablshift|の値（先も書いた通り，sp単位）である．和文文字の
+補正量は|\ltj@ykblshift|の値で指定されるが，以前の「和文フォントへの置換」処理において，
+|\ltj@yablshift|へと値を移し変えているので，この段階では|\ltj@yablshift|の値のみを気にしている．
 
 さて，実際に補正されるのは次の場合である:
 \itemitem 文字 (|glyph_node|)

diff --git a/src/luatexja-core.lua b/src/luatexja-core.lua
index a2c43db..9d0f931 100644 (file)
--- a/src/luatexja-core.lua
+++ b/src/luatexja-core.lua
@@ -19,14 +19,14 @@ local id_rule = node.id('rule')
 local id_math = node.id('math')
 local id_whatsit = node.id('whatsit')
 
-local attr_jchar_class = luatexbase.attributes['luatexja@charclass']
-local attr_curjfnt = luatexbase.attributes['luatexja@curjfnt']
-local attr_yablshift = luatexbase.attributes['luatexja@yablshift']
-local attr_ykblshift = luatexbase.attributes['luatexja@ykblshift']
-local attr_icflag = luatexbase.attributes['luatexja@icflag']
+local attr_jchar_class = luatexbase.attributes['ltj@charclass']
+local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
+local attr_yablshift = luatexbase.attributes['ltj@yablshift']
+local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
+local attr_icflag = luatexbase.attributes['ltj@icflag']
 -- attr_icflag: 1: kern from \/, 2: 'lineend' kern from JFM
 
-local lang_ja_token = token.create('luatexja@japanese')
+local lang_ja_token = token.create('ltj@japanese')
 local lang_ja = lang_ja_token[2]
 
 -- 
@@ -160,10 +160,10 @@ ltj.int_get_inhibit_xsp_table = cstb_get_inhibit_xsp_table
 
 -- EXT: print parameters that don't need arguments
 function ltj.ext_get_parameter_unary(k)
-   if k == 'yabaselineshift' then
-      tex.write(print_scaled(tex.getattribute('luatexja@yablshift'))..'pt')
-   elseif k == 'ykbaselineshift' then
-      tex.write(print_scaled(tex.getattribute('luatexja@ykblshift'))..'pt')
+   if k == 'yalbaselineshift' then
+      tex.write(print_scaled(tex.getattribute('ltj@yablshift'))..'pt')
+   elseif k == 'yjabaselineshift' then
+      tex.write(print_scaled(tex.getattribute('ltj@ykblshift'))..'pt')
    elseif k == 'kanjiskip' then
       tex.write(print_spec(tex.getskip('kanjiskip')))
    elseif k == 'xkanjiskip' then
@@ -191,7 +191,7 @@ end
 
 -- EXT: print parameters that need arguments
 function ltj.ext_get_parameter_binary(k,c)
-   if k == 'jcharrange' then
+   if k == 'jacharrange' then
       if c<0 or c>216 then c=0 end
       tex.write(rgjc_get_range_setting(c))
    else
@@ -209,7 +209,7 @@ function ltj.ext_get_parameter_binary(k,c)
         tex.write(cstb_get_penalty_table('kcat',c))
       elseif k == 'chartorange' then 
         tex.write(rgjc_char_to_range(c))
-      elseif k == 'cjkxspmode' or k == 'asciixspmode' then
+      elseif k == 'jaxspmode' or k == 'alxspmode' then
         tex.write(cstb_get_inhibit_xsp_table(c))
       end
    end

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 83fd352..3868ddd 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -4,18 +4,19 @@
 \catcode"FFFFF=14 %"
 
 \input luaotfload.sty
+\input ltxcmds.sty
 \input xkeyval.tex
 \input infwarerr.sty
-\ifdefined\luatexja@loaded\endinput\fi
-\def\luatexja@loaded{hoge}
+\ifdefined\ltj@loaded\endinput\fi
+\def\ltj@loaded{hoge}
 
-\newcount\luatexja@tempcnta
-\newcount\luatexja@tempcntb
-\newcount\luatexja@tempcntc
-\newdimen\luatexja@tempdima
+\newcount\ltj@tempcnta
+\newcount\ltj@tempcntb
+\newcount\ltj@tempcntc
+\newdimen\ltj@tempdima
 
-\newcount\luatexja@autospc
-\newcount\luatexja@autoxspc
+\newcount\ltj@autospc
+\newcount\ltj@autoxspc
 
 \newcount\jcharwidowpenalty
 \newskip\kanjiskip
@@ -26,12 +27,12 @@
 \newdimen\jH \jH=0.25mm
 
 %%%%%%%% Attributes for Japanese typesetting.
-\newluatexattribute\luatexja@curjfnt   % index for ``current Japanese font''
-\newluatexattribute\luatexja@charclass % 
-\newluatexattribute\luatexja@yablshift % attribute for \yabaselineshift
-\newluatexattribute\luatexja@ykblshift % attribute for \ykbaselineshift
-\newluatexattribute\luatexja@icflag    % attribute for italic correction
-\newlanguage\luatexja@japanese
+\newluatexattribute\ltj@curjfnt   % index for ``current Japanese font''
+\newluatexattribute\ltj@charclass % 
+\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
+\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\ltj@icflag    % attribute for italic correction
+\newlanguage\ltj@japanese
 
 %%%%%%%% Loading lua files
 \directlua{%
@@ -54,47 +55,48 @@
 
 
 %%%%%%%% Attributes for character ranges
-\luatexja@tempcnta=0
-\loop\ifnum\luatexja@tempcnta<7
+\ltj@tempcnta=0
+\loop\ifnum\ltj@tempcnta<7
   \expandafter\newluatexattribute%
-    \csname luatexja@kcat\the\luatexja@tempcnta\endcsname
-  \csname luatexja@kcat\the\luatexja@tempcnta\endcsname=0
-  \advance\luatexja@tempcnta by1
+    \csname ltj@kcat\the\ltj@tempcnta\endcsname
+  \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
+  \advance\ltj@tempcnta by1
 \repeat
 
 %%%%%%%% \asluastring
 \def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
 
 %%%%%%%% Redefine \/
-%\let\luatexja@ic=\/ \protected\def\/{{\luatexja@icflag=1\luatexja@ic}}
+%\let\ltj@ic=\/ \protected\def\/{{\ltj@icflag=1\ltj@ic}}
 \protected\def\/{\directlua{ltj.ext_append_italic()}}
 
-%%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \gjfont
-\def\jfont{\afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(false)}}
-\def\gjfont{\afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(true)}}
+%%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
+\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(false)}}
+\protected\def\globaljfont{%
+  \afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(true)}}
 \def\ltj@@jfont{\directlua{ltj.ext_jfontdefY()}}
 
 %%%%%%%% \inhibitglue
-\def\inhibitglue{\directlua{ltj.ext_create_inhibitglue_node()}}
+\protected\def\inhibitglue{\directlua{ltj.ext_create_inhibitglue_node()}}
 
 %%%%%%%% \ltjdefcharrange<name>{100-200,3000-,5000,...}
-\def\ltjdefcharrange#1#2{%
-  \luatexja@tempcntc=#1 \expandafter\ltj@@dcrange#2,,\ignorespaces}
+\protected\def\ltjdefcharrange#1#2{%
+  \ltj@tempcntc=#1 \expandafter\ltj@@dcrange#2,,\ignorespaces}
 \def\ltj@@dcrange#1,{\def\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\@next=\relax\else
   \ltj@@dcrangeA{#1}\let\@next=\ltj@@dcrange\fi\@next}
 \def\ltj@@dcrangeA#1{\ltj@@dcrangeB#1--\@nil}
 \def\ltj@@dcrangeB#1-#2-#3\@nil{\def\ltj@temp{#3}%
   \ifx\ltj@temp\empty
-    \luatexja@tempcnta=#1 \luatexja@tempcntb=\luatexja@tempcnta
+    \ltj@tempcnta=#1 \ltj@tempcntb=\ltj@tempcnta
   \else
     \def\ltj@temp{#1}%
-    \ifx\ltj@temp\empty\luatexja@tempcnta='200 \else\luatexja@tempcnta=#1 \fi
+    \ifx\ltj@temp\empty\ltj@tempcnta='200 \else\ltj@tempcnta=#1 \fi
     \def\ltj@temp{#2}%
-    \ifx\ltj@temp\empty\luatexja@tempcntb="10FFFF \else\luatexja@tempcntb=#2 \fi%"
+    \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF \else\ltj@tempcntb=#2 \fi%"
   \fi
-  \directlua{ltj.ext_add_char_range(\the\luatexja@tempcnta,\the\luatexja@tempcntb,
-    \the\luatexja@tempcntc)}%
+  \directlua{ltj.ext_add_char_range(\the\ltj@tempcnta,\the\ltj@tempcntb,
+    \the\ltj@tempcntc)}%
   }
 
 %%%%%%%% \ltjsetparameter
@@ -109,51 +111,52 @@
 \define@key[ltj]{japaram}{postbreakpenalty}{%
   \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}}
 \def\ltj@@set@stack#1,#2:#3#4#5{%
-  \luatexja@tempcnta=#1\relax \luatexja@tempcntb=#2\relax
+  \ltj@tempcnta=#1\relax \ltj@tempcntb=#2\relax
   \directlua{ltj.ext_set_stack_table(ltj.isglobal, \asluastring{#3},
-    \the\luatexja@tempcnta,tex.getcount('luatexja@tempcntb'),#4,#5)}}
+    \the\ltj@tempcnta,tex.getcount('ltj@tempcntb'),#4,#5)}}
 
-% yabaselineshift = <dimen>
-\define@key[ltj]{japaram}{yabaselineshift}{%
-  \luatexja@tempdima=#1\relax%
+% yalbaselineshift = <dimen>
+% yjabaselineshift = <dimen>
+\define@key[ltj]{japaram}{yalbaselineshift}{%
+  \ltj@tempdima=#1\relax%
   \directlua{tex.setattribute(ltj.isglobal, 
-    luatexbase.attributes['luatexja@yablshift'],
-    tex.getdimen('luatexja@tempdima'))}}
-\define@key[ltj]{japaram}{ykbaselineshift}{%
-  \luatexja@tempdima=#1\relax%
+    luatexbase.attributes['ltj@yablshift'],
+    tex.getdimen('ltj@tempdima'))}}
+\define@key[ltj]{japaram}{yjabaselineshift}{%
+  \ltj@tempdima=#1\relax%
   \directlua{tex.setattribute(ltj.isglobal, 
-    luatexbase.attributes['luatexja@ykblshift'],
-    tex.getdimen('luatexja@tempdima'))}}
+    luatexbase.attributes['ltj@ykblshift'],
+    tex.getdimen('ltj@tempdima'))}}
 
-% cjkxspmode = {<char_code>, <mode>}
+% jaxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
 %    or       0        2         1      3
-\define@key[ltj]{japaram}{cjkxspmode}{%        \inhibitxspcode
-  \expandafter\ltj@set@cjkxspmode#1:\relax}
-\def\ltj@set@cjkxspmode#1,#2:{%
+\define@key[ltj]{japaram}{jaxspmode}{%        \inhibitxspcode
+  \expandafter\ltj@set@jaxspmode#1:\relax}
+\def\ltj@set@jaxspmode#1,#2:{%
   \lowercase{\edef\ltj@temp{#2}}%
   \def\ltj@tempa{inhibit}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{0}\fi
   \def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
   \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
   \def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
-  \luatexja@tempcnta=#1\relax\luatexja@tempcntb=\ltj@temp\relax
-  \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\luatexja@tempcnta,
-    \the\luatexja@tempcntb,0,3)}}
+  \ltj@tempcnta=#1\relax\ltj@tempcntb=\ltj@temp\relax
+  \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\ltj@tempcnta,
+    \the\ltj@tempcntb,0,3)}}
 
-% asciixspmode = {<char_code>, <mode>}
+% alxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
 %    or       0        1         2      3
-\define@key[ltj]{japaram}{asciixspmode}{%        \inhibitxspcode
-  \expandafter\ltj@set@asciixspmode#1:\relax}
-\def\ltj@set@asciixspmode#1,#2:{%
+\define@key[ltj]{japaram}{alxspmode}{%        \inhibitxspcode
+  \expandafter\ltj@set@alxspmode#1:\relax}
+\def\ltj@set@alxspmode#1,#2:{%
   \lowercase{\edef\ltj@temp{#2}}%
   \def\ltj@tempa{inhibit}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{0}\fi
   \def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
   \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
   \def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
-  \luatexja@tempcnta=#1\relax\luatexja@tempcntb=\ltj@temp\relax
-  \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\luatexja@tempcnta,
-    \the\luatexja@tempcntb,0,3)}}
+  \ltj@tempcnta=#1\relax\ltj@tempcntb=\ltj@temp\relax
+  \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\ltj@tempcnta,
+    \the\ltj@tempcntb,0,3)}}
 
 % autospacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autospacing}[true]{%
@@ -193,41 +196,45 @@
   % large, small, average, both
 
 
-% jcharrange = { +-<range_number> }
-\define@key[ltj]{japaram}{jcharrange}{\expandafter\ltj@@scrange#1,,}
+% jacharrange = { +-<range_number> }
+\define@key[ltj]{japaram}{jacharrange}{\expandafter\ltj@@scrange#1,,}
 \def\ltj@@scrange#1,{%
   \edef\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
-    \luatexja@tempcnta=#1 \directlua{ltj.ext_toggle_char_range(%
-      ltj.is_global,\the\luatexja@tempcnta)}%
+    \ltj@tempcnta=#1 \directlua{ltj.ext_toggle_char_range(%
+      ltj.is_global,\the\ltj@tempcnta)}%
   \fi\next
 }
 
-
-
-
-
-\def\ltjsetparameter#1{\directlua{ltj.isglobal=''}%
+\protected\def\ltjsetparameter#1{\directlua{ltj.isglobal=''}%
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
-\def\globalltjsetparameter#1{\directlua{ltj.isglobal='global'}%
+\protected\def\ltjglobalsetparameter#1{\directlua{ltj.isglobal='global'}%
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
 
 %%%%%%%% 
+\def\ltj@@decl@array@param#1{%
+  \expandafter\let\csname ltj@@array@param/#1\endcsname=t%
+}
+\ltj@@decl@array@param{prebreakpenalty}
+\ltj@@decl@array@param{postbreakpenalty}
+\ltj@@decl@array@param{jaxspmode}
+\ltj@@decl@array@param{alxspmode}
+\ltj@@decl@array@param{kcatcode}
+\ltj@@decl@array@param{jacharrange}
+\ltj@@decl@array@param{chartorange}
 \def\ltjgetparameter#1{%
-  \lowercase{\edef\ltj@temp{#1}}\let\@next=\ltj@@getparam@one%
-  \def\ltj@tempa{prebreakpenalty}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \def\ltj@tempa{postbreakpenalty}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \def\ltj@tempa{cjkxspmode}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \def\ltj@tempa{asciixspmode}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \def\ltj@tempa{kcatcode}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \def\ltj@tempa{jcharrange}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \def\ltj@tempa{chartorange}\ifx\ltj@temp\ltj@tempa\let\@next=\ltj@@getparam@two\fi
-  \@next
+  \ifcsname ltj@@array@param/#1\endcsname
+    \expandafter\ltx@firstoftwo
+  \else
+    \expandafter\ltx@secondoftwo
+  \fi
+  {\ltj@@getparam@two{#1}}%
+  {\ltj@@getparam@one{#1}}%
 }
-\def\ltj@@getparam@one{\directlua{ltj.ext_get_parameter_unary('\ltj@temp')}}
-\def\ltj@@getparam@two#1{%
-  \luatexja@tempcnta=#1
-  \directlua{ltj.ext_get_parameter_binary('\ltj@temp', \the\luatexja@tempcnta)}
+\def\ltj@@getparam@one#1{%
+  \directlua{ltj.ext_get_parameter_unary('#1')}}
+\def\ltj@@getparam@two#1#2{\ltj@tempcnta=#2
+  \directlua{ltj.ext_get_parameter_binary('#1', \the\ltj@tempcnta)}
 }
 
 

diff --git a/src/luatexja-jfont.lua b/src/luatexja-jfont.lua
index 8f1fb33..e0b2e53 100644 (file)
--- a/src/luatexja-jfont.lua
+++ b/src/luatexja-jfont.lua
@@ -3,8 +3,8 @@ local has_attr = node.has_attribute
 local floor = math.floor
 local round = tex.round
 
-local attr_icflag = luatexbase.attributes['luatexja@icflag']
-local attr_curjfnt = luatexbase.attributes['luatexja@curjfnt']
+local attr_icflag = luatexbase.attributes['ltj@icflag']
+local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local id_glyph = node.id('glyph')
 local id_kern = node.id('kern')
 
@@ -127,7 +127,7 @@ function ltj.ext_jfontdefY() -- for horizontal font
    ltj.font_metric_table[fn].jfm=j; ltj.font_metric_table[fn].size=f.size
    tex.sprint(ltj.is_global .. '\\protected\\expandafter\\def\\csname '
               .. cstemp .. '\\endcsname'
-              .. '{\\csname luatexja@curjfnt\\endcsname=' .. fn
+              .. '{\\csname ltj@curjfnt\\endcsname=' .. fn
               .. ' \\zw=' .. tex.round(f.size*ltj.metrics[j].zw) .. 'sp'
               .. '\\zh=' .. tex.round(f.size*ltj.metrics[j].zh) .. 'sp\\relax}')
 end
@@ -203,7 +203,7 @@ end
 
 local function rgjc_get_range_setting(i) -- i: internal range number
    return floor(tex.getattribute(
-                       luatexbase.attributes['luatexja@kcat'..floor(i/31)])
+                       luatexbase.attributes['ltj@kcat'..floor(i/31)])
                     /math.pow(2, i%31))%2
 end
 ltj.int_get_range_setting = rgjc_get_range_setting
@@ -216,7 +216,7 @@ local function rgjc_is_ucs_in_japanese_char(p)
    else 
       local i=jcr_table_main[c] 
       return (floor(
-                has_attr(p, luatexbase.attributes['luatexja@kcat'..floor(i/31)])
+                has_attr(p, luatexbase.attributes['ltj@kcat'..floor(i/31)])
                 /math.pow(2, i%31))%2 ~= jcr_noncjk) 
    end
 end
@@ -229,7 +229,7 @@ function ltj.ext_toggle_char_range(g, i) -- i: external range number
       local kc
       if i>0 then kc=0 else kc=1; i=-i end
       if i>216 then i=0 end
-      local attr = luatexbase.attributes['luatexja@kcat'..floor(i/31)]
+      local attr = luatexbase.attributes['ltj@kcat'..floor(i/31)]
       local a = tex.getattribute(attr)
       local k = math.pow(2, i%31)
       tex.setattribute(g,attr,(floor(a/k/2)*2+kc)*k+a%k)

diff --git a/src/luatexja-kinsoku.tex b/src/luatexja-kinsoku.tex
index c766e52..52672e4 100644 (file)
--- a/src/luatexja-kinsoku.tex
+++ b/src/luatexja-kinsoku.tex
@@ -171,236 +171,236 @@
 \ltjsetparameter{postbreakpenalty={`｢,10000}}
 %
 % xspcode
-\ltjsetparameter{asciixspmode={`(,preonly}}
-\ltjsetparameter{asciixspmode={`),postonly}}
-\ltjsetparameter{asciixspmode={`[,preonly}}
-\ltjsetparameter{asciixspmode={`],postonly}}
-\ltjsetparameter{asciixspmode={``,preonly}}
-\ltjsetparameter{asciixspmode={`',postonly}}
-\ltjsetparameter{asciixspmode={`;,postonly}}
-\ltjsetparameter{asciixspmode={47,postonly}}
-\ltjsetparameter{asciixspmode={`.,postonly}}
+\ltjsetparameter{alxspmode={`(,preonly}}
+\ltjsetparameter{alxspmode={`),postonly}}
+\ltjsetparameter{alxspmode={`[,preonly}}
+\ltjsetparameter{alxspmode={`],postonly}}
+\ltjsetparameter{alxspmode={``,preonly}}
+\ltjsetparameter{alxspmode={`',postonly}}
+\ltjsetparameter{alxspmode={`;,postonly}}
+\ltjsetparameter{alxspmode={47,postonly}}
+\ltjsetparameter{alxspmode={`.,postonly}}
 %  for 8bit Latin
-\ltjsetparameter{asciixspmode={"80,allow}}
-\ltjsetparameter{asciixspmode={"81,allow}}
-\ltjsetparameter{asciixspmode={"82,allow}}
-\ltjsetparameter{asciixspmode={"83,allow}}
-\ltjsetparameter{asciixspmode={"84,allow}}
-\ltjsetparameter{asciixspmode={"85,allow}}
-\ltjsetparameter{asciixspmode={"86,allow}}
-\ltjsetparameter{asciixspmode={"87,allow}}
-\ltjsetparameter{asciixspmode={"88,allow}}
-\ltjsetparameter{asciixspmode={"89,allow}}
-\ltjsetparameter{asciixspmode={"8A,allow}}
-\ltjsetparameter{asciixspmode={"8B,allow}}
-\ltjsetparameter{asciixspmode={"8C,allow}}
-\ltjsetparameter{asciixspmode={"8D,allow}}
-\ltjsetparameter{asciixspmode={"8E,allow}}
-\ltjsetparameter{asciixspmode={"8F,allow}}
-\ltjsetparameter{asciixspmode={"90,allow}}
-\ltjsetparameter{asciixspmode={"91,allow}}
-\ltjsetparameter{asciixspmode={"92,allow}}
-\ltjsetparameter{asciixspmode={"93,allow}}
-\ltjsetparameter{asciixspmode={"94,allow}}
-\ltjsetparameter{asciixspmode={"95,allow}}
-\ltjsetparameter{asciixspmode={"96,allow}}
-\ltjsetparameter{asciixspmode={"97,allow}}
-\ltjsetparameter{asciixspmode={"98,allow}}
-\ltjsetparameter{asciixspmode={"99,allow}}
-\ltjsetparameter{asciixspmode={"9A,allow}}
-\ltjsetparameter{asciixspmode={"9B,allow}}
-\ltjsetparameter{asciixspmode={"9C,allow}}
-\ltjsetparameter{asciixspmode={"9D,allow}}
-\ltjsetparameter{asciixspmode={"9E,allow}}
-\ltjsetparameter{asciixspmode={"9F,allow}}
-\ltjsetparameter{asciixspmode={"A0,allow}}
-\ltjsetparameter{asciixspmode={"A1,allow}}
-\ltjsetparameter{asciixspmode={"A2,allow}}
-\ltjsetparameter{asciixspmode={"A3,allow}}
-\ltjsetparameter{asciixspmode={"A4,allow}}
-\ltjsetparameter{asciixspmode={"A5,allow}}
-\ltjsetparameter{asciixspmode={"A6,allow}}
-\ltjsetparameter{asciixspmode={"A7,allow}}
-\ltjsetparameter{asciixspmode={"A8,allow}}
-\ltjsetparameter{asciixspmode={"A9,allow}}
-\ltjsetparameter{asciixspmode={"AA,allow}}
-\ltjsetparameter{asciixspmode={"AB,allow}}
-\ltjsetparameter{asciixspmode={"AC,allow}}
-\ltjsetparameter{asciixspmode={"AD,allow}}
-\ltjsetparameter{asciixspmode={"AE,allow}}
-\ltjsetparameter{asciixspmode={"AF,allow}}
-\ltjsetparameter{asciixspmode={"B0,allow}}
-\ltjsetparameter{asciixspmode={"B1,allow}}
-\ltjsetparameter{asciixspmode={"B2,allow}}
-\ltjsetparameter{asciixspmode={"B3,allow}}
-\ltjsetparameter{asciixspmode={"B4,allow}}
-\ltjsetparameter{asciixspmode={"B5,allow}}
-\ltjsetparameter{asciixspmode={"B6,allow}}
-\ltjsetparameter{asciixspmode={"B7,allow}}
-\ltjsetparameter{asciixspmode={"B8,allow}}
-\ltjsetparameter{asciixspmode={"B9,allow}}
-\ltjsetparameter{asciixspmode={"BA,allow}}
-\ltjsetparameter{asciixspmode={"BB,allow}}
-\ltjsetparameter{asciixspmode={"BC,allow}}
-\ltjsetparameter{asciixspmode={"BD,allow}}
-\ltjsetparameter{asciixspmode={"BE,allow}}
-\ltjsetparameter{asciixspmode={"BF,allow}}
-\ltjsetparameter{asciixspmode={"C0,allow}}
-\ltjsetparameter{asciixspmode={"C1,allow}}
-\ltjsetparameter{asciixspmode={"C2,allow}}
-\ltjsetparameter{asciixspmode={"C3,allow}}
-\ltjsetparameter{asciixspmode={"C4,allow}}
-\ltjsetparameter{asciixspmode={"C5,allow}}
-\ltjsetparameter{asciixspmode={"C6,allow}}
-\ltjsetparameter{asciixspmode={"C7,allow}}
-\ltjsetparameter{asciixspmode={"C8,allow}}
-\ltjsetparameter{asciixspmode={"C9,allow}}
-\ltjsetparameter{asciixspmode={"CA,allow}}
-\ltjsetparameter{asciixspmode={"CB,allow}}
-\ltjsetparameter{asciixspmode={"CC,allow}}
-\ltjsetparameter{asciixspmode={"CD,allow}}
-\ltjsetparameter{asciixspmode={"CE,allow}}
-\ltjsetparameter{asciixspmode={"CF,allow}}
-\ltjsetparameter{asciixspmode={"D0,allow}}
-\ltjsetparameter{asciixspmode={"D1,allow}}
-\ltjsetparameter{asciixspmode={"D2,allow}}
-\ltjsetparameter{asciixspmode={"D3,allow}}
-\ltjsetparameter{asciixspmode={"D4,allow}}
-\ltjsetparameter{asciixspmode={"D5,allow}}
-\ltjsetparameter{asciixspmode={"D6,allow}}
-\ltjsetparameter{asciixspmode={"D7,allow}}
-\ltjsetparameter{asciixspmode={"D8,allow}}
-\ltjsetparameter{asciixspmode={"D9,allow}}
-\ltjsetparameter{asciixspmode={"DA,allow}}
-\ltjsetparameter{asciixspmode={"DB,allow}}
-\ltjsetparameter{asciixspmode={"DC,allow}}
-\ltjsetparameter{asciixspmode={"DD,allow}}
-\ltjsetparameter{asciixspmode={"DE,allow}}
-\ltjsetparameter{asciixspmode={"DF,allow}}
-\ltjsetparameter{asciixspmode={"E0,allow}}
-\ltjsetparameter{asciixspmode={"E1,allow}}
-\ltjsetparameter{asciixspmode={"E2,allow}}
-\ltjsetparameter{asciixspmode={"E3,allow}}
-\ltjsetparameter{asciixspmode={"E4,allow}}
-\ltjsetparameter{asciixspmode={"E5,allow}}
-\ltjsetparameter{asciixspmode={"E6,allow}}
-\ltjsetparameter{asciixspmode={"E7,allow}}
-\ltjsetparameter{asciixspmode={"E8,allow}}
-\ltjsetparameter{asciixspmode={"E9,allow}}
-\ltjsetparameter{asciixspmode={"EA,allow}}
-\ltjsetparameter{asciixspmode={"EB,allow}}
-\ltjsetparameter{asciixspmode={"EC,allow}}
-\ltjsetparameter{asciixspmode={"ED,allow}}
-\ltjsetparameter{asciixspmode={"EE,allow}}
-\ltjsetparameter{asciixspmode={"EF,allow}}
-\ltjsetparameter{asciixspmode={"F0,allow}}
-\ltjsetparameter{asciixspmode={"F1,allow}}
-\ltjsetparameter{asciixspmode={"F2,allow}}
-\ltjsetparameter{asciixspmode={"F3,allow}}
-\ltjsetparameter{asciixspmode={"F4,allow}}
-\ltjsetparameter{asciixspmode={"F5,allow}}
-\ltjsetparameter{asciixspmode={"F6,allow}}
-\ltjsetparameter{asciixspmode={"F7,allow}}
-\ltjsetparameter{asciixspmode={"F8,allow}}
-\ltjsetparameter{asciixspmode={"F9,allow}}
-\ltjsetparameter{asciixspmode={"FA,allow}}
-\ltjsetparameter{asciixspmode={"FB,allow}}
-\ltjsetparameter{asciixspmode={"FC,allow}}
-\ltjsetparameter{asciixspmode={"FD,allow}}
-\ltjsetparameter{asciixspmode={"FE,allow}}
-\ltjsetparameter{asciixspmode={"FF,allow}}
+\ltjsetparameter{alxspmode={"80,allow}}
+\ltjsetparameter{alxspmode={"81,allow}}
+\ltjsetparameter{alxspmode={"82,allow}}
+\ltjsetparameter{alxspmode={"83,allow}}
+\ltjsetparameter{alxspmode={"84,allow}}
+\ltjsetparameter{alxspmode={"85,allow}}
+\ltjsetparameter{alxspmode={"86,allow}}
+\ltjsetparameter{alxspmode={"87,allow}}
+\ltjsetparameter{alxspmode={"88,allow}}
+\ltjsetparameter{alxspmode={"89,allow}}
+\ltjsetparameter{alxspmode={"8A,allow}}
+\ltjsetparameter{alxspmode={"8B,allow}}
+\ltjsetparameter{alxspmode={"8C,allow}}
+\ltjsetparameter{alxspmode={"8D,allow}}
+\ltjsetparameter{alxspmode={"8E,allow}}
+\ltjsetparameter{alxspmode={"8F,allow}}
+\ltjsetparameter{alxspmode={"90,allow}}
+\ltjsetparameter{alxspmode={"91,allow}}
+\ltjsetparameter{alxspmode={"92,allow}}
+\ltjsetparameter{alxspmode={"93,allow}}
+\ltjsetparameter{alxspmode={"94,allow}}
+\ltjsetparameter{alxspmode={"95,allow}}
+\ltjsetparameter{alxspmode={"96,allow}}
+\ltjsetparameter{alxspmode={"97,allow}}
+\ltjsetparameter{alxspmode={"98,allow}}
+\ltjsetparameter{alxspmode={"99,allow}}
+\ltjsetparameter{alxspmode={"9A,allow}}
+\ltjsetparameter{alxspmode={"9B,allow}}
+\ltjsetparameter{alxspmode={"9C,allow}}
+\ltjsetparameter{alxspmode={"9D,allow}}
+\ltjsetparameter{alxspmode={"9E,allow}}
+\ltjsetparameter{alxspmode={"9F,allow}}
+\ltjsetparameter{alxspmode={"A0,allow}}
+\ltjsetparameter{alxspmode={"A1,allow}}
+\ltjsetparameter{alxspmode={"A2,allow}}
+\ltjsetparameter{alxspmode={"A3,allow}}
+\ltjsetparameter{alxspmode={"A4,allow}}
+\ltjsetparameter{alxspmode={"A5,allow}}
+\ltjsetparameter{alxspmode={"A6,allow}}
+\ltjsetparameter{alxspmode={"A7,allow}}
+\ltjsetparameter{alxspmode={"A8,allow}}
+\ltjsetparameter{alxspmode={"A9,allow}}
+\ltjsetparameter{alxspmode={"AA,allow}}
+\ltjsetparameter{alxspmode={"AB,allow}}
+\ltjsetparameter{alxspmode={"AC,allow}}
+\ltjsetparameter{alxspmode={"AD,allow}}
+\ltjsetparameter{alxspmode={"AE,allow}}
+\ltjsetparameter{alxspmode={"AF,allow}}
+\ltjsetparameter{alxspmode={"B0,allow}}
+\ltjsetparameter{alxspmode={"B1,allow}}
+\ltjsetparameter{alxspmode={"B2,allow}}
+\ltjsetparameter{alxspmode={"B3,allow}}
+\ltjsetparameter{alxspmode={"B4,allow}}
+\ltjsetparameter{alxspmode={"B5,allow}}
+\ltjsetparameter{alxspmode={"B6,allow}}
+\ltjsetparameter{alxspmode={"B7,allow}}
+\ltjsetparameter{alxspmode={"B8,allow}}
+\ltjsetparameter{alxspmode={"B9,allow}}
+\ltjsetparameter{alxspmode={"BA,allow}}
+\ltjsetparameter{alxspmode={"BB,allow}}
+\ltjsetparameter{alxspmode={"BC,allow}}
+\ltjsetparameter{alxspmode={"BD,allow}}
+\ltjsetparameter{alxspmode={"BE,allow}}
+\ltjsetparameter{alxspmode={"BF,allow}}
+\ltjsetparameter{alxspmode={"C0,allow}}
+\ltjsetparameter{alxspmode={"C1,allow}}
+\ltjsetparameter{alxspmode={"C2,allow}}
+\ltjsetparameter{alxspmode={"C3,allow}}
+\ltjsetparameter{alxspmode={"C4,allow}}
+\ltjsetparameter{alxspmode={"C5,allow}}
+\ltjsetparameter{alxspmode={"C6,allow}}
+\ltjsetparameter{alxspmode={"C7,allow}}
+\ltjsetparameter{alxspmode={"C8,allow}}
+\ltjsetparameter{alxspmode={"C9,allow}}
+\ltjsetparameter{alxspmode={"CA,allow}}
+\ltjsetparameter{alxspmode={"CB,allow}}
+\ltjsetparameter{alxspmode={"CC,allow}}
+\ltjsetparameter{alxspmode={"CD,allow}}
+\ltjsetparameter{alxspmode={"CE,allow}}
+\ltjsetparameter{alxspmode={"CF,allow}}
+\ltjsetparameter{alxspmode={"D0,allow}}
+\ltjsetparameter{alxspmode={"D1,allow}}
+\ltjsetparameter{alxspmode={"D2,allow}}
+\ltjsetparameter{alxspmode={"D3,allow}}
+\ltjsetparameter{alxspmode={"D4,allow}}
+\ltjsetparameter{alxspmode={"D5,allow}}
+\ltjsetparameter{alxspmode={"D6,allow}}
+\ltjsetparameter{alxspmode={"D7,allow}}
+\ltjsetparameter{alxspmode={"D8,allow}}
+\ltjsetparameter{alxspmode={"D9,allow}}
+\ltjsetparameter{alxspmode={"DA,allow}}
+\ltjsetparameter{alxspmode={"DB,allow}}
+\ltjsetparameter{alxspmode={"DC,allow}}
+\ltjsetparameter{alxspmode={"DD,allow}}
+\ltjsetparameter{alxspmode={"DE,allow}}
+\ltjsetparameter{alxspmode={"DF,allow}}
+\ltjsetparameter{alxspmode={"E0,allow}}
+\ltjsetparameter{alxspmode={"E1,allow}}
+\ltjsetparameter{alxspmode={"E2,allow}}
+\ltjsetparameter{alxspmode={"E3,allow}}
+\ltjsetparameter{alxspmode={"E4,allow}}
+\ltjsetparameter{alxspmode={"E5,allow}}
+\ltjsetparameter{alxspmode={"E6,allow}}
+\ltjsetparameter{alxspmode={"E7,allow}}
+\ltjsetparameter{alxspmode={"E8,allow}}
+\ltjsetparameter{alxspmode={"E9,allow}}
+\ltjsetparameter{alxspmode={"EA,allow}}
+\ltjsetparameter{alxspmode={"EB,allow}}
+\ltjsetparameter{alxspmode={"EC,allow}}
+\ltjsetparameter{alxspmode={"ED,allow}}
+\ltjsetparameter{alxspmode={"EE,allow}}
+\ltjsetparameter{alxspmode={"EF,allow}}
+\ltjsetparameter{alxspmode={"F0,allow}}
+\ltjsetparameter{alxspmode={"F1,allow}}
+\ltjsetparameter{alxspmode={"F2,allow}}
+\ltjsetparameter{alxspmode={"F3,allow}}
+\ltjsetparameter{alxspmode={"F4,allow}}
+\ltjsetparameter{alxspmode={"F5,allow}}
+\ltjsetparameter{alxspmode={"F6,allow}}
+\ltjsetparameter{alxspmode={"F7,allow}}
+\ltjsetparameter{alxspmode={"F8,allow}}
+\ltjsetparameter{alxspmode={"F9,allow}}
+\ltjsetparameter{alxspmode={"FA,allow}}
+\ltjsetparameter{alxspmode={"FB,allow}}
+\ltjsetparameter{alxspmode={"FC,allow}}
+\ltjsetparameter{alxspmode={"FD,allow}}
+\ltjsetparameter{alxspmode={"FE,allow}}
+\ltjsetparameter{alxspmode={"FF,allow}}
 %
 % inhibitxspcode
-\ltjsetparameter{cjkxspmode={`、,postonly}}
-\ltjsetparameter{cjkxspmode={`。,postonly}}
-\ltjsetparameter{cjkxspmode={`，,postonly}}
-\ltjsetparameter{cjkxspmode={`．,postonly}}
-\ltjsetparameter{cjkxspmode={`；,postonly}}
-\ltjsetparameter{cjkxspmode={`？,postonly}}
-\ltjsetparameter{cjkxspmode={`）,postonly}}
-\ltjsetparameter{cjkxspmode={`（,preonly}}
-\ltjsetparameter{cjkxspmode={`］,postonly}}
-\ltjsetparameter{cjkxspmode={`［,preonly}}
-\ltjsetparameter{cjkxspmode={`｝,postonly}}
-\ltjsetparameter{cjkxspmode={`｛,preonly}}
-\ltjsetparameter{cjkxspmode={`‘,preonly}}
-\ltjsetparameter{cjkxspmode={`’,postonly}}
-\ltjsetparameter{cjkxspmode={`“,preonly}}
-\ltjsetparameter{cjkxspmode={`”,postonly}}
-\ltjsetparameter{cjkxspmode={`〔,preonly}}
-\ltjsetparameter{cjkxspmode={`〕,postonly}}
-\ltjsetparameter{cjkxspmode={`〈,preonly}}
-\ltjsetparameter{cjkxspmode={`〉,postonly}}
-\ltjsetparameter{cjkxspmode={`《,preonly}}
-\ltjsetparameter{cjkxspmode={`》,postonly}}
-\ltjsetparameter{cjkxspmode={`「,preonly}}
-\ltjsetparameter{cjkxspmode={`」,postonly}}
-\ltjsetparameter{cjkxspmode={`『,preonly}}
-\ltjsetparameter{cjkxspmode={`』,postonly}}
-\ltjsetparameter{cjkxspmode={`【,preonly}}
-\ltjsetparameter{cjkxspmode={`】,postonly}}
-\ltjsetparameter{cjkxspmode={`—,inhibit}}% U+2014 EM DASH
-\ltjsetparameter{cjkxspmode={`―,inhibit}}% U+2015 HORIZONTAL BAR
-\ltjsetparameter{cjkxspmode={`〜,inhibit}}% U+301C WAVE DASH
-\ltjsetparameter{cjkxspmode={`～,inhibit}}% U+FF5E FULLWIDTH TILDE
-\ltjsetparameter{cjkxspmode={`…,inhibit}}
-\ltjsetparameter{cjkxspmode={`¥,inhibit}}% U+00A5 YEN SIGN
-\ltjsetparameter{cjkxspmode={`￥,inhibit}}% U+FFE5 FULLWIDTH YEN SIGN
-\ltjsetparameter{cjkxspmode={`°,postonly}}
-\ltjsetparameter{cjkxspmode={`′,postonly}}
-\ltjsetparameter{cjkxspmode={`″,postonly}}
+\ltjsetparameter{jaxspmode={`、,postonly}}
+\ltjsetparameter{jaxspmode={`。,postonly}}
+\ltjsetparameter{jaxspmode={`，,postonly}}
+\ltjsetparameter{jaxspmode={`．,postonly}}
+\ltjsetparameter{jaxspmode={`；,postonly}}
+\ltjsetparameter{jaxspmode={`？,postonly}}
+\ltjsetparameter{jaxspmode={`）,postonly}}
+\ltjsetparameter{jaxspmode={`（,preonly}}
+\ltjsetparameter{jaxspmode={`］,postonly}}
+\ltjsetparameter{jaxspmode={`［,preonly}}
+\ltjsetparameter{jaxspmode={`｝,postonly}}
+\ltjsetparameter{jaxspmode={`｛,preonly}}
+\ltjsetparameter{jaxspmode={`‘,preonly}}
+\ltjsetparameter{jaxspmode={`’,postonly}}
+\ltjsetparameter{jaxspmode={`“,preonly}}
+\ltjsetparameter{jaxspmode={`”,postonly}}
+\ltjsetparameter{jaxspmode={`〔,preonly}}
+\ltjsetparameter{jaxspmode={`〕,postonly}}
+\ltjsetparameter{jaxspmode={`〈,preonly}}
+\ltjsetparameter{jaxspmode={`〉,postonly}}
+\ltjsetparameter{jaxspmode={`《,preonly}}
+\ltjsetparameter{jaxspmode={`》,postonly}}
+\ltjsetparameter{jaxspmode={`「,preonly}}
+\ltjsetparameter{jaxspmode={`」,postonly}}
+\ltjsetparameter{jaxspmode={`『,preonly}}
+\ltjsetparameter{jaxspmode={`』,postonly}}
+\ltjsetparameter{jaxspmode={`【,preonly}}
+\ltjsetparameter{jaxspmode={`】,postonly}}
+\ltjsetparameter{jaxspmode={`—,inhibit}}% U+2014 EM DASH
+\ltjsetparameter{jaxspmode={`―,inhibit}}% U+2015 HORIZONTAL BAR
+\ltjsetparameter{jaxspmode={`〜,inhibit}}% U+301C WAVE DASH
+\ltjsetparameter{jaxspmode={`～,inhibit}}% U+FF5E FULLWIDTH TILDE
+\ltjsetparameter{jaxspmode={`…,inhibit}}
+\ltjsetparameter{jaxspmode={`¥,inhibit}}% U+00A5 YEN SIGN
+\ltjsetparameter{jaxspmode={`￥,inhibit}}% U+FFE5 FULLWIDTH YEN SIGN
+\ltjsetparameter{jaxspmode={`°,postonly}}
+\ltjsetparameter{jaxspmode={`′,postonly}}
+\ltjsetparameter{jaxspmode={`″,postonly}}
 %
 % inhibitxspcode  JIS X 0213
 %
-\ltjsetparameter{cjkxspmode={`⦅,preonly}}
-\ltjsetparameter{cjkxspmode={`⦆,postonly}}
-\ltjsetparameter{cjkxspmode={`｟,preonly}}
-\ltjsetparameter{cjkxspmode={`｠,postonly}}
-\ltjsetparameter{cjkxspmode={`〘,preonly}}
-\ltjsetparameter{cjkxspmode={`〙,postonly}}
-\ltjsetparameter{cjkxspmode={`〖,preonly}}
-\ltjsetparameter{cjkxspmode={`〗,postonly}}
-\ltjsetparameter{cjkxspmode={`«,preonly}}
-\ltjsetparameter{cjkxspmode={`»,postonly}}
-\ltjsetparameter{cjkxspmode={`〝,preonly}}
-\ltjsetparameter{cjkxspmode={`〟,postonly}}
-\ltjsetparameter{cjkxspmode={`‼,postonly}}
-\ltjsetparameter{cjkxspmode={`⁇,postonly}}
-\ltjsetparameter{cjkxspmode={`⁈,postonly}}
-\ltjsetparameter{cjkxspmode={`⁉,postonly}}
-\ltjsetparameter{cjkxspmode={`¡,preonly}}
-\ltjsetparameter{cjkxspmode={`¿,preonly}}
-\ltjsetparameter{cjkxspmode={`ª,postonly}}
-\ltjsetparameter{cjkxspmode={`º,postonly}}
-\ltjsetparameter{cjkxspmode={`¹,postonly}}
-\ltjsetparameter{cjkxspmode={`²,postonly}}
-\ltjsetparameter{cjkxspmode={`³,postonly}}
-\ltjsetparameter{cjkxspmode={`€,preonly}}
+\ltjsetparameter{jaxspmode={`⦅,preonly}}
+\ltjsetparameter{jaxspmode={`⦆,postonly}}
+\ltjsetparameter{jaxspmode={`｟,preonly}}
+\ltjsetparameter{jaxspmode={`｠,postonly}}
+\ltjsetparameter{jaxspmode={`〘,preonly}}
+\ltjsetparameter{jaxspmode={`〙,postonly}}
+\ltjsetparameter{jaxspmode={`〖,preonly}}
+\ltjsetparameter{jaxspmode={`〗,postonly}}
+\ltjsetparameter{jaxspmode={`«,preonly}}
+\ltjsetparameter{jaxspmode={`»,postonly}}
+\ltjsetparameter{jaxspmode={`〝,preonly}}
+\ltjsetparameter{jaxspmode={`〟,postonly}}
+\ltjsetparameter{jaxspmode={`‼,postonly}}
+\ltjsetparameter{jaxspmode={`⁇,postonly}}
+\ltjsetparameter{jaxspmode={`⁈,postonly}}
+\ltjsetparameter{jaxspmode={`⁉,postonly}}
+\ltjsetparameter{jaxspmode={`¡,preonly}}
+\ltjsetparameter{jaxspmode={`¿,preonly}}
+\ltjsetparameter{jaxspmode={`ª,postonly}}
+\ltjsetparameter{jaxspmode={`º,postonly}}
+\ltjsetparameter{jaxspmode={`¹,postonly}}
+\ltjsetparameter{jaxspmode={`²,postonly}}
+\ltjsetparameter{jaxspmode={`³,postonly}}
+\ltjsetparameter{jaxspmode={`€,preonly}}
 %
 % inhibitxspcode  JIS X 0212
 %
-%\ltjsetparameter{cjkxspmode={`¡,postonly}}
-%\ltjsetparameter{cjkxspmode={`¿,postonly}}
-%\ltjsetparameter{cjkxspmode={`º,postonly}}
-%\ltjsetparameter{cjkxspmode={`ª,postonly}}
-\ltjsetparameter{cjkxspmode={`™,postonly}}
+%\ltjsetparameter{jaxspmode={`¡,postonly}}
+%\ltjsetparameter{jaxspmode={`¿,postonly}}
+%\ltjsetparameter{jaxspmode={`º,postonly}}
+%\ltjsetparameter{jaxspmode={`ª,postonly}}
+\ltjsetparameter{jaxspmode={`™,postonly}}
 %
 % inhibitxspcode  半角片仮名
 %
-\ltjsetparameter{cjkxspmode={`｡,postonly}}
-\ltjsetparameter{cjkxspmode={`､,postonly}}
-\ltjsetparameter{cjkxspmode={`｢,preonly}}
-\ltjsetparameter{cjkxspmode={`｣,postonly}}
+\ltjsetparameter{jaxspmode={`｡,postonly}}
+\ltjsetparameter{jaxspmode={`､,postonly}}
+\ltjsetparameter{jaxspmode={`｢,preonly}}
+\ltjsetparameter{jaxspmode={`｣,postonly}}
 
 \endinput 
 cat `locate ukinsoku.tex` \
   | sed "s/prebreakpenalty\(.*\)=\([0-9]*\)/ltjsetparameter{prebreakpenalty={\1,\2}}/" \
   | sed "s/postbreakpenalty\(.*\)=\([0-9]*\)/ltjsetparameter{postbreakpenalty={\1,\2}}/" \
-  | sed "s/inhibitxspcode\(.*\)=0/ltjsetparameter{cjkxspmode={\1,inhibit}}/" \
-  | sed "s/inhibitxspcode\(.*\)=1/ltjsetparameter{cjkxspmode={\1,postonly}}/" \
-  | sed "s/inhibitxspcode\(.*\)=2/ltjsetparameter{cjkxspmode={\1,preonly}}/" \
-  | sed "s/inhibitxspcode\(.*\)=3/ltjsetparameter{cjkxspmode={\1,allow}}/" \
-  | sed "s/xspcode\(.*\)=0/ltjsetparameter{asciixspmode={\1,inhibit}}/" \
-  | sed "s/xspcode\(.*\)=2/ltjsetparameter{asciixspmode={\1,postonly}}/" \
-  | sed "s/xspcode\(.*\)=1/ltjsetparameter{asciixspmode={\1,preonly}}/" \
-  | sed "s/xspcode\(.*\)=3/ltjsetparameter{asciixspmode={\1,allow}}/"  > luatexja-kinsoku.tex
\ No newline at end of file
+  | sed "s/inhibitxspcode\(.*\)=0/ltjsetparameter{jaxspmode={\1,inhibit}}/" \
+  | sed "s/inhibitxspcode\(.*\)=1/ltjsetparameter{jaxspmode={\1,postonly}}/" \
+  | sed "s/inhibitxspcode\(.*\)=2/ltjsetparameter{jaxspmode={\1,preonly}}/" \
+  | sed "s/inhibitxspcode\(.*\)=3/ltjsetparameter{jaxspmode={\1,allow}}/" \
+  | sed "s/xspcode\(.*\)=0/ltjsetparameter{alxspmode={\1,inhibit}}/" \
+  | sed "s/xspcode\(.*\)=2/ltjsetparameter{alxspmode={\1,postonly}}/" \
+  | sed "s/xspcode\(.*\)=1/ltjsetparameter{alxspmode={\1,preonly}}/" \
+  | sed "s/xspcode\(.*\)=3/ltjsetparameter{alxspmode={\1,allow}}/"  > luatexja-kinsoku.tex
\ No newline at end of file

diff --git a/src/luatexja-plain.tex b/src/luatexja-plain.tex
index 435e0d4..2c70ab0 100644 (file)
--- a/src/luatexja-plain.tex
+++ b/src/luatexja-plain.tex
@@ -12,28 +12,28 @@
 \mc
 \ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt, 
   xkanjiskip=.25\zw plus 1pt minus 1pt,
-  autospacing, autoxspacing, jcharrange={-1}, 
-  yabaselineshift=0pt, ykbaselineshift=0pt,
+  autospacing, autoxspacing, jacharrange={-1}, 
+  yalbaselineshift=0pt, yjabaselineshift=0pt,
   jcharwidowpenalty=500, differentjfm=average
 }
 
 \input luatexja-kinsoku.tex
 
-\luatexja@tempcnta="2000%"
-\loop\ifnum\luatexja@tempcnta<"2070%"
-  \ltjsetparameter{kcatcode={\luatexja@tempcnta,1}}%
-  \advance\luatexja@tempcnta by1
+\ltj@tempcnta="2000%"
+\loop\ifnum\ltj@tempcnta<"2070%"
+  \ltjsetparameter{kcatcode={\ltj@tempcnta,1}}%
+  \advance\ltj@tempcnta by1
 \repeat
 
-\luatexja@tempcnta="3000%"
-\loop\ifnum\luatexja@tempcnta<"3040%"
-  \ltjsetparameter{kcatcode={\luatexja@tempcnta,1}}%
-  \advance\luatexja@tempcnta by1
+\ltj@tempcnta="3000%"
+\loop\ifnum\ltj@tempcnta<"3040%"
+  \ltjsetparameter{kcatcode={\ltj@tempcnta,1}}%
+  \advance\ltj@tempcnta by1
 \repeat
 
-\luatexja@tempcnta="FF00%"
-\loop\ifnum\luatexja@tempcnta<"FFF0%"
-  \ltjsetparameter{kcatcode={\luatexja@tempcnta,1}}%
-  \advance\luatexja@tempcnta by1
+\ltj@tempcnta="FF00%"
+\loop\ifnum\ltj@tempcnta<"FFF0%"
+  \ltjsetparameter{kcatcode={\ltj@tempcnta,1}}%
+  \advance\ltj@tempcnta by1
 \repeat
 \endinput
\ No newline at end of file

diff --git a/src/luatexja-xkanji.lua b/src/luatexja-xkanji.lua
index 8d224b5..671daa0 100644 (file)
--- a/src/luatexja-xkanji.lua
+++ b/src/luatexja-xkanji.lua
@@ -23,8 +23,8 @@ local id_adjust = node.id('adjust')
 local id_math = node.id('math')
 local id_whatsit = node.id('whatsit')
 
-local attr_icflag = luatexbase.attributes['luatexja@icflag']
-local attr_curjfnt = luatexbase.attributes['luatexja@curjfnt']
+local attr_icflag = luatexbase.attributes['ltj@icflag']
+local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 
 local kanji_skip
 local xkanji_skip

diff --git a/test/test01-noembed.pdf b/test/test01-noembed.pdf
index 9be4da3..9795be3 100644 (file)
Binary files a/test/test01-noembed.pdf and b/test/test01-noembed.pdf differ

diff --git a/test/test01-noembed.tex b/test/test01-noembed.tex
index e157cf0..6a4b14a 100644 (file)
--- a/test/test01-noembed.tex
+++ b/test/test01-noembed.tex
@@ -37,8 +37,8 @@
 {\tentt sups} feature: 注１注1→{\jissups 注１注1}\hfil\break
 ↑文字クラスが変わらないので幅も変わらない．
 
-{\tentt liga} feature: ã\81\8bã\82\9aã\81\8dã\82\9aã\81\8fã\82\9aã\81\91ã\82\9aã\81\93ã\82\9aâ\86\92{\jisliga ã\81\8bã\82\9aã\81\8dã\82\9aã\81\8fã\82\9aã\81\91ã\82\9aã\81\93ã\82\9a}\hfil\break
-↑合字用の半濁点（{\tentt U+309A}）を用いれば成功する．単体用（{\tentt U+309C}）では失敗する．%比較：{\tmiliga か゜き゜く゜け゜こ゜}
+{\tentt liga} feature: ã\81\8bã\82\9cã\81\8dã\82\9cã\81\8fã\82\9cã\81\91ã\82\9cã\81\93ã\82\9câ\86\92{\jisliga ã\81\8bã\82\9cã\81\8dã\82\9cã\81\8fã\82\9cã\81\91ã\82\9cã\81\93ã\82\9c}\hfil\break
+↑なぜかうまくいかない．%比較：{\tmiliga か゜き゜く゜け゜こ゜}
 
 {\tentt vert} feature: あ（㌢㍍），い→{\jisvert あ（㌢㍍），い}\hfil\break
 ↑縦組み時に気にすればいいか．

diff --git a/test/test01.log b/test/test01.log
deleted file mode 100644 (file)
index 17bb93c..0000000
--- a/test/test01.log
+++ /dev/null
@@ -1,253 +0,0 @@
-This is LuaTeX, Version beta-0.66.0-2011041707 (rev 4141)  (format=luatex 2011.4.16)  30 APR 2011 16:23
- restricted \write18 enabled.
-**test01
-(./test01.tex (c:/w32tex/share/texmf-local/tex/luatexja/luatexja-core.sty
-(c:/w32tex/share/texmf/tex/luatex/luaotfload/luaotfload.sty
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase.sty
-Package: luatexbase 2010/10/06 v0.3 Module utilities for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
-Package ifluatex Info: LuaTeX detected.
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-compat.sty
-Package: luatexbase-compat 2010/10/10 v0.3 Compatibility tools for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-))
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-loader.sty
-Package: luatexbase-loader 2010/10/10 v0.3 Lua module loader for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-compat.sty)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase.loader.lua))
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-regs.sty
-Package: luatexbase-regs 2010/10/10 v0.3 Registers allocation for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-))
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-attr.sty
-Package: luatexbase-attr 2010/10/10 v0.3 Attributes allocation for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-compat.sty)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-loader.sty)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/attr.lua))
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-cctb.sty
-Package: luatexbase-cctb 2010/10/10 v0.3 Catcodetable allocation for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-loader.sty)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/cctb.lua)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-compat.sty)
-\lltxb@catcodetable@alloc=\count277
-\@tempcnta=\count278
-\@tempcntb=\count279
-\CatcodeTableIniTeX=\luatexcatcodetable1
-\CatcodeTableString=\luatexcatcodetable2
-\CatcodeTableOther=\luatexcatcodetable3
-\CatcodeTableLaTeX=\luatexcatcodetable4
-\CatcodeTableLaTeXAtLetter=\luatexcatcodetable5
-\CatcodeTableExpl=\luatexcatcodetable6
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-mcb.sty
-Package: luatexbase-mcb 2010/10/10 v0.3 Callback management for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-modutils.sty
-Package: luatexbase-modutils 2010/10/10 v0.3 Module utilities for LuaTeX
-(c:/w32tex/share/texmf/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-loader.sty)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/modutils.lua))
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/mcb.lua)
-Lua module: luatexbase-mcb 2010/05/12 0.2 register several functions in a callb
-ack
-)
-(c:/w32tex/share/texmf/tex/luatex/luatexbase/luatexbase-modutils.sty))
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs.lua)
-Lua module: lualibs 2010/06/28 0.95 Lua additional functions.
-
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-string.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-lpeg.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-boolean.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-number.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-math.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-table.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-aux.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-io.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-os.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-file.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-md5.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-dir.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-unicode.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-utils.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-dimen.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-url.lua)
-(c:/w32tex/share/texmf/tex/luatex/lualibs/lualibs-set.lua)
-(c:/w32tex/share/texmf/tex/luatex/luaotfload/luaotfload.lua)
-Lua module: luaotfload 2010/11/11 1.21 OpenType layout system.
-
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-luat-
-dum.lua.(using cache: C:/w32tex/share/ctxdir/luatex-cache/generic)
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-luat-
-ovr.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-data-
-con.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-ini.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-node-
-dum.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-node-
-inj.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-tfm.lua.
-luatexbase.attributes["otfl@state"] = 1
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-cid.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-ott.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-map.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-otf.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-otd.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-oti.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-otb.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-otn.lua.
-luatexbase.attributes["otfl@markbase"] = 2
-luatexbase.attributes["otfl@markmark"] = 3
-luatexbase.attributes["otfl@markdone"] = 4
-luatexbase.attributes["otfl@cursbase"] = 5
-luatexbase.attributes["otfl@curscurs"] = 6
-luatexbase.attributes["otfl@cursdone"] = 7
-luatexbase.attributes["otfl@kernpair"] = 8
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-ota.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-otc.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-def.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-xtx.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-dum.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-nms.lua.
-luaotfload: loading file c:/w32tex/share/texmf/tex/luatex/luaotfload/otfl-font-
-clr.lua.
-Module luatexbase-mcb info: inserting 'luaotfload.pre_linebreak_filter'
-(luatexbase-mcb)            at position 1 in 'pre_linebreak_filter'
-Module luatexbase-mcb info: inserting 'luaotfload.hpack_filter'
-(luatexbase-mcb)            at position 1 in 'hpack_filter'
-Module luatexbase-mcb info: resetting callback 'define_font'
-Module luatexbase-mcb info: inserting 'luaotfload.define_font'
-(luatexbase-mcb)            at position 1 in 'define_font'
-Module luatexbase-mcb info: inserting 'luaotfload.find_vf_file'
-(luatexbase-mcb)            at position 1 in 'find_vf_file'
-) (c:/w32tex/share/texmf/tex/generic/xkeyval/xkeyval.tex
-\XKV@toks=\toks13
-\XKV@tempa@toks=\toks14
-\XKV@depth=\count280
-
-2008/08/13 v2.6a key=value parser (HA)
-(c:/w32tex/share/texmf/tex/generic/xkeyval/xkvtxhdr.tex
-2005/02/22 v1.1 xkeyval TeX header (HA))
-(c:/w32tex/share/texmf/tex/generic/xkeyval/keyval.tex))
-(c:/w32tex/share/texmf/tex/generic/oberdiek/infwarerr.sty
-Package: infwarerr 2010/04/08 v1.3 Providing info/warning/message (HO)
-)
-\luatexja@tempcnta=\count281
-\luatexja@tempcntb=\count282
-\luatexja@tempcntc=\count283
-\luatexja@tempdima=\dimen256
-\luatexja@autospc=\count284
-\luatexja@autoxspc=\count285
-\jcharwidowpenalty=\count286
-\kanjiskip=\skip256
-\xkanjiskip=\skip257
-\zw=\dimen257
-\zh=\dimen258
-\jQ=\dimen259
-\jH=\dimen260
-\luatexja@curjfnt=\luatexattribute9
-\luatexja@charclass=\luatexattribute10
-\luatexja@yablshift=\luatexattribute11
-\luatexja@ykblshift=\luatexattribute12
-\luatexja@icflag=\luatexattribute13
-\luatexja@japanese=\language87
-
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-rmlgbm.lua)
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-rmlgbm-data.lua)
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-jfont.lua)
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-core.lua)
-Module luatexbase-mcb info: inserting 'ltj.process_input_buffer'
-(luatexbase-mcb)            at position 1 in 'process_input_buffer'
-Module luatexbase-mcb info: inserting 'ltj.hpack_filter_pre'
-(luatexbase-mcb)            at position 1 in 'hpack_filter'
-Module luatexbase-mcb info: inserting 'ltj.hyphenate'
-(luatexbase-mcb)            at position 1 in 'hyphenate'
-Module luatexbase-mcb info: inserting 'ltj.pre_linebreak_filter'
-(luatexbase-mcb)            at position 2 in 'pre_linebreak_filter'
-Module luatexbase-mcb info: inserting 'ltj.hpack_filter'
-(luatexbase-mcb)            at position 2 in 'hpack_filter'
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-xkanji.lua)
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-core-aux.lua)
-\luatexja@kcat0=\luatexattribute14
-\luatexja@kcat1=\luatexattribute15
-\luatexja@kcat2=\luatexattribute16
-\luatexja@kcat3=\luatexattribute17
-\luatexja@kcat4=\luatexattribute18
-\luatexja@kcat5=\luatexattribute19
-\luatexja@kcat6=\luatexattribute20
-\ltj@@stack=\count287
-\ltj@@group@level=\count288
-
-plain format: loading luatexja-plain.tex
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-plain.tex
-(c:/w32tex/share/texmf-local/tex/luatexja/jfm-ujis.lua)
-(c:/w32tex/share/texmf-local/tex/luatexja/luatexja-kinsoku.tex)))
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)(load: C:/w32tex/share/ctxdir/luatex-cache/generic/fonts/otf/temp-ipaexm.lu
-a)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-luaotfload | load font: auto-selecting default features for script: dflt (was l
-atn)
-(c:/w32tex/share/texmf-local/tex/luatexja/jfm-ujis.lua)(load: C:/w32tex/share/c
-txdir/luatex-cache/generic/fonts/otf/temp-ipaexg.lua) [1{c:/w32tex/share/texmf/
-fonts/map/pdftex/updmap/pdftex.map
-LuaTeX warning (file c:/w32tex/share/texmf/fonts/map/pdftex/updmap/pdftex.map):
- fontmap entry for `cmcsc8' already exists, duplicates ignored
-
-LuaTeX warning (file c:/w32tex/share/texmf/fonts/map/pdftex/updmap/pdftex.map):
- fontmap entry for `cmcsc9' already exists, duplicates ignored
-}] )<c:/w32tex/share/texmf-local/fonts/truetype/IPAexfont00102/ipaexg.ttf><c:/w
-32tex/share/texmf-local/fonts/truetype/IPAexfont00102/ipaexm.ttf><c:/w32tex/sha
-re/texmf/fonts/type1/public/amsfonts/cm/cmbx10.pfb><c:/w32tex/share/texmf/fonts
-/type1/public/amsfonts/cm/cmr10.pfb><c:/w32tex/share/texmf/fonts/type1/public/a
-msfonts/cm/cmtt10.pfb>
-Output written on test01.pdf (1 page, 258375 bytes).
-PDF statistics: 44 PDF objects out of 1000 (max. 8388607)
- 29 compressed objects within 1 object stream
- 0 named destinations out of 1000 (max. 131072)
- 1 words of extra memory for PDF output out of 10000 (max. 10000000)
-

diff --git a/test/test01.pdf b/test/test01.pdf
index 7ec608f..a118a1a 100644 (file)
Binary files a/test/test01.pdf and b/test/test01.pdf differ

diff --git a/test/test02-latex.pdf b/test/test02-latex.pdf
index 27be300..676678b 100644 (file)
Binary files a/test/test02-latex.pdf and b/test/test02-latex.pdf differ

diff --git a/test/test02-latex.tex b/test/test02-latex.tex
index d718bbd..6cc9982 100644 (file)
--- a/test/test02-latex.tex
+++ b/test/test02-latex.tex
@@ -33,7 +33,7 @@
 \def\extract@font{%
     \get@external@font
     \ifnum\pdf@strcmp{\f@encoding}{EU2}=0
-      \expandafter\gjfont\font@name\external@font\relax
+      \expandafter\globaljfont\font@name\external@font\relax
       \font@name\global\zw=\zw\global\zh=\zh
     \else
       \global\expandafter\font\font@name\external@font\relax

diff --git a/test/test03-after.pdf b/test/test03-after.pdf
index 8364f34..8454ed6 100644 (file)
Binary files a/test/test03-after.pdf and b/test/test03-after.pdf differ

diff --git a/test/test03-after.tex b/test/test03-after.tex
index be97b7a..f90a4ff 100644 (file)
--- a/test/test03-after.tex
+++ b/test/test03-after.tex
@@ -6,10 +6,10 @@
 {\tengt ■パラメタ代入テスト}
 
 \catcode`\@=11
-\the\luatexja@ykblshift
-\ltjsetparameter{ykbaselineshift=\maxdimen,autoxspacing=false}
-\the\luatexja@ykblshift\ 
-\ltjgetparameter{ykbaselineshift}
+\the\ltj@ykblshift
+\ltjsetparameter{yjabaselineshift=\maxdimen,autoxspacing=false}
+\the\ltj@ykblshift\ 
+\ltjgetparameter{yjabaselineshift}
 
 \ltjgetparameter{kanjiskip},
 \ltjgetparameter{xkanjiskip}
@@ -18,12 +18,12 @@
 \ltjgetparameter{autoxspacing}
 
 \ltjgetparameter{differentjfm}.
-\ltjsetparameter{ykbaselineshift=0pt,autoxspacing=true}
+\ltjsetparameter{yjabaselineshift=0pt,autoxspacing=true}
 
 
-あいうえお{\ltjsetparameter{ykbaselineshift=2pt}かきくけこ}さしすせそ: local
+あいうえお{\ltjsetparameter{yjabaselineshift=2pt}かきくけこ}さしすせそ: local
 
-あいうえお{\globalltjsetparameter{ykbaselineshift=2pt}かきくけこ}さしすせそ: global
+あいうえお{\ltjglobalsetparameter{yjabaselineshift=2pt}かきくけこ}さしすせそ: global
 
 \ltjgetparameter{prebreakpenalty}{`（},
 \ltjgetparameter{prebreakpenalty}{`）},
@@ -39,18 +39,18 @@ a\inhibitglue （a）\inhibitglue aあa〜a
 \medskip
 xspmode
 
-\ltjgetparameter{cjkxspmode}{`（},
-\ltjgetparameter{cjkxspmode}{`）},
-\ltjgetparameter{cjkxspmode}{`あ},
-\ltjgetparameter{cjkxspmode}{`〜}
+\ltjgetparameter{jaxspmode}{`（},
+\ltjgetparameter{jaxspmode}{`）},
+\ltjgetparameter{jaxspmode}{`あ},
+\ltjgetparameter{jaxspmode}{`〜}
 
-\ltjsetparameter{asciixspmode={`\b,inhibit}}
+\ltjsetparameter{alxspmode={`\b,inhibit}}
 あ[あ]あaあbあ
 
-\ltjgetparameter{asciixspmode}{`[},
-\ltjgetparameter{asciixspmode}{`]},
-\ltjgetparameter{asciixspmode}{`a},
-\ltjgetparameter{asciixspmode}{`b}
+\ltjgetparameter{alxspmode}{`[},
+\ltjgetparameter{alxspmode}{`]},
+\ltjgetparameter{alxspmode}{`a},
+\ltjgetparameter{alxspmode}{`b}
 
 {\ltjsetparameter{kanjiskip=0pt plus 1fi minus 1fil}\ltjgetparameter{kanjiskip}\par}
 {x\ltjsetparameter{kanjiskip=0pt plus 1fill minus 1filll}\ltjgetparameter{kanjiskip}\par}
@@ -59,12 +59,21 @@ xspmode
 {\tengt ■合字テスト}
 
 \tenrm
-{\ltjsetparameter{asciixspmode={`i,preonly},ykbaselineshift=0pt}
+{\ltjsetparameter{alxspmode={`i,preonly},yjabaselineshift=0pt}
 あiあfiあffiあ\par}
 
-{\ltjsetparameter{asciixspmode={`f,postonly},ykbaselineshift=0pt}
+{\ltjsetparameter{alxspmode={`f,postonly},yjabaselineshift=0pt}
 あfあfiあffiあ\par}
 
-\ltjsetparameter{asciixspmode={-1,inhibit}}
+\ltjsetparameter{alxspmode={-1,inhibit}}
 あ$a$あ
+
+\medskip
+{\tengt ■ltjgetparameter}
+
+\ltjsetparameter{yalbaselineshift=2pt}
+\edef\yabls{\ltjgetparameter{yalbaselineshift}}
+\ltjsetparameter{yalbaselineshift=3pt}
+\dimen255=\yabls\relax\the\dimen255
+
 \end

diff --git a/test/test04-jfm.log b/test/test04-jfm.log
deleted file mode 100644 (file)
index 79f69d4..0000000
--- a/test/test04-jfm.log
+++ /dev/null
@@ -1,283 +0,0 @@
-This is LuaTeX, Version beta-0.66.0-2011032121 (rev 4093)  (format=luatex 2011.4.20)  23 APR 2011 12:44
- restricted \write18 enabled.
-**test04-jfm.tex
-(./test04-jfm.tex
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-core.sty
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
-Package: luatexbase 2010/10/06 v0.3 Module utilities for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
-Package ifluatex Info: LuaTeX detected.
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
-Package: luatexbase-compat 2010/10/10 v0.3 Compatibility tools for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-))
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty
-Package: luatexbase-loader 2010/10/10 v0.3 Lua module loader for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase.loader.lua))
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty
-Package: luatexbase-regs 2010/10/10 v0.3 Registers allocation for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-))
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
-Package: luatexbase-attr 2010/10/10 v0.3 Attributes allocation for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/attr.lua))
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
-Package: luatexbase-cctb 2010/10/10 v0.3 Catcodetable allocation for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/cctb.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty)
-\lltxb@catcodetable@alloc=\count277
-\@tempcnta=\count278
-\@tempcntb=\count279
-\CatcodeTableIniTeX=\luatexcatcodetable1
-\CatcodeTableString=\luatexcatcodetable2
-\CatcodeTableOther=\luatexcatcodetable3
-\CatcodeTableLaTeX=\luatexcatcodetable4
-\CatcodeTableLaTeXAtLetter=\luatexcatcodetable5
-\CatcodeTableExpl=\luatexcatcodetable6
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty
-Package: luatexbase-mcb 2010/10/10 v0.3 Callback management for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty
-Package: luatexbase-modutils 2010/10/10 v0.3 Module utilities for LuaTeX
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/ifluatex.sty
-Package ifluatex Info: The package is already loaded.
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/modutils.lua))
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/mcb.lua)
-Lua module: luatexbase-mcb 2010/05/12 0.2 register several functions in a callb
-ack
-)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty))
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs.lua)
-Lua module: lualibs 2011/01/20 0.96 Lua additional functions.
-
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-string.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-lpeg.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-boolean.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-number.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-math.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-table.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-aux.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-io.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-os.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-file.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-md5.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-dir.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-unicode.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-utils.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-dimen.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-url.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/lualibs/lualibs-set.lua)
-(/opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/luaotfload.lua)
-Lua module: luaotfload 2011/02/16 1.24 OpenType layout system.
-
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-luat-dum.lua.(using cache: /home/h7k/.texlive2010/texmf-var/luatex-cache/gen
-eric)
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-luat-ovr.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-data-con.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-ini.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-node-dum.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-node-inj.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-tfm.lua.
-luatexbase.attributes["otfl@state"] = 1
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-cid.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-ott.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-map.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-otf.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-otd.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-oti.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-otb.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-otn.lua.
-luatexbase.attributes["otfl@markbase"] = 2
-luatexbase.attributes["otfl@markmark"] = 3
-luatexbase.attributes["otfl@markdone"] = 4
-luatexbase.attributes["otfl@cursbase"] = 5
-luatexbase.attributes["otfl@curscurs"] = 6
-luatexbase.attributes["otfl@cursdone"] = 7
-luatexbase.attributes["otfl@kernpair"] = 8
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-ota.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-otc.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-def.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-xtx.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-dum.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-nms.lua.
-luaotfload: loading file /opt/texlive/p2010/texmf-dist/tex/luatex/luaotfload/ot
-fl-font-clr.lua.
-Module luatexbase-mcb info: creating 'luaotfload.patch_font' type 4
-Module luatexbase-mcb info: inserting 'luaotfload.pre_linebreak_filter'
-(luatexbase-mcb)            at position 1 in 'pre_linebreak_filter'
-Module luatexbase-mcb info: inserting 'luaotfload.hpack_filter'
-(luatexbase-mcb)            at position 1 in 'hpack_filter'
-Module luatexbase-mcb info: resetting callback 'define_font'
-Module luatexbase-mcb info: inserting 'luaotfload.define_font'
-(luatexbase-mcb)            at position 1 in 'define_font'
-Module luatexbase-mcb info: inserting 'luaotfload.find_vf_file'
-(luatexbase-mcb)            at position 1 in 'find_vf_file'
-) (/opt/texlive/p2010/texmf-dist/tex/generic/xkeyval/xkeyval.tex
-\XKV@toks=\toks13
-\XKV@tempa@toks=\toks14
-\XKV@depth=\count280
-
-2008/08/13 v2.6a key=value parser (HA)
-(/opt/texlive/p2010/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
-2005/02/22 v1.1 xkeyval TeX header (HA))
-(/opt/texlive/p2010/texmf-dist/tex/generic/xkeyval/keyval.tex))
-(/opt/texlive/p2010/texmf-dist/tex/generic/oberdiek/infwarerr.sty
-Package: infwarerr 2010/04/08 v1.3 Providing info/warning/message (HO)
-)
-\luatexja@tempcnta=\count281
-\luatexja@tempcntb=\count282
-\luatexja@tempcntc=\count283
-\luatexja@tempdima=\dimen256
-\luatexja@autospc=\count284
-\luatexja@autoxspc=\count285
-\jcharwidowpenalty=\count286
-\kanjiskip=\skip256
-\xkanjiskip=\skip257
-\zw=\dimen257
-\zh=\dimen258
-\jQ=\dimen259
-\jH=\dimen260
-\luatexja@curjfnt=\luatexattribute9
-\luatexja@charclass=\luatexattribute10
-\luatexja@yablshift=\luatexattribute11
-\luatexja@ykblshift=\luatexattribute12
-\luatexja@icflag=\luatexattribute13
-\luatexja@japanese=\language87
-
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-rmlgbm.lua)
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-rmlgbm-data.lu
-a)
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-core.lua)
-Module luatexbase-mcb info: inserting 'ltj.process_input_buffer'
-(luatexbase-mcb)            at position 1 in 'process_input_buffer'
-Module luatexbase-mcb info: inserting 'ltj.pre_linebreak_filter'
-(luatexbase-mcb)            at position 2 in 'pre_linebreak_filter'
-Module luatexbase-mcb info: inserting 'ltj.hpack_filter'
-(luatexbase-mcb)            at position 2 in 'hpack_filter'
-Module luatexbase-mcb info: inserting 'ltj.hpack_filter_pre'
-(luatexbase-mcb)            at position 1 in 'hpack_filter'
-Module luatexbase-mcb info: inserting 'ltj.hyphenate'
-(luatexbase-mcb)            at position 1 in 'hyphenate'
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-jfont.lua)
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-core-aux.lua)
-\luatexja@kcat0=\luatexattribute14
-\luatexja@kcat1=\luatexattribute15
-\luatexja@kcat2=\luatexattribute16
-\luatexja@kcat3=\luatexattribute17
-\luatexja@kcat4=\luatexattribute18
-\luatexja@kcat5=\luatexattribute19
-\luatexja@kcat6=\luatexattribute20
-\ltj@stack@pbp=\count287
-\ltj@group@level@pbp=\count288
-
-plain format: loading luatexja-plain.tex
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-plain.tex
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/jfm-ujis.lua)
-(/opt/texlive/p2010/../texmf-local/tex/generic/luatexja/luatexja-kinsoku.tex)))
-(load: /home/h7k/.texlive2010/texmf-var/luatex-cache/generic/fonts/otf/temp-ipa
-m.lua)(load: /home/h7k/.texlive2010/texmf-var/luatex-cache/generic/fonts/otf/te
-mp-kozminpr6n-regular.lua)
-(./jfm-bad.lua)
-! LuaTeX-ja error: bad JFM 'bad'.
-\@jfont ->\directlua {ltj.jfontdefY()}
-                                      
-<to be read again> 
-                   \rml 
-l.15 \rml
-          あ123 % \rml は未定義となる󿿿
-The JFM file you specified is not valid JFM file.
-Defining Japanese font is cancelled.
-
-(load: /home/h7k/.texlive2010/texmf-var/luatex-cache/generic/fonts/otf/temp-ipa
-exg.lua)
-! Undefined control sequence.
-\defcharrange #1#2->\ltj@tempcntc 
-                                  =#1 \expandafter \ltj@dcrange #2,,\ignores...
-l.25 \defcharrange{2}{`あ,"E0-"FF}
-                                   
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-
-! LuaTeX-ja error: Invalid character code (-1), should in the range 0.."10FFFF.
-.
-\@next ...p ', tex.getcount('luatexja@tempcnta'))}
-                                                   
-l.46 \getjaparameter{chartorange}{-1}
-                                       % must be -1
-I'm going to use 0 instead of that illegal character code.
-
-[1{/opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdftex.map
-LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
-x.map): fontmap entry for `bchb8r' already exists, duplicates ignored
-
-LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
-x.map): fontmap entry for `bchbi8r' already exists, duplicates ignored
-
-LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
-x.map): fontmap entry for `bchbo8r' already exists, duplicates ignored
-
-LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
-x.map): fontmap entry for `bchr8r' already exists, duplicates ignored
-
-LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
-x.map): fontmap entry for `bchri8r' already exists, duplicates ignored
-
-LuaTeX warning (file /opt/texlive/p2010/texmf-var/fonts/map/pdftex/updmap/pdfte
-x.map): fontmap entry for `bchro8r' already exists, duplicates ignored
-}] )</opt/texlive/p2010/texmf/fonts/truetype/test/ipaexg.ttf></opt/texlive/p201
-0/texmf/fonts/opentype/test/kozuka/KozMinPr6N-Regular.otf></opt/texlive/p2010/t
-exmf/fonts/truetype/test/ipam.ttf></opt/texlive/p2010/texmf-dist/fonts/type1/pu
-blic/amsfonts/cm/cmr10.pfb>
-Output written on test04-jfm.pdf (1 page, 283021 bytes).
-PDF statistics: 43 PDF objects out of 1000 (max. 8388607)
- 27 compressed objects within 1 object stream
- 0 named destinations out of 1000 (max. 131072)
- 1 words of extra memory for PDF output out of 10000 (max. 10000000)
-

diff --git a/test/test04-jfm.pdf b/test/test04-jfm.pdf
index 3ca9e23..a701597 100644 (file)
Binary files a/test/test04-jfm.pdf and b/test/test04-jfm.pdf differ

diff --git a/test/test04-jfm.tex b/test/test04-jfm.tex
index feabe8d..a19a55b 100644 (file)
--- a/test/test04-jfm.tex
+++ b/test/test04-jfm.tex
@@ -12,7 +12,7 @@
 \rml あ\inhibitglue\char"201Cあ←KozMinPr6N-Regular
 
 {\scrollmode
-\gjfont\rml={psft:GothicBBB-Medium:jfm=bad} at 10pt % must be error
+\globaljfont\rml={psft:GothicBBB-Medium:jfm=bad} at 10pt % must be error
 }
 \rml あ123 % \rml は未定義となる
 {\tt\meaning\rml}
@@ -28,12 +28,12 @@
 \ltjdefcharrange{2}{`あ,"E0-"FF}
 「\char"F4」は2番の文字範囲なので，和文扱いのはず
 
-{iso8859-1 和文扱い:\ltjsetparameter{jcharrange={1}}%
-\ltjgetparameter{jcharrange}{1}%
+{iso8859-1 和文扱い:\ltjsetparameter{jacharrange={1}}%
+\ltjgetparameter{jacharrange}{1}%
 § ¶ ° £ ¥ \char"F4}
 
-{iso8859-1 欧文扱い:\ltjsetparameter{jcharrange={-1}}%
-\ltjgetparameter{jcharrange}{1}%
+{iso8859-1 欧文扱い:\ltjsetparameter{jacharrange={-1}}%
+\ltjgetparameter{jacharrange}{1}%
 § ¶ ° £ ¥ \char"F4}
 
 
@@ -49,9 +49,9 @@
 \ltjgetparameter{chartorange}{-1}  % must be error "
 
 \medskip
-\ltjsetparameter{jcharrange={-217}}
+\ltjsetparameter{jacharrange={-217}}
 ほとんど欧文扱い．2番は別（「あ」）
-\ltjsetparameter{jcharrange={218}}
+\ltjsetparameter{jacharrange={218}}
 和文扱いにもどる
 
 \vfill\eject

diff --git a/test/test05-speed.pdf b/test/test05-speed.pdf
index 6017fc1..774b80c 100644 (file)
Binary files a/test/test05-speed.pdf and b/test/test05-speed.pdf differ

diff --git a/test/test05-speed.tex b/test/test05-speed.tex
index e79d9bd..7ae5c96 100644 (file)
--- a/test/test05-speed.tex
+++ b/test/test05-speed.tex
@@ -4,7 +4,7 @@
 \newcount\cnt\newcount\cnta
 \cnt=0
 \long\def\loop#1\repeat{\def\body{#1}\iterate}
-\loop\ifnum\cnt<10 % <= this value
+\loop\ifnum\cnt<20 % <= this value
   \cnta=0 \message{\the\cnt:}\par
   {\loop\ifnum\cnta<500 あ．「い，うえお・か（き）く）（けこ\advance\cnta1\repeat}
   \advance\cnt1
@@ -13,6 +13,6 @@
 \end
 
 %     real time:
-% 20: 14.373s
-% 10:  8.476s
+% 20:  7.867s
+% 10:  4.563s
 % env: C2D E7300, Mem 4GB, LuaTeX 0.66.0pre, Gentoo amd64 unstable
\ No newline at end of file