X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems.inc;h=394b5ce95705b59d93268c3bbccff56b160583ec;hb=d8a6e0ab70962134792c5eca585fdcd013204649;hp=881b1fd4c8bade08be516895c7ebc7fd21e63624;hpb=9aad4bc27f607d869be86681dce1ef60f1053e23;p=lyx.git

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 881b1fd4c8..394b5ce957 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -4,30 +4,33 @@
 # Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
 # Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
 
-# The environnements defined are :
+# The environments defined are :
 # - Theorem
 # - Corollary
 # - Lemma
 # - Proposition
 # - Conjecture
+# - Fact
 # - Definition
 # - Example
 # - Problem
 # - Exercise
 # - Remark
 # - Claim
-# - Proof
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
-Format 14
+Format 43
 
 Style Theorem
-	Category              Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
 	NextNoIndent          1
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Alternative Theorem String"
+		Tooltip       "Alternative theorem string"
+	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
 	ParSkip               0.4
@@ -49,6 +52,7 @@ Style Theorem
 	  Series              Bold
 	EndFont
 	Preamble
+		\theoremstyle{plain}
 		\newtheorem{thm}{\protect\theoremname}
 	EndPreamble
 	LangPreamble
@@ -67,7 +71,8 @@ Style Corollary
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
-	  \newtheorem{cor}[thm]{\protect\corollaryname}
+		\theoremstyle{plain}
+		\newtheorem{cor}[thm]{\protect\corollaryname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\corollaryname}{_(Corollary)}
@@ -84,7 +89,8 @@ Style Lemma
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
-	  \newtheorem{lem}[thm]{\protect\lemmaname}
+		\theoremstyle{plain}
+		\newtheorem{lem}[thm]{\protect\lemmaname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\lemmaname}{_(Lemma)}
@@ -101,7 +107,8 @@ Style Proposition
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
-	  \newtheorem{prop}[thm]{\protect\propositionname}
+		\theoremstyle{plain}
+		\newtheorem{prop}[thm]{\protect\propositionname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\propositionname}{_(Proposition)}
@@ -118,7 +125,8 @@ Style Conjecture
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
-	  \newtheorem{conjecture}[thm]{\protect\conjecturename}
+		\theoremstyle{plain}
+		\newtheorem{conjecture}[thm]{\protect\conjecturename}
 	EndPreamble
 	LangPreamble
 		\providecommand{\conjecturename}{_(Conjecture)}
@@ -135,7 +143,8 @@ Style Fact
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
-	  \newtheorem{fact}[thm]{\protect\factname}
+		\theoremstyle{plain}
+		\newtheorem{fact}[thm]{\protect\factname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\factname}{_(Fact)}
@@ -159,8 +168,8 @@ Style Definition
 	  Series              Bold
 	EndFont
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{defn}[thm]{\protect\definitionname}
+		\theoremstyle{definition}
+		\newtheorem{defn}[thm]{\protect\definitionname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\definitionname}{_(Definition)}
@@ -176,8 +185,8 @@ Style Example
 	LatexName             example
 	LabelString           "Example \thetheorem."
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{example}[thm]{\protect\examplename}
+		\theoremstyle{definition}
+		\newtheorem{example}[thm]{\protect\examplename}
 	EndPreamble
 	LangPreamble
 		\providecommand{\examplename}{_(Example)}
@@ -193,8 +202,8 @@ Style Problem
 	LatexName             problem
 	LabelString           "Problem \thetheorem."
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{problem}[thm]{\protect\problemname}
+		\theoremstyle{definition}
+		\newtheorem{problem}[thm]{\protect\problemname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\problemname}{_(Problem)}
@@ -210,8 +219,8 @@ Style Exercise
 	LatexName             xca
 	LabelString           "Exercise \thetheorem."
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{xca}[thm]{\protect\exercisename}
+		\theoremstyle{definition}
+		\newtheorem{xca}[thm]{\protect\exercisename}
 	EndPreamble
 	LangPreamble
 		\providecommand{\exercisename}{_(Exercise)}
@@ -236,8 +245,8 @@ Style Remark
 	  Shape               Italic
 	EndFont
 	Preamble
-	  \theoremstyle{remark}
-	  \newtheorem{rem}[thm]{\protect\remarkname}
+		\theoremstyle{remark}
+		\newtheorem{rem}[thm]{\protect\remarkname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\remarkname}{_(Remark)}
@@ -253,8 +262,8 @@ Style Claim
 	LatexName             claim
 	LabelString           "Claim \thetheorem."
 	Preamble
-	  \theoremstyle{remark}
-	  \newtheorem{claim}[thm]{\protect\claimname}
+		\theoremstyle{remark}
+		\newtheorem{claim}[thm]{\protect\claimname}
 	EndPreamble
 	LangPreamble
 		\providecommand{\claimname}{_(Claim)}
@@ -264,36 +273,5 @@ Style Claim
 	EndBabelPreamble
 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
-End
+Input theorems-case.inc
+Input theorems-refprefix.inc