X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=b419211487d3ef3792556052614228b5cabe852f;hb=61a9f04754921abb28d9189c4449ae170d0b994f;hp=00525cd6bafe052daca27eea5b76b6140ca0831c;hpb=d2e5ef3d654d0b633cd5f56e3551c09b80eed9ab;p=lyx.git diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 00525cd6ba..b419211487 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -4,7 +4,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard 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 6 +Format 60 + +OutlinerName thm "Definitions & Theorems" Style Theorem - Category Theorem + Category Reasoning Margin First_Dynamic LatexType Environment LatexName thm NextNoIndent 1 - OptionalArgs 1 + 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,74 +60,111 @@ 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 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 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 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 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 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 End Style Definition CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName defn LabelString "Definition \thetheorem." Font @@ -129,8 +176,14 @@ 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 End @@ -139,9 +192,15 @@ Style Example LatexName example LabelString "Example \thetheorem." Preamble - \theoremstyle{definition} - \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 @@ -151,8 +210,14 @@ Style Problem LabelString "Problem \thetheorem." Preamble \theoremstyle{definition} - \newtheorem{problem}[thm]{Problem} + \newtheorem{problem}[thm]{\protect\problemname} EndPreamble + LangPreamble + \providecommand{\problemname}{_(Problem)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}} + EndBabelPreamble End @@ -162,14 +227,37 @@ Style Exercise LabelString "Exercise \thetheorem." Preamble \theoremstyle{definition} - \newtheorem{xca}[thm]{Exercise} + \newtheorem{xca}[thm]{\protect\exercisename} EndPreamble + LangPreamble + \providecommand{\exercisename}{_(Exercise)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}} + EndBabelPreamble +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 End Style Remark CopyStyle Theorem - DependsOn Theorem + DependsOn Theorem LatexName rem LabelString "Remark \thetheorem." Font @@ -182,8 +270,14 @@ 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 End @@ -193,23 +287,15 @@ Style Claim LabelString "Claim \thetheorem." Preamble \theoremstyle{remark} - \newtheorem{claim}[thm]{Claim} + \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 - 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