DocBook: implement modern CV.

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

diff --git a/lib/layouts/theorems-bytype.inc b/lib/layouts/theorems-bytype.inc
index 1814e16ddc2ca9dec5f592732adb08d9974dfcdb..1617b0caf37dae27190eb189071a99971c852804 100644 (file)
--- a/lib/layouts/theorems-bytype.inc
+++ b/lib/layouts/theorems-bytype.inc
@@ -5,7 +5,7 @@
 # Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
 # Hacked June '09 by Paul Rubin <rubin@msu.edu> to use separate counters
 
-# The environnements defined are :
+# The environments defined are :
 # - Theorem
 # - Corollary
 # - Lemma
@@ -16,20 +16,25 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
 # - Proof
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
-Format 35
+Format 85
 
 Style Theorem
-       Category              Theorem
+       Category              Reasoning
        Margin                First_Dynamic
        LatexType             Environment
        LatexName             thm
        NextNoIndent          1
-       OptionalArgs          1
+       ResetArgs             1
+       Argument 1
+               LabelString    "Additional Theorem Text"
+               Tooltip        "Additional text appended to the theorem header"
+       EndArgument
        LabelSep              xx
        ParIndent             MMM
        ParSkip               0.4
@@ -39,7 +44,7 @@ Style Theorem
        ParSep                0.3
        Align                 Block
        AlignPossible         Left
-       LabelType             Counter
+       LabelType             Static
        LabelCounter          theorem
        LabelString           "Theorem \thetheorem."
        Font
@@ -61,6 +66,8 @@ Style Theorem
                \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
        EndBabelPreamble
        Requires              amsthm
+       DocBookTag            para
+       DocBookAttr           role='theorem'
 End
 
 
@@ -79,6 +86,8 @@ Style Corollary
                \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
        EndBabelPreamble
        LabelCounter          corollary
+       DocBookTag            para
+       DocBookAttr           role='corollary'
 End
 
 
@@ -97,6 +106,8 @@ Style Lemma
                \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
        EndBabelPreamble
        LabelCounter          lemma
+       DocBookTag            para
+       DocBookAttr           role='lemma'
 End
 
 
@@ -115,6 +126,8 @@ Style Proposition
                \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
        EndBabelPreamble
        LabelCounter          proposition
+       DocBookTag            para
+       DocBookAttr           role='proposition'
 End
 
 
@@ -133,6 +146,8 @@ Style Conjecture
                \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
        EndBabelPreamble
        LabelCounter          conjecture
+       DocBookTag            para
+       DocBookAttr           role='conjecture'
 End
 
 
@@ -151,6 +166,8 @@ Style Fact
                \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
        EndBabelPreamble
        LabelCounter          fact
+       DocBookTag            para
+       DocBookAttr           role='fact'
 End
 
 
@@ -176,6 +193,8 @@ Style Definition
                \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
        EndBabelPreamble
        LabelCounter          definition  
+       DocBookTag            para
+       DocBookAttr           role='definition'
 End
 
 
@@ -195,6 +214,9 @@ Style Example
                \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
        EndBabelPreamble
        LabelCounter          example
+       DocBookWrapperTag     informalexample
+       DocBookTag            para
+       DocBookAttr        ""
 End
 
 
@@ -214,6 +236,8 @@ Style Problem
                \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
        EndBabelPreamble
        LabelCounter          problem
+       DocBookTag            para
+       DocBookAttr           role='problem'
 End
 
 
@@ -233,6 +257,29 @@ 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 \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
+       DocBookTag            para
+       DocBookAttr           role='solution'
 End
 
 
@@ -259,6 +306,8 @@ Style Remark
                \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
        EndBabelPreamble
        LabelCounter          remark
+       DocBookTag            note
+       DocBookItemTag        para
 End
 
 
@@ -278,41 +327,10 @@ Style Claim
                \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
        EndBabelPreamble
        LabelCounter          claim
+       DocBookTag            para
+       DocBookAttr           role='claim'
+       DocBookItemTag        ""
 End
 
-
-# Define Case as an enumeration environment
-Style Case
-       Category              Theorem
-       CopyStyle             Enumerate
-       LatexName             caseenv
-       LabelType             Static
-       LeftMargin            "Case ###."
-       LabelString           "Case #."
-       LabelFont
-         Series              Medium
-         Shape               Italic
-       EndFont
-       Preamble
-         \newcounter{casectr}
-         \newenvironment{caseenv}
-         {\begin{list}{{\itshape\ \protect\casename} \arabic{casectr}.}{%
-          \setlength{\leftmargin}{\labelwidth}
-          \addtolength{\leftmargin}{\parskip}
-          \setlength{\itemindent}{\listparindent}
-          \setlength{\itemsep}{\medskipamount}
-          \setlength{\topsep}{\itemsep}}
-          \setcounter{casectr}{0}
-          \usecounter{casectr}}
-         {\end{list}}
-       EndPreamble
-       LangPreamble
-               \providecommand{\casename}{_(Case)}
-       EndLangPreamble
-       BabelPreamble
-               \addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
-       EndBabelPreamble
-       RefPrefix OFF
-End
-
+Input theorems-case.inc
 Input theorems-refprefix.inc