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 85cf48fc169f5492e373b20f744f33c4d80d039c..31cb99971433dcb9e2d94f6bf1e7c23c6b77017a 100644 (file)
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -26,7 +26,7 @@
 # - Note
 
 
-Format 35
+Format 41
 
 
 Counter                theorem
@@ -37,7 +37,10 @@ Style Theorem
        LatexType       Environment
        LatexName       theorem
        NextNoIndent    1
-       OptionalArgs    1
+       Argument 1
+               LabelString   "Alternative Theorem String"
+               Tooltip       "Alternative theorem string"
+       EndArgument
        LabelSep        xx
        ParIndent       MMM
        ParSkip         0.4
@@ -49,7 +52,7 @@ Style Theorem
        AlignPossible   Left
        LabelType       Counter
        LabelCounter    theorem
-       LabelString     "Theorem \thetheorem"
+       LabelString     "Theorem \thetheorem."
        Font
          Shape         Italic
          Size          Normal
@@ -73,7 +76,7 @@ Style Corollary
        CopyStyle       Theorem
        LabelCounter    corollary
        LatexName       corollary
-       LabelString     "Corollary \thecorollary"
+       LabelString     "Corollary \thecorollary."
        LangPreamble
                \providecommand{\corollaryname}{_(Corollary)}
        EndLangPreamble
@@ -89,7 +92,7 @@ Style Lemma
        CopyStyle       Theorem
        LabelCounter    lemma
        LatexName       lemma
-       LabelString     "Lemma \thelemma"
+       LabelString     "Lemma \thelemma."
        LangPreamble
                \providecommand{\lemmaname}{_(Lemma)}
        EndLangPreamble
@@ -105,7 +108,7 @@ Style Proposition
        CopyStyle       Theorem
        LabelCounter    proposition
        LatexName       proposition
-       LabelString     "Proposition \theproposition"
+       LabelString     "Proposition \theproposition."
        LangPreamble
                \providecommand{\propositionname}{_(Proposition)}
        EndLangPreamble
@@ -128,12 +131,6 @@ Style Prop
        LabelFont
          Series        Medium
        EndFont
-       LangPreamble
-               \providecommand{\propname}{_(Prop)}
-       EndLangPreamble
-       BabelPreamble
-               \addto\captions$$lang{\renewcommand{\propname}{_(Prop)}}
-       EndBabelPreamble
 End
 
 
@@ -143,7 +140,7 @@ Style Conjecture
        CopyStyle       Theorem
        LabelCounter    conjecture
        LatexName       conjecture
-       LabelString     "Conjecture \theconjecture"
+       LabelString     "Conjecture \theconjecture."
        Font
          Shape         Up
        EndFont
@@ -182,7 +179,7 @@ Style Definition
        CopyStyle       Theorem
        LabelCounter    definition
        LatexName       definition
-       LabelString     "Definition \thedefinition"
+       LabelString     "Definition \thedefinition."
        RefPrefix       def
        Font
          Shape         Up
@@ -206,7 +203,7 @@ Style Example
        CopyStyle       Conjecture
        LabelCounter    example
        LatexName       example
-       LabelString     "Example \theexample"
+       LabelString     "Example \theexample."
        RefPrefix       exa
        LangPreamble
                \providecommand{\examplename}{_(Example)}
@@ -224,7 +221,7 @@ Style Problem
        Category        Exercise
        LabelCounter    problem
        LatexName       problem
-       LabelString     "Problem \theproblem"
+       LabelString     "Problem \theproblem."
        RefPrefix       prob
        LangPreamble
                \providecommand{\problemname}{_(Problem)}
@@ -238,12 +235,30 @@ End
 Counter                prob
   Within       chapter
 End
+# Prob does not copy a style to avoid preamble code
 Style Prob
-       CopyStyle       Problem
-       LabelCounter    prob
+       Category        Exercise
+       LatexType       Environment
        LatexName       prob
+       Margin          First_Dynamic
+       LabelType       Counter
+       LabelCounter    prob
        LabelString     "\theprob."
-       OptionalArgs    0
+       RefPrefix       pro
+       NextNoIndent    1
+       ResetArgs       1
+       LabelSep        xx
+       ParIndent       MMM
+       ParSkip         0.4
+       ItemSep         0.2
+       TopSep          0.7
+       BottomSep       0.7
+       ParSep          0.3
+       Align           Block
+       AlignPossible   Left
+       LabelFont
+         Series        Bold
+       EndFont
 End
 
 
@@ -254,7 +269,7 @@ Style Solution
        LabelCounter    solution
        LatexName       solution
        LabelString     "Solution \thesolution."
-       RefPrefix       sol
+       RefPrefix       solu
        LangPreamble
                \providecommand{\solutionname}{_(Solution)}
        EndLangPreamble
@@ -264,15 +279,16 @@ Style Solution
 End
 
 
-Counter                sol
-  Within       chapter
-End
 Style Sol
-       CopyStyle       Problem
-       LabelCounter    sol
+       CopyStyle       Prob
        LatexName       sol
-       LabelString     "\thesol"
-       RequiredArgs    1
+       LabelType       Static
+       LabelString     "# [number of Prob]"
+       Argument 1
+               Mandatory     1
+               LabelString   "Solution"
+               Tooltip       "Mandatory argument to the sol environment"
+       EndArgument
 End
 
 
@@ -282,7 +298,7 @@ Style Exercise
        CopyStyle       Definition
        LabelCounter    exercise
        LatexName       exercise
-       LabelString     "Exercise \theexercise"
+       LabelString     "Exercise \theexercise."
        RefPrefix       exer
        LangPreamble
                \providecommand{\exercisename}{_(Exercise)}
@@ -299,7 +315,7 @@ Style Remark
        CopyStyle       Conjecture
        LabelCounter    remark
        LatexName       remark
-       LabelString     "Remark \theremark"
+       LabelString     "Remark \theremark."
        RefPrefix       rem
        LangPreamble
                \providecommand{\remarkname}{_(Remark)}
@@ -329,7 +345,7 @@ Style Case
        CopyStyle       Remark
        LabelCounter    case
        LatexName       case
-       LabelString     "Case \thecase"
+       LabelString     "Case \thecase."
        RefPrefix       case
        LangPreamble
                \providecommand{\casename}{_(Case)}
@@ -346,7 +362,7 @@ Style Property
        CopyStyle       Claim
        LabelCounter    property
        LatexName       property
-       LabelString     "Property \theproperty"
+       LabelString     "Property \theproperty."
        RefPrefix       prop
        LangPreamble
                \providecommand{\propertyname}{_(Property)}
@@ -363,7 +379,7 @@ Style Question
        CopyStyle       Claim
        LabelCounter    question
        LatexName       question
-       LabelString     "Question \thequestion"
+       LabelString     "Question \thequestion."
        RefPrefix       que
        LangPreamble
                \providecommand{\questionname}{_(Question)}
@@ -380,7 +396,7 @@ Style Note
        CopyStyle       Claim
        LabelCounter    note
        LatexName       note
-       LabelString     "Note \thenote"
+       LabelString     "Note \thenote."
        RefPrefix       note
        LangPreamble
                \providecommand{\notename}{_(Note)}