Now I have got the external inset working as I'd like, I guess that it is
time to actually kill the RasterImage template. The attached patch to
lyx2lyx replaces any RasterImage external inset with a graphics inset.
Ok?
--
Angus
? lib/reLyX-safe
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.447
diff -u -p -r1.447 ChangeLog
--- lib/ChangeLog 4 Jun 2003 09:16:28 -0000 1.447
+++ lib/ChangeLog 4 Jun 2003 20:18:48 -0000
@@ -1,3 +1,14 @@
+2003-06-04 Angus Leeming <[EMAIL PROTECTED]>
+
+ * lyx2lyx/lyxconvert_223.py (conv):
+
+2003-06-04 Angus Leeming <[EMAIL PROTECTED]>
+
+ * lyx2lyx/lyx2lyx: bump the output format to 224.
+ * lyx2lyx/lyxconvert_223.py (convert_external): new file, new function.
+ An amalgamation of suggestions from José Matos and Dekel Tsur.
+ Also converts a RasterImage External Inset to a Graphics Inset.
+
2003-06-03 Angus Leeming <[EMAIL PROTECTED]>
* external_templates: modify the templates to use the converter" mechanism.
Index: lib/lyx2lyx/lyx2lyx
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/lyx2lyx/lyx2lyx,v
retrieving revision 1.8
diff -u -p -r1.8 lyx2lyx
--- lib/lyx2lyx/lyx2lyx 14 Mar 2003 13:37:34 -0000 1.8
+++ lib/lyx2lyx/lyx2lyx 4 Jun 2003 20:18:49 -0000
@@ -37,7 +37,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"]
+lst_ft = ["210", "215", "216", "217", "218", "220", "221", "223", "224"]
def usage():
print """Usage: lyx2lyx [options] file1
Index: lib/lyx2lyx/lyxconvert_223.py
===================================================================
RCS file: lib/lyx2lyx/lyxconvert_223.py
diff -N lib/lyx2lyx/lyxconvert_223.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/lyx2lyx/lyxconvert_223.py 4 Jun 2003 20:18:49 -0000
@@ -0,0 +1,60 @@
+# This file is part of lyx2lyx
+# Copyright (C) 2002 Dekel Tsur <[EMAIL PROTECTED]>
+#
+# 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.
+
+import string
+import re
+from parser_tools import find_token
+
+def convert_external(lines):
+ external_rexp = re.compile(r'\\begin_inset External ([^,]*),"([^"]*)",')
+ external_header = "\\begin_inset External"
+ i = 0
+ while 1:
+ i = find_token(lines, external_header, i)
+ if i == -1:
+ break
+ look = external_rexp.search(lines[i])
+ args = ['','']
+ if look:
+ args[0] = look.group(1)
+ args[1] = look.group(2)
+ #FIXME: if the previous search fails then warn
+
+ if args[0] == "RasterImage":
+ # Convert a RasterImage External Inset to a Graphics Inset.
+ top = "\\begin_inset Graphics"
+ if args[1]:
+ filename = "\tfilename " + args[1]
+ lines[i:i+1] = [top, filename]
+ i = i + 1
+ else:
+ # Convert the old External Inset format to the new.
+ top = external_header
+ template = "\ttemplate " + args[0]
+ if args[1]:
+ filename = "\tfilename " + args[1]
+ lines[i:i+1] = [top, template, filename]
+ i = i + 2
+ else:
+ lines[i:i+1] = [top, template]
+ i = i + 1
+
+def convert(header, body):
+ convert_external(body)
+
+if __name__ == "__main__":
+ pass
