Fix caret painting

[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 13d36831b065176e13a96928d9b13ee73008f3ed..59a9d03aab43ce32c35570509925243f653b452b 100644 (file)
--- a/lib/layouts/theorems-ams-bytype.inc
+++ b/lib/layouts/theorems-ams-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,12 +16,13 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
 # We need separate counters for each theorem-like style.
-Format 30
+Format 66
 Counter theorem
 End
 Counter corollary
@@ -42,20 +43,29 @@ Counter problem
 End
 Counter exercise
 End
+Counter solution
+End
 Counter remark
 End
 Counter claim
 End
 
-Format 11
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
-       Category              Theorem
+       Category              Reasoning
        Margin                First_Dynamic
        LatexType             Environment
        LatexName             thm
        NextNoIndent          1
-       OptionalArgs          1
+       ResetArgs             1
+       AddToToc              thm
+       IsTocCaption          1
+       Argument 1
+               LabelString    "Additional Theorem Text"
+               Tooltip        "Additional text appended to the theorem header"
+               IsTocCaption      1
+       EndArgument
        LabelSep              xx
        ParIndent             MMM
        ParSkip               0.4
@@ -65,7 +75,7 @@ Style Theorem
        ParSep                0.3
        Align                 Block
        AlignPossible         Left
-       LabelType             Counter
+       LabelType             Static
        LabelCounter          theorem
        LabelString           "Theorem \thetheorem."
        Font
@@ -78,8 +88,14 @@ Style Theorem
        EndFont
        Preamble
                \theoremstyle{plain}
-               \newtheorem{thm}{Theorem}
+               \newtheorem{thm}{\protect\theoremname}
        EndPreamble
+       LangPreamble
+               \providecommand{\theoremname}{_(Theorem)}
+       EndLangPreamble
+       BabelPreamble
+               \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
+       EndBabelPreamble
        Requires              amsthm
 End
 
@@ -90,9 +106,15 @@ Style Corollary
        LabelString           "Corollary \thecorollary."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{cor}{Corollary}
+         \newtheorem{cor}{\protect\corollaryname}
        EndPreamble
        LabelCounter          corollary
+       LangPreamble
+               \providecommand{\corollaryname}{_(Corollary)}
+       EndLangPreamble
+       BabelPreamble
+               \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+       EndBabelPreamble
 End
 
 
@@ -102,8 +124,14 @@ Style Lemma
        LabelString           "Lemma \thelemma."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{lem}{Lemma}
+         \newtheorem{lem}{\protect\lemmaname}
        EndPreamble
+       LangPreamble
+         \providecommand{\lemmaname}{_(Lemma)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+       EndBabelPreamble
        LabelCounter          lemma
 End
 
@@ -114,8 +142,14 @@ Style Proposition
        LabelString           "Proposition \theproposition."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{prop}{Proposition}
+         \newtheorem{prop}{\protect\propositionname}
        EndPreamble
+       LangPreamble
+         \providecommand{\propositionname}{_(Proposition)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+       EndBabelPreamble
        LabelCounter          proposition
 End
 
@@ -126,8 +160,14 @@ Style Conjecture
        LabelString           "Conjecture \theconjecture."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{conjecture}{Conjecture}
+         \newtheorem{conjecture}{\protect\conjecturename}
        EndPreamble
+       LangPreamble
+         \providecommand{\conjecturename}{_(Conjecture)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+       EndBabelPreamble
        LabelCounter          conjecture
 End
 
@@ -138,8 +178,14 @@ Style Fact
        LabelString           "Fact \thefact."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{fact}{Fact}
+         \newtheorem{fact}{\protect\factname}
        EndPreamble
+       LangPreamble
+         \providecommand{\factname}{_(Fact)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+       EndBabelPreamble
        LabelCounter          fact
 End
 
@@ -157,8 +203,14 @@ Style Definition
        EndFont
        Preamble
          \theoremstyle{definition}
-         \newtheorem{defn}{Definition}
+         \newtheorem{defn}{\protect\definitionname}
        EndPreamble
+       LangPreamble
+         \providecommand{\definitionname}{_(Definition)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+       EndBabelPreamble
        LabelCounter          definition
 End
 
@@ -169,9 +221,15 @@ Style Example
        LabelString           "Example \theexample."
        Preamble
         \theoremstyle{definition}
-         \newtheorem{example}{Example}
+         \newtheorem{example}{\protect\examplename}
        EndPreamble
        Requires              amsthm
+       LangPreamble
+         \providecommand{\examplename}{_(Example)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
+       EndBabelPreamble
        LabelCounter          example
 End
 
@@ -182,9 +240,15 @@ Style Problem
        LabelString           "Problem \theproblem."
        Preamble
          \theoremstyle{definition}
-         \newtheorem{problem}{Problem}
+         \newtheorem{problem}{\protect\problemname}
        EndPreamble
        Requires              amsthm
+       LangPreamble
+         \providecommand{\problemname}{_(Problem)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+       EndBabelPreamble
        LabelCounter          problem
 End
 
@@ -195,13 +259,38 @@ Style Exercise
        LabelString           "Exercise \theexercise."
        Preamble
          \theoremstyle{definition}
-         \newtheorem{xca}{Exercise}
+         \newtheorem{xca}{\protect\exercisename}
        EndPreamble
        Requires              amsthm
+       LangPreamble
+         \providecommand{\exercisename}{_(Exercise)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+       EndBabelPreamble
        LabelCounter          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
+End
+
+
 Style Remark
        CopyStyle             Theorem
        LatexName             rem
@@ -216,8 +305,14 @@ Style Remark
        EndFont
        Preamble
          \theoremstyle{remark}
-         \newtheorem{rem}{Remark}
+         \newtheorem{rem}{\protect\remarkname}
        EndPreamble
+       LangPreamble
+         \providecommand{\remarkname}{_(Remark)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+       EndBabelPreamble
        LabelCounter          remark
 End
 
@@ -228,46 +323,16 @@ Style Claim
        LabelString           "Claim \theclaim."
        Preamble
          \theoremstyle{remark}
-         \newtheorem{claim}{Claim}
+         \newtheorem{claim}{\protect\claimname}
        EndPreamble
        Requires              amsthm
+       LangPreamble
+         \providecommand{\claimname}{_(Claim)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+       EndBabelPreamble
        LabelCounter          claim
 End
 
-
-# Define Case as an enumeration environment
-Style Case
-       Category              Theorem
-       Margin                Static
-       LatexType             Item_Environment
-       LatexName             caseenv
-       LabelType             Itemize
-       NextNoIndent          1
-       LeftMargin            "Case ###."
-       ParSkip               0.0
-       ItemSep               0.2
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelSep              xx
-       LabelString           "Case #."
-       LabelFont
-         Series              Medium
-         Shape               Italic
-       EndFont
-       Preamble
-         \newcounter{casectr}
-         \newenvironment{caseenv}
-         {\begin{list}{{\itshape\ Case} \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
-End
+Input theorems-case.inc