X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphicsParams.cpp;h=c7419b39eaeae8f77d04c0c342c8feadab7e013c;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=9d85bb2a4b0b74f9f16f38cf675cb57e15205186;hpb=b89cc942eb458284f40f4d4e7db58890c3288979;p=lyx.git

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index 9d85bb2a4b..c7419b39ea 100644
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -13,7 +13,6 @@
 
 #include "InsetGraphicsParams.h"
 
-#include "support/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"
@@ -145,8 +145,7 @@ 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 << "\tinzipName " << filename.inzipName() << '\n';
-		os << "\tembed " << (filename.embedded() ? "true" : "false") << '\n';
+		os << "\tembed " << (filename.embedded() ? filename.inzipName() : "\"\"") << '\n';
 	}
 	if (lyxscale != 100)
 		os << "\tlyxscale " << lyxscale << '\n';
@@ -196,11 +195,15 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
 		lex.eatLine();
 		filename.set(lex.getString(), bufpath);
 	} else if (token == "inzipName") {
+		// this option is currently ignored because only files in
+		// or under current document path is embeddable, and their
+		// inzipName is automatically determined.
 		lex.eatLine();
-		filename.setInzipName(lex.getString());
 	} else if (token == "embed") {
 		lex.next();
-		filename.setEmbed(lex.getBool());		
+		string const name = lex.getString();
+		filename.setInzipName(name);
+		filename.setEmbed(!name.empty());
 	} else if (token == "lyxscale") {
 		lex.next();
 		lyxscale = lex.getInteger();
@@ -272,7 +275,8 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
 graphics::Params InsetGraphicsParams::as_grfxParams() const
 {
 	graphics::Params pars;
-	pars.filename = filename;
+	pars.filename = filename.availableFile();
+	pars.icon = filename.embedded() ? "pin.png" : "";
 	pars.scale = lyxscale;
 	pars.angle = convert<double>(rotateAngle);