From 2607927e2f7bce33a95780452fcbf9ea00c09047 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 31 Aug 2007 15:01:17 +0000 Subject: [PATCH] Modularize the theorem modules. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19952 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/scons_manifest.py | 8 +- lib/Makefile.am | 2 + lib/layouts/theorems-ams-withinsec.module | 538 +--------------------- lib/layouts/theorems-ams.inc | 499 ++++++++++++++++++++ lib/layouts/theorems-ams.module | 538 +--------------------- lib/layouts/theorems-std.module | 175 +------ lib/layouts/theorems-withinchap.module | 176 +------ lib/layouts/theorems-withinsec.module | 176 +------ lib/layouts/theorems.inc | 176 +++++++ 9 files changed, 687 insertions(+), 1601 deletions(-) create mode 100644 lib/layouts/theorems-ams.inc create mode 100644 lib/layouts/theorems.inc diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 7af5de5edd..622023ec89 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -2709,18 +2709,20 @@ lib_layouts_inc_files = Split(''' stdstruct.inc stdtitle.inc svjour.inc + theorems.inc + theorems-ams.inc ''') lib_layouts_module_files = Split(''' - lib/layouts/url.module lib/layouts/endnotes.module lib/layouts/foottoend.module - lib/layouts/theorems-ams-withinsec.module lib/layouts/theorems-ams.module + lib/layouts/theorems-ams-withinsec.module + lib/layouts/theorems-std.module lib/layouts/theorems-withinsec.module lib/layouts/theorems-withinchap.module - lib/layouts/theorems-std.module + lib/layouts/url.module ''') lib_scripts_files = Split(''' diff --git a/lib/Makefile.am b/lib/Makefile.am index 8575e7f905..51233e9bf8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1015,6 +1015,8 @@ dist_layouts_DATA =\ layouts/svglobal.layout \ layouts/endnotes.module \ layouts/foottoend.module \ + layouts/theorems.inc \ + layouts/theorems-ams.inc \ layouts/theorems-ams.module \ layouts/theorems-ams-withinsec.module \ layouts/theorems-std.module \ diff --git a/lib/layouts/theorems-ams-withinsec.module b/lib/layouts/theorems-ams-withinsec.module index cde37165fb..6bfac27e59 100644 --- a/lib/layouts/theorems-ams-withinsec.module +++ b/lib/layouts/theorems-ams-withinsec.module @@ -3,47 +3,6 @@ # Author: Richard Heck # Adapted from amsdefs.inc and amsmaths.inc -# the environments defined are: -# - Proof -# - Theorem -# - Theorem* -# - Corollary -# - Corollary* -# - Lemma -# - Lemma* -# - Proposition -# - Proposition* -# - Conjecture -# - Conjecture* -# - Criterion -# - Algorithm -# - Axiom -# - Definition -# - Definition* -# - Example -# - Example* -# - Condition -# - Condition* -# - Problem -# - Problem* -# - Exercise -# - Remark -# - Remark* -# - Note -# - Note* -# - Notation -# - Notation* -# - Claim -# - Claim* -# - Summary -# - Acknowledgement -# - Acknowledgement* -# - Case -# - Conclusion -# - Conclusion* -# - Fact -# - Fact* - Format 5 Preamble \usepackage{amsmath} @@ -58,499 +17,4 @@ Counter End -Style Theorem - Margin First_Dynamic - LatexType Environment - LatexName thm -#DependsOn TheoremStyle - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Counter - LabelCounter theorem - LabelString "Theorem \thetheorem." - Font - Shape Italic - Size Normal - EndFont - LabelFont - Shape Up - Series Bold - EndFont -End - - -Style Theorem* - CopyStyle Theorem - LatexName thm* - LabelType Static - LabelString "Theorem." - Preamble - \theoremstyle{plain} - \newtheorem*{thm*}{Theorem} - EndPreamble -End - - -Style Corollary - CopyStyle 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} - EndPreamble -End - - -Style Lemma - CopyStyle 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} - EndPreamble -End - - -Style Proposition - CopyStyle 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} - EndPreamble -End - - -Style Conjecture - CopyStyle 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} - EndPreamble -End - - -Style Fact - CopyStyle 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} - EndPreamble -End - - -Style Definition - CopyStyle Theorem - LatexName defn - LabelString "Definition \thetheorem." - Font - Shape Up - EndFont - LabelFont - Shape Up - Series Bold - 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} - EndPreamble -End - - -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} - EndPreamble -End - - -Style Problem - CopyStyle Definition - LatexName 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} - EndPreamble -End - - -Style Exercise - CopyStyle Definition - LatexName xca - 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} - EndPreamble -End - - -Style Remark - CopyStyle Theorem - LatexName rem - LabelString "Remark \thetheorem." - Font - Shape Up - Size Normal - EndFont - LabelFont - Series Medium - Shape Italic - 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} - EndPreamble -End - - -Style Claim - CopyStyle Remark - LatexName 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} - EndPreamble -End - - -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 - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - 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 - LabelFont - Shape Italic - EndFont - # We don't want the preamble from Theorem - Preamble - EndPreamble -End - - +Input theorems-ams.inc diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc new file mode 100644 index 0000000000..5802738805 --- /dev/null +++ b/lib/layouts/theorems-ams.inc @@ -0,0 +1,499 @@ +# Author: Richard Heck +# Stolen from amsdefs.inc and amsmaths.inc + +Style Theorem + Margin First_Dynamic + LatexType Environment + LatexName thm +#DependsOn TheoremStyle + NextNoIndent 1 + LabelSep xx + ParIndent MMM + ParSkip 0.4 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Counter + LabelCounter theorem + LabelString "Theorem \thetheorem." + Font + Shape Italic + Size Normal + EndFont + LabelFont + Shape Up + Series Bold + EndFont +End + + +Style Theorem* + CopyStyle Theorem + LatexName thm* + LabelType Static + LabelString "Theorem." + Preamble + \theoremstyle{plain} + \newtheorem*{thm*}{Theorem} + EndPreamble +End + + +Style Corollary + CopyStyle 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} + EndPreamble +End + + +Style Lemma + CopyStyle 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} + EndPreamble +End + + +Style Proposition + CopyStyle 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} + EndPreamble +End + + +Style Conjecture + CopyStyle 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} + EndPreamble +End + + +Style Fact + CopyStyle 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} + EndPreamble +End + + +Style Definition + CopyStyle Theorem + LatexName defn + LabelString "Definition \thetheorem." + Font + Shape Up + EndFont + LabelFont + Shape Up + Series Bold + 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} + EndPreamble +End + + +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} + EndPreamble +End + + +Style Problem + CopyStyle Definition + LatexName 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} + EndPreamble +End + + +Style Exercise + CopyStyle Definition + LatexName xca + 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} + EndPreamble +End + + +Style Remark + CopyStyle Theorem + LatexName rem + LabelString "Remark \thetheorem." + Font + Shape Up + Size Normal + EndFont + LabelFont + Series Medium + Shape Italic + 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} + EndPreamble +End + + +Style Claim + CopyStyle Remark + LatexName 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} + EndPreamble +End + + +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 + NextNoIndent 1 + LabelSep xx + ParIndent MMM + ParSkip 0.4 + 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 + LabelFont + Shape Italic + EndFont + # We don't want the preamble from Theorem + Preamble + EndPreamble +End + + diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module index cd917ca9df..70200c849e 100644 --- a/lib/layouts/theorems-ams.module +++ b/lib/layouts/theorems-ams.module @@ -3,47 +3,6 @@ # Author: Richard Heck # Adapted from amsdefs.inc and amsmaths.inc -# the environments defined are: -# - Proof -# - Theorem -# - Theorem* -# - Corollary -# - Corollary* -# - Lemma -# - Lemma* -# - Proposition -# - Proposition* -# - Conjecture -# - Conjecture* -# - Criterion -# - Algorithm -# - Axiom -# - Definition -# - Definition* -# - Example -# - Example* -# - Condition -# - Condition* -# - Problem -# - Problem* -# - Exercise -# - Remark -# - Remark* -# - Note -# - Note* -# - Notation -# - Notation* -# - Claim -# - Claim* -# - Summary -# - Acknowledgement -# - Acknowledgement* -# - Case -# - Conclusion -# - Conclusion* -# - Fact -# - Fact* - Format 5 Preamble \usepackage{amsmath} @@ -57,499 +16,4 @@ Counter End -Style Theorem - Margin First_Dynamic - LatexType Environment - LatexName thm -#DependsOn TheoremStyle - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Counter - LabelCounter theorem - LabelString "Theorem \thetheorem." - Font - Shape Italic - Size Normal - EndFont - LabelFont - Shape Up - Series Bold - EndFont -End - - -Style Theorem* - CopyStyle Theorem - LatexName thm* - LabelType Static - LabelString "Theorem." - Preamble - \theoremstyle{plain} - \newtheorem*{thm*}{Theorem} - EndPreamble -End - - -Style Corollary - CopyStyle 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} - EndPreamble -End - - -Style Lemma - CopyStyle 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} - EndPreamble -End - - -Style Proposition - CopyStyle 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} - EndPreamble -End - - -Style Conjecture - CopyStyle 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} - EndPreamble -End - - -Style Fact - CopyStyle 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} - EndPreamble -End - - -Style Definition - CopyStyle Theorem - LatexName defn - LabelString "Definition \thetheorem." - Font - Shape Up - EndFont - LabelFont - Shape Up - Series Bold - 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} - EndPreamble -End - - -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} - EndPreamble -End - - -Style Problem - CopyStyle Definition - LatexName 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} - EndPreamble -End - - -Style Exercise - CopyStyle Definition - LatexName xca - 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} - EndPreamble -End - - -Style Remark - CopyStyle Theorem - LatexName rem - LabelString "Remark \thetheorem." - Font - Shape Up - Size Normal - EndFont - LabelFont - Series Medium - Shape Italic - 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} - EndPreamble -End - - -Style Claim - CopyStyle Remark - LatexName 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} - EndPreamble -End - - -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 - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - 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 - LabelFont - Shape Italic - EndFont - # We don't want the preamble from Theorem - Preamble - EndPreamble -End - - +Input theorems-ams.inc diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module index 95999b2eae..e73b568c3e 100644 --- a/lib/layouts/theorems-std.module +++ b/lib/layouts/theorems-std.module @@ -3,184 +3,11 @@ # Author: Richard Heck # Adapted from amsmaths.inc -# The environnements defined are : -# - Theorem -# - Corollary -# - Lemma -# - Proposition -# - Conjecture -# - Definition -# - Example -# - Exercise -# - Remark -# - Note -# - Claim -# - Case -# - Conclusion -# - Fact - Format 5 Counter Name theorem End - -Style Theorem - Margin First_Dynamic - LatexType Environment - LatexName thm - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Counter - LabelCounter theorem - LabelString "Theorem \arabic{theorem}." - Font - Shape Italic - Size Normal - EndFont - LabelFont - Shape Up - Series Bold - EndFont - Preamble - \newtheorem{thm}{Theorem} - EndPreamble -End - -Style Corollary - CopyStyle Theorem - LatexName cor - LabelString "Corollary \thetheorem." - Preamble - \newtheorem{cor}[thm]{Corollary} - EndPreamble -End - -Style Lemma - CopyStyle Theorem - LatexName lem - LabelString "Lemma \thetheorem." - Preamble - \newtheorem{lem}[thm]{Lemma} - EndPreamble -End - -Style Proposition - CopyStyle Theorem - LatexName prop - LabelString "Proposition \thetheorem." - Preamble - \newtheorem{prop}[thm]{Proposition} - EndPreamble -End - -Style Conjecture - CopyStyle Theorem - LatexName conjecture - LabelString "Conjecture \thetheorem." - Preamble - \newtheorem{conjecture}[thm]{Conjecture} - EndPreamble -End - -Style Fact - CopyStyle Theorem - LatexName fact - LabelString "Fact \thetheorem." - Preamble - \newtheorem{fact}[thm]{Fact} - EndPreamble -End - -Style Definition - CopyStyle Theorem - LatexName defn - LabelString "Definition \thetheorem." - Font - Shape Up - EndFont - LabelFont - Shape Up - Series Bold - EndFont - Preamble - \newtheorem{defn}[thm]{Definition} - EndPreamble -End - - -Style Example - CopyStyle Definition - LatexName example - LabelString "Example \thetheorem." - Preamble - \newtheorem{example}[thm]{Example} - EndPreamble -End - - -Style Exercise - CopyStyle Definition - LatexName xca - LabelString "Exercise \thetheorem." - Preamble - \newtheorem{xca}{Exercise} - EndPreamble -End - - -Style Remark - CopyStyle Theorem - LatexName rem - LabelString "Remark \thetheorem." - Font - Shape Up - Size Normal - EndFont - LabelFont - Series Medium - Shape Italic - EndFont - Preamble - \newtheorem{rem}[thm]{Remark} - EndPreamble -End - - -Style Claim - CopyStyle Remark - LatexName claim - LabelString "Claim \thetheorem." - Preamble - \newtheorem{claim}[thm]{Claim} - EndPreamble -End - -Style Case - CopyStyle Remark - LatexName case - LabelString "Case \thetheorem." - Preamble - \newtheorem{case}[thm]{Case} - EndPreamble -End - - -Style Conclusion - CopyStyle Remark - LatexName conclusion - LabelString "Conclusion \thetheorem." - Preamble - \newtheorem{conclusion}[thm]{Conclusion} - EndPreamble -End +Input theorems.inc diff --git a/lib/layouts/theorems-withinchap.module b/lib/layouts/theorems-withinchap.module index 644f29f12f..05131edf13 100644 --- a/lib/layouts/theorems-withinchap.module +++ b/lib/layouts/theorems-withinchap.module @@ -3,22 +3,6 @@ # Author: Richard Heck # Adapted from amsmaths.inc -# The environnements defined are : -# - Theorem -# - Corollary -# - Lemma -# - Proposition -# - Conjecture -# - Definition -# - Example -# - Exercise -# - Remark -# - Note -# - Claim -# - Case -# - Conclusion -# - Fact - Format 5 Counter @@ -26,162 +10,4 @@ Counter Within chapter End - -Style Theorem - Margin First_Dynamic - LatexType Environment - LatexName thm - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Counter - LabelCounter theorem - LabelString "Theorem \thechapter.\thetheorem." - Font - Shape Italic - Size Normal - EndFont - LabelFont - Shape Up - Series Bold - EndFont - Preamble - \newtheorem{thm}{Theorem}[chapter] - EndPreamble -End - -Style Corollary - CopyStyle Theorem - LatexName cor - LabelString "Corollary \thechapter.\thetheorem." - Preamble - \newtheorem{cor}[thm]{Corollary} - EndPreamble -End - -Style Lemma - CopyStyle Theorem - LatexName lem - LabelString "Lemma \thechapter.\thetheorem." - Preamble - \newtheorem{lem}[thm]{Lemma} - EndPreamble -End - -Style Proposition - CopyStyle Theorem - LatexName prop - LabelString "Proposition \thechapter.\thetheorem." - Preamble - \newtheorem{prop}[thm]{Proposition} - EndPreamble -End - -Style Conjecture - CopyStyle Theorem - LatexName conjecture - LabelString "Conjecture \thechapter.\thetheorem." - Preamble - \newtheorem{conjecture}[thm]{Conjecture} - EndPreamble -End - -Style Fact - CopyStyle Theorem - LatexName fact - LabelString "Fact \thechapter.\thetheorem." - Preamble - \newtheorem{fact}[thm]{Fact} - EndPreamble -End - -Style Definition - CopyStyle Theorem - LatexName defn - LabelString "Definition \thechapter.\thetheorem." - Font - Shape Up - EndFont - LabelFont - Shape Up - Series Bold - EndFont - Preamble - \newtheorem{defn}[thm]{Definition} - EndPreamble -End - - -Style Example - CopyStyle Definition - LatexName example - LabelString "Example \thechapter.\thetheorem." - Preamble - \newtheorem{example}[thm]{Example} - EndPreamble -End - - -Style Exercise - CopyStyle Definition - LatexName xca - LabelString "Exercise \thechapter.\thetheorem." - Preamble - \newtheorem{xca}{Exercise} - EndPreamble -End - - -Style Remark - CopyStyle Theorem - LatexName rem - LabelString "Remark \thechapter.\thetheorem." - Font - Shape Up - Size Normal - EndFont - LabelFont - Series Medium - Shape Italic - EndFont - Preamble - \newtheorem{rem}[thm]{Remark} - EndPreamble -End - - -Style Claim - CopyStyle Remark - LatexName claim - LabelString "Claim \thechapter.\thetheorem." - Preamble - \newtheorem{claim}[thm]{Claim} - EndPreamble -End - -Style Case - CopyStyle Remark - LatexName case - LabelString "Case \thechapter.\thetheorem." - Preamble - \newtheorem{case}[thm]{Case} - EndPreamble -End - - -Style Conclusion - CopyStyle Remark - LatexName conclusion - LabelString "Conclusion \thechapter.\thetheorem." - Preamble - \newtheorem{conclusion}[thm]{Conclusion} - EndPreamble -End - +Input theorems.inc diff --git a/lib/layouts/theorems-withinsec.module b/lib/layouts/theorems-withinsec.module index a0cf013708..f66c3caf5b 100644 --- a/lib/layouts/theorems-withinsec.module +++ b/lib/layouts/theorems-withinsec.module @@ -3,22 +3,6 @@ # Author: Richard Heck # Adapted from amsmaths.inc -# The environnements defined are : -# - Theorem -# - Corollary -# - Lemma -# - Proposition -# - Conjecture -# - Definition -# - Example -# - Exercise -# - Remark -# - Note -# - Claim -# - Case -# - Conclusion -# - Fact - Format 5 Counter @@ -26,162 +10,4 @@ Counter Within section End - -Style Theorem - Margin First_Dynamic - LatexType Environment - LatexName thm - NextNoIndent 1 - LabelSep xx - ParIndent MMM - ParSkip 0.4 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Counter - LabelCounter theorem - LabelString "Theorem \thetheorem." - Font - Shape Italic - Size Normal - EndFont - LabelFont - Shape Up - Series Bold - EndFont - Preamble - \newtheorem{thm}{Theorem}[section] - EndPreamble -End - -Style Corollary - CopyStyle Theorem - LatexName cor - LabelString "Corollary \thetheorem." - Preamble - \newtheorem{cor}[thm]{Corollary} - EndPreamble -End - -Style Lemma - CopyStyle Theorem - LatexName lem - LabelString "Lemma \thetheorem." - Preamble - \newtheorem{lem}[thm]{Lemma} - EndPreamble -End - -Style Proposition - CopyStyle Theorem - LatexName prop - LabelString "Proposition \thetheorem." - Preamble - \newtheorem{prop}[thm]{Proposition} - EndPreamble -End - -Style Conjecture - CopyStyle Theorem - LatexName conjecture - LabelString "Conjecture \thetheorem." - Preamble - \newtheorem{conjecture}[thm]{Conjecture} - EndPreamble -End - -Style Fact - CopyStyle Theorem - LatexName fact - LabelString "Fact \thetheorem." - Preamble - \newtheorem{fact}[thm]{Fact} - EndPreamble -End - -Style Definition - CopyStyle Theorem - LatexName defn - LabelString "Definition \thetheorem." - Font - Shape Up - EndFont - LabelFont - Shape Up - Series Bold - EndFont - Preamble - \newtheorem{defn}[thm]{Definition} - EndPreamble -End - - -Style Example - CopyStyle Definition - LatexName example - LabelString "Example \thetheorem." - Preamble - \newtheorem{example}[thm]{Example} - EndPreamble -End - - -Style Exercise - CopyStyle Definition - LatexName xca - LabelString "Exercise \thetheorem." - Preamble - \newtheorem{xca}{Exercise} - EndPreamble -End - - -Style Remark - CopyStyle Theorem - LatexName rem - LabelString "Remark \thetheorem." - Font - Shape Up - Size Normal - EndFont - LabelFont - Series Medium - Shape Italic - EndFont - Preamble - \newtheorem{rem}[thm]{Remark} - EndPreamble -End - - -Style Claim - CopyStyle Remark - LatexName claim - LabelString "Claim \thetheorem." - Preamble - \newtheorem{claim}[thm]{Claim} - EndPreamble -End - -Style Case - CopyStyle Remark - LatexName case - LabelString "Case \thetheorem." - Preamble - \newtheorem{case}[thm]{Case} - EndPreamble -End - - -Style Conclusion - CopyStyle Remark - LatexName conclusion - LabelString "Conclusion \thetheorem." - Preamble - \newtheorem{conclusion}[thm]{Conclusion} - EndPreamble -End - +Input theorems.inc diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc new file mode 100644 index 0000000000..32bb74cbf2 --- /dev/null +++ b/lib/layouts/theorems.inc @@ -0,0 +1,176 @@ +# Author: Richard Heck +# Adapted from amsmaths.inc + +# The environnements defined are : +# - Theorem +# - Corollary +# - Lemma +# - Proposition +# - Conjecture +# - Definition +# - Example +# - Exercise +# - Remark +# - Note +# - Claim +# - Case +# - Conclusion +# - Fact + +Style Theorem + Margin First_Dynamic + LatexType Environment + LatexName thm + NextNoIndent 1 + LabelSep xx + ParIndent MMM + ParSkip 0.4 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Counter + LabelCounter theorem + LabelString "Theorem \arabic{theorem}." + Font + Shape Italic + Size Normal + EndFont + LabelFont + Shape Up + Series Bold + EndFont + Preamble + \newtheorem{thm}{Theorem} + EndPreamble +End + +Style Corollary + CopyStyle Theorem + LatexName cor + LabelString "Corollary \thetheorem." + Preamble + \newtheorem{cor}[thm]{Corollary} + EndPreamble +End + +Style Lemma + CopyStyle Theorem + LatexName lem + LabelString "Lemma \thetheorem." + Preamble + \newtheorem{lem}[thm]{Lemma} + EndPreamble +End + +Style Proposition + CopyStyle Theorem + LatexName prop + LabelString "Proposition \thetheorem." + Preamble + \newtheorem{prop}[thm]{Proposition} + EndPreamble +End + +Style Conjecture + CopyStyle Theorem + LatexName conjecture + LabelString "Conjecture \thetheorem." + Preamble + \newtheorem{conjecture}[thm]{Conjecture} + EndPreamble +End + +Style Fact + CopyStyle Theorem + LatexName fact + LabelString "Fact \thetheorem." + Preamble + \newtheorem{fact}[thm]{Fact} + EndPreamble +End + +Style Definition + CopyStyle Theorem + LatexName defn + LabelString "Definition \thetheorem." + Font + Shape Up + EndFont + LabelFont + Shape Up + Series Bold + EndFont + Preamble + \newtheorem{defn}[thm]{Definition} + EndPreamble +End + + +Style Example + CopyStyle Definition + LatexName example + LabelString "Example \thetheorem." + Preamble + \newtheorem{example}[thm]{Example} + EndPreamble +End + + +Style Exercise + CopyStyle Definition + LatexName xca + LabelString "Exercise \thetheorem." + Preamble + \newtheorem{xca}{Exercise} + EndPreamble +End + + +Style Remark + CopyStyle Theorem + LatexName rem + LabelString "Remark \thetheorem." + Font + Shape Up + Size Normal + EndFont + LabelFont + Series Medium + Shape Italic + EndFont + Preamble + \newtheorem{rem}[thm]{Remark} + EndPreamble +End + + +Style Claim + CopyStyle Remark + LatexName claim + LabelString "Claim \thetheorem." + Preamble + \newtheorem{claim}[thm]{Claim} + EndPreamble +End + +Style Case + CopyStyle Remark + LatexName case + LabelString "Case \thetheorem." + Preamble + \newtheorem{case}[thm]{Case} + EndPreamble +End + + +Style Conclusion + CopyStyle Remark + LatexName conclusion + LabelString "Conclusion \thetheorem." + Preamble + \newtheorem{conclusion}[thm]{Conclusion} + EndPreamble +End -- 2.39.2