X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=691559b2a2d257dab716eaaf3c647bf15f29f827;hb=051c5f27284f00c20e95c5732bcfb04632c7cb18;hp=3b4292532316ee1fdeb373f538d6c69d66c9094c;hpb=d252730dff10221be69df2a8c889cd311ae20e27;p=lyx.git diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 3b42925323..691559b2a2 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 7 +Format 99 + +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,141 @@ 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='theorem' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='corollary' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='lemma' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='proposition' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='conjecture' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='fact' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Definition CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName defn LabelString "Definition \thetheorem." Font @@ -130,8 +206,19 @@ 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='definition' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End @@ -140,10 +227,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 +248,19 @@ 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='problem' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End @@ -165,15 +270,47 @@ 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='exercise' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true +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 + DocBookWrapperTag figure + DocBookWrapperAttr role='solution' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Remark CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName rem LabelString "Remark \thetheorem." Font @@ -186,8 +323,19 @@ 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='remark' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End @@ -197,25 +345,20 @@ 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 + DocBookWrapperTag figure + DocBookWrapperAttr role='claim' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End - -# Define Case as an enumeration environment -Style Case - Category Theorem - CopyStyle Enumerate - LatexName caseenv - LabelType Static - LeftMargin "Case ###:" - LabelString "Case #:" - Preamble - \newcounter{casectr} - \newenvironment{caseenv} - {\begin{list}{\bfseries\upshape Case \arabic{casectr}:}% - {}\setcounter{casectr}{0}\usecounter{casectr}}% - {\end{list}} - EndPreamble -End +Input theorems-case.inc +Input theorems-refprefix.inc