From f367964247384ab455da28b3c27092c4948d79a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Tue, 25 Sep 2007 16:38:56 +0000 Subject: [PATCH] * lib/layouts/ams*.layout: * lib/layouts/ams*.inc: - updates from Paul A. Rubin. Maybe some tweaks for 1.6 are still needed (e.g. counters). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20496 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/layouts/amsart-plain.layout | 134 +---------------- lib/layouts/amsart-seq.layout | 245 +------------------------------- lib/layouts/amsart.layout | 9 +- lib/layouts/amsbook.layout | 22 +-- lib/layouts/amsdefs.inc | 9 +- lib/layouts/amsmaths-plain.inc | 111 ++------------- lib/layouts/amsmaths-seq.inc | 182 ++++++++++++++++++++++-- lib/layouts/amsmaths.inc | 171 ++++++++++++++-------- 8 files changed, 312 insertions(+), 571 deletions(-) diff --git a/lib/layouts/amsart-plain.layout b/lib/layouts/amsart-plain.layout index 1218a80b4f..631f1b29c7 100644 --- a/lib/layouts/amsart-plain.layout +++ b/lib/layouts/amsart-plain.layout @@ -7,6 +7,7 @@ # The "unnumbered" version has all results, unnumbered # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin Format 5 Input amsart.layout @@ -14,141 +15,10 @@ Input amsart.layout # Change the definitions of the theorem-like environments to get unnumbered # results -Input amsmaths-plain.inc - # Use a simpler preamble. Preamble \usepackage{amsmath,amsthm} \usepackage{amsfonts} EndPreamble - -Style Theorem - LabelString "Theorem." -End - - -Style Corollary - LabelType Static - LabelString "Corollary." -End - - -Style Lemma - LabelType Static - LabelString "Lemma." -End - - -Style Proposition - LabelType Static - LabelString "Proposition." -End - - -Style Conjecture - LabelType Static - LabelString "Conjecture." -End - - -Style Criterion - LabelType Static - LabelString "Criterion." -End - - -Style Algorithm - LabelType Static - LabelString "Algorithm." -End - - -Style Fact - LabelType Static - LabelString "Fact." -End - - -Style Axiom - LabelType Static - LabelString "Axiom." -End - - -Style Definition - LabelType Static - LabelString "Definition." -End - - -Style Example - LabelType Static - LabelString "Example." -End - - -Style Condition - LabelType Static - LabelString "Condition." -End - - -Style Problem - LabelType Static - LabelString "Problem." -End - - -Style Exercise - LabelType Static - LabelString "Exercise." -End - - -Style Remark - LabelType Static - LabelString "Remark." -End - - -Style Claim - LabelType Static - LabelString "Claim." -End - - -Style Note - LabelType Static - LabelString "Note." -End - - -Style Notation - LabelType Static - LabelString "Notation." -End - - -Style Summary - LabelType Static - LabelString "Summary." -End - - -Style Acknowledgement - LabelType Static - LabelString "Acknowledgement." -End - - -Style Case - LabelType Static - LabelString "Case." -End - - -Style Conclusion - LabelType Static - LabelString "Conclusion." -End +Input amsmaths-plain.inc diff --git a/lib/layouts/amsart-seq.layout b/lib/layouts/amsart-seq.layout index a166cbd10b..23f25606f9 100644 --- a/lib/layouts/amsart-seq.layout +++ b/lib/layouts/amsart-seq.layout @@ -11,6 +11,7 @@ # # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin Format 5 Input amsart.layout @@ -20,247 +21,3 @@ Input amsart.layout Input amsmaths-seq.inc -# Use a simpler preamble. - -Preamble -EndPreamble - - -# but more counters - -Counter - Name corollary -End - - -Counter - Name lemma -End - - -Counter - Name proposition -End - - -Counter - Name conjecture -End - - -Counter - Name criterion -End - - -Counter - Name algorithm -End - - -Counter - Name fact -End - - -Counter - Name axiom -End - - -Counter - Name definition -End - - -Counter - Name example -End - - -Counter - Name condition -End - - -Counter - Name problem -End - - -Counter - Name exercise -End - - -Counter - Name remark -End - - -Counter - Name claim -End - - -Counter - Name note -End - - -Counter - Name notation -End - - -Counter - Name summary -End - - -Counter - Name acknowledgement -End - - -Counter - Name case -End - - -Counter - Name conclusion -End - - - -Style Theorem - LabelCounter theorem - LabelString "Theorem \arabic{theorem}." -End - - -Style Corollary - LabelCounter corollary - LabelString "Corollary \arabic{corollary}." -End - - -Style Lemma - LabelCounter lemma - LabelString "Lemma \arabic{lemma}." -End - - -Style Proposition - LabelCounter proposition - LabelString "Proposition \arabic{proposition}." -End - - -Style Conjecture - LabelCounter conjecture - LabelString "Conjecture \arabic{conjecture}." -End - - -Style Criterion - LabelCounter criterion - LabelString "Criterion \arabic{criterion}." -End - - -Style Algorithm - LabelCounter algorithm - LabelString "Algorithm \arabic{algorithm}." -End - - -Style Fact - LabelCounter fact - LabelString "Fact \arabic{fact}." -End - - -Style Axiom - LabelCounter axiom - LabelString "Axiom \arabic{axiom}." -End - - -Style Definition - LabelCounter definition - LabelString "Definition \arabic{definition}." -End - - -Style Example - LabelCounter example - LabelString "Example \arabic{example}." -End - - -Style Condition - LabelCounter condition - LabelString "Condition \arabic{condition}." -End - - -Style Problem - LabelCounter problem - LabelString "Problem \arabic{problem}." -End - - -Style Exercise - LabelCounter exercise - LabelString "Exercise \arabic{exercise}." -End - - -Style Remark - LabelCounter remark - LabelString "Remark \arabic{remark}." -End - - -Style Claim - LabelCounter claim - LabelString "Claim \arabic{claim}." -End - - -Style Note - LabelCounter note - LabelString "Note \arabic{note}." -End - - -Style Notation - LabelCounter notation - LabelString "Notation \arabic{notation}." -End - - -Style Summary - LabelCounter summary - LabelString "Summary \arabic{summary}." -End - - -Style Acknowledgement - LabelCounter acknowledgement - LabelString "Acknowledgement \arabic{acknowledgement}." -End - - -Style Case - LabelCounter case - LabelString "Case \arabic{case}." -End - - -Style Conclusion - LabelCounter conclusion - LabelString "Conclusion \arabic{conclusion}." -End diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout index 8e05e848d1..71c9348828 100644 --- a/lib/layouts/amsart.layout +++ b/lib/layouts/amsart.layout @@ -6,6 +6,7 @@ # Author : David L. Johnson # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin Format 5 Columns 1 @@ -31,22 +32,19 @@ End Preamble - \theoremstyle{plain} - \newtheorem{thm}{Theorem}[section] \numberwithin{equation}{section} %% Comment out for sequentially-numbered \numberwithin{figure}{section} %% Comment out for sequentially-numbered EndPreamble -Input stdinsets.inc Input stdsections.inc Input stdstarsections.inc Input lyxmacros.inc -Input amsdefs.inc Input stdlayouts.inc Input stdlists.inc Input stdfloats.inc Input stdcounters.inc +Input amsdefs.inc NoStyle Chapter NoStyle Paragraph @@ -56,12 +54,11 @@ NoStyle Chapter* #NoStyle Subparagraph* NoStyle Verse # Although mathematicians tend to be poets at times, - # we don't need this. + # we don't need this. Style Section Align Center - AlignPossible Block, Center, Left Font Series Medium Shape Smallcaps diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index 90c00d85ca..0ab548e154 100644 --- a/lib/layouts/amsbook.layout +++ b/lib/layouts/amsbook.layout @@ -6,6 +6,7 @@ # Author : David L. Johnson # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin Format 5 @@ -33,21 +34,17 @@ End Preamble \numberwithin{section}{chapter} - \theoremstyle{plain} - \newtheorem{thm}{Theorem}[section] \numberwithin{equation}{section} %% Comment out for sequentially-numbered \numberwithin{figure}{section} %% Comment out for sequentially-numbered EndPreamble -Input stdinsets.inc Input stdsections.inc Input numreport.inc Style Section Align Center - AlignPossible Block, Center, Left Font Series Medium Shape Smallcaps @@ -73,24 +70,17 @@ End Input stdstarsections.inc - - Input lyxmacros.inc -NoStyle Address - - -Input amsdefs.inc - - Input stdlayouts.inc -NoStyle Verse -NoStyle Abstract - - Input stdlists.inc Input stdfloats.inc Input stdcounters.inc +Input amsdefs.inc +# Unwanted styles from the includes +NoStyle Address +NoStyle Verse +NoStyle Abstract # Chapter is _not_ prepended Style Section diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index 6e4d20eede..b9b0e6f988 100644 --- a/lib/layouts/amsdefs.inc +++ b/lib/layouts/amsdefs.inc @@ -1,6 +1,7 @@ # Author : David L. Johnson # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin # Including the maths stuff Format 5 @@ -68,7 +69,6 @@ Style Title BottomSep 1 ParSep 1 Align Center - AlignPossible Center LabelType No_Label OptionalArgs 1 Font @@ -90,7 +90,6 @@ Style Author BottomSep 0.7 ParSep 0.7 Align Center - AlignPossible Center LabelType No_Label Font Size Large @@ -110,7 +109,6 @@ Style Date BottomSep 0.5 ParSep 1 Align Center - AlignPossible Center LabelType Static LabelString "Date:" Font @@ -135,7 +133,6 @@ Style Abstract TopSep 0.7 BottomSep 0.7 Align Block - AlignPossible Block LabelType Static LabelString "Abstract." LabelSep M @@ -222,8 +219,8 @@ End Style Subjectclass CopyStyle Address - LatexName subjclass - LabelString "1991 Mathematics Subject Classification:" + LatexName subjclass[2000] + LabelString "2000 Mathematics Subject Classification:" End diff --git a/lib/layouts/amsmaths-plain.inc b/lib/layouts/amsmaths-plain.inc index b26a0d44e9..251f2ed582 100644 --- a/lib/layouts/amsmaths-plain.inc +++ b/lib/layouts/amsmaths-plain.inc @@ -1,9 +1,12 @@ # Author : David L. Johnson # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin -# These are only the plain (unnumbered) theorem styles environments +# These are only the plain (unnumbered) theorem styles environments. +# Both starred and unstarred versions are included for compatibility +# with the other AMS classes. # The environments defined are: # - Theorem # - Corollary @@ -25,226 +28,140 @@ # - Notation # - Summary # - Acknowledgement -# - Case # - Conclusion +# - Assumption +# - Case (regular only -- defined as an enumeration) Format 5 + Style Theorem LatexName thm* LabelString "Theorem." - Preamble - \theoremstyle{plain} - \newtheorem*{thm*}{Theorem} - EndPreamble End Style Corollary LatexName cor* LabelString "Corollary." - Preamble - \theoremstyle{plain} - \newtheorem*{cor*}{Corollary} - EndPreamble End Style Lemma LatexName lem* LabelString "Lemma." - Preamble - \theoremstyle{plain} - \newtheorem*{lem*}{Lemma} - EndPreamble End Style Proposition LatexName prop* LabelString "Proposition." - Preamble - \theoremstyle{plain} - \newtheorem*{prop*}{Proposition} - EndPreamble End Style Conjecture LatexName conjecture* LabelString "Conjecture." - Preamble - \theoremstyle{plain} - \newtheorem*{conjecture*}{Conjecture} - EndPreamble End Style Criterion LatexName criterion* LabelString "Criterion." - Preamble - \theoremstyle{plain} - \newtheorem*{criterion*}{Criterion} - EndPreamble End Style Algorithm LatexName algorithm* - LabelString "Algorithm #." - Preamble - \theoremstyle{plain} - \newtheorem*{algorithm*}{Algorithm} - EndPreamble + LabelString "Algorithm." End Style Fact LatexName fact* LabelString "Fact." - Preamble - \theoremstyle{plain} - \newtheorem*{fact*}{Fact} - EndPreamble End Style Axiom LatexName ax* LabelString "Axiom." - Preamble - \theoremstyle{plain} - \newtheorem*{ax*}{Axiom} - EndPreamble End Style Definition LatexName defn* LabelString "Definition." - Preamble - \theoremstyle{definition} - \newtheorem*{defn*}{Definition} - EndPreamble End Style Example LatexName example* LabelString "Example." - Preamble - \theoremstyle{definition} - \newtheorem*{example*}{Example} - EndPreamble End Style Condition LatexName condition* LabelString "Condition." - Preamble - \theoremstyle{definition} - \newtheorem*{condition*}{Condition} - EndPreamble End Style Problem LatexName problem* LabelString "Problem." - Preamble - \theoremstyle{definition} - \newtheorem*{problem*}{Problem} - EndPreamble End Style Exercise LatexName xca* LabelString "Exercise." - Preamble - \theoremstyle{definition} - \newtheorem*{xca*}{Exercise} - EndPreamble End Style Remark LatexName rem* LabelString "Remark." - Preamble - \theoremstyle{remark} - \newtheorem*{rem*}{Remark} - EndPreamble End Style Claim LatexName claim* LabelString "Claim." - Preamble - \theoremstyle{remark} - \newtheorem*{claim*}{Claim} - EndPreamble End Style Note LatexName note* LabelString "Note." - Preamble - \theoremstyle{remark} - \newtheorem*{note*}{Note} - EndPreamble End Style Notation LatexName notation* LabelString "Notation." - Preamble - \theoremstyle{remark} - \newtheorem*{notation*}{Notation} - EndPreamble End Style Summary LatexName summary* LabelString "Summary." - Preamble - \theoremstyle{remark} - \newtheorem*{summary*}{Summary} - EndPreamble End Style Acknowledgement LatexName acknowledgement* LabelString "Acknowledgement." - Preamble - \theoremstyle{remark} - \newtheorem*{acknowledgement*}{Acknowledgement} - EndPreamble -End - - -Style Case - LatexName case* - LabelString "Case." - Preamble - \theoremstyle{remark} - \newtheorem*{case*}{Case} - EndPreamble End Style Conclusion LatexName conclusion* LabelString "Conclusion." - Preamble - \theoremstyle{remark} - \newtheorem*{conclusion*}{Conclusion} - EndPreamble +End + + +Style Assumption + LatexName assumption* + LabelString "Assumption." End diff --git a/lib/layouts/amsmaths-seq.inc b/lib/layouts/amsmaths-seq.inc index e90e383629..86fd047f21 100644 --- a/lib/layouts/amsmaths-seq.inc +++ b/lib/layouts/amsmaths-seq.inc @@ -1,6 +1,7 @@ # Author : David L. Johnson # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN +# Tinkered with Sep. '07 by Paul Rubin # These are only the theorems styles environnements # The environnements defined are : @@ -24,12 +25,131 @@ # - Notation # - Summary # - Acknowledgement -# - Case # - Conclusion - +# - Assumption +# - Case (regular only -- defined as an enumeration) Format 5 + +# Use a simpler preamble. + +Preamble +EndPreamble + + +# but more counters + +# Do not restart theorem counter after section change +Counter + Name thm +End + +Counter + Name corollary +End + + +Counter + Name lemma +End + + +Counter + Name proposition +End + + +Counter + Name conjecture +End + + +Counter + Name criterion +End + + +Counter + Name algorithm +End + + +Counter + Name fact +End + + +Counter + Name axiom +End + + +Counter + Name definition +End + + +Counter + Name example +End + + +Counter + Name condition +End + + +Counter + Name problem +End + + +Counter + Name exercise +End + + +Counter + Name remark +End + + +Counter + Name claim +End + + +Counter + Name note +End + + +Counter + Name notation +End + + +Counter + Name summary +End + + +Counter + Name acknowledgement +End + + +Counter + Name conclusion +End + +Counter + Name assumption +End + Style Theorem + LabelCounter thm + LabelString "Theorem \arabic{thm}." Preamble \theoremstyle{plain} \newtheorem{thm}{Theorem} @@ -38,6 +158,8 @@ End Style Corollary + LabelCounter corollary + LabelString "Corollary \arabic{corollary}." Preamble \theoremstyle{plain} \newtheorem{cor}{Corollary} @@ -46,6 +168,8 @@ End Style Lemma + LabelCounter lemma + LabelString "Lemma \arabic{lemma}." Preamble \theoremstyle{plain} \newtheorem{lem}{Lemma} @@ -54,6 +178,8 @@ End Style Proposition + LabelCounter proposition + LabelString "Proposition \arabic{proposition}." Preamble \theoremstyle{plain} \newtheorem{prop}{Proposition} @@ -62,6 +188,8 @@ End Style Conjecture + LabelCounter conjecture + LabelString "Conjecture \arabic{conjecture}." Preamble \theoremstyle{plain} \newtheorem{conjecture}{Conjecture} @@ -70,6 +198,8 @@ End Style Criterion + LabelCounter criterion + LabelString "Criterion \arabic{criterion}." Preamble \theoremstyle{plain} \newtheorem{criterion}{Criterion} @@ -78,6 +208,8 @@ End Style Algorithm + LabelCounter algorithm + LabelString "Algorithm \arabic{algorithm}." Preamble \theoremstyle{plain} \newtheorem{algorithm}{Algorithm} @@ -86,6 +218,8 @@ End Style Fact + LabelCounter fact + LabelString "Fact \arabic{fact}." Preamble \theoremstyle{plain} \newtheorem{fact}{Fact} @@ -94,6 +228,8 @@ End Style Axiom + LabelCounter axiom + LabelString "Axiom \arabic{axiom}." Preamble \theoremstyle{plain} \newtheorem{ax}{Axiom} @@ -102,6 +238,8 @@ End Style Definition + LabelCounter definition + LabelString "Definition \arabic{definition}." Preamble \theoremstyle{definition} \newtheorem{defn}{Definition} @@ -110,6 +248,8 @@ End Style Example + LabelCounter example + LabelString "Example \arabic{example}." Preamble \theoremstyle{definition} \newtheorem{example}{Example} @@ -118,6 +258,8 @@ End Style Condition + LabelCounter condition + LabelString "Condition \arabic{condition}." Preamble \theoremstyle{definition} \newtheorem{condition}{Condition} @@ -126,6 +268,8 @@ End Style Problem + LabelCounter problem + LabelString "Problem \arabic{problem}." Preamble \theoremstyle{definition} \newtheorem{problem}{Problem} @@ -134,6 +278,8 @@ End Style Exercise + LabelCounter exercise + LabelString "Exercise \arabic{exercise}." Preamble \theoremstyle{definition} \newtheorem{xca}{Exercise} @@ -142,6 +288,8 @@ End Style Remark + LabelCounter remark + LabelString "Remark \arabic{remark}." Preamble \theoremstyle{remark} \newtheorem{rem}{Remark} @@ -150,6 +298,8 @@ End Style Claim + LabelCounter claim + LabelString "Claim \arabic{claim}." Preamble \theoremstyle{remark} \newtheorem{claim}{Claim} @@ -158,6 +308,8 @@ End Style Note + LabelCounter note + LabelString "Note \arabic{note}." Preamble \theoremstyle{remark} \newtheorem{note}{Note} @@ -166,6 +318,8 @@ End Style Notation + LabelCounter notation + LabelString "Notation \arabic{notation}." Preamble \theoremstyle{remark} \newtheorem{notation}{Notation} @@ -174,6 +328,8 @@ End Style Summary + LabelCounter summary + LabelString "Summary \arabic{summary}." Preamble \theoremstyle{remark} \newtheorem{summary}{Summary} @@ -182,6 +338,8 @@ End Style Acknowledgement + LabelCounter acknowledgement + LabelString "Acknowledgement \arabic{acknowledgement}." Preamble \theoremstyle{remark} \newtheorem{acknowledgement}{Acknowledgement} @@ -189,15 +347,9 @@ Style Acknowledgement End -Style Case - Preamble - \theoremstyle{remark} - \newtheorem{case}{Case} - EndPreamble -End - - Style Conclusion + LabelCounter conclusion + LabelString "Conclusion \arabic{conclusion}." Preamble \theoremstyle{remark} \newtheorem{conclusion}{Conclusion} @@ -205,5 +357,11 @@ Style Conclusion End - - +Style Assumption + LabelCounter assumption + LabelString "Assumption \arabic{assumption}." + Preamble + \theoremstyle{plain} + \newtheorem{assumption}{Assumption} + EndPreamble +End diff --git a/lib/layouts/amsmaths.inc b/lib/layouts/amsmaths.inc index d1f1b33fb7..6c4f4db39a 100644 --- a/lib/layouts/amsmaths.inc +++ b/lib/layouts/amsmaths.inc @@ -5,57 +5,39 @@ # numbered environments (figures as well) containing the section number. # (Themorem (1.1), Corollary (1.2) Theorem (1.3), etc. # These are only the theorems styles environnements +# Tinkered with Sep. '07 by Paul Rubin - -# The environnements defined are : +# The environnements defined (regular and starred) are : # - 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* +# - Assumption +# - Case (regular only -- defined as an enumeration) Format 5 -Preamble - \theoremstyle{plain} - \newtheorem{thm}{Theorem}[section] -EndPreamble Counter Name theorem + Within section End @@ -76,7 +58,7 @@ Style Theorem AlignPossible Block, Left LabelType Counter LabelCounter theorem - LabelString "Theorem \thetheorem." + LabelString "Theorem @Section@.\arabic{theorem}." Font Shape Italic Size Normal @@ -85,6 +67,10 @@ Style Theorem Shape Up Series Bold EndFont + Preamble + \theoremstyle{plain} + \newtheorem{thm}{Theorem}[section] + EndPreamble End @@ -103,7 +89,7 @@ End Style Corollary CopyStyle Theorem LatexName cor - LabelString "Corollary \thetheorem." + LabelString "Corollary @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{cor}[thm]{Corollary} @@ -125,7 +111,7 @@ End Style Lemma CopyStyle Theorem LatexName lem - LabelString "Lemma \thetheorem." + LabelString "Lemma @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{lem}[thm]{Lemma} @@ -147,7 +133,7 @@ End Style Proposition CopyStyle Theorem LatexName prop - LabelString "Proposition \thetheorem." + LabelString "Proposition @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{prop}[thm]{Proposition} @@ -169,7 +155,7 @@ End Style Conjecture CopyStyle Theorem LatexName conjecture - LabelString "Conjecture \thetheorem." + LabelString "Conjecture @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{conjecture}[thm]{Conjecture} @@ -191,18 +177,28 @@ End Style Criterion CopyStyle Theorem LatexName criterion - LabelString "Criterion \thetheorem." + LabelString "Criterion @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{criterion}[thm]{Criterion} EndPreamble End +Style Criterion* + CopyStyle Theorem* + LatexName criterion* + LabelString "Criterion." + Preamble + \theoremstyle{plain} + \newtheorem*{criterion*}{Criterion} + EndPreamble +End + Style Algorithm CopyStyle Theorem LatexName algorithm - LabelString "Algorithm \thetheorem." + LabelString "Algorithm @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{algorithm}[thm]{Algorithm} @@ -210,10 +206,21 @@ Style Algorithm End +Style Algorithm* + CopyStyle Theorem* + LatexName algorithm* + LabelString "Algorithm." + Preamble + \theoremstyle{plain} + \newtheorem*{algorithm*}{Algorithm} + EndPreamble +End + + Style Fact CopyStyle Theorem LatexName fact - LabelString "Fact \thetheorem." + LabelString "Fact @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{fact}[thm]{Fact} @@ -235,7 +242,7 @@ End Style Axiom CopyStyle Theorem LatexName ax - LabelString "Axiom \thetheorem." + LabelString "Axiom @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{ax}[thm]{Axiom} @@ -243,10 +250,21 @@ Style Axiom End +Style Axiom* + CopyStyle Theorem* + LatexName ax* + LabelString "Axiom." + Preamble + \theoremstyle{plain} + \newtheorem*{ax*}{Axiom} + EndPreamble +End + + Style Definition CopyStyle Theorem LatexName defn - LabelString "Definition \thetheorem." + LabelString "Definition @Section@.\arabic{theorem}." Font Shape Up EndFont @@ -276,7 +294,7 @@ End Style Example CopyStyle Definition LatexName example - LabelString "Example \thetheorem." + LabelString "Example @Section@.\arabic{theorem}." Preamble \theoremstyle{definition} \newtheorem{example}[thm]{Example} @@ -298,7 +316,7 @@ End Style Condition CopyStyle Definition LatexName condition - LabelString "Condition \thetheorem." + LabelString "Condition @Section@.\arabic{theorem}." Preamble \theoremstyle{definition} \newtheorem{condition}[thm]{Condition} @@ -320,7 +338,7 @@ End Style Problem CopyStyle Definition LatexName problem - LabelString "Problem \thetheorem." + LabelString "Problem @Section@.\arabic{theorem}." Preamble \theoremstyle{definition} \newtheorem{problem}[thm]{Problem} @@ -342,11 +360,10 @@ End Style Exercise CopyStyle Definition LatexName xca - LabelString "Exercise \thetheorem." + LabelString "Exercise @Section@.\arabic{theorem}." Preamble \theoremstyle{definition} - %%Delete [section] for sequential numbering - \newtheorem{xca}[section]{Exercise} + \newtheorem{xca}[thm]{Exercise} EndPreamble End @@ -365,7 +382,7 @@ End Style Remark CopyStyle Theorem LatexName rem - LabelString "Remark \thetheorem." + LabelString "Remark @Section@.\arabic{theorem}." Font Shape Up Size Normal @@ -396,7 +413,7 @@ End Style Claim CopyStyle Remark LatexName claim - LabelString "Claim \thetheorem." + LabelString "Claim @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{claim}[thm]{Claim} @@ -418,7 +435,7 @@ End Style Note CopyStyle Remark LatexName note - LabelString "Note \thetheorem." + LabelString "Note @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{note}[thm]{Note} @@ -440,7 +457,7 @@ End Style Notation CopyStyle Remark LatexName notation - LabelString "Notation \thetheorem." + LabelString "Notation @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{notation}[thm]{Notation} @@ -454,7 +471,7 @@ Style Notation* LabelString "Notation." Preamble \theoremstyle{remark} - \newtheorem*{notation*}[thm]{Notation} + \newtheorem*{notation*}{Notation} EndPreamble End @@ -462,7 +479,7 @@ End Style Summary CopyStyle Remark LatexName summary - LabelString "Summary \thetheorem." + LabelString "Summary @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{summary}[thm]{Summary} @@ -470,10 +487,21 @@ Style Summary End +Style Summary* + CopyStyle Remark* + LatexName summary* + LabelString "Summary." + Preamble + \theoremstyle{remark} + \newtheorem*{summary*}{Summary} + EndPreamble +End + + Style Acknowledgement CopyStyle Remark LatexName acknowledgement - LabelString "Acknowledgement \thetheorem." + LabelString "Acknowledgement @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{acknowledgement}[thm]{Acknowledgement} @@ -492,21 +520,10 @@ Style Acknowledgement* 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." + LabelString "Conclusion @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{conclusion}[thm]{Conclusion} @@ -523,3 +540,41 @@ Style Conclusion* \newtheorem*{conclusion*}{Conclusion} EndPreamble End + + +Style Assumption + CopyStyle Theorem + LatexName assumption + LabelString "Assumption @Section@.\arabic{theorem}." + Preamble + \theoremstyle{plain} + \newtheorem{assumption}[thm]{Assumption} + EndPreamble +End + + +Style Assumption* + CopyStyle Theorem* + LatexName assumption* + LabelString "Assumption." + Preamble + \theoremstyle{plain} + \newtheorem*{assumption*}{Assumption} + EndPreamble +End + + +# Define Case as an enumeration environment +Style Case + CopyStyle Enumerate + LatexName caseenv + LabelType Static + LeftMargin "MMMMMMN" + LabelString "Case #:" + Preamble + \newcounter{casectr} + \newenvironment{caseenv} + {\begin{list}{\bfseries\upshape Case \arabic{casectr}:}{}\setcounter{casectr}{0}\usecounter{casectr}} + {\end{list}} + EndPreamble +End