Update covington support in linguistics module (file format change)

[lyx.git] / lib / layouts / theorems-ams-bytype.inc

diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc
index b76b1db0ba9c71ffb28a7e0d315a6b0b25500d3c..1aefb1565f92f530fd96a69345dce3bcae50199e 100644 (file)
--- a/lib/layouts/theorems-ams-bytype.inc
+++ b/lib/layouts/theorems-ams-bytype.inc
@@ -2,7 +2,7 @@
 # Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
 # modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
 # Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
-# Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
+# Modularized Jan 08 by Richard Kimberly Heck <rikiheck@lyx.org>
 # Hacked June '09 by Paul Rubin <rubin@msu.edu> to use separate counters
 
 # The environments defined are :
@@ -21,55 +21,9 @@
 # - Claim
 # - Case (by inclusion)
 
-# We need separate counters for each theorem-like style.
-Format 89
-Counter theorem
-       GuiName Theorem
-       LaTeXName thm
-End
-Counter corollary
-       GuiName Corollary
-       LaTeXName cor
-End
-Counter lemma
-       GuiName Lemma
-       LaTeXName lem
-End
-Counter proposition
-       GuiName Proposition
-       LaTeXName prop
-End
-Counter conjecture
-       GuiName Conjecture
-End
-Counter fact
-       GuiName Fact
-End
-Counter definition
-       GuiName Definition
-       LaTeXName defn
-End
-Counter example
-       GuiName Example
-End
-Counter problem
-       GuiName Problem
-End
-Counter exercise
-       GuiName Exercise
-       LaTeXName xca
-End
-Counter solution
-       GuiName Solution
-       LaTeXName sol
-End
-Counter remark
-       GuiName Remark
-       LaTeXName rem
-End
-Counter claim
-       GuiName Claim
-End
+Format 100
+
+Input theorems-counters-bytype.inc
 
 OutlinerName thm "Definitions & Theorems"
 
@@ -118,8 +72,11 @@ Style Theorem
                \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
        EndBabelPreamble
        Requires              amsthm
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='theorem'
        DocBookTag            para
-       DocBookAttr           role='theorem'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -138,8 +95,11 @@ Style Corollary
        BabelPreamble
                \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
        EndBabelPreamble
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='corollary'
        DocBookTag            para
-       DocBookAttr           role='corollary'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -158,8 +118,11 @@ Style Lemma
          \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
        EndBabelPreamble
        LabelCounter          lemma
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='lemma'
        DocBookTag            para
-       DocBookAttr           role='lemma'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -178,8 +141,11 @@ Style Proposition
          \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
        EndBabelPreamble
        LabelCounter          proposition
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='proposition'
        DocBookTag            para
-       DocBookAttr           role='proposition'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -198,8 +164,11 @@ Style Conjecture
          \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
        EndBabelPreamble
        LabelCounter          conjecture
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='conjecture'
        DocBookTag            para
-       DocBookAttr           role='conjecture'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -218,8 +187,11 @@ Style Fact
          \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
        EndBabelPreamble
        LabelCounter          fact
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='fact'
        DocBookTag            para
-       DocBookAttr           role='fact'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -245,8 +217,11 @@ Style Definition
          \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
        EndBabelPreamble
        LabelCounter          definition
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='definition'
        DocBookTag            para
-       DocBookAttr           role='definition'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -268,7 +243,7 @@ Style Example
        LabelCounter          example
        DocBookWrapperTag     informalexample
        DocBookTag            para
-       DocBookAttr        ""
+       DocBookAttr           ""
 End
 
 
@@ -288,8 +263,11 @@ Style Problem
          \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
        EndBabelPreamble
        LabelCounter          problem
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='problem'
        DocBookTag            para
-       DocBookAttr           role='problem'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -309,8 +287,11 @@ Style Exercise
          \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
        EndBabelPreamble
        LabelCounter          exercise
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='exercise'
        DocBookTag            para
-       DocBookAttr           role='exercise'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -330,8 +311,11 @@ Style Solution
                \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
        EndBabelPreamble
        LabelCounter          solution
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='solution'
        DocBookTag            para
-       DocBookAttr           role='solution'
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -358,8 +342,11 @@ Style Remark
          \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
        EndBabelPreamble
        LabelCounter          remark
-       DocBookTag            note
-       DocBookItemTag        para
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='remark'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -379,9 +366,11 @@ Style Claim
          \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
        EndBabelPreamble
        LabelCounter          claim
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='claim'
        DocBookTag            para
-       DocBookAttr           role='claim'
-       DocBookItemTag        ""
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc