-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995-2001 the LyX Team.
- *
- * This file Copyright 2000 Baruch Even.
- * ====================================================== */
+/**
+ * \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 Voß
+ *
+ * Full author contact details are available in file CREDITS.
+ */
/*
-Major tasks:
- * Switch to convert the images in the background, this requires work on
- the converter, the systemcontroller and the graphics cache.
-
-Minor tasks:
- * Pop up a dialog if the widget version is higher than what we accept.
- * Provide sed/awk/C code to downgrade from InsetGraphics to FigInset(?)
-
-*/
+TODO
-/*
-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.
- * Bug in FileDlg class (src/filedlg.[hC]) when selecting a file and then
- pressing ok, it counts as if no real selection done. Apparently
- when choosing a file it doesn't update the select file input line.
-
- * If we are trying to create a file in a read-only directory and there
- are graphics that need converting, the converting will fail because
- it is done in-place, into the same directory as the original image.
- This needs to be fixed in the src/converter.C file
- [ This is presumed to be fixed, needs testing.]
-
- * We do not dither or resize the image in a WYSIWYM way, we load it at
- its original size and color, resizing is done in the final output,
- but not in the LyX window.
-
-TODO Before initial production release:
- * Replace insetfig everywhere
- * Search for comments of the form
- // INSET_GRAPHICS: remove this when InsetFig is thrown.
- And act upon them. Make sure not to remove InsetFig code for the
- 1.2.0 release, only afterwards, after deployment shows InsetGraphics
- to be ok.
-
-TODO Extended features:
-
- * Advanced Latex tab folder.
- * Add support for more features so that it will be better than insetfig.
- * Keep aspect ratio radio button
- * Support for complete control over the latex parameters for TeXperts
- * What advanced features the users want to do?
- Implement them in a non latex dependent way, but a logical way.
- LyX should translate it to latex or any other fitting format.
+ * What advanced features the users want to do?
+ Implement them in a non latex dependent way, but a logical way.
+ LyX should translate it to latex or any other fitting format.
* 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.
- * Add support for the 'picins' package.
- * Add support for the 'picinpar' package.
- * Improve support for 'subfigure' - Allow to set the various options
- that are possible.
- * Add resizing by percentage of image size (50%, 150%) - usefull for two
- images of different size to be resized where they both should have
- the same scale compared to each other.
- */
+ to find it in the clipart, or in the same directory with the image.
+ * 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.
+ * Add support for the 'picins' package.
+ * Add support for the 'picinpar' package.
+ * Improve support for 'subfigure' - Allow to set the various options
+ that are possible.
+*/
/* NOTES:
- *
- * Intentions:
- * This is currently a moving target, I'm trying stuff and learning what
- * is needed and how to accomplish it, since there is no predefined goal or
- * way to go I invent it as I go.
- *
- * My current intention is for seperation from LaTeX, the basic needs are
- * resizing and rotating, displaying on screen in various depths and printing
- * conversion of depths (independent of the display depth). For this I'll
- * provide a simple interface.
- *
- * The medium level includes clipping of the image, but in a limited way.
- *
- * For the LaTeX gurus I'll provide a complete control over the output, but
- * this is latex dependent and guru dependent so I'd rather avoid doing this
- * for the normal user. This stuff includes clipping, special image size
- * specifications (\textwidth\minus 2in) which I see no way to generalize
- * to non-latex specific way.
- *
- * Used packages:
- * 'graphicx' for the graphics inclusion.
- * 'subfigure' for the subfigures.
- *
* Fileformat:
- *
- * Current version is 1 (inset file format version), when changing it
- * it should be changed in the Write() function when writing in one place
- * and when reading one should change the version check and the error message.
- *
* The filename is kept in the lyx file in a relative way, so as to allow
* moving the document file and its images with no problem.
*
+ *
* Conversions:
* Postscript output means EPS figures.
*
* PDF output is best done with PDF figures if it's a direct conversion
* or PNG figures otherwise.
- * Image format
- * from to
- * EPS epstopdf
- * JPG/PNG direct
- * PDF direct
- * others PNG
+ * Image format
+ * from to
+ * EPS epstopdf
+ * PS ps2pdf
+ * JPG/PNG direct
+ * PDF direct
+ * others PNG
*/
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
#include "insets/insetgraphics.h"
-#include "insets/insetgraphicsParams.h"
-#include "graphics/GraphicsCache.h"
-#include "graphics/GraphicsCacheItem.h"
+#include "insets/render_graphic.h"
-#include "frontends/Dialogs.h"
-#include "LyXView.h"
#include "buffer.h"
#include "BufferView.h"
#include "converter.h"
-#include "frontends/support/LyXImage.h"
-#include "Painter.h"
-#include "lyx_gui_misc.h"
-#include "support/FileInfo.h"
-#include "support/filetools.h"
-#include "support/lyxlib.h"
-#include "lyxtext.h"
-#include "lyxrc.h"
-#include "font.h" // For the lyxfont class.
-#include <algorithm> // For the std::max
-#include "support/lyxmanip.h"
+#include "cursor.h"
#include "debug.h"
+#include "dispatchresult.h"
+#include "exporter.h"
+#include "format.h"
+#include "funcrequest.h"
+#include "FuncStatus.h"
#include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "lyx_main.h"
+#include "lyxlength.h"
+#include "lyxlex.h"
+#include "metricsinfo.h"
+#include "mover.h"
+#include "outputparams.h"
+#include "sgml.h"
+
+#include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
+#include "support/convert.h"
+#include "support/filetools.h"
+#include "support/lyxalgo.h" // lyx::count
+#include "support/lyxlib.h" // lyx::sum
+#include "support/lstrings.h"
+#include "support/os.h"
+#include "support/systemcall.h"
+
+#include <boost/bind.hpp>
+#include <boost/tuple/tuple.hpp>
+
+#include <sstream>
+
+namespace support = lyx::support;
+
+using lyx::support::AbsolutePath;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::compare_timestamps;
+using lyx::support::contains;
+using lyx::support::FileName;
+using lyx::support::float_equal;
+using lyx::support::GetExtension;
+using lyx::support::IsFileReadable;
+using lyx::support::latex_path;
+using lyx::support::OnlyFilename;
+using lyx::support::rtrim;
+using lyx::support::subst;
+using lyx::support::Systemcall;
+using lyx::support::unzipFile;
+using lyx::support::unzippedFileName;
+
+namespace os = lyx::support::os;
-extern string system_tempdir;
-
-using std::ostream;
using std::endl;
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
+
+namespace {
// This function is a utility function
+// ... that should be with ChangeExtension ...
inline
string const RemoveExtension(string const & filename)
{
}
-// Initialize only those variables that do not have a constructor.
+string findTargetFormat(string const & format, OutputParams const & runparams)
+{
+ // Are we using latex or pdflatex?
+ if (runparams.flavor == OutputParams::PDFLATEX) {
+ lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode" << endl;
+ // Convert postscript to pdf
+ if (format == "eps" || format == "ps")
+ return "pdf";
+ // pdflatex can use jpeg, png and pdf directly
+ if (format == "jpg" || format == "pdf")
+ return format;
+ // Convert everything else to png
+ return "png";
+ }
+ // If it's postscript, we always do eps.
+ lyxerr[Debug::GRAPHICS] << "findTargetFormat: PostScript mode" << endl;
+ if (format != "ps")
+ // any other than ps is changed to eps
+ return "eps";
+ // let ps untouched
+ return format;
+}
+
+} // namespace anon
+
+
InsetGraphics::InsetGraphics()
- : cacheHandle(0), imageLoaded(false)
+ : graphic_label(sgml::uniqueID("graph")),
+ graphic_(new RenderGraphic(this))
{}
-InsetGraphics::InsetGraphics(InsetGraphics const & ig, bool same_id)
- : Inset(), SigC::Object()
- , cacheHandle(ig.cacheHandle)
- , imageLoaded(ig.imageLoaded)
+InsetGraphics::InsetGraphics(InsetGraphics const & ig)
+ : InsetOld(ig),
+ boost::signals::trackable(),
+ graphic_label(sgml::uniqueID("graph")),
+ graphic_(new RenderGraphic(*ig.graphic_, this))
{
- setParams(ig.getParams());
- if (same_id)
- id_ = ig.id_;
+ setParams(ig.params());
}
-InsetGraphics::~InsetGraphics()
+auto_ptr<InsetBase> InsetGraphics::doClone() const
{
- // Emits the hide signal to the dialog connected (if any)
- hideDialog();
+ return auto_ptr<InsetBase>(new InsetGraphics(*this));
}
-string const
-InsetGraphics::statusMessage() const
+InsetGraphics::~InsetGraphics()
{
- string msg;
-
- if (cacheHandle.get()) {
- switch (cacheHandle->getImageStatus()) {
- case GraphicsCacheItem::UnknownError:
- msg = _("Unknown Error");
- break;
-
- case GraphicsCacheItem::Loading:
- msg = _("Loading...");
- break;
-
- case GraphicsCacheItem::ErrorReading:
- msg = _("Error reading");
- break;
+ InsetGraphicsMailer(*this).hideDialog();
+}
- case GraphicsCacheItem::ErrorConverting:
- msg = _("Error converting");
- break;
- case GraphicsCacheItem::Loaded:
- // No message to write.
- break;
- }
+void InsetGraphics::doDispatch(LCursor & cur, FuncRequest & cmd)
+{
+ switch (cmd.action) {
+ case LFUN_GRAPHICS_EDIT: {
+ Buffer const & buffer = *cur.bv().buffer();
+ InsetGraphicsParams p;
+ InsetGraphicsMailer::string2params(cmd.argument, buffer, p);
+ editGraphics(p, buffer);
+ break;
}
- return msg;
-}
-
+ case LFUN_INSET_MODIFY: {
+ Buffer const & buffer = cur.buffer();
+ InsetGraphicsParams p;
+ InsetGraphicsMailer::string2params(cmd.argument, buffer, p);
+ if (!p.filename.empty())
+ setParams(p);
+ else
+ cur.noUpdate();
+ break;
+ }
-int InsetGraphics::ascent(BufferView *, LyXFont const &) const
-{
- LyXImage * pixmap = 0;
- if (cacheHandle.get() && (pixmap = cacheHandle->getImage()))
- return pixmap->getHeight();
- else
- return 50;
-}
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetGraphicsMailer(*this).updateDialog(&cur.bv());
+ break;
+ case LFUN_MOUSE_RELEASE:
+ InsetGraphicsMailer(*this).showDialog(&cur.bv());
+ break;
-int InsetGraphics::descent(BufferView *, LyXFont const &) const
-{
- // this is not true if viewport is used and clip is not.
- return 0;
+ default:
+ InsetBase::doDispatch(cur, cmd);
+ break;
+ }
}
-int InsetGraphics::width(BufferView *, LyXFont const & font) const
+bool InsetGraphics::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & flag) const
{
- LyXImage * pixmap = 0;
-
- if (cacheHandle.get() && (pixmap = cacheHandle->getImage()))
- return pixmap->getWidth();
- else {
- string const msg = statusMessage();
- int font_width = 0;
-
- if (!msg.empty())
- font_width = lyxfont::width(msg, font);
-
- return std::max(50, font_width + 15);
+ switch (cmd.action) {
+ case LFUN_GRAPHICS_EDIT:
+ case LFUN_INSET_MODIFY:
+ case LFUN_INSET_DIALOG_UPDATE:
+ flag.enabled(true);
+ return true;
+
+ default:
+ return InsetBase::getStatus(cur, cmd, flag);
}
}
-void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
- int baseline, float & x, bool) const
+void InsetGraphics::edit(LCursor & cur, bool)
{
- Painter & paint = bv->painter();
-
- int ldescent = descent(bv, font);
- int lascent = ascent(bv, font);
- int lwidth = width(bv, font);
-
- // Make sure x is updated upon exit from this routine
- int old_x = int(x);
- x += lwidth;
-
- // This will draw the graphics. If the graphics has not been loaded yet,
- // we draw just a rectangle.
- if (imageLoaded) {
-
- paint.image(old_x + 2, baseline - lascent,
- lwidth - 4, lascent + ldescent,
- cacheHandle->getImage());
- } else {
-
- // Get the image status, default to unknown error.
- GraphicsCacheItem::ImageStatus status = GraphicsCacheItem::UnknownError;
- if (cacheHandle.get())
- status = cacheHandle->getImageStatus();
-
- // Check if the image is now ready.
- if (status == GraphicsCacheItem::Loaded) {
- imageLoaded = true;
-
- // Tell BufferView we need to be updated!
- bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
- return;
- }
-
-
- paint.rectangle(old_x + 2, baseline - lascent,
- lwidth - 4,
- lascent + ldescent);
-
- string const msg = statusMessage();
- if (!msg.empty()) {
- // Print the message.
- LyXFont msgFont(font);
- msgFont.setFamily(LyXFont::SANS_FAMILY);
- msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- string const justname = OnlyFilename (params.filename);
- paint.text(old_x + 8,
- baseline - lyxfont::maxAscent(msgFont) - 4,
- justname, msgFont);
-
- msgFont.setSize(LyXFont::SIZE_TINY);
- paint.text(old_x + 8, baseline - 4, msg, msgFont);
- }
- }
+ InsetGraphicsMailer(*this).showDialog(&cur.bv());
}
-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);
+ setPosCache(pi, x, y);
+ graphic_->draw(pi, x, y);
}
-Inset::EDITABLE InsetGraphics::editable() const
+InsetBase::EDITABLE InsetGraphics::editable() const
{
return IS_EDITABLE;
}
-void InsetGraphics::write(Buffer const * buf, ostream & os) const
+void InsetGraphics::write(Buffer const & buf, ostream & os) const
{
- os << "Graphics FormatVersion 1\n";
-
- params.Write(buf, os);
+ os << "Graphics\n";
+ params().Write(os, buf.filePath());
}
-void InsetGraphics::read(Buffer const * buf, LyXLex & lex)
+void InsetGraphics::read(Buffer const & buf, LyXLex & lex)
{
- string const token = lex.GetString();
+ 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::INFO] << "Not a Graphics or Figure inset!\n";
+ lyxerr[Debug::GRAPHICS] << "Not a Graphics inset!" << endl;
- 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;
- while (lex.IsOK() && !finished) {
+ while (lex.isOK() && !finished) {
lex.next();
- string const token = lex.GetString();
- lyxerr[Debug::INFO] << "Token: '" << token << '\''
- << std::endl;
+ 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 == "FormatVersion") {
- lex.next();
- int version = lex.GetInteger();
- if (version > 1)
- lyxerr
- << "This document was created with a newer Graphics widget"
- ", You should use a newer version of LyX to read this"
- " file."
- << std::endl;
- // TODO: Possibly open up a dialog?
- }
- else {
- if (! params.Read(buf, lex, token))
- lyxerr << "Unknown token, " << token << ", skipping."
+ } else {
+ if (!params_.Read(lex, token, bufpath))
+ lyxerr << "Unknown token, " << token << ", skipping."
<< std::endl;
}
}
}
-void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
+string const InsetGraphics::createLatexOptions() const
{
- bool finished = false;
-
- while (lex.IsOK() && !finished) {
- lex.next();
+ // Calculate the options part of the command, we must do it to a string
+ // stream since we might have a trailing comma that we would like to remove
+ // before writing it to the output stream.
+ ostringstream options;
+ if (!params().bb.empty())
+ options << "bb=" << rtrim(params().bb) << ',';
+ if (params().draft)
+ options << "draft,";
+ if (params().clip)
+ options << "clip,";
+ double const scl = convert<double>(params().scale);
+ if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) {
+ if (!float_equal(scl, 100.0, 0.05))
+ options << "scale=" << scl / 100.0 << ',';
+ } else {
+ if (!params().width.zero())
+ options << "width=" << params().width.asLatexString() << ',';
+ if (!params().height.zero())
+ options << "height=" << params().height.asLatexString() << ',';
+ if (params().keepAspectRatio)
+ options << "keepaspectratio,";
+ }
- string const token = lex.GetString();
- lyxerr[Debug::INFO] << "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 = OnlyPath(buf->fileName());
- 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();
- } else if (token == "label") {
- if (lex.next());
- // kept for backwards compability. Delete in 0.13.x
- } else if (token == "angle") {
- if (lex.next())
- params.rotateAngle = lex.GetFloat();
- } else if (token == "size") {
- // Size of image on screen is ignored in InsetGraphics, just eat
- // the input.
- if (lex.next())
- lex.GetInteger();
- if (lex.next())
- lex.GetInteger();
- } else if (token == "flags") {
- InsetGraphicsParams::DisplayType tmp = InsetGraphicsParams::COLOR;
- if (lex.next())
- switch (lex.GetInteger()) {
- case 1: tmp = InsetGraphicsParams::MONOCHROME; break;
- case 2: tmp = InsetGraphicsParams::GRAYSCALE; break;
- }
- params.display = tmp;
- } else if (token == "subfigure") {
- params.subcaption = true;
- } else if (token == "width") {
- if (lex.next())
- params.widthResize = static_cast<InsetGraphicsParams::Resize>(lex.GetInteger());
- if (lex.next())
- params.widthSize = lex.GetFloat();
- } else if (token == "height") {
- if (lex.next())
- params.heightResize = static_cast<InsetGraphicsParams::Resize>(lex.GetInteger());
- if (lex.next())
- params.heightSize = lex.GetFloat();
- }
+ // Make sure rotation angle is not very close to zero;
+ // a float can be effectively zero but not exactly zero.
+ if (!params().rotateAngle.empty()
+ && !float_equal(convert<double>(params().rotateAngle), 0.0, 0.001)) {
+ options << "angle=" << params().rotateAngle << ',';
+ if (!params().rotateOrigin.empty()) {
+ options << "origin=" << params().rotateOrigin[0];
+ if (contains(params().rotateOrigin,"Top"))
+ options << 't';
+ else if (contains(params().rotateOrigin,"Bottom"))
+ options << 'b';
+ else if (contains(params().rotateOrigin,"Baseline"))
+ options << 'B';
+ options << ',';
+ }
}
+
+ if (!params().special.empty())
+ options << params().special << ',';
+
+ string opts = options.str();
+ // delete last ','
+ return opts.substr(0, opts.size() - 1);
}
-namespace {
+string const InsetGraphics::toDocbookLength(LyXLength const & len) const
+{
+ ostringstream result;
+ switch (len.unit()) {
+ case LyXLength::SP: // Scaled point (65536sp = 1pt) TeX's smallest unit.
+ result << len.value() * 65536.0 * 72 / 72.27 << "pt";
+ break;
+ case LyXLength::PT: // Point = 1/72.27in = 0.351mm
+ result << len.value() * 72 / 72.27 << "pt";
+ break;
+ case LyXLength::BP: // Big point (72bp = 1in), also PostScript point
+ result << len.value() << "pt";
+ break;
+ case LyXLength::DD: // Didot point = 1/72 of a French inch, = 0.376mm
+ result << len.value() * 0.376 << "mm";
+ break;
+ case LyXLength::MM: // Millimeter = 2.845pt
+ result << len.value() << "mm";
+ break;
+ case LyXLength::PC: // Pica = 12pt = 4.218mm
+ result << len.value() << "pc";
+ break;
+ case LyXLength::CC: // Cicero = 12dd = 4.531mm
+ result << len.value() * 4.531 << "mm";
+ break;
+ case LyXLength::CM: // Centimeter = 10mm = 2.371pc
+ result << len.value() << "cm";
+ break;
+ case LyXLength::IN: // Inch = 25.4mm = 72.27pt = 6.022pc
+ result << len.value() << "in";
+ break;
+ case LyXLength::EX: // Height of a small "x" for the current font.
+ // Obviously we have to compromise here. Any better ratio than 1.5 ?
+ result << len.value() / 1.5 << "em";
+ break;
+ case LyXLength::EM: // Width of capital "M" in current font.
+ result << len.value() << "em";
+ break;
+ case LyXLength::MU: // Math unit (18mu = 1em) for positioning in math mode
+ result << len.value() * 18 << "em";
+ break;
+ case LyXLength::PTW: // Percent of TextWidth
+ case LyXLength::PCW: // Percent of ColumnWidth
+ case LyXLength::PPW: // Percent of PageWidth
+ case LyXLength::PLW: // Percent of LineWidth
+ case LyXLength::PTH: // Percent of TextHeight
+ case LyXLength::PPH: // Percent of Paper
+ // Sigh, this will go wrong.
+ result << len.value() << "%";
+ break;
+ default:
+ result << len.asString();
+ break;
+ }
+ return result.str();
+}
-void formatResize(ostream & os, string const & key,
- InsetGraphicsParams::Resize resizeType, double size)
+string const InsetGraphics::createDocBookAttributes() const
{
- switch (resizeType) {
- case InsetGraphicsParams::DEFAULT_SIZE:
- break;
+ // Calculate the options part of the command, we must do it to a string
+ // stream since we copied the code from createLatexParams() ;-)
- case InsetGraphicsParams::CM:
- os << key << '=' << size << "cm,";
- break;
+ // FIXME: av: need to translate spec -> Docbook XSL spec (http://www.sagehill.net/docbookxsl/ImageSizing.html)
+ // Right now it only works with my version of db2latex :-)
- case InsetGraphicsParams::INCH:
- os << key << '=' << size << "in,";
- break;
+ ostringstream options;
+ double const scl = convert<double>(params().scale);
+ if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) {
+ if (!float_equal(scl, 100.0, 0.05))
+ options << " scale=\""
+ << static_cast<int>( (scl) + 0.5 )
+ << "\" ";
+ } else {
+ if (!params().width.zero()) {
+ options << " width=\"" << toDocbookLength(params().width) << "\" ";
+ }
+ if (!params().height.zero()) {
+ options << " depth=\"" << toDocbookLength(params().height) << "\" ";
+ }
+ if (params().keepAspectRatio) {
+ // This will be irrelevant unless both width and height are set
+ options << "scalefit=\"1\" ";
+ }
+ }
- case InsetGraphicsParams::PERCENT_PAGE:
- os << key << '=' << size / 100 << "\\text" << key << ',';
- break;
- case InsetGraphicsParams::PERCENT_COLUMN:
- os << key << '=' << size / 100 << "\\column" << key << ',';
- break;
+ if (!params().special.empty())
+ options << params().special << " ";
- }
+ string opts = options.str();
+ // trailing blanks are ok ...
+ return opts;
}
-} // namespace anon
+namespace {
-string const
-InsetGraphics::createLatexOptions() const
-{
- // Calculate the options part of the command, we must do it to a string
- // stream since we might have a trailing comma that we would like to remove
- // before writing it to the output stream.
- ostringstream options;
+enum CopyStatus {
+ SUCCESS,
+ FAILURE,
+ IDENTICAL_PATHS,
+ IDENTICAL_CONTENTS
+};
- formatResize(options, "width", params.widthResize, params.widthSize);
- formatResize(options, "height", params.heightResize, params.heightSize);
- // 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)) {
- options << "angle="
- << params.rotateAngle << ',';
+std::pair<CopyStatus, string> const
+copyFileIfNeeded(string const & file_in, string const & file_out)
+{
+ BOOST_ASSERT(AbsolutePath(file_in));
+ BOOST_ASSERT(AbsolutePath(file_out));
+
+ unsigned long const checksum_in = support::sum(file_in);
+ unsigned long const checksum_out = support::sum(file_out);
+
+ if (checksum_in == checksum_out)
+ // Nothing to do...
+ return std::make_pair(IDENTICAL_CONTENTS, file_out);
+
+ Mover const & mover = movers(formats.getFormatFromFile(file_in));
+ bool const success = mover.copy(file_in, file_out);
+ if (!success) {
+ lyxerr[Debug::GRAPHICS]
+ << support::bformat(_("Could not copy the file\n%1$s\n"
+ "into the temporary directory."),
+ file_in)
+ << std::endl;
}
- string opts = options.str().c_str();
- opts = strip(opts, ',');
-
- return opts;
+ CopyStatus status = success ? SUCCESS : FAILURE;
+ return std::make_pair(status, file_out);
}
-namespace {
-
-string decideOutputImageFormat(string const & in_fmt)
-{
- // lyxrc.pdf_mode means:
- // Are we creating a PDF or a PS file?
- // (Should actually mean, are we using latex or pdflatex).
-
- if (lyxrc.pdf_mode) {
- if (in_fmt == "eps" || in_fmt == "epsi" || in_fmt == "pdf")
- return "pdf";
- else if (in_fmt == "jpg" || in_fmt == "jpeg")
- return in_fmt;
- else
- return "png";
- }
- // If it's postscript, we always do eps.
- // Garst has many eps files with various extensions, we just assume
- // whatever goes in (except those we know to be otherwise) is eps
- if (in_fmt == "gif" || in_fmt == "png" || in_fmt == "jpg")
- return "eps";
- return in_fmt;
-}
-
-} // Anon. namespace
-
-string const
-InsetGraphics::prepareFile(Buffer const *buf) 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
- //
-
- // Get the extension (format) of the original file.
- string const extension = GetExtension(params.filename);
-
- // Are we creating a PDF or a PS file?
- // (Should actually mean, are we usind latex or pdflatex).
- string const image_target = decideOutputImageFormat(extension);
-
- if (extension == image_target)
- return params.filename;
-
- string outfile;
- if (!buf->niceFile) {
- string const temp = AddName(buf->tmppath, params.filename);
- outfile = RemoveExtension(temp);
-
- //lyxerr << "buf::tmppath = " << buf->tmppath << "\n";
- //lyxerr << "filename = " << params.filename << "\n";
- //lyxerr << "temp = " << temp << "\n";
- //lyxerr << "outfile = " << outfile << endl;
- } else {
- string const path = OnlyPath(buf->fileName());
- string const relname = MakeRelPath(params.filename, path);
- outfile = RemoveExtension(relname);
+std::pair<CopyStatus, string> const
+copyToDirIfNeeded(string const & file_in, string const & dir, bool zipped)
+{
+ using support::rtrim;
+
+ BOOST_ASSERT(AbsolutePath(file_in));
+
+ string const only_path = support::OnlyPath(file_in);
+ if (rtrim(support::OnlyPath(file_in) , "/") == rtrim(dir, "/"))
+ return std::make_pair(IDENTICAL_PATHS, file_in);
+
+ string mangled = FileName(file_in).mangledFilename();
+ if (zipped) {
+ // We need to change _eps.gz to .eps.gz. The mangled name is
+ // still unique because of the counter in mangledFilename().
+ // We can't just call mangledFilename() with the zip
+ // extension removed, because base.eps and base.eps.gz may
+ // have different content but would get the same mangled
+ // name in this case.
+ string const base = RemoveExtension(unzippedFileName(file_in));
+ string::size_type const ext_len = file_in.length() - base.length();
+ mangled[mangled.length() - ext_len] = '.';
}
+ string const file_out = support::MakeAbsPath(mangled, dir);
+
+ return copyFileIfNeeded(file_in, file_out);
+}
- converters.convert(buf, params.filename, outfile, extension, image_target);
-
- return outfile;
+
+string const stripExtensionIfPossible(string const & file)
+{
+ // Remove the extension so the LaTeX will use whatever
+ // is appropriate (when there are several versions in
+ // different formats)
+ // This works only if the filename contains no dots besides
+ // the just removed one. We can fool here by replacing all
+ // dots with a macro whose definition is just a dot ;-)
+ // The automatic format selection does not work if the file
+ // name is escaped.
+ string const latex_name = latex_path(file,
+ lyx::support::EXCLUDE_EXTENSION);
+ if (contains(latex_name, '"'))
+ return latex_name;
+ return latex_path(RemoveExtension(file),
+ lyx::support::PROTECT_EXTENSION,
+ lyx::support::ESCAPE_DOTS);
}
-int InsetGraphics::latex(Buffer const *buf, ostream & os,
- bool /*fragile*/, bool/*fs*/) const
+string const stripExtensionIfPossible(string const & file, string const & to)
{
- // MISSING: We have to decide how to do the order of the options
- // that is dependent of order, like width, height, angle. Should
- // we rotate before scale? Should we let the user decide?
- // bool rot_before_scale; ?
+ // No conversion is needed. LaTeX can handle the graphic file as is.
+ // This is true even if the orig_file is compressed.
+ string const to_format = formats.getFormat(to)->extension();
+ string const file_format = GetExtension(file);
+ // for latex .ps == .eps
+ if (to_format == file_format ||
+ (to_format == "eps" && file_format == "ps") ||
+ (to_format == "ps" && file_format == "eps"))
+ return stripExtensionIfPossible(file);
+ return latex_path(file, lyx::support::EXCLUDE_EXTENSION);
+}
+
+} // namespace anon
+
+
+string const InsetGraphics::prepareFile(Buffer const & buf,
+ OutputParams const & runparams) const
+{
+ // The following code depends on non-empty filenames
+ if (params().filename.empty())
+ return string();
+
+ string const orig_file = params().filename.absFilename();
+ string const rel_file = params().filename.relFilename(buf.filePath());
+
+ // 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 = params().filename.isZipped();
+
+ // 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;
+
+ // The master buffer. This is useful when there are multiple levels
+ // of include files
+ Buffer const * m_buffer = buf.getMasterBuffer();
+
+ // Return the output name if the file does not exist.
+ // We are not going to change the extension or using the name of the
+ // temporary file, the code is already complicated enough.
+ if (!IsFileReadable(orig_file))
+ return params().filename.outputFilename(m_buffer->filePath());
+
+ // We place all temporary files in the master buffer's temp dir.
+ // This is possible because we use mangled file names.
+ // This is necessary for DVI export.
+ string const temp_path = m_buffer->temppath();
+
+ CopyStatus status;
+ boost::tie(status, temp_file) =
+ copyToDirIfNeeded(orig_file, temp_path, zipped);
+
+ if (status == FAILURE)
+ return orig_file;
+
+ // a relative filename should be relative to the master
+ // buffer.
+ // "nice" means that the buffer is exported to LaTeX format but not
+ // run through the LaTeX compiler.
+ string const output_file = os::external_path(runparams.nice ?
+ params().filename.outputFilename(m_buffer->filePath()) :
+ OnlyFilename(temp_file));
+ string const source_file = runparams.nice ? orig_file : temp_file;
+
+ if (zipped) {
+ if (params().noUnzip) {
+ // We don't know whether latex can actually handle
+ // this file, but we can't check, because that would
+ // mean to unzip the file and thereby making the
+ // noUnzip parameter meaningless.
+ lyxerr[Debug::GRAPHICS]
+ << "\tpass zipped file to LaTeX.\n";
+
+ string const bb_orig_file = ChangeExtension(orig_file, "bb");
+ if (runparams.nice) {
+ runparams.exportdata->addExternalFile("latex",
+ bb_orig_file,
+ ChangeExtension(output_file, "bb"));
+ } else {
+ // LaTeX needs the bounding box file in the
+ // tmp dir
+ string bb_file = ChangeExtension(temp_file, "bb");
+ boost::tie(status, bb_file) =
+ copyFileIfNeeded(bb_orig_file, bb_file);
+ if (status == FAILURE)
+ return orig_file;
+ runparams.exportdata->addExternalFile("latex",
+ bb_file);
+ }
+ runparams.exportdata->addExternalFile("latex",
+ source_file, output_file);
+ runparams.exportdata->addExternalFile("dvi",
+ source_file, output_file);
+ // We can't strip the extension, because we don't know
+ // the unzipped file format
+ return latex_path(output_file,
+ lyx::support::EXCLUDE_EXTENSION);
+ }
+
+ string const unzipped_temp_file = unzippedFileName(temp_file);
+ if (compare_timestamps(unzipped_temp_file, temp_file) > 0) {
+ // temp_file has been unzipped already and
+ // orig_file has not changed in the meantime.
+ temp_file = unzipped_temp_file;
+ lyxerr[Debug::GRAPHICS]
+ << "\twas already unzipped to " << temp_file
+ << endl;
+ } else {
+ // unzipped_temp_file does not exist or is too old
+ temp_file = unzipFile(temp_file);
+ lyxerr[Debug::GRAPHICS]
+ << "\tunzipped to " << temp_file << endl;
+ }
+ }
- // (BE) As a first step we should do a scale before rotate since this is
- // more like the natural thought of how to do it.
- // (BE) I believe that a priority list presented to the user with
- // a default order would be the best, though it would be better to
- // hide such a thing in an "Advanced options" dialog.
- // (BE) This should go an advanced LaTeX options dialog.
+ string const from = formats.getFormatFromFile(temp_file);
+ if (from.empty()) {
+ lyxerr[Debug::GRAPHICS]
+ << "\tCould not get file format." << endl;
+ return orig_file;
+ }
+ string const to = findTargetFormat(from, runparams);
+ string const ext = formats.extension(to);
+ lyxerr[Debug::GRAPHICS]
+ << "\t we have: from " << from << " to " << to << '\n';
+
+ // 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.
+
+ lyxerr[Debug::GRAPHICS]
+ << "\tthe orig file is: " << orig_file << endl;
+
+ if (from == to) {
+ // The extension of temp_file might be != ext!
+ runparams.exportdata->addExternalFile("latex", source_file,
+ output_file);
+ runparams.exportdata->addExternalFile("dvi", source_file,
+ output_file);
+ return stripExtensionIfPossible(output_file, to);
+ }
- // 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";
+ string const to_file = ChangeExtension(temp_file, ext);
+ string const output_to_file = ChangeExtension(output_file, ext);
+
+ // Do we need to perform the conversion?
+ // Yes if to_file does not exist or if temp_file is newer than to_file
+ if (compare_timestamps(temp_file, to_file) < 0) {
+ lyxerr[Debug::GRAPHICS]
+ << bformat(_("No conversion of %1$s is needed after all"),
+ rel_file)
+ << std::endl;
+ runparams.exportdata->addExternalFile("latex", to_file,
+ output_to_file);
+ runparams.exportdata->addExternalFile("dvi", to_file,
+ output_to_file);
+ return stripExtensionIfPossible(output_file);
+ }
- return 1; // One end of line marker added to the stream.
+ 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'
+ << "\t from " << from << " to " << to << '\n';
+
+ if (converters.convert(&buf, temp_file, temp_file, from, to, true)) {
+ runparams.exportdata->addExternalFile("latex",
+ to_file, output_to_file);
+ runparams.exportdata->addExternalFile("dvi",
+ to_file, output_to_file);
}
- // Keep count of newlines that we issued.
- int newlines = 0;
+ return stripExtensionIfPossible(output_file);
+}
- // This variables collect all the latex code that should be before and
+
+int InsetGraphics::latex(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
+{
+ // 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.absFilename() << endl;
+
+ string const relative_file =
+ params().filename.relFilename(buf.filePath());
+
+ string const file_ = params().filename.absFilename();
+ bool const file_exists = !file_.empty() && IsFileReadable(file_);
+ 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
+ // 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;
string after;
-
// Do we want subcaptions?
- if (params.subcaption) {
- before += "\\subfigure[" + params.subcaptionText + "]{";
- after = '}' + after;
+ if (params().subcaption) {
+ before += "\\subfigure[" + params().subcaptionText + "]{";
+ after = '}';
}
-
// We never use the starred form, we use the "clip" option instead.
- os << before << "\\includegraphics";
+ before += "\\includegraphics";
// Write the options if there are any.
string const opts = createLatexOptions();
- if (!opts.empty()) {
- os << '[' << opts << ']';
- }
-
- // 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 filename = prepareFile(buf);
-
- os << '{' << filename << '}' << after;
-
+ lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl;
+
+ if (!opts.empty() && !message.empty())
+ before += ('[' + opts + ',' + message + ']');
+ else if (!opts.empty() || !message.empty())
+ before += ('[' + opts + message + ']');
+
+ lyxerr[Debug::GRAPHICS]
+ << "\tBefore = " << before
+ << "\n\tafter = " << after << endl;
+
+ string latex_str = before + '{';
+ // Convert the file if necessary.
+ // Remove the extension so LaTeX will use whatever is appropriate
+ // (when there are several versions in different formats)
+ latex_str += prepareFile(buf, runparams);
+ latex_str += '}' + after;
+ os << latex_str;
+
+ lyxerr[Debug::GRAPHICS] << "InsetGraphics::latex outputting:\n"
+ << latex_str << endl;
// Return how many newlines we issued.
- return newlines;
+ return int(lyx::count(latex_str.begin(), latex_str.end(),'\n'));
}
-int InsetGraphics::ascii(Buffer const *, ostream &, int) const
+int InsetGraphics::plaintext(Buffer const &, ostream & os,
+ OutputParams const &) const
{
// No graphics in ascii output. Possible to use gifscii to convert
// images to ascii approximation.
-
// 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 << '<' << bformat(_("Graphics file: %1$s"),
+ params().filename.absFilename()) << ">\n";
return 0;
}
-int InsetGraphics::linuxdoc(Buffer const *, ostream &) const
+int InsetGraphics::linuxdoc(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
- // No graphics in LinuxDoc output. Should check how/what to add.
+ string const file_name = runparams.nice ?
+ params().filename.relFilename(buf.filePath()):
+ params().filename.absFilename();
+
+ runparams.exportdata->addExternalFile("linuxdoc",
+ params().filename.absFilename());
+ os << "<eps file=\"" << file_name << "\">\n";
+ os << "<img src=\"" << file_name << "\">";
return 0;
}
-// For explanation on inserting graphics into DocBook checkout:
-// http://linuxdoc.org/LDP/LDP-Author-Guide/inserting-pictures.html
-// See also the docbook guide at http://www.docbook.org/
-int InsetGraphics::docBook(Buffer const * buf, ostream & os) const
-{
- // Change the path to be relative to the main file.
- string const buffer_dir = OnlyPath(buf->fileName());
- string const filename = RemoveExtension(
- MakeRelPath(params.filename, buffer_dir));
+namespace {
- // 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
- // easier to use.
- os << "<graphic fileref=\"" << filename << "\"></graphic>";
- return 0;
+int writeImageObject(char * format, ostream& os, OutputParams const & runparams,
+ string const graphic_label, string const attributes)
+{
+ if (runparams.flavor != OutputParams::XML) {
+ os << "<![ %output.print." << format << "; [" << std::endl;
+ }
+ os <<"<imageobject><imagedata fileref=\"&"
+ << graphic_label << ";." << format << "\" " << attributes ;
+ if (runparams.flavor == OutputParams::XML) {
+ os << " role=\"" << format << "\"/>" ;
+ }
+ else {
+ os << " format=\"" << format << "\">" ;
+ }
+ os << "</imageobject>";
+ if (runparams.flavor != OutputParams::XML) {
+ os << std::endl << "]]>" ;
+ }
+ return runparams.flavor == OutputParams::XML ? 0 : 2;
+}
+// end anonymous namespace
}
-void InsetGraphics::validate(LaTeXFeatures & features) const
+// For explanation on inserting graphics into DocBook checkout:
+// http://en.tldp.org/LDP/LDP-Author-Guide/html/inserting-pictures.html
+// See also the docbook guide at http://www.docbook.org/
+int InsetGraphics::docbook(Buffer const &, ostream & os,
+ OutputParams const & runparams) const
{
- // If we have no image, we should not require anything.
- if (params.filename.empty())
- return ;
+ // 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
+ // easier to use.
+ if (runparams.flavor == OutputParams::XML) {
+ runparams.exportdata->addExternalFile("docbook-xml",
+ params().filename.absFilename());
+ } else {
+ runparams.exportdata->addExternalFile("docbook",
+ params().filename.absFilename());
+ }
+ os << "<inlinemediaobject>";
- features.graphicx = true;
+ int r = 0;
+ string attributes = createDocBookAttributes();
+ r += writeImageObject("png", os, runparams, graphic_label, attributes);
+ r += writeImageObject("pdf", os, runparams, graphic_label, attributes);
+ r += writeImageObject("eps", os, runparams, graphic_label, attributes);
+ r += writeImageObject("bmp", os, runparams, graphic_label, attributes);
- if (params.subcaption)
- features.subfigure = true;
+ os << "</inlinemediaobject>";
+ return r;
}
-// Update the inset after parameters changed (read from file or changed in
-// dialog.
-void InsetGraphics::updateInset() const
+void InsetGraphics::validate(LaTeXFeatures & features) const
{
- GraphicsCache & gc = GraphicsCache::getInstance();
- boost::shared_ptr<GraphicsCacheItem> temp(0);
-
- // We do it this way so that in the face of some error, we will still
- // be in a valid state.
- if (!params.filename.empty()) {
- temp = gc.addFile(params.filename);
+ // If we have no image, we should not require anything.
+ if (params().filename.empty())
+ return;
+
+ features.includeFile(graphic_label,
+ RemoveExtension(params().filename.absFilename()));
+
+ features.require("graphicx");
+
+ if (features.nice()) {
+ Buffer const * m_buffer = features.buffer().getMasterBuffer();
+ string basename =
+ params().filename.outputFilename(m_buffer->filePath());
+ basename = RemoveExtension(basename);
+ if(params().filename.isZipped())
+ basename = RemoveExtension(basename);
+ if (contains(basename, "."))
+ features.require("lyxdot");
}
- // Mark the image as unloaded so that it gets updated.
- imageLoaded = false;
-
- cacheHandle = temp;
+ if (params().subcaption)
+ features.require("subfigure");
}
bool InsetGraphics::setParams(InsetGraphicsParams const & p)
{
// If nothing is changed, just return and say so.
- if (params == p)
+ if (params() == p && !p.filename.empty())
return false;
// Copy the new parameters.
- params = p;
+ 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;
}
-InsetGraphicsParams InsetGraphics::getParams() const
+InsetGraphicsParams const & InsetGraphics::params() const
+{
+ return params_;
+}
+
+
+void InsetGraphics::editGraphics(InsetGraphicsParams const & p,
+ Buffer const & buffer) const
{
- return params;
+ string const file_with_path = p.filename.absFilename();
+ formats.edit(buffer, file_with_path,
+ formats.getFormatFromFile(file_with_path));
}
-Inset * InsetGraphics::clone(Buffer const &, bool same_id) const
+string const InsetGraphicsMailer::name_("graphics");
+
+InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
+ : inset_(inset)
+{}
+
+
+string const InsetGraphicsMailer::inset2string(Buffer const & buffer) const
+{
+ return params2string(inset_.params(), buffer);
+}
+
+
+void InsetGraphicsMailer::string2params(string const & in,
+ Buffer const & buffer,
+ InsetGraphicsParams & params)
+{
+ params = InsetGraphicsParams();
+ if (in.empty())
+ return;
+
+ istringstream data(in);
+ LyXLex lex(0,0);
+ lex.setStream(data);
+
+ string name;
+ lex >> name;
+ if (!lex || name != name_)
+ return print_mailer_error("InsetGraphicsMailer", in, 1, name_);
+
+ InsetGraphics inset;
+ inset.readInsetGraphics(lex, buffer.filePath());
+ params = inset.params();
+}
+
+
+string const
+InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
+ Buffer const & buffer)
{
- return new InsetGraphics(*this, same_id);
+ ostringstream data;
+ data << name_ << ' ';
+ params.Write(data, buffer.filePath());
+ data << "\\end_inset\n";
+ return data.str();
}
projects / lyx.git / blobdiff