Fix the fix.

[saga.git] / macros.tex

diff --git a/macros.tex b/macros.tex
index 1738889519b071109f3cab9119f75e2115468996..4a0fd1ee707cc18f0bed6b6812c1ce0f5e8a6624 100644 (file)
--- a/macros.tex
+++ b/macros.tex
@@ -3,6 +3,7 @@
 
 \input epsf.tex
 \input btxmac.tex
+%\input amssym.tex
 
 \catcode`@=11
 
@@ -46,15 +47,16 @@
 % Bit strings
 \def\0{{\bf 0}}
 \def\1{{\bf 1}}
-\def\(#1){\left<#1\right>}
+\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{\bop{not}}
+\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
@@ -108,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
@@ -137,6 +145,7 @@
 % Other fonts
 \font\chapfont=csssdc17 scaled \magstep1
 \font\secfont=csb14
+\font\secitfont=csbxti14
 
 %%% FIXME
 \footline={\hss\twelverm\folio\hss}