From fb0be050d192a963849cfb33d78b58345662c559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 15 Sep 2003 15:49:13 +0000 Subject: [PATCH] grrrrrr.... the rest of that pile of s... All of it. I don't get it. An hour wasted to chop things into pieces to get the effect of a three-second 'cvs commit'... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7760 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/layouts/IEEEtran.layout | 105 ++++------ lib/layouts/aa.layout | 109 +++++----- lib/layouts/amsart-plain.layout | 134 +++++++++++- lib/layouts/amsart.layout | 105 ++++------ lib/layouts/amsbook.layout | 126 ++++++------ lib/layouts/amsdefs.inc | 166 +++------------ lib/layouts/amsmaths-plain.inc | 67 ++---- lib/layouts/amsmaths.inc | 215 ++++++++----------- lib/layouts/article.layout | 31 +-- lib/layouts/elsart.layout | 218 +++++++------------- lib/layouts/numarticle.inc | 45 ++++ lib/layouts/numreport.inc | 54 +++++ lib/layouts/numrevtex.inc | 38 ++++ lib/layouts/siamltex.layout | 352 ++++++++++++++++---------------- lib/layouts/stdsections.inc | 21 -- 15 files changed, 840 insertions(+), 946 deletions(-) create mode 100644 lib/layouts/numrevtex.inc diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 3b3ad121e4..c4a513ba0b 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -14,30 +14,6 @@ # the author information area. There is a LaTeX 2.09 IEEEtran.sty available # also but LyX doesn't support 2.09 stuff so don't get that one. - -# Input general definitions - -Columns 1 -Sides 1 -MaxCounter Counter_Section -SecNumDepth 3 -TocDepth 3 - - -ClassOptions - FontSize 9|10|11|12 -End - - -DefaultFont - Family Roman - Series Medium - Shape Up - Size Normal - Color None -EndFont - - Style Standard Margin Static LatexType Paragraph @@ -50,8 +26,12 @@ Style Standard End -Input stdlists.inc +## +## stdlists +## + +Input stdlists.inc # First cut at theorem environment support. # What other theorem-like environments are needed? @@ -63,6 +43,7 @@ Input stdlists.inc # Tell me: rae@lyx.org +# Theorem-numbered style *Template* declaration Style TheoremTemplate Margin First_Dynamic LatexType Environment @@ -72,8 +53,6 @@ Style TheoremTemplate Align Block AlignPossible Block, Left LabelType Static - - # label font definition LabelFont Shape Italic EndFont @@ -92,7 +71,6 @@ Style Theorem CopyStyle TheoremTemplate LatexName thm LabelString "Theorem #:" - Preamble \newtheorem{thm}{Theorem} EndPreamble @@ -103,7 +81,6 @@ Style Lemma CopyStyle TheoremTemplate LatexName lemma LabelString "Lemma #:" - Preamble \newtheorem{lemma}{Lemma} EndPreamble @@ -114,7 +91,6 @@ Style Corollary CopyStyle TheoremTemplate LatexName cor LabelString "Corollary #:" - Preamble \newtheorem{cor}{Corollary} EndPreamble @@ -125,7 +101,6 @@ Style Proposition CopyStyle TheoremTemplate LatexName prop LabelString "Proposition #:" - Preamble \newtheorem{prop}{Proposition} EndPreamble @@ -136,7 +111,6 @@ Style Conjecture CopyStyle TheoremTemplate LatexName conject LabelString "Conjecture #:" - Preamble \newtheorem{conject}{Conjecture} EndPreamble @@ -147,7 +121,6 @@ Style Criterion CopyStyle TheoremTemplate LatexName criter LabelString "Criterion #:" - Preamble \newtheorem{criter}{Criterion} EndPreamble @@ -158,7 +131,6 @@ Style Fact CopyStyle TheoremTemplate LatexName fact LabelString "Fact #:" - Preamble \newtheorem{fact}{Fact} EndPreamble @@ -169,7 +141,6 @@ Style Axiom CopyStyle TheoremTemplate LatexName axi LabelString "Axiom #:" - Preamble \newtheorem{axi}{Axiom} EndPreamble @@ -180,7 +151,6 @@ Style Definition CopyStyle TheoremTemplate LatexName definitn LabelString "Definition #:" - Preamble \newtheorem{definitn}{Definition} EndPreamble @@ -191,7 +161,6 @@ Style Example CopyStyle TheoremTemplate LatexName example LabelString "Example #:" - Preamble \newtheorem{example}{Example} EndPreamble @@ -202,7 +171,6 @@ Style Condition CopyStyle TheoremTemplate LatexName condition LabelString "Condition #:" - Preamble \newtheorem{condition}{Condition} EndPreamble @@ -213,7 +181,6 @@ Style Problem CopyStyle TheoremTemplate LatexName problem LabelString "Problem #:" - Preamble \newtheorem{problem}{Problem} EndPreamble @@ -224,7 +191,6 @@ Style Exercise CopyStyle TheoremTemplate LatexName exacise LabelString "Exercise #:" - Preamble \newtheorem{exacise}{Exercise} EndPreamble @@ -235,7 +201,6 @@ Style Remark CopyStyle TheoremTemplate LatexName remrk LabelString "Remark #:" - Preamble \newtheorem{remrk}{Remark} EndPreamble @@ -246,7 +211,6 @@ Style Claim CopyStyle TheoremTemplate LatexName claim LabelString "Claim #:" - Preamble \newtheorem{claim}{Claim} EndPreamble @@ -257,7 +221,6 @@ Style Note CopyStyle TheoremTemplate LatexName note LabelString "Note #:" - Preamble \newtheorem{note}{Note} EndPreamble @@ -268,7 +231,6 @@ Style Notation CopyStyle TheoremTemplate LatexName notation LabelString "Notation #:" - Preamble \newtheorem{notation}{Notation} EndPreamble @@ -279,7 +241,6 @@ Style Case CopyStyle TheoremTemplate LatexName case LabelString "Case #:" - Preamble \newtheorem{case}{Case} EndPreamble @@ -288,10 +249,14 @@ End NoStyle TheoremTemplate + +## +## stdsections and stdstarsections +## + Input stdsections.inc Input stdstarsections.inc - NoStyle Part NoStyle Part* NoStyle Chapter @@ -303,7 +268,6 @@ NoStyle Subparagraph* Style Section Align Center AlignPossible Block, Center, Left - Font Shape Smallcaps Size Normal @@ -330,7 +294,6 @@ End Style Section* Align Center AlignPossible Block, Center, Left - Font Shape Smallcaps Size Normal @@ -354,10 +317,13 @@ Style Subsubsection* End + +## +## stdstruct +## Input stdtitle.inc Input stdstruct.inc - Style Abstract Margin First_Dynamic LeftMargin "" @@ -367,12 +333,10 @@ Style Abstract LabelType Static LabelString "Abstract---" # LabelBottomSep 0.0 - Font Series Bold Size Small EndFont - LabelFont Shape Italic Series Medium @@ -437,25 +401,9 @@ End Style Appendices - Margin Static - LatexType Command - InTitle 0 + CopyStyle Appendix LatexName appendices - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Center - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "Appendices" - TextFont - Shape Up - Size Small - EndFont - LabelFont - Shape Smallcaps - Size Normal - EndFont End @@ -470,6 +418,10 @@ Style Biography End +## +## stdlayouts +## + Input stdlayouts.inc @@ -511,9 +463,24 @@ Style MarkBoth End +## ## Others +## +Input numarticle.inc Input stdfloats.inc Input stdcounters.inc Input lyxmacros.inc -Input obsolete.inc + + +Columns 1 +Sides 1 +SecNumDepth 3 +TocDepth 3 + + +ClassOptions + FontSize 9|10|11|12 +End + + diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index f6f0e5cd0b..9d2e21c431 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -10,23 +10,14 @@ # change layout of title # abstract is command -# General textclass parameters + Columns 2 Sides 2 -MaxCounter Counter_Section SecNumDepth 3 TocDepth 0 PageStyle Plain -DefaultFont - Family Roman - Series Medium - Shape Up - Size Normal - Color None -EndFont -# Standard style definition Style Standard Margin Static LatexType Paragraph @@ -38,66 +29,82 @@ Style Standard LabelType No_Label End + # I want to keep the entries in a logical order. # Therefore I'll define the entries first, then fill them Style Section - End +End + Style Subsection - End +End + Style Subsubsection - End +End + Style Itemize - End +End + Style Enumerate - End +End + Style Description - End +End + Style List - End +End + Style Caption - End +End + Style Title - End +End + Style Subtitle - End +End + Style Author - End +End + Style Address - End +End + Style Offprint - End +End + Style Mail - End +End + Style Date - End +End + Style Abstract - End +End + Style Acknowledgement - End +End + Style Bibliography - End +End + # OK, now we have a more or less consistent Ordering. Now fill the -# definitions. -# First, the standard includes +# definitions. First, the standard includes Input stdlists.inc Input stdsections.inc +Input numarticle.inc Input stdtitle.inc Input stdstruct.inc Input stdfloats.inc Input stdcounters.inc -# Remove unwanted Styles NoStyle Chapter NoStyle Paragraph NoStyle Subparagraph NoStyle Part -# Definitions only valid for A&A style -# Subitle style definition Style Subtitle Margin Static LatexType Command @@ -111,8 +118,6 @@ Style Subtitle ParSep 1 Align Center LabelType No_Label - - # standard font definition Font Family Sans Size Larger @@ -120,7 +125,7 @@ Style Subtitle EndFont End -# Address style definition + Style Address LeftMargin MMM Margin Static @@ -131,14 +136,13 @@ Style Address # BottomSep 0.4 Align Left LabelType No_Label - Font Family Roman Size Small EndFont End -# Address for Offprints style definition + Style Offprint Margin Static LatexType Command @@ -150,7 +154,6 @@ Style Offprint LabelType Static LabelString "Offprint Requests to:" LabelSep M - Font Family Roman Size Small @@ -162,7 +165,7 @@ Style Offprint EndFont End -# Mail address style definition + Style Mail Margin Static LatexType Command @@ -174,7 +177,6 @@ Style Mail LabelType Static LabelString "Correspondence to:" LabelSep M - Font Family Roman Size Small @@ -187,7 +189,6 @@ Style Mail End -# Acnowledgement style definition Style Acknowledgement Margin First_Dynamic LatexType Environment @@ -202,19 +203,16 @@ Style Acknowledgement LabelType Static LabelString "Acknowledgements." LabelSep M - # standard font definition Font Size Small EndFont - - # label font definition LabelFont Size Small Shape Italic EndFont End -# Caption style definition + Style Caption Margin First_Dynamic LatexType Command @@ -227,15 +225,12 @@ Style Caption AlignPossible Center LabelType Sensitive LabelString Caption - LabelFont Series Bold EndFont End -# Redefine some things -# Section style redefinition Style Section TopSep 2.0 BottomSep 1.3 @@ -245,7 +240,7 @@ Style Section EndFont End -# Subsection style redefinition + Style Subsection TopSep 1.7 BottomSep 1.1 @@ -257,7 +252,7 @@ Style Subsection EndFont End -# Subsubsection style redefinition + Style Subsubsection TopSep 1.7 BottomSep 1.1 @@ -267,7 +262,7 @@ Style Subsubsection EndFont End -# Title style redefinition + Style Title TopSep 2 BottomSep 1.3 @@ -279,7 +274,7 @@ Style Title EndFont End -# Author style redefinition + Style Author Align Center AlignPossible Center @@ -291,7 +286,7 @@ Style Author EndFont End -# Date style redefinition + Style Date LeftMargin MMM LabelSep "" @@ -303,7 +298,7 @@ Style Date EndFont End -# Abstract style redefinition + Style Abstract Margin First_Dynamic LatexType Command @@ -323,7 +318,6 @@ Style Abstract LabelString " Abstract " LabelSep M LabelBottomSep 0 - Font Size Small EndFont @@ -334,7 +328,7 @@ Style Abstract EndFont End -# Bibliography style redefinition + Style Bibliography Align Left AlignPossible Left @@ -342,4 +336,3 @@ Style Bibliography Series Bold EndFont End - diff --git a/lib/layouts/amsart-plain.layout b/lib/layouts/amsart-plain.layout index e387760340..43f6367b94 100644 --- a/lib/layouts/amsart-plain.layout +++ b/lib/layouts/amsart-plain.layout @@ -9,8 +9,10 @@ # modified and modularized by Emmanuel GUREGHIAN Input amsart.layout + # Change the definitions of the theorem-like environments to get unnumbered -# results +# results + Input amsmaths-plain.inc # Use a simpler preamble. @@ -19,3 +21,133 @@ Preamble \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 diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout index 5ac19e1392..7b3827f6a1 100644 --- a/lib/layouts/amsart.layout +++ b/lib/layouts/amsart.layout @@ -7,19 +7,16 @@ # Probably broken by Jean-Marc Lasgouttes # modified and modularized by Emmanuel GUREGHIAN - -# General textclass parameters -# Description "article (AMS)" Columns 1 Sides 2 PageStyle Headers -MaxCounter Counter_Section + ClassOptions FontSize 8|9|10|11|12 End -# Standard style definition + Style Standard Margin Static LatexType Paragraph @@ -31,55 +28,6 @@ Style Standard LabelType No_Label End -############### Sections. -# First the standard numbered definitions -Input stdsections.inc - - -# Redefine some of the section styles. -Style Section - Align Center - AlignPossible Block, Center, Left - - # standard font definition - Font - Series Medium - Shape Smallcaps - Size Large - EndFont -End - -# Subsection-numbered style definition -Style Subsection - # standard font definition - Font - Series Bold - Size Normal - EndFont -End - -# Subsubsection-numbered style definition -Style Subsubsection - # standard font definition - Font - Shape Italic - Size Normal - EndFont -End - -# then define the unumbered sections, based on the numbered ones. -Input stdstarsections.inc - -# remove the layouts that we do not need. -NoStyle Chapter -NoStyle Paragraph -NoStyle Subparagraph -NoStyle Chapter* -#NoStyle Paragraph* -#NoStyle Subparagraph* - -# Perharp's we should put this at the end of the file so it appears at the end -# of the list box ?? Preamble \theoremstyle{plain} @@ -89,21 +37,50 @@ Preamble EndPreamble - +Input stdsections.inc +Input stdstarsections.inc +Input numarticle.inc Input lyxmacros.inc -NoStyle Address Input amsdefs.inc - - Input stdlayouts.inc -NoStyle Verse # Although mathematicians tend to be poets at times, - # we don't need this. - - Input stdlists.inc Input stdfloats.inc Input stdcounters.inc -### Finally a few obsolete definitions for compatibility -Input obsolete.inc +NoStyle Chapter +NoStyle Paragraph +NoStyle Subparagraph +NoStyle Chapter* +NoStyle Address +#NoStyle Paragraph* +#NoStyle Subparagraph* +NoStyle Verse # Although mathematicians tend to be poets at times, + # we don't need this. + + +Style Section + Align Center + AlignPossible Block, Center, Left + Font + Series Medium + Shape Smallcaps + Size Large + EndFont +End + + +Style Subsection + Font + Series Bold + Size Normal + EndFont +End + + +Style Subsubsection + Font + Shape Italic + Size Normal + EndFont +End diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index e25ca1ad24..e71bd0d55b 100644 --- a/lib/layouts/amsbook.layout +++ b/lib/layouts/amsbook.layout @@ -8,18 +8,16 @@ # modified and modularized by Emmanuel GUREGHIAN -# General textclass parameters -# Description "book (AMS)" Columns 1 Sides 2 PageStyle Headers -MaxCounter Counter_Chapter + ClassOptions FontSize 8|9|10|11|12 End -# Standard style definition + Style Standard Margin Static LatexType Paragraph @@ -32,49 +30,6 @@ Style Standard End - -############### Sections. - -Input stdsections.inc - -# Redefine some of the section styles. -Style Section - Align Center - AlignPossible Block, Center, Left - - # standard font definition - Font - Series Medium - Shape Smallcaps - Size Large - EndFont -End - -# Subsection-numbered style definition -Style Subsection - # standard font definition - Font - Series Bold - Size Normal - EndFont -End - -# Subsubsection-numbered style definition -Style Subsubsection - # standard font definition - Font - Shape Italic - Size Normal - EndFont -End - -# then define the unumbered sections, based on the numbered ones. -Input stdstarsections.inc - - -# Perharp's we should put this at the end of the file so it appears at the end -# of the list box ?? - Preamble \numberwithin{section}{chapter} \theoremstyle{plain} @@ -83,23 +38,75 @@ Preamble \numberwithin{figure}{section} %% Comment out for sequentially-numbered EndPreamble + +Input stdsections.inc +Input numreport.inc + + +Style Section + Align Center + AlignPossible Block, Center, Left + Font + Series Medium + Shape Smallcaps + Size Large + EndFont +End + + +Style Subsection + Font + Series Bold + Size Normal + EndFont +End + + +Style Subsubsection + Font + Shape Italic + Size Normal + EndFont +End + + +Input stdstarsections.inc + + Input lyxmacros.inc NoStyle Address + + Input amsdefs.inc - + Input stdlayouts.inc -NoStyle Verse # Although mathematicians tend to be poets at times, - # we don't need this. -NoStyle Abstract # there are no abstract in a book. +NoStyle Verse +NoStyle Abstract + Input stdlists.inc Input stdfloats.inc Input stdcounters.inc -# End-of Chapter exercises I need a way to do this. -# Chapter Exercises style definition +# Chapter is _not_ prepended +Style Section + LabelString "\arabic{section}" + LabelStringAppendix "\arabic{section}" +End + + +# Paragraph doesn't have numbered labels +Style Paragraph + LabelString "" + LabelStringAppendix "" + Font + EndFont +End + + +# End-of Chapter exercises I need a way to do this. Style Chapter_Exercises Margin First_Dynamic LatexType Item_Environment @@ -114,24 +121,13 @@ Style Chapter_Exercises ParSep 0.3 Align Block AlignPossible Block, Left - LabelType Counter_EnumI - - # standard font definition - - # label font definition + LabelType Counter LabelFont Shape Up Series Bold EndFont - Preamble \newenvironment{lyxxcb}{\begin{xcb}{Exercises}\begin{enumerate}} {\end{enumerate}\end{xcb}} EndPreamble - End - - -### Finally a few obsolete definitions for compatibility -Input obsolete.inc - diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index eb97c183b8..0f95811e8d 100644 --- a/lib/layouts/amsdefs.inc +++ b/lib/layouts/amsdefs.inc @@ -11,8 +11,8 @@ ProvidesAmsmath 1 ProvidesMakeidx 1 -# the environnements copied from the old amsart.layout are : -# - Proof, +# the environments copied from the old amsart.layout are: +# - Proof # - Bibliography # - Title # - Author @@ -23,7 +23,7 @@ ProvidesMakeidx 1 # - Keywords # - Subjectclass -# Proof style declaration + Style Proof Margin First_Dynamic LatexType Environment @@ -41,27 +41,21 @@ Style Proof LabelType Static LabelString "Proof." EndLabelType Box - - # standard font definition Font Shape Up Size Normal EndFont - - # label font definition LabelFont Shape Italic EndFont - # We don't want the preamble from Theorem Preamble EndPreamble End + ### Now the title stuff. We copy do not use stdstruct.inc to keep ### things in the right order - -# Title style definition Style Title Margin Static LatexType Command @@ -75,8 +69,6 @@ Style Title Align Center AlignPossible Center LabelType No_Label - - # standard font definition Font Shape Smallcaps Series Bold @@ -84,7 +76,7 @@ Style Title EndFont End -# Author style definition + Style Author Margin Static LatexType Command @@ -98,16 +90,13 @@ Style Author Align Center AlignPossible Center LabelType No_Label - - # standard font definition Font Size Large Shape Smallcaps EndFont - End -# Date style definition + Style Date Margin Dynamic LatexType Command @@ -122,19 +111,16 @@ Style Date AlignPossible Center LabelType Static LabelString "Date: " - - # standard font definition Font Size Large EndFont - LabelFont Shape Italic Size Large EndFont End -# Abstract style definition + Style Abstract Margin First_Dynamic LatexType Environment @@ -151,19 +137,15 @@ Style Abstract LabelType Static LabelString Abstract. LabelSep M - - # standard font definition Font Size Small EndFont - - # label font definition LabelFont Shape Smallcaps EndFont End -# Address style definition + Style Address Margin Dynamic LatexType Command @@ -176,165 +158,70 @@ Style Address AlignPossible Block, Left, Right, Center LabelType Static LabelString "Address: " - # label font definition LabelFont Shape Italic EndFont End -# Current Address style definition + Style Current_Address - Margin Dynamic - LatexType Command - InTitle 1 + CopyStyle Address LatexName curraddr - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "Current address: " - # label font definition - LabelFont - Shape Italic - EndFont End -# Email style definition + Style Email + CopyStyle Address Margin First_Dynamic - LatexType Command - InTitle 1 LatexName email - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static labelString "E-mail address: " - LabelFont - Shape Italic - EndFont End -# URL style definition + Style URL + CopyStyle Address Margin First_Dynamic - LatexType Command - InTitle 1 LatexName urladdr - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static labelString "URL: " - LabelFont - Shape Italic - EndFont End -# Keywords style definition + Style Keywords - Margin Dynamic - LatexType Command - InTitle 1 + CopyStyle Address LatexName keywords - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "Key words and phrases: " - # label font definition - LabelFont - Shape Italic - EndFont End -# Thanks style definition + Style Thanks - Margin Dynamic - LatexType Command - InTitle 1 + CopyStyle Address LatexName thanks - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "Thanks: " - # label font definition - LabelFont - Shape Italic - EndFont End -# Dedicatory style definition + Style Dedicatory - Margin Dynamic - LatexType Command - InTitle 1 + CopyStyle Address LatexName dedicatory - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "Dedication: " - # label font definition - LabelFont - Shape Italic - EndFont End -# Translator style definition Style Translator - Margin Dynamic - LatexType Command - InTitle 1 + CopyStyle Address LatexName translator - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "Translator: " - # label font definition - LabelFont - Shape Italic - EndFont End -# Subjectclass style definition + Style Subjectclass - Margin Dynamic - LatexType Command - InTitle 1 + CopyStyle Address LatexName subjclass - ParSkip 0.4 - BottomSep 1.5 - ParSep 1.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType Static LabelString "1991 Mathematics Subject Classification: " - # label font definition - LabelFont - Shape Italic - EndFont End -# Bibliography style definition Style Bibliography Margin First_Dynamic LatexType Bib_Environment @@ -350,17 +237,12 @@ Style Bibliography AlignPossible Block, Left LabelType Bibliography LabelString References - LabelBottomSep 0.7 - - # standard font definition + LabelBottomSep 0.7 Font Size Small EndFont - - # label font definition LabelFont Size Normal Shape Smallcaps EndFont End - diff --git a/lib/layouts/amsmaths-plain.inc b/lib/layouts/amsmaths-plain.inc index ccbc1b85df..8c77aa7b9c 100644 --- a/lib/layouts/amsmaths-plain.inc +++ b/lib/layouts/amsmaths-plain.inc @@ -3,8 +3,8 @@ # modified and modularized by Emmanuel GUREGHIAN -# These are only the plain (unnumbered) theorem styles environnements -# The environnements defined are : +# These are only the plain (unnumbered) theorem styles environments +# The environments defined are: # - Theorem # - Corollary # - Lemma @@ -28,198 +28,180 @@ # - Case # - Conclusion -# Theorem-plain style declaration + Style Theorem LatexName thm* LabelString "Theorem." - Preamble \theoremstyle{plain} \newtheorem*{thm*}{Theorem} EndPreamble End -# Corollary-plain style declaration + Style Corollary LatexName cor* LabelString "Corollary." - Preamble \theoremstyle{plain} \newtheorem*{cor*}{Corollary} EndPreamble End -# Lemma-plain style declaration + Style Lemma LatexName lem* LabelString "Lemma." - Preamble \theoremstyle{plain} \newtheorem*{lem*}{Lemma} EndPreamble End -# Proposition-plain style declaration + Style Proposition LatexName prop* LabelString "Proposition." - Preamble \theoremstyle{plain} \newtheorem*{prop*}{Proposition} EndPreamble End -# Conjecture-plain style declaration + Style Conjecture LatexName conjecture* LabelString "Conjecture." - Preamble \theoremstyle{plain} \newtheorem*{conjecture*}{Conjecture} EndPreamble End -# Criterion-plain style declaration + Style Criterion LatexName criterion* LabelString "Criterion." - Preamble \theoremstyle{plain} \newtheorem*{criterion*}{Criterion} EndPreamble End -# Algorithm-plain style declaration + Style Algorithm LatexName algorithm* LabelString "Algorithm #." - Preamble \theoremstyle{plain} \newtheorem*{algorithm*}{Algorithm} EndPreamble End -# Fact-plain style declaration + Style Fact LatexName fact* LabelString "Fact." - Preamble \theoremstyle{plain} \newtheorem*{fact*}{Fact} EndPreamble End -# Axiom-plain style declaration + Style Axiom LatexName ax* LabelString "Axiom." - Preamble \theoremstyle{plain} \newtheorem*{ax*}{Axiom} EndPreamble End -# Definition-plain style declaration + Style Definition LatexName defn* LabelString "Definition." - Preamble \theoremstyle{definition} \newtheorem*{defn*}{Definition} EndPreamble End -# Example-plain style declaration + Style Example LatexName example* LabelString "Example." - Preamble \theoremstyle{definition} \newtheorem*{example*}{Example} EndPreamble End -# Condition-plain style declaration + Style Condition LatexName condition* LabelString "Condition." - Preamble \theoremstyle{definition} \newtheorem*{condition*}{Condition} EndPreamble End -# Problem-plain style declaration + Style Problem LatexName problem* LabelString "Problem." - Preamble \theoremstyle{definition} \newtheorem*{problem*}{Problem} EndPreamble End -# Exercise-plain style declaration + Style Exercise LatexName xca* LabelString "Exercise." - Preamble \theoremstyle{definition} \newtheorem*{xca*}{Exercise} EndPreamble End -# Remark-plain style declaration + Style Remark LatexName rem* LabelString "Remark." - Preamble \theoremstyle{remark} \newtheorem*{rem*}{Remark} EndPreamble End -# Claim-plain style declaration + Style Claim LatexName claim* LabelString "Claim." - Preamble \theoremstyle{remark} \newtheorem*{claim*}{Claim} EndPreamble End -# Note-plain style declaration + Style Note LatexName note* LabelString "Note." - Preamble \theoremstyle{remark} \newtheorem*{note*}{Note} EndPreamble End -# Notation style declaration + Style Notation LatexName notation* LabelString "Notation." - Preamble \theoremstyle{remark} \newtheorem*{notation*}{Notation} @@ -227,11 +209,9 @@ Style Notation End -# Summary style declaration Style Summary LatexName summary* LabelString "Summary." - Preamble \theoremstyle{remark} \newtheorem*{summary*}{Summary} @@ -239,11 +219,9 @@ Style Summary End -# Acknowledgement style declaration Style Acknowledgement LatexName acknowledgement* LabelString "Acknowledgement." - Preamble \theoremstyle{remark} \newtheorem*{acknowledgement*}{Acknowledgement} @@ -251,11 +229,9 @@ Style Acknowledgement End -# Case style declaration Style Case LatexName case* LabelString "Case." - Preamble \theoremstyle{remark} \newtheorem*{case*}{Case} @@ -263,14 +239,11 @@ Style Case End -# Conclusion style declaration Style Conclusion LatexName conclusion* LabelString "Conclusion." - Preamble \theoremstyle{remark} \newtheorem*{conclusion*}{Conclusion} EndPreamble End - diff --git a/lib/layouts/amsmaths.inc b/lib/layouts/amsmaths.inc index f7df2376f8..beeb2fc5c2 100644 --- a/lib/layouts/amsmaths.inc +++ b/lib/layouts/amsmaths.inc @@ -44,23 +44,22 @@ # - Fact # - Fact* -# A hack: this is used to provide a preamble which is needed by other -# style. Since this style has been obsoleted, it does not show up in -# layout lists -Style TheoremStyle - ObsoletedBy Standard - Preamble - \theoremstyle{plain} - EndPreamble +Preamble + \theoremstyle{plain} + \newtheorem{thm}{Theorem}[section] +EndPreamble + + +Counter + Name theorem End -# Theorem-numbered style declaration Style Theorem Margin First_Dynamic LatexType Environment LatexName thm - DependsOn TheoremStyle + #DependsOn TheoremStyle NextNoIndent 1 LabelSep xx ParIndent MMM @@ -71,362 +70,326 @@ Style Theorem ParSep 0.3 Align Block AlignPossible Block, Left - LabelType Static - LabelString "Theorem #." - - - # standard font definition + LabelType Counter + LabelCounter theorem + LabelString "Theorem @Section@.\arabic{theorem}." Font Shape Italic Size Normal EndFont - - # label font definition LabelFont Shape Up Series Bold EndFont - End -# Theorem-unnumbered style declaration + Style Theorem* CopyStyle Theorem LatexName thm* LabelString "Theorem." - Preamble \theoremstyle{plain} \newtheorem*{thm*}{Theorem} EndPreamble End -# Corollary-numbered style declaration + Style Corollary CopyStyle Theorem LatexName cor - LabelString "Corollary #." - + LabelString "Corollary @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} - \newtheorem{cor}[thm]{Corollary} %%Delete [thm] to re-start numbering + \newtheorem{cor}[thm]{Corollary} EndPreamble End -# Corollary-unnumbered style declaration + + Style Corollary* CopyStyle Theorem LatexName cor* LabelString "Corollary." - Preamble \theoremstyle{plain} \newtheorem*{cor*}{Corollary} EndPreamble End -# Lemma-numbered style declaration + Style Lemma CopyStyle Theorem LatexName lem - LabelString "Lemma #." - + LabelString "Lemma @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} - \newtheorem{lem}[thm]{Lemma} %%Delete [thm] to re-start numbering + \newtheorem{lem}[thm]{Lemma} EndPreamble End -# Lemma-unnumbered style declaration + Style Lemma* CopyStyle Theorem LatexName lem* LabelString "Lemma." - Preamble \theoremstyle{plain} - \newtheorem*{lem*}{Lemma} %%Delete [thm] to re-start numbering + \newtheorem*{lem*}{Lemma} EndPreamble End -# Proposition-numbered style declaration + Style Proposition CopyStyle Theorem LatexName prop - LabelString "Proposition #." - + LabelString "Proposition @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} - \newtheorem{prop}[thm]{Proposition} %%Delete [thm] to re-start numbering + \newtheorem{prop}[thm]{Proposition} EndPreamble End -# Proposition-unnumbered style declaration + Style Proposition* CopyStyle Theorem LatexName prop* LabelString "Proposition." - Preamble \theoremstyle{plain} \newtheorem*{prop*}{Proposition} EndPreamble End -# Conjecture-numbered style declaration + Style Conjecture CopyStyle Theorem LatexName conjecture - LabelString "Conjecture #." - + LabelString "Conjecture @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} - \newtheorem{conjecture}[thm]{Conjecture} %%Delete [thm] to re-start numbering + \newtheorem{conjecture}[thm]{Conjecture} EndPreamble End -# Conjecture-unnumbered style declaration + Style Conjecture* CopyStyle Theorem LatexName conjecture* LabelString "Conjecture." - Preamble \theoremstyle{plain} \newtheorem*{conjecture*}{Conjecture} EndPreamble End -# Criterion-numbered style declaration + Style Criterion CopyStyle Theorem LatexName criterion - LabelString "Criterion #." - + LabelString "Criterion @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} - \newtheorem{criterion}[thm]{Criterion} %%Delete [thm] to re-start numbering + \newtheorem{criterion}[thm]{Criterion} EndPreamble End -# Algorithm-numbered style declaration + Style Algorithm CopyStyle Theorem LatexName algorithm - LabelString "Algorithm #." - + LabelString "Algorithm @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} - \newtheorem{algorithm}[thm]{Algorithm} %%Delete [thm] to re-start numbering + \newtheorem{algorithm}[thm]{Algorithm} EndPreamble End -# Fact-numbered style declaration + Style Fact CopyStyle Theorem LatexName fact - LabelString "Fact #." - + LabelString "Fact @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{fact}[thm]{Fact} EndPreamble End -# Fact-unnumbered style declaration + Style Fact* CopyStyle Theorem LatexName fact* LabelString "Fact." - Preamble \theoremstyle{plain} \newtheorem*{fact*}{Fact} EndPreamble End -# Axiom-numbered style declaration + Style Axiom CopyStyle Theorem LatexName ax - LabelString "Axiom #." - + LabelString "Axiom @Section@.\arabic{theorem}." Preamble \theoremstyle{plain} \newtheorem{ax}[thm]{Axiom} EndPreamble End -# Definition-numbered style declaration + Style Definition CopyStyle Theorem LatexName defn - LabelString "Definition #." - - # standard font definition + LabelString "Definition @Section@.\arabic{theorem}." Font Shape Up EndFont - - # label font definition LabelFont Shape Up Series Bold EndFont - Preamble - \theoremstyle{definition} - \newtheorem{defn}[thm]{Definition} + \theoremstyle{definition} + \newtheorem{defn}[thm]{Definition} EndPreamble End -# Definition-unnumbered style declaration + + Style Definition* CopyStyle Definition LatexName defn* LabelString "Definition." - Preamble \theoremstyle{definition} \newtheorem*{defn*}{Definition} EndPreamble End -# Example-numbered style declaration + Style Example CopyStyle Definition LatexName example - LabelString "Example #." - + LabelString "Example @Section@.\arabic{theorem}." Preamble \theoremstyle{definition} \newtheorem{example}[thm]{Example} EndPreamble End -# Example-unnumbered style declaration + Style Example* CopyStyle Definition LatexName example* LabelString "Example." - Preamble - \theoremstyle{definition} + \theoremstyle{definition} \newtheorem*{example*}{Example} EndPreamble End -# Condition-numbered style declaration + Style Condition CopyStyle Definition LatexName condition - LabelString "Condition #." - + LabelString "Condition @Section@.\arabic{theorem}." Preamble - \theoremstyle{definition} + \theoremstyle{definition} \newtheorem{condition}[thm]{Condition} EndPreamble End -# Problem-numbered style declaration + Style Problem CopyStyle Definition LatexName problem - LabelString "Problem #." - + LabelString "Problem @Section@.\arabic{theorem}." Preamble - \theoremstyle{definition} + \theoremstyle{definition} \newtheorem{problem}[thm]{Problem} EndPreamble End -# Exercise-numbered style declaration + Style Exercise CopyStyle Definition LatexName xca - LabelString "Exercise #." - + LabelString "Exercise @Section@.\arabic{theorem}." Preamble - \theoremstyle{definition} - \newtheorem{xca}[section]{Exercise}%%Delete [section] for sequential numbering + \theoremstyle{definition} + %%Delete [section] for sequential numbering + \newtheorem{xca}[section]{Exercise} EndPreamble End -# Remark-numbered style declaration + Style Remark CopyStyle Theorem LatexName rem - LabelString "Remark #." - - # standard font definition + LabelString "Remark @Section@.\arabic{theorem}." Font Shape Up Size Normal EndFont - - # label font definition LabelFont Series Medium Shape Italic EndFont - Preamble \theoremstyle{remark} \newtheorem{rem}[thm]{Remark} EndPreamble End -# Remark-unnumbered style declaration + + Style Remark* CopyStyle Remark LatexName rem* LabelString "Remark." - Preamble \theoremstyle{remark} \newtheorem*{rem*}{Remark} EndPreamble End -# Claim-numbered style declaration + Style Claim CopyStyle Remark LatexName claim - LabelString "Claim #." - + LabelString "Claim @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{claim}[thm]{Claim} EndPreamble End -# Claim-unnumbered style declaration + Style Claim* CopyStyle Remark LatexName claim* LabelString "Claim." - Preamble \theoremstyle{remark} \newtheorem*{claim*}{Claim} EndPreamble End -# Note-numbered style declaration + Style Note CopyStyle Remark LatexName note - LabelString "Note #." - + LabelString "Note @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{note}[thm]{Note} EndPreamble End -# Note-unnumbered style declaration + Style Note* CopyStyle Remark LatexName note* LabelString "Note." - Preamble \theoremstyle{remark} \newtheorem*{note*}{Note} @@ -434,86 +397,78 @@ Style Note* End -# Notation-numbered style declaration Style Notation CopyStyle Remark LatexName notation - LabelString "Notation #." - + LabelString "Notation @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{notation}[thm]{Notation} EndPreamble End -# Summary-numbered style declaration + Style Summary CopyStyle Remark LatexName summary - LabelString "Summary #." - + LabelString "Summary @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{summary}[thm]{Summary} EndPreamble End -# Acknowledgement-numbered style declaration + Style Acknowledgement CopyStyle Remark LatexName acknowledgement - LabelString "Acknowledgement #." - + LabelString "Acknowledgement @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{acknowledgement}[thm]{Acknowledgement} EndPreamble End -# Acknowledgement-unnumbered style declaration + + Style Acknowledgement* CopyStyle Remark LatexName acknowledgement* LabelString "Acknowledgement." - Preamble \theoremstyle{remark} \newtheorem*{acknowledgement*}{Acknowledgement} EndPreamble End -# Case-numbered style declaration + Style Case CopyStyle Remark LatexName case - LabelString "Case #." - + LabelString "Case @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem{case}{Case} %%Numbering of Cases not keyed to sections EndPreamble End -# Conclusion-numbered style declaration + Style Conclusion CopyStyle Remark LatexName conclusion LabelString "Conclusion #." - Preamble \theoremstyle{remark} \newtheorem{conclusion}[thm]{Conclusion} EndPreamble End -# Conclusion-unnumbered style declaration + Style Conclusion* CopyStyle Remark LatexName conclusion* - LabelString "Conclusion #." - + LabelString "Conclusion @Section@.\arabic{theorem}." Preamble \theoremstyle{remark} \newtheorem*{conclusion*}{Conclusion} EndPreamble End - diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index 51cfbe69c7..038dbeef8b 100644 --- a/lib/layouts/article.layout +++ b/lib/layouts/article.layout @@ -5,24 +5,21 @@ # Transposed by Pascal André # Heavily modifed and enhanced by serveral developers. -# Input general definitions Input stdclass.inc +Input numarticle.inc -# There are no chapters in an article. -NoStyle Chapter -NoStyle Chapter* - -MaxCounter Counter_Section SecNumDepth 3 TocDepth 3 -# Change a bit Part and Part* +NoStyle Chapter +NoStyle Chapter* + + Style Part Align Left AlignPossible Left TopSep 2 BottomSep 1.5 - Font Size Larger EndFont @@ -34,26 +31,8 @@ Style Part* AlignPossible Left TopSep 2 BottomSep 1.5 - Font Size Larger EndFont End - -Style Section - LabelString "\arabic{section}" - LabelStringAppendix "\Alph{section}" -End - - -Style Subsection - LabelString "@Section@.\arabic{subsection}" - LabelStringAppendix "@Section@.\arabic{subsection}" -End - - -Style Subsubsection - LabelString "@Subsection@.\arabic{subsubsection}" - LabelStringAppendix "@Subsection@.\arabic{subsubsection}" -End diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index 01002fa2c4..9442a644d9 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -21,68 +21,66 @@ # rather than subsection. The Elsevier doc file allows for # numbered sections, as does the class file. -# General textclass parameters -Columns 1 -Sides 2 -PageStyle headings -MaxCounter Counter_Section + +Columns 1 +Sides 2 +PageStyle headings ClassOptions -# FontSize "default" # controlled by class +# FontSize "default" # controlled by class End # elsart does not use the plain old \maketitle TitleLatexType Environment TitleLatexName frontmatter +Counter + Name summ +End -DefaultFont - Family Roman - Series Medium - Shape Up - Size Normal - Color None -EndFont + +Counter + Name case +End Style Standard - LatexName dummy - LatexType Paragraph - Margin Static - ParIndent MM - ParSkip 0.4 - ParSep 0.4 - TopSep 1.0 - BottomSep 1.0 - Align Block - AlignPossible Block, Left, Right, Center - LabelType No_Label + LatexName dummy + LatexType Paragraph + Margin Static + ParIndent MM + ParSkip 0.4 + ParSep 0.4 + TopSep 1.0 + BottomSep 1.0 + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label +End + + +Style Keywords + LatexName keyword + LatexType Environment + Margin Static + ParIndent MM + InTitle 1 + ParSkip 0.4 + ParSep 0.4 + TopSep 1.0 + BottomSep 1.0 + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label + Font + Color blue + EndFont End -Style Keywords - LatexName keyword - LatexType Environment - Margin Static - ParIndent MM - InTitle 1 - ParSkip 0.4 - ParSep 0.4 - TopSep 1.0 - BottomSep 1.0 - Align Block - AlignPossible Block, Left, Right, Center - LabelType No_Label -Font - Color blue -EndFont -End - - -# Load standard defs, as most of the -# Elsevier stuff seems the same. Input stdsections.inc +Input numarticle.inc Input stdstarsections.inc Input stdlists.inc Input stdstruct.inc @@ -200,7 +198,6 @@ Style Thanks End -# new Abstract style definition Style Abstract Margin Static LatexType Environment @@ -219,11 +216,9 @@ Style Abstract LabelType Centered_Top_Environment LabelString Abstract LabelBottomSep 0.5 - Font Size Small EndFont - LabelFont Series Bold Size Large @@ -231,13 +226,9 @@ Style Abstract End -# Theorm environments have been copied over from -# the amsmaths.inc file. It could not be inputfiled -# as it does some stuff which is incompatible with -# the Elsevier stlye, that is it redefines -# the theorem* environments in the preamble. - - +# Theorem environments have been copied over from the amsmaths.inc file. It +# could not be input as it does some stuff which is incompatible with the +# Elsevier stlye: it redefines the theorem* environments in the preamble. # The environments defined are : # - Theorem @@ -258,6 +249,10 @@ End # - Acknowledgement # - Case +Counter + Name theorem +End + Style Theorem Margin First_Dynamic @@ -273,19 +268,18 @@ Style Theorem ParSep 0.3 Align Block AlignPossible Block, Left - LabelType Static - LabelString "Theorem #." - + LabelType Counter + LabelCounter theorem + LabelString "Theorem \arabic{theorem}" Font Shape Italic Size Normal EndFont - LabelFont Shape Up Series Bold EndFont -End +End # Proof style declaration - from email by Stacy Prowell (sprowell@cs.utk.edu) @@ -305,14 +299,11 @@ Style Proof Align Block AlignPossible Block, Left LabelType Static - # make the label all caps, like it is in the output. LabelString "PROOF." - Font Shape Up Size Normal EndFont - LabelFont Series Bold EndFont @@ -322,183 +313,122 @@ End Style Lemma CopyStyle Theorem LatexName lem - LabelString "Lemma #." - -# Preamble -# \theoremstyle{plain} -# \newtheorem{lem}[thm]{Lemma} %%Delete [thm] to re-start numbering -# EndPreamble + LabelString "Lemma \arabic{theorem}" End Style Corollary CopyStyle Theorem LatexName cor - LabelString "Corollary #." - -# Preamble -# \theoremstyle{plain} -# \newtheorem{cor}[thm]{Corollary} %%Delete [thm] to re-start numbering -# EndPreamble + LabelString "Corollary \arabic{theorem}" End Style Proposition CopyStyle Theorem LatexName prop - LabelString "Proposition #." - -# Preamble -# \theoremstyle{plain} -# \newtheorem{prop}[thm]{Proposition} %%Delete [thm] to re-start numbering -# EndPreamble + LabelString "Proposition \arabic{theorem}" End Style Criterion CopyStyle Theorem LatexName crit - LabelString "Criterion #." - -# Preamble -# \theoremstyle{plain} -# \newtheorem{crit}[thm]{Criterion} %%Delete [thm] to re-start numbering -# EndPreamble + LabelString "Criterion \arabic{theorem}" End Style Algorithm CopyStyle Theorem LatexName alg - LabelString "Algorithm #." - -# Preamble -# \theoremstyle{plain} -# \newtheorem{alg}[thm]{Algorithm} %%Delete [thm] to re-start numbering -# EndPreamble + LabelString "Algorithm \arabic{theorem}" End Style Definition CopyStyle Theorem LatexName defn - LabelString "Definition #." - + LabelString "Definition \arabic{theorem}" Font Shape Up EndFont - LabelFont Shape Up Series Bold EndFont - -# Preamble -# \theoremstyle{definition} -# \newtheorem{defn}[thm]{Definition} -# EndPreamble End Style Conjecture CopyStyle Theorem LatexName conj - LabelString "Conjecture #." - -# Preamble -# \theoremstyle{plain} -# \newtheorem{conj}[thm]{Conjecture} %%Delete [thm] to re-start numbering -# EndPreamble + LabelString "Conjecture \arabic{theorem}" End Style Example CopyStyle Theorem LatexName exmp - LabelString "Example #." - -# Preamble -# \theoremstyle{definition} -# \newtheorem{exmp}[thm]{Example} -# EndPreamble + LabelString "Example \arabic{theorem}" End Style Problem CopyStyle Theorem LatexName prob - LabelString "Problem #." - -# Preamble -# \theoremstyle{definition} -# \newtheorem{prob}[thm]{Problem} -# EndPreamble + LabelString "Problem \arabic{theorem}" End Style Remark CopyStyle Theorem LatexName rem - LabelString "Remark #." - + LabelString "Remark \arabic{theorem}" End Style Note CopyStyle Theorem LatexName note - LabelString "Note #." - + LabelString "Note \arabic{theorem}" End Style Claim CopyStyle Theorem LatexName claim - LabelString "Claim #." - + LabelString "Claim \arabic{theorem}" End Style Summary CopyStyle Theorem LatexName summ - LabelString "Summary #." - + LabelCounter summ + LabelString "Summary \arabic{summ}" End Style Case CopyStyle Theorem LatexName case - LabelString "Case #." - + LabelCounter case + LabelString "Case \arabic{case}" End -#Style Acknowledgement -# CopyStyle Theorem -# LatexName ack -# LabelString "Acknowledgement #." -# -#End - -# Acknowledgement style definition -# This is not taken from the AMS defs, -# so as to match the output of the +# This is not taken from the AMS defs, so as to match the output of the # style file. - Style Acknowledgement Margin Static LatexType environment LatexName ack Labeltype Top_Environment LabelBottomsep 1 - LabelString "Acknowledgement #." + LabelString "Acknowledgement \arabic{theorem}" parsep 0.3 - LabelFont - Size large - Series Bold + Size large + Series Bold EndFont End diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc index e69de29bb2..b23812b1f5 100644 --- a/lib/layouts/numarticle.inc +++ b/lib/layouts/numarticle.inc @@ -0,0 +1,45 @@ +# Author : André Pönitz +# This include files contains label definitions for a article-like numbering. + +Style Part + LabelType Counter + LabelCounter part + LabelString "Part \Roman{part}" +End + + +Style Section + LabelType Counter + LabelCounter section + LabelString "\arabic{section}" + LabelStringAppendix "\Alph{section}" + TocLevel 1 +End + + +Style Subsection + LabelType Counter + LabelCounter subsection + LabelString "@Section@.\arabic{subsection}" + LabelStringAppendix "@Section@.\arabic{subsection}" + TocLevel 2 +End + + +Style Subsubsection + LabelType Counter + LabelCounter subsubsection + LabelString "@Subsection@.\arabic{subsubsection}" + LabelStringAppendix "@Subsection@.\arabic{subsubsection}" + TocLevel 3 +End + + +Style Paragraph + TocLevel 4 +End + + +Style Subparagraph + TocLevel 5 +End diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index e69de29bb2..4c973b3b0e 100644 --- a/lib/layouts/numreport.inc +++ b/lib/layouts/numreport.inc @@ -0,0 +1,54 @@ +# Author : André Pönitz +# This include files contains a label definitions for a report-like numbering. + +Style Part + LabelType Counter + LabelCounter part + LabelString "Part \Roman{part}" +End + + +Style Chapter + LabelType Counter + LabelCounter chapter + LabelString "Chapter \arabic{chapter}" + LabelStringAppendix "Appendix \Alph{chapter}" + TocLevel 1 +End + + +Style Section + LabelType Counter + LabelCounter section + LabelString "\arabic{chapter}.\arabic{section}" + LabelStringAppendix "\Alph{chapter}.\arabic{section}" + TocLevel 2 +End + + +Style Subsection + LabelType Counter + LabelCounter subsection + LabelString "@Section@.\arabic{subsection}" + LabelStringAppendix "@Section@.\arabic{subsection}" + TocLevel 3 +End + + +Style Subsubsection + LabelType Counter + LabelCounter subsubsection + LabelString "@Subsection@.\arabic{subsubsection}" + LabelStringAppendix "@Subsection@.\arabic{subsubsection}" + TocLevel 4 +End + + +Style Paragraph + TocLevel 5 +End + + +Style Subparagraph + TocLevel 6 +End diff --git a/lib/layouts/numrevtex.inc b/lib/layouts/numrevtex.inc new file mode 100644 index 0000000000..a1c0ec0dec --- /dev/null +++ b/lib/layouts/numrevtex.inc @@ -0,0 +1,38 @@ +# Author : André Pönitz +# This include files contains label definitions for a article-like numbering. + + +Style Section + LabelType Counter + LabelCounter section + LabelString "\Roman{section}." + LabelStringAppendix " Appendix \Alph{section}:" + TocLevel 1 +End + + +Style Subsection + LabelType Counter + LabelCounter subsection + LabelString " \Alph{subsection}." + LabelStringAppendix " \arabic{subsection}." + TocLevel 2 +End + + +Style Subsubsection + LabelType Counter + LabelCounter subsubsection + LabelString " \arabic{subsubsection}." + LabelStringAppendix " \alph{subsubsection}." + TocLevel 3 +End + + +Style Paragraph + LabelType Counter + LabelCounter paragraph + LabelString " \alph{paragraph}." + LabelStringAppendix " \alph{paragraph}." + TocLevel 4 +End diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index 7ccf65cd0d..4a156ad73b 100644 --- a/lib/layouts/siamltex.layout +++ b/lib/layouts/siamltex.layout @@ -4,31 +4,30 @@ # Cut & paste from various LyX layouts plus some minor modifications # Author : Kornelia Pietsch -Columns 1 -Sides 1 -SecNumDepth 2 -TocDepth 2 -MaxCounter Counter_Section +Columns 1 +Sides 1 +SecNumDepth 2 +TocDepth 2 ClassOptions - FontSize 10|11|12 - Other "draft|final" + FontSize 10|11|12 + Other "draft|final" End Style Standard - Margin Dynamic - LatexType Paragraph - LatexName dummy - ParSkip 0 - ParIndent ........ - NextNoIndent 0 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.7 - Align Block - AlignPossible Block, Left, Right, Center - LabelType No_Label + Margin Dynamic + LatexType Paragraph + LatexName dummy + ParSkip 0 + ParIndent ........ + NextNoIndent 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.7 + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label End @@ -36,268 +35,263 @@ Input stdlists.inc Input stdlayouts.inc Input stdcounters.inc Input stdfloats.inc - +Input numarticle.inc Style Section - CopyStyle Standard - Margin First_Dynamic - LatexType Command - LatexName section - NeedProtect 1 - NextNoIndent 1 - LabelSep xxx - Align Block - AlignPossible Block, Left - LabelType Counter_Section - EndLabelType Static - EndLabelString . - Font - Series Bold + CopyStyle Standard + Margin First_Dynamic + LatexType Command + LatexName section + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + Align Block + AlignPossible Block, Left + EndLabelType Static + EndLabelString . + Font + Series Bold EndFont End Style Subsection - CopyStyle Section - LatexName subsection - LabelType Counter_Subsection + CopyStyle Section + LatexName subsection End Style Subsubsection - CopyStyle Subsection - LatexName subsubsection - LabelType Counter_Subsubsection + CopyStyle Subsection + LatexName subsubsection End Style Paragraph - CopyStyle Subsubsection - LatexName paragraph - LabelType Counter_Paragraph - Font - Shape Italic - Series Medium + CopyStyle Subsubsection + LatexName paragraph + Font + Shape Italic + Series Medium EndFont End Style Section* - CopyStyle Section - LatexName section* - LabelType No_Label + CopyStyle Section + LatexName section* + LabelType No_Label End Style Subsection* - CopyStyle Subsection - LatexName subsection* - LabelType No_Label + CopyStyle Subsection + LatexName subsection* + LabelType No_Label End Style Subsubsection* - CopyStyle Subsubsection - LatexName subsubsection* - LabelType No_Label + CopyStyle Subsubsection + LatexName subsubsection* + LabelType No_Label End Style Paragraph* - CopyStyle Paragraph - LatexName paragraph* - LabelType No_Label + CopyStyle Paragraph + LatexName paragraph* + LabelType No_Label End Style Title - Margin Static - LatexType Command - InTitle 1 - LatexName title - BottomSep 1 - Align Center - AlignPossible Center - LabelType No_Label - Font - Size Larger - Shape SmallCaps - Series Bold + Margin Static + LatexType Command + InTitle 1 + LatexName title + BottomSep 1 + Align Center + AlignPossible Center + LabelType No_Label + Font + Size Larger + Shape SmallCaps + Series Bold EndFont End Style Author - CopyStyle Title - LatexName author - Font - Size Normal - Shape SmallCaps - Series Medium + CopyStyle Title + LatexName author + Font + Size Normal + Shape SmallCaps + Series Medium EndFont End Style Date - CopyStyle Author - LatexName date + CopyStyle Author + LatexName date End Style Abstract - Margin First_Dynamic - LatexType Environment -# InTitle 1 - LatexName abstract - ParIndent ........ - NextNoIndent 1 - TopSep 0.7 - BottomSep 0.7 - ParSkip 0.7 - Align Block - AlignPossible Block - LabelType Static - LabelString Abstract. - LabelSep M - LabelIndent ........ + Margin First_Dynamic + LatexType Environment +# InTitle 1 + LatexName abstract + ParIndent ........ + NextNoIndent 1 + TopSep 0.7 + BottomSep 0.7 + ParSkip 0.7 + Align Block + AlignPossible Block + LabelType Static + LabelString Abstract. + LabelSep M + LabelIndent ........ Font - Size Small + Size Small EndFont LabelFont - Series Bold - Size Small + Series Bold + Size Small EndFont End Style Keywords - CopyStyle Abstract - LatexName keywords - LabelString "Key words." -End + CopyStyle Abstract + LatexName keywords + LabelString "Key words." +End Style AMS - CopyStyle Abstract - LatexName AMS - LabelString "AMS subject classifications." -End + CopyStyle Abstract + LatexName AMS + LabelString "AMS subject classifications." +End Style Bibliography - Margin Dynamic - LatexType Bib_Environment - LatexName thebibliography - NextNoIndent 0 - LeftMargin M - RightMargin M - Align Block - AlignPossible Block, Center - LabelType Bibliography - #LabelType centered_top_environment - LabelString References - LabelBottomSep 0.7 + Margin Dynamic + LatexType Bib_Environment + LatexName thebibliography + NextNoIndent 0 + LeftMargin M + RightMargin M + Align Block + AlignPossible Block, Center + LabelType Bibliography + #LabelType centered_top_environment + LabelString References + LabelBottomSep 0.7 + LabelFont + Shape SmallCaps + EndFont +End + + +Style Theorem + CopyStyle Standard + LabelSep xx + LabelType Static + LabelString "Theorem #." + TextFont + Shape Slanted + Size Normal + EndFont LabelFont Shape SmallCaps EndFont End -Style Theorem - CopyStyle Standard - LabelSep xx - LabelType Static - LabelString "Theorem #." - TextFont - Shape Slanted - Size Normal - EndFont - LabelFont - Shape SmallCaps - EndFont +Style Lemma + CopyStyle Theorem + LatexName lemma + LabelString "Lemma #." End -Style Lemma - CopyStyle Theorem - LatexName lemma - LabelString "Lemma #." -End - - Style Corollary - CopyStyle Theorem - LatexName corollary - LabelString "Corollary #." -End + CopyStyle Theorem + LatexName corollary + LabelString "Corollary #." +End Style Proposition - CopyStyle Theorem - LatexName proposition - LabelString "Proposition #." -End + CopyStyle Theorem + LatexName proposition + LabelString "Proposition #." +End Style Definition - CopyStyle Theorem - LatexName Definition - LabelString "Definition #." + CopyStyle Theorem + LatexName Definition + LabelString "Definition #." Font - Shape Up + Shape Up EndFont LabelFont - Shape Up - Series Bold + Shape Up + Series Bold EndFont End Style Proof - CopyStyle Theorem - LatexName proof - LabelString "Proof." - EndLabelType Box + CopyStyle Theorem + LatexName proof + LabelString "Proof." + EndLabelType Box Font - Shape Up - Color Blue + Shape Up + Color Blue EndFont LabelFont - Shape Slanted + Shape Slanted EndFont -End +End Style Theorem* - CopyStyle Theorem - LatexName theorem* - LabelString "Theorem." -End + CopyStyle Theorem + LatexName theorem* + LabelString "Theorem." + End Style Lemma* - CopyStyle Lemma - LatexName lemma* - LabelString "Lemma." -End + CopyStyle Lemma + LatexName lemma* + LabelString "Lemma." +End Style Corollary* - CopyStyle Corollary - LatexName corollary* - LabelString "Corollary." -End + CopyStyle Corollary + LatexName corollary* + LabelString "Corollary." +End Style Proposition* - CopyStyle Proposition - LatexName proposition* - LabelString "Proposition." -End - - -Style Definition* - CopyStyle Definition - LatexName definition* - LabelString "Definition." + CopyStyle Proposition + LatexName proposition* + LabelString "Proposition." +End + +Style Definition******** + CopyStyle Definition + LatexName definition* + LabelString "Definition." End diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index 780378e7fc..f000c22a3b 100644 --- a/lib/layouts/stdsections.inc +++ b/lib/layouts/stdsections.inc @@ -7,7 +7,6 @@ # commands that are useful for article-like document classes, but not # for letters. - Style Part Margin Dynamic LatexType Command @@ -21,9 +20,6 @@ Style Part ParSep 0.8 Align Center Alignpossible Center - LabelType Counter - LabelCounter part - LabelString "Part \arabic{part}" Font Series Bold Size Huge @@ -43,10 +39,6 @@ Style Chapter ParSep 0.8 Align Block AlignPossible Block, Left - LabelType Counter - LabelCounter chapter - LabelString "\arabic{chapter}" - LabelStringAppendix "Appendix \Alph{chapter}" OptionalArgs 1 Font Series Bold @@ -68,10 +60,6 @@ Style Section ParSep 0.7 Align Block AlignPossible Block, Left - LabelType Counter - LabelCounter section - LabelString "\arabic{chapter}.\arabic{section}" - LabelStringAppendix "\Alph{chapter}.\arabic{section}" OptionalArgs 1 Font Series Bold @@ -86,8 +74,6 @@ Style Subsection TopSep 0.9 BottomSep 0.5 ParSep 0.5 - LabelCounter subsection - LabelString "@Section@.\arabic{subsection} Font Series Bold Size Large @@ -100,8 +86,6 @@ Style Subsubsection LatexName subsubsection TopSep 0.7 BottomSep 0.4 - LabelCounter subsubsection - LabelString "@Subsection@.\arabic{subsubsection} Font Series Bold Size Normal @@ -114,8 +98,6 @@ Style Paragraph LatexName paragraph TopSep 0.4 BottomSep 0 - LabelCounter paragraph - LabelString "@Subsubsection@.\arabic{paragraph} End @@ -124,7 +106,4 @@ Style Subparagraph LatexName subparagraph NextNoIndent 0 LeftMargin MM - LabelSep xxx - LabelCounter subparagraph - LabelString "@Paragraph@.\arabic{subparagraph} End