#include "Cursor.h"
#include "debug.h"
#include "DispatchResult.h"
+#include "ErrorList.h"
#include "Exporter.h"
#include "Format.h"
#include "FuncRequest.h"
#include "Mover.h"
#include "OutputParams.h"
#include "sgml.h"
+#include "EmbeddedFiles.h"
#include "frontends/alert.h"
#include "support/convert.h"
+#include "support/docstream.h"
#include "support/filetools.h"
-#include "support/lyxalgo.h" // count
#include "support/lyxlib.h" // sum
#include "support/lstrings.h"
#include "support/os.h"
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
+#include <algorithm>
#include <sstream>
using support::FileName;
using support::float_equal;
using support::getExtension;
-using support::isFileReadable;
+using support::isValidLaTeXFilename;
using support::latex_path;
using support::onlyFilename;
using support::removeExtension;
using support::rtrim;
using support::subst;
+using support::suffixIs;
using support::Systemcall;
using support::unzipFile;
using support::unzippedFileName;
using std::endl;
using std::string;
-using std::auto_ptr;
using std::istringstream;
using std::ostream;
using std::ostringstream;
}
-auto_ptr<Inset> InsetGraphics::doClone() const
+Inset * InsetGraphics::clone() const
{
- return auto_ptr<Inset>(new InsetGraphics(*this));
+ return new InsetGraphics(*this);
}
{
switch (cmd.action) {
case LFUN_GRAPHICS_EDIT: {
- Buffer const & buffer = *cur.bv().buffer();
+ Buffer const & buffer = cur.bv().buffer();
InsetGraphicsParams p;
InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buffer, p);
editGraphics(p, buffer);
}
+void InsetGraphics::registerEmbeddedFiles(Buffer const &,
+ EmbeddedFiles & files) const
+{
+ files.registerFile(params().filename.absFilename(),
+ false, this);
+}
+
+
+void InsetGraphics::updateEmbeddedFile(Buffer const & buf,
+ EmbeddedFile const & file)
+{
+ BOOST_ASSERT(buf.embeddedFiles().enabled());
+ params_.filename = file;
+ LYXERR(Debug::FILES) << "Update InsetGraphic with File "
+ << params_.filename.toFilesystemEncoding()
+ << ", embedding status: "
+ << params_.filename.embedded() << std::endl;
+}
+
+
void InsetGraphics::edit(Cursor & cur, bool)
{
InsetGraphicsMailer(*this).showDialog(&cur.bv());
}
-bool InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
{
graphic_->metrics(mi, dim);
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
}
void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
{
- setPosCache(pi, x, y);
graphic_->draw(pi, x, y);
}
void InsetGraphics::write(Buffer const & buf, ostream & os) const
{
os << "Graphics\n";
- params().Write(os, buf.filePath());
+ params().Write(os, buf);
}
else
LYXERR(Debug::GRAPHICS) << "Not a Graphics inset!" << endl;
+ // InsetGraphics is read, with filename in params_. We do not know if this file actually
+ // exists or is embedded so we need to get the 'availableFile' from buf.embeddedFiles()
+ if (buf.embeddedFiles().enabled()) {
+ EmbeddedFiles::EmbeddedFileList::const_iterator it =
+ buf.embeddedFiles().find(params_.filename.toFilesystemEncoding());
+ if (it != buf.embeddedFiles().end())
+ // using available file, embedded or external, depending on file availability and
+ // embedding status.
+ params_.filename = *it;
+ }
graphic_->update(params().as_grfxParams());
}
options << "draft,";
if (params().clip)
options << "clip,";
+ ostringstream size;
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 << ',';
+ size << "scale=" << scl / 100.0 << ',';
} else {
if (!params().width.zero())
- options << "width=" << params().width.asLatexString() << ',';
+ size << "width=" << params().width.asLatexString() << ',';
if (!params().height.zero())
- options << "height=" << params().height.asLatexString() << ',';
+ size << "height=" << params().height.asLatexString() << ',';
if (params().keepAspectRatio)
- options << "keepaspectratio,";
+ size << "keepaspectratio,";
}
+ if (params().scaleBeforeRotation && !size.str().empty())
+ options << size.str();
// Make sure rotation angle is not very close to zero;
// a float can be effectively zero but not exactly zero.
options << ',';
}
}
+ if (!params().scaleBeforeRotation && !size.str().empty())
+ options << size.str();
if (!params().special.empty())
options << params().special << ',';
string opts = options.str();
// delete last ','
- return opts.substr(0, opts.size() - 1);
+ if (suffixIs(opts, ','))
+ opts = opts.substr(0, opts.size() - 1);
+
+ return opts;
}
// Calculate the options part of the command, we must do it to a string
// stream since we copied the code from createLatexParams() ;-)
- // FIXME: av: need to translate spec -> Docbook XSL spec (http://www.sagehill.net/docbookxsl/ImageSizing.html)
+ // 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 :-)
odocstringstream options;
namespace {
-enum CopyStatus {
+enum GraphicsCopyStatus {
SUCCESS,
FAILURE,
IDENTICAL_PATHS,
};
-std::pair<CopyStatus, FileName> const
+std::pair<GraphicsCopyStatus, FileName> const
copyFileIfNeeded(FileName const & file_in, FileName const & file_out)
{
unsigned long const checksum_in = support::sum(file_in);
<< std::endl;
}
- CopyStatus status = success ? SUCCESS : FAILURE;
+ GraphicsCopyStatus status = success ? SUCCESS : FAILURE;
return std::make_pair(status, file_out);
}
-std::pair<CopyStatus, FileName> const
+std::pair<GraphicsCopyStatus, FileName> const
copyToDirIfNeeded(DocFileName const & file, string const & dir)
{
using support::rtrim;
// The master buffer. This is useful when there are multiple levels
// of include files
- Buffer const * m_buffer = buf.getMasterBuffer();
+ Buffer const * masterBuffer = buf.masterBuffer();
// Return the output name if we are inside a comment or 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 (runparams.inComment || !isFileReadable(params().filename))
- return params().filename.outputFilename(m_buffer->filePath());
+ if (runparams.inComment || !params().filename.isFileReadable())
+ return params().filename.outputFilename(masterBuffer->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();
+ string const temp_path = masterBuffer->temppath();
- CopyStatus status;
+ GraphicsCopyStatus status;
boost::tie(status, temp_file) =
copyToDirIfNeeded(params().filename, temp_path);
if (status == FAILURE)
return orig_file;
- // a relative filename should be relative to the master
- // buffer.
+ // 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 output_file = support::os::external_path(runparams.nice ?
- params().filename.outputFilename(m_buffer->filePath()) :
- onlyFilename(temp_file.absFilename()));
+ // run through the LaTeX compiler.
+ string output_file = runparams.nice ?
+ params().filename.outputFilename(masterBuffer->filePath()) :
+ onlyFilename(temp_file.absFilename());
+
+ if (runparams.nice && !isValidLaTeXFilename(output_file)) {
+ frontend::Alert::warning(_("Invalid filename"),
+ _("The following filename is likely to cause trouble "
+ "when running the exported file through LaTeX: ") +
+ from_utf8(output_file));
+ }
+
FileName source_file = runparams.nice ? FileName(params().filename) : temp_file;
string const tex_format = (runparams.flavor == OutputParams::LATEX) ?
"latex" : "pdflatex";
// FIXME (Abdel 12/08/06): Is there a need to show these errors?
ErrorList el;
if (theConverters().convert(&buf, temp_file, to_file, params().filename,
- from, to, el,
- Converters::try_default | Converters::try_cache)) {
+ from, to, el,
+ Converters::try_default | Converters::try_cache)) {
runparams.exportdata->addExternalFile(tex_format,
to_file, output_to_file);
runparams.exportdata->addExternalFile("dvi",
int InsetGraphics::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
// If there is no file specified or not existing,
// just output a message about it in the latex output.
string const relative_file =
params().filename.relFilename(buf.filePath());
- bool const file_exists = !params().filename.empty() &&
- isFileReadable(params().filename);
+ bool const file_exists = !params().filename.empty()
+ && params().filename.isFileReadable();
string const message = file_exists ?
string() : string("bb = 0 0 200 100, draft, type=eps");
// if !message.empty() then there was no existing file
LYXERR(Debug::GRAPHICS) << "InsetGraphics::latex outputting:\n"
<< latex_str << endl;
// Return how many newlines we issued.
- return int(lyx::count(latex_str.begin(), latex_str.end(),'\n'));
+ return int(std::count(latex_str.begin(), latex_str.end(),'\n'));
}
int InsetGraphics::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const &) const
+ OutputParams const &) const
{
// No graphics in ascii output. Possible to use gifscii to convert
// images to ascii approximation.
// FIXME: We have no idea what the encoding of the filename is
docstring const str = bformat(buf.B_("Graphics file: %1$s"),
- from_utf8(params().filename.absFilename()));
+ from_utf8(params().filename.absFilename()));
os << '<' << str << '>';
return 2 + str.size();
namespace {
-int writeImageObject(char * format, odocstream & os, OutputParams const & runparams,
- docstring const graphic_label, docstring const attributes)
+int writeImageObject(char const * format,
+ odocstream & os,
+ OutputParams const & runparams,
+ docstring const & graphic_label,
+ docstring const & attributes)
{
if (runparams.flavor != OutputParams::XML) {
os << "<
projects / lyx.git / blobdiff