From: André Pönitz Date: Mon, 15 Sep 2003 15:00:46 +0000 (+0000) Subject: some more cleanup X-Git-Tag: 1.6.10~16093 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3d00d04387ca65ca2316e81beaab1d8207b35256;p=features.git some more cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7755 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout index df2f3db317..7b0c35f13c 100644 --- a/lib/layouts/spie.layout +++ b/lib/layouts/spie.layout @@ -5,17 +5,13 @@ # to be used with the spie.cls LaTex-style available at # http://public.lanl.gov/kmh/spie/ -# Input general definitions Input stdclass.inc +Input numarticle.inc -# no pagenumbers by default -PageStyle empty - -# There are no chapters in an article. NoStyle Chapter NoStyle Chapter* -MaxCounter Counter_Section +PageStyle empty SecNumDepth 3 TocDepth 3 @@ -86,9 +82,10 @@ Style Abstract EndFont End + Style Acknowledgments CopyStyle Abstract -# NextNoIndent 1 +# NextNoIndent 1 # LatexType Command LatexName acknowledgments LabelString ACKNOWLEDGMENTS diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index 0017ec3e9a..937a7e1ecf 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -6,12 +6,12 @@ # This is a base layout which is designed to be included from other # ``standard'' layouts, like article and friends. -# General textclass parameters + Columns 1 Sides 1 SecNumDepth 2 TocDepth 2 -DefaultStyle Standard +DefaultStyle Standard # This is just to show how to declare the default font. # The defaults are exactly those shown here. @@ -45,4 +45,3 @@ Input lyxmacros.inc Input stdlayouts.inc Input stdfloats.inc Input stdcounters.inc -Input obsolete.inc diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc index 17a5dda621..62654738b5 100644 --- a/lib/layouts/stdcounters.inc +++ b/lib/layouts/stdcounters.inc @@ -8,80 +8,70 @@ Counter Name part End - Counter Name chapter End - Counter Name section Within chapter End - Counter Name subsection Within section End - Counter Name subsubsection Within subsection End - Counter Name paragraph Within subsubsection End - Counter Name subparagraph Within paragraph End - Counter Name enumi End - Counter Name enumii Within enumi End - Counter Name enumiii Within enumii End - Counter Name enumiv Within enumiii End - Counter Name bibitem End - Counter Name figure End - Counter Name table End - Counter Name algorithm End + +Counter + Name equation +End diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index 0b945f0d5c..5efa4cb2bf 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -42,8 +42,8 @@ End Style Verse -# LaTeX type is first dynamic because of LaTeX implementation. -# In LyX this does not make sense. + # LaTeX type is first dynamic because of LaTeX implementation. + # In LyX this does not make sense. LatexType Environment LatexName verse Margin First_Dynamic @@ -73,8 +73,9 @@ Style Caption LabelType Sensitive LabelString Caption OptionalArgs 1 - LabelFont Series Bold EndFont End + + diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc index 99fdc5db87..df535be49a 100644 --- a/lib/layouts/stdletter.inc +++ b/lib/layouts/stdletter.inc @@ -2,21 +2,11 @@ # Author : Matthias Ettrich # Heavily modifed and enhanced by several developers. -# General textclass parameters + Columns 1 Sides 1 PageStyle Empty -# This is just to show how to declare the default font. -# The defaults are exactly those shown here. -DefaultFont - Family Roman - Series Medium - Shape Up - Size Normal - Color None -EndFont - Style Standard Margin Static @@ -70,7 +60,6 @@ Style Opening AlignPossible Block, Left LabelType Static LabelString Opening: - LabelFont Series Bold Shape Italic @@ -92,7 +81,6 @@ Style Signature AlignPossible Block, Left LabelType Static LabelString Signature: - LabelFont Series Bold Shape Italic @@ -102,24 +90,10 @@ End Style Closing - Margin Static - LatexType Command + CopyStyle Signature LatexName closing LeftMargin Signature::xx - LabelSep xx - TopSep 0.4 - BottomSep 0.4 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static LabelString Closing: - - LabelFont - Series Bold - Shape Italic - Color red - EndFont End @@ -140,51 +114,26 @@ End Style encl - Margin Static - LatexType Command + CopyStyle cc LatexName encl LeftMargin encl:xx - LabelSep xx - TopSep 0.4 - BottomSep 0.4 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static LabelString encl: Spacing Other 1.5 End Style Location - Margin Static - LatexType Command + CopyStyle encl LatexName location LeftMargin Location:xx - LabelSep xx - TopSep 0.4 - BottomSep 0.4 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static LabelString Location: - Spacing Other 1.5 End Style Telephone - Margin Static - LatexType Command + CopyStyle encl LatexName telephone LeftMargin Telephone:xx - LabelSep xx - TopSep 0.4 - BottomSep 0.4 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static LabelString Telephone: - Spacing Other 1.5 End + diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc index d278965afd..54501b04a5 100644 --- a/lib/layouts/stdlists.inc +++ b/lib/layouts/stdlists.inc @@ -148,3 +148,4 @@ End # AlignPossible Block, Left # LabelType Enumerate #End + diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index e8e21b268f..f3d8d11cec 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -4,9 +4,9 @@ # Heavily modifed and enhanced by several developers. # This include files contains all non numbered versions of the -# sectionning-related commands that are useful for article-like +# sectioning-related commands that are useful for article-like # document classes, but not for letters. It should be Input after -# modying the style of the regular sectionning layouts. +# modifying the style of the regular sectioning layouts. Style Part* diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc index 3e247e57c4..9629693b90 100644 --- a/lib/layouts/stdstruct.inc +++ b/lib/layouts/stdstruct.inc @@ -25,11 +25,9 @@ Style Abstract LabelType Centered_Top_Environment LabelString Abstract LabelBottomSep 0.5 - Font Size Small EndFont - LabelFont Series Bold Size Large @@ -53,7 +51,6 @@ Style Bibliography LabelType Bibliography LabelString References LabelBottomSep 0.7 - LabelFont Series Bold Size Larger diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc index 9a4fd9299b..9fa440a6c1 100644 --- a/lib/layouts/stdtitle.inc +++ b/lib/layouts/stdtitle.inc @@ -21,7 +21,6 @@ Style Title Align Center AlignPossible Center LabelType No_Label - Font Size Largest EndFont @@ -41,7 +40,6 @@ Style Author Align Center AlignPossible Center LabelType No_Label - Font Size Large EndFont @@ -61,7 +59,6 @@ Style Date Align Center AlignPossible Center LabelType No_Label - Font Size Large EndFont diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout index 4992ea4dd5..a7d4b80555 100644 --- a/lib/layouts/svjog.layout +++ b/lib/layouts/svjog.layout @@ -20,10 +20,11 @@ # (jog) ? # # see www.springer.de/author/tex/help-journals.html for class files -# -# The standard Springer Journal sections + + Input svjour.inc + ClassOptions Other jog End @@ -45,7 +46,6 @@ Style Abstract AlignPossible Block, Left LabelType Top_Environment LabelString Abstract. - LabelFont Series Bold EndFont diff --git a/lib/layouts/svjour.inc b/lib/layouts/svjour.inc index 7284c8ad1f..65a57b2d27 100644 --- a/lib/layouts/svjour.inc +++ b/lib/layouts/svjour.inc @@ -15,12 +15,11 @@ # work done by MV in 2000. # # see www.springer.de/author/tex/help-journals.html for class files -# -# General textclass parameters + + Columns 2 Sides 1 PageStyle Plain -MaxCounter Counter_Section Style Standard @@ -36,6 +35,15 @@ End Input stdsections.inc +Input numarticle.inc +Input stdstarsections.inc +Input stdlayouts.inc +Input stdlists.inc + +NoStyle Part +NoStyle Part* +NoStyle Chapter +NoStyle Chapter* Style Section @@ -83,19 +91,6 @@ Style Subparagraph End -Input stdstarsections.inc - -# Remove the ones that we do not want -NoStyle Part -NoStyle Part* -NoStyle Chapter -NoStyle Chapter* - -# Some standard things -Input stdlayouts.inc -Input stdlists.inc - - Style Headnote Margin Static LatexType Command @@ -112,13 +107,11 @@ Style Headnote AlignPossible Left LabelType Static LabelString "Headnote (optional): " - LabelFont Series Bold Shape Italic Color Red EndFont - End @@ -145,7 +138,6 @@ Style Title LabelType No_Label Fill_Top 1 Fill_Bottom 1 - Font Family Sans Series Bold @@ -168,7 +160,6 @@ Style Subtitle Align Left AlignPossible Left LabelType No_Label - Font Family Sans Series Bold @@ -176,6 +167,7 @@ Style Subtitle EndFont End + Style Running_LaTeX_Title CopyStyle Headnote LatexName titlerunning @@ -198,7 +190,6 @@ Style Author Align Left AlignPossible Left LabelType No_Label - Font Series Bold Shape Italic @@ -227,20 +218,18 @@ Style Institute Align Left AlignPossible Left LabelType No_Label - Font Size Small EndFont - End + Style Date CopyStyle Institute LatexName date End -# Correspondence address style definition Style Mail CopyStyle Headnote LatexName mail @@ -248,6 +237,7 @@ Style Mail LabelString "Corr Author: " End + Style Offprints CopyStyle Headnote LatexName offprints @@ -271,7 +261,6 @@ Style Abstract AlignPossible Block, Left LabelType Top_Environment LabelString Abstract. - LabelFont Series Bold EndFont @@ -293,7 +282,6 @@ Style Keywords AlignPossible Block, Left LabelType Static LabelString "Key words: " - LabelFont Series Bold EndFont @@ -315,17 +303,16 @@ Style Acknowledgements AlignPossible Block, Left LabelType Static LabelString Acknowledgements. - Font Size Small EndFont - LabelFont Shape Italic Size Small EndFont End + Style Acknowledgement CopyStyle Acknowledgements LatexName acknowledgement @@ -349,13 +336,11 @@ Style Bibliography LabelType Bibliography LabelString References LabelBottomSep 0.7 - LabelFont Series Bold EndFont End -# Mathematics-like definitions: Style Claim Margin First_Dynamic @@ -372,7 +357,6 @@ Style Claim AlignPossible Block, Left LabelType Static LabelString Claim. - LabelFont Shape Italic EndFont @@ -390,11 +374,9 @@ Style Corollary CopyStyle Claim LatexName corollary LabelString "Corollary #. " - Font Shape Italic EndFont - LabelFont Shape Up Series Bold @@ -420,14 +402,10 @@ Style Exercise CopyStyle Claim LatexName exercise LabelString "Exercise #. " - - # font & label font definition - LabelFont Shape Up Series Bold EndFont - End @@ -499,7 +477,3 @@ Style Theorem LatexName theorem LabelString "Theorem #. " End - - -#Finally a few older definitions for compatibility -Input obsolete.inc diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout index 7482d59b4b..615901c9a9 100644 --- a/lib/layouts/svprobth.layout +++ b/lib/layouts/svprobth.layout @@ -22,8 +22,8 @@ # (jog) ? # # see www.springer.de/author/tex/help-journals.html for class files -# -# The standard Springer Journal sections + + Input svjour.inc ClassOptions @@ -31,8 +31,6 @@ ClassOptions End -## Now, some cosmetic changes wrt the default style. - Style Title Font Family Roman @@ -50,7 +48,6 @@ Style Subtitle EndFont End - Style Author Font Series Medium