[PATCH] lyx2lyx: subcaption in LyX file format 2.15

[John Levon]

On Mon, Mar 24, 2003 at 01:38:49AM +0100, Markus Grabner wrote:

>     LyX 1.3.0 and 1.3.1 can't correctly import subfigure captions 
> stored in the ancient lyx 2.15 file format. Subfigure captions are only 
> read up to the first whitespace character, the rest is ignored.

Here's a fix. lyx2lyx people, please look and OK or fix up yourself

JMarc, this is a dataloss, probably wanted for 1.3.2

thanks
john


Index: lyxconvert_218.py
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/lyx2lyx/lyxconvert_218.py,v
retrieving revision 1.33
diff -u -p -r1.33 lyxconvert_218.py
--- lyxconvert_218.py   14 Mar 2003 15:00:02 -0000      1.33
+++ lyxconvert_218.py   24 Mar 2003 02:10:28 -0000
@@ -403,9 +403,12 @@ def remove_figinset(lines):
        else:
            display = "color"
 
-       subcaptionText = get_value(lines, "subcaption", i+1, j)
-       if subcaptionText != "":
-           subcaptionText = '"'+subcaptionText+'"'
+       subcaptionLine = find_token(lines, "subcaption", i+1, j)
+       if subcaptionLine != -1:
+            subcaptionText = lines[subcaptionLine][11:]
+           if subcaptionText != "":
+               subcaptionText = '"'+subcaptionText+'"'
+
        k = find_token(lines, "subfigure", i+1,j)
        if k == -1:
            subcaption = 0