From: Richard Heck <rgheck@comcast.net>
Date: Thu, 24 Jul 2008 22:28:57 +0000 (+0000)
Subject: Don't define the proof environment if it's already defined.
X-Git-Tag: 1.6.10~3885
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2aa40fe939b096f738e619eb17780383e9e24f14;p=lyx.git

Don't define the proof environment if it's already defined.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25877 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module
index 23cfcd68c4..1bf04e6e1e 100644
--- a/lib/layouts/theorems-std.module
+++ b/lib/layouts/theorems-std.module
@@ -20,16 +20,18 @@ Input theorems-proof.inc
 #This is just a hacked version of the AMS proof environment
 Style Proof
   Preamble
-    \newenvironment{proof}[1][\proofname]{\par
-      \normalfont\topsep6\p@\@plus6\p@\relax
-      \trivlist
-      \itemindent\parindent
-      \item[\hskip\labelsep
-            \scshape
-        #1]\ignorespaces
-    }{%
-      \endtrivlist\@endpefalse
-    }
-    \providecommand{\proofname}{Proof}
+    \ifx\proof\undefined\
+      \newenvironment{proof}[1][\proofname]{\par
+        \normalfont\topsep6\p@\@plus6\p@\relax
+        \trivlist
+        \itemindent\parindent
+        \item[\hskip\labelsep
+              \scshape
+          #1]\ignorespaces
+      }{%
+        \endtrivlist\@endpefalse
+      }
+      \providecommand{\proofname}{Proof}
+    \fi
   EndPreamble
 End
\ No newline at end of file