More tweaks, and some fixes for missing files in the makefiles, while we're at it.

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 050a281ed38ec1f6501a6a32b3d1b1f8dc29adcd..51ad3f52bdd1bea8d32b2ba95a61f5f72fa84de5 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2594,8 +2594,10 @@ lib_layouts_inc_files = Split('''
     numreport.inc
     numrevtex.inc
     scrclass.inc
+    stdcharstyles.inc
     stdclass.inc
     stdcounters.inc
+    stdcustom.inc
     stdfloats.inc
     stdinsets.inc
     stdlayouts.inc

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f28c8871ced8e1f59abdc67af2beb96555455c3b..9564df109a68b2abf881e77cd2be4b8dad634b45 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1029,7 +1029,9 @@ dist_layouts_DATA =\
        layouts/slides.layout \
        layouts/spie.layout \
        layouts/stdclass.inc \
+       layouts/stdcharstyles.inc \
        layouts/stdcounters.inc \
+       layouts/stdcustom.inc \
        layouts/stdfloats.inc \
        layouts/stdinsets.inc \
        layouts/stdlayouts.inc \

diff --git a/lib/layouts/theorems-order.inc b/lib/layouts/theorems-order.inc
new file mode 100644 (file)
index 0000000..d15c8e1
--- /dev/null
+++ b/lib/layouts/theorems-order.inc
@@ -0,0 +1,77 @@
+# Sets the order of the main theorem environments
+# Author: Richard Heck
+
+Format 6
+
+#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
+
+Style Case
+End
+
+Style Proof
+End

diff --git a/lib/layouts/theorems-starred-equivalents.inc b/lib/layouts/theorems-starred-equivalents.inc
new file mode 100644 (file)
index 0000000..75f0706
--- /dev/null
+++ b/lib/layouts/theorems-starred-equivalents.inc
@@ -0,0 +1,49 @@
+# Sets the order of the main theorem environments
+# Author: Richard Heck
+
+Format 6
+
+#Get the order right
+Style Theorem
+       CopyStyle Theorem*
+End
+
+Style Corollary
+       CopyStyle Corollary*
+End
+
+Style Lemma
+       CopyStyle Lemma*
+End
+
+Style Proposition
+       CopyStyle Proposition*
+End
+
+Style Conjecture
+       CopyStyle Conjecture*
+End
+
+Style Definition
+       CopyStyle Definition*
+End
+
+Style Example
+       CopyStyle Example*
+End
+
+Style Problem
+       CopyStyle Problem*
+End
+
+Style Exercise
+       CopyStyle Exercise*
+End
+
+Style Remark
+       CopyStyle Remark*
+End
+
+Style Claim
+       CopyStyle Claim*
+End