#include "OutputParams.h"
#include "output_xhtml.h"
#include "sgml.h"
+#include "texstream.h"
#include "TocBackend.h"
#include "frontends/alert.h"
#include "support/os.h"
#include "support/Systemcall.h"
-#include <boost/tuple/tuple.hpp>
-
#include <algorithm>
#include <sstream>
+#include <tuple>
using namespace std;
using namespace lyx::support;
}
// for HTML, we leave the known formats and otherwise convert to png
if (runparams.flavor == OutputParams::HTML) {
+ Format const * const f = formats.getFormat(format);
+ // Convert vector graphics to svg
+ if (f && f->vectorFormat() && theConverters().isReachable(format, "svg"))
+ return "svg";
+ // Leave the known formats alone
if (format == "jpg" || format == "png" || format == "gif")
return format;
+ // Convert everything else to png
return "png";
}
// If it's postscript, we always do eps.
}
-void readInsetGraphics(Lexer & lex, string const & bufpath,
+void readInsetGraphics(Lexer & lex, Buffer const & buf, bool allowOrigin,
InsetGraphicsParams & params)
{
bool finished = false;
if (token == "\\end_inset") {
finished = true;
} else {
- if (!params.Read(lex, token, bufpath))
+ if (!params.Read(lex, token, buf, allowOrigin))
lyxerr << "Unknown token, "
<< token
<< ", skipping."
}
case LFUN_INSET_MODIFY: {
+ if (cmd.getArg(0) != "graphics") {
+ Inset::doDispatch(cur, cmd);
+ break;
+ }
+
InsetGraphicsParams p;
string2params(to_utf8(cmd.argument()), buffer(), p);
if (p.filename.empty()) {
FuncStatus & flag) const
{
switch (cmd.action()) {
- case LFUN_INSET_EDIT:
case LFUN_INSET_MODIFY:
+ if (cmd.getArg(0) != "graphics")
+ return Inset::getStatus(cur, cmd, flag);
+ // fall through
+ case LFUN_INSET_EDIT:
case LFUN_INSET_DIALOG_UPDATE:
case LFUN_GRAPHICS_RELOAD:
flag.setEnabled(true);
{
lex.setContext("InsetGraphics::read");
//lex >> "Graphics";
- readInsetGraphics(lex, buffer().filePath(), params_);
+ readInsetGraphics(lex, buffer(), true, params_);
graphic_->update(params().as_grfxParams());
}
// 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().bbox.empty())
+ options << "bb=" << params().bbox.xl.asLatexString() << ' '
+ << params().bbox.yb.asLatexString() << ' '
+ << params().bbox.xr.asLatexString() << ' '
+ << params().bbox.yt.asLatexString() << ',';
if (params().draft)
options << "draft,";
if (params().clip)
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 )
+ << support::iround(scl)
<< "\" ";
} else {
if (!params().width.zero()) {
{
string const file_in = file.absFileName();
string const only_path = onlyPath(file_in);
- if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/"))
+ if (rtrim(only_path, "/") == rtrim(dir, "/"))
return make_pair(IDENTICAL_PATHS, FileName(file_in));
string mangled = file.mangledFileName();
// 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);
+ tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
if (status == FAILURE)
return orig_file;
// determine the export format
string const tex_format = flavor2format(runparams.flavor);
- // 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 (formats.isZippedFile(params().filename)) {
- 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.");
-
- FileName const bb_orig_file =
- FileName(changeExtension(orig_file, "bb"));
- if (runparams.nice) {
- runparams.exportdata->addExternalFile(tex_format,
- bb_orig_file,
- changeExtension(output_file, "bb"));
- } else {
- // LaTeX needs the bounding box file in the
- // tmp dir
- FileName bb_file =
- FileName(changeExtension(temp_file.absFileName(), "bb"));
- boost::tie(status, bb_file) =
- copyFileIfNeeded(bb_orig_file, bb_file);
- if (status == FAILURE)
- return orig_file;
- runparams.exportdata->addExternalFile(tex_format,
- bb_file);
- }
- runparams.exportdata->addExternalFile(tex_format,
- 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, EXCLUDE_EXTENSION);
- }
-
FileName const unzipped_temp_file =
FileName(unzippedFileName(temp_file.absFileName()));
output_file = unzippedFileName(output_file);
&& params().filename.isReadableFile();
string message;
if (!file_exists) {
- if (params().bb.empty())
+ if (params().bbox.empty())
message = "bb = 0 0 200 100";
if (!params().draft) {
if (!message.empty())
if (params().filename.empty())
return string();
- string const orig_file = params().filename.absFileName();
+ if (!params().filename.isReadableFile())
+ return string();
// 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
// Copy to temporary directory.
FileName temp_file;
GraphicsCopyStatus status;
- boost::tie(status, temp_file) =
- copyToDirIfNeeded(params().filename, temp_path);
+ 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())
+ if (from.empty()) {
LYXERR(Debug::GRAPHICS, "\tCould not get file format.");
+ return string();
+ }
string const to = findTargetFormat(from, runparams);
string const ext = formats.extension(to);
+ string const orig_file = params().filename.absFileName();
+ string output_file = onlyFileName(temp_file.absFileName());
LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to);
LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
// really be better to do width and height conversion, rather than to output
// these parameters here.
string imgstyle;
- if (!params().width.zero())
- imgstyle += "width:" + params().width.asHTMLString() + ";";
- if (!params().height.zero())
- imgstyle += " height:" + params().height.asHTMLString() + ";";
+ bool const havewidth = !params().width.zero();
+ bool const haveheight = !params().height.zero();
+ if (havewidth || haveheight) {
+ if (havewidth)
+ imgstyle += "width:" + params().width.asHTMLString() + ";";
+ if (haveheight)
+ imgstyle += " height:" + params().height.asHTMLString() + ";";
+ } else if (params().scale != "100") {
+ // Note that this will not have the same effect as in LaTeX export:
+ // There, the image will be scaled from its original size. Here, the
+ // percentage will be interpreted by the browser, and the image will
+ // be scaled to a percentage of the window size.
+ imgstyle = "width:" + params().scale + "%;";
+ }
if (!imgstyle.empty())
imgstyle = "style='" + imgstyle + "' ";
}
-void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active,
+ UpdateType, TocBackend & backend) const
{
//FIXME UNICODE
docstring const str = from_utf8(params_.filename.onlyFileName());
- buffer().tocBackend().toc("graphics").push_back(TocItem(cpit, 0, str, output_active));
+ TocBuilder & b = backend.builder("graphics");
+ b.pushItem(cpit, str, output_active);
+ b.pop();
}
lex.setContext("InsetGraphics::string2params");
lex >> "graphics";
params = InsetGraphicsParams();
- readInsetGraphics(lex, buffer.filePath(), params);
+ readInsetGraphics(lex, buffer, false, params);
}
projects / lyx.git / blobdiff