X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest01.tex;h=83fc40bc7b4dc36394a0ac3c081a5839d963eda2;hb=eb118f3e5ea0852407b5261817700401699528b9;hp=6ad9c0c83ee0a71c743b1dd31994764e8e0104c5;hpb=b470e92153b991fb21371ccf82dab74e3314e886;p=luatex-ja%2Fluatexja.git

diff --git a/test/test01.tex b/test/test01.tex
index 6ad9c0c..83fc40b 100644
--- a/test/test01.tex
+++ b/test/test01.tex
@@ -57,10 +57,9 @@
 {\noindent\bf\tengt ■{\tt differentjfm}による挙動の違い}
 
 \jfont\tenMa={file:KozMinPr6N-Regular.otf:jfm=ujis}
-\jfont\tenMb={file:KozMinPr6N-Regular.otf:jfm=ujis;jfmvar=a}
+\jfont\tenMb={file:KozMinPr6N-Regular.otf:jfm=jis;jfmvar=a}
 \jfont\tenGa={file:ipaexg.ttf:jfm=ujis} at 15pt
-\jfont\tenGb={file:ipaexg.ttf:jfm=ujis;jfmvar=a} at 15pt\relax
-
+\jfont\tenGb={file:ipaexg.ttf:jfm=jis;jfmvar=a} at 15pt\relax
 \def\djtest{%
 {\tt Ma-Ma}: \setbox0=\hbox{{\tenMa ）}{\tenMa  ・}}\hbox to 90pt{\copy0\hss(\the\wd0)},
 {\tt Ma-Mb}: \setbox0=\hbox{{\tenMa ）}{\tenMb ・}}\hbox to 90pt{\copy0\hss(\the\wd0)},
@@ -79,14 +78,26 @@
 
 \ltjsetparameter{differentjfm=LARGE}\djtest
 
-{\noindent\bf\tengt {\tt differentjfm=average}（default，平均）}
+{\noindent\bf\tengt {\tt differentjfm=average}（平均）}
 
 \ltjsetparameter{differentjfm=AVERAGE}\djtest
 
-{\noindent\bf\tengt {\tt differentjfm=both}（両方挿入）}
+{\noindent\bf\tengt {\tt differentjfm=both}（合計）}
 
 \ltjsetparameter{differentjfm=Both}\djtest
 
+{\noindent\bf\tengt {\tt differentjfm=pleft}（左側の指定で比例配分）}
+
+\ltjsetparameter{differentjfm=pleft}\djtest
+
+{\noindent\bf\tengt {\tt differentjfm=pright}（右側の指定で比例配分）}
+
+\ltjsetparameter{differentjfm=pright}\djtest
+
+{\noindent\bf\tengt {\tt differentjfm=paverage}（default, 左・右それぞれの指定で比例配分した値の平均）}
+
+\ltjsetparameter{differentjfm=paverage}\djtest
+
 \bigskip
 {\noindent\bf\tengt ■ujis, jis, min}
 
@@ -98,4 +109,21 @@
 \test{ujis}
 \test{jis}
 \test{min}
+
+\bigskip
+{\noindent\bf\tengt ■pdftotext}
+\jfont\jisnorm={file:KozMinPr6N-Regular.otf:script=latn;color=0000007f;jfm=ujis}
+\jfont\jishkna={file:KozMinPr6N-Regular.otf:script=latn;+hkna;color=ff00007f;jfm=ujis}
+\jfont\jisvkna={file:KozMinPr6N-Regular.otf:script=latn;+vkna;color=0000ff7f;jfm=ujis}
+
+\setbox0=\hbox{\jisnorm あいうえお}
+\setbox2=\hbox{\jishkna あいうえお}
+\setbox4=\hbox{\jisvkna あいうえお}
+
+\leavevmode \copy0 \rlap{\copy0}\copy2 \copy2
+
+\leavevmode \rlap{\copy0}\copy4 \rlap{\copy2}\copy4
+
+\leavevmode \copy4
+
 \end