Improve \ltj@pkgpatch in luatexja-latex.sty.

[luatex-ja/luatexja.git] / doc / s1sty.tex

diff --git a/doc/s1sty.tex b/doc/s1sty.tex
index 9c2baa6..c2258ad 100644 (file)
--- a/doc/s1sty.tex
+++ b/doc/s1sty.tex
@@ -8,6 +8,7 @@
 \font\eightsl=cmsl8
 \font\eightmus=cmmi8
 \font\eighttt=cmtt8
+\font\eightsf=cmss8
 % Fonts  for 12pt
 \font\twelverm=cmr12
 \font\twelvebf=cmbx12
@@ -15,10 +16,12 @@
 \font\twelvesl=cmsl12
 \font\twelvemus=cmmi12
 \font\twelvett=cmtt12
+\font\twelvesf=cmss12
 
 \font\bigbf=cmbx12 scaled \magstep3
 \font\eightsc=cmcsc10 at 8pt
 \font\tensc=cmcsc10
+\font\tensf=cmss10
 \font\twelvesc=cmcsc10 at 12pt
 
 % Japanese fonts
@@ -38,24 +41,26 @@
 % Size 
 \def\large{\def\rm{\textfont0=\twelverm\twelverm\fam0}\def\bf{\twelvebf\gt}%
   \let\it=\twelveit  \let\sl=\twelvesl \let\mus=\twelvemus 
-  \let\sc=\twelvesc  \let\tt=\twelvett
+  \let\sc=\twelvesc  \let\tt=\twelvett \let\sf=\twelvesf
   \let\mc=\twelvemc \let\gt=\twelvegt
-  \baselineskip=18pt\rm\mc\xkanjiskip=0.25\zw plus 0.10\zw minus 0.10\zw}
+  \baselineskip=18pt\rm\mc
+  \ltjsetparameter{xkanjiskip={0.25\zw plus 0.10\zw minus 0.10\zw}}}
 
-\def\big{\bigbf\biggt\xkanjiskip=0.25\zw plus 0.10\zw minus 0.10\zw}
+\def\big{\bigbf\biggt\ltjsetparameter{xkanjiskip={0.25\zw plus 0.10\zw minus 0.10\zw}}}
 
 \def\normalsize{\def\rm{\textfont0=\tenrm\tenrm\fam0\let\sx=\sevenrm}%
   \def\bf{\tenbf\gt\let\sx=\sevenbf}%
   \let\it=\tenit \let\sl=\tensl \let\mus=\tenmus 
-  \let\sc=\tensc \def\tt{\tentt\tenjtt}%
+  \let\sc=\tensc \def\tt{\tentt\tenjtt}\let\sf=\tensf %
   \let\mc=\tenmc \let\gt=\tengt
-  \baselineskip=15pt\rm\mc\xkanjiskip=0.25\zw plus 1pt minus 1pt}
+  \baselineskip=15pt\rm\mc
+  \ltjsetparameter{xkanjiskip=0.25\zw plus 1pt minus 1pt}}
 \def\small{\def\rm{\textfont0=\eightrm\eightrm\fam0}\def\bf{\eightbf\gt}%
   \let\it=\eightit \let\sl=\eightsl \let\mus=\eightmus 
-  \let\sc=\eightsc \def\tt{\eighttt\eightjtt}%
+  \let\sc=\eightsc \def\tt{\eighttt\eightjtt}\let\sf=\eightsf %
   \let\mc=\eightmc \let\gt=\eightgt%
-  \rm\mc\xkanjiskip=0.25\zw plus 1pt minus 1pt%
-  \ltjsetparameter{yjabaselineshift=-0.76pt, yalbaselineshift=-0.76pt}
+  \rm\mc\ltjsetparameter{xkanjiskip={0.25\zw plus 1pt minus 1pt},
+  yjabaselineshift=-0.76pt, yalbaselineshift=-0.76pt}
 }
 
 
@@ -72,7 +77,7 @@
   \message{#1}\leftline{\large\bf#1\hskip0.5\zw\hrulefill}\nobreak\smallskip}
 \outer\def\beginparagraph#1\par{\vskip0pt plus.1\vsize\penalty-100%
   \vskip0pt plus-.1\vsize\medskip\vskip\parskip%
-  \message{#1}\leftline{\bf\char"25A0#1}\nobreak}
+  \message{#1}\leftline{\bf\char"25A0 #1}\nobreak}
 
 % verbatim
 % borrowed from manmac.tex
@@ -80,7 +85,7 @@
 \newbox\vspbox
 \setbox\vspbox=\hbox{\tt\char32}
 {\catcode`\ =\active\catcode`\_=\active%\catcode`\%=\active
-\gdef\ttverbatim{\begingroup\xkanjiskip=0pt
+\gdef\ttverbatim{\begingroup\ltjsetparameter{xkanjiskip=0pt}
 \catcode`\ =\active\let =~\catcode`\%=\other
 \catcode`\\=\other\catcode`\{=\other\catcode`\}=\other
 \catcode`\$=\other\catcode`\&=\other\catcode`\#=\other\catcode`\~=\other
@@ -93,7 +98,8 @@
 \belowdisplayskip=\medskipamount
 \belowdisplayshortskip=\medskipamount
 %
-\outer\def\begintt{$$\let\par=\endgraf \ttverbatim\parskip=0pt\catcode`\|=0 \rightskip-5pc\ttfinish}
+\outer\def\begintt{$$\let\par=\endgraf\baselineskip=12pt
+\ttverbatim\parskip=0pt\catcode`\|=0 \rightskip-5pc\ttfinish}
 {\catcode`\|=0 |catcode`|\=\other% | is temporary escape character
 |obeylines% end of line is active
 |gdef|ttfinish#1^^M#2\endtt{#1|parindent3|zw|noindent|vbox{#2}|hss|endgroup$$}}