X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest02-latex.tex;h=ccb446f47d33426e542ff49666be51583585f3d7;hb=26649839d59f6fb2d9517806a2850200a16895bc;hp=136ca60f2d39c0516a9a58c13ea80d6c3638a1f2;hpb=10d1cbf1a118a88778fac09c4ee1ea8e84348d93;p=luatex-ja%2Fluatexja.git

diff --git a/test/test02-latex.tex b/test/test02-latex.tex
index 136ca60..ccb446f 100644
--- a/test/test02-latex.tex
+++ b/test/test02-latex.tex
@@ -1,26 +1,16 @@
 %#! lualatex
-\documentclass{article}
-\usepackage{luatexja}
-\nonstopmode
+\documentclass{ltjsarticle}
+%\nonstopmode
 
 \makeatletter
-% from jsclasses
-\def\@setfontsize#1#2#3{%
-  \ifx\protect\@typeset@protect
-    \let\@currsize#1%
-  \fi
-  \fontsize{#2}{#3}\selectfont
-  \ifdim\parindent>\z@
-      \parindent=1\zw
-  \fi
-  \ltjsetparameter{kanjiskip={0\zw plus .1\zw minus .01\zw}}%
-  \@tempskipa=\ltjgetparameter{xkanjiskip}%
-  \ifdim\@tempskipa>\z@
-    \ltjsetparameter{xkanjiskip={0.25em plus 0.15em minus 0.06em}}%
-  \fi}
 
 % for test
 \DeclareTextFontCommand{\textix}{\fontshape{ix}\selectfont}
+\DeclareFontFamily{OT1}{hoge}{}\DeclareFontShape{OT1}{hoge}{m}{n}{<-> pagk7t}{}
+\DeclareKanjiFamily{JY3}{hoge}{}
+\DeclareFontShape{JY3}{hoge}{m}{n}{<-> file:ipaexg.ttf:jfm=ujis}{}
+
+\DeclareFontSubstitution{OT1}{cmss}{m}{n}
 
 \makeatother
 \begin{document}
@@ -55,17 +45,17 @@
 %\end{document}
 
 \section{slanted, extended}
-\DeclareFontShape{JY3}{mc}{m}{sl}{<-> s*[0.960444] 
+\DeclareFontShape{JY3}{mc}{m}{sl}{<-> s*[0.962216] 
   psft:Ryumin-Light:slant=0.25;jfm=ujiso25}{}
-\DeclareFontShape{JY3}{mc}{x}{n}{<-> s*[0.960444] 
+\DeclareFontShape{JY3}{mc}{x}{n}{<-> s*[0.962216] 
   psft:Ryumin-Light:extend=1.5;jfm=ujisx50}{}
-\DeclareFontShape{JY3}{gt}{m}{sl}{<-> s*[0.960444] 
-  file:ipag.ttf:slant=0.25;jfm=ujiso25}{}
-\DeclareFontShape{JY3}{gt}{x}{n}{<-> s*[0.960444] 
+\DeclareFontShape{JY3}{gt}{m}{sl}{<-> s*[0.962216] 
+  file:ipam.ttf:slant=0.25;jfm=ujiso25}{}
+\DeclareFontShape{JY3}{gt}{x}{n}{<-> s*[0.962216] 
   file:ipag.ttf:extend=1.5;jfm=ujisx50}{}
 
 % for test
-\DeclareFontShape{JY3}{gt}{m}{ix}{<-> s*[0.960444] 
+\DeclareFontShape{JY3}{gt}{m}{ix}{<-> s*[0.962216] 
   file:ipag.ttf:slant=0.25;jfm=ujiso25}{}
 
 \paragraph{psft prefix でもOK?}\ 
@@ -95,11 +85,38 @@ font series `ix': 欧文は未定義，和文は機械的斜体．
 
 \newpage{\obeylines\tt
 \setbox0=\hbox{\gt\textsl{あいう■\textup{■え■}■おかき}}
-\directlua{ltj.ext_show_node_list(tex.box[0].head, '', tex.print)}\par}
+\directlua{luatexja.ext_show_node_list(tex.box[0].head, '', tex.print)}\par}
 
 \bigskip
 
-正しい補正量：$0.960444\times 10 \times 0.88\times 0.25 \simeq
-\directlua{tex.print(0.960444*10*0.88*0.25)}\,\textrm{pt}$
+正しい補正量：$0.962216\times 10 \times 0.88\times 0.25 \simeq
+\directlua{tex.print(0.962216*10*0.88*0.25)}\,\textrm{pt}$
+
+\paragraph{fontfamily}\
+\makeatletter
+\def\TEST#1{\par{\fontfamily{#1}\selectfont あいうabc: font\hfill(#1: \k@family, \f@family)}}
+
+\gt
+\TEST{mc}
+\TEST{fuga}
+\TEST{fuga}
+\TEST{mc}
+
+{\fontfamily{hoge}\selectfont あいうabc: font\hfill(\k@family, \f@family)}
+
+{\romanfamily{hoge}\selectfont あいうabc: roman\hfill(\k@family, \f@family)}
+
+{\kanjifamily{hoge}\selectfont あいうabc: kanji\hfill(\k@family, \f@family)}
+
+\TEST{mc}
+\TEST{ptm}
+\TEST{ptm}
+
+\makeatletter
+\let\@@fontfamily=\fontfamily
+\def\fontfamily#1{(\k@family, \f@family)\@@fontfamily{#1}(\k@family, \f@family)}
+
+あい{うえお\texttt{abc}\globaldefs1あ\/い}うえお
 
+あいうえお{\tt abc}あいうえお
 \end{document}