From: Richard Heck <rgheck@comcast.net>
Date: Thu, 10 Jan 2008 07:13:01 +0000 (+0000)
Subject: AMS module tweaks.
X-Git-Tag: 1.6.10~6678
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=736418751ad66945a4f70ce276050e62fa15992a;p=lyx.git

AMS module tweaks.


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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index b4829d622e..050a281ed3 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2607,8 +2607,10 @@ lib_layouts_inc_files = Split('''
     stdtitle.inc
     svjour.inc
     theorems.inc
+    theorems-order.inc
     theorems-proof.inc
     theorems-starred.inc
+    theorems-starred-equivalents.inc
 ''')
 
 
@@ -2623,6 +2625,7 @@ lib_layouts_module_files = Split('''
     theorems-ams.module
     theorems-chap.module
     theorems-sec.module
+    theorems-starred.module
     theorems-std.module
 ''')
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f2aa1c7fc6..f28c8871ce 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1049,10 +1049,12 @@ dist_layouts_DATA =\
 	layouts/theorems-ams.module \
 	layouts/theorems-chap.module \
 	layouts/theorems.inc \
+	layouts/theorems-order.inc \
 	layouts/theorems-proof.inc \
 	layouts/theorems-sec.module \
 	layouts/theorems-starred.inc \
 	layouts/theorems-starred.module \
+	layouts/theorems-starred-equivalents.inc \
 	layouts/theorems-std.module \
 	layouts/treport.layout
 
diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module
index 41764e218b..7b06b445b9 100644
--- a/lib/layouts/theorems-ams.module
+++ b/lib/layouts/theorems-ams.module
@@ -25,73 +25,7 @@ Preamble
 	\theoremstyle{plain}
 EndPreamble
 
-#Get the order right
-Style Theorem
-End
-
-Style Theorem*
-End
-
-Style Corollary
-End
-
-Style Corollary*
-End
-
-Style Lemma
-End
-
-Style Lemma*
-End
-
-Style Proposition
-End
-
-Style Proposition*
-End
-
-Style Conjecture
-End
-
-Style Conjecture*
-End
-
-Style Definition
-End
-
-Style Definition*
-End
-
-Style Example
-End
-
-Style Example*
-End
-
-Style Problem
-End
-
-Style Problem*
-End
-
-Style Exercise
-End
-
-Style Exercise*
-End
-
-Style Remark
-End
-
-Style Remark*
-End
-
-Style Claim
-End
-
-Style Claim*
-End
-
+Input theorems-order.inc
 Input theorems.inc
 Input theorems-starred.inc
 Input theorems-proof.inc
diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc
index 67704f8975..649762ed1c 100644
--- a/lib/layouts/theorems-starred.inc
+++ b/lib/layouts/theorems-starred.inc
@@ -21,10 +21,30 @@
 Format 6
 
 Style Theorem*
-	CopyStyle             Theorem
+	LatexType             Environment
+	Margin                First_Dynamic
 	LatexName             thm*
 	LabelType             Static
 	LabelString           "Theorem."
+	NextNoIndent          1
+	OptionalArgs          1
+	LabelSep              xx
+	ParIndent             MMM
+	ParSkip               0.4
+	ItemSep               0.2
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.3
+	Align                 Block
+	AlignPossible         Left
+	Font
+	  Shape               Italic
+	  Size                Normal
+	EndFont
+	LabelFont
+	  Shape               Up
+	  Series              Bold
+	EndFont
 	Preamble
 	  \theoremstyle{plain}
 	  \newtheorem*{thm*}{Theorem}
@@ -88,10 +108,13 @@ End
 
 
 Style Definition*
-	CopyStyle             Definition
+	CopyStyle             Theorem*
 	LatexName             defn*
-	LabelType             Static
+#LabelType             Static
 	LabelString           "Definition."
+	Font
+	  Shape               Up
+	EndFont
 	Preamble
 	 \theoremstyle{definition}
 	 \newtheorem*{defn*}{Definition}
@@ -133,10 +156,17 @@ End
 
 
 Style Remark*
-	CopyStyle             Remark
+	CopyStyle             Theorem*
 	LatexName             rem*
-	LabelType             Static
 	LabelString           "Remark."
+	Font
+	  Shape               Up
+	  Size                Normal
+	EndFont
+	LabelFont
+	  Series              Medium
+	  Shape               Italic
+	EndFont
 	Preamble
 	  \theoremstyle{remark}
 	  \newtheorem*{rem*}{Remark}
diff --git a/lib/layouts/theorems-starred.module b/lib/layouts/theorems-starred.module
index 5ee9b8a4ef..df751dbea6 100644
--- a/lib/layouts/theorems-starred.module
+++ b/lib/layouts/theorems-starred.module
@@ -9,5 +9,7 @@
 
 Format 6
 
+Input theorems-order.inc
 Input theorems-starred.inc
+Input theorems-starred-equivalents.inc
 Input theorems-proof.inc
diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 5776a9fe58..a85561b850 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -35,7 +35,7 @@ Style Theorem
 	BottomSep             0.7
 	ParSep                0.3
 	Align                 Block
-	AlignPossible         Block, Left
+	AlignPossible         Left
 	LabelType             Counter
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."