Korektury.

[saga.git] / macros.tex

diff --git a/macros.tex b/macros.tex
index ca99e441dc46cfb281423de86033ee0a4a369d96..bedae0c16f8539fd5fd1560e4ab0169ee92ece95 100644 (file)
--- a/macros.tex
+++ b/macros.tex
@@ -36,12 +36,14 @@
 \def\symdiff{\mathbin{\Delta}}
 \def\hphantas#1#2{\setbox0=\hbox{#2}\hbox to \wd0{#1\hss}}
 \def\o#1{\accent23 #1}
-\def\mst{{\rm mst}}
+\def\mst{\mathop{\rm mst}}
+\def\deg{\mathop{\rm deg}}
+\def\timesalpha{\mskip2mu\alpha}
 
 % Footnotes
 \newcount\footcnt
 \footcnt=0
-\def\foot#1{\global\advance\footcnt by 1{\parindent=0.25in\parskip=0pt\footnote{$^{\the\footcnt}$}{#1}}}
+\def\foot#1{\global\advance\footcnt by 1{\parindent=0.25in\parskip=0pt\footnote{$^{\bf\the\footcnt}$}{#1}}}
 
 %%% Fonts %%%
 
@@ -273,24 +275,28 @@
 \chapcount=0
 \seccount=0
 \thmcount=0
+\def\currentid{??}
 
 \def\chapter#1{\vfill\supereject
 \advance\chapcount by 1
 \seccount=0
 \thmcount=0
-\leftline{\chapfont\the\chapcount. #1}
+\edef\currentid{\the\chapcount}
+\leftline{\chapfont\currentid. #1}
 \bigskip
 }
 
 \def\section#1{\bigskip
 \advance\seccount by 1
 \thmcount=0
-\leftline{\secfont\the\chapcount.\the\seccount. #1}
+\edef\currentid{\the\chapcount.\the\seccount}
+\leftline{\secfont\currentid. #1}
 \medskip
 }
 
 \def\proclaim#1{\advance\thmcount by 1
-\noindent {\bo \the\chapcount.\the\seccount.\the\thmcount.\enspace #1.\enspace}}
+\edef\currentid{\the\chapcount.\the\seccount.\the\thmcount}
+\noindent {\bo \currentid.\enspace #1.\enspace}}
 
 \def\thm{\proclaim{Theorem}}
 \def\lemma{\proclaim{Lemma}}
@@ -334,13 +340,7 @@
 \fi
 }
 
-\def\chapid#1{\writeid{ch#1}{\the\chapcount}}
-\def\secid#1{\writeid{sec#1}{\the\chapcount.\the\seccount}}
-\def\thmid#1{\writeid{thm#1}{\the\chapcount.\the\seccount.\the\thmcount}}
-
-\def\chapref#1{\ref{ch#1}}
-\def\secref#1{\ref{sec#1}}
-\def\thmref#1{\ref{thm#1}}
+\def\id#1{\writeid{#1}{\currentid}}
 
 %%% Bibliography %%%