X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=9718b2fe68b44c87b0d908634362544b2092f16b;hb=9dc6f09c6584f765576dfed9758889ecbb286937;hp=63dcc2929bb56cdd702f5490aa33b26efc617ed4;hpb=64baf4dedc9385e37474600a7fa6de1fa9d5def5;p=features.git diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 63dcc2929b..9718b2fe68 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -2,9 +2,9 @@ # 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 +# Modularized Jan 08 by Richard Kimberly Heck -# The environnements defined are : +# The environments defined are : # - Theorem # - Corollary # - Lemma @@ -14,20 +14,30 @@ # - Example # - Problem # - Exercise +# - Solution # - Remark # - Claim # - Proof -# - Case (regular only -- defined as an enumeration) +# - Case (by inclusion) -Format 9 +Format 95 + +OutlinerName thm "Definitions & Theorems" Style Theorem - Category Theorem + Category Reasoning Margin First_Dynamic LatexType Environment LatexName thm - NextNoIndent 1 - OptionalArgs 1 + NextNoIndent 0 + ResetArgs 1 + AddToToc thm + IsTocCaption 1 + Argument 1 + LabelString "Additional Theorem Text" + Tooltip "Additional text appended to the theorem header" + IsTocCaption 1 + EndArgument LabelSep xx ParIndent MMM ParSkip 0.4 @@ -37,7 +47,7 @@ Style Theorem ParSep 0.3 Align Block AlignPossible Left - LabelType Counter + LabelType Static LabelCounter theorem LabelString "Theorem \thetheorem." Font @@ -50,75 +60,123 @@ Style Theorem EndFont Preamble \theoremstyle{plain} - \newtheorem{thm}{Theorem} + \newtheorem{thm}{\protect\theoremname} EndPreamble + LangPreamble + \providecommand{\theoremname}{_(Theorem)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}} + EndBabelPreamble Requires amsthm + DocBookTag para + DocBookAttr role='theorem' End Style Corollary CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName cor LabelString "Corollary \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{cor}[thm]{Corollary} + \newtheorem{cor}[thm]{\protect\corollaryname} EndPreamble + LangPreamble + \providecommand{\corollaryname}{_(Corollary)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='corollary' End Style Lemma CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName lem LabelString "Lemma \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{lem}[thm]{Lemma} + \newtheorem{lem}[thm]{\protect\lemmaname} EndPreamble + LangPreamble + \providecommand{\lemmaname}{_(Lemma)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='lemma' End Style Proposition CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName prop LabelString "Proposition \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{prop}[thm]{Proposition} + \newtheorem{prop}[thm]{\protect\propositionname} EndPreamble + LangPreamble + \providecommand{\propositionname}{_(Proposition)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='proposition' End Style Conjecture CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName conjecture LabelString "Conjecture \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{conjecture}[thm]{Conjecture} + \newtheorem{conjecture}[thm]{\protect\conjecturename} EndPreamble + LangPreamble + \providecommand{\conjecturename}{_(Conjecture)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='conjecture' End Style Fact CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName fact LabelString "Fact \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{fact}[thm]{Fact} + \newtheorem{fact}[thm]{\protect\factname} EndPreamble + LangPreamble + \providecommand{\factname}{_(Fact)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='fact' End Style Definition CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName defn LabelString "Definition \thetheorem." Font @@ -130,8 +188,16 @@ Style Definition EndFont Preamble \theoremstyle{definition} - \newtheorem{defn}[thm]{Definition} + \newtheorem{defn}[thm]{\protect\definitionname} EndPreamble + LangPreamble + \providecommand{\definitionname}{_(Definition)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='definition' End @@ -140,10 +206,18 @@ Style Example LatexName example LabelString "Example \thetheorem." Preamble - \theoremstyle{definition} - \newtheorem{example}[thm]{Example} + \theoremstyle{definition} + \newtheorem{example}[thm]{\protect\examplename} EndPreamble - Requires amsthm + LangPreamble + \providecommand{\examplename}{_(Example)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}} + EndBabelPreamble + DocBookWrapperTag informalexample + DocBookTag para + DocBookAttr "" End @@ -153,9 +227,16 @@ Style Problem LabelString "Problem \thetheorem." Preamble \theoremstyle{definition} - \newtheorem{problem}[thm]{Problem} + \newtheorem{problem}[thm]{\protect\problemname} EndPreamble - Requires amsthm + LangPreamble + \providecommand{\problemname}{_(Problem)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='problem' End @@ -165,15 +246,41 @@ Style Exercise LabelString "Exercise \thetheorem." Preamble \theoremstyle{definition} - \newtheorem{xca}[thm]{Exercise} + \newtheorem{xca}[thm]{\protect\exercisename} EndPreamble - Requires amsthm + LangPreamble + \providecommand{\exercisename}{_(Exercise)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='exercise' +End + + +Style Solution + CopyStyle Definition + LatexName sol + LabelString "Solution \thetheorem." + Preamble + \theoremstyle{definition} + \newtheorem{sol}[thm]{\protect\solutionname} + EndPreamble + LangPreamble + \providecommand{\solutionname}{_(Solution)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='solution' End Style Remark CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName rem LabelString "Remark \thetheorem." Font @@ -186,8 +293,16 @@ Style Remark EndFont Preamble \theoremstyle{remark} - \newtheorem{rem}[thm]{Remark} + \newtheorem{rem}[thm]{\protect\remarkname} EndPreamble + LangPreamble + \providecommand{\remarkname}{_(Remark)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} + EndBabelPreamble + DocBookTag note + DocBookItemTag para End @@ -197,35 +312,18 @@ Style Claim LabelString "Claim \thetheorem." Preamble \theoremstyle{remark} - \newtheorem{claim}[thm]{Claim} + \newtheorem{claim}[thm]{\protect\claimname} EndPreamble - Requires amsthm + LangPreamble + \providecommand{\claimname}{_(Claim)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}} + EndBabelPreamble + DocBookTag para + DocBookAttr role='claim' + DocBookItemTag "" 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\ Case} \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 -End +Input theorems-case.inc +Input theorems-refprefix.inc