X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest04-jfm.tex;h=16b68f6e8cc4e217e30ebd15d3386cdfba346288;hb=6abeb05c5b8703d1871f6d4e861b3505ed8100cf;hp=c14c873515a5a360f815ad0839b7582b1bf7c616;hpb=16805623da80b07de6e37dcfd19da35d0bc72cb9;p=luatex-ja%2Fluatexja.git

diff --git a/test/test04-jfm.tex b/test/test04-jfm.tex
index c14c873..16b68f6 100644
--- a/test/test04-jfm.tex
+++ b/test/test04-jfm.tex
@@ -1,7 +1,7 @@
 %#!luatex
 \input luatexja-core.sty
 
-\def\head#1{\medskip\penalty-100\noindent{\bf\tengt ■ #1}\par\penalty10000}
+\def\head#1{\medskip\penalty-100\noindent{\bf\tengt ■ #1}\par\penalty10000 }
 \jfont\rml={psft:Ryumin-Light:jfm=ujis} at 10pt
 \rml あ\inhibitglue\char"201Cあ・い←Ryumin-Light
 
@@ -28,14 +28,18 @@
 
 \head{文字範囲の代入/取得テスト}
 
-\ltjdefcharrange{2}{`あ,"E0-"FF}
-「\char"F4」は2番の文字範囲なので，和文扱いのはず
+\ltjdefcharrange{9}{`あ,"E0-"FF}
+「\char"F4」は9番の文字範囲なので，和文扱いのはず
 
-{iso8859-1 和文扱い:\ltjsetparameter{jacharrange={1}}%
+{iso8859-1 和文扱い:\ltjsetparameter{jacharrange={1,8}}%
 \ltjgetparameter{jacharrange}{1}%
 § ¶ ° £ ¥ \char"F4}
 
-{iso8859-1 欧文扱い:\ltjsetparameter{jacharrange={-1}}%
+{iso8859-1 欧文扱い:\ltjsetparameter{jacharrange={-1,-8}}%
+\ltjgetparameter{jacharrange}{1}%
+§ ¶ ° £ ¥ \char"F4}
+
+{標準:%
 \ltjgetparameter{jacharrange}{1}%
 § ¶ ° £ ¥ \char"F4}
 
@@ -57,6 +61,18 @@
 \ltjsetparameter{jacharrange={218}}
 和文扱いにもどる
 
+\head{Ticket \#25121}
+\setbox0=\hbox{\ltjsetparameter{kanjiskip=-5pt}
+あいうえお\hbox{\ltjsetparameter{kanjiskip=12pt}かきくけこ}さしすせそ\par a}\copy0
+\tracingonline=0\showboxdepth=10000\showboxbreadth=10000\tracingonline=1\showbox0
+
+{\ltjsetparameter{kanjiskip=3pt}
+あいうえお{\ltjsetparameter{kanjiskip=-5pt}% this setting is ignored
+かきくけこ}さしすせそ\par}
+
+{\ltjsetparameter{kanjiskip=3pt}
+あいうえおさしすせそ}\par
+
 
 \vfill\eject
 \noindent{\bf\gt  以下はJFMグルー挿入検証}
@@ -67,7 +83,9 @@
 \def\dumplist#1{\par\noindent\leavevmode
 \hbox to 0.2\hsize{\copy#1\hss}%
 \vbox{\hsize=0.6\hsize\sixtt\baselineskip=7.2pt\sixgt\let\\=\relax
-\directlua{ltj.ext_show_node_list(tex.getbox(#1).head, '\\par', tex.print)}\hrule}}
+\directlua{ltj.ext_show_node_list(tex.getbox(#1).head, '\\par ', tex.print)}\hrule}}
+
+%\tracingonline=1\tracingoutput=1\showboxdepth=3\showboxbreadth=100
 
 \head{JA--JA (penなし)}
 
@@ -129,6 +147,12 @@
 
 \setbox0=\hbox{\rmlh え\hbox{}}\dumplist0
 
+\setbox0=\hbox{\rmlh あ\hbox{ア}}\dumplist0
+
+\setbox0=\hbox{\rmlh あ\hbox{a}}\dumplist0
+
+\setbox0=\hbox{\rmlh い\hbox{a}}\dumplist0
+
 \head{hbox--JA (penなし)}
 
 \setbox0=\hbox{\rmlh \hbox{}あ}\dumplist0
@@ -137,29 +161,11 @@
 
 \setbox0=\hbox{\rmlh \hbox{}う}\dumplist0
 
-\head{JA--penalty (penなし)} TODO: この場合の挙動はこれで良いか？
-
-\setbox0=\hbox{\rmlh あ\penalty567}\dumplist0
-
-\setbox0=\hbox{\rmlh い\penalty567}\dumplist0
-
-\setbox0=\hbox{\rmlh う\penalty567}\dumplist0
-
-\setbox0=\hbox{\rmlh え\penalty567}\dumplist0
-
-\head{penalty--JA (penなし)} TODO: この場合の挙動はこれで良いか？
-
-\setbox0=\hbox{\rmlh \penalty567あ}\dumplist0
-
-\setbox0=\hbox{\rmlh \penalty567い}\dumplist0
-
-\setbox0=\hbox{\rmlh \penalty567う}\dumplist0
-
 {\vfill\eject%
 
 \ltjsetparameter{prebreakpenalty={`（,123}}
 \ltjsetparameter{postbreakpenalty={`あ,123}}
-\ltjsetparameter{postbreakpenalty={`い,123}}
+\ltjsetparameter{prebreakpenalty={`い,571}, postbreakpenalty={`い,123}}
 \ltjsetparameter{postbreakpenalty={`う,123}}
 \ltjsetparameter{postbreakpenalty={`え,123}}
 \ltjsetparameter{postbreakpenalty={`お,123}}
@@ -198,6 +204,16 @@
 
 \setbox0=\hbox{\rmlh aう}\dumplist0
 
+\head{JA--hbox (penあり)}
+
+\setbox0=\hbox{\rmlh あ\hbox{ア}}\dumplist0
+
+\setbox0=\hbox{\rmlh あ\hbox{a}}\dumplist0
+
+\setbox0=\hbox{\rmlh い\hbox{a}}\dumplist0
+
+\setbox0=\hbox{\rmlh \hbox{（}い\hbox{）}}\dumplist0
+
 \head{italic correction}
 
 \setbox0=\hbox{\it f\/（\/あ}\dumplist0
@@ -210,7 +226,7 @@
 \head{kanjiskip from JFM, autospacing (JA--JA)}
 \setbox0=\hbox{あ\rmlh あ}\dumplist0
 
-{\kanjiskip=\maxdimen
+{\ltjsetparameter{kanjiskip=\maxdimen}
 \setbox0=\hbox{あ\rmlh あ}\dumplist0
 \jfont\rmlk={psft:Ryumin-Light:jfm=test} at 12pt
 \setbox0=\hbox{\rmlk は\rmlh あ}\dumplist0}
@@ -226,26 +242,74 @@
 
 \setbox0=\hbox{\naxspc\rmlh まx}\dumplist0
 
-{\xkanjiskip=\maxdimen\setbox0=\hbox{\rmlh まx}\dumplist0}
+{\ltjsetparameter{xkanjiskip=\maxdimen}\setbox0=\hbox{\rmlh まx}\dumplist0}
 
 {\ltjsetparameter{jaxspmode={`ま,preonly}}
 \setbox0=\hbox{\rmlh まx}\dumplist0}
 {\ltjsetparameter{alxspmode={`x,postonly}}
 \setbox0=\hbox{\rmlh まx}\dumplist0}
 
-
-\head{kanjiskip from JFM/autoxspacing (EN--JA)}
+\head{xkanjiskip from JFM/autoxspacing (EN--JA)}
 \setbox0=\hbox{\rmlh xま}\dumplist0
 
 \setbox0=\hbox{\rmlh x\naxspc ま}\dumplist0
 
 \setbox0=\hbox{\naxspc\rmlh xま}\dumplist0
 
-{\xkanjiskip=\maxdimen\setbox0=\hbox{\rmlh xま}\dumplist0}
+{\ltjsetparameter{xkanjiskip=\maxdimen}\setbox0=\hbox{\rmlh xま}\dumplist0}
 
 {\ltjsetparameter{jaxspmode={`ま,postonly}}
 \setbox0=\hbox{\rmlh xま}\dumplist0}
 {\ltjsetparameter{alxspmode={`x,inhibit}}
 \setbox0=\hbox{\rmlh xまおx}\dumplist0}
 
+\head{more than one penalty}
+
+\setbox0=\hbox{\rmlh お\penalty1701\penalty1701\penalty1701い}
+\dumplist0
+\setbox0=\hbox{\rmlh お\penalty1701\penalty1701\penalty1701お}
+\dumplist0
+\setbox0=\hbox{\rmlh あ\penalty1701\penalty1701\penalty1701い}
+\dumplist0
+\setbox0=\hbox{\rmlh あ\penalty1701\penalty1701\penalty1701お}
+\dumplist0
+
+\head{その他: italic correction and accents}
+
+\setbox0=\hbox{\tenrm あ\/j}
+\dumplist0
+\setbox0=\hbox{\tenrm\rmlh れ\v{A}）}
+\dumplist0
+
+\head{その他: box boundary}
+
+\setbox0=\hbox{\rmlh かあか}
+\dumplist0
+\setbox0=\hbox{a\setbox3=\hbox{\rmlh  かあか}\unhbox3a}
+\dumplist0
+\setbox0=\hbox{a\setbox3=\hbox{\rmlh  か}\box3a}
+\dumplist0
+\setbox0=\hbox{\rmlh き\hbox{か}き\hbox{き}き}
+\dumplist0
+
+{\ltjsetparameter{postbreakpenalty={`あ,1000},prebreakpenalty={`あ,1000}}
+\setbox0=\hbox{あ\hbox{（}あ\setbox3=\hbox{（}\unhbox3あ}
+\dumplist0}
+
+\vfill\eject
+\noindent{\gt\bf paragraph, hbox and math boundary}
+
+\setbox1=\vbox{\parindent19.2pt \rmlh\hsize=100pt\parfillskip=30pt
+かエ\par\global\setbox0=\lastbox}
+\dumplist0
+
+\setbox1=\vbox{\noindent\rmlh\hsize=100pt\parfillskip=30pt
+かエ\par\global\setbox0=\lastbox}
+\dumplist0
+
+\setbox0=\hbox{\rmlh かエ}
+\dumplist0
+
+\setbox0=\hbox{\rmlh あ$a$さ$a$か}
+\dumplist0
 \end