BUGS: Little ones to fix

[saga.git] / macros.tex

diff --git a/macros.tex b/macros.tex
index 9027957db714eee27f889fbe3c782b7598d51736..3ab39f7c608e3af65c963ab3a4508aca94bca5b7 100644 (file)
--- a/macros.tex
+++ b/macros.tex
@@ -23,24 +23,11 @@
 \hwobble=10mm
 \advance\hsize by -10mm
 
-% Glue
-\smallskipamount=4pt plus 1.2pt minus 1.2pt
-\medskipamount=7pt plus 2.5pt minus 2pt
-\bigskipamount=15pt plus 5pt minus 4pt
-
-\abovedisplayskip=15pt plus 4pt minus 10pt
-\abovedisplayshortskip=0pt plus 3pt
-\belowdisplayskip=15pt plus 4pt minus 10pt
-\belowdisplayshortskip=8.5pt plus 3.5pt minus 4.5pt
-
 %%% Miscellanea %%%
 
 \def\em#1{{\it #1\/}}
 \def\df#1{{\it #1\/}}  % when we define something
 \def\O{{\cal O}}
-\def\<#1>{\ifmmode
-    \mathchoice{\hbox{\it #1\/}}{\hbox{\it #1\/}}{\hbox{\eightti #1\/}}{\hbox{\sixti #1\/}}%
-  \else\leavevmode\hbox{\it #1\/}\fi}
 \let\>=\noindent
 \def\qed{{\parfillskip=0pt\allowbreak\hfill\nobreak $\spadesuit$\par}}
 \def\qeditem{{\parfillskip=0pt\hfill\rlap{\hskip\rightskip\llap{$\spadesuit$}}\par}}
@@ -89,19 +76,7 @@
 \footcnt=0
 \def\foot#1{\global\advance\footcnt by 1{\parindent=0.25in\parskip=0pt\footnote{$^{\bf\the\footcnt}$}{#1}}}
 
-%%% Fonts %%%
-
-\font\twelverm=cmr12
-\font\twelveit=cmti12
-\font\twelvebf=cmbx12
-
-%\font\twelverm=pplr8z at 12pt
-%\font\twelveit=pplri8z at 12pt
-%\font\twelvebf=pplb8z at 12pt
-
-\font\twelvesl=cmsl12
-\font\twelveb=cmb12
-\font\twelvesc=cmcsc12
+%%% Font definition macros (used in fonts<size>.tex) %%%
 
 \def\mathf@nt#1#2#3#4{%
 \toks0=\expandafter{\csname#1#2\endcsname}%
@@ -111,75 +86,6 @@
 \fi%
 \edef\m@@f{\the\toks0}}
 
-\def\fntmathsize{12}
-\def\fntmathtok{twelve}
-\def\fntmathssize{8}
-\def\fntmathstok{eight}
-\def\fntmathsssize{6}
-\def\fntmathsstok{six}
-
-\mathf@nt{\fntmathtok}{r}{\fntmathsize}{cm}\textfont0=\m@@f
-\mathf@nt{\fntmathstok}{r}{\fntmathssize}{cm}\scriptfont0=\m@@f
-\mathf@nt{\fntmathsstok}{r}{\fntmathsssize}{cm}\scriptscriptfont0=\m@@f
-\mathf@nt{\fntmathtok}{mi}{\fntmathsize}{cm}\skewchar\m@@f='177\textfont1=\m@@f
-\mathf@nt{\fntmathstok}{mi}{\fntmathssize}{cm}\skewchar\m@@f='177\scriptfont1=\m@@f
-\mathf@nt{\fntmathsstok}{mi}{\fntmathsssize}{cm}\skewchar\m@@f='177\scriptscriptfont1=\m@@f
-\mathf@nt{\fntmathtok}{sy}{\fntmathsize}{cm}\skewchar\m@@f='60\textfont2=\m@@f
-\mathf@nt{\fntmathstok}{sy}{\fntmathssize}{cm}\skewchar\m@@f='60\scriptfont2=\m@@f
-\mathf@nt{\fntmathsstok}{sy}{\fntmathsssize}{cm}\skewchar\m@@f='60\scriptscriptfont2=\m@@f
-\mathf@nt{\fntmathtok}{ex}{\fntmathsize}{cm}\textfont3=\m@@f\scriptfont3=\m@@f\scriptscriptfont3=\m@@f
-\mathf@nt{\fntmathtok}{ti}{\fntmathsize}{cm}\textfont\itfam=\m@@f
-\mathf@nt{\fntmathstok}{ti}{\fntmathssize}{cm}\scriptfont\itfam=\m@@f
-\mathf@nt{\fntmathsstok}{ti}{\fntmathssize}{cm}\scriptscriptfont\itfam=\m@@f
-\mathf@nt{\fntmathtok}{sl}{\fntmathsize}{cm}\textfont\slfam=\m@@f
-\mathf@nt{\fntmathtok}{bx}{\fntmathsize}{cm}\textfont\bffam=\m@@f
-\mathf@nt{\fntmathtok}{tt}{\fntmathsize}{cm}\hyphenchar\m@@f=-1\textfont\ttfam=\m@@f
-\mathf@nt{\fntmathtok}{msam}{\fntmathsize}{}\textfont\msafam=\m@@f
-\mathf@nt{\fntmathstok}{msam}{\fntmathssize}{}\scriptfont\msafam=\m@@f
-\mathf@nt{\fntmathsstok}{msam}{\fntmathsssize}{}\scriptscriptfont\msafam=\m@@f
-\mathf@nt{\fntmathtok}{msbm}{\fntmathsize}{}\textfont\msbfam=\m@@f
-\mathf@nt{\fntmathstok}{msbm}{\fntmathssize}{}\scriptfont\msbfam=\m@@f
-\mathf@nt{\fntmathsstok}{msbm}{\fntmathsssize}{}\scriptscriptfont\msbfam=\m@@f
-
-% Blackboard bold font
-\newfam\bbfam
-\font\bbtwelve=bbm12
-\font\bbeight=bbm8
-\font\bbsix=bbm6
-\textfont\bbfam=\bbtwelve
-\scriptfont\bbfam=\bbeight
-\scriptscriptfont\bbfam=\bbsix
-\def\bb{\bbtwelve\fam\bbfam}
-
-% Font switches
-\def\rm{\fam\z@\twelverm}
-\def\it{\fam\itfam\twelveit}
-\def\bo{\fam\bffam\twelveb}
-\def\bf{\fam\bffam\twelvebf}
-\def\tt{\fam\ttfam\twelvett\hyphenchar\twelvett=-1\relax}
-\def\sc{\twelvesc}
-\def\sl{\fam\slfam\twelvesl}
-
-% Switch to 12pt baselines
-\rm
-\baselineskip=14.4pt
-\lineskip=1.2pt
-\setbox\strutbox=\hbox{\vrule height 10.2pt depth 4.2pt width 0pt}
-
-% Other fonts
-\font\chapfont=csssdc17 scaled \magstep1
-\font\secfont=csb14
-\font\secitfont=csbxti14
-
-%%% FIXME
-\footline={\hss\twelverm\folio\hss}
-
-% We have to redefine \big and friends as we are using 12pt symbols
-\def\big#1{{\hbox{$\left#1\vbox to11.5\p@{}\right.\n@space$}}}
-\def\Big#1{{\hbox{$\left#1\vbox to14.5\p@{}\right.\n@space$}}}
-\def\bigg#1{{\hbox{$\left#1\vbox to17.5\p@{}\right.\n@space$}}}
-\def\Bigg#1{{\hbox{$\left#1\vbox to20.5\p@{}\right.\n@space$}}}
-
 %%% Enumerated lists %%%
 
 \newif\ifitem\itemtrue
@@ -543,9 +449,9 @@
 \def\makefootline{\baselineskip30pt\lineskiplimit 0pt\line{\the\footline}}
 
 \footline={\ifodd\pageno
-  {\hfil\twelvemi\the\pageno}%
+  {\hfil\mi\the\pageno}%
 \else
-  {\twelvemi\the\pageno\hfil}%
+  {\mi\the\pageno\hfil}%
 \fi
 }