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

[lyx.git] / lib / layouts / theorems-without-preamble.inc

diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc
index f7bcceaeb47db1774da370099ebe306f6cd6f98b..ad7580bb4a0846cdd8203869f1891fc3ee18fe5b 100644 (file)
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -1,5 +1,5 @@
 # This file provides theorem environments without adding preamble code or
-# requiring packages. THis is useful for classes that define their own theorems
+# requiring packages. This is useful for classes that define their own theorems
 # like svjour3 or ijmpc.
 # Author: Uwe Stöhr <uwestoehr@web.de>
 
@@ -26,18 +26,25 @@
 # - Note
 
 
-Format 35
+Format 80
 
+OutlinerName thm "Definitions & Theorems"
 
 Counter                theorem
 End
 Style Theorem
-       Category        Theorem
+       Category        Reasoning
        Margin          First_Dynamic
        LatexType       Environment
        LatexName       theorem
        NextNoIndent    1
-       OptionalArgs    1
+       AddToToc              thm
+       IsTocCaption          1
+       Argument 1
+         LabelString   "Name/Title"
+         Tooltip       "Alternative optional name or title"
+         IsTocCaption      1
+       EndArgument
        LabelSep        xx
        ParIndent       MMM
        ParSkip         0.4
@@ -47,9 +54,9 @@ Style Theorem
        ParSep          0.3
        Align           Block
        AlignPossible   Left
-       LabelType       Counter
+       LabelType       Static
        LabelCounter    theorem
-       LabelString     "Theorem \thetheorem"
+       LabelString     "Theorem \thetheorem."
        Font
          Shape         Italic
          Size          Normal
@@ -59,10 +66,10 @@ Style Theorem
          Series        Bold
        EndFont
        LangPreamble
-               \providecommand{\theoremname}{_(Theorem)}
+         \providecommand{\theoremname}{_(Theorem)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
+         \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
        EndBabelPreamble
 End
 
@@ -73,12 +80,12 @@ Style Corollary
        CopyStyle       Theorem
        LabelCounter    corollary
        LatexName       corollary
-       LabelString     "Corollary \thecorollary"
+       LabelString     "Corollary \thecorollary."
        LangPreamble
-               \providecommand{\corollaryname}{_(Corollary)}
+         \providecommand{\corollaryname}{_(Corollary)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+         \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
        EndBabelPreamble
 End
 
@@ -89,12 +96,12 @@ Style Lemma
        CopyStyle       Theorem
        LabelCounter    lemma
        LatexName       lemma
-       LabelString     "Lemma \thelemma"
+       LabelString     "Lemma \thelemma."
        LangPreamble
-               \providecommand{\lemmaname}{_(Lemma)}
+         \providecommand{\lemmaname}{_(Lemma)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+         \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
        EndBabelPreamble
 End
 
@@ -105,12 +112,12 @@ Style Proposition
        CopyStyle       Theorem
        LabelCounter    proposition
        LatexName       proposition
-       LabelString     "Proposition \theproposition"
+       LabelString     "Proposition \theproposition."
        LangPreamble
-               \providecommand{\propositionname}{_(Proposition)}
+         \providecommand{\propositionname}{_(Proposition)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+         \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
        EndBabelPreamble
 End
 
@@ -128,12 +135,6 @@ Style Prop
        LabelFont
          Series        Medium
        EndFont
-       LangPreamble
-               \providecommand{\propname}{_(Prop)}
-       EndLangPreamble
-       BabelPreamble
-               \addto\captions$$lang{\renewcommand{\propname}{_(Prop)}}
-       EndBabelPreamble
 End
 
 
@@ -143,7 +144,7 @@ Style Conjecture
        CopyStyle       Theorem
        LabelCounter    conjecture
        LatexName       conjecture
-       LabelString     "Conjecture \theconjecture"
+       LabelString     "Conjecture \theconjecture."
        Font
          Shape         Up
        EndFont
@@ -152,10 +153,10 @@ Style Conjecture
          Shape         Italic
        EndFont
        LangPreamble
-               \providecommand{\conjecturename}{_(Conjecture)}
+         \providecommand{\conjecturename}{_(Conjecture)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+         \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
        EndBabelPreamble
 End
 
@@ -168,10 +169,10 @@ Style Fact
        LatexName       fact
        LabelString     "Fact \thefact."
        LangPreamble
-               \providecommand{\factname}{_(Fact)}
+         \providecommand{\factname}{_(Fact)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+         \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
        EndBabelPreamble
 End
 
@@ -182,7 +183,7 @@ Style Definition
        CopyStyle       Theorem
        LabelCounter    definition
        LatexName       definition
-       LabelString     "Definition \thedefinition"
+       LabelString     "Definition \thedefinition."
        RefPrefix       def
        Font
          Shape         Up
@@ -192,10 +193,10 @@ Style Definition
          Series        Bold
        EndFont
        LangPreamble
-               \providecommand{\definitionname}{_(Definition)}
+         \providecommand{\definitionname}{_(Definition)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+         \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
        EndBabelPreamble
 End
 
@@ -206,13 +207,13 @@ Style Example
        CopyStyle       Conjecture
        LabelCounter    example
        LatexName       example
-       LabelString     "Example \theexample"
+       LabelString     "Example \theexample."
        RefPrefix       exa
        LangPreamble
-               \providecommand{\examplename}{_(Example)}
+         \providecommand{\examplename}{_(Example)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
+         \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
        EndBabelPreamble
 End
 
@@ -224,13 +225,13 @@ Style Problem
        Category        Exercise
        LabelCounter    problem
        LatexName       problem
-       LabelString     "Problem \theproblem"
+       LabelString     "Problem \theproblem."
        RefPrefix       prob
        LangPreamble
-               \providecommand{\problemname}{_(Problem)}
+         \providecommand{\problemname}{_(Problem)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+         \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
        EndBabelPreamble
 End
 
@@ -244,12 +245,12 @@ Style Prob
        LatexType       Environment
        LatexName       prob
        Margin          First_Dynamic
-       LabelType       Counter
+       LabelType       Static
        LabelCounter    prob
        LabelString     "\theprob."
        RefPrefix       pro
        NextNoIndent    1
-       OptionalArgs    0
+       ResetArgs       1
        LabelSep        xx
        ParIndent       MMM
        ParSkip         0.4
@@ -262,6 +263,8 @@ Style Prob
        LabelFont
          Series        Bold
        EndFont
+       AddToToc        thm
+       IsTocCaption    true
 End
 
 
@@ -274,10 +277,10 @@ Style Solution
        LabelString     "Solution \thesolution."
        RefPrefix       solu
        LangPreamble
-               \providecommand{\solutionname}{_(Solution)}
+         \providecommand{\solutionname}{_(Solution)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+         \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
        EndBabelPreamble
 End
 
@@ -287,7 +290,12 @@ Style Sol
        LatexName       sol
        LabelType       Static
        LabelString     "# [number of Prob]"
-       RequiredArgs    1
+       Argument 1
+         Mandatory     1
+         LabelString   "Label of Problem"
+         Tooltip       "Label of the corresponding problem"
+         IsTocCaption true
+       EndArgument
 End
 
 
@@ -297,13 +305,13 @@ Style Exercise
        CopyStyle       Definition
        LabelCounter    exercise
        LatexName       exercise
-       LabelString     "Exercise \theexercise"
+       LabelString     "Exercise \theexercise."
        RefPrefix       exer
        LangPreamble
-               \providecommand{\exercisename}{_(Exercise)}
+         \providecommand{\exercisename}{_(Exercise)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+         \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
        EndBabelPreamble
 End
 
@@ -314,13 +322,13 @@ Style Remark
        CopyStyle       Conjecture
        LabelCounter    remark
        LatexName       remark
-       LabelString     "Remark \theremark"
+       LabelString     "Remark \theremark."
        RefPrefix       rem
        LangPreamble
-               \providecommand{\remarkname}{_(Remark)}
+         \providecommand{\remarkname}{_(Remark)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+         \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
        EndBabelPreamble
 End
 
@@ -330,10 +338,10 @@ Style             Claim
        LatexName       claim
        LabelString     "Claim"
        LangPreamble
-               \providecommand{\claimname}{_(Claim)}
+         \providecommand{\claimname}{_(Claim)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+         \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
        EndBabelPreamble
 End
 
@@ -344,13 +352,13 @@ Style Case
        CopyStyle       Remark
        LabelCounter    case
        LatexName       case
-       LabelString     "Case \thecase"
+       LabelString     "Case \thecase."
        RefPrefix       case
        LangPreamble
-               \providecommand{\casename}{_(Case)}
+         \providecommand{\casename}{_(Case)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
+         \addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
        EndBabelPreamble
 End
 
@@ -361,13 +369,13 @@ Style Property
        CopyStyle       Claim
        LabelCounter    property
        LatexName       property
-       LabelString     "Property \theproperty"
+       LabelString     "Property \theproperty."
        RefPrefix       prop
        LangPreamble
-               \providecommand{\propertyname}{_(Property)}
+         \providecommand{\propertyname}{_(Property)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
+         \addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
        EndBabelPreamble
 End
 
@@ -378,13 +386,13 @@ Style Question
        CopyStyle       Claim
        LabelCounter    question
        LatexName       question
-       LabelString     "Question \thequestion"
+       LabelString     "Question \thequestion."
        RefPrefix       que
        LangPreamble
-               \providecommand{\questionname}{_(Question)}
+         \providecommand{\questionname}{_(Question)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
+         \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
        EndBabelPreamble
 End
 
@@ -395,13 +403,13 @@ Style Note
        CopyStyle       Claim
        LabelCounter    note
        LatexName       note
-       LabelString     "Note \thenote"
+       LabelString     "Note \thenote."
        RefPrefix       note
        LangPreamble
-               \providecommand{\notename}{_(Note)}
+         \providecommand{\notename}{_(Note)}
        EndLangPreamble
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
+         \addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
        EndBabelPreamble
 End