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 b4829d622e39663c3376f5d2f14269aece233f2f..050a281ed38ec1f6501a6a32b3d1b1f8dc29adcd 100644 (file)
--- 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 f2aa1c7fc6c89d58cb9dace4667e8d994370fb58..f28c8871ced8e1f59abdc67af2beb96555455c3b 100644 (file)
--- 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 41764e218b6d86f2078e9a2ac3a13a964c90ccc0..7b06b445b9c1547ad69fbb780d654c11c9ea6ea4 100644 (file)
--- 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 67704f89759512cbda3590b6041bd5300b62af6b..649762ed1cbaeb40f4d9b6c9846a25813b6d9d38 100644 (file)
--- 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 5ee9b8a4eff653c03ffa14e64d0f4a179373067a..df751dbea6007f988747a37ccc5100f92005bb9d 100644 (file)
--- 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 5776a9fe58d31b940a7c23091170a8063a341d72..a85561b850a8e8ffe8c959c4750de044be4c2814 100644 (file)
--- 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."