X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=8da4b7b657cd9427aadb9e91a985abb8f4fdf033;hb=8d707723b76d98ba4ed50a43967f74f10d95bb8b;hp=5802738805e77b4e217016514be9f2bca0573468;hpb=2607927e2f7bce33a95780452fcbf9ea00c09047;p=lyx.git diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 5802738805..8da4b7b657 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -1,12 +1,33 @@ -# Author: Richard Heck -# Stolen from amsdefs.inc and 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 +# - Corollary +# - Lemma +# - Proposition +# - Conjecture +# - Definition +# - Example +# - Problem +# - Exercise +# - Remark +# - Claim +# - Proof +# - Case (regular only -- defined as an enumeration) + +Format 35 Style Theorem + Category Theorem Margin First_Dynamic LatexType Environment LatexName thm -#DependsOn TheoremStyle NextNoIndent 1 + OptionalArgs 1 LabelSep xx ParIndent MMM ParSkip 0.4 @@ -15,7 +36,7 @@ Style Theorem BottomSep 0.7 ParSep 0.3 Align Block - AlignPossible Block, Left + AlignPossible Left LabelType Counter LabelCounter theorem LabelString "Theorem \thetheorem." @@ -27,166 +48,113 @@ Style Theorem Shape Up Series Bold EndFont -End - - -Style Theorem* - CopyStyle Theorem - LatexName thm* - LabelType Static - LabelString "Theorem." Preamble - \theoremstyle{plain} - \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 \theoremstyle{plain} - \newtheorem{cor}[thm]{Corollary} - EndPreamble -End - - -Style Corollary* - CopyStyle Theorem* - LatexName cor* - LabelString "Corollary." - Preamble - \theoremstyle{plain} - \newtheorem*{cor*}{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 LatexName lem LabelString "Lemma \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{lem}[thm]{Lemma} - EndPreamble -End - - -Style Lemma* - CopyStyle Theorem* - LatexName lem* - LabelString "Lemma." - Preamble - \theoremstyle{plain} - \newtheorem*{lem*}{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 LatexName prop LabelString "Proposition \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{prop}[thm]{Proposition} - EndPreamble -End - - -Style Proposition* - CopyStyle Theorem* - LatexName prop* - LabelString "Proposition." - Preamble - \theoremstyle{plain} - \newtheorem*{prop*}{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 LatexName conjecture LabelString "Conjecture \thetheorem." Preamble \theoremstyle{plain} - \newtheorem{conjecture}[thm]{Conjecture} - EndPreamble -End - - -Style Conjecture* - CopyStyle Theorem* - LatexName conjecture* - LabelString "Conjecture." - Preamble - \theoremstyle{plain} - \newtheorem*{conjecture*}{Conjecture} - EndPreamble -End - - -Style Criterion - CopyStyle Theorem - LatexName criterion - LabelString "Criterion \thetheorem." - Preamble - \theoremstyle{plain} - \newtheorem{criterion}[thm]{Criterion} - EndPreamble -End - - -Style Algorithm - CopyStyle Theorem - LatexName algorithm - LabelString "Algorithm \thetheorem." - Preamble - \theoremstyle{plain} - \newtheorem{algorithm}[thm]{Algorithm} + \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 \theoremstyle{plain} - \newtheorem{fact}[thm]{Fact} - EndPreamble -End - - -Style Fact* - CopyStyle Theorem* - LatexName fact* - LabelString "Fact." - Preamble - \theoremstyle{plain} - \newtheorem*{fact*}{Fact} - EndPreamble -End - - -Style Axiom - CopyStyle Theorem - LatexName ax - LabelString "Axiom \thetheorem." - Preamble - \theoremstyle{plain} - \newtheorem{ax}[thm]{Axiom} + \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 @@ -198,20 +166,14 @@ Style Definition EndFont Preamble \theoremstyle{definition} - \newtheorem{defn}[thm]{Definition} - EndPreamble -End - - -Style Definition* - CopyStyle Definition - LatexName defn* - LabelType Static - LabelString "Definition." - Preamble - \theoremstyle{definition} - \newtheorem*{defn*}{Definition} + \newtheorem{defn}[thm]{\protect\definitionname} EndPreamble + LangPreamble + \providecommand{\definitionname}{_(Definition)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}} + EndBabelPreamble End @@ -219,43 +181,16 @@ Style Example CopyStyle Definition LatexName example LabelString "Example \thetheorem." - Preamble - \theoremstyle{definition} - \newtheorem{example}[thm]{Example} - EndPreamble -End - - -Style Example* - CopyStyle Definition* - LatexName example* - LabelString "Example." - Preamble - \theoremstyle{definition} - \newtheorem*{example*}{Example} - EndPreamble -End - - -Style Condition - CopyStyle Definition - LatexName condition - LabelString "Condition \thetheorem." - Preamble - \theoremstyle{definition} - \newtheorem{condition}[thm]{Condition} - EndPreamble -End - - -Style Condition* - CopyStyle Definition* - LatexName condition* - LabelString "Condition." Preamble \theoremstyle{definition} - \newtheorem*{condition*}{Condition} + \newtheorem{example}[thm]{\protect\examplename} EndPreamble + LangPreamble + \providecommand{\examplename}{_(Example)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}} + EndBabelPreamble End @@ -265,19 +200,14 @@ Style Problem LabelString "Problem \thetheorem." Preamble \theoremstyle{definition} - \newtheorem{problem}[thm]{Problem} - EndPreamble -End - - -Style Problem* - CopyStyle Definition* - LatexName problem* - LabelString "Problem." - Preamble - \theoremstyle{definition} - \newtheorem*{problem*}{Problem} + \newtheorem{problem}[thm]{\protect\problemname} EndPreamble + LangPreamble + \providecommand{\problemname}{_(Problem)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}} + EndBabelPreamble End @@ -287,25 +217,20 @@ Style Exercise LabelString "Exercise \thetheorem." Preamble \theoremstyle{definition} - %%Delete [section] for sequential numbering - \newtheorem{xca}[section]{Exercise} - EndPreamble -End - - -Style Exercise* - CopyStyle Definition* - LatexName xca - LabelString "Exercise." - Preamble - \theoremstyle{definition} - \newtheorem*{xca*}{Exercise} + \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 @@ -318,20 +243,14 @@ Style Remark EndFont Preamble \theoremstyle{remark} - \newtheorem{rem}[thm]{Remark} - EndPreamble -End - - -Style Remark* - CopyStyle Remark - LatexName rem* - LabelType Static - LabelString "Remark." - Preamble - \theoremstyle{remark} - \newtheorem*{rem*}{Remark} + \newtheorem{rem}[thm]{\protect\remarkname} EndPreamble + LangPreamble + \providecommand{\remarkname}{_(Remark)} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} + EndBabelPreamble End @@ -341,159 +260,58 @@ Style Claim LabelString "Claim \thetheorem." Preamble \theoremstyle{remark} - \newtheorem{claim}[thm]{Claim} - EndPreamble -End - - -Style Claim* - CopyStyle Remark* - LatexName claim* - LabelString "Claim." - Preamble - \theoremstyle{remark} - \newtheorem*{claim*}{Claim} - EndPreamble -End - - -Style Note - CopyStyle Remark - LatexName note - LabelString "Note \thetheorem." - Preamble - \theoremstyle{remark} - \newtheorem{note}[thm]{Note} - EndPreamble -End - - -Style Note* - CopyStyle Remark* - LatexName note* - LabelString "Note." - Preamble - \theoremstyle{remark} - \newtheorem*{note*}{Note} - EndPreamble -End - - -Style Notation - CopyStyle Remark - LatexName notation - LabelString "Notation \thetheorem." - Preamble - \theoremstyle{remark} - \newtheorem{notation}[thm]{Notation} - EndPreamble -End - - -Style Notation* - CopyStyle Remark* - LatexName notation* - LabelString "Notation." - Preamble - \theoremstyle{remark} - \newtheorem*{notation*}[thm]{Notation} - EndPreamble -End - - -Style Summary - CopyStyle Remark - LatexName summary - LabelString "Summary \thetheorem." - Preamble - \theoremstyle{remark} - \newtheorem{summary}[thm]{Summary} - EndPreamble -End - - -Style Acknowledgement - CopyStyle Remark - LatexName acknowledgement - LabelString "Acknowledgement \thetheorem." - Preamble - \theoremstyle{remark} - \newtheorem{acknowledgement}[thm]{Acknowledgement} - EndPreamble -End - - -Style Acknowledgement* - CopyStyle Remark* - LatexName acknowledgement* - LabelString "Acknowledgement." - Preamble - \theoremstyle{remark} - \newtheorem*{acknowledgement*}{Acknowledgement} + \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." - Preamble - \theoremstyle{remark} - \newtheorem{case}{Case} %%Numbering of Cases not keyed to sections - EndPreamble -End - - -Style Conclusion - CopyStyle Remark - LatexName conclusion - LabelString "Conclusion \thetheorem." - Preamble - \theoremstyle{remark} - \newtheorem{conclusion}[thm]{Conclusion} - EndPreamble -End - - -Style Conclusion* - CopyStyle Remark* - LatexName conclusion* - LabelString "Conclusion." - Preamble - \theoremstyle{remark} - \newtheorem*{conclusion*}{Conclusion} - EndPreamble -End - - -Style Proof - Margin First_Dynamic - LatexType Environment - LatexName proof + Category Theorem + Margin Static + LatexType Item_Environment + LatexName caseenv + LabelType Static NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 + LeftMargin "Case ###." + ParSkip 0.0 ItemSep 0.2 TopSep 0.7 BottomSep 0.7 ParSep 0.3 Align Block AlignPossible Block, Left - LabelType Static - LabelString "Proof." - EndLabelType Box - Font - Shape Up - Size Normal - EndFont + LabelSep xx + LabelString "Case #." LabelFont + Series Medium Shape Italic EndFont - # We don't want the preamble from Theorem Preamble - EndPreamble -End - - + \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 +End + +Input theorems-refprefix.inc