#include "graphics/GraphicsCache.h"
#include "graphics/GraphicsImage.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxtext.h"
#include "buffer.h"
#include "BufferView.h"
#include "converter.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "lyxrc.h"
-#include "font.h" // For the lyxfont class.
+#include "frontends/font_metrics.h"
#include "debug.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
InsetGraphics::~InsetGraphics()
{
- cached_image_.reset(0);
+ cached_image_.reset();
grfx::GCache & gc = grfx::GCache::get();
gc.remove(*this);
string const justname = OnlyFilename (params().filename);
if (!justname.empty()) {
msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- font_width = lyxfont::width(justname, msgFont);
+ font_width = font_metrics::width(justname, msgFont);
}
string const msg = statusMessage();
if (!msg.empty()) {
msgFont.setSize(LyXFont::SIZE_TINY);
- int const msg_width = lyxfont::width(msg, msgFont);
+ int const msg_width = font_metrics::width(msg, msgFont);
font_width = std::max(font_width, msg_width);
}
string const justname = OnlyFilename (params().filename);
if (!justname.empty()) {
msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- paint.text(old_x + 8,
- baseline - lyxfont::maxAscent(msgFont) - 4,
+ paint.text(old_x + 8,
+ baseline - font_metrics::maxAscent(msgFont) - 4,
justname, msgFont);
}
// Reset the cache, ready for the next draw request
cached_status_ = grfx::ErrorUnknown;
- cached_image_.reset(0);
+ cached_image_.reset();
cache_filled_ = false;
}
}
-void InsetGraphics::edit(BufferView *bv, int, int, unsigned int)
+void InsetGraphics::edit(BufferView *bv, int, int, mouse_button::state)
{
bv->owner()->getDialogs()->showGraphics(this);
}
void InsetGraphics::edit(BufferView * bv, bool)
{
- edit(bv, 0, 0, 0);
+ edit(bv, 0, 0, mouse_button::none);
}
// lyxrc.pdf_mode means:
// Are we creating a PDF or a PS file?
// (Should actually mean, are we using latex or pdflatex).
- lyxerr[Debug::GRAPHICS] << "findTargetFormat: lyxrc.pdf_mode = "
- << lyxrc.pdf_mode << std::endl;
if (lyxrc.pdf_mode) {
+ lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode\n";
if (contains(suffix,"ps") || suffix == "pdf")
return "pdf";
- else if (suffix == "jpg")
+ else if (suffix == "jpg") // pdflatex can use jpeg
return suffix;
else
- return "png";
+ return "png"; // and also png
}
// If it's postscript, we always do eps.
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PostScript mode\n";
- if (suffix != "ps")
- return "eps";
+ if (suffix != "ps") // any other than ps
+ return "eps"; // is changed to eps
else
- return "ps";
+ return suffix; // let ps untouched
}
} // Anon. namespace
string const orig_file = params().filename;
string const orig_file_with_path =
MakeAbsPath(orig_file, buf->filePath());
+ lyxerr[Debug::GRAPHICS] << "prepareFile: " << orig_file << endl
+ << " with path: " << orig_file_with_path << endl;
if (!IsFileReadable(orig_file_with_path))
return orig_file;
// If the file is compressed and we have specified that it should not be
// uncompressed, then just return its name and let LaTeX do the rest!
- bool const zipped = zippedFile(orig_file);
+ bool const zipped = zippedFile(orig_file_with_path);
+ if (zipped)
+ lyxerr[Debug::GRAPHICS] << "it's a zipped file\n";
if (zipped && params().noUnzip) {
+ lyxerr[Debug::GRAPHICS] << "pass file unzipped to LaTeX\n";
return orig_file;
}
// Perform all these manipulations on a temporary file if possible.
// If we are not using a temp dir, then temp_file contains the
// original file.
- string temp_file = MakeAbsPath(OnlyFilename(orig_file), buf->tmppath);
-
+ // to allow files with the same name in different dirs
+ // we manipulate the original file "any.dir/file.ext"
+ // to "any_dir_file.ext"! changing the dots in the
+ // dirname is important for the use of ChangeExtension
+ string temp_file(orig_file);
+ if (lyxrc.use_tempdir) {
+ string const ext_tmp = GetExtension(orig_file);
+ // without ext and /
+ temp_file = subst(
+ ChangeExtension(temp_file, string()), "/", "_");
+ // without . and again with ext
+ temp_file = ChangeExtension(
+ subst(temp_file, ".", "_"), ext_tmp);
+ // now we have any_dir_file.ext
+ temp_file = MakeAbsPath(temp_file, buf->tmppath);
+ }
lyxerr[Debug::GRAPHICS]
<< "InsetGraphics::prepareFile. The temp file is: "
<< temp_file << endl;
if (lyxrc.use_tempdir && !IsFileReadable(temp_file)) {
bool const success = lyx::copy(orig_file_with_path, temp_file);
lyxerr[Debug::GRAPHICS]
- << "InsetGraphics::prepareFile. Copying from "
+ << "InsetGraphics::prepareFile. Copying from "
<< orig_file << " to " << temp_file
<< (success ? " succeeded\n" : " failed\n");
if (!success) {
// Uncompress the file if necessary. If it has been uncompressed in
// a previous call to prepareFile, do nothing.
- if (zipped) {
+ if (zipped) {
// What we want to end up with:
string const temp_file_unzipped =
ChangeExtension(temp_file, string());
}
// Ascertain the graphics format that LaTeX requires.
- string const from = getExtFromContents(temp_file);
+ // Make again an absolute path, maybe that we have no
+ // tempdir. Than temp_file=orig_file
+ string const from = lyxrc.use_tempdir ?
+ getExtFromContents(temp_file) :
+ getExtFromContents(MakeAbsPath(temp_file, buf->filePath()));
string const to = findTargetFormat(from);
// No conversion is needed. LaTeX can handle the graphics file as it is.
lyxerr[Debug::GRAPHICS]
<< "InsetGraphics::prepareFile. The original file is "
- << orig_file << ".\n"
+ << orig_file << "\n"
<< "A copy has been made and convert is to be called with:\n"
<< "\tfile to convert = " << temp_file << '\n'
<< "\toutfile_base = " << outfile_base << '\n'
// A missing (e)ps-extension is no problem for LaTeX, so
// we have to test three different cases
string const file_(MakeAbsPath(params().filename, buf->filePath()));
- bool const file_exists =
- !file_.empty() &&
+ bool const file_exists =
+ !file_.empty() &&
(IsFileReadable(file_) || // original
- IsFileReadable(file_ + ".eps") || // original.eps
+ IsFileReadable(file_ + ".eps") || // original.eps
IsFileReadable(file_ + ".ps")); // original.ps
- string const message = file_exists ?
+ string const message = file_exists ?
string() : string("bb = 0 0 200 100, draft, type=eps]");
// if !message.empty() than there was no existing file
// "filename(.(e)ps)" found. In this case LaTeX
if (params().filename.empty())
return ;
- features.includeFile(graphic_label, RemoveExtension(params_.filename));
+ features.includeFile(graphic_label, RemoveExtension(params().filename));
features.require("graphicx");
projects / lyx.git / blobdiff