Revert 1b1d3c3 and 3b2bba1.

[luatex-ja/luatexja.git] / test / test04-jfm.tex

diff --git a/test/test04-jfm.tex b/test/test04-jfm.tex
index 16b68f6..d6c75e0 100644 (file)
--- a/test/test04-jfm.tex
+++ b/test/test04-jfm.tex
@@ -1,6 +1,6 @@
-%#!luatex
+%#!luatex test04-jfm ; pdftotext test04-jfm.pdf /tmp/new
 \input luatexja-core.sty
-
+\pdfcompresslevel=0
 \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
@@ -50,9 +50,9 @@
 \ltjgetparameter{jacharrange}{2}
 
 \head{文字コード→文字範囲}
-\ltjgetparameter{chartorange}{`い} % must be 217
-\ltjgetparameter{chartorange}{`§} % must be 1
-\ltjgetparameter{chartorange}{"F7} % must be 2
+\ltjgetparameter{chartorange}{`い} % must be 6
+\ltjgetparameter{chartorange}{`§} % must be 8
+\ltjgetparameter{chartorange}{"F7} % must be 9
 \ltjgetparameter{chartorange}{-1}  % must be error "
 
 \medskip
@@ -74,7 +74,7 @@
 あいうえおさしすせそ}\par
 
 
-\vfill\eject
+\vfill\eject\tracingonline=0
 \noindent{\bf\gt  以下はJFMグルー挿入検証}
 \jfont\rmlh={psft:Ryumin-Light:jfm=test} at 10pt
 \jfont\sixgt={psft:GothicBBB-Medium:jfm=ujis} at 6pt
@@ -83,7 +83,7 @@
 \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{luatexja.ext_show_node_list(tex.getbox(#1).head, '\\par ', tex.print)}\hrule}}
 
 %\tracingonline=1\tracingoutput=1\showboxdepth=3\showboxbreadth=100
 
@@ -224,16 +224,16 @@
 \noindent{\gt\bf [x]kanjiskipの挿入}
 
 \head{kanjiskip from JFM, autospacing (JA--JA)}
-\setbox0=\hbox{あ\rmlh あ}\dumplist0
+\setbox0=\hbox{\rmlh ああ}\dumplist0
 
 {\ltjsetparameter{kanjiskip=\maxdimen}
-\setbox0=\hbox{あ\rmlh あ}\dumplist0
+\setbox0=\hbox{\rmlh ああ}\dumplist0
 \jfont\rmlk={psft:Ryumin-Light:jfm=test} at 12pt
 \setbox0=\hbox{\rmlk は\rmlh あ}\dumplist0}
 
 \def\naspc{\ltjsetparameter{autospacing=false}\relax}
 \def\naxspc{\ltjsetparameter{autoxspacing=false}\relax}
-\setbox0=\hbox{あ\naspc ああ}\dumplist0
+\setbox0=\hbox{\rmlh あ\naspc ああ}\dumplist0
 
 \head{kanjiskip from JFM/autoxspacing (JA--EN)}
 \setbox0=\hbox{\rmlh まx}\dumplist0
@@ -312,4 +312,29 @@
 
 \setbox0=\hbox{\rmlh あ$a$さ$a$か}
 \dumplist0
+
+\head{その他: unhbox の連続}
+\setbox0=\hbox{\tenmin\setbox1=\hbox{）}\setbox2=\hbox{a}\unhbox1\unhbox2}
+\dumplist0
+
+\setbox3=\hbox{\tenmin\setbox1=\hbox{）}\setbox2=\hbox{a}\unhbox1\unhbox2}
+\setbox0=\hbox{\unhbox3}
+\dumplist0
+
+\setbox0=\hbox{\tenmin\setbox1=\hbox{（）}\setbox2=\hbox{「」}%
+  \unhcopy1\unhbox1\unhbox2}
+\dumplist0
+
+\head{その他: 「前由来」「後由来」JFM由来グルー}
+\setbox0=\hbox{\tenmin あ\fivemin （}
+\dumplist0
+
+\setbox0=\hbox{\fivemin あ\tenmin （}
+\dumplist0
+
+\setbox0=\hbox{\fivemin ．\tenmin ・}
+\dumplist0
+
+\setbox0=\hbox{\tenmin ．\fivemin ・}
+\dumplist0
 \end