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 48527845e22c1d9c06c3d0a32cc9e47bbab23381..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 :
@@ -16,36 +16,16 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
 # - Case (by inclusion)
 
-# We need separate counters for each theorem-like style.
-Format 48
-Counter theorem
-End
-Counter corollary
-End
-Counter lemma
-End
-Counter proposition
-End
-Counter conjecture
-End
-Counter fact
-End
-Counter definition
-End
-Counter example
-End
-Counter problem
-End
-Counter exercise
-End
-Counter remark
-End
-Counter claim
-End
+Format 100
+
+Input theorems-counters-bytype.inc
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
        Category              Reasoning
@@ -53,9 +33,13 @@ Style Theorem
        LatexType             Environment
        LatexName             thm
        NextNoIndent          1
+       ResetArgs             1
+       AddToToc              thm
+       IsTocCaption          1
        Argument 1
-               LabelString   "Alternative Theorem String|S"
-               Tooltip       "Alternative theorem string"
+               LabelString    "Additional Theorem Text"
+               Tooltip        "Additional text appended to the theorem header"
+               IsTocCaption      1
        EndArgument
        LabelSep              xx
        ParIndent             MMM
@@ -88,6 +72,11 @@ Style Theorem
                \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
        EndBabelPreamble
        Requires              amsthm
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='theorem'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -106,6 +95,11 @@ Style Corollary
        BabelPreamble
                \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
        EndBabelPreamble
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='corollary'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -124,6 +118,11 @@ Style Lemma
          \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
        EndBabelPreamble
        LabelCounter          lemma
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='lemma'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -142,6 +141,11 @@ Style Proposition
          \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
        EndBabelPreamble
        LabelCounter          proposition
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='proposition'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -160,6 +164,11 @@ Style Conjecture
          \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
        EndBabelPreamble
        LabelCounter          conjecture
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='conjecture'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -178,6 +187,11 @@ Style Fact
          \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
        EndBabelPreamble
        LabelCounter          fact
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='fact'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -203,6 +217,11 @@ Style Definition
          \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
        EndBabelPreamble
        LabelCounter          definition
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='definition'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -222,6 +241,9 @@ Style Example
          \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
        EndBabelPreamble
        LabelCounter          example
+       DocBookWrapperTag     informalexample
+       DocBookTag            para
+       DocBookAttr           ""
 End
 
 
@@ -241,6 +263,11 @@ Style Problem
          \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
        EndBabelPreamble
        LabelCounter          problem
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='problem'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -260,6 +287,35 @@ Style Exercise
          \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
        EndBabelPreamble
        LabelCounter          exercise
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='exercise'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
+End
+
+
+Style Solution
+       CopyStyle             Definition
+       LatexName             sol
+       LabelString           "Solution \thesolution."
+       Preamble
+         \theoremstyle{definition}
+         \newtheorem{sol}{\protect\solutionname}
+       EndPreamble
+       Requires              amsthm
+       LangPreamble
+               \providecommand{\solutionname}{_(Solution)}
+       EndLangPreamble
+       BabelPreamble
+               \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+       EndBabelPreamble
+       LabelCounter          solution
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='solution'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -286,6 +342,11 @@ Style Remark
          \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
        EndBabelPreamble
        LabelCounter          remark
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='remark'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -305,6 +366,11 @@ Style Claim
          \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
        EndBabelPreamble
        LabelCounter          claim
+       DocBookWrapperTag     figure
+       DocBookWrapperAttr    role='claim'
+       DocBookTag            para
+       DocBookGenerateTitle  true
+       DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc