Add a layout tag ForceOwnlines that assures an inset is started and terminated by...

[lyx.git] / src / insets / InsetGraphicsParams.cpp

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index 35fb9bcb516ea0c0c5bcdf1a7ba0deb6d384fbe7..f4cd119f6e34ffd762e24c1bf3b8ce52d8a2ced4 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,17 +13,17 @@
 
 #include "InsetGraphicsParams.h"
 
+#include "Buffer.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
-#include "Buffer.h"
 
+#include "graphics/epstools.h"
 #include "graphics/GraphicsParams.h"
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
-#include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/Translator.h"
@@ -64,7 +64,7 @@ void InsetGraphicsParams::init()
 {
        filename.erase();
        lyxscale = 100;                 // lyx scaling in percentage
-       display = graphics::DefaultDisplay; // display mode; see preferences
+       display = true;         // may be overriden by display mode in preferences
        scale = string("100");                  // output scaling in percentage
        width = Length();
        height = Length();
@@ -79,6 +79,7 @@ void InsetGraphicsParams::init()
        rotateAngle = "0";              // angle of rotation in degrees
        rotateOrigin.erase();           // Origin of rotation
        special.erase();                // additional userdefined stuff
+       groupId.clear();
 }
 
 
@@ -101,6 +102,7 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
        rotateAngle = igp.rotateAngle;
        rotateOrigin = igp.rotateOrigin;
        special = igp.special;
+       groupId = igp.groupId;
 }
 
 
@@ -123,7 +125,8 @@ bool operator==(InsetGraphicsParams const & left,
 
            left.rotateAngle == right.rotateAngle &&
            left.rotateOrigin == right.rotateOrigin &&
-           left.special == right.special;
+           left.special == right.special &&
+           left.groupId == right.groupId;
 }
 
 
@@ -138,11 +141,11 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
 {
        // Do not write the default values
        if (!filename.empty())
-               os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
+               os << "\tfilename " << filename.outputFileName(buffer.filePath()) << '\n';
        if (lyxscale != 100)
                os << "\tlyxscale " << lyxscale << '\n';
-       if (display != graphics::DefaultDisplay)
-               os << "\tdisplay " << graphics::displayTranslator().find(display) << '\n';
+       if (!display)
+               os << "\tdisplay false\n";
        if (!scale.empty() && !float_equal(convert<double>(scale), 0.0, 0.05)) {
                if (!float_equal(convert<double>(scale), 100.0, 0.05))
                        os << "\tscale " << scale << '\n';
@@ -174,6 +177,8 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
                os << "\trotateOrigin " << rotateOrigin << '\n';
        if (!special.empty())
                os << "\tspecial " << special << '\n';
+       if (!groupId.empty())
+               os << "\tgroupId "<< groupId << '\n';
 }
 
 
@@ -188,7 +193,7 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
        } else if (token == "display") {
                lex.next();
                string const type = lex.getString();
-               display = graphics::displayTranslator().find(type);
+               display = lex.getString() != "false";
        } else if (token == "scale") {
                lex.next();
                scale = lex.getString();
@@ -227,6 +232,9 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
        } else if (token == "special") {
                lex.eatLine();
                special = lex.getString();
+       } else if (token == "groupId") {
+               lex.eatLine();
+               groupId = lex.getString();
 
        // catch and ignore following two old-format tokens and their arguments.
        // e.g. "size_kind scale" clashes with the setting of the
@@ -254,12 +262,11 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const
                pars.bb = bb;
 
                // Get the original Bounding Box from the file
-               string const tmp = readBB_from_PSFile(filename);
+               string const tmp = graphics::readBB_from_PSFile(filename);
                LYXERR(Debug::GRAPHICS, "BB_from_File: " << tmp);
                if (!tmp.empty()) {
-                       // FIXME: why not convert to unsigned int? (Lgb)
-                       unsigned int const bb_orig_xl = convert<int>(token(tmp, ' ', 0));
-                       unsigned int const bb_orig_yb = convert<int>(token(tmp, ' ', 1));
+                       unsigned int const bb_orig_xl = convert<unsigned int>(token(tmp, ' ', 0));
+                       unsigned int const bb_orig_yb = convert<unsigned int>(token(tmp, ' ', 1));
 
                        // new pars.bb values must be >= zero
                        if (pars.bb.xl > bb_orig_xl)
@@ -295,15 +302,11 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const
                }
        }
 
-       if (display == graphics::DefaultDisplay) {
-               pars.display = graphics::DisplayType(lyxrc.display_graphics);
-       } else {
-               pars.display = display;
-       }
+       pars.display = display;
 
        // Override the above if we're not using a gui
        if (!use_gui)
-               pars.display = graphics::NoDisplay;
+               pars.display = false;
 
        return pars;
 }