X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphicsParams.cpp;h=ad796d7638ff0f3794bb27ec6ba11f9bdd7d3200;hb=4a1be58591ea5a7431d9426abb27d8b946c634cb;hp=5e3cfeb537c43d0f50d473bf92668161edcf4012;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index 5e3cfeb537..ad796d7638 100644
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -13,7 +13,6 @@
 
 #include "InsetGraphicsParams.h"
 
-#include "debug.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -23,6 +22,7 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
@@ -30,17 +30,11 @@
 
 #include <ostream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::float_equal;
-using support::readBB_from_PSFile;
-using support::token;
-using support::DocFileName;
-
-using std::string;
-using std::ostream;
-
 
 InsetGraphicsParams::InsetGraphicsParams()
 {
@@ -70,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();
@@ -84,9 +78,8 @@ void InsetGraphicsParams::init()
 
 	rotateAngle = "0";		// angle of rotation in degrees
 	rotateOrigin.erase();		// Origin of rotation
-	subcaption = false;		// subfigure
-	subcaptionText.erase();		// subfigure caption
 	special.erase();		// additional userdefined stuff
+	groupId.clear();
 }
 
 
@@ -108,9 +101,8 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
 
 	rotateAngle = igp.rotateAngle;
 	rotateOrigin = igp.rotateOrigin;
-	subcaption = igp.subcaption;
-	subcaptionText = igp.subcaptionText;
 	special = igp.special;
+	groupId = igp.groupId;
 }
 
 
@@ -133,9 +125,8 @@ bool operator==(InsetGraphicsParams const & left,
 
 	    left.rotateAngle == right.rotateAngle &&
 	    left.rotateOrigin == right.rotateOrigin &&
-	    left.subcaption == right.subcaption &&
-	    left.subcaptionText == right.subcaptionText &&
-	    left.special == right.special;
+	    left.special == right.special &&
+	    left.groupId == right.groupId;
 }
 
 
@@ -149,15 +140,12 @@ bool operator!=(InsetGraphicsParams const & left,
 void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
 {
 	// Do not write the default values
-	if (!filename.empty()) {
+	if (!filename.empty())
 		os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
-		os << "\tinzipName " << filename.inzipName() << '\n';
-		os << "\tembed " << (filename.embedded() ? "true" : "false") << '\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';
@@ -187,12 +175,10 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
 		os << "\trotateAngle " << rotateAngle << '\n';
 	if (!rotateOrigin.empty())
 		os << "\trotateOrigin " << rotateOrigin << '\n';
-	if (subcaption)
-		os << "\tsubcaption\n";
-	if (!subcaptionText.empty())
-		os << "\tsubcaptionText \"" << subcaptionText << '\"' << '\n';
 	if (!special.empty())
 		os << "\tspecial " << special << '\n';
+	if (!groupId.empty())
+		os << "\tgroupId "<< groupId << '\n';
 }
 
 
@@ -201,19 +187,13 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
 	if (token == "filename") {
 		lex.eatLine();
 		filename.set(lex.getString(), bufpath);
-	} else if (token == "inzipName") {
-		lex.eatLine();
-		filename.setInzipName(lex.getString());
-	} else if (token == "embed") {
-		lex.next();
-		filename.setEmbed(lex.getBool());		
 	} else if (token == "lyxscale") {
 		lex.next();
 		lyxscale = lex.getInteger();
 	} 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();
@@ -249,16 +229,12 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
 	} else if (token == "rotateOrigin") {
 		lex.next();
 		rotateOrigin=lex.getString();
-	} else if (token == "subcaption") {
-		subcaption = true;
-	} else if (token == "subcaptionText") {
-		lex.eatLine();
-		string sub = lex.getString();
-		// strip surrounding " "
-		subcaptionText = sub.substr(1, sub.length() - 2);
 	} 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
@@ -327,15 +303,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;
 }