Wrap all mjotex files in conditionals to prevent double-loading.

[mjotex.git] / mjo-convex.tex

diff --git a/mjo-convex.tex b/mjo-convex.tex
index f482f9f2fa4eeac75155f05893fc3a3fe4f5bfc8..dfc282213908c28028b8d018474de6b19a368555 100644 (file)
--- a/mjo-convex.tex
+++ b/mjo-convex.tex
@@ -1,6 +1,12 @@
 %
 % Operations that usually appear in convex optimization.
 %
+\ifx\havemjoconvex\undefined
+\def\havemjoconvex{1}
+
+
+% Needed for \operatorname.
+\usepackage{amsopn}
 
 \input{mjo-common}
 
@@ -19,5 +25,12 @@
 % The ``lineality'' operator.
 \newcommand*{\lin}[1]{ \operatorname{lin} \of{{#1}} }
 
-% The ``Exteme vectors'' operator.
+% The ``Extreme vectors'' (or ``Extreme directions'') operator.
 \newcommand*{\Ext}[1]{ \operatorname{Ext} \of{{#1}} }
+
+% The "is a face of" and "is a proper face of" relations.
+\newcommand*{\faceof}{ \trianglelefteq }
+\newcommand*{\properfaceof}{ \triangleleft }
+
+
+\fi