bug 656 - 1.3. patch attached to bug

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index d570b3f4ae7093c981bc674f37176abf6da8667b..0d7e9d974f0afd4826dd99b138a75b5490d01064 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-28  John Levon  <levon@movementarian.org>
+
+       * insetgraphicsParams.C: read subcaptionText as a whole line
+       (bug 656)
+
 2003-03-28  John Levon  <levon@movementarian.org>
 
        * insettext.C: remove unused prototypes

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index af7cba0a1e3e72cfdfd725de20ce0b62c9b69ee4..7ce47109746e7260af1b7fca0c55dafe30fdc613 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -222,8 +222,10 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
        } else if (token == "subcaption") {
                subcaption = true;
        } else if (token == "subcaptionText") {
-               lex.next();
-               subcaptionText = lex.getString();
+               lex.eatLine();
+               string sub = lex.getString();
+               // strip surrounding " "
+               subcaptionText = sub.substr(1, sub.length() - 2);
        } else if (token == "special") {
                lex.eatLine();
                special = lex.getString();