From fd70aabcc8c8adae0a25b51aeab42eb1515bb4bf Mon Sep 17 00:00:00 2001
From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Mon, 14 May 2007 19:56:05 +0000
Subject: [PATCH] Add charstyles Alert and Structure to beamer

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18322 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/beamer.layout | 19 ++++++++++++++++++-
 lib/lyx2lyx/LyX.py        |  2 +-
 lib/lyx2lyx/lyx_1_5.py    | 39 ++++++++++++++++++++++++++++++++++++++-
 src/Buffer.cpp            |  2 +-
 4 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index b610305a50..d6fff6667c 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1055,10 +1055,27 @@ Style Uncover
   EndFont
 End
 
+# Input lyxmacros.inc
 
+# Charstyles:
 
+CharStyle Alert
+        LatexType             Command
+        LatexName             alert
+        Font
+          Color               red
+        EndFont
+End
+
+
+CharStyle Structure
+        LatexType             Command
+        LatexName             structure
+        Font
+          Color               blue 
+        EndFont
+End
 
-# Input lyxmacros.inc
 
 Float
   Type                  table
diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 57f86ef600..090ad03c06 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -74,7 +74,7 @@ format_relation = [("0_06",    [200], generate_minor_versions("0.6" , 4)),
                    ("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():
diff --git a/lib/lyx2lyx/lyx_1_5.py b/lib/lyx2lyx/lyx_1_5.py
index ae85cf33c6..b0adef8a9c 100644
--- a/lib/lyx2lyx/lyx_1_5.py
+++ b/lib/lyx2lyx/lyx_1_5.py
@@ -1210,6 +1210,43 @@ def revert_utf8plain(document):
     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 @@ convert = [[246, []],
            [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]],
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 4db5afad6b..ee4275b5d1 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -141,7 +141,7 @@ using std::string;
 
 namespace {
 
-int const LYX_FORMAT = 269;
+int const LYX_FORMAT = 270;
 
 } // namespace anon
 
-- 
2.39.2