X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fentcs.layout;h=3f90193b3cd4f79f354a14ca3563132a5c8494da;hb=99bbf5b42ac3d74d7082559c0b9b76e585827c90;hp=d03ab4e2b30860e578a82c51e56b103581891cc4;hpb=12d02d04b2b26bdd49ca8dfcc0c53529c8a20f9d;p=lyx.git

diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout
index d03ab4e2b3..3f90193b3c 100644
--- a/lib/layouts/entcs.layout
+++ b/lib/layouts/entcs.layout
@@ -3,57 +3,86 @@
 # 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
 	LatexType             Command
 	LatexName             settitle
 	InTitle               1
 	Preamble
-\newcommand{\settitle}[1]{\def\theTitle{#1}}
+		\newcommand{\settitle}[1]{\def\theTitle{#1}}
 	EndPreamble
+	HTMLTitle             true
 End
 
+
 Style Author
 	LatexType             Command
 	LatexName             setauthor
 	InTitle               1
 	Preamble
-\newcommand{\setauthor}[1]{\def\theAuthor{#1}}
+		\newcommand{\setauthor}[1]{\def\theAuthor{#1}}
 	EndPreamble
 End
 
+
 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
 
+
 Style FrontMatter
 	CopyStyle             LaTeX
 	LaTeXType             Command
 	LaTeXName             setfrontmatter
 	InTitle               1
 	Preamble
-\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
+		\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
 	EndPreamble
 End
 
-# Abstract style definition
-Style Abstract 
+
+Style Abstract
 	LatexType             Command
 	LatexName             setabstract
 	LabelType             Top_Environment
@@ -62,54 +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
 
-# Keyword style definition
+
 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
-	
-	# standard font definition
-	Font 
+	Font
 	  Size                Small
 	EndFont
-
-	# label font definition
-	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