Merge branch 'master' of git.lyx.org:lyx

[features.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 e4528f712fdd321c894f5f34818839093b576a10..a8ea0be05d151ef8252e68646331b9f2869bac72 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 82
+Format 95
+
+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,6 +118,8 @@ Style Theorem
                \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
        EndBabelPreamble
        Requires              amsthm
+       DocBookTag            para
+       DocBookAttr           role='theorem'
 End
 
 
@@ -151,6 +142,8 @@ Style Corollary
        BabelPreamble
                \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
        EndBabelPreamble
+       DocBookTag            para
+       DocBookAttr           role='corollary'
 End
 
 
@@ -173,6 +166,8 @@ Style Lemma
          \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
        EndBabelPreamble
        LabelCounter          lemma
+       DocBookTag            para
+       DocBookAttr           role='lemma'
 End
 
 
@@ -195,6 +190,8 @@ Style Proposition
          \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
        EndBabelPreamble
        LabelCounter          proposition
+       DocBookTag            para
+       DocBookAttr           role='proposition'
 End
 
 
@@ -217,6 +214,8 @@ Style Conjecture
          \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
        EndBabelPreamble
        LabelCounter          conjecture
+       DocBookTag            para
+       DocBookAttr           role='conjecture'
 End
 
 
@@ -239,6 +238,8 @@ Style Fact
          \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
        EndBabelPreamble
        LabelCounter          fact
+       DocBookTag            para
+       DocBookAttr           role='fact'
 End
 
 
@@ -268,6 +269,8 @@ Style Definition
          \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
        EndBabelPreamble
        LabelCounter          definition
+       DocBookTag            para
+       DocBookAttr           role='definition'
 End
 
 
@@ -291,6 +294,9 @@ Style Example
          \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
        EndBabelPreamble
        LabelCounter          example
+       DocBookWrapperTag     informalexample
+       DocBookTag            para
+       DocBookAttr        ""
 End
 
 
@@ -314,6 +320,8 @@ Style Problem
          \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
        EndBabelPreamble
        LabelCounter          problem
+       DocBookTag            para
+       DocBookAttr           role='problem'
 End
 
 
@@ -337,6 +345,8 @@ Style Exercise
          \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
        EndBabelPreamble
        LabelCounter          exercise
+       DocBookTag            para
+       DocBookAttr           role='exercise'
 End
 
 
@@ -360,6 +370,8 @@ Style Solution
                \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
        EndBabelPreamble
        LabelCounter          solution
+       DocBookTag            para
+       DocBookAttr           role='solution'
 End
 
 
@@ -415,6 +427,9 @@ Style Claim
          \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
        EndBabelPreamble
        LabelCounter          claim
+       DocBookTag            para
+       DocBookAttr           role='claim'
+       DocBookItemTag        ""
 End