Update layouts (run layout2layout.py)

[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 ffca387af0b68f37ac950bd4f5814ecfa8ddd831..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,46 +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
 End
 Counter corollary
-       GuiName Corollary
+       Within chapter
 End
 Counter lemma
-       GuiName Lemma
+       Within chapter
 End
 Counter proposition
-       GuiName Proposition
+       Within chapter
 End
 Counter conjecture
-       GuiName Conjecture
+       Within chapter
 End
 Counter fact
-       GuiName Fact
+       Within chapter
 End
 Counter definition
-       GuiName Definition
+       Within chapter
 End
 Counter example
-       GuiName Example
+       Within chapter
 End
 Counter problem
-       GuiName Problem
+       Within chapter
 End
 Counter exercise
-       GuiName Exercise
+       Within chapter
 End
 Counter solution
-       GuiName Solution
+       Within chapter
 End
 Counter remark
-       GuiName Remark
+       Within chapter
 End
 Counter claim
-       GuiName Claim
+       Within chapter
 End
 
 OutlinerName thm "Definitions & Theorems"
@@ -92,7 +94,7 @@ Style Theorem
        AlignPossible         Left
        LabelType             Static
        LabelCounter          theorem
-       LabelString           "Theorem \thechapter.\thetheorem."
+       LabelString           "Theorem \thetheorem."
        Font
          Shape               Italic
          Size                Normal
@@ -116,13 +118,15 @@ Style Theorem
                \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
        EndBabelPreamble
        Requires              amsthm
+       DocBookTag            para
+       DocBookAttr           role='theorem'
 End
 
 
 Style Corollary
        CopyStyle             Theorem
        LatexName             cor
-       LabelString           "Corollary \thechapter.\thecorollary."
+       LabelString           "Corollary \thecorollary."
        Preamble
          \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -138,13 +142,15 @@ Style Corollary
        BabelPreamble
                \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
        EndBabelPreamble
+       DocBookTag            para
+       DocBookAttr           role='corollary'
 End
 
 
 Style Lemma
        CopyStyle             Theorem
        LatexName             lem
-       LabelString           "Lemma \thechapter.\thelemma."
+       LabelString           "Lemma \thelemma."
        Preamble
          \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -160,13 +166,15 @@ Style Lemma
          \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
        EndBabelPreamble
        LabelCounter          lemma
+       DocBookTag            para
+       DocBookAttr           role='lemma'
 End
 
 
 Style Proposition
        CopyStyle             Theorem
        LatexName             prop
-       LabelString           "Proposition \thechapter.\theproposition."
+       LabelString           "Proposition \theproposition."
        Preamble
          \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -182,13 +190,15 @@ Style Proposition
          \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
        EndBabelPreamble
        LabelCounter          proposition
+       DocBookTag            para
+       DocBookAttr           role='proposition'
 End
 
 
 Style Conjecture
        CopyStyle             Theorem
        LatexName             conjecture
-       LabelString           "Conjecture \thechapter.\theconjecture."
+       LabelString           "Conjecture \theconjecture."
        Preamble
          \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -204,13 +214,15 @@ Style Conjecture
          \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
        EndBabelPreamble
        LabelCounter          conjecture
+       DocBookTag            para
+       DocBookAttr           role='conjecture'
 End
 
 
 Style Fact
        CopyStyle             Theorem
        LatexName             fact
-       LabelString           "Fact \thechapter.\thefact."
+       LabelString           "Fact \thefact."
        Preamble
          \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -226,13 +238,15 @@ Style Fact
          \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
        EndBabelPreamble
        LabelCounter          fact
+       DocBookTag            para
+       DocBookAttr           role='fact'
 End
 
 
 Style Definition
        CopyStyle             Theorem
        LatexName             defn
-       LabelString           "Definition \thechapter.\thedefinition."
+       LabelString           "Definition \thedefinition."
        Font
          Shape               Up
        EndFont
@@ -255,13 +269,15 @@ Style Definition
          \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
        EndBabelPreamble
        LabelCounter          definition
+       DocBookTag            para
+       DocBookAttr           role='definition'
 End
 
 
 Style Example
        CopyStyle             Definition
        LatexName             example
-       LabelString           "Example \thechapter.\theexample."
+       LabelString           "Example \theexample."
        Preamble
          \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -278,13 +294,16 @@ Style Example
          \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
        EndBabelPreamble
        LabelCounter          example
+       DocBookWrapperTag     informalexample
+       DocBookTag            para
+       DocBookAttr        ""
 End
 
 
 Style Problem
        CopyStyle             Definition
        LatexName             problem
-       LabelString           "Problem \thechapter.\theproblem."
+       LabelString           "Problem \theproblem."
        Preamble
          \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -301,13 +320,15 @@ Style Problem
          \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
        EndBabelPreamble
        LabelCounter          problem
+       DocBookTag            para
+       DocBookAttr           role='problem'
 End
 
 
 Style Exercise
        CopyStyle             Definition
        LatexName             xca
-       LabelString           "Exercise \thechapter.\theexercise."
+       LabelString           "Exercise \theexercise."
        Preamble
          \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -324,13 +345,15 @@ Style Exercise
          \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
        EndBabelPreamble
        LabelCounter          exercise
+       DocBookTag            para
+       DocBookAttr           role='exercise'
 End
 
 
 Style Solution
        CopyStyle             Definition
        LatexName             sol
-       LabelString           "Solution \thechapter.\thesolution."
+       LabelString           "Solution \thesolution."
        Preamble
          \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -347,13 +370,15 @@ Style Solution
                \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
        EndBabelPreamble
        LabelCounter          solution
+       DocBookTag            para
+       DocBookAttr           role='solution'
 End
 
 
 Style Remark
        CopyStyle             Theorem
        LatexName             rem
-       LabelString           "Remark \thechapter.\theremark."
+       LabelString           "Remark \theremark."
        Font
          Shape               Up
          Size                Normal
@@ -385,7 +410,7 @@ End
 Style Claim
        CopyStyle             Remark
        LatexName             claim
-       LabelString           "Claim \thechapter.\theclaim."
+       LabelString           "Claim \theclaim."
        Preamble
          \theoremstyle{remark}
     \ifx\thechapter\undefined
@@ -402,6 +427,9 @@ Style Claim
          \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
        EndBabelPreamble
        LabelCounter          claim
+       DocBookTag            para
+       DocBookAttr           role='claim'
+       DocBookItemTag        ""
 End