Fix #8201: our translation mechanism chokes on the character "

[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 109519fe7bd375379f576b5f5f1a18721b38dadb..7b4863d63d6ce8bf2ebe6522411c1052209d110a 100644 (file)
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -14,7 +14,9 @@
 # - Definition
 # - Example
 # - Problem
+# - Prob
 # - Solution
+# - Sol
 # - Exercise
 # - Remark
 # - Claim
@@ -22,10 +24,9 @@
 # - Property
 # - Question
 # - Note
-# - Prob
 
 
-Format 35
+Format 36
 
 
 Counter                theorem
@@ -48,7 +49,7 @@ Style Theorem
        AlignPossible   Left
        LabelType       Counter
        LabelCounter    theorem
-       LabelString     "Theorem \thetheorem"
+       LabelString     "Theorem \thetheorem."
        Font
          Shape         Italic
          Size          Normal
@@ -72,7 +73,7 @@ Style Corollary
        CopyStyle       Theorem
        LabelCounter    corollary
        LatexName       corollary
-       LabelString     "Corollary \thecorollary"
+       LabelString     "Corollary \thecorollary."
        LangPreamble
                \providecommand{\corollaryname}{_(Corollary)}
        EndLangPreamble
@@ -88,7 +89,7 @@ Style Lemma
        CopyStyle       Theorem
        LabelCounter    lemma
        LatexName       lemma
-       LabelString     "Lemma \thelemma"
+       LabelString     "Lemma \thelemma."
        LangPreamble
                \providecommand{\lemmaname}{_(Lemma)}
        EndLangPreamble
@@ -104,7 +105,7 @@ Style Proposition
        CopyStyle       Theorem
        LabelCounter    proposition
        LatexName       proposition
-       LabelString     "Proposition \theproposition"
+       LabelString     "Proposition \theproposition."
        LangPreamble
                \providecommand{\propositionname}{_(Proposition)}
        EndLangPreamble
@@ -127,12 +128,6 @@ Style Prop
        LabelFont
          Series        Medium
        EndFont
-       LangPreamble
-               \providecommand{\propname}{_(Prop)}
-       EndLangPreamble
-       BabelPreamble
-               \addto\captions$$lang{\renewcommand{\propname}{_(Prop)}}
-       EndBabelPreamble
 End
 
 
@@ -142,7 +137,7 @@ Style Conjecture
        CopyStyle       Theorem
        LabelCounter    conjecture
        LatexName       conjecture
-       LabelString     "Conjecture \theconjecture"
+       LabelString     "Conjecture \theconjecture."
        Font
          Shape         Up
        EndFont
@@ -181,7 +176,7 @@ Style Definition
        CopyStyle       Theorem
        LabelCounter    definition
        LatexName       definition
-       LabelString     "Definition \thedefinition"
+       LabelString     "Definition \thedefinition."
        RefPrefix       def
        Font
          Shape         Up
@@ -205,7 +200,7 @@ Style Example
        CopyStyle       Conjecture
        LabelCounter    example
        LatexName       example
-       LabelString     "Example \theexample"
+       LabelString     "Example \theexample."
        RefPrefix       exa
        LangPreamble
                \providecommand{\examplename}{_(Example)}
@@ -223,10 +218,8 @@ Style Problem
        Category        Exercise
        LabelCounter    problem
        LatexName       problem
-       LabelString     "Problem \theproblem"
+       LabelString     "Problem \theproblem."
        RefPrefix       prob
-       OptionalArgs    1
-       RequiredArgs    1
        LangPreamble
                \providecommand{\problemname}{_(Problem)}
        EndLangPreamble
@@ -236,14 +229,44 @@ Style Problem
 End
 
 
+Counter                prob
+  Within       chapter
+End
+# Prob does not copy a style to avoid preamble code
+Style Prob
+       Category        Exercise
+       LatexType       Environment
+       LatexName       prob
+       Margin          First_Dynamic
+       LabelType       Counter
+       LabelCounter    prob
+       LabelString     "\theprob."
+       RefPrefix       pro
+       NextNoIndent    1
+       OptionalArgs    0
+       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
+
+
 Counter                solution
 End
 Style Solution
        CopyStyle       Problem
        LabelCounter    solution
        LatexName       solution
-       LabelString     "Solution \thesolution"
-       RefPrefix       sol
+       LabelString     "Solution \thesolution."
+       RefPrefix       solu
        LangPreamble
                \providecommand{\solutionname}{_(Solution)}
        EndLangPreamble
@@ -253,13 +276,22 @@ Style Solution
 End
 
 
+Style Sol
+       CopyStyle       Prob
+       LatexName       sol
+       LabelType       Static
+       LabelString     "# [number of Prob]"
+       RequiredArgs    1
+End
+
+
 Counter                exercise
 End
 Style Exercise
        CopyStyle       Definition
        LabelCounter    exercise
        LatexName       exercise
-       LabelString     "Exercise \theexercise"
+       LabelString     "Exercise \theexercise."
        RefPrefix       exer
        LangPreamble
                \providecommand{\exercisename}{_(Exercise)}
@@ -276,7 +308,7 @@ Style Remark
        CopyStyle       Conjecture
        LabelCounter    remark
        LatexName       remark
-       LabelString     "Remark \theremark"
+       LabelString     "Remark \theremark."
        RefPrefix       rem
        LangPreamble
                \providecommand{\remarkname}{_(Remark)}
@@ -287,10 +319,10 @@ Style Remark
 End
 
 
-Style Claim
-       CopyStyle             Remark
-       LatexName             claim
-       LabelString           "Claim "
+Style          Claim
+       CopyStyle       Remark
+       LatexName       claim
+       LabelString     "Claim"
        LangPreamble
                \providecommand{\claimname}{_(Claim)}
        EndLangPreamble
@@ -306,7 +338,7 @@ Style Case
        CopyStyle       Remark
        LabelCounter    case
        LatexName       case
-       LabelString     "Case \thecase"
+       LabelString     "Case \thecase."
        RefPrefix       case
        LangPreamble
                \providecommand{\casename}{_(Case)}
@@ -323,7 +355,7 @@ Style Property
        CopyStyle       Claim
        LabelCounter    property
        LatexName       property
-       LabelString     "Property \theproperty"
+       LabelString     "Property \theproperty."
        RefPrefix       prop
        LangPreamble
                \providecommand{\propertyname}{_(Property)}
@@ -340,7 +372,7 @@ Style Question
        CopyStyle       Claim
        LabelCounter    question
        LatexName       question
-       LabelString     "Question \thequestion"
+       LabelString     "Question \thequestion."
        RefPrefix       que
        LangPreamble
                \providecommand{\questionname}{_(Question)}
@@ -357,7 +389,7 @@ Style Note
        CopyStyle       Claim
        LabelCounter    note
        LatexName       note
-       LabelString     "Note \thenote"
+       LabelString     "Note \thenote."
        RefPrefix       note
        LangPreamble
                \providecommand{\notename}{_(Note)}
@@ -367,12 +399,3 @@ Style Note
        EndBabelPreamble
 End
 
-
-Counter                prob
-End
-Style Prob
-       CopyStyle       Claim
-       LabelCounter    prob
-       LatexName       prob
-       LabelString     "\theprob"
-End