use svjour.inc instead of svjour3.inc (bug 5154)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26296 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 7862b9d5f9446d58573dd131e6267b3d19cd79c5..3989f379038c711e140071094d60ca63ab18269c 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2654,7 +2654,6 @@ lib_layouts_inc_files = Split('''
     stdstruct.inc
     stdtitle.inc
     svjour.inc
-    svjour3.inc
     theorems.inc
     theorems-ams.inc
     theorems-order.inc

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ed45ef85232af76ce5bda1fed98ae5523892237a..b14566dc3727bec557a2d3f2cbbd7ff954732372 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1066,7 +1066,6 @@ dist_layouts_DATA =\
        layouts/svglobal3.layout \
        layouts/svjog.layout \
        layouts/svjour.inc \
-       layouts/svjour3.inc \
        layouts/svprobth.layout \
        layouts/tarticle.layout \
        layouts/tbook.layout \

diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout
index b846d93643a0d299c0d943b9cc6390df9ddc39c1..1985e1d693af7f88a8b98bb55e32ad4b5e18fbe2 100644 (file)
--- a/lib/layouts/svglobal3.layout
+++ b/lib/layouts/svglobal3.layout
@@ -1,6 +1,6 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[svjour3,svglov3.clo]{article (Springer svjour3/global)}
-# svjour3/global3 (article) textclass definition file.
+# svjour3/global (article) textclass definition file.
 # for various Springer Verlag Journals for which no specific file exists (Global).
 # --------
 #
@@ -19,7 +19,7 @@
 #
 # The standard Springer Journal sections
 Format 8
-Input svjour3.inc
+Input svjour.inc
 
 ClassOptions
   Other                global

diff --git a/lib/layouts/svjour3.inc b/lib/layouts/svjour3.inc
deleted file mode 100644 (file)
index 9780590..0000000
--- a/lib/layouts/svjour3.inc
+++ /dev/null
@@ -1,482 +0,0 @@
-# svjour3 (article) textclass definition file for inclusion.
-# for Springer Verlag journals
-# --------
-#
-# Taken from initial LyX source code
-# Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-# Transposed by Pascal André <andre@via.ecp.fr>
-# Heavily modified and enhanced by serveral developers.
-#
-# --------
-# ejour2 made originally by Martin Vermeer based on article.layout.
-# Modified for LyX 1.2 by Jean-Marc Lasgouttes and MV.
-# Minor change for LyX 1.3.3 by Cengiz Gunay.
-#
-# Adapted for new svjour3 LaTeX2e classes published by Springer in 1999;
-# work done by MV in 2000.
-#
-# see www.springer.de/author/tex/help-journals.html for class files
-
-
-Format 8
-Columns                 2
-Sides                   1
-PageStyle               Plain
-
-
-Style Standard
-       Margin                Static
-       LatexType             Paragraph
-       LatexName             dummy
-       ParIndent             MM
-       ParSkip               0.4
-       Align                 Block
-       AlignPossible         Block, Left, Right, Center
-       LabelType             No_Label
-End
-
-
-Input stdsections.inc
-Input stdstarsections.inc
-Input stdlayouts.inc
-Input stdlists.inc
-Input stdfloats.inc
-Input stdcounters.inc
-
-NoStyle Part
-NoStyle Part*
-NoStyle Chapter
-NoStyle Chapter*
-
-
-Style Section
-       Font
-         Series              Medium
-         Series              Bold
-         Size                Normal
-       EndFont
-End
-
-
-Style Subsection
-       Font
-         Series              Medium
-         Shape               Italic
-         Size                Normal
-       EndFont
-End
-
-
-Style Subsubsection
-       Font
-         Series              Medium
-         Shape               Up
-         Size                Normal
-       EndFont
-End
-
-
-Style Paragraph
-       Font
-         Series              Medium
-         Shape               Italic
-         Size                Normal
-       EndFont
-End
-
-
-Style Subparagraph
-       Font
-         Series              Medium
-         Shape               Up
-         Size                Normal
-       EndFont
-End
-
-
-Style Headnote
-       Margin                Static
-       LatexType             Command
-       InTitle               1
-       LatexName             headnote
-       NextNoIndent          1
-       LeftMargin            "HeadNote (optional):xxx"
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                1.3
-       BottomSep             0.7
-       ParSep                0.7
-       Align                 Left
-       AlignPossible         Left
-       LabelType             Static
-       LabelString           "Headnote (optional):"
-       LabelFont
-         Series              Bold
-         Shape               Italic
-         Color               Red
-       EndFont
-End
-
-
-Style Dedication
-       CopyStyle             Headnote
-       LatexName             dedication
-       LeftMargin            Dedication:xxx
-       LabelString           "Dedication:"
-End
-
-
-Style Title
-       Margin                Static
-       LatexType             Command
-       InTitle               1
-       LatexName             title
-       NextNoIndent          1
-       ParSkip               0.4
-       TopSep                1.3
-       BottomSep             0.7
-       ParSep                0.7
-       Align                 Left
-       AlignPossible         Block, Center, Left, Right, Center
-       LabelType             No_Label
-       Fill_Top              1
-       Fill_Bottom           1
-       Font
-         Family              Sans
-         Series              Bold
-         Size                Largest
-       EndFont
-End
-
-
-Style Subtitle
-       Margin                Static
-       LatexType             Command
-       InTitle               1
-       LatexName             subtitle
-       NextNoIndent          1
-       ParSkip               0.4
-       ItemSep               0
-       TopSep                0
-       BottomSep             0
-       ParSep                0
-       Align                 Left
-       AlignPossible         Left
-       LabelType             No_Label
-       Font
-         Family              Sans
-         Series              Bold
-         Size                Large
-       EndFont
-End
-
-
-Style Running_LaTeX_Title
-       CopyStyle             Headnote
-       LatexName             titlerunning
-       LeftMargin            "Running title:xxx"
-       LabelString           "Running title:"
-End
-
-
-Style Author
-       Margin                Static
-       LatexType             Command
-       InTitle               1
-       LatexName             author
-       NextNoIndent          1
-       ParSkip               0.4
-       TopSep                0.7
-       BottomSep             0.7
-       ItemSep               0
-       ParSep                0
-       Align                 Left
-       AlignPossible         Left
-       LabelType             No_Label
-       Font
-         Series              Bold
-         Shape               Italic
-       EndFont
-End
-
-
-Style Author_Running
-       CopyStyle             Headnote
-       LatexName             authorrunning
-       LeftMargin            "Author Running:xxx"
-       LabelString           "Author Running:"
-End
-
-
-Style Institute
-       Margin                Static
-       LatexType             Command
-       InTitle               1
-       LatexName             institute
-       NextNoIndent          1
-       ParSkip               0.4
-       TopSep                1.3
-       BottomSep             0.7
-       ParSep                0.7
-       Align                 Left
-       AlignPossible         Left
-       LabelType             No_Label
-       Font
-         Size                Small
-       EndFont
-End
-
-
-Style Date
-       CopyStyle             Institute
-       LatexName             date
-End
-
-
-Style Mail
-       CopyStyle             Headnote
-       LatexName             mail
-       LeftMargin            "Corr Author:xx."
-       LabelString           "Corr Author:"
-End
-
-
-Style Offprints
-       CopyStyle             Headnote
-       LatexName             offprints
-       LeftMargin            "Offprints:xx."
-       LabelString           "Offprints:"
-End
-
-
-Style Abstract
-       Margin                First_Dynamic
-       LatexType             Environment
-       LatexName             abstract
-       NextNoIndent          0
-       ParIndent             MM
-       LabelSep              xx
-       ItemSep               0
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Top_Environment
-       LabelString           "Abstract."
-       LabelFont
-         Series              Bold
-       EndFont
-End
-
-
-Style Keywords
-       Margin                First_Dynamic
-       LatexType             Command
-       LatexName             keywords
-       NextNoIndent          0
-       ParIndent             MM
-       LabelSep              xx
-       ItemSep               0
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Static
-       LabelString           "Key words:"
-       LabelFont
-         Series              Bold
-       EndFont
-End
-
-
-Style Acknowledgements
-       Margin                First_Dynamic
-       LatexType             Environment
-       LatexName             acknowledgements
-       NextNoIndent          0
-       ParIndent             MM
-       LabelSep              xx
-       ItemSep               0
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Static
-       LabelString           "Acknowledgements."
-       Font
-         Size                Small
-       EndFont
-       LabelFont
-         Shape               Italic
-         Size                Small
-       EndFont
-End
-
-
-Style Acknowledgement
-       CopyStyle             Acknowledgements
-       LatexName             acknowledgement
-       LabelString           "Acknowledgement."
-End
-
-
-Style Bibliography
-       Margin                First_Dynamic
-       LatexType             Bib_Environment
-       LatexName             thebibliography
-       NextNoIndent          1
-       LeftMargin            MM
-       ParSkip               0.4
-       ItemSep               0
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.5
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Bibliography
-       LabelString           "References"
-       LabelBottomSep        0.7
-       LabelFont
-         Series              Bold
-       EndFont
-End
-
-
-Style Claim
-       Margin                First_Dynamic
-       LatexType             Environment
-       LatexName             claim
-       NextNoIndent          0
-       ParIndent             MM
-       LabelSep              xx
-       ItemSep               0
-       TopSep                0.5
-       BottomSep             0.5
-       ParSep                0
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Static
-       LabelString           "Claim."
-       LabelFont
-         Shape               Italic
-       EndFont
-End
-
-
-Style Conjecture
-       CopyStyle             Claim
-       LatexName             conjecture
-       LabelString           "Conjecture #."
-End
-
-
-Style Corollary
-       CopyStyle             Claim
-       LatexName             corollary
-       LabelString           "Corollary #."
-       Font
-         Shape               Italic
-       EndFont
-       LabelFont
-         Shape               Up
-         Series              Bold
-       EndFont
-End
-
-
-Style Definition
-       CopyStyle             Corollary
-       LatexName             definition
-       LabelString           "Definition #."
-End
-
-
-Style Example
-       CopyStyle             Claim
-       LatexName             example
-       LabelString           "Example #."
-End
-
-
-Style Exercise
-       CopyStyle             Claim
-       LatexName             exercise
-       LabelString           "Exercise #."
-       LabelFont
-         Shape               Up
-         Series              Bold
-       EndFont
-End
-
-
-Style Lemma
-       CopyStyle             Corollary
-       LatexName             lemma
-       LabelString           "Lemma #."
-End
-
-
-Style Note
-       CopyStyle             Claim
-       LatexName             note
-       LabelString           "Note #."
-End
-
-
-Style Problem
-       CopyStyle             Exercise
-       LatexName             problem
-       LabelString           "Problem #."
-End
-
-
-Style Proof
-       CopyStyle             Claim
-       LatexName             proof
-       LabelString           "Proof."
-End
-
-
-Style Property
-       CopyStyle             Claim
-       LatexName             property
-       LabelString           "Property #."
-End
-
-
-Style Proposition
-       CopyStyle             Claim
-       LatexName             proposition
-       LabelString           "Proposition #."
-End
-
-
-Style Question
-       CopyStyle             Claim
-       LatexName             question
-       LabelString           "Question #."
-End
-
-
-Style Remark
-       CopyStyle             Claim
-       LatexName             remark
-       LabelString           "Remark #."
-End
-
-
-Style Solution
-       CopyStyle             Exercise
-       LatexName             solution
-       LabelString           "Solution #."
-End
-
-
-Style Theorem
-       CopyStyle             Corollary
-       LatexName             theorem
-       LabelString           "Theorem #."
-End