- seminar.lyx: better descriptions, by Günter and me

- seminar.layout: fix section numbering within LyX

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

diff --git a/lib/examples/seminar.lyx b/lib/examples/seminar.lyx
index 305854ad930b6933db9ee4e6f139f15f0531a80e..3085ce98979fc80f5f049c6821f0d7a1a2398c1a 100644 (file)
--- a/lib/examples/seminar.lyx
+++ b/lib/examples/seminar.lyx
@@ -99,19 +99,13 @@ powerdot
 
 \begin_deeper
 \begin_layout SlideHeading
 
 \begin_deeper
 \begin_layout SlideHeading

-How to make a presentation with LyX
-\begin_inset Newline newline
-\end_inset
-
-and the seminar LaTeX class 
-\end_layout
-
-\begin_layout SlideSubHeading
-seminar.cls and seminar.layout
-\begin_inset Newline newline
-\end_inset
-
-template and introduction
+Slides and Notes with the 
+\family sans
+\noun on
+Seminar
+\family default
+\noun default
+ class

 \end_layout
 
 \end_deeper
 \end_layout
 
 \end_deeper


@@ -163,7 +157,7 @@ sem-user.dvi
 
 \begin_deeper
 \begin_layout SlideHeading
 
 \begin_deeper
 \begin_layout SlideHeading

-Putting some stuff in a slide 
+Putting some content in a slide 

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -200,7 +194,7 @@ How to nest things is explained in LyX's User's Guide chapter 3.4.
 \end_layout
 
 \begin_deeper
 \end_layout
 
 \begin_deeper

-\begin_layout SlideHeading
+\begin_layout SlideSubHeading

 What can be part of a slide?
 \end_layout
 
 What can be part of a slide?
 \end_layout
 


@@ -251,7 +245,7 @@ ProgressContents
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-All of them can be found in the Style pulldown.
+All of them can be found in the Style pull-down box.

 \end_layout
 
 \end_deeper
 \end_layout
 
 \end_deeper


@@ -273,20 +267,9 @@ What happens, when you want a List or a Heading first?
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Normally, LyX doesn't like empty paragraphs and it kills empty environments
+Normally, LyX does not like empty paragraphs and it kills empty environments

  before you are able to nest something in them (if you don't insert an empty
  before you are able to nest something in them (if you don't insert an empty

- command, like 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-, say).
+ command or a note).

  
 \family typewriter
 seminar
  
 \family typewriter
 seminar


@@ -307,26 +290,48 @@ PortraitSlide
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-The same holds for the 
+The 

 \family sans
 --Separator--
 \family default
 \family sans
 --Separator--
 \family default

- Environment, that is needed because LyX will normally merge two environments
- if they come immediately one after the other (i.e.
- two Paragraphs in the 
+ paragraph after a slide is needed because LyX will normally merge two environme
+nts if they come immediately one after the other (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e.
+\begin_inset space ~
+\end_inset
+
+two Paragraphs in the 

 \family sans
 LandscapeSlide
 \family default
 \family sans
 LandscapeSlide
 \family default

- environment will go to one slide, if there is nothing else in between.)
+ environment will go to one slide, if there is nothing else between.)

 \end_layout
 
 \end_deeper
 \end_layout
 
 \end_deeper

-\begin_layout LandscapeSlide
+\begin_layout --Separator--

 
 \end_layout
 
 
 \end_layout
 

-\begin_layout --Separator--
+\begin_layout Standard
+The seminar class puts everything that is not nested inside a 
+\family sans
+Slide
+\family default
+ environment on extra pages as 
+\emph on
+notes
+\emph default
+ (see slide 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sli:output-options"

 
 

+\end_inset
+
+ for output options).

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -334,7 +339,7 @@ There is no need for a
 \family sans
 --Separator--
 \family default
 \family sans
 --Separator--
 \family default

- paragraph, if some notes follow the slide (or if a 
+ paragraph, if notes follow the slide (or if a 

 \family sans
 Landscape Slide
 \family default
 \family sans
 Landscape Slide
 \family default


@@ -343,18 +348,6 @@ Landscape Slide
 Portrait Slide
 \family default
 .
 Portrait Slide
 \family default
 .

- The seminar class puts everything that is not nested inside a 
-\family sans
-Slide
-\family default
- environment on extra pages (see slide 
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sli:output-options"
-
-\end_inset
-
- for output options).

 \end_layout
 
 \begin_layout Section
 \end_layout
 
 \begin_layout Section


@@ -362,8 +355,16 @@ Outline
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Seminar defines additional content-listing commands, as the standard Table
- of Contents only lists standard headings and subheadings:
+Seminar defines additional content-listing commands, as the Table of Contents
+ only lists 
+\begin_inset Quotes eld
+\end_inset
+
+normal
+\begin_inset Quotes erd
+\end_inset
+
+ headings and subheadings:

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -375,36 +376,58 @@ LatexCommand tableofcontents
 
 \end_layout
 
 
 \end_layout
 

+\begin_layout Subsection
+Slide contents
+\end_layout
+

 \begin_layout Standard
 The 
 \family sans
 SlideContents
 \family default
 \begin_layout Standard
 The 
 \family sans
 SlideContents
 \family default

- paragraph style lists every page of the output (to produce a slide with
- the contents, nest it in a 
+ paragraph style is an analogue to the table of contents but lists only
+ 

 \family sans
 \family sans

-Slide
+SlideHeading

 \family default
 \family default

- paragraph):
+s.
+ It has problems with 
+\family sans
+SlideSubheading
+\family default
+s, though which fail to show up in the list (seems to be a bug in 
+\family typewriter
+slidesec.sty
+\family default
+):

 \end_layout
 
 \begin_layout SlideContents
 
 \end_layout
 
 \end_layout
 
 \begin_layout SlideContents
 
 \end_layout
 

+\begin_layout Subsection
+List of slides
+\end_layout
+

 \begin_layout Standard
 \begin_layout Standard

-If you want to have a listing of the slides only, use the 
+Analogue to a list of tables, the 

 \family sans
 ListOfSlides
 \family default
 \family sans
 ListOfSlides
 \family default

- paragraph style:
+ style lists all slides in your document (to produce a slide with the list,
+ nest it in a 
+\family sans
+...Slide
+\family default
+ paragraph):

 \end_layout
 
 \begin_layout ListOfSlides
 
 \end_layout
 
 \end_layout
 
 \begin_layout ListOfSlides
 
 \end_layout
 

-\begin_layout Section
+\begin_layout Subsection

 Progress Contents
 \end_layout
 
 Progress Contents
 \end_layout
 


@@ -437,7 +460,11 @@ ProgressContents
 
 \begin_deeper
 \begin_layout SlideHeading
 
 \begin_deeper
 \begin_layout SlideHeading

-output options 
+Configuration
+\end_layout
+
+\begin_layout SlideSubHeading
+Output options

 \begin_inset CommandInset label
 LatexCommand label
 name "sli:output-options"
 \begin_inset CommandInset label
 LatexCommand label
 name "sli:output-options"


@@ -466,7 +493,7 @@ Class
 \end_layout
 
 \begin_layout Description
 \end_layout
 
 \begin_layout Description

-slidesonly Only the slides are printed
+slidesonly Only the slides are printed.

 \end_layout
 
 \begin_layout Description
 \end_layout
 
 \begin_layout Description


@@ -474,7 +501,7 @@ notesonly Only the notes are printed
 \end_layout
 
 \begin_layout Description
 \end_layout
 
 \begin_layout Description

-notes Both notes and slides are printed
+notes Both notes and slides are printed.

 \end_layout
 
 \begin_layout Description
 \end_layout
 
 \begin_layout Description


@@ -482,18 +509,32 @@ notesonly* Produces a slide marker for each slide environment
 \end_layout
 
 \begin_layout Description
 \end_layout
 
 \begin_layout Description

-article Print as article (two-up)
+article Print as article (two-up).

 \end_layout
 
 \end_layout
 

-\begin_layout SlideHeading
-preamble commands 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
+\begin_layout SlideSubHeading
+Preamble commands 

 \end_layout
 
 \begin_layout Description
 
 \backslash
 \end_layout
 
 \begin_layout Description
 
 \backslash

-onlyslides{8,9,11} print only slides number 8, 9 and 11 (e.g.
- color plots),
+onlyslides{8,9,11} print only slides number 8, 9 and 11 (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space ~
+\end_inset
+
+color plots),

 \end_layout
 
 \begin_layout Description
 \end_layout
 
 \begin_layout Description


@@ -512,7 +553,7 @@ notslides{4,8,9,11} don't print these slides.
 \end_layout
 
 \begin_deeper
 \end_layout
 
 \begin_deeper

-\begin_layout SlideHeading
+\begin_layout SlideSubHeading

 Fancier formatting
 \end_layout
 
 Fancier formatting
 \end_layout
 


@@ -652,7 +693,11 @@ Class
 
 \begin_layout Itemize
 If you have problems with the orientation of the slides/page, try the recommenda
 
 \begin_layout Itemize
 If you have problems with the orientation of the slides/page, try the recommenda

-tions in Apppendix E of the seminar handbook.
+tions in Apppendix
+\begin_inset space ~
+\end_inset
+
+E of the seminar handbook.

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize

diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index ea2f66926f2d4ffd6512c704c2299e2eb1dc17d7..45303a202a8541671048bd41eb83b39339cb771e 100644 (file)
--- a/lib/layouts/seminar.layout
+++ b/lib/layouts/seminar.layout
@@ -55,14 +55,14 @@ End
 
 # Note: \slideheading is only defined when the option slidesec is present
 Style SlideHeading
 
 # Note: \slideheading is only defined when the option slidesec is present
 Style SlideHeading

-       CopyStyle               Section
+       CopyStyle               Section*

        LatexName               slideheading
        Align                   Center
 End
 
 # Note: \slidesubheading is only defined when the option slidesec is present
 Style SlideSubHeading
        LatexName               slideheading
        Align                   Center
 End
 
 # Note: \slidesubheading is only defined when the option slidesec is present
 Style SlideSubHeading

-       CopyStyle               Subsection
+       CopyStyle               Subsection*

        LatexName               slidesubheading
        Align                   Center
 End
        LatexName               slidesubheading
        Align                   Center
 End