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;
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)) {
bool const file_exists = !params().filename.empty()
&& params().filename.isReadableFile();
- string const message = file_exists ?
- string() : string("bb = 0 0 200 100, draft, type=eps");
- // if !message.empty() then there was no existing file
- // "filename" found. In this case LaTeX
+ string message;
+ if (!file_exists) {
+ if (params().bb.empty())
+ message = "bb = 0 0 200 100";
+ if (!params().draft) {
+ if (!message.empty())
+ message += ", ";
+ message += "draft";
+ }
+ if (!message.empty())
+ message += ", ";
+ message += "type=eps";
+ }
+ // If no existing file "filename" was found LaTeX
// draws only a rectangle with the above bb and the
// not found filename in it.
LYXERR(Debug::GRAPHICS, "\tMessage = \"" << message << '\"');
// Remove the extension so LaTeX will use whatever is appropriate
// (when there are several versions in different formats)
string file_path = prepareFile(runparams);
- if (!runparams.export_folder.empty()) {
- // Relative pathnames starting with ../ will be sanitized
- // if exporting to a different folder
- while (file_path.substr(0, 17) == "\\lyxdot \\lyxdot /")
- file_path = file_path.substr(17, file_path.length() - 17);
- }
latex_str += file_path;
latex_str += '}' + after;
// FIXME UNICODE
}
-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.
features.require("graphicx");
if (features.runparams().nice) {
- Buffer const * masterBuffer = features.buffer().masterBuffer();
- string const rel_file = removeExtension(
- params().filename.relFileName(masterBuffer->filePath()));
+ string const rel_file = params().filename.onlyFileNameWithoutExt();
if (contains(rel_file, "."))
features.require("lyxdot");
}
}
-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));
}
return data.str();
}
+
+docstring InsetGraphics::toolTip(BufferView const &, int, int) const
+{
+ return from_utf8(params().filename.onlyFileName());
+}
+
namespace graphics {
void getGraphicsGroups(Buffer const & b, set<string> & ids)
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);
}