-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995-2002 the LyX Team.
+/**
+ * \file insetgraphics.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author Baruch Even
- * \author Herbert Voss <voss@lyx.org>
- * ====================================================== */
+ * \author Herbert Voss
+ *
+ * Full author contact details are available in file CREDITS
+ */
/*
-Known BUGS:
-
- * If the image is from the clipart, and the document is moved to another
- directory, the user is screwed. Need a way to handle it.
- This amounts to a problem of when to use relative or absolute file paths
- We should probably use what the user asks to use... but when he chooses
- by the file dialog we normally get an absolute path and this may not be
- what the user meant.
-
- Note that browseRelFile in helper_funcs.* provides a file name
- which is relative if it is at reference path (here puffer path)
- level or below, and an absolute path if the file name is not a
- `natural' relative file name. In any case,
- MakeAbsPath(filename, buf->filePath())
- is guaranteed to provide the correct absolute path. This is what is
- done know for include insets. Feel free to ask me -- JMarc
- 14/01/2002
-
-TODO Before initial production release:
+TODO
* What advanced features the users want to do?
Implement them in a non latex dependent way, but a logical way.
* Add a way to roll the image file into the file format.
* When loading, if the image is not found in the expected place, try
to find it in the clipart, or in the same directory with the image.
- * Keep a tab on the image file, if it changes, update the lyx view.
* The image choosing dialog could show thumbnails of the image formats
it knows of, thus selection based on the image instead of based on
filename.
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "insets/insetgraphics.h"
#include "insets/insetgraphicsParams.h"
+#include "insets/renderers.h"
-#include "graphics/GraphicsCache.h"
-#include "graphics/GraphicsImage.h"
-
-#include "LyXView.h"
-#include "lyxtext.h"
#include "buffer.h"
#include "BufferView.h"
#include "converter.h"
-#include "Painter.h"
-#include "lyxrc.h"
-#include "font.h" // For the lyxfont class.
#include "debug.h"
+#include "format.h"
+#include "funcrequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
+#include "Lsstream.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
-#include "frontends/controllers/helper_funcs.h" // getVectorFromString
-#include "support/LAssert.h"
#include "support/filetools.h"
#include "support/lyxalgo.h" // lyx::count
+#include "support/lyxlib.h" // float_equal
+#include "support/tostr.h"
+#include "support/systemcall.h"
+
+#include <boost/bind.hpp>
#include <algorithm> // For the std::max
extern string system_tempdir;
+// set by Exporters
+
+using namespace lyx::support;
using std::ostream;
using std::endl;
+
+namespace {
+
///////////////////////////////////////////////////////////////////////////
int const VersionNumber = 1;
///////////////////////////////////////////////////////////////////////////
-namespace {
-
// This function is a utility function
// ... that should be with ChangeExtension ...
inline
return ChangeExtension(filename, string());
}
-} // namespace anon
-
-
-namespace {
-string const unique_id()
+string const uniqueID()
{
static unsigned int seed = 1000;
-
- ostringstream ost;
- ost << "graph" << ++seed;
-
- // Needed if we use lyxstring.
- return ost.str().c_str();
+ return "graph" + tostr(++seed);
}
-} // namespace anon
-
-
-InsetGraphics::InsetGraphics()
- : graphic_label(unique_id()),
- cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
-
-{}
-
-InsetGraphics::InsetGraphics(InsetGraphics const & ig, bool same_id)
- : Inset(ig, same_id),
- SigC::Object(),
- graphic_label(unique_id()),
- cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
+string findTargetFormat(string const & suffix, LatexRunParams const & runparams)
{
- setParams(ig.params());
+ // Are we using latex or pdflatex).
+ if (runparams.flavor == LatexRunParams::PDFLATEX) {
+ lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode\n";
+ if (contains(suffix, "ps") || suffix == "pdf")
+ return "pdf";
+ if (suffix == "jpg") // pdflatex can use jpeg
+ return suffix;
+ return "png"; // and also png
+ }
+ // If it's postscript, we always do eps.
+ lyxerr[Debug::GRAPHICS] << "findTargetFormat: PostScript mode\n";
+ if (suffix != "ps") // any other than ps
+ return "eps"; // is changed to eps
+ return suffix; // let ps untouched
}
-
-InsetGraphics::~InsetGraphics()
-{
- cached_image_.reset(0);
- grfx::GCache & gc = grfx::GCache::get();
- gc.remove(*this);
-
- // Emits the hide signal to the dialog connected (if any)
- hideDialog();
-}
+} // namespace anon
-string const InsetGraphics::statusMessage() const
+InsetGraphics::InsetGraphics()
+ : graphic_label(uniqueID()),
+ graphic_(new GraphicRenderer)
{
- string msg;
-
- switch (cached_status_) {
- case grfx::WaitingToLoad:
- msg = _("Waiting for draw request to start loading...");
- break;
- case grfx::Loading:
- msg = _("Loading...");
- break;
- case grfx::Converting:
- msg = _("Converting to loadable format...");
- break;
- case grfx::ScalingEtc:
- msg = _("Loaded. Scaling etc...");
- break;
- case grfx::ErrorNoFile:
- msg = _("No file found!");
- break;
- case grfx::ErrorLoading:
- msg = _("Error loading file into memory");
- break;
- case grfx::ErrorConverting:
- msg = _("Error converting to loadable format");
- break;
- case grfx::ErrorScalingEtc:
- msg = _("Error scaling etc");
- break;
- case grfx::ErrorUnknown:
- msg = _("No image");
- break;
- case grfx::Loaded:
- msg = _("Loaded but not displaying");
- break;
- }
-
- return msg;
+ graphic_->connect(boost::bind(&InsetGraphics::statusChanged, this));
}
-void InsetGraphics::setCache() const
+InsetGraphics::InsetGraphics(InsetGraphics const & ig)
+ : Inset(ig),
+ boost::signals::trackable(),
+ graphic_label(uniqueID()),
+ graphic_(new GraphicRenderer(*ig.graphic_))
{
- if (cache_filled_)
- return;
-
- grfx::GCache & gc = grfx::GCache::get();
- cached_status_ = gc.status(*this);
- cached_image_ = gc.image(*this);
+ graphic_->connect(boost::bind(&InsetGraphics::statusChanged, this));
+ setParams(ig.params());
}
-bool InsetGraphics::drawImage() const
+InsetBase * InsetGraphics::clone() const
{
- setCache();
- Pixmap const pixmap =
- (cached_status_ == grfx::Loaded && cached_image_.get() != 0) ?
- cached_image_->getPixmap() : 0;
-
- return pixmap != 0;
+ return new InsetGraphics(*this);
}
-int InsetGraphics::ascent(BufferView *, LyXFont const &) const
+InsetGraphics::~InsetGraphics()
{
- old_asc = 50;
- if (drawImage())
- old_asc = cached_image_->getHeight();
- return old_asc;
+ InsetGraphicsMailer(*this).hideDialog();
}
-int InsetGraphics::descent(BufferView *, LyXFont const &) const
+void InsetGraphics::statusChanged()
{
- return 0;
+ BufferView * bv = graphic_->view();
+ if (bv)
+ bv->updateInset(this);
}
-int InsetGraphics::width(BufferView *, LyXFont const & font) const
+dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
{
- if (drawImage())
- return cached_image_->getWidth();
- else {
- int font_width = 0;
-
- LyXFont msgFont(font);
- msgFont.setFamily(LyXFont::SANS_FAMILY);
-
- string const justname = OnlyFilename (params().filename);
- if (!justname.empty()) {
- msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- font_width = lyxfont::width(justname, msgFont);
- }
-
- string const msg = statusMessage();
- if (!msg.empty()) {
- msgFont.setSize(LyXFont::SIZE_TINY);
- int const msg_width = lyxfont::width(msg, msgFont);
- font_width = std::max(font_width, msg_width);
+ switch (cmd.action) {
+ case LFUN_INSET_MODIFY: {
+ string const bufpath = cmd.view()->buffer()->filePath();
+ InsetGraphicsParams p;
+ InsetGraphicsMailer::string2params(cmd.argument, bufpath, p);
+ if (!p.filename.empty()) {
+ setParams(p);
+ cmd.view()->updateInset(this);
}
-
- return std::max(50, font_width + 15);
+ return DISPATCHED;
}
-}
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetGraphicsMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
-void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
- int baseline, float & x, bool) const
-{
- int oasc = old_asc;
- grfx::ImageStatus old_status_ = cached_status_;
-
- int ldescent = descent(bv, font);
- int lascent = ascent(bv, font);
- int lwidth = width(bv, font);
-
- // we may have changed while someone other was drawing us so better
- // to not draw anything as we surely call to redraw ourself soon.
- // This is not a nice thing to do and should be fixed properly somehow.
- // But I still don't know the best way to go. So let's do this like this
- // for now (Jug 20020311)
- if (lascent != oasc) {
-// lyxerr << "IG(" << this << "): " << x << endl;
- return;
- }
-
- // Make sure now that x is updated upon exit from this routine
- int old_x = int(x);
- x += lwidth;
+ case LFUN_INSET_EDIT:
+ case LFUN_MOUSE_RELEASE:
+ InsetGraphicsMailer(*this).showDialog(cmd.view());
+ return DISPATCHED;
- // Initiate the loading of the graphics file
- if (cached_status_ == grfx::WaitingToLoad) {
- grfx::GCache & gc = grfx::GCache::get();
- gc.startLoading(*this);
+ default:
+ return Inset::localDispatch(cmd);
}
-
- // This will draw the graphics. If the graphics has not been loaded yet,
- // we draw just a rectangle.
- Painter & paint = bv->painter();
-
- if (drawImage()) {
-// lyxerr << "IG(" << this << "): " << old_x << endl;
- paint.image(old_x + 2, baseline - lascent,
- lwidth - 4, lascent + ldescent,
- *cached_image_.get());
-
- } else {
-
- paint.rectangle(old_x + 2, baseline - lascent,
- lwidth - 4,
- lascent + ldescent);
-
- // Print the file name.
- LyXFont msgFont(font);
- msgFont.setFamily(LyXFont::SANS_FAMILY);
- string const justname = OnlyFilename (params().filename);
- if (!justname.empty()) {
- msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- paint.text(old_x + 8,
- baseline - lyxfont::maxAscent(msgFont) - 4,
- justname, msgFont);
- }
-
- // Print the message.
- string const msg = statusMessage();
- if (!msg.empty()) {
- msgFont.setSize(LyXFont::SIZE_TINY);
- paint.text(old_x + 8, baseline - 4, msg, msgFont);
- }
- }
-
- // the status message may mean we changed size, so indicate
- // we need a row redraw
- if (old_status_ != grfx::ErrorUnknown && old_status_ != cached_status_) {
- bv->getLyXText()->status(bv, LyXText::CHANGED_IN_DRAW);
- }
-
- // Reset the cache, ready for the next draw request
- cached_status_ = grfx::ErrorUnknown;
- cached_image_.reset(0);
- cache_filled_ = false;
-}
-
-
-// Update the inset after parameters changed (read from file or changed in
-// dialog. The grfx::GCache makes the decisions about whether or not to draw
-// (interogates lyxrc, ascertains whether file exists etc)
-void InsetGraphics::updateInset() const
-{
- grfx::GCache & gc = grfx::GCache::get();
- gc.update(*this);
}
-void InsetGraphics::edit(BufferView *bv, int, int, unsigned int)
+void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
{
- bv->owner()->getDialogs()->showGraphics(this);
+ graphic_->metrics(mi, dim);
+ dim_ = dim;
}
-void InsetGraphics::edit(BufferView * bv, bool)
+void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
{
- edit(bv, 0, 0, 0);
+ graphic_->draw(pi, x, y);
}
void InsetGraphics::write(Buffer const * buf, ostream & os) const
{
- os << "Graphics FormatVersion " << VersionNumber << '\n';
- params().Write(buf, os);
+ os << "Graphics\n";
+ params().Write(os, buf->filePath());
}
string const token = lex.getString();
if (token == "Graphics")
- readInsetGraphics(buf, lex);
- else if (token == "Figure") // Compatibility reading of FigInset figures.
- readFigInset(buf, lex);
+ readInsetGraphics(lex, buf->filePath());
else
- lyxerr[Debug::GRAPHICS] << "Not a Graphics or Figure inset!\n";
+ lyxerr[Debug::GRAPHICS] << "Not a Graphics inset!\n";
- updateInset();
+ graphic_->update(params().as_grfxParams());
}
-void InsetGraphics::readInsetGraphics(Buffer const * buf, LyXLex & lex)
+
+void InsetGraphics::readInsetGraphics(LyXLex & lex, string const & bufpath)
{
bool finished = false;
// TODO: Possibly open up a dialog?
}
else {
- if (! params_.Read(buf, lex, token))
+ if (!params_.Read(lex, token, bufpath))
lyxerr << "Unknown token, " << token << ", skipping."
<< std::endl;
}
}
}
-// FormatVersion < 1.0 (LyX < 1.2)
-void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
-{
- std::vector<string> const oldUnits =
- getVectorFromString("pt,cm,in,p%,c%");
- bool finished = false;
- // set the display default
- if (lyxrc.display_graphics == "mono")
- params_.display = InsetGraphicsParams::MONOCHROME;
- else if (lyxrc.display_graphics == "gray")
- params_.display = InsetGraphicsParams::GRAYSCALE;
- else if (lyxrc.display_graphics == "color")
- params_.display = InsetGraphicsParams::COLOR;
- else
- params_.display = InsetGraphicsParams::NONE;
- while (lex.isOK() && !finished) {
- lex.next();
-
- string const token = lex.getString();
- lyxerr[Debug::GRAPHICS] << "Token: " << token << endl;
-
- if (token.empty())
- continue;
- else if (token == "\\end_inset") {
- finished = true;
- } else if (token == "file") {
- if (lex.next()) {
- string const name = lex.getString();
- string const path = buf->filePath();
- params_.filename = MakeAbsPath(name, path);
- }
- } else if (token == "extra") {
- if (lex.next());
- // kept for backwards compability. Delete in 0.13.x
- } else if (token == "subcaption") {
- if (lex.eatLine())
- params_.subcaptionText = lex.getString();
- params_.subcaption = true;
- } else if (token == "label") {
- if (lex.next());
- // kept for backwards compability. Delete in 0.13.x
- } else if (token == "angle") {
- if (lex.next())
- params_.rotate = true;
- params_.rotateAngle = lex.getFloat();
- } else if (token == "size") {
- if (lex.next())
- params_.lyxwidth = LyXLength(lex.getString()+"pt");
- if (lex.next())
- params_.lyxheight = LyXLength(lex.getString()+"pt");
- } else if (token == "flags") {
- if (lex.next())
- switch (lex.getInteger()) {
- case 1: params_.display = InsetGraphicsParams::MONOCHROME;
- break;
- case 2: params_.display = InsetGraphicsParams::GRAYSCALE;
- break;
- case 3: params_.display = InsetGraphicsParams::COLOR;
- break;
- }
- } else if (token == "subfigure") {
- params_.subcaption = true;
- } else if (token == "width") {
- if (lex.next()) {
- int i = lex.getInteger();
- if (lex.next()) {
- if (i == 5) {
- params_.scale = lex.getInteger();
- params_.size_type = InsetGraphicsParams::SCALE;
- } else {
- params_.width = LyXLength(lex.getString()+oldUnits[i]);
- params_.size_type = InsetGraphicsParams::WH;
- }
- }
- }
- } else if (token == "height") {
- if (lex.next()) {
- int i = lex.getInteger();
- if (lex.next()) {
- params_.height = LyXLength(lex.getString()+oldUnits[i]);
- params_.size_type = InsetGraphicsParams::WH;
- }
- }
- }
- }
-}
string const InsetGraphics::createLatexOptions() const
{
// before writing it to the output stream.
ostringstream options;
if (!params().bb.empty())
- options << " bb=" << strip(params().bb) << ",\n";
+ options << " bb=" << rtrim(params().bb) << ",\n";
if (params().draft)
options << " draft,\n";
if (params().clip)
options << " clip,\n";
- if (params().size_type == InsetGraphicsParams::WH) {
- if (!params().width.zero())
- options << " width=" << params().width.asLatexString() << ",\n";
- if (!params().height.zero())
- options << " height=" << params().height.asLatexString() << ",\n";
- } else if (params().size_type == InsetGraphicsParams::SCALE) {
- if (params().scale > 0)
- options << " scale=" << double(params().scale)/100.0 << ",\n";
+ if (!float_equal(params().scale, 0.0, 0.05)) {
+ if (!float_equal(params().scale, 100.0, 0.05))
+ options << " scale=" << params().scale / 100.0
+ << ",\n";
+ } else {
+ if (!params().width.zero())
+ options << " width=" << params().width.asLatexString() << ",\n";
+ if (!params().height.zero())
+ options << " height=" << params().height.asLatexString() << ",\n";
+ if (params().keepAspectRatio)
+ options << " keepaspectratio,\n";
}
- if (params().keepAspectRatio)
- options << " keepaspectratio,\n";
- // Make sure it's not very close to zero, a float can be effectively
- // zero but not exactly zero.
- if (!lyx::float_equal(params().rotateAngle, 0, 0.001) && params().rotate) {
+
+ // Make sure rotation angle is not very close to zero;
+ // a float can be effectively zero but not exactly zero.
+ if (!float_equal(params().rotateAngle, 0, 0.001)) {
options << " angle=" << params().rotateAngle << ",\n";
if (!params().rotateOrigin.empty()) {
options << " origin=" << params().rotateOrigin[0];
options << ",\n";
}
}
+
if (!params().special.empty())
options << params().special << ",\n";
- string opts = options.str().c_str();
- return opts.substr(0,opts.size()-2); // delete last ",\n"
-}
-namespace {
-string findTargetFormat(string const & suffix)
-{
- // 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] << "decideOutput: lyxrc.pdf_mode = "
- << lyxrc.pdf_mode << std::endl;
- if (lyxrc.pdf_mode) {
- if (contains(suffix,"ps") || suffix == "pdf")
- return "pdf";
- else if (suffix == "jpg")
- return suffix;
- else
- return "png";
- }
- // If it's postscript, we always do eps.
- lyxerr[Debug::GRAPHICS] << "decideOutput: we have PostScript mode\n";
- if (suffix != "ps")
- return "eps";
- else
- return "ps";
+ string opts = STRCONV(options.str());
+ // delete last ",\n"
+ return opts.substr(0, opts.size() - 2);
}
-} // Anon. namespace
-
-string const InsetGraphics::prepareFile(Buffer const *buf) const
+string const InsetGraphics::prepareFile(Buffer const * buf,
+ LatexRunParams const & runparams) const
{
- // do_convert = Do we need to convert the file?
- // nice = Do we create a nice version?
- // This is used when exporting the latex file only.
- // if (!do_convert)
- // return original filename
- // if (!nice)
- // convert_place = temp directory
- // return new filename in temp directory
- // else
- // convert_place = original file directory
- // return original filename without the extension
- //
- // if it's a zipped one, than let LaTeX do the rest!!!
- string filename_ = params().filename;
- bool const zipped = zippedFile(filename_);
-
- if ((zipped && params().noUnzip) || buf->niceFile) {
- lyxerr[Debug::GRAPHICS] << "don't unzip file or export latex"
- << filename_ << endl;
- return filename_;
+ // LaTeX can cope if the graphics file doesn't exist, so just return the
+ // filename.
+ string orig_file = params().filename;
+ string const rel_file = MakeRelPath(orig_file, buf->filePath());
+
+ if (!IsFileReadable(orig_file)) {
+ lyxerr[Debug::GRAPHICS]
+ << "InsetGraphics::prepareFile\n"
+ << "No file '" << orig_file << "' can be found!" << endl;
+ return rel_file;
}
- if (zipped)
- filename_ = unzipFile(filename_);
+ bool const zipped = zippedFile(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!
+ if (zipped && params().noUnzip) {
+ lyxerr[Debug::GRAPHICS]
+ << "\tpass zipped file to LaTeX but with full path.\n";
+ // LaTeX needs an absolute path, otherwise the
+ // coresponding *.eps.bb file isn't found
+ return orig_file;
+ }
- string const from = getExtFromContents(filename_);
- string const to = findTargetFormat(from);
+ // temp_file will contain the file for LaTeX to act on if, for example,
+ // we move it to a temp dir or uncompress it.
+ string temp_file = orig_file;
+
+ if (zipped) {
+ // Uncompress the file if necessary.
+ // If it has been uncompressed in a previous call to
+ // prepareFile, do nothing.
+ temp_file = MakeAbsPath(OnlyFilename(temp_file), buf->tmppath);
+ lyxerr[Debug::GRAPHICS]
+ << "\ttemp_file: " << temp_file << endl;
+ if (graphic_->hasFileChanged() || !IsFileReadable(temp_file)) {
+ bool const success = copy(orig_file, temp_file);
+ lyxerr[Debug::GRAPHICS]
+ << "\tCopying zipped file from "
+ << orig_file << " to " << temp_file
+ << (success ? " succeeded\n" : " failed\n");
+ } else
+ lyxerr[Debug::GRAPHICS]
+ << "\tzipped file " << temp_file
+ << " exists! Maybe no tempdir ...\n";
+ orig_file = unzipFile(temp_file);
+ lyxerr[Debug::GRAPHICS]
+ << "\tunzipped to " << orig_file << endl;
+ }
- if (from == to) {
- // No conversion needed!
- return filename_;
+ string const from = getExtFromContents(orig_file);
+ string const to = findTargetFormat(from, runparams);
+ lyxerr[Debug::GRAPHICS]
+ << "\t we have: from " << from << " to " << to << '\n';
+
+ if (from == to && !lyxrc.use_tempdir) {
+ // No conversion is needed. LaTeX can handle the
+ // graphic file as is.
+ // This is true even if the orig_file is compressed.
+ if (formats.getFormat(to)->extension() == GetExtension(orig_file))
+ return RemoveExtension(orig_file);
+ return orig_file;
}
- string const temp = AddName(buf->tmppath, filename_);
- string const outfile_base = RemoveExtension(temp);
+ // We're going to be running the exported buffer through the LaTeX
+ // compiler, so must ensure that LaTeX can cope with the graphics
+ // file format.
+
+ // 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.
+ // 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
+ lyxerr[Debug::GRAPHICS]
+ << "\tthe orig file is: " << orig_file << endl;
+
+ if (lyxrc.use_tempdir) {
+ temp_file = copyFileToDir(buf->tmppath, orig_file);
+ if (temp_file.empty()) {
+ string str = bformat(_("Could not copy the file\n%1$s\n"
+ "into the temporary directory."),
+ orig_file);
+ Alert::error(_("Graphics display failed"), str);
+ return orig_file;
+ }
- lyxerr[Debug::GRAPHICS] << "tempname = " << temp << "\n";
- lyxerr[Debug::GRAPHICS] << "buf::tmppath = " << buf->tmppath << "\n";
- lyxerr[Debug::GRAPHICS] << "filename_ = " << filename_ << "\n";
- lyxerr[Debug::GRAPHICS] << "outfile_base = " << outfile_base << endl;
+ if (from == to) {
+ // No conversion is needed. LaTeX can handle the
+ // graphic file as is.
+ if (formats.getFormat(to)->extension() == GetExtension(orig_file))
+ return RemoveExtension(temp_file);
+ return temp_file;
+ }
+ }
- converters.convert(buf, filename_, outfile_base, from, to);
- return outfile_base;
+ string const outfile_base = RemoveExtension(temp_file);
+ lyxerr[Debug::GRAPHICS]
+ << "\tThe original file is " << orig_file << "\n"
+ << "\tA copy has been made and convert is to be called with:\n"
+ << "\tfile to convert = " << temp_file << '\n'
+ << "\toutfile_base = " << outfile_base << '\n'
+ << "\t from " << from << " to " << to << '\n';
+
+ // if no special converter defined, than we take the default one
+ // from ImageMagic: convert from:inname.from to:outname.to
+ if (!converters.convert(buf, temp_file, outfile_base, from, to)) {
+ string const command =
+ LibFileSearch("scripts", "convertDefault.sh") +
+ ' ' + from + ':' + temp_file + ' ' +
+ to + ':' + outfile_base + '.' + to;
+ lyxerr[Debug::GRAPHICS]
+ << "No converter defined! I use convertDefault.sh:\n\t"
+ << command << endl;
+ Systemcall one;
+ one.startscript(Systemcall::Wait, command);
+ if (!IsFileReadable(ChangeExtension(outfile_base, to))) {
+ string str = bformat(_("No information for converting %1$s "
+ "format files to %2$s.\n"
+ "Try defining a convertor in the preferences."), from, to);
+ Alert::error(_("Could not convert image"), str);
+ }
+ }
+
+ return RemoveExtension(temp_file);
}
-int InsetGraphics::latex(Buffer const *buf, ostream & os,
- bool /*fragile*/, bool/*fs*/) const
+int InsetGraphics::latex(Buffer const * buf, ostream & os,
+ LatexRunParams const & runparams) const
{
- // If there is no file specified, just output a message about it in
- // the latex output.
- if (params().filename.empty()) {
- os << "\\fbox{\\rule[-0.5in]{0pt}{1in}"
- << _("empty figure path") << "}\n";
- return 1; // One end of line marker added to the stream.
- }
+ // If there is no file specified or not existing,
+ // just output a message about it in the latex output.
+ lyxerr[Debug::GRAPHICS]
+ << "insetgraphics::latex: Filename = "
+ << params().filename << endl;
+
+ string const relative_file = MakeRelPath(params().filename, buf->filePath());
+
+ // A missing (e)ps-extension is no problem for LaTeX, so
+ // we have to test three different cases
+#warning uh, but can our cache handle it ? no.
+ string const file_ = params().filename;
+ bool const file_exists =
+ !file_.empty() &&
+ (IsFileReadable(file_) || // original
+ IsFileReadable(file_ + ".eps") || // original.eps
+ IsFileReadable(file_ + ".ps")); // original.ps
+ 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
+ // draws only a rectangle with the above bb and the
+ // not found filename in it.
+ lyxerr[Debug::GRAPHICS]
+ << "\tMessage = \"" << message << '\"' << endl;
+
// These variables collect all the latex code that should be before and
// after the actual includegraphics command.
string before;
}
// We never use the starred form, we use the "clip" option instead.
before += "\\includegraphics";
+
// Write the options if there are any.
string const opts = createLatexOptions();
- if (!opts.empty()) {
- before += ("[%\n" + opts +']');
+ lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl;
+
+ if (!opts.empty() && !message.empty())
+ before += ("[%\n" + opts + ',' + message + ']');
+ else if (!opts.empty() || !message.empty())
+ before += ("[%\n" + opts + message + ']');
+
+ lyxerr[Debug::GRAPHICS]
+ << "\tBefore = " << before
+ << "\n\tafter = " << after << endl;
+
+
+ // "nice" means that the buffer is exported to LaTeX format but not
+ // run through the LaTeX compiler.
+ if (runparams.nice) {
+ os << before <<'{' << relative_file << '}' << after;
+ return 1;
}
+
// Make the filename relative to the lyx file
// and remove the extension so the LaTeX will use whatever is
// appropriate (when there are several versions in different formats)
- string const latex_str = before + '{' + prepareFile(buf) + '}' + after;
+ string const latex_str = message.empty() ?
+ (before + '{' + os::external_path(prepareFile(buf, runparams)) + '}' + after) :
+ (before + '{' + relative_file + " not found!}" + after);
os << latex_str;
+ lyxerr[Debug::GRAPHICS] << "InsetGraphics::latex outputting:\n"
+ << latex_str << endl;
// Return how many newlines we issued.
- int const newlines =
- int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
-
- // lyxerr << "includegraphics: " << newlines << " lines of text"
- // << endl;
- return newlines;
+ return int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
}
// 1. Convert file to ascii using gifscii
// 2. Read ascii output file and add it to the output stream.
// at least we send the filename
- os << '<' << _("Graphic file:") << params().filename << ">\n";
+ os << '<' << bformat(_("Graphics file: %1$s"), params().filename) << ">\n";
return 0;
}
// For explanation on inserting graphics into DocBook checkout:
-// http://linuxdoc.org/LDP/LDP-Author-Guide/inserting-pictures.html
+// http://en.tldp.org/LDP/LDP-Author-Guide/inserting-pictures.html
// See also the docbook guide at http://www.docbook.org/
-int InsetGraphics::docbook(Buffer const *, ostream & os) const
+int InsetGraphics::docbook(Buffer const *, ostream & os,
+ bool /*mixcont*/) const
{
// In DocBook v5.0, the graphic tag will be eliminated from DocBook, will
// need to switch to MediaObject. However, for now this is sufficient and
{
// If we have no image, we should not require anything.
if (params().filename.empty())
- return ;
+ return;
- features.includeFile(graphic_label, RemoveExtension(params_.filename));
+ features.includeFile(graphic_label, RemoveExtension(params().filename));
features.require("graphicx");
bool InsetGraphics::setParams(InsetGraphicsParams const & p)
{
// If nothing is changed, just return and say so.
- if (params() == p && !p.filename.empty()) {
+ if (params() == p && !p.filename.empty())
return false;
- }
// Copy the new parameters.
params_ = p;
- // Update the inset with the new parameters.
- updateInset();
+ // Update the display using the new parameters.
+ graphic_->update(params().as_grfxParams());
// We have changed data, report it.
return true;
}
-Inset * InsetGraphics::clone(Buffer const &, bool same_id) const
+BufferView * InsetGraphics::view() const
+{
+ return graphic_->view();
+}
+
+
+string const InsetGraphicsMailer::name_("graphics");
+
+InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
+ : inset_(inset)
+{}
+
+
+string const InsetGraphicsMailer::inset2string() const
+{
+ BufferView * bv = inset_.view();
+ if (bv)
+ return params2string(inset_.params(), bv->buffer()->filePath());
+ return string();
+}
+
+
+void InsetGraphicsMailer::string2params(string const & in,
+ string const & buffer_path,
+ InsetGraphicsParams & params)
+{
+ params = InsetGraphicsParams();
+
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
+ LyXLex lex(0,0);
+ lex.setStream(data);
+
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != name_)
+ return;
+ }
+
+ if (lex.isOK()) {
+ InsetGraphics inset;
+ inset.readInsetGraphics(lex, buffer_path);
+ params = inset.params();
+ }
+}
+
+
+string const
+InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
+ string const & buffer_path)
{
- return new InsetGraphics(*this, same_id);
+ ostringstream data;
+ data << name_ << ' ';
+ params.Write(data, buffer_path);
+ data << "\\end_inset\n";
+ return STRCONV(data.str());
}
projects / lyx.git / blobdiff