Merge remote-tracking branch 'origin/master' into features/latexargs

[lyx.git] / lib / layouts / IEEEtran.layout

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 3ed9c72b0e6da963bcec815c3b80f8f2e36bc82c..3644ab16f51ece1771641445ef745d3b3d61b224 100644 (file)
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -1,5 +1,6 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLaTeXClass{article (IEEEtran)}
+#  \DeclareLaTeXClass{IEEE Transactions}
+#  \DeclareCategory{Articles}
 # Author : Allan Rae <rae@lyx.org>
 #
 # revised for IEEEtran version 1.7a
@@ -8,7 +9,7 @@
 # IEEtran textclass definition file.
 
 
-Format 34
+Format 40
 
 Sides          1
 SecNumDepth    3
@@ -67,7 +68,7 @@ Style Title
   LatexName    title
   Category     FrontMatter
   InTitle      1
-  OptionalArgs 0
+  ResetArgs    1
   ParSkip      0.4
   ItemSep      0
   TopSep       0
@@ -81,7 +82,7 @@ Style Title
 End
 
 
-InsetLayout IEEE_membership
+InsetLayout Flex:IEEE_membership
   LyxType      custom
   LatexType    command
   LatexName    IEEEmembership
@@ -100,8 +101,8 @@ InsetLayout IEEE_membership
 End
 
 
-InsetLayout Lowercase
-  CopyStyle    IEEE_membership
+InsetLayout Flex:Lowercase
+  CopyStyle    Flex:IEEE_membership
   LatexType    command
   LatexName    MakeLowercase
   LabelString  "lowercase"
@@ -116,7 +117,11 @@ Style Author
   LatexType    Command
   Category     FrontMatter
   InTitle      1
-  OptionalArgs 1
+  Argument 1
+       LabelString   "Short Author"
+       Shortcut      S
+       Tooltip       "A short version of the author name"
+  EndArgument
   LatexName    author
   LabelSep     xxx
   ParSkip      0.4
@@ -235,7 +240,10 @@ Style Appendix
   CopyStyle    Appendices
   LatexName    appendix
   LabelString  "Appendix"
-  OptionalArgs 1
+  Argument 1
+       LabelString   "Appendix Title"
+       Tooltip       "Optional title of the appendix"
+ EndArgument
 End
 
 
@@ -267,7 +275,10 @@ Style Biography
   LaTeXType    Environment
   LaTeXName    IEEEbiography
   Category     BackMatter
-  OptionalArgs 1
+  Argument 1
+       LabelString   "Biography Photo"
+       Tooltip       "Insert a photo to your biography"
+  EndArgument
   Align        Block
   TextFont
     Size       Small
@@ -278,7 +289,7 @@ End
 Style Biography_without_photo
   CopyStyle    Biography
   LaTeXName    IEEEbiographynophoto
-  OptionalArgs 0
+  ResetArgs    1
 End
 
 Style BiographyNoPhoto
@@ -292,7 +303,10 @@ Style Proof
   LatexType    Environment
   LatexName    IEEEproof
   NextNoIndent 1
-  OptionalArgs 1
+  Argument 1
+       LabelString   "Alternative Proof String"
+       Tooltip       "An alternative proof string"
+  EndArgument
   LabelSep     xx
   ParIndent    MMM
   ParSkip      0.4