fix #832

[lyx.git] / src / insets / insetgraphicsParams.C

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index af52942f77695f40f65d9665a5ecb96dfbf59219..d8b01f8404fca99e15da88a75dd873b985edf18f 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -11,9 +11,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetgraphicsParams.h"
 
@@ -27,6 +24,7 @@
 #include "lyxrc.h"
 #include "debug.h"
 #include "lyxlex.h"
+#include "frontends/lyx_gui.h"
 
 using std::ostream;
 
@@ -58,7 +56,7 @@ void InsetGraphicsParams::init()
        filename.erase();
        lyxscale = 100;                 // lyx scaling in percentage
        display = grfx::DefaultDisplay; // display mode; see preferences
-       scale = 100;                    // output scaling in percentage
+       scale = 100.0;                  // output scaling in percentage
        width = LyXLength();
        height = LyXLength();
        keepAspectRatio = false;        // for LaTeX output
@@ -142,16 +140,16 @@ void InsetGraphicsParams::Write(ostream & os) const
                os << "\tlyxscale " << lyxscale << '\n';
        if (display != grfx::DefaultDisplay)
                os << "\tdisplay " << grfx::displayTranslator.find(display) << '\n';
-       if (scale) {
-               if (scale != 100)
+       if (!lyx::float_equal(scale, 0.0, 0.05)) {
+               if (!lyx::float_equal(scale, 100.0, 0.05))
                        os << "\tscale " << scale << '\n';
        } else {
                if (!width.zero())
                        os << "\twidth " << width.asString() << '\n';
+               if (!height.zero())
+                       os << "\theight " << height.asString() << '\n';
        }
 
-       if (!height.zero())
-               os << "\theight " << height.asString() << '\n';
        if (keepAspectRatio)
                os << "\tkeepAspectRatio\n";
        if (draft)                      // draft mode
@@ -191,14 +189,15 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
                display = grfx::displayTranslator.find(type);
        } else if (token == "scale") {
                lex.next();
-               scale = lex.getInteger();
+               scale = lex.getFloat();
        } else if (token == "width") {
                lex.next();
                width = LyXLength(lex.getString());
-               scale = 0;
+               scale = 0.0;
        } else if (token == "height") {
                lex.next();
                height = LyXLength(lex.getString());
+               scale = 0.0;
        } else if (token == "keepAspectRatio") {
                keepAspectRatio = true;
        } else if (token == "draft") {
@@ -206,9 +205,12 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
        } else if (token == "noUnzip") {
                noUnzip = true;
        } else if (token == "BoundingBox") {
-               for (int i=0; i<4 ;i++) {
+               bb.erase();
+               for (int i = 0; i < 4; ++i) {
+                       if (i != 0)
+                               bb += ' ';
                        lex.next();
-                       bb += (lex.getString()+" ");
+                       bb += lex.getString();
                }
        } else if (token == "clip") {
                clip = true;
@@ -221,18 +223,23 @@ 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();
 
        // catch and ignore following two old-format tokens and their arguments.
-       // e.g. "size_kind scale" clashes with the setting of the "scale" keyword.
+       // e.g. "size_kind scale" clashes with the setting of the
+       // "scale <value>" keyword.
        } else if (token == "size_kind" || token == "lyxsize_kind") {
                lex.next();
                lex.getString();
-       } else {        // If it's none of the above, it's not ours.
+
+       } else {
+               // If it's none of the above, it's not ours.
                return false;
        }
        return true;
@@ -259,22 +266,22 @@ grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) const
                        unsigned int const bb_orig_xl = strToInt(token(tmp, ' ', 0));
                        unsigned int const bb_orig_yb = strToInt(token(tmp, ' ', 1));
 
-                       // new pars.bb values must be >= zero 
+                       // new pars.bb values must be >= zero
                        if  (pars.bb.xl > bb_orig_xl)
                                pars.bb.xl -= bb_orig_xl;
                        else
                                pars.bb.xl = 0;
-                       
+
                        if (pars.bb.xr > bb_orig_xl)
                                pars.bb.xr -= bb_orig_xl;
                        else
                                pars.bb.xr = 0;
-                               
+
                        if (pars.bb.yb > bb_orig_yb)
                                pars.bb.yb -= bb_orig_yb;
                        else
                                pars.bb.yb = 0;
-                               
+
                        if (pars.bb.yt > bb_orig_yb)
                                pars.bb.yt -= bb_orig_yb;
                        else
@@ -292,15 +299,15 @@ grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) const
                        pars.bb.yt = 0;
                }
        }
-       
+
        if (display == grfx::DefaultDisplay) {
                pars.display = lyxrc.display_graphics;
        } else {
                pars.display = display;
        }
-       
+
        // Override the above if we're not using a gui
-       if (!lyxrc.use_gui) {
+       if (!lyx_gui::use_gui) {
                pars.display = grfx::NoDisplay;
        }