[Patch] Re: Beamer patch (Re: Beta 3 (preparation))
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
+Columns1
+Sides 1
+SecNumDepth2
+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
+ ShapeUp
+ Size Normal
+ ColorNone
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
+ LatexTypeParagraph
+ LatexNamedummy
+ ParIndentMM
+ ParSkip 0.4
+ AlignLeft
+ AlignPossibleBlock, Left, Right, Center
+ LabelTypeNo_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
+ LatexTypeItem_Environment
+ LatexNameitemize
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeItemize
+ 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
+ LatexTypeItem_Environment
+ LatexNameenumerate
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ParSkip 0.0
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeEnumerate
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
+ LatexTypeItem_environment
+ LatexNamedescription
+ NextNoIndent 1
+ LeftMargin MM
+ LabelSep xxx
+ ParSkip 0.4
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeManual
+ LabelString MM
# label font definition
LabelFont
-Series Bold
+SeriesBold
EndFont
End
+# Sectioning section
+# Part style definition
+Style Part
+ Margin Dynamic
+ LatexTypeCommand
+ LatexNamepart
+ NeedProtect 1
+ NextNoIndent 1
+ Labelsep xxx
+ ParSkip 0.4
+ TopSep 4
+ BottomSep4
+ ParSep 0.8
+ AlignCenter
+ AlignpossibleCenter
+ LabelTypeStatic
+
RE: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
btw, i think some of these counter defs are superfluous. when i open a beamer document i see the following in the console: New counter already exists: section New counter already exists: subsection New counter already exists: bibitem New counter already exists: table New counter already exists: enumi New counter already exists: enumii -Original Message- From: Martin Vermeer [mailto:[EMAIL PROTECTED] Sent: Tue 5/15/07 10:43 To: José Matos Cc: lyx-devel@lists.lyx.org Subject: [Patch] Re: Beamer patch (Re: Beta 3 (preparation)) 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
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 10:45:07 +0200 Leuven, E. [EMAIL PROTECTED] wrote: btw, i think some of these counter defs are superfluous. when i open a beamer document i see the following in the console: New counter already exists: section New counter already exists: subsection New counter already exists: bibitem New counter already exists: table New counter already exists: enumi New counter already exists: enumii How do you propose to suppress them? I think these are modified from the original ones. - Martin -Original Message- From: Martin Vermeer [mailto:[EMAIL PROTECTED] Sent: Tue 5/15/07 10:43 To: José Matos Cc: lyx-devel@lists.lyx.org Subject: [Patch] Re: Beamer patch (Re: Beta 3 (preparation)) 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
RE: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
How do you propose to suppress them? with the delete button? I think these are modified from the original ones. the entries in stdcounters.inc are identical...
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 12:05:27 +0200
Leuven, E. [EMAIL PROTECTED] wrote:
How do you propose to suppress them?
with the delete button?
I think these are modified from the original ones.
the entries in stdcounters.inc are identical...
OK, they are gone now... and the columns stuff looks a little better
on-screen...
- Martin
Index: beamer.layout
===
--- beamer.layout (revision 18324)
+++ beamer.layout (working copy)
@@ -8,121 +8,245 @@
Format 4
Input stdcounters.inc
+# local counters
+
+Counter
+ Name figure
+ Name lyxframeend{}\section
+End
+
+
# General textclass parameters
-Columns 1
-Sides 1
-SecNumDepth 2
-TocDepth 2
-DefaultStyle Standard
+Columns1
+Sides 1
+SecNumDepth2
+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
+ ShapeUp
+ Size Normal
+ ColorNone
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
+ LatexTypeParagraph
+ LatexNamedummy
+ ParIndentMM
+ ParSkip 0.4
+ AlignLeft
+ AlignPossibleBlock, Left, Right, Center
+ LabelTypeNo_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
+ LatexTypeItem_Environment
+ LatexNameitemize
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeItemize
+ 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
+ LatexTypeItem_Environment
+ LatexNameenumerate
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ParSkip 0.0
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeEnumerate
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
+ LatexTypeItem_environment
+ LatexNamedescription
+ NextNoIndent 1
+ LeftMargin MM
+ LabelSep xxx
+ ParSkip 0.4
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeManual
+ LabelString MM
# label font definition
LabelFont
-Series Bold
+SeriesBold
EndFont
End
+# Sectioning section
+# Part style definition
+Style Part
+ Margin Dynamic
+ LatexTypeCommand
+ LatexNamepart
+ NeedProtect 1
+ NextNoIndent 1
+ Labelsep xxx
+ ParSkip 0.4
+ TopSep 4
+ BottomSep4
+ ParSep 0.8
+ AlignCenter
+ AlignpossibleCenter
+ LabelTypeStatic
+ 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
+ LatexTypeCommand
+ LatexNamelyxframeend{}\section
+ NeedProtect 1
+ NextNoIndent 1
+ LabelSep xxx
+ ParSkip 0.4
+ TopSep 2
+ BottomSep0.25
+ ParSep 0.7
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeCounter
+ LabelCounter section
+ LabelString Section \arabic{section}
+ OptionalArgs 1
+
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
Martin == Martin Vermeer [EMAIL PROTECTED] writes:
Martin On Tue, 15 May 2007 12:05:27 +0200
Martin Leuven, E. [EMAIL PROTECTED] wrote:
How do you propose to suppress them?
with the delete button?
I think these are modified from the original ones.
the entries in stdcounters.inc are identical...
Martin OK, they are gone now... and the columns stuff looks a
Martin little better on-screen...
+# local counters
+
+Counter
+ Name figure
+ Name lyxframeend{}\section
+End
What is this counter supposed to do? Especially with two different
names and no other contents?
# This is just to show how to declare the default font.
# The defaults are exactly those shown here.
DefaultFont
- Family Sans
- Series Medium
Remove this comment. It only makes sense in classes where the defaults
are unchanged.
JMarc
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 14:27:58 +0200
Jean-Marc Lasgouttes [EMAIL PROTECTED] wrote:
Martin == Martin Vermeer [EMAIL PROTECTED] writes:
Martin On Tue, 15 May 2007 12:05:27 +0200
Martin Leuven, E. [EMAIL PROTECTED] wrote:
How do you propose to suppress them?
with the delete button?
I think these are modified from the original ones.
the entries in stdcounters.inc are identical...
Martin OK, they are gone now... and the columns stuff looks a
Martin little better on-screen...
+# local counters
+
+Counter
+ Name figure
+ Name lyxframeend{}\section
+End
What is this counter supposed to do? Especially with two different
names and no other contents?
No idea... my feeling is though that using \section makes the figure
counter appear in the TOC (initial slide, nav bar). Just a guess.
# This is just to show how to declare the default font.
# The defaults are exactly those shown here.
DefaultFont
- Family Sans
- Series Medium
Remove this comment. It only makes sense in classes where the defaults
are unchanged.
Only the comment? or the whole definition?
JMarc
- Martin
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
Martin == Martin Vermeer [EMAIL PROTECTED] writes: What is this counter supposed to do? Especially with two different names and no other contents? Martin No idea... my feeling is though that using \section makes the Martin figure counter appear in the TOC (initial slide, nav bar). Martin Just a guess. By just setting the name? I am not convinced... Martin Only the comment? or the whole definition? The definition is useful, it gives fonts different from the default. But the comment is misleading. Instead of removing it you could just correct it. JMarc
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 14:55:26 +0200 Jean-Marc Lasgouttes [EMAIL PROTECTED] wrote: Martin == Martin Vermeer [EMAIL PROTECTED] writes: What is this counter supposed to do? Especially with two different names and no other contents? Martin No idea... my feeling is though that using \section makes the Martin figure counter appear in the TOC (initial slide, nav bar). Martin Just a guess. By just setting the name? I am not convinced... Martin Only the comment? or the whole definition? The definition is useful, it gives fonts different from the default. But the comment is misleading. Instead of removing it you could just correct it. JMarc I just checked it in with the comment removed. I left the figure/section thing alone. Someone who knows these things may fix this, if fixing is what it needs. - Martin
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
Martin == Martin Vermeer [EMAIL PROTECTED] writes: Martin I left the figure/section thing alone. Someone who knows these Martin things may fix this, if fixing is what it needs. Fair enough. JMarc
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, May 15, 2007 at 04:59:12PM +0200, Jean-Marc Lasgouttes wrote: Martin == Martin Vermeer [EMAIL PROTECTED] writes: Martin I left the figure/section thing alone. Someone who knows these Martin things may fix this, if fixing is what it needs. Fair enough. JMarc One more brush-up attached. Again, no substitute for RTFM, but may prevent some head-scratching. OK to commit? (Obviously risk-free, but do we want it?) - Martin Index: beamer.layout === --- beamer.layout (revision 18343) +++ beamer.layout (working copy) @@ -401,9 +401,9 @@ AlignLeft LabelTypeStatic LabelSep xx - LabelString start column of width: + LabelString start column (increase depth!), width: OptionalArgs 1 - LeftMargin start column of width: + LeftMargin start column (increase depth!), width: # standard font definition LabelFont
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
Martin == Martin Vermeer [EMAIL PROTECTED] writes: Martin On Tue, May 15, 2007 at 04:59:12PM +0200, Jean-Marc Lasgouttes Martin wrote: Martin == Martin Vermeer [EMAIL PROTECTED] writes: Martin I left the figure/section thing alone. Someone who knows these Martin things may fix this, if fixing is what it needs. Fair enough. JMarc Martin One more brush-up attached. Again, no substitute for RTFM, but Martin may prevent some head-scratching. Martin OK to commit? (Obviously risk-free, but do we want it?) If you are brusing up, add a comment above the figure counter that it should probably be deleted. JMarc
[Patch] Re: Beamer patch (Re: Beta 3 (preparation))
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
+Columns1
+Sides 1
+SecNumDepth2
+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
+ ShapeUp
+ Size Normal
+ ColorNone
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
+ LatexTypeParagraph
+ LatexNamedummy
+ ParIndentMM
+ ParSkip 0.4
+ AlignLeft
+ AlignPossibleBlock, Left, Right, Center
+ LabelTypeNo_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
+ LatexTypeItem_Environment
+ LatexNameitemize
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeItemize
+ 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
+ LatexTypeItem_Environment
+ LatexNameenumerate
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ParSkip 0.0
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeEnumerate
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
+ LatexTypeItem_environment
+ LatexNamedescription
+ NextNoIndent 1
+ LeftMargin MM
+ LabelSep xxx
+ ParSkip 0.4
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeManual
+ LabelString "MM"
# label font definition
LabelFont
-Series Bold
+SeriesBold
EndFont
End
+# Sectioning section
+# Part style definition
+Style Part
+ Margin Dynamic
+ LatexTypeCommand
+ LatexNamepart
+ NeedProtect 1
+ NextNoIndent 1
+ Labelsep xxx
+ ParSkip 0.4
+ TopSep 4
+ BottomSep4
+ ParSep 0.8
+ AlignCenter
+ AlignpossibleCenter
+
RE: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
btw, i think some of these counter defs are superfluous. when i open a beamer document i see the following in the console: New counter already exists: section New counter already exists: subsection New counter already exists: bibitem New counter already exists: table New counter already exists: enumi New counter already exists: enumii -Original Message- From: Martin Vermeer [mailto:[EMAIL PROTECTED] Sent: Tue 5/15/07 10:43 To: José Matos Cc: lyx-devel@lists.lyx.org Subject: [Patch] Re: Beamer patch (Re: Beta 3 (preparation)) 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
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 10:45:07 +0200 "Leuven, E." <[EMAIL PROTECTED]> wrote: > btw, i think some of these counter defs are superfluous. when i open a beamer > document i see the following in the console: > > New counter already exists: section > New counter already exists: subsection > New counter already exists: bibitem > New counter already exists: table > New counter already exists: enumi > New counter already exists: enumii How do you propose to suppress them? I think these are modified from the original ones. - Martin > -Original Message- > From: Martin Vermeer [mailto:[EMAIL PROTECTED] > Sent: Tue 5/15/07 10:43 > To: José Matos > Cc: lyx-devel@lists.lyx.org > Subject: [Patch] Re: Beamer patch (Re: Beta 3 (preparation)) > > 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 >
RE: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
> How do you propose to suppress them? with the delete button? > I think these are modified from the original ones. the entries in stdcounters.inc are identical...
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 12:05:27 +0200
"Leuven, E." <[EMAIL PROTECTED]> wrote:
> > How do you propose to suppress them?
>
> with the delete button?
>
> > I think these are modified from the original ones.
>
> the entries in stdcounters.inc are identical...
OK, they are gone now... and the "columns" stuff looks a little better
on-screen...
- Martin
Index: beamer.layout
===
--- beamer.layout (revision 18324)
+++ beamer.layout (working copy)
@@ -8,121 +8,245 @@
Format 4
Input stdcounters.inc
+# local counters
+
+Counter
+ Name figure
+ Name lyxframeend{}\section
+End
+
+
# General textclass parameters
-Columns 1
-Sides 1
-SecNumDepth 2
-TocDepth 2
-DefaultStyle Standard
+Columns1
+Sides 1
+SecNumDepth2
+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
+ ShapeUp
+ Size Normal
+ ColorNone
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
+ LatexTypeParagraph
+ LatexNamedummy
+ ParIndentMM
+ ParSkip 0.4
+ AlignLeft
+ AlignPossibleBlock, Left, Right, Center
+ LabelTypeNo_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
+ LatexTypeItem_Environment
+ LatexNameitemize
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeItemize
+ 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
+ LatexTypeItem_Environment
+ LatexNameenumerate
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ParSkip 0.0
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeEnumerate
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
+ LatexTypeItem_environment
+ LatexNamedescription
+ NextNoIndent 1
+ LeftMargin MM
+ LabelSep xxx
+ ParSkip 0.4
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep0.7
+ ParSep 0.3
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeManual
+ LabelString "MM"
# label font definition
LabelFont
-Series Bold
+SeriesBold
EndFont
End
+# Sectioning section
+# Part style definition
+Style Part
+ Margin Dynamic
+ LatexTypeCommand
+ LatexNamepart
+ NeedProtect 1
+ NextNoIndent 1
+ Labelsep xxx
+ ParSkip 0.4
+ TopSep 4
+ BottomSep4
+ ParSep 0.8
+ AlignCenter
+ AlignpossibleCenter
+ LabelTypeStatic
+ 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
+ LatexTypeCommand
+ LatexNamelyxframeend{}\section
+ NeedProtect 1
+ NextNoIndent 1
+ LabelSep xxx
+ ParSkip 0.4
+ TopSep 2
+ BottomSep0.25
+ ParSep 0.7
+ AlignLeft
+ AlignPossibleLeft
+ LabelTypeCounter
+ LabelCounter section
+ LabelString "Section
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes:
Martin> On Tue, 15 May 2007 12:05:27 +0200
Martin> "Leuven, E." <[EMAIL PROTECTED]> wrote:
>> > How do you propose to suppress them?
>>
>> with the delete button?
>>
>> > I think these are modified from the original ones.
>>
>> the entries in stdcounters.inc are identical...
Martin> OK, they are gone now... and the "columns" stuff looks a
Martin> little better on-screen...
+# local counters
+
+Counter
+ Name figure
+ Name lyxframeend{}\section
+End
What is this counter supposed to do? Especially with two different
names and no other contents?
# This is just to show how to declare the default font.
# The defaults are exactly those shown here.
DefaultFont
- Family Sans
- Series Medium
Remove this comment. It only makes sense in classes where the defaults
are unchanged.
JMarc
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 14:27:58 +0200
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> wrote:
> > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes:
>
> Martin> On Tue, 15 May 2007 12:05:27 +0200
> Martin> "Leuven, E." <[EMAIL PROTECTED]> wrote:
>
> >> > How do you propose to suppress them?
> >>
> >> with the delete button?
> >>
> >> > I think these are modified from the original ones.
> >>
> >> the entries in stdcounters.inc are identical...
>
> Martin> OK, they are gone now... and the "columns" stuff looks a
> Martin> little better on-screen...
>
> +# local counters
> +
> +Counter
> + Name figure
> + Name lyxframeend{}\section
> +End
>
> What is this counter supposed to do? Especially with two different
> names and no other contents?
No idea... my feeling is though that using \section makes the figure
counter appear in the TOC (initial slide, nav bar). Just a guess.
># This is just to show how to declare the default font.
># The defaults are exactly those shown here.
>DefaultFont
> - Family Sans
> - Series Medium
>
> Remove this comment. It only makes sense in classes where the defaults
> are unchanged.
Only the comment? or the whole definition?
> JMarc
- Martin
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: >> What is this counter supposed to do? Especially with two different >> names and no other contents? Martin> No idea... my feeling is though that using \section makes the Martin> figure counter appear in the TOC (initial slide, nav bar). Martin> Just a guess. By just setting the name? I am not convinced... Martin> Only the comment? or the whole definition? The definition is useful, it gives fonts different from the default. But the comment is misleading. Instead of removing it you could just correct it. JMarc
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, 15 May 2007 14:55:26 +0200 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > >> What is this counter supposed to do? Especially with two different > >> names and no other contents? > > Martin> No idea... my feeling is though that using \section makes the > Martin> figure counter appear in the TOC (initial slide, nav bar). > Martin> Just a guess. > > By just setting the name? I am not convinced... > > Martin> Only the comment? or the whole definition? > > The definition is useful, it gives fonts different from the default. > But the comment is misleading. Instead of removing it you could just > correct it. > > JMarc I just checked it in with the comment removed. I left the figure/section thing alone. Someone who knows these things may fix this, if fixing is what it needs. - Martin
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> I left the figure/section thing alone. Someone who knows these Martin> things may fix this, if fixing is what it needs. Fair enough. JMarc
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
On Tue, May 15, 2007 at 04:59:12PM +0200, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > Martin> I left the figure/section thing alone. Someone who knows these > Martin> things may fix this, if fixing is what it needs. > > Fair enough. > > JMarc One more brush-up attached. Again, no substitute for RTFM, but may prevent some head-scratching. OK to commit? (Obviously risk-free, but do we want it?) - Martin Index: beamer.layout === --- beamer.layout (revision 18343) +++ beamer.layout (working copy) @@ -401,9 +401,9 @@ AlignLeft LabelTypeStatic LabelSep xx - LabelString "start column of width:" + LabelString "start column (increase depth!), width:" OptionalArgs 1 - LeftMargin "start column of width:" + LeftMargin "start column (increase depth!), width:" # standard font definition LabelFont
Re: [Patch] Re: Beamer patch (Re: Beta 3 (preparation))
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> On Tue, May 15, 2007 at 04:59:12PM +0200, Jean-Marc Lasgouttes Martin> wrote: >> > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> I left the figure/section thing alone. Someone who knows these Martin> things may fix this, if fixing is what it needs. >> Fair enough. >> >> JMarc Martin> One more brush-up attached. Again, no substitute for RTFM, but Martin> may prevent some head-scratching. Martin> OK to commit? (Obviously risk-free, but do we want it?) If you are brusing up, add a comment above the figure counter that it should probably be deleted. JMarc
Re: Beamer patch (Re: Beta 3 (preparation))
Ping!
On Sun, 13 May 2007 19:49:12 +0300
Martin Vermeer [EMAIL PROTECTED] wrote:
On Sat, May 12, 2007 at 07:11:17PM +0100, José Matos wrote:
On Saturday 12 May 2007 18:29:00 Martin Vermeer wrote:
On Fri, May 11, 2007 at 02:37:55PM +0100, Jos Matos wrote:
Hi all,
Michael asked for more time to finish some code CT-related.
Since I have
not so much time as I did expect I have decided to delay the release to
Monday afternoon/night.
I take this chance to ask if there are patches in the batch
that you
think are important to commit before beta 3.
beamer alert patch, hopefully tomorrow evening.
OK.
Attached; thanks Juergen.
What about Jean-Pierre's reordering patch (bug 3141)? I tried the newest but
it
doesn't apply cleanly anymore.
- Martin
Index: src/Buffer.cpp
===
--- src/Buffer.cpp (revision 18282)
+++ src/Buffer.cpp (working copy)
@@ -141,7 +141,7 @@
namespace {
-int const LYX_FORMAT = 269;
+int const LYX_FORMAT = 270;
} // namespace anon
Index: lib/lyx2lyx/LyX.py
===
--- lib/lyx2lyx/LyX.py (revision 18282)
+++ lib/lyx2lyx/LyX.py (working copy)
@@ -74,7 +74,7 @@
(1_2, [220], generate_minor_versions(1.2 , 4)),
(1_3, [221], generate_minor_versions(1.3 , 7)),
(1_4, range(222,246), generate_minor_versions(1.4 , 4)),
- (1_5, range(246,270), generate_minor_versions(1.5 , 0))]
+ (1_5, range(246,271), generate_minor_versions(1.5 , 0))]
def formats_list():
Index: lib/lyx2lyx/lyx_1_5.py
===
--- lib/lyx2lyx/lyx_1_5.py (revision 18282)
+++ lib/lyx2lyx/lyx_1_5.py (working copy)
@@ -1210,6 +1210,43 @@
document.inputencoding = get_value(document.header, \\inputencoding, 0)
+def revert_beamer_alert(document):
+ Revert beamer's \\alert inset back to ERT.
+i = 0
+while 1:
+i = find_token(document.body, \\begin_inset CharStyle Alert, i)
+if i == -1:
+return
+document.body[i] = \\begin_inset ERT
+i = i + 1
+while 1:
+if (document.body[i][:13] == \\begin_layout):
+# Insert the \alert command
+document.body[i + 1] = \\alert{ + document.body[i + 1] + '}'
+break
+i = i + 1
+
+i = i + 1
+
+
+def revert_beamer_structure(document):
+ Revert beamer's \\structure inset back to ERT.
+i = 0
+while 1:
+i = find_token(document.body, \\begin_inset CharStyle Structure, i)
+if i == -1:
+return
+document.body[i] = \\begin_inset ERT
+i = i + 1
+while 1:
+if (document.body[i][:13] == \\begin_layout):
+document.body[i + 1] = \\structure{ + document.body[i + 1] + '}'
+break
+i = i + 1
+
+i = i + 1
+
+
def convert_changes(document):
Switch output_changes off if tracking_changes is off.
i = find_token(document.header, '\\tracking_changes', 0)
@@ -1529,7 +1566,7 @@
[268, []],
[269, []]]
-revert = [
+revert = [[269, [revert_beamer_alert, revert_beamer_structure]],
[268, [revert_preamble_listings_params, revert_listings_inset, revert_include_listings]],
[267, [revert_CJK]],
[266, [revert_utf8plain]],
Index: lib/layouts/beamer.layout
===
--- lib/layouts/beamer.layout (revision 18282)
+++ lib/layouts/beamer.layout (working copy)
@@ -1055,11 +1055,28 @@
EndFont
End
+# Input lyxmacros.inc
+# Charstyles:
+CharStyle Alert
+LatexType Command
+LatexName alert
+Font
+ Color red
+EndFont
+End
-# Input lyxmacros.inc
+CharStyle Structure
+LatexType Command
+LatexName structure
+Font
+ Color blue
+EndFont
+End
+
+
Float
Type table
GuiName Table
Re: Beamer patch (Re: Beta 3 (preparation))
On Monday 14 May 2007 16:24:23 Martin Vermeer wrote: Ping! OK. -- José Abílio
Re: Beamer patch (Re: Beta 3 (preparation))
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 -- José Abílio
Re: Beamer patch (Re: Beta 3 (preparation))
On Mon, May 14, 2007 at 05:41:14PM +0100, José Matos wrote: On Monday 14 May 2007 16:24:23 Martin Vermeer wrote: Ping! OK. It's in now. - Martin
Re: Beamer patch (Re: Beta 3 (preparation))
Ping!
On Sun, 13 May 2007 19:49:12 +0300
Martin Vermeer <[EMAIL PROTECTED]> wrote:
> On Sat, May 12, 2007 at 07:11:17PM +0100, José Matos wrote:
> > On Saturday 12 May 2007 18:29:00 Martin Vermeer wrote:
> > > On Fri, May 11, 2007 at 02:37:55PM +0100, Jos Matos wrote:
> > > > Hi all,
> > > > Michael asked for more time to finish some code CT-related.
> > > > Since I have
> > > > not so much time as I did expect I have decided to delay the release to
> > > > Monday afternoon/night.
> > > >
> > > > I take this chance to ask if there are patches in the batch
> > > > that you
> > > > think are important to commit before beta 3.
> > >
> > > beamer alert patch, hopefully tomorrow evening.
> >
> > OK.
>
> Attached; thanks Juergen.
>
> What about Jean-Pierre's reordering patch (bug 3141)? I tried the newest but
> it
> doesn't apply cleanly anymore.
>
> - Martin
>
Index: src/Buffer.cpp
===
--- src/Buffer.cpp (revision 18282)
+++ src/Buffer.cpp (working copy)
@@ -141,7 +141,7 @@
namespace {
-int const LYX_FORMAT = 269;
+int const LYX_FORMAT = 270;
} // namespace anon
Index: lib/lyx2lyx/LyX.py
===
--- lib/lyx2lyx/LyX.py (revision 18282)
+++ lib/lyx2lyx/LyX.py (working copy)
@@ -74,7 +74,7 @@
("1_2", [220], generate_minor_versions("1.2" , 4)),
("1_3", [221], generate_minor_versions("1.3" , 7)),
("1_4", range(222,246), generate_minor_versions("1.4" , 4)),
- ("1_5", range(246,270), generate_minor_versions("1.5" , 0))]
+ ("1_5", range(246,271), generate_minor_versions("1.5" , 0))]
def formats_list():
Index: lib/lyx2lyx/lyx_1_5.py
===
--- lib/lyx2lyx/lyx_1_5.py (revision 18282)
+++ lib/lyx2lyx/lyx_1_5.py (working copy)
@@ -1210,6 +1210,43 @@
document.inputencoding = get_value(document.header, "\\inputencoding", 0)
+def revert_beamer_alert(document):
+" Revert beamer's \\alert inset back to ERT. "
+i = 0
+while 1:
+i = find_token(document.body, "\\begin_inset CharStyle Alert", i)
+if i == -1:
+return
+document.body[i] = "\\begin_inset ERT"
+i = i + 1
+while 1:
+if (document.body[i][:13] == "\\begin_layout"):
+# Insert the \alert command
+document.body[i + 1] = "\\alert{" + document.body[i + 1] + '}'
+break
+i = i + 1
+
+i = i + 1
+
+
+def revert_beamer_structure(document):
+" Revert beamer's \\structure inset back to ERT. "
+i = 0
+while 1:
+i = find_token(document.body, "\\begin_inset CharStyle Structure", i)
+if i == -1:
+return
+document.body[i] = "\\begin_inset ERT"
+i = i + 1
+while 1:
+if (document.body[i][:13] == "\\begin_layout"):
+document.body[i + 1] = "\\structure{" + document.body[i + 1] + '}'
+break
+i = i + 1
+
+i = i + 1
+
+
def convert_changes(document):
" Switch output_changes off if tracking_changes is off. "
i = find_token(document.header, '\\tracking_changes', 0)
@@ -1529,7 +1566,7 @@
[268, []],
[269, []]]
-revert = [
+revert = [[269, [revert_beamer_alert, revert_beamer_structure]],
[268, [revert_preamble_listings_params, revert_listings_inset, revert_include_listings]],
[267, [revert_CJK]],
[266, [revert_utf8plain]],
Index: lib/layouts/beamer.layout
===
--- lib/layouts/beamer.layout (revision 18282)
+++ lib/layouts/beamer.layout (working copy)
@@ -1055,11 +1055,28 @@
EndFont
End
+# Input lyxmacros.inc
+# Charstyles:
+CharStyle Alert
+LatexType Command
+LatexName alert
+Font
+ Color red
+EndFont
+End
-# Input lyxmacros.inc
+CharStyle Structure
+LatexType Command
+LatexName structure
+Font
+ Color blue
+EndFont
+End
+
+
Float
Type table
GuiName Table
Re: Beamer patch (Re: Beta 3 (preparation))
On Monday 14 May 2007 16:24:23 Martin Vermeer wrote: > Ping! OK. -- José Abílio
Re: Beamer patch (Re: Beta 3 (preparation))
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 -- José Abílio
Re: Beamer patch (Re: Beta 3 (preparation))
On Mon, May 14, 2007 at 05:41:14PM +0100, José Matos wrote: > On Monday 14 May 2007 16:24:23 Martin Vermeer wrote: > > Ping! > > OK. It's in now. - Martin
