layout files changes

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9bbf93b0608f9e696761c532429b54761aee687c..3912e362e114f76e14f889835cb9bf9a3761b3a2 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,4 +1,12 @@
+2001-09-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * layouts/entcs.layout: renamed from encts.layout (stupid typo!);
+       restrict font size to `11pt'
+
+       * layouts/cv.layout: rename SubSection layout to Subsection
+
 2001-09-03  Yves Bastide  <stid@libd-pc11.univ-bpclermont.fr>
+
        * reLyX/reLyX.in: fix initialization before BEGIN block.
 
 2001-09-02  Dekel Tsur  <dekelts@tau.ac.il>

diff --git a/lib/layouts/cv.layout b/lib/layouts/cv.layout
index f4e8506862c38df8e50b01c3e1ea52f44977fe9b..ab74d1b2896ce9a2c1bd61d01ee0acd3a7e009eb 100644 (file)
--- a/lib/layouts/cv.layout
+++ b/lib/layouts/cv.layout
@@ -46,7 +46,7 @@ Style Section
 End
 
 # Section style definition
-Style SubSection
+Style Subsection
   CopyStyle            Section
   LatexName             subsection
   Margin               Static

diff --git a/lib/layouts/encts.layout b/lib/layouts/encts.layout
deleted file mode 100644 (file)
index b84ff6e..0000000
--- a/lib/layouts/encts.layout
+++ /dev/null
@@ -1,110 +0,0 @@
-#% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{article (ENTCS)}
-# Based on LyX article class; modified to support ENTCS class
-# R.R.T.   27/5-2/6/01
-
-Input article.layout
-
-Style Title
-  LatexType             Command
-  LatexName             settitle
-  InTitle               1
-  Preamble
-\newcommand{\settitle}[1]{\def\theTitle{#1}}
-  EndPreamble
-End
-
-Style Author
-  LatexType             Command
-  LatexName             setauthor
-  InTitle               1
-  Preamble
-\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}}
-  EndPreamble
-  Font 
-    Shape              Italic
-  EndFont
-End
-
-Style FrontMatter
-  CopyStyle             LaTeX
-  LaTeXType             Command
-  LaTeXName             setfrontmatter
-  InTitle               1
-  Preamble
-\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
-  EndPreamble
-End
-
-# Abstract style definition
-Style Abstract 
-  LatexType             Command
-  LatexName            setabstract
-  LabelType            Top_Environment
-  ParIndent             ""
-  LeftMargin           ""
-  RightMargin          ""
-  InTitle               1
-  Preamble
-\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}}
-  EndPreamble
-  LabelType             Static
-  LabelString           "Key words:"
-  LabelSep              xx
-  
-  # standard font definition
-  Font 
-    Size               Small
-  EndFont
-
-  # label font definition
-  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

diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout
new file mode 100644 (file)
index 0000000..bc3271a
--- /dev/null
+++ b/lib/layouts/entcs.layout
@@ -0,0 +1,115 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass{article (ENTCS)}
+# Based on LyX article class; modified to support ENTCS class
+# Reuben Thomas (rrt@sc3d.org)   27/5-2/6/01
+
+Input article.layout
+
+# only font size 11pt is really available
+ClassOptions
+  FontSize   11
+End  
+
+Style Title
+  LatexType             Command
+  LatexName             settitle
+  InTitle               1
+  Preamble
+\newcommand{\settitle}[1]{\def\theTitle{#1}}
+  EndPreamble
+End
+
+Style Author
+  LatexType             Command
+  LatexName             setauthor
+  InTitle               1
+  Preamble
+\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}}
+  EndPreamble
+  Font 
+    Shape              Italic
+  EndFont
+End
+
+Style FrontMatter
+  CopyStyle             LaTeX
+  LaTeXType             Command
+  LaTeXName             setfrontmatter
+  InTitle               1
+  Preamble
+\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
+  EndPreamble
+End
+
+# Abstract style definition
+Style Abstract 
+  LatexType             Command
+  LatexName            setabstract
+  LabelType            Top_Environment
+  ParIndent             ""
+  LeftMargin           ""
+  RightMargin          ""
+  InTitle               1
+  Preamble
+\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}}
+  EndPreamble
+  LabelType             Static
+  LabelString           "Key words:"
+  LabelSep              xx
+  
+  # standard font definition
+  Font 
+    Size               Small
+  EndFont
+
+  # label font definition
+  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