X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=691559b2a2d257dab716eaaf3c647bf15f29f827;hb=051c5f27284f00c20e95c5732bcfb04632c7cb18;hp=e3fadb8294bc559f18f5250a5ab4720a408b8167;hpb=cd27d171d5b94eb3345d4be435271030e015bdb6;p=lyx.git diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index e3fadb8294..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 12 +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 @@ -49,100 +59,142 @@ Style Theorem Series Bold EndFont Preamble - \providecommand{\theoremname}{Theorem} \theoremstyle{plain} \newtheorem{thm}{\protect\theoremname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}\fi} - EndI18nPreamble + 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 - \providecommand{\corollaryname}{Corollary} \theoremstyle{plain} \newtheorem{cor}[thm]{\protect\corollaryname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}\fi} - EndI18nPreamble + 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 - \providecommand{\lemmaname}{Lemma} \theoremstyle{plain} \newtheorem{lem}[thm]{\protect\lemmaname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}\fi} - EndI18nPreamble + 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 - \providecommand{\propositionname}{Proposition} \theoremstyle{plain} \newtheorem{prop}[thm]{\protect\propositionname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}\fi} - EndI18nPreamble + 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 - \providecommand{\conjecturename}{Conjecture} \theoremstyle{plain} \newtheorem{conjecture}[thm]{\protect\conjecturename} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}\fi} - EndI18nPreamble + 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 - \providecommand{\factname}{Fact} \theoremstyle{plain} \newtheorem{fact}[thm]{\protect\factname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}\fi} - EndI18nPreamble + 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 @@ -153,13 +205,20 @@ Style Definition Series Bold EndFont Preamble - \providecommand{\definitionname}{Definition} \theoremstyle{definition} \newtheorem{defn}[thm]{\protect\definitionname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}\fi} - EndI18nPreamble + 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 @@ -168,13 +227,18 @@ Style Example LatexName example LabelString "Example \thetheorem." Preamble - \providecommand{\examplename}{Example} \theoremstyle{definition} \newtheorem{example}[thm]{\protect\examplename} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}\fi} - EndI18nPreamble + LangPreamble + \providecommand{\examplename}{_(Example)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}} + EndBabelPreamble + DocBookWrapperTag informalexample + DocBookTag para + DocBookAttr "" End @@ -183,13 +247,20 @@ Style Problem LatexName problem LabelString "Problem \thetheorem." Preamble - \providecommand{\problemname}{Problem} \theoremstyle{definition} \newtheorem{problem}[thm]{\protect\problemname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}\fi} - EndI18nPreamble + 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 @@ -198,19 +269,48 @@ Style Exercise LatexName xca LabelString "Exercise \thetheorem." Preamble - \providecommand{\exercisename}{Exercise} \theoremstyle{definition} \newtheorem{xca}[thm]{\protect\exercisename} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}\fi} - EndI18nPreamble + 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 @@ -222,13 +322,20 @@ Style Remark Shape Italic EndFont Preamble - \providecommand{\remarkname}{Remark} \theoremstyle{remark} \newtheorem{rem}[thm]{\protect\remarkname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}\fi} - EndI18nPreamble + 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 @@ -237,53 +344,21 @@ Style Claim LatexName claim LabelString "Claim \thetheorem." Preamble - \providecommand{\claimname}{Claim} \theoremstyle{remark} \newtheorem{claim}[thm]{\protect\claimname} EndPreamble - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}\fi} - EndI18nPreamble + 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 - Margin Static - LatexType Item_Environment - LatexName caseenv - LabelType Static - NextNoIndent 1 - LeftMargin "Case ###." - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelSep xx - LabelString "Case #." - LabelFont - Series Medium - Shape Italic - EndFont - Preamble - \providecommand{\casename}{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 - I18nPreamble - \AtBeginDocument{\ifx\LdfInit\undefined\relax\else\addto\captions$$lang{\renewcommand{\casename}{_(Case)}}\fi} - EndI18nPreamble -End +Input theorems-case.inc +Input theorems-refprefix.inc