Fix the fix.

[saga.git] / macros.tex

diff --git a/macros.tex b/macros.tex
index 2a99ea127c9bfdcc4c8b7190b82e73cbb5df4a46..4a0fd1ee707cc18f0bed6b6812c1ce0f5e8a6624 100644 (file)
--- a/macros.tex
+++ b/macros.tex
@@ -3,6 +3,7 @@
 
 \input epsf.tex
 \input btxmac.tex
+%\input amssym.tex
 
 \catcode`@=11
 
@@ -35,7 +36,7 @@
 \def\qeditem{{\parfillskip=0pt\hfill\rlap{\hskip\rightskip\llap{$\spadesuit$}}\par}}
 \def\FIXME#1{\>{\bo TODO:} #1}
 \def\symdiff{\mathbin{\Delta}}
-\def\hphantas#1#2{\setbox0=\hbox{#2}\hbox to \wd0{#1\hss}}
+\def\rack#1#2{\setbox0=\hbox{#1}\hbox to \wd0{#2}}
 \def\o#1{\accent23 #1}
 \def\mst{\mathop{\rm mst}}
 \def\deg{\mathop{\rm deg}}
@@ -43,6 +44,24 @@
 \def\timesbeta{\mskip2mu\beta}
 \def\tower{\mathop\uparrow}
 
+% Bit strings
+\def\0{{\bf 0}}
+\def\1{{\bf 1}}
+\def\(#1){\mathord{\left<#1\right>}}
+
+% Bitwise operations
+\def\shl{\mathbin{<\!<}}
+\def\shr{\mathbin{>\!>}}
+\def\bop#1{\mathbin{\hbox{\sc #1}}}
+\def\band{\bop{and}}
+\def\bor{\bop{or}}
+\def\bxor{\bop{xor}}
+\def\bnot{\mathop{\hbox{\sc not}}}
+
+% A reversed version of \ddots with extra space at the top to get good alignment of exponents.
+\def\rddots{\mathinner{\mkern1mu\raise\p@\vbox{\kern7\p@\hbox{.}}\mkern2mu
+    \raise4\p@\hbox{.}\mkern2mu\raise7\p@\hbox{.}\raise11\p@\hbox{}\mkern1mu}}
+
 % Footnotes
 \newcount\footcnt
 \footcnt=0
@@ -91,6 +110,12 @@
 \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
@@ -120,6 +145,7 @@
 % Other fonts
 \font\chapfont=csssdc17 scaled \magstep1
 \font\secfont=csb14
+\font\secitfont=csbxti14
 
 %%% FIXME
 \footline={\hss\twelverm\folio\hss}
@@ -284,6 +310,7 @@
 \advance\chapcount by 1
 \seccount=0
 \thmcount=0
+\footcnt=0
 \edef\currentid{\the\chapcount}
 \leftline{\chapfont\currentid. #1}
 \bigskip
@@ -321,6 +348,7 @@
 \def\lemman{\lemma\label}
 \def\defnn{\defn\label}
 \def\algn{\alg\label}
+\def\notan{\nota\label}
 
 \def\proof{\noindent {\sl Proof.}\enspace}
 \def\proofsketch{\noindent {\sl Proof sketch.}\enspace}