#include "frontends/alert.h"
#include "frontends/Application.h"
+#include "graphics/GraphicsCache.h"
+#include "graphics/GraphicsCacheItem.h"
+#include "graphics/GraphicsImage.h"
+
#include "support/convert.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/lyxlib.h"
#include "support/lstrings.h"
#include "support/os.h"
+#include "support/qstring_helpers.h"
#include "support/Systemcall.h"
+#include <QProcess>
+
#include <algorithm>
#include <sstream>
#include <tuple>
/// Note that \p format may be unknown (i. e. an empty string)
string findTargetFormat(string const & format, OutputParams const & runparams)
{
- // Are we using latex or XeTeX/LuaTeX/pdflatex?
+ // Are we latexing to DVI or PDF?
if (runparams.flavor == OutputParams::PDFLATEX
|| runparams.flavor == OutputParams::XETEX
|| runparams.flavor == OutputParams::LUATEX) {
}
+void InsetGraphics::outBoundingBox(graphics::BoundingBox & bbox) const
+{
+ if (bbox.empty())
+ return;
+
+ FileName const file(params().filename.absFileName());
+
+ // No correction is necessary for a postscript image
+ bool const zipped = theFormats().isZippedFile(file);
+ FileName const unzipped_file = zipped ? unzipFile(file) : file;
+ string const format = theFormats().getFormatFromFile(unzipped_file);
+ if (zipped)
+ unzipped_file.removeFile();
+ if (Formats::isPostScriptFileFormat(format))
+ return;
+
+ // Get the actual image dimensions in pixels
+ int width = 0;
+ int height = 0;
+ graphics::Cache & gc = graphics::Cache::get();
+ if (gc.inCache(file)) {
+ graphics::Image const * image = gc.item(file)->image();
+ if (image) {
+ width = image->width();
+ height = image->height();
+ }
+ }
+ if (width == 0 || height == 0)
+ return;
+
+ // Use extractbb to find the dimensions in the typeset output
+ QProcess extractbb;
+ extractbb.start("extractbb", QStringList() << "-O" << toqstr(file.absFileName()));
+ if (!extractbb.waitForStarted() || !extractbb.waitForFinished()) {
+ LYXERR0("Cannot read output bounding box of " << file);
+ return;
+ }
+
+ string const result = extractbb.readAll().constData();
+ size_t i = result.find("%%BoundingBox:");
+ if (i == string::npos) {
+ LYXERR0("Cannot find output bounding box of " << file);
+ return;
+ }
+
+ string const bb = result.substr(i);
+ int out_width = convert<int>(token(bb, ' ', 3));
+ int out_height = convert<int>(token(bb, ' ', 4));
+
+ // Compute the scaling ratio and correct the bounding box
+ double scalex = out_width / double(width);
+ double scaley = out_height / double(height);
+
+ bbox.xl.value(scalex * bbox.xl.value());
+ bbox.xr.value(scalex * bbox.xr.value());
+ bbox.yb.value(scaley * bbox.yb.value());
+ bbox.yt.value(scaley * bbox.yt.value());
+}
+
+
string InsetGraphics::createLatexOptions(bool const ps) const
{
// Calculate the options part of the command, we must do it to a string
// before writing it to the output stream.
ostringstream options;
if (!params().bbox.empty()) {
+ graphics::BoundingBox out_bbox = params().bbox;
+ outBoundingBox(out_bbox);
string const key = ps ? "bb=" : "viewport=";
- options << key << params().bbox.xl.asLatexString() << ' '
- << params().bbox.yb.asLatexString() << ' '
- << params().bbox.xr.asLatexString() << ' '
- << params().bbox.yt.asLatexString() << ',';
+ options << key << out_bbox.xl.asLatexString() << ' '
+ << out_bbox.yb.asLatexString() << ' '
+ << out_bbox.xr.asLatexString() << ' '
+ << out_bbox.yt.asLatexString() << ',';
}
if (params().draft)
options << "draft,";
// extension removed, because base.eps and base.eps.gz may
// have different content but would get the same mangled
// name in this case.
+ // Also take into account that if the name of the zipped file
+ // has no zip extension then the name of the unzipped one is
+ // prefixed by "unzipped_".
string const base = removeExtension(file.unzippedFileName());
- string::size_type const ext_len = file_in.length() - base.length();
+ string::size_type const prefix_len =
+ prefixIs(onlyFileName(base), "unzipped_") ? 9 : 0;
+ string::size_type const ext_len =
+ file_in.length() + prefix_len - base.length();
mangled[mangled.length() - ext_len] = '.';
}
FileName const file_out(makeAbsPath(mangled, dir));
// FIXME (Abdel 12/08/06): Is there a need to show these errors?
ErrorList el;
- if (theConverters().convert(&buffer(), temp_file, to_file, params().filename,
+ Converters::RetVal const rv =
+ theConverters().convert(&buffer(), temp_file, to_file, params().filename,
from, to, el,
- Converters::try_default | Converters::try_cache)) {
+ Converters::try_default | Converters::try_cache);
+ if (rv == Converters::KILLED) {
+ LYXERR0("Graphics preparation killed.");
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ } else if (rv == Converters::SUCCESS) {
runparams.exportdata->addExternalFile(tex_format,
to_file, output_to_file);
runparams.exportdata->addExternalFile("dvi",
// FIXME (Abdel 12/08/06): Is there a need to show these errors?
ErrorList el;
- bool const success =
+ Converters::RetVal const rv =
theConverters().convert(&buffer(), temp_file, to_file, params().filename,
from, to, el, Converters::try_default | Converters::try_cache);
- if (!success)
+ if (rv == Converters::KILLED) {
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ return string();
+ }
+ if (rv != Converters::SUCCESS)
return string();
runparams.exportdata->addExternalFile("xhtml", to_file, output_to_file);
return output_to_file;
projects / lyx.git / blobdiff