Replace <programlist> with <screen>, as it is more general.

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

diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout
index 54b7038acca3d0a541ebf2fb790782caa8585587..3a5e7b9e26c08abaff534d1ccd86445595a88963 100644 (file)
--- a/lib/layouts/slides.layout
+++ b/lib/layouts/slides.layout
@@ -6,11 +6,11 @@
 # Based on the Article textclass "article.layout"
 #
 
-# General textclass parameters
+
 Columns        1
 Sides          1
 PageStyle      Plain
-MaxCounter     Counter_EnumI
+
 
 DefaultFont
        Family       Sans
@@ -28,13 +28,6 @@ ClassOptions
 End
 
 
-#####################################
-#
-#  Layout-specific preamble
-#
-#####################################
-
-
 Preamble
        \newcounter{slidetype}
        \setcounter{slidetype}{0}
@@ -75,12 +68,20 @@ Style Standard
 End
 
 
+#  Note that the "Section" family of environments is missing, as is
+#  "Title" "Bibliograpy" "LaTeX-Title" "Author" "Abstract" and "Date".
+#  I may choose to reintroduce these and/or remove others at a later
+#  date.
+#  -jw 10/2/96
 
-##############################
-#
-# New Definitions for Slides
-#
-##############################
+Input stdlists.inc
+Input stdlayouts.inc
+Input lyxmacros.inc
+Input stdcounters.inc
+Input stdfloats.inc
+
+NoStyle Address
+NoStyle Right_Address
 
 
 Style Slide
@@ -99,25 +100,23 @@ Style Slide
        LabelBottomSep    0.5
        LeftMargin        MMMMxMMMMxxxNewSlide
        LabelString       "_____________________________NewSlide: "
-
-       Font 
+       Font
          Family          Typewriter
          Series          Bold
          Size            Large
          Color           Blue
        EndFont
-       LabelFont 
+       LabelFont
          Family          Typewriter
          Size            Large
          Color           Blue
        EndFont
-
        Preamble
-       \newcommand{\lyxnewslide}[1]{
-          \lyxendslide{.}
-          \setcounter{slidetype}{1}
-          \begin{slide}
-       }
+               \newcommand{\lyxnewslide}[1]{
+                        \lyxendslide{.}
+                        \setcounter{slidetype}{1}
+                        \begin{slide}
+               }
        EndPreamble
 End
 
@@ -138,28 +137,26 @@ Style Overlay
        LabelBottomSep    0.5
        LeftMargin        MMMMxNewOverlay
        LabelString       "- - - - - - - - - - NewOverlay: "
-
-       Font 
+       Font
          Family          Typewriter
          Series          Bold
          Size            Large
          Shape                       SmallCaps
          Color           Magenta
        EndFont
-       LabelFont 
+       LabelFont
          Family          Typewriter
          Series          Bold
          Size            Large
          Shape                       SmallCaps
          Color           Magenta
        EndFont
-
        Preamble
-       \newcommand{\lyxnewoverlay}[1]{
-          \lyxendslide{.}
-          \setcounter{slidetype}{2}
-          \begin{overlay}
-       }
+               \newcommand{\lyxnewoverlay}[1]{
+                        \lyxendslide{.}
+                        \setcounter{slidetype}{2}
+                        \begin{overlay}
+               }
        EndPreamble
 End
 
@@ -180,28 +177,26 @@ Style Note
        LabelBottomSep    0.5
        LeftMargin        MMMMxMMxxNewNote
        LabelString       "........................NewNote: "
-
-       Font 
+       Font
          Family          Typewriter
          Series          Bold
          Size            Large
          Shape                       Italic
          Color           Magenta
        EndFont
-       LabelFont 
+       LabelFont
          Family          Typewriter
          Series          Bold
          Size            Large
          Shape                       Italic
          Color           Magenta
        EndFont
-
        Preamble
-       \newcommand{\lyxnewnote}[1]{
-          \lyxendslide{.}
-          \setcounter{slidetype}{3}
-          \begin{note}
-       }
+               \newcommand{\lyxnewnote}[1]{
+                        \lyxendslide{.}
+                        \setcounter{slidetype}{3}
+                        \begin{note}
+               }
        EndPreamble
 End
 
@@ -215,22 +210,18 @@ Style InvisibleText
        AlignPossible     Center
        LabelType         Static
        LabelString       "<Invisible Text Follows>"
-
-       Font 
+       Font
          Family          Roman
          Size            Normal
          Color           Cyan
        EndFont
-       LabelFont 
+       LabelFont
          Family          Roman
          Size            Normal
          Color           Cyan
        EndFont
-
        Preamble
-       \newcommand{\lyxinvisible}[1]{
-          \invisible
-       }
+               \newcommand{\lyxinvisible}[1]{\invisible}
        EndPreamble
 End
 
@@ -244,58 +235,17 @@ Style VisibleText
        AlignPossible     Center
        LabelType         Static
        LabelString       "<Visible Text Follows>"
-
-       Font 
+       Font
          Family          Roman
          Size            Normal
          Color           Green
        EndFont
-       LabelFont 
+       LabelFont
          Family          Roman
          Size            Normal
          Color           Green
        EndFont
-
        Preamble
-       \newcommand{\lyxvisible}[1]{
-          \visible
-       }
+               \newcommand{\lyxvisible}[1]{\visible}
        EndPreamble
 End
-
-########################################################################
-#
-# Definitions taken from article.layout.
-#
-#  Note that the "Section" family of environments is missing, as is
-#  "Title" "Bibliograpy" "LaTeX-Title" "Author" "Abstract" and "Date".
-#
-#  I may choose to reintroduce these and/or remove others at a later
-#  date.
-# 
-#  -jw 10/2/96
-#
-########################################################################
-
-Input stdlists.inc
-Input stdlayouts.inc
-Input lyxmacros.inc
-Input stdcounters.inc
-Input stdfloats.inc
-
-#Input obsolete.inc
-
-# Style definition for end of a slide
-Style End_All_Slides
-       ObsoletedBy       Comment
-End
-
-NoStyle Address
-NoStyle Right_Address
-
-
-
-
-#############
-#
-# End  File