X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.cpp;h=3055be90935deb7121acf4bb189830dd56771226;hb=9b530e59c2b74828f3a68f3bb7ee3dee0365cdc0;hp=38cbfa72fc3b3e6a3eb3a326ce1b5e5bae2464f0;hpb=c73d9adeb7dcb52fec5beb8ece6eb48848e72875;p=lyx.git

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 38cbfa72fc..3055be9093 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -110,7 +110,7 @@ string findTargetFormat(string const & format, OutputParams const & runparams)
 		Format const * const f = formats.getFormat(format);
 		// Convert vector graphics to pdf
 		if (f && f->vectorFormat())
-			return "pdf";
+			return "pdf6";
 		// pdflatex can use jpeg, png and pdf directly
 		if (format == "jpg")
 			return format;
@@ -203,6 +203,11 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_INSET_MODIFY: {
+		if (cmd.getArg(0) != "graphics") {
+			Inset::doDispatch(cur, cmd);
+			break;
+		}
+
 		InsetGraphicsParams p;
 		string2params(to_utf8(cmd.argument()), buffer(), p);
 		if (p.filename.empty()) {
@@ -240,8 +245,11 @@ bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
 	switch (cmd.action()) {
-	case LFUN_INSET_EDIT:
 	case LFUN_INSET_MODIFY:
+		if (cmd.getArg(0) != "graphics")
+			return Inset::getStatus(cur, cmd, flag);
+	// fall through
+	case LFUN_INSET_EDIT:
 	case LFUN_INSET_DIALOG_UPDATE:
 	case LFUN_GRAPHICS_RELOAD:
 		flag.setEnabled(true);
@@ -487,7 +495,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
 	string const file_in = file.absFileName();
 	string const only_path = onlyPath(file_in);
 	if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/"))
-		return make_pair(IDENTICAL_PATHS, file_in);
+		return make_pair(IDENTICAL_PATHS, FileName(file_in));
 
 	string mangled = file.mangledFileName();
 	if (formats.isZippedFile(file)) {
@@ -809,7 +817,8 @@ void InsetGraphics::latex(otexstream & os,
 }
 
 
-int InsetGraphics::plaintext(odocstream & os, OutputParams const &) const
+int InsetGraphics::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	// No graphics in ascii output. Possible to use gifscii to convert
 	// images to ascii approximation.
@@ -1046,13 +1055,11 @@ void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const
 }
 
 
-void InsetGraphics::addToToc(DocIterator const & cpit) const
+void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active) const
 {
-	TocBackend & backend = buffer().tocBackend();
-
 	//FIXME UNICODE
 	docstring const str = from_utf8(params_.filename.onlyFileName());
-	backend.toc("graphics").push_back(TocItem(cpit, 0, str));
+	buffer().tocBackend().toc("graphics").push_back(TocItem(cpit, 0, str, output_active));
 }
 
 
@@ -1164,7 +1171,7 @@ void unifyGraphicsGroups(Buffer & b, string const & argument)
 			InsetGraphics & ins = static_cast<InsetGraphics &>(*it);
 			InsetGraphicsParams inspar = ins.getParams();
 			if (params.groupId == inspar.groupId) {
-				b.undo().recordUndo(it);
+				b.undo().recordUndo(CursorData(it));
 				params.filename = inspar.filename;
 				ins.setParams(params);
 			}