Grammar

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

diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc
index 94bc673876e53700aa2128d28d06a59d53e17e5d..37577235ac9a12a412b7eef3b6c9db668718ee66 100644 (file)
--- a/lib/layouts/theorems-ams-chap-bytype.inc
+++ b/lib/layouts/theorems-ams-chap-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
 # Chapter dependence added Oct '16 by Andrew Parsloe <aparsloe@clear.net.nz>
 
@@ -23,59 +23,48 @@
 # - Case (by inclusion)
 
 
-# We need separate counters for each theorem-like style.
-Format 85
+Format 104
+
+Input theorems-counters-bytype.inc
+
 Counter theorem
-       GuiName Theorem
-       Within         chapter
+       Within chapter
 End
 Counter corollary
-       GuiName Corollary
-       Within         chapter
+       Within chapter
 End
 Counter lemma
-       GuiName Lemma
-       Within         chapter
+       Within chapter
 End
 Counter proposition
-       GuiName Proposition
-       Within         chapter
+       Within chapter
 End
 Counter conjecture
-       GuiName Conjecture
-       Within         chapter
+       Within chapter
 End
 Counter fact
-       GuiName Fact
-       Within         chapter
+       Within chapter
 End
 Counter definition
-       GuiName Definition
-       Within         chapter
+       Within chapter
 End
 Counter example
-       GuiName Example
-       Within         chapter
+       Within chapter
 End
 Counter problem
-       GuiName Problem
-       Within         chapter
+       Within chapter
 End
 Counter exercise
-       GuiName Exercise
-       Within         chapter
+       Within chapter
 End
 Counter solution
-       GuiName Solution
-       Within         chapter
+       Within chapter
 End
 Counter remark
-       GuiName Remark
-       Within         chapter
+       Within chapter
 End
 Counter claim
-       GuiName Claim
-       Within         chapter
+       Within chapter
 End
 
 OutlinerName thm "Definitions & Theorems"
@@ -129,8 +118,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
 
 
@@ -153,8 +145,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
 
 
@@ -177,8 +172,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
 
 
@@ -201,8 +199,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
 
 
@@ -225,8 +226,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
 
 
@@ -249,8 +253,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
 
 
@@ -280,8 +287,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
 
 
@@ -307,7 +317,7 @@ Style Example
        LabelCounter          example
        DocBookWrapperTag     informalexample
        DocBookTag            para
-       DocBookAttr        ""
+       DocBookAttr           ""
 End
 
 
@@ -331,8 +341,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
 
 
@@ -356,8 +369,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
 
 
@@ -381,8 +397,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
 
 
@@ -413,8 +432,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
 
 
@@ -438,9 +460,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