X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems.inc;h=874cba99c9cac3c0db208867c273d153a67cd8ac;hb=d748a0a6f16c996ff042e19ea463a018d37236be;hp=32bb74cbf2ae42789e0752543c959882b4fa30b7;hpb=2607927e2f7bce33a95780452fcbf9ea00c09047;p=lyx.git diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc index 32bb74cbf2..874cba99c9 100644 --- a/lib/layouts/theorems.inc +++ b/lib/layouts/theorems.inc @@ -1,5 +1,8 @@ -# Author: Richard Heck -# Adapted from amsmaths.inc +# Original Author : David L. Johnson +# Probably broken by Jean-Marc Lasgouttes +# modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin +# Modularized Jan 08 by Richard Heck # The environnements defined are : # - Theorem @@ -9,19 +12,22 @@ # - Conjecture # - Definition # - Example +# - Problem # - Exercise # - Remark -# - Note # - Claim -# - Case -# - Conclusion -# - Fact +# - Proof +# - Case (regular only -- defined as an enumeration) + +Format 30 Style Theorem + Category Theorem Margin First_Dynamic LatexType Environment LatexName thm NextNoIndent 1 + OptionalArgs 1 LabelSep xx ParIndent MMM ParSkip 0.4 @@ -30,10 +36,10 @@ Style Theorem BottomSep 0.7 ParSep 0.3 Align Block - AlignPossible Block, Left + AlignPossible Left LabelType Counter LabelCounter theorem - LabelString "Theorem \arabic{theorem}." + LabelString "Theorem \thetheorem." Font Shape Italic Size Normal @@ -43,57 +49,112 @@ Style Theorem Series Bold EndFont Preamble - \newtheorem{thm}{Theorem} + \theoremstyle{plain} + \newtheorem{thm}{\protect\theoremname} EndPreamble + LangPreamble + \providecommand{\theoremname}{_(Theorem)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}} + EndBabelPreamble + Requires amsthm End + Style Corollary CopyStyle Theorem + DependsOn Theorem LatexName cor LabelString "Corollary \thetheorem." Preamble - \newtheorem{cor}[thm]{Corollary} + \theoremstyle{plain} + \newtheorem{cor}[thm]{\protect\corollaryname} EndPreamble + LangPreamble + \providecommand{\corollaryname}{_(Corollary)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}} + EndBabelPreamble End + Style Lemma CopyStyle Theorem + DependsOn Theorem LatexName lem LabelString "Lemma \thetheorem." Preamble - \newtheorem{lem}[thm]{Lemma} + \theoremstyle{plain} + \newtheorem{lem}[thm]{\protect\lemmaname} EndPreamble + LangPreamble + \providecommand{\lemmaname}{_(Lemma)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}} + EndBabelPreamble End + Style Proposition CopyStyle Theorem + DependsOn Theorem LatexName prop LabelString "Proposition \thetheorem." Preamble - \newtheorem{prop}[thm]{Proposition} + \theoremstyle{plain} + \newtheorem{prop}[thm]{\protect\propositionname} EndPreamble + LangPreamble + \providecommand{\propositionname}{_(Proposition)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}} + EndBabelPreamble End + Style Conjecture CopyStyle Theorem + DependsOn Theorem LatexName conjecture LabelString "Conjecture \thetheorem." Preamble - \newtheorem{conjecture}[thm]{Conjecture} + \theoremstyle{plain} + \newtheorem{conjecture}[thm]{\protect\conjecturename} EndPreamble + LangPreamble + \providecommand{\conjecturename}{_(Conjecture)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}} + EndBabelPreamble End + Style Fact CopyStyle Theorem + DependsOn Theorem LatexName fact LabelString "Fact \thetheorem." Preamble - \newtheorem{fact}[thm]{Fact} + \theoremstyle{plain} + \newtheorem{fact}[thm]{\protect\factname} EndPreamble + LangPreamble + \providecommand{\factname}{_(Fact)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}} + EndBabelPreamble End + Style Definition CopyStyle Theorem + DependsOn Theorem LatexName defn LabelString "Definition \thetheorem." Font @@ -104,8 +165,15 @@ Style Definition Series Bold EndFont Preamble - \newtheorem{defn}[thm]{Definition} + \theoremstyle{definition} + \newtheorem{defn}[thm]{\protect\definitionname} EndPreamble + LangPreamble + \providecommand{\definitionname}{_(Definition)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}} + EndBabelPreamble End @@ -114,8 +182,32 @@ Style Example LatexName example LabelString "Example \thetheorem." Preamble - \newtheorem{example}[thm]{Example} + \theoremstyle{definition} + \newtheorem{example}[thm]{\protect\examplename} + EndPreamble + LangPreamble + \providecommand{\examplename}{_(Example)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}} + EndBabelPreamble +End + + +Style Problem + CopyStyle Definition + LatexName problem + LabelString "Problem \thetheorem." + Preamble + \theoremstyle{definition} + \newtheorem{problem}[thm]{\protect\problemname} EndPreamble + LangPreamble + \providecommand{\problemname}{_(Problem)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}} + EndBabelPreamble End @@ -124,13 +216,21 @@ Style Exercise LatexName xca LabelString "Exercise \thetheorem." Preamble - \newtheorem{xca}{Exercise} + \theoremstyle{definition} + \newtheorem{xca}[thm]{\protect\exercisename} EndPreamble + LangPreamble + \providecommand{\exercisename}{_(Exercise)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}} + EndBabelPreamble End Style Remark CopyStyle Theorem + DependsOn Theorem LatexName rem LabelString "Remark \thetheorem." Font @@ -142,8 +242,15 @@ Style Remark Shape Italic EndFont Preamble - \newtheorem{rem}[thm]{Remark} + \theoremstyle{remark} + \newtheorem{rem}[thm]{\protect\remarkname} EndPreamble + LangPreamble + \providecommand{\remarkname}{_(Remark)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} + EndBabelPreamble End @@ -152,25 +259,50 @@ Style Claim LatexName claim LabelString "Claim \thetheorem." Preamble - \newtheorem{claim}[thm]{Claim} + \theoremstyle{remark} + \newtheorem{claim}[thm]{\protect\claimname} EndPreamble + LangPreamble + \providecommand{\claimname}{_(Claim)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}} + EndBabelPreamble End + +# Define Case as an enumeration environment Style Case - CopyStyle Remark - LatexName case - LabelString "Case \thetheorem." + Category Theorem + CopyStyle Enumerate + LatexName caseenv + LabelType Static + LeftMargin "Case ###." + LabelString "Case #." + LabelFont + Series Medium + Shape Italic + EndFont Preamble - \newtheorem{case}[thm]{Case} + \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 + RefPrefix OFF End - -Style Conclusion - CopyStyle Remark - LatexName conclusion - LabelString "Conclusion \thetheorem." - Preamble - \newtheorem{conclusion}[thm]{Conclusion} - EndPreamble -End +Input theorems-refprefix.inc