* Licence details can be found in the file COPYING.
*
* \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
*
* Full author contact details are available in file CREDITS.
*/
#include "MetricsInfo.h"
#include "Mover.h"
#include "OutputParams.h"
+#include "output_xhtml.h"
#include "sgml.h"
#include "TocBackend.h"
#include "support/os.h"
#include "support/Systemcall.h"
-#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
#include <algorithm>
/// 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 pdflatex?
- if (runparams.flavor == OutputParams::PDFLATEX) {
+ // Are we using latex or XeTeX/pdflatex?
+ if (runparams.flavor == OutputParams::PDFLATEX
+ || runparams.flavor == OutputParams::XETEX) {
LYXERR(Debug::GRAPHICS, "findTargetFormat: PDF mode");
Format const * const f = formats.getFormat(format);
// Convert vector graphics to pdf
// Convert everything else to png
return "png";
}
+ // for HTML, we leave the known formats and otherwise convert to png
+ if (runparams.flavor == OutputParams::HTML) {
+ if (format == "jpg" || format == "png" || format == "gif")
+ return format;
+ return "png";
+ }
// If it's postscript, we always do eps.
LYXERR(Debug::GRAPHICS, "findTargetFormat: PostScript mode");
if (format != "ps")
} // namespace anon
-InsetGraphics::InsetGraphics(Buffer & buf)
- : graphic_label(sgml::uniqueID(from_ascii("graph"))),
+InsetGraphics::InsetGraphics(Buffer * buf)
+ : Inset(buf), graphic_label(sgml::uniqueID(from_ascii("graph"))),
graphic_(new RenderGraphic(this))
{
- Inset::setBuffer(buf);
}
InsetGraphics::InsetGraphics(InsetGraphics const & ig)
: Inset(ig),
- boost::signals::trackable(),
- graphic_label(sgml::uniqueID(from_ascii("graph"))),
+ graphic_label(sgml::uniqueID(from_ascii("graph"))),
graphic_(new RenderGraphic(*ig.graphic_, this))
{
setParams(ig.params());
InsetGraphics::~InsetGraphics()
{
hideDialogs("graphics", this);
+ delete graphic_;
}
InsetGraphicsParams p = params();
if (!cmd.argument().empty())
string2params(to_utf8(cmd.argument()), buffer(), p);
- editGraphics(p, buffer());
+ editGraphics(p);
break;
}
case LFUN_INSET_MODIFY: {
InsetGraphicsParams p;
string2params(to_utf8(cmd.argument()), buffer(), p);
- if (!p.filename.empty())
- setParams(p);
- else
+ if (p.filename.empty()) {
cur.noUpdate();
+ break;
+ }
+
+ setParams(p);
+ // if the inset is part of a graphics group, all the
+ // other members should be updated too.
+ if (!params_.groupId.empty())
+ graphics::unifyGraphicsGroups(buffer(),
+ to_utf8(cmd.argument()));
break;
}
case LFUN_INSET_DIALOG_UPDATE:
- cur.bv().updateDialog("graphics", params2string(params(),
- cur.bv().buffer()));
+ cur.bv().updateDialog("graphics", params2string(params(), buffer()));
break;
- case LFUN_MOUSE_RELEASE:
- if (!cur.selection() && cmd.button() == mouse_button::button1)
- cur.bv().showDialog("graphics", params2string(params(),
- cur.bv().buffer()), this);
+ case LFUN_GRAPHICS_RELOAD:
+ params_.filename.refresh();
+ graphic_->reload();
break;
default:
case LFUN_INSET_EDIT:
case LFUN_INSET_MODIFY:
case LFUN_INSET_DIALOG_UPDATE:
+ case LFUN_GRAPHICS_RELOAD:
flag.setEnabled(true);
return true;
}
-void InsetGraphics::edit(Cursor & cur, bool, EntryDirection)
+bool InsetGraphics::showInsetDialog(BufferView * bv) const
{
- cur.bv().showDialog("graphics", params2string(params(),
- cur.bv().buffer()), this);
+ bv->showDialog("graphics", params2string(params(), bv->buffer()),
+ const_cast<InsetGraphics *>(this));
+ return true;
}
+
void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
{
graphic_->metrics(mi, dim);
}
-Inset::EDITABLE InsetGraphics::editable() const
-{
- return IS_EDITABLE;
-}
-
-
void InsetGraphics::write(ostream & os) const
{
os << "Graphics\n";
if (runparams.dryrun)
return stripExtensionIfPossible(rel_file, runparams.nice);
- // temp_file will contain the file for LaTeX to act on if, for example,
- // we move it to a temp dir or uncompress it.
- FileName temp_file = params().filename;
-
// The master buffer. This is useful when there are multiple levels
// of include files
Buffer const * masterBuffer = buffer().masterBuffer();
// This is necessary for DVI export.
string const temp_path = masterBuffer->temppath();
+ // temp_file will contain the file for LaTeX to act on if, for example,
+ // we move it to a temp dir or uncompress it.
+ FileName temp_file;
GraphicsCopyStatus status;
boost::tie(status, temp_file) =
copyToDirIfNeeded(params().filename, temp_path);
LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
if (from == to) {
- if (!runparams.nice && getExtension(temp_file.absFilename()) != ext) {
+ // source and destination formats are the same
+ if (!runparams.nice && !FileName(temp_file).hasExtension(ext)) {
// The LaTeX compiler will not be able to determine
// the file format from the extension, so we must
// change it.
return stripExtensionIfPossible(output_file, to, runparams.nice);
}
+ // so the source and destination formats are different
FileName const to_file = FileName(changeExtension(temp_file.absFilename(), ext));
string const output_to_file = changeExtension(output_file, ext);
}
+string InsetGraphics::prepareHTMLFile(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();
+
+ // The master buffer. This is useful when there are multiple levels
+ // of include files
+ Buffer const * masterBuffer = buffer().masterBuffer();
+
+ if (!params().filename.isReadableFile())
+ return string();
+
+ // We place all temporary files in the master buffer's temp dir.
+ // This is possible because we use mangled file names.
+ // FIXME We may want to put these files in some special temporary
+ // directory.
+ string const temp_path = masterBuffer->temppath();
+
+ // Copy to temporary directory.
+ FileName temp_file;
+ GraphicsCopyStatus status;
+ boost::tie(status, temp_file) =
+ copyToDirIfNeeded(params().filename, temp_path);
+
+ if (status == FAILURE)
+ return string();
+
+ string output_file = onlyFilename(temp_file.absFilename());
+
+ string const from = formats.getFormatFromFile(temp_file);
+ if (from.empty())
+ LYXERR(Debug::GRAPHICS, "\tCould not get file format.");
+
+ string const to = findTargetFormat(from, runparams);
+ string const ext = formats.extension(to);
+ LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to);
+ LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
+
+ if (from == to) {
+ // source and destination formats are the same
+ runparams.exportdata->addExternalFile("xhtml", temp_file, output_file);
+ return output_file;
+ }
+
+ // so the source and destination formats are different
+ FileName const to_file = FileName(changeExtension(temp_file.absFilename(), 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) {
+ // FIXME UNICODE
+ LYXERR(Debug::GRAPHICS,
+ to_utf8(bformat(_("No conversion of %1$s is needed after all"),
+ from_utf8(orig_file))));
+ runparams.exportdata->addExternalFile("xhtml", to_file, output_to_file);
+ return output_to_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'
+ << "\t from " << from << " to " << to);
+
+ // FIXME (Abdel 12/08/06): Is there a need to show these errors?
+ ErrorList el;
+ bool const success =
+ theConverters().convert(&buffer(), temp_file, to_file, params().filename,
+ from, to, el, Converters::try_default | Converters::try_cache);
+ if (!success)
+ return string();
+ runparams.exportdata->addExternalFile("xhtml", to_file, output_to_file);
+ return output_to_file;
+}
+
+
+docstring InsetGraphics::xhtml(XHTMLStream & xs, OutputParams const & op) const
+{
+ string const output_file = prepareHTMLFile(op);
+ if (output_file.empty()) {
+ LYXERR0("InsetGraphics::xhtml: Unable to prepare file `"
+ << params().filename << "' for output. File missing?");
+ string const attr = "src='" + params().filename.absFilename()
+ + "' alt='image: " + output_file + "'";
+ xs << html::CompTag("img", attr);
+ return docstring();
+ }
+
+ // FIXME XHTML
+ // Do we want to do something with the parameters, other than use them to
+ // crop, etc, the image?
+ // Speaking of which: Do the cropping, rotating, etc.
+ string const attr = "src='" + output_file + "' alt='image: "
+ + output_file + "'";
+ xs << html::CompTag("img", attr);
+ return docstring();
+}
+
+
void InsetGraphics::validate(LaTeXFeatures & features) const
{
// If we have no image, we should not require anything.
}
-void InsetGraphics::editGraphics(InsetGraphicsParams const & p,
- Buffer const & buffer) const
+void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const
{
- formats.edit(buffer, p.filename,
+ formats.edit(buffer(), p.filename,
formats.getFormatFromFile(p.filename));
}
}
+int countGroupMembers(Buffer const & b, string const & groupId)
+{
+ int n = 0;
+ if (groupId.empty())
+ return n;
+ Inset & inset = b.inset();
+ InsetIterator it = inset_iterator_begin(inset);
+ InsetIterator const end = inset_iterator_end(inset);
+ for (; it != end; ++it)
+ if (it->lyxCode() == GRAPHICS_CODE) {
+ InsetGraphics & ins = static_cast<InsetGraphics &>(*it);
+ if (ins.getParams().groupId == groupId)
+ ++n;
+ }
+ return n;
+}
+
+
string getGroupParams(Buffer const & b, string const & groupId)
{
if (groupId.empty())
}
-void unifyGraphicsGroups(Buffer const & b, string const & argument)
+void unifyGraphicsGroups(Buffer & b, string const & argument)
{
InsetGraphicsParams params;
InsetGraphics::string2params(argument, b, params);
+ b.undo().beginUndoGroup();
Inset & inset = b.inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
InsetGraphics & ins = static_cast<InsetGraphics &>(*it);
InsetGraphicsParams inspar = ins.getParams();
if (params.groupId == inspar.groupId) {
+ b.undo().recordUndo(it);
params.filename = inspar.filename;
ins.setParams(params);
}
}
}
-
+ b.undo().endUndoGroup();
}
projects / lyx.git / blobdiff