On Mon, 14 May 2007 18:49:00 +0100 José Matos <[EMAIL PROTECTED]> wrote:
> On Monday 14 May 2007 16:24:23 Martin Vermeer wrote: > > > Attached; thanks Juergen. > > > > > > What about Jean-Pierre's reordering patch (bug 3141)? I tried the newest > > > but it doesn't apply cleanly anymore. > > As soon as it applies cleanly it can go in. :-) > > > > - Martin Attached Jean-Pierre's reordering patch, manually applied. I used the opportunity to do a whitespace clean-up. Also I slightly improved the user interface of the block environments, which may baffle newcomers (it still doesn't replace reading the manual though :-( ) If nobody sees anything untoward, it goes in soonish. - Martin
Index: beamer.layout =================================================================== --- beamer.layout (revision 18324) +++ beamer.layout (working copy) @@ -8,121 +8,271 @@ Format 4 Input stdcounters.inc +# local counters + +Counter + Name section +End + +Counter + Name subsection + Within section +End + +Counter + Name bibitem +End + +Counter + Name figure + Name lyxframeend{}\section +End + +Counter + Name table +End + +Counter + Name enumi +End + +Counter + Name enumii + Within enumi +End + + # General textclass parameters -Columns 1 -Sides 1 -SecNumDepth 2 -TocDepth 2 -DefaultStyle Standard +Columns 1 +Sides 1 +SecNumDepth 2 +TocDepth 2 +DefaultStyle Standard # This is just to show how to declare the default font. # The defaults are exactly those shown here. DefaultFont - Family Sans - Series Medium - Shape Up - Size Normal - Color None + Family Sans + Series Medium + Shape Up + Size Normal + Color None EndFont + # Standard style definition Style Standard - Margin Static - LatexType Paragraph - LatexName dummy - ParIndent MM - ParSkip 0.4 - Align Left - AlignPossible Block, Left, Right, Center - LabelType No_Label + Margin Static + LatexType Paragraph + LatexName dummy + ParIndent MM + ParSkip 0.4 + Align Left + AlignPossible Block, Left, Right, Center + LabelType No_Label End +# List section # Itemize style definition Style Itemize - Margin Static - LatexType Item_Environment - LatexName itemize - NextNoIndent 1 - LeftMargin MMN - LabelSep xx - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Left - AlignPossible Left - LabelType Itemize - LabelString "*" + Margin Static + LatexType Item_Environment + LatexName itemize + NextNoIndent 1 + LeftMargin MMN + LabelSep xx + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Left + AlignPossible Left + LabelType Itemize + LabelString "*" End # Enumerate style definition Style Enumerate - Margin Static - LatexType Item_Environment - LatexName enumerate - NextNoIndent 1 - LeftMargin MMN - LabelSep xx - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Left - AlignPossible Left - LabelType Enumerate + Margin Static + LatexType Item_Environment + LatexName enumerate + NextNoIndent 1 + LeftMargin MMN + LabelSep xx + ParSkip 0.0 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Left + AlignPossible Left + LabelType Enumerate End # Description style definition Style Description - Margin First_Dynamic - LatexType Item_environment - LatexName description - NextNoIndent 1 - LeftMargin MM - LabelSep xxx - ParSkip 0.4 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Left - AlignPossible Left - LabelType Manual - LabelString "MM" + Margin First_Dynamic + LatexType Item_environment + LatexName description + NextNoIndent 1 + LeftMargin MM + LabelSep xxx + ParSkip 0.4 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Left + AlignPossible Left + LabelType Manual + LabelString "MM" # label font definition LabelFont - Series Bold + Series Bold EndFont End +# Sectioning section +# Part style definition +Style Part + Margin Dynamic + LatexType Command + LatexName part + NeedProtect 1 + NextNoIndent 1 + Labelsep xxx + ParSkip 0.4 + TopSep 4 + BottomSep 4 + ParSep 0.8 + Align Center + Alignpossible Center + LabelType Static + LabelString "Part " + + # standard font definition + Font + Family Roman + Series Bold + Size Huge + EndFont + + LabelFont + Color Latex + EndFont +End + +# Section style definition +Style Section + Margin First_Dynamic + LatexType Command + LatexName lyxframeend{}\section + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 2 + BottomSep 0.25 + ParSep 0.7 + Align Left + AlignPossible Left + LabelType Counter + LabelCounter section + LabelString "Section \arabic{section}" + OptionalArgs 1 + + Font + Family Roman + Series Bold + Size huge + EndFont + + LabelFont + Color latex + EndFont + LabelStringAppendix "\Alph{section}" + TocLevel 1 +End + +# Section* style definition +Style Section* + CopyStyle Section + Margin Static + LatexName lyxframeend{}\section* + LabelType No_Label + OptionalArgs 0 +End + +# Subsection style definition +Style Subsection + Margin First_Dynamic + LatexType Command + LatexName lyxframeend{}\subsection + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 2 + BottomSep 0.25 + ParSep 0.5 + Align Left + AlignPossible Left + LabelType Counter + LabelCounter subsection + LabelString "Subsection \arabic{section}.\arabic{subsection}" + OptionalArgs 1 + + # standard font definition + Font + Family Roman + Series Bold + Size larger + EndFont + + LabelFont + Color latex + EndFont + LabelStringAppendix "\arabic{section}.\arabic{subsection}" + TocLevel 2 +End + +# Subsection* style definition +Style Subsection* + CopyStyle Subsection + Margin Static + LatexName lyxframeend{}\subsection* + LabelType No_Label + OptionalArgs 0 +End + +# Frame control definition Style BeginFrame - KeepEmpty 1 - LatexType Command - LatexName lyxframeend{}\lyxframe - Margin First_Dynamic - NextNoIndent 1 - ParSkip 0 - TopSep 2.5 - BottomSep 0.5 - ParSep 0 - Align Center - AlignPossible Center - LabelType Static - LabelBottomSep 0 - LeftMargin M - LabelString "Frame " + KeepEmpty 1 + LatexType Command + LatexName lyxframeend{}\lyxframe + Margin First_Dynamic + NextNoIndent 1 + ParSkip 0 + TopSep 2.5 + BottomSep 0.5 + ParSep 0 + Align Center + AlignPossible Center + LabelType Static + LabelBottomSep 0 + LeftMargin M + LabelString "Frame " Font - Series Bold - Size Largest - Color Blue + Series Bold + Size Largest + Color Blue EndFont LabelFont - Family Roman - Color latex + Family Roman + Color latex EndFont Preamble @@ -139,9 +289,9 @@ End Style BeginPlainFrame - KeepEmpty 1 - LatexType Command - LatexName lyxframeend{}\lyxplainframe + KeepEmpty 1 + LatexType Command + LatexName lyxframeend{}\lyxplainframe Margin First_Dynamic NextNoIndent 1 ParSkip 0 @@ -153,7 +303,7 @@ LabelType Static LabelBottomSep 0 LeftMargin M - LabelString "Frame (no head/foot/sidebars) " + LabelString "Frame (no head/foot/sidebars)__" Font Series Bold @@ -176,50 +326,60 @@ EndPreamble End -Style EndFrame - KeepEmpty 1 - LatexType Command - LatexName lyxframeend +Style AgainFrame + KeepEmpty 0 + LatexType Command + LatexName lyxframeend{}\lyxagainframe Margin First_Dynamic + NextNoIndent 1 ParSkip 0 - TopSep 0 + TopSep 3 BottomSep 3 ParSep 0 Align Center AlignPossible Center LabelType Static LabelBottomSep 0 - LeftMargin MMMMM - LabelString "________________________________" + LeftMargin M + LabelString "Again frame with label__" + Font + Color latex + EndFont + LabelFont - Family typewriter - Series Medium - Size Normal + Family Roman Color latex + Series Bold + Size Largest EndFont Preamble - \def\lyxframeend{} % In case there is a superfluous frame end + \makeatletter + [EMAIL PROTECTED]@lyxframestop}% + [EMAIL PROTECTED]@ifnextchar<{\@@lyxagainframe}{\@@lyxagainframe<*>}}% + \def\@@lyxagainframe<#1>[EMAIL PROTECTED]@@@lyxagainframe<#1>}{\@@@lyxagainframe<#1>[]}} + \long\def\@@@lyxagainframe<#1>[EMAIL PROTECTED] + \againframe<#1>[#2]{#3}} + \makeatother EndPreamble End -Style Pause - KeepEmpty 1 - LatexType Command - LatexName pause +Style EndFrame + KeepEmpty 1 + LatexType Command + LatexName lyxframeend Margin First_Dynamic - NextNoIndent 1 ParSkip 0 TopSep 0 - BottomSep 0.25 + BottomSep 3 ParSep 0 Align Center AlignPossible Center LabelType Static LabelBottomSep 0 LeftMargin MMMMM - LabelString "_ _ _ _ _ _ _ _ _ _ _ _ _ _" + LabelString "________________________________" LabelFont Family typewriter @@ -227,884 +387,734 @@ Size Normal Color latex EndFont -End -Counter - Name section + Preamble + \def\lyxframeend{} % In case there is a superfluous frame end + EndPreamble End -Counter - Name subsection - Within section -End +# Frame decoration section +Style FrameSubtitle + Margin Static + LatexType Command + LatexName framesubtitle + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Center + AlignPossible Center + LabelType No_Label + OptionalArgs 1 -Counter - Name bibitem -End + # standard font definition + Font + Series Bold + Color Blue + EndFont -Counter - Name figure - Name lyxframeend{}\section End -Counter - Name table -End -Counter - Name enumi -End +Style Column + Margin Static + LatexType Command + LatexName column + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + Align Left + LabelType Static + LabelSep xx + LabelString "start column of width: " + OptionalArgs 1 + LeftMargin MMMMMMMMM -Counter - Name enumii - Within enumi + # standard font definition + LabelFont + Family Roman + Color latex + EndFont End -# Section style definition -Style Section - Margin First_Dynamic - LatexType Command - LatexName lyxframeend{}\section - NeedProtect 1 - NextNoIndent 1 - LabelSep xxx - ParSkip 0.4 - TopSep 2 - BottomSep 0.25 - ParSep 0.7 - Align Left - AlignPossible Left - LabelType Counter - LabelCounter section - LabelString "Section \arabic{section}" - OptionalArgs 1 +Style Columns - Font - Family Roman - Series Bold - Size huge - EndFont + KeepEmpty 1 + Margin Static + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx + LatexName columns}%{ + LabelString "columns" + LeftMargin columns + + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + + + # font & label font definition + LabelFont - Color latex + Family Roman + Color latex EndFont - LabelStringAppendix "\Alph{section}" - TocLevel 1 End -# Section* style definition -Style Section* - CopyStyle Section - Margin Static - LatexName lyxframeend{}\section* - LabelType No_Label - OptionalArgs 0 -End +Style ColumnsCenterAligned + KeepEmpty 1 + Margin Static + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align left + LabelType Static + LabelSep xx -# Subsection style definition -Style Subsection - Margin First_Dynamic - LatexType Command - LatexName lyxframeend{}\subsection - NeedProtect 1 - NextNoIndent 1 - LabelSep xxx - ParSkip 0.4 - TopSep 2 - BottomSep 0.25 - ParSep 0.5 - Align Left - AlignPossible Left - LabelType Counter - LabelCounter subsection - LabelString "Subsection \arabic{section}.\arabic{subsection}" - OptionalArgs 1 + LatexName centercolumns}%{ + LabelString "columns (center aligned)" + LeftMargin "columns (center aligned)" - # standard font definition - Font - Family Roman - Series Bold - Size larger - EndFont + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + Preamble + \newenvironment{centercolumns}{\begin{columns}[c]}{\end{columns}} + EndPreamble + # font & label font definition + LabelFont - Color latex + Family Roman + Color latex EndFont - LabelStringAppendix "\arabic{section}.\arabic{subsection}" - TocLevel 2 End -# Subsection* style definition -Style Subsection* - CopyStyle Subsection - Margin Static - LatexName lyxframeend{}\subsection* - LabelType No_Label - OptionalArgs 0 +Style ColumnsTopAligned + KeepEmpty 1 + Margin Static + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align left + LabelType Static + LabelSep xx + + LatexName topcolumns}%{ + LabelString "columns (top aligned)" + LeftMargin "columns (top aligned)" + + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + + Preamble + \newenvironment{topcolumns}{\begin{columns}[t]}{\end{columns}} + EndPreamble + # font & label font definition + + LabelFont + Family Roman + Color latex + EndFont End -Style AgainFrame - KeepEmpty 0 - LatexType Command - LatexName lyxframeend{}\lyxagainframe +# Frame progression section +Style Pause + KeepEmpty 1 + LatexType Command + LatexName pause Margin First_Dynamic NextNoIndent 1 ParSkip 0 - TopSep 3 - BottomSep 3 + TopSep 0 + BottomSep 0.25 ParSep 0 Align Center AlignPossible Center LabelType Static LabelBottomSep 0 - LeftMargin M - LabelString "Again frame with label " + LeftMargin MMMMM + LabelString "_ _ _ _ _ _ _ _ _ _ _ _ _ _" - Font - Color latex - EndFont - LabelFont - Family Roman + Family typewriter + Series Medium + Size Normal Color latex - Series Bold - Size Largest EndFont - - Preamble - \makeatletter - [EMAIL PROTECTED]@lyxframestop}% - [EMAIL PROTECTED]@ifnextchar<{\@@lyxagainframe}{\@@lyxagainframe<*>}}% - \def\@@lyxagainframe<#1>[EMAIL PROTECTED]@@@lyxagainframe<#1>}{\@@@lyxagainframe<#1>[]}} - \long\def\@@@lyxagainframe<#1>[EMAIL PROTECTED] - \againframe<#1>[#2]{#3}} - \makeatother - EndPreamble End -Style AlertBlock - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx +Style Overprint + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx - LatexName alertblock - LabelString "block with alerted text" + LatexName overprint + LabelString "overprint" - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + KeepEmpty 1 # font & label font definition - Font - Color red - EndFont - LabelFont - Family Roman - Color latex + Family Roman + Color latex EndFont End -# Author style definition -Style Author - Margin Static - LatexType Command - InTitle 1 - LatexName author - LabelSep xxx - ParSkip 0.4 - TopSep 1.3 - BottomSep 0.7 - ParSep 0.7 - Align Center - AlignPossible Center - LabelType No_Label - OptionalArgs 1 +Style OverlayArea + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx - # standard font definition - Font - Size Largest - Color Blue - EndFont + LatexName overlayarea + LabelString "overlayarea" -End + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 -# Bibliography style definition -Style Bibliography - Margin First_Dynamic - LatexType Bib_Environment - LatexName thebibliography - NextNoIndent 1 - LeftMargin MM - ParSkip 0.4 - ItemSep 0 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.5 - Align Left - AlignPossible Left - LabelType Bibliography - LabelString "References" - LabelBottomSep 0.7 + # font & label font definition - # label font definition LabelFont - Series Bold - Size Larger + Family Roman + Color latex EndFont End -Style Block - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx +Style Uncover + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static - LatexName block - LabelString "block" + LatexName uncoverenv}%{ + LabelString "uncovered on slides " - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 # font & label font definition LabelFont - Family Roman - Color latex + Family Roman + Color Latex EndFont End -Style Corollary - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx +Style Only + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static - LatexName corollary}%{ - LabelString "Corollary. " + LatexName onlyenv}%{ + LabelString "only on slides_" - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - KeepEmpty 1 + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 # font & label font definition - LabelFont - Series Bold - Color Blue - Size Large + LabelFont + Family Roman + Color Latex EndFont End -Style Column - Margin Static - LatexType Command - LatexName column - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - Align Left - LabelType Static - LabelSep xx - LabelString "start column of width: " - OptionalArgs 1 - LeftMargin MMMMMMMMM +# Blocks section +Style Block + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx - # standard font definition - LabelFont - Family Roman - Color latex - EndFont -End + LatexName block + LabelString "block ( ERT[{title}] body ): " + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 -Style Columns - - KeepEmpty 1 - Margin Static - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx - - LatexName columns}%{ - LabelString "columns" - LeftMargin columns - - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - - # font & label font definition - LabelFont - Family Roman - Color latex + LabelFont + Family Roman + Color latex EndFont End -Style ColumnsCenterAligned - KeepEmpty 1 - Margin Static - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align left - LabelType Static - LabelSep xx +Style ExampleBlock + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx - LatexName centercolumns}%{ - LabelString "columns (center aligned)" - LeftMargin "columns (center aligned)" + LatexName exampleblock + LabelString "block ( ERT[{title}] example text ): " - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 - Preamble - \newenvironment{centercolumns}{\begin{columns}[c]}{\end{columns}} - EndPreamble # font & label font definition + Font + Color green + EndFont + LabelFont - Family Roman - Color latex + Family Roman + Color latex EndFont End -Style ColumnsTopAligned - KeepEmpty 1 - Margin Static - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align left - LabelType Static - LabelSep xx +Style AlertBlock + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx - LatexName topcolumns}%{ - LabelString "columns (top aligned)" - LeftMargin "columns (top aligned)" + LatexName alertblock + LabelString "block ( ERT[{title}] alert text ): " - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 - Preamble - \newenvironment{topcolumns}{\begin{columns}[t]}{\end{columns}} - EndPreamble # font & label font definition + Font + Color red + EndFont + LabelFont - Family Roman - Color latex + Family Roman + Color latex EndFont End +# Title slide data section +# Title style definition +Style Title + Margin Static + LatexType Command + InTitle 1 + LatexName title + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Center + AlignPossible Center + LabelType No_Label + OptionalArgs 1 -# Date style definition -Style Date - Margin Dynamic - LatexType Command - InTitle 1 - LatexName date - LabelSep xxx - ParSkip 0.4 - TopSep 0.9 - BottomSep 0.5 - ParSep 1 - Align Center - AlignPossible Center - LabelType No_Label - OptionalArgs 1 - # standard font definition Font - Size Largest - Color Blue + Size Huge + Series Bold + Color Blue EndFont -End -Style Definition - CopyStyle Corollary - LatexName definition}%{ - LabelString "Definition. " End -Style Definitions - CopyStyle Corollary - LatexName definitions}%{ - LabelString "Definitions. " -End +Style Subtitle + Margin Static + LatexType Command + InTitle 1 + LatexName subtitle + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Center + AlignPossible Center + LabelType No_Label + OptionalArgs 1 -Style Example - CopyStyle Corollary - LatexName example}%{ - LabelString "Example. " - - LabelFont - Series Bold - Color Green + # standard font definition + Font + Size Large + Series Bold + Color Blue EndFont -End -Style Examples - CopyStyle Corollary - LatexName examples}%{ - LabelString "Examples. " End -Style ExampleBlock - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx +# Author style definition +Style Author + Margin Static + LatexType Command + InTitle 1 + LatexName author + LabelSep xxx + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Center + AlignPossible Center + LabelType No_Label + OptionalArgs 1 - LatexName exampleblock - LabelString "block showing an example" - - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - - # font & label font definition - - Font - Color green - EndFont - - LabelFont - Family Roman - Color latex - EndFont -End - -Style Fact - CopyStyle Corollary - LatexName fact}%{ - LabelString "Fact. " -End - -Style FrameSubtitle - Margin Static - LatexType Command - LatexName framesubtitle - ParSkip 0.4 - ItemSep 0 - TopSep 0 - BottomSep 1 - ParSep 1 - Align Center - AlignPossible Center - LabelType No_Label - OptionalArgs 1 - # standard font definition Font - Series Bold - Color Blue + Size Largest + Color Blue EndFont End -# Date style definition Style Institute - Margin Dynamic - LatexType Command - InTitle 1 - LatexName institute - LabelSep xxx - ParSkip 0.4 - TopSep 0.9 - BottomSep 0.5 - ParSep 1 - Align Center - AlignPossible Center - LabelType No_Label - OptionalArgs 1 + Margin Dynamic + LatexType Command + InTitle 1 + LatexName institute + LabelSep xxx + ParSkip 0.4 + TopSep 0.9 + BottomSep 0.5 + ParSep 1 + Align Center + AlignPossible Center + LabelType No_Label + OptionalArgs 1 # standard font definition Font - Size Large - Color Blue + Size Large + Color Blue EndFont End -Style LyX-Code - Margin Static - LatexType Environment - LatexName lyxcode - NextNoIndent 1 - LeftMargin MMM - RightMargin MMM - TopSep 0.5 - BottomSep 0.5 - Align Left - AlignPossible Block, Left, Right, Center - LabelType No_Label - FreeSpacing 1 +# Date style definition +Style Date + Margin Dynamic + LatexType Command + InTitle 1 + LatexName date + LabelSep xxx + ParSkip 0.4 + TopSep 0.9 + BottomSep 0.5 + ParSep 1 + Align Center + AlignPossible Center + LabelType No_Label + OptionalArgs 1 - # define the environment lyxcode - Preamble - \newenvironment{lyxcode} - {\begin{list}{}{ - \setlength{\rightmargin}{\leftmargin} - \setlength{\listparindent}{0pt}% needed for AMS classes - \raggedright - \setlength{\itemsep}{0pt} - \setlength{\parsep}{0pt} - \normalfont\ttfamily}% - \def\{{\char`\{} - \def\}{\char`\}} - \def\textasciitilde{\char`\~} - \item[]} - {\end{list}} - EndPreamble - # standard font definition Font - Family Typewriter + Size Largest + Color Blue EndFont End -Style NoteItem - Margin Static - LatexType Command - LatexName note[item] - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - Align Left - LabelType Static - LabelSep xx - LabelString "note: " - OptionalArgs 1 - LeftMargin MMM +# Titles & bibliography section +# Bibliography style definition +Style Bibliography + Margin First_Dynamic + LatexType Bib_Environment + LatexName thebibliography + NextNoIndent 1 + LeftMargin MM + ParSkip 0.4 + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.5 + Align Left + AlignPossible Left + LabelType Bibliography + LabelString "References" + LabelBottomSep 0.7 - # standard font definition + # label font definition LabelFont - Family Roman - Color latex + Series Bold + Size Larger EndFont End +Style TitleGraphic + Margin Static + LatexType Command + InTitle 1 + LatexName titlegraphic + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Center + AlignPossible Center + LabelType No_Label -Style Only - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static + # standard font definition + Font + Size Huge + Series Bold + Color Blue + EndFont - LatexName onlyenv}%{ - LabelString "only on slides " +End - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - # font & label font definition +# Theorems and such section +Style Corollary + Margin First_Dynamic + LatexType Environment + NextNoIndent 0 + ParIndent MM + Align Left + LabelType Static + LabelSep xx - LabelFont - Family Roman - Color Latex - EndFont + LatexName corollary}%{ + LabelString "Corollary_" + + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + KeepEmpty 1 + + # font & label font definition + + LabelFont + Series Bold + Color Blue + Size Large + EndFont End -Style Overprint - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx +Style Definition + CopyStyle Corollary + LatexName definition}%{ + LabelString "Definition. " +End - LatexName overprint - LabelString "overprint" +Style Definitions + CopyStyle Corollary + LatexName definitions}%{ + LabelString "Definitions. " +End - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - KeepEmpty 1 +Style Example + CopyStyle Corollary + LatexName example}%{ + LabelString "Example. " - # font & label font definition - - LabelFont - Family Roman - Color latex + LabelFont + Series Bold + Color Green EndFont End -Style OverlayArea - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - LabelSep xx +Style Examples + CopyStyle Corollary + LatexName examples}%{ + LabelString "Examples. " +End - LatexName overlayarea - LabelString "overlayarea" - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - - # font & label font definition - - LabelFont - Family Roman - Color latex - EndFont +Style Fact + CopyStyle Corollary + LatexName fact}%{ + LabelString "Fact. " End -# Part style definition -Style Part - Margin Dynamic - LatexType Command - LatexName part - NeedProtect 1 - NextNoIndent 1 - Labelsep xxx - ParSkip 0.4 - TopSep 4 - BottomSep 4 - ParSep 0.8 - Align Center - Alignpossible Center - LabelType Static - LabelString "Part " - - # standard font definition - Font - Family Roman - Series Bold - Size Huge - EndFont - - LabelFont - Color Latex - EndFont -End - Style Proof - CopyStyle Corollary - LatexName proof}%{ - LabelString "Proof. " + CopyStyle Corollary + LatexName proof}%{ + LabelString "Proof. " End +Style Theorem + CopyStyle Corollary + LatexName theorem}%{ + LabelString "Theorem. " +End + +# Misc. section # Separator style definition Style Separator - LatexType Paragraph - LatexName dummy - ParIndent MM - ParSkip 0.4 - Align Left - AlignPossible Block, Left, Right, Center - Margin First_Dynamic - TopSep 0 - BottomSep 0 - ParSep 0 - LabelType Static - LabelBottomSep 0 - LabelString "___" - KeepEmpty 1 + LatexType Paragraph + LatexName dummy + ParIndent MM + ParSkip 0.4 + Align Left + AlignPossible Block, Left, Right, Center + Margin First_Dynamic + TopSep 0 + BottomSep 0 + ParSep 0 + LabelType Static + LabelBottomSep 0 + LabelString "___" + KeepEmpty 1 LabelFont - Series Medium - Size Normal - Color latex + Series Medium + Size Normal + Color latex EndFont End + +Style LyX-Code + Margin Static + LatexType Environment + LatexName lyxcode + NextNoIndent 1 + LeftMargin MMM + RightMargin MMM + TopSep 0.5 + BottomSep 0.5 + Align Left + AlignPossible Block, Left, Right, Center + LabelType No_Label + FreeSpacing 1 -# Title style definition -Style Title - Margin Static - LatexType Command - InTitle 1 - LatexName title - ParSkip 0.4 - ItemSep 0 - TopSep 0 - BottomSep 1 - ParSep 1 - Align Center - AlignPossible Center - LabelType No_Label - OptionalArgs 1 + # define the environment lyxcode + Preamble + \newenvironment{lyxcode} + {\begin{list}{}{ + \setlength{\rightmargin}{\leftmargin} + \setlength{\listparindent}{0pt}% needed for AMS classes + \raggedright + \setlength{\itemsep}{0pt} + \setlength{\parsep}{0pt} + \normalfont\ttfamily}% + \def\{{\char`\{} + \def\}{\char`\}} + \def\textasciitilde{\char`\~} + \item[]} + {\end{list}} + EndPreamble # standard font definition Font - Size Huge - Series Bold - Color Blue + Family Typewriter EndFont - End - -Style TitleGraphic - Margin Static - LatexType Command - InTitle 1 - LatexName titlegraphic - ParSkip 0.4 - ItemSep 0 - TopSep 0 - BottomSep 1 - ParSep 1 - Align Center - AlignPossible Center - LabelType No_Label - + +Style NoteItem + Margin Static + LatexType Command + LatexName note[item] + ParSkip 0.5 + TopSep 1 + BottomSep 1 + ParSep 0 + Align Left + LabelType Static + LabelSep xx + LabelString "note: " + OptionalArgs 1 + LeftMargin MMM + # standard font definition - Font - Size Huge - Series Bold - Color Blue - EndFont - -End - -Style Theorem - CopyStyle Corollary - LatexName theorem}%{ - LabelString "Theorem. " -End - -Style Subtitle - Margin Static - LatexType Command - InTitle 1 - LatexName subtitle - ParSkip 0.4 - ItemSep 0 - TopSep 0 - BottomSep 1 - ParSep 1 - Align Center - AlignPossible Center - LabelType No_Label - OptionalArgs 1 - - # standard font definition - Font - Size Large - Series Bold - Color Blue - EndFont - -End - - -Style Uncover - Margin First_Dynamic - LatexType Environment - NextNoIndent 0 - ParIndent MM - Align Left - LabelType Static - - LatexName uncoverenv}%{ - LabelString "uncovered on slides " - - ParSkip 0.5 - TopSep 1 - BottomSep 1 - ParSep 0 - - # font & label font definition - LabelFont - Family Roman - Color Latex + Family Roman + Color latex EndFont End + # Input lyxmacros.inc # Charstyles: CharStyle Alert - LatexType Command - LatexName alert - Font - Color red - EndFont + LatexType Command + LatexName alert + Font + Color red + EndFont End CharStyle Structure - LatexType Command - LatexName structure - Font - Color blue - EndFont + LatexType Command + LatexName structure + Font + Color blue + EndFont End Float - Type table - GuiName Table - Placement tbp - Extension lot - NumberWithin none - Style plain - ListName "List of Tables" - LaTeXBuiltin true + Type table + GuiName Table + Placement tbp + Extension lot + NumberWithin none + Style plain + ListName "List of Tables" + LaTeXBuiltin true End Float - Type figure - GuiName Figure - Placement tbp - Extension lof - NumberWithin none - Style plain - ListName "List of Figures" - LaTeXBuiltin true + Type figure + GuiName Figure + Placement tbp + Extension lof + NumberWithin none + Style plain + ListName "List of Figures" + LaTeXBuiltin true End TitleLaTeXName frame{\maketitle} -SecNumDepth 2 -TocDepth 2 - Preamble \AtBeginDocument{ \let\origtableofcontents=\tableofcontents