Merge branch 'zh-maqiyuan' into kitagawa_test

[luatex-ja/luatexja.git] / test / test02-latex.tex

diff --git a/test/test02-latex.tex b/test/test02-latex.tex
index 4c05ff9..7b323e3 100644 (file)
--- a/test/test02-latex.tex
+++ b/test/test02-latex.tex
@@ -6,6 +6,11 @@
 
 % 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}
@@ -40,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] 
+\DeclareFontShape{JY3}{gt}{m}{sl}{<-> s*[0.962216] 
   file:ipag.ttf:slant=0.25;jfm=ujiso25}{}
-\DeclareFontShape{JY3}{gt}{x}{n}{<-> s*[0.960444] 
+\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?}\ 
@@ -84,7 +89,34 @@ font series `ix': 欧文は未定義，和文は機械的斜体．
 
 \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}