Update layouts to format 24.

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

diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout
index 57a2b2440f057a8e5dd82e9117f925939d41cafa..3f90193b3cd4f79f354a14ca3563132a5c8494da 100644 (file)
--- a/lib/layouts/entcs.layout
+++ b/lib/layouts/entcs.layout
@@ -3,12 +3,37 @@
 # Based on LyX article class; modified to support ENTCS class
 # Reuben Thomas (rrt@sc3d.org)   27/5-2/6/01
 
+Format 24
 Input article.layout
 
 # only font size 11pt is really available
 ClassOptions
        FontSize   11
-End  
+End
+
+Requires       ifthen
+
+Preamble
+       \usepackage{entcsmacro}
+       \newcommand{\theTitle}[1]{}
+       \newcommand{\theAuthor}[1]{}
+       \newcommand{\theAddress}[1]{}
+       \newcommand{\theAbstract}[1]{}
+       \newboolean{hasAbstract}
+       \newcommand{\theKeyword}[1]{}
+       \newboolean{hasKeyword}
+       \newcommand{\theFrontMatter}[1]{}
+       \newcommand{\maketitle}{
+        \begin{frontmatter}
+        \title{\theTitle}
+        \author{\theAuthor}
+        \address{\theAddress}
+        \ifthenelse{\boolean{hasAbstract}}{\begin{abstract}\theAbstract\end{abstract}}{}
+        \ifthenelse{\boolean{hasKeyword}}{\begin{keyword}\theKeyword\end{keyword}}{}
+        \theFrontMatter
+        \end{frontmatter}
+       }
+EndPreamble
 
 
 Style Title
@@ -16,8 +41,9 @@ Style Title
        LatexName             settitle
        InTitle               1
        Preamble
-\newcommand{\settitle}[1]{\def\theTitle{#1}}
+               \newcommand{\settitle}[1]{\def\theTitle{#1}}
        EndPreamble
+       HTMLTitle             true
 End
 
 
@@ -26,7 +52,7 @@ Style Author
        LatexName             setauthor
        InTitle               1
        Preamble
-\newcommand{\setauthor}[1]{\def\theAuthor{#1}}
+               \newcommand{\setauthor}[1]{\def\theAuthor{#1}}
        EndPreamble
 End
 
@@ -35,12 +61,11 @@ Style Address
        LatexType             Command
        LatexName             setaddress
        Align                 Center
-       AlignPossible         Center
        InTitle               1
        Preamble
-\newcommand{\setaddress}[1]{\def\theAddress{#1}}
+               \newcommand{\setaddress}[1]{\def\theAddress{#1}}
        EndPreamble
-       Font 
+       Font
          Shape               Italic
        EndFont
 End
@@ -52,12 +77,12 @@ Style FrontMatter
        LaTeXName             setfrontmatter
        InTitle               1
        Preamble
-\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
+               \newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
        EndPreamble
 End
 
 
-Style Abstract 
+Style Abstract
        LatexType             Command
        LatexName             setabstract
        LabelType             Top_Environment
@@ -66,53 +91,29 @@ Style Abstract
        RightMargin           ""
        InTitle               1
        Preamble
-\newcommand{\setabstract}[1]{\def\theAbstract{#1}\setboolean{hasAbstract}{true}}
+               \newcommand{\setabstract}[1]{%
+                       \def\theAbstract{#1}\setboolean{hasAbstract}{true}}
        EndPreamble
 End
 
 
 Style Keyword
        Align                 Center
-       AlignPossible         Center
        LatexType             Command
        LatexName             setkeyword
        InTitle               1
        Preamble
-\newcommand{\setkeyword}[1]{\def\theKeyword{#1}\setboolean{hasKeyword}{true}}
+               \newcommand{\setkeyword}[1]{%
+                       \def\theKeyword{#1}\setboolean{hasKeyword}{true}}
        EndPreamble
        LabelType             Static
        LabelString           "Key words:"
        LabelSep              xx
-       
-       Font 
+       Font
          Size                Small
        EndFont
-
-       LabelFont 
+       LabelFont
          Shape               Italic
          Size                Small
        EndFont
 End
-
-
-Preamble
-\usepackage{entcsmacro,ifthen}
-\newcommand{\theTitle}[1]{}
-\newcommand{\theAuthor}[1]{}
-\newcommand{\theAddress}[1]{}
-\newcommand{\theAbstract}[1]{}
-\newboolean{hasAbstract}
-\newcommand{\theKeyword}[1]{}
-\newboolean{hasKeyword}
-\newcommand{\theFrontMatter}[1]{}
-\newcommand{\maketitle}{
- \begin{frontmatter}
- \title{\theTitle}
- \author{\theAuthor}
- \address{\theAddress}
- \ifthenelse{\boolean{hasAbstract}}{\begin{abstract}\theAbstract\end{abstract}}{}
- \ifthenelse{\boolean{hasKeyword}}{\begin{keyword}\theKeyword\end{keyword}}{}
- \theFrontMatter
- \end{frontmatter}
-}
-EndPreamble