Compiled default "kinsoku" parameters into ltj-kinsoku.lua.

diff --git a/src/luatexja-kinsoku.tex b/no_runtime/luatexja-kinsoku.tex
similarity index 100%
rename from src/luatexja-kinsoku.tex
rename to no_runtime/luatexja-kinsoku.tex

diff --git a/no_runtime/luatexja-kinsoku_make.tex b/no_runtime/luatexja-kinsoku_make.tex
index a19c904..8ae1973 100644 (file)
--- a/no_runtime/luatexja-kinsoku_make.tex
+++ b/no_runtime/luatexja-kinsoku_make.tex
@@ -1,17 +1,15 @@
-\parindent0pt
-\output={\shipout\box255}
-\tt\catcode`\_=12
-\def\{{\char'173 }\def\}{\char'175}
-\toks0={\%}
-\def\postbreakpenalty{\out\toks0={\string\setpostbreakpenalty\{}\count600 }%
-\def\prebreakpenalty{\out\toks0={\string\setprebreakpenalty\{}\count600 }%
-\def\inhibitxspcode{\out\toks0={\string\setinhibitxspcode\{}\count600 }%
-\def\xspcode{\out\toks0={\string\setxspcode\{}\count600 }%
-\catcode`\=13
-\def={\count601 }%\
-\def\out{\par\the\toks0 \the\count600\}\{\the\count601\}}
-\input ukinsoku
-\end
-
-% euptex pte-kinsoku-make ; dvitype -output-level=1 pte-kinsoku-make
-% | grep "\[" | sed "s/\[\(.*\)\]/\1/" > pte-kinsoku.tex
\ No newline at end of file
+%#!lualatex --shell-escape luatexja-kinsoku_make.tex
+\documentclass{article}
+\usepackage{luatexja}
+\makeatletter
+\input{luatexja-kinsoku.tex}
+\usepackage{luacode}
+\begin{luacode}
+ s = table.copy(luatexja.stack.charprop_stack_table[0])
+ s[0].jwp, s[0].xsp = nil, nil
+ s.kanjiskip = nil; s.xkanjiskip = nil
+ table.tofile('ltj-kinsoku.out', s, 'return', false, true, false)
+\end{luacode}
+\immediate\write18{texluac -o ltj-kinsoku.lua ltj-kinsoku.out}
+\begin{document}
+\end{document}
\ No newline at end of file

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index 4964717..0dc28f7 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -522,7 +522,7 @@ local function new_jfm_glue(m, bc, ac)
    local g, d = z.glue[ac], 0 
    if g then
       g,d = node_copy(g[1]), g[2]; 
-      g.spec = node.copy(g.spec); -- node_copy は spec を copy しない（参照を増やすのみ）
+      g.spec = node_copy(g.spec); -- node_copy は spec をコピーする
    else
       local k = z.kern[ac]
       if k then

diff --git a/src/ltj-kinsoku.lua b/src/ltj-kinsoku.lua
new file mode 100644 (file)
index 0000000..c22760e
Binary files /dev/null and b/src/ltj-kinsoku.lua differ

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index cdd84be..84901b0 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -38,6 +38,12 @@
 \usepackage{lltjcore}
 
 %%% default parameters
+\directlua{
+  luatexja.stack.charprop_stack_table[0] 
+    = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'),
+      "File `ltj-kinsoku.lua' not found"))
+}
+
 \ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt,
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1},
@@ -45,7 +51,6 @@
   jcharwidowpenalty=500, differentjfm=paverage
 }
 
-\input luatexja-kinsoku.tex
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 
 %%% patch for packages

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index 7a19c05..30012f3 100644 (file)
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -32,6 +32,13 @@
 \let\mc=\tenmin
 \let\gt=\tengt
 \mc
+
+\directlua{
+  luatexja.stack.charprop_stack_table[0] 
+    = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'),
+      "File `ltj-kinsoku.lua' not found"))
+}
+
 \ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt, 
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1}, 
@@ -39,9 +46,6 @@
   jcharwidowpenalty=500, differentjfm=paverage
 }
 
-\input luatexja-kinsoku.tex
-
-
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} 
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} 
 \ltjdefcharrange{3}{%

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index 21f71d6..de985d5 100644 (file)
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -17,7 +17,9 @@ local id_whatsit = node.id('whatsit')
 local sid_user = node.subtype('user_defined')
 local hmode = 118 -- in luatexref-t.pdf, this must be 127
 
-local charprop_stack_table={}; charprop_stack_table[0]={}
+charprop_stack_table={}; 
+local charprop_stack_table = charprop_stack_table
+charprop_stack_table[0]={}
 
 -- modified from table.fastcopy
 local next = next