Handle Michael's changes to InsetCollapsable.

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

diff --git a/development/ChangeLog b/development/ChangeLog
index 67eb3065aefdc2d948046295bf8ca03be838a0bc..d4f7cff291e0bf914f1b407968cd21be1ef5b9e2 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-15  Angus Leeming  <leeming@lyx.org>
+
+       * FORMAT: document change to format 228.
+
 2003-12-10  Angus Leeming  <leeming@lyx.org>
 
        * FORMAT: document the addition of a 'draft' option to InsetExternal.

diff --git a/development/FORMAT b/development/FORMAT
index d8bec3d94ce3322261dcc27bee10fa19315cf178..b4764b86f5488bbd498345b591499b088cc73380 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,14 @@
 LyX file-format changes
 -----------------------
 
+2003-12-15  Angus Leeming  <leeming@lyx.org>
+
+       * format incremented to 228.
+       * Change the output of all insets derived from InsetCollapsable
+       except for InsetERT (which has this output already), changing lines
+       "collapsed true" -> "status collapsed"
+       "collapsed false" -> "status open".
+
 2003-12-10  Angus Leeming  <leeming@lyx.org>
 
        * format NOT incremented.

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 1aaa3bfe93525830896b23d3bbeb5b7d6675c952..9ec1d4f64a2fedaf5df9c3ef662a681e7a0b85fc 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-15  Angus Leeming  <leeming@lyx.org>
+
+       * lyx2lyx:
+       * lyxconvert_227.py:
+       * lyxrevert_228.py: convert the InsetCollapsable format between
+       formats 227 and 228.
+
 2003-12-10  Angus Leeming  <leeming@lyx.org>
 
        * lyxrevert_227.py: InsetExternal gains a 'draft' option, so remove

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index c314816c5f367d7738108fee4789045fb459d961..1a45dbe0db3e896758a639a8f341e77496c9ebc6 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -40,7 +40,7 @@ opt.quiet = 0
 
 format = re.compile(r"(\d)[\.,]?(\d\d)")
 fileformat = re.compile(r"\\lyxformat\s*(\S*)")
-lst_ft = [210, 215, 216, 217,  218, 220, 221, 223, 224, 225, 226, 227]
+lst_ft = [210, 215, 216, 217,  218, 220, 221, 223, 224, 225, 226, 227, 228]
 
 def usage():
     print """Usage: lyx2lyx [options] [file]

diff --git a/lib/lyx2lyx/lyxconvert_227.py b/lib/lyx2lyx/lyxconvert_227.py
new file mode 100644 (file)
index 0000000..6f6fbf0
--- /dev/null
+++ b/lib/lyx2lyx/lyxconvert_227.py
@@ -0,0 +1,50 @@
+# This file is part of lyx2lyx
+# Copyright (C) 2003 José Matos <jamatos@fep.up.pt>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+from parser_tools import find_tokens
+
+def convert_collapsable(lines):
+    i = 0
+    while 1:
+        i = find_tokens(lines, ["\\begin_inset Box",
+                                "\\begin_inset Branch",
+                                "\\begin_inset CharStyle",
+                                "\\begin_inset Float",
+                                "\\begin_inset Foot",
+                                "\\begin_inset Marginal",
+                                "\\begin_inset Note",
+                                "\\begin_inset OptArg",
+                                "\\begin_inset Wrap"], i)
+        if i == -1:
+            break
+
+        # We are interested in the next line
+        i = i + 1
+        if (lines[i] == "collapsed false"):
+            lines[i] = "status open"
+        elif (lines[i] == "collapsed true"):
+            lines[i] = "status collapsed"
+        else:
+            sys.stderr.write("Malformed lyx file\n")
+
+        i = i + 1
+
+def convert(header, body):
+    convert_collapsable(body)
+
+if __name__ == "__main__":
+    pass

diff --git a/lib/lyx2lyx/lyxrevert_228.py b/lib/lyx2lyx/lyxrevert_228.py
new file mode 100644 (file)
index 0000000..8357d72
--- /dev/null
+++ b/lib/lyx2lyx/lyxrevert_228.py
@@ -0,0 +1,51 @@
+# This file is part of lyx2lyx
+# Copyright (C) 2003 Jos\81é Matos <jamatos@fep.up.pt>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+from parser_tools import find_tokens
+
+def convert_collapsable(lines):
+    i = 0
+    while 1:
+        i = find_tokens(lines, ["\\begin_inset Box",
+                                "\\begin_inset Branch",
+                                "\\begin_inset CharStyle",
+                                "\\begin_inset Float",
+                                "\\begin_inset Foot",
+                                "\\begin_inset Marginal",
+                                "\\begin_inset Note",
+                                "\\begin_inset OptArg",
+                                "\\begin_inset Wrap"], i)
+        if i == -1:
+            break
+
+        # We are interested in the next line
+        i = i + 1
+        if (lines[i] == "status open"):
+            lines[i] = "collapsed false"
+        elif (lines[i] == "status collapsed" or
+              lines[i] == "status inlined"):
+            lines[i] = "collapsed true"
+        else:
+            sys.stderr.write("Malformed lyx file\n")
+
+        i = i + 1
+
+def convert(header, body):
+    convert_collapsable(body)
+
+if __name__ == "__main__":
+    pass

diff --git a/src/ChangeLog b/src/ChangeLog
index 7a4510e9cacb1e778532013e801d253414214731..273a5cd436ca168579e5de443f4d1a4c14dca4af 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,11 @@
+2003-12-15  Angus Leeming  <leeming@lyx.org>
+
+       * buffer.C: up the format to 228.
 
 2003-12-15  André Pönitz  <poenitz@gmx.net>
 
-       * cursor_slice.[Ch]: new class to cover texted and mathed's cursor slices
+       * cursor_slice.[Ch]: new class to cover texted and mathed's cursor
+       slices
 
        * Makefile.am:
 

diff --git a/src/buffer.C b/src/buffer.C
index 53c5b39230c8157898026e93bb677985fe9c5da7..30a42b39daa4f2f03d527610124c5c73be2fa85a 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -132,7 +132,7 @@ extern BufferList bufferlist;
 
 namespace {
 
-const int LYX_FORMAT = 227;
+const int LYX_FORMAT = 228;
 
 } // namespace anon