X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest27-lineprofile.tex;h=7c8e33760965d41343e8afdf0217d839b37b2613;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=f05c48b2104ab3a62d6a50e2041052afee34d091;hpb=0f85b5e0e32d7fc63991070a815371f7bc39faab;p=luatex-ja%2Fluatexja.git

diff --git a/test/test27-lineprofile.tex b/test/test27-lineprofile.tex
index f05c48b..7c8e337 100644
--- a/test/test27-lineprofile.tex
+++ b/test/test27-lineprofile.tex
@@ -2,12 +2,7 @@
 \usepackage[width=40\zw, lines=40,centering]{geometry}
 \usepackage{amsmath,luacode,xcolor,luatexja-adjust}
 \begin{document}
-% #1: null（TeX 既定） or profile（行の中身を考慮した行間測定）
-% #2: null（TeX 既定）
-%   or step（行送りが \baselineskip で十分でなかった場合，
-%            lineskip.step_factor * \baselineskip の倍数だけ広げて
-%            行間が \lineskip 以上になるようにする）
-\def\R#1#2{\directlua{luatexja.lineskip.setting('#1','#2')}%
+\def\R#1#2{\ltjenableadjust[profile=#1,linestep=#2]%
 \noindent\fbox{\parbox{25\zw}{%
 \baselineskip14pt\noindent
 \setbox2=\vtop{\noindent\hsize20\zw\textcolor{cyan!30!white}{%
@@ -29,7 +24,7 @@
  □□□□■□□□□■□□□□■□□□□■□□□□■□□□□■□□□□■□□□□■
  □□□□■□□□□■□□□□■□□□□■
 }}\dp2=0pt\rlap{\copy2}\par\vspace*{-\baselineskip}
-\textbf{#1, #2}\\
+\textbf{profile: #1, linestep: #2}\par
 \vrule height 2pt depth 0pt width 10\zw\\
 \vrule height 2pt depth 0pt width 10\zw\\
 \the\baselineskip あああああああああああああああ\\
@@ -57,9 +52,50 @@
 }}\newpage}
 
 
-\R{null}{null}
-\R{profile}{null}
-\R{null}{step}
-\R{profile}{step}
+\R{false}{false}
+\R{true}{false}
+\R{false}{true}
+\R{true}{true}
+
+\ltjgetparameter{linestep_factor}
+
+\ltjdisableadjust
+\def\R#1#2{\ltjenableadjust[profile=#1,priority=#2]%
+\noindent\fbox{\parbox[t]{20\zw}{%
+\baselineskip14pt\noindent
+\textbf{profile: #1, priority: #2}\par
+  \ltjsetparameter{xkanjiskip=.25\zw plus 20pt minus 20pt}
+  ああxあaaaあxあx\vrule height 30pt depth 30pt width 9.7\zw「\break
+  \vrule height 30pt depth 30pt width9.6\zw xあxあxあaaaああ「\break
+}}}
+
+\R{false}{false}%
+\R{true}{false}\\
+\R{false}{true}%
+\R{true}{true}%
+
+\ltjdisableadjust
+\ltjenableadjust[profile]
+
+\def\R#1{%
+  \fbox{\parbox[t]{130pt}{\lineskip1pt\textbf{#1pt (\texttt{lineskip}: \the\lineskip)}\\%
+    \noindent\vrule height 5pt depth 50pt width 45pt\kern30pt%
+    \vrule height 5pt depth 50pt width 30pt\\
+    \textcolor{red}{\kern\dimexpr45pt+#1pt\vrule height 50pt depth 5pt width20pt}%
+    \textcolor{blue}{\kern-40pt\vrule height 5pt depth 5pt width 60pt}%
+  }}\hskip0pt\ignorespaces
+}
+
+\newpage
+\texttt{profile\_hgap\_factor=\ltjgetparameter{profile_hgap_factor}}\par
+\noindent
+\R{0}\R{0.5}\R{1}\R{2}\R{8}\R{9}\R{10}
+
+
+\newpage
+\ltjsetparameter{profile_hgap_factor=2}
+\texttt{profile\_hgap\_factor=\ltjgetparameter{profile_hgap_factor}}\par
+\noindent
+\R{0}\R{0.5}\R{1}\R{2}\R{8}\R{9}\R{10}
 
 \end{document}