Convert CharStyle to Flex also in file format

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

diff --git a/development/FORMAT b/development/FORMAT
index 2b7c0a0bd321e20e63f256ce56dc477fe4d6d3e3..3f1a1aed07272637f3ffe7c9418dc310e4811bee 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,11 @@
 LyX file-format changes
 -----------------------
 
+2007-09-08 Martin Vermeer
+
+       * format incremented to 283: CharStyle insets are now 
+         called Flex.
+
 2007-08-31 Bo Peng
 
        * format incremented to 282: lyx files can be zipfiles with

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index bf5a479797b79861fc6484024b68256f5c95688a..8810e5f016501a4b5709bdd467d59fe76253e210 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -78,7 +78,7 @@ format_relation = [("0_06",    [200], generate_minor_versions("0.6" , 4)),
                    ("1_3",     [221], generate_minor_versions("1.3" , 7)),
                    ("1_4", range(222,246), generate_minor_versions("1.4" , 5)),
                    ("1_5", range(246,277), generate_minor_versions("1.5" , 1)),
-                   ("1_6", range(277,283), generate_minor_versions("1.6" , 0))]
+                   ("1_6", range(277,284), generate_minor_versions("1.6" , 0))]
 
 
 def formats_list():

diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index 997c6560844b0acb6e5789fc3e184da2005f90b0..51f077cc34b9236e624e08db0ec0edbf2267fac0 100644 (file)
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -155,6 +155,25 @@ def revert_begin_modules(document):
             break
         document.header[i : j + 1] = []
 
+def convert_flex(document):
+    "Convert CharStyle to Flex"
+    i = 0
+    while True:
+        i = find_token(document.body, "\\begin_inset CharStyle", i)
+        if i == -1:
+            return
+        document.body[i] = document.body[i].replace('\\begin_inset CharStyle', '\\begin_inset Flex')
+
+def revert_flex(document):
+    "Convert Flex to CharStyle"
+    i = 0
+    while True:
+        i = find_token(document.body, "\\begin_inset Flex", i)
+        if i == -1:
+            return
+        document.body[i] = document.body[i].replace('\\begin_inset Flex', '\\begin_inset CharStyle')
+
+
 
 ##
 # Conversion hub
@@ -167,10 +186,12 @@ convert = [
            [279, [long_charstyle_names]],
            [280, [axe_show_label]],
            [281, []],
-           [282, []]
+           [282, []],
+           [283, [convert_flex]]
           ]
 
 revert =  [
+           [282, [revert_flex]],
            [281, []],
            [280, [revert_begin_modules]],
            [279, [revert_show_label]],

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index dc2d85f9d24bc488c5db79ed2da738c0048af753..bdf866fbe12d863ab711351cdfefe113a46e8490 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -142,7 +142,7 @@ namespace fs = boost::filesystem;
 
 namespace {
 
-int const LYX_FORMAT = 282;
+int const LYX_FORMAT = 283;
 
 } // namespace anon
 

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index ae0430d07ee9236901564edf2562c8a811818895..4ef9581353b9e36969c19a170285503ede8d5df5 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -78,7 +78,7 @@ void InsetFlex::setLayout(InsetLayout il)
 
 docstring const InsetFlex::editMessage() const
 {
-       return _("Opened CharStyle Inset");
+       return _("Opened Flex Inset");
 }
 
 
@@ -137,7 +137,7 @@ bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
        switch (cmd.action) {
-               // paragraph breaks not allowed in charstyle insets
+               // paragraph breaks not allowed in flex insets
                case LFUN_BREAK_PARAGRAPH:
                case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
                case LFUN_BREAK_PARAGRAPH_SKIP:
@@ -190,7 +190,7 @@ void InsetFlex::textString(Buffer const & buf, odocstream & os) const
 
 void InsetFlexParams::write(ostream & os) const
 {
-       os << "CharStyle " << name << "\n";
+       os << "Flex " << name << "\n";
 }
 
 
@@ -200,7 +200,7 @@ void InsetFlexParams::read(Lexer & lex)
                lex.next();
                string token = lex.getString();
 
-               if (token == "CharStyle") {
+               if (token == "Flex") {
                        lex.next();
                        name = lex.getString();
                }