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
