]> git.lyx.org Git - lyx.git/blobdiff - lib/layouts/svcommon.inc
Revert "Update layouts"
[lyx.git] / lib / layouts / svcommon.inc
index 916e0936173df1f626b1c5ab86e2b0ad60442e79..72941773762122804a79e84e14c2c8bf6dc5ca0e 100644 (file)
@@ -5,7 +5,7 @@
 #     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.
+#     Heavily modified and enhanced by several developers.
 #     --------
 #     ejour2 made originally by Martin Vermeer based on article.layout.
 #     Modified for LyX 1.2 by Jean-Marc Lasgouttes and MV.
 #     Adapted for new svjour LaTeX2e classes published by Springer in 1999;
 #     work done by MV in 2000.
 #
-# Adapted for svmono, svmult,     2009/2007
-# by Marcus Kriele (mkriele@mac.com)
+# Adapted for svmono, svmult, and svjour3 2011
+# by Marcus Kriele (mkriele@mac.com) and Uwe Stöhr
 # see http://www.springer.com/authors for class files and further instructions
 
 
-Format 35
+Format 104
 PageStyle              Plain
 
 
 Style Standard
+       Category        MainText
        Margin          Static
        LatexType       Paragraph
        LatexName       dummy
@@ -32,6 +33,7 @@ Style Standard
        Align           Block
        AlignPossible   Block, Left, Right, Center
        LabelType       No_Label
+       DocBookTag             para
 End
 
 Input stdcounters.inc
@@ -49,19 +51,20 @@ Input theorems-without-preamble.inc
 NoStyle Fact
 NoStyle Prop
 
-
-NoStyle Subparagraph
 NoCounter subparagraph
 NoStyle Subparagraph*
 
 
 Style Title
-       Align                   Left
-       AlignPossible           Block, Center, Left, Right, Center
+       Align           Left
+       AlignPossible   Block, Center, Left, Right
        Font
-         Family                Sans
-         Series                Bold
+         Family        Sans
+         Series        Bold
        EndFont
+       DocBookTag            title
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 
@@ -71,7 +74,7 @@ Style Front_Matter
        LatexType       Command
        LatexName       frontmatter
        KeepEmpty       1
-       OptionalArgs    0
+       ResetArgs       1
        Margin          First_Dynamic
        NextNoIndent    1
        ParSkip         0
@@ -88,7 +91,7 @@ Style Front_Matter
          Family        Sans
          Series        Bold
          Size          Largest
-         Color         Blue
+         Color         textlabel1
        EndFont
 End
 
@@ -107,231 +110,276 @@ Style Back_Matter
 End
 
 Style Part
-      Margin                   Static
-      Align                    Right
+       Margin          Static
+       Align           Right
+       DocBookTag            title
+       DocBookTagType        paragraph
+       DocBookSectionTag     part
+       DocBookInInfo         maybe
+       DocBookForceAbstractTag partintro
 End
 
 ## The following is a variant of style Part.  It allows to place some
 ## text on the following page which would otherwise be blank.  
 
 Style PartBacktext
-       Category              Section
-       Margin                First_Dynamic
-       LabelString           "Part \thepart"
-       LabelType             Counter
-       TocLevel              0
-       LabelCounter          part
-       Labelsep              xx
-       NeedProtect           1
-       ParIndent             MM
-       TopSep                4
-       BottomSep             4
+       Category        Sectioning
+       Margin          First_Dynamic
+       LabelString     "Part \thepart"
+       LabelType       Static
+       TocLevel        0
+       LabelCounter    part
+       Labelsep        xx
+       NeedProtect     1
+       ParIndent       MM
+       TopSep          4
+       BottomSep       4
        LaTexType       Environment
        LatexName       svmultpartbacktext
        LabelFont
-         Series              Bold
-         Size                Huge
-       EndLabelFont
+         Series        Bold
+         Size          Huge
+       EndFont
        TextFont
          Series        Medium
          Shape         Up
          Size          normal
-       EndTextFont
-       RequiredArgs    1
+       EndFont
+       Argument 1
+         Mandatory     1
+         LabelString   "Part Title"
+         Tooltip           "Title of this part"
+         IsTocCaption  1
+         DocBookTag    title
+       EndArgument
        Preamble
          \newenvironment{svmultpartbacktext}[1]{\begin{partbacktext}
          \part{#1}}{\end{partbacktext}}
        EndPreamble
-       HTMLTag               h1
+       HTMLTag         h1
+       DocBookTag            NONE
+       DocBookSection        true
+       DocBookSectionTag     part
+       # A second paragraph of PartBacktext can only wreak havok: it should start a section, and nothing else (otherwise, it's a real nightmare to implement). This ought to be enough for now, even though the document cannot be valid.
 End
 
 Style Chapter
-       Align                   Left
+       Align           Left
+       DocBookTag            title
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
+       DocBookSectionTag     chapter
+       TocLevel 0
 End
 
 Style ChapSubtitle
-      LatexName                        chapsubtitle
-      LatexType                        Command
-      Category                 Section
-       TopSep                  0.7
+       LatexName       chapsubtitle
+       LatexType       Command
+       Category        Sectioning
+       TopSep          0.7
        Font
-         Series                Bold
-         Shape                 Up
-         Size                  large
+         Series        Bold
+         Shape         Up
+         Size          large
        EndFont
+       DocBookTag            subtitle
 
 End
 
 Style ChapAuthor
-      LatexName                        chapauthor
-      LatexType                        Command
-      Category                 Section
-      TopSep                   0.7
-      Font
-         Series                Bold
-         Shape                 Up
-         Size                  normal
-      EndFont
+       LatexName       chapauthor
+       LatexType       Command
+       Category        Sectioning
+       TopSep          0.7
+       Font
+         Series        Bold
+         Shape         Up
+         Size          normal
+       EndFont
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookInInfo         always
 End
 
 Style ChapMotto
-      LatexName                        motto
-      LatexType                        Command
-      Category                 Section
-      TopSep                   0.7
-      BottomSep                        0.7
-      Align                    Left
-      LeftMargin               MMMMMMMMMMMM
-      Font
-         Series                Medium
-         Shape                 Italic
-         Size                  normal
-      EndFont
+       LatexName       motto
+       LatexType       Command
+       Category        Sectioning
+       TopSep          0.7
+       BottomSep       0.7
+       Align           Left
+       LeftMargin      MMMMMMMMMMMM
+       Font
+         Series        Medium
+         Shape         Italic
+         Size          normal
+       EndFont
 End
 
 Style Section
        Font
-         Series                Bold
-         Shape                 Up
-         Size                  large
+         Series        Bold
+         Shape         Up
+         Size          large
        EndFont
-       TocLevel 1
+       TocLevel        1
 End
 
 Style Subsection
        Font
-         Series                Bold
-         Shape                 Italic
-         Size                  large
+         Series        Bold
+         Shape         Italic
+         Size          large
        EndFont
-       TocLevel 2
+       TocLevel        2
 End
 
 Style Subsubsection
        Font
-         Series                Bold
-         Shape                 Up
-         Size                  Normal
+         Series        Bold
+         Shape         Up
+         Size          Normal
        EndFont
-       TocLevel 3
+       TocLevel        3
 End
 
 Style Paragraph
        Font
-         Series                Medium
-         Shape                 Up
-         Size                  Normal
+         Series        Medium
+         Shape         Up
+         Size          Normal
+       EndFont
+       TopSep          0.7
+       BottomSep       0.4
+       TocLevel        4
+End
+
+Style Subparagraph
+       LeftMargin      ""
+       Font
+         Series        Medium
+         Shape         Italic
+         Size          Normal
        EndFont
-       TopSep                  0.7
-       BottomSep               0.4
-       TocLevel 4
+       TopSep          0.7
+       BottomSep       0.4
+       TocLevel        4
 End
 
 Style Part*
-      Margin                   Static
-      Align                    Right
+      Margin           Static
+      Align            Right
 End
 
 Style Chapter*
-       Align                   Left
+       Align           Left
 End
 
 Style Section*
        Font
-         Series                Bold
-         Shape                 Up
-         Size                  large
+         Series        Bold
+         Shape         Up
+         Size          large
        EndFont
 End
 
 Style Subsection*
        Font
-         Series                Bold
-         Shape                 Italic
-         Size                  large
+         Series        Bold
+         Shape         Italic
+         Size          large
        EndFont
 End
 
 Style Subsubsection*
        Font
-         Series                Bold
-         Shape                 Up
-         Size                  Normal
+         Series        Bold
+         Shape         Up
+         Size          Normal
        EndFont
 End
 
 Style Paragraph*
        Font
-         Series              Medium
-         Shape               Up
-         Size                Normal
+         Series        Medium
+         Shape         Up
+         Size          Normal
        EndFont
-       TopSep                0.7
-       BottomSep             0.4
+       TopSep          0.7
+       BottomSep       0.4
 End
 
 Style Run-in_headings
-       Category                Unnumbered
-       LabelType               No_Label
-       LabelSep                xx
-       TopSep                0.7
+       Category        Unnumbered
+       LabelType       No_Label
+       LabelSep        xx
+       TopSep          0.7
        Font
-         Series                Bold
-         Shape                 Up
-         Size                  Normal
+         Series        Bold
+         Shape         Up
+         Size          Normal
        EndFont
-       Margin                Static
-       LatexType               Command
-       LatexName               runinhead
+       Margin          Static
+       LatexType       Command
+       LatexName       runinhead
 End
 
 Style Sub-run-in_headings
-       CopyStyle               Run-in_headings
+       CopyStyle       Run-in_headings
        Font 
-         Series                Medium
-         Shape                 Italic
-         Size                  Normal
+         Series        Medium
+         Shape         Italic
+         Size          Normal
        EndFont
-       LatexName               subruninhead
+       LatexName       subruninhead
 End
 
 Style Extrachap
-       CopyStyle             Chapter*
-       LatexName             Extrachap
+       CopyStyle       Chapter*
+       LatexName       Extrachap
 End
 
 Style extrachap
-       CopyStyle             Chapter*
-       LatexName             extrachap
+       CopyStyle       Chapter*
+       LatexName       extrachap
 End
 
 Style Title
-       Align                   Left
-       AlignPossible           Block, Center, Left, Right, Center
+       Align           Left
+       AlignPossible   Block, Center, Left, Right, Center
        Font
-         Family                Sans
-         Series                Bold
+         Family        Sans
+         Series        Bold
        EndFont
 End
 
 Style Subtitle
-       CopyStyle               Title
-       LatexName               subtitle
-       NextNoIndent            1
-       BottomSep               0
-       ParSep                  0
+       CopyStyle       Title
+       LatexName       subtitle
+       NextNoIndent    1
+       BottomSep       0
+       ParSep          0
        Font
-         Size                  Large
+         Size          Large
        EndFont
+       DocBookTag            subtitle
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 Style Author
-       NextNoIndent            1
-       Align                   Left
+       NextNoIndent    1
+       Align           Left
        Font
-         Series                Bold
-         Shape                 Italic
+         Series        Bold
+         Shape         Italic
        EndFont
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookWrapperTagType inline
+       DocBookInInfo         always
 End
 
 Style Institute
@@ -339,22 +387,27 @@ Style Institute
        LatexType       Command
        InTitle         1
        LatexName       institute
-       Margin          Static
-       LeftMargin      "Author data:xxx"
-       LabelSep        xxx
+       Margin          First_Dynamic
+       LabelSep        x
        LabelType       Static
-       LabelString     "Author data: "
+       LabelString     "Author data:"
        LabelFont
-         Shape         Italic
+         Family        Typewriter
+         Color         textlabel1
        EndFont
        Requires        url
        Align           Left
+       # TODO: should rather be merged with the list of authors, but this would require a lot of specific code...
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookInInfo         always
 End
 
 Style Date
-       Align                   Left
+       Align           Left
        Font
-         Size                  Small
+         Size          Small
        EndFont
 End
 
@@ -364,42 +417,65 @@ Style TOC_Title
        Align           Left
        LatexType       Command
        LatexName       toctitle
-       LeftMargin      xxx
+       LeftMargin      xx
        TopSep          0.4
        BottomSep       0.4
        LabelType       Static
        LabelSep        x
-       LabelString     "TOC Title:"
+       LabelString     "TOC title:"
        LabelFont
          Family        Typewriter
-         Color         Blue
+         Color         textlabel1
        EndFont  
 End
 
 Style TOC_Author
        CopyStyle       TOC_Title
        LatexName       tocauthor
-       LabelString     "TOC Author:"
+       LabelString     "TOC author:"
 End
 
 Style Running_Title
-       CopyStyle       TOC_Title
+       CopyStyle       TOC_Title
        LatexName       titlerunning
        InTitle         1
-       LabelString     "Running Title:"
-End
-
-Style Running_LaTeX_Title
-      ObsoletedBy      Running_Title
+       LabelString     "Running title:"
+       DocBookTag            titleabbrev
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 Style Running_Author
        CopyStyle       Running_Title
        LatexName       authorrunning
-       LabelString     "Running Author:"
+       LabelString     "Running author:"
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookWrapperAttr    role='abbrev'
+       DocBookWrapperTagType block
+       DocBookInInfo         always
+End
+
+Style Running_Chapter
+       CopyStyle       Running_Title
+       Category        Sectioning
+       InTitle         0
+       LatexName       chaptermark
+       LabelString     "Running chapter:"
+       DocBookTag            titleabbrev
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
+       DocBookSection        false
 End
-Style Author_Running
-      ObsoletedBy      Running_Author
+
+Style Running_Section
+       CopyStyle       Running_Chapter
+       LatexName       sectionmark
+       LabelString     "Running section:"
+       DocBookTag            titleabbrev
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 Style Abstract
@@ -408,7 +484,7 @@ Style Abstract
        LatexType       Environment
        LatexName       abstract
        LabelType       Static
-       LabelString     "Abstract."
+       LabelString     "Abstract"
        LabelFont
          Series        Bold
        EndFont
@@ -421,172 +497,213 @@ Style Abstract
        ParSep          0
        Align           Block
        AlignPossible   Block, Left
+       DocBookAbstract       true
+       DocBookInInfo         always
+       DocBookWrapperTag     abstract
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 Style Abstract*
-      CopyStyle                Abstract
+       CopyStyle       Abstract
+       LatexType       Command
        LatexName       abstract*
-       LabelString     "Abstract* (not printed)."
-       LabelFont
-         Color         Blue
+       LabelString     "Abstract* (not printed)"
+       LabelFont
+         Color         textlabel1
        EndFont
        TextFont        
-          Color                Blue
-         EndFont
+         Color         textlabel1
+       EndFont
+       DocBookAbstract       true
+       DocBookInInfo         always
+       DocBookWrapperTag     abstract
+       DocBookWrapperAttr    role='not-printed'
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 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           "Keywords"
+       Margin          First_Dynamic
+       LatexType       Command
+       LatexName       keywords
+       Category        FrontMatter
+       NextNoIndent    0
+       ParIndent       MM
+       LabelSep        xx
+       ItemSep         0
+       TopSep          0.7
+       BottomSep       0.7
+       ParSep          0
+       Align           Block
+       AlignPossible   Block, Left
+       LabelType       Static
+       LabelString     "Keywords"
        LabelFont
-         Series              Bold
+         Series        Bold
        EndFont
+       DocBookTag          keyword
+       DocBookTagType      paragraph
+       DocBookWrapperTag   keywordset
+       DocBookInInfo       always
 End
 
 Style Dedication
-       Category                FrontMatter
-       Margin                  Static
-       LatexType               Environment
-       LatexName               dedication
-       LeftMargin              MMMMMMMMMMMM
-       TopSep                  2
-       ParIndent               MM
-       Parsep                  0
-       BottomSep               2
-       Align                   Left
-       LabelType               Static
-       LabelString             ""
-       LabelIndent             ""
+       Category        FrontMatter
+       Margin          Static
+       LatexType       Environment
+       LatexName       dedication
+       LeftMargin      MMMMMMMMMMMM
+       TopSep          2
+       ParIndent       MM
+       Parsep          0
+       BottomSep       2
+       Align           Left
+       LabelType       Static
+       LabelString     ""
+       LabelIndent     ""
        Font
-         Shape                 Italic
-         Size                  large
+         Shape         Italic
+         Size          large
        EndFont
+       DocBookTag             para
+       DocBookTagType         paragraph
+       DocBookWrapperTag      dedication
+       DocBookWrapperTagType  block
+       DocBookWrapperMergeWithPrevious    true
+       DocBookInInfo          never
 End
 
 Style Foreword
-       Margin                First_Dynamic
-       Category              Unnumbered
-       LabelType               Static
-       LabelString             "Foreword"
-       KeepEmpty               1
-       LatexName             foreword
-       TocLevel              0
-       LatexType             Command
-       NeedProtect           1
-       NextNoIndent          1
-       ParSkip               0.4
-       TopSep                4
-       BottomSep             0.8
-       ParSep                0.8
-       Align                 Block
-       OptionalArgs          1
+       Margin          First_Dynamic
+       Category        FrontMatter
+       LabelType       Static
+       LabelString     "Foreword"
+       KeepEmpty       1
+       LatexName       foreword
+       TocLevel        0
+       LatexType       Command
+       NeedProtect     1
+       NextNoIndent    1
+       ParSkip         0.4
+       TopSep          4
+       BottomSep       0.8
+       ParSep          0.8
+       Align           Block
+       Argument 1
+         LabelString   "Alternative Name"
+         Tooltip       "Alternative name"
+       EndArgument
        Font
-         Series              Bold
-         Size                Huge
+         Series        Bold
+         Size          Huge
        EndFont
-       HTMLTag               h1
+       DocBookTag             title
+       DocBookTagType         paragraph
+       DocBookSection         true
+       DocBookSectionTag      preface
 End
 
-#  Future implementation of the Style "Preface" (not fully backward compatible)
-#
-#  Style Preface
-#      CopyStyle               Foreword
-#              LabelString             "Preface"
-#              LatexName             preface
-# End
-
-#  Current implementation of the Style Preface for backwards compatibility
 Style Preface
-       CopyStyle       Title
-       Category        "For editors"
-       LatexName       svmultpreface
-       KeepEmpty       1
-       OptionalArgs    0
+       CopyStyle       Foreword
+       Category        FrontMatter
+       LatexName       preface
        InTitle         0
        Margin          First_Dynamic
        TopSep          4
        BottomSep       0.8
        LabelType       Static
-       LabelString     "Preface:"
+       LabelString     "Preface"
        LabelSep        xx
        Align           Left
-       Preamble
-         \newcommand{\svmultpreface}[1]{\ifthenelse{\equal{#1}{}}{\preface}{\preface[#1]}}
-       EndPreamble
-       Requires        ifthen
-End
-
-
-
-Style Acknowledgement
-       Category              BackMatter
-       Margin                First_Dynamic
-       LatexType             Environment
-       LatexName             acknowledgement
-       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."
+       DocBookTag             title
+       DocBookTagType         paragraph
+       DocBookSection         true
+       DocBookSectionTag      preface
+End
+
+Style Acknowledgment
+       Category        BackMatter
+       Margin          First_Dynamic
+       LatexType       Environment
+       LatexName       acknowledgement
+       NextNoIndent    0
+       ParIndent       MM
+       LabelSep        xx
+       ItemSep         0
+       TopSep          0.7
+       BottomSep       0.7
+       ParSep          0
+       Align           Block
+       AlignPossible   Block, Left
+       LabelType       Static
+       LabelString     "Acknowledgments"
        Font
-         Size                Small
+         Size          Small
        EndFont
        LabelFont
-         Series              Bold
-         Shape               Up
-         Size                Small
+         Series        Bold
+         Shape         Up
+         Size          Small
        EndFont
+       DocBookTag  para
+       DocBookWrapperTag  acknowledgements
 End
 
-Style Acknowledgements
-      CopyStyle                        Acknowledgement
-      LatexName                acknowledgements
+Style Acknowledgments
+       CopyStyle       Acknowledgment
+       LatexName       acknowledgements
 End
 
 Style Bibliography
-       Margin                First_Dynamic
-       LatexType             Bib_Environment
-       LatexName             thebibliography
-       Category              BackMatter
-       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
+       Margin          First_Dynamic
+       LatexType       Bib_Environment
+       LatexName       thebibliography
+       Category        BackMatter
+       NextNoIndent    1
+       ToggleIndent    Never
+       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
+         Series        Bold
        EndFont
+       TocLevel        0
+       IsTocCaption    0
+       Argument listpreamble:1
+         LabelString    "Bib preamble"
+         MenuString     "Bibliography Preamble"
+         Tooltip        "LaTeX code to be inserted before the first bibliography item"
+         PassThru       1
+         Font
+           Family typewriter
+           Color latex
+         EndFont
+       EndArgument
 End
 
 Style Description
+       Argument 1
+         LabelString   "Longest Description Label"
+         Tooltip       "Longest description label"
+       EndArgument
        LabelFont
-         Series              Medium
+         Series        Medium
        EndFont
+       DocBookTag            variablelist
+       DocBookItemWrapperTag varlistentry
+       DocBookItemTag        listitem
+       DocBookItemInnerTag   para
+       DocBookItemLabelTag   term
+       DocBookItemLabelTagType   paragraph
 End
 
 Style Petit
@@ -594,35 +711,51 @@ Style Petit
        Category        MainText
        LatexType       Environment
        LatexName       petit
-       TopSep                0.7
-       BottomSep             0.7
+       TopSep          0.7
+       BottomSep       0.7
        Font
          Size          Small
        EndFont
 End
 
 Style Svgraybox
-       Category                MainText
-       Margin                  Static
-       LatexType               Environment
-       LatexName               svgraybox
-       RightMargin             MMM
-       TopSep                  0.5
-       ParIndent               MM
-       Parsep                  0
-       BottomSep               0.5
-       Align                   Block
-       AlignPossible           Block, Left, Right, Center
-       LabelType               No_Label
+       Category        MainText
+       Margin          Static
+       LatexType       Environment
+       LatexName       svgraybox
+       RightMargin     MMM
+       TopSep          0.5
+       ParIndent       MM
+       Parsep          0
+       BottomSep       0.5
+       Align           Block
+       AlignPossible   Block, Left, Right, Center
+       LabelType       No_Label
        Font
-         Family                Sans
+         Family        Sans
        EndFont
 End
 
 Style Proof
-       CopyStyle             Claim
-       LatexName             proof
-       LabelString           "Proof"
+       Category        Reasoning
+       LatexType       Environment
+       LatexName       proof
+       Margin          First_Dynamic
+       LeftMargin      xxx
+       TopSep          0.4
+       BottomSep       0.4
+       LabelType       Static
+       LabelSep        xx
+       LabelString     "Proof."
+       LabelFont
+         Shape         Italic
+       EndFont
+       LangPreamble
+         \providecommand{\proofname}{_(Proof)}
+       EndLangPreamble
+       BabelPreamble
+         \addto\captions$$lang{\renewcommand{\proofname}{_(Proof)}}
+       EndBabelPreamble
 End
 
 Style Proof(QED)
@@ -630,64 +763,39 @@ Style Proof(QED)
        LatexName       svmultproof
        EndLabelType    Box
        Preamble
-               \newenvironment{svmultproof}{\begin{proof}}{\qed\end{proof}}
+         \newenvironment{svmultproof}{\begin{proof}}{\qed\end{proof}}
        EndPreamble
 End
 
 Style Proof(smartQED)
        CopyStyle       Proof
        LatexName       svmultproof2
-       EndLabelType    Filled_Box
+       EndLabelType    Box
        Preamble
          \newenvironment{svmultproof2}{\begin{proof}}{\smartqed\qed\end{proof}}
        EndPreamble
 End
 
-
-Style Description
-       OptionalArgs    1
-End
-
-
 InsetLayout Flex:Email
-           Decoration  Conglomerate
-       LyxType                 custom
-       LatexType               command
-       LatexName               email
-       LabelString             "Email"
+       Decoration      Conglomerate
+       LyxType         custom
+       LatexType       command
+       LatexName       email
+       LabelString     "Email"
        Font
-         Color                 foreground
-         Size                  Small
-         Family                Roman
-         Shape                 Up
-         Series                Medium
-         Misc                  No_Emph
-         Misc                  No_Noun
-         Misc                  No_Bar
+         Color         foreground
+         Size          Small
+         Family        Roman
+         Shape         Up
+         Series        Medium
+         Misc          No_Emph
+         Misc          No_Noun
+         Misc          No_Bar
        EndFont
        LabelFont
-         Color                 urltext
-         Size                  Small
+         Color         urltext
+         Size          Small
        EndFont
+       ResetsFont true
 End
 
-
-InsetLayout    Flex:and
-       ContentAsLabel  1
-       CustomPars      0
-       Decoration      Classic
-       LatexName       and
-       LatexType       Command
-       LabelString     "and"
-       LyxType         Custom
-       KeepEmpty       1
-End
-
-# InsetLayout  Flex:and
-#        CopyStyle     Flex:Email
-#        LatexName     and
-#        LabelString   "and"
-#        Font  
-#        EndFont
-#        KeepEmpty     1
-# End