#include <sstream>
-namespace support = lyx::support;
-namespace external = lyx::external;
-namespace graphics = lyx::graphics;
-
-using lyx::docstring;
using std::endl;
using std::string;
using std::auto_ptr;
using std::ostringstream;
using std::vector;
-namespace lyx {
-extern bool use_gui;
-}
namespace {
-external::DisplayType const defaultDisplayType = external::NoDisplay;
+lyx::external::DisplayType const defaultDisplayType = lyx::external::NoDisplay;
unsigned int const defaultLyxScale = 100;
namespace lyx {
+
namespace external {
TempName::TempName()
{
- tempname_ = support::tempName(string(), "lyxext");
+ support::FileName const tempname(support::tempName(support::FileName(), "lyxext"));
// FIXME: This is unsafe
- support::unlink(tempname_);
+ support::unlink(tempname);
// must have an extension for the converter code to work correctly.
- tempname_ += ".tmp";
+ tempname_ = support::FileName(tempname.absFilename() + ".tmp");
}
}
} // namespace external
-} // namespace lyx
InsetExternalParams::InsetExternalParams()
case LFUN_EXTERNAL_EDIT: {
Buffer const & buffer = cur.buffer();
InsetExternalParams p;
- InsetExternalMailer::string2params(lyx::to_utf8(cmd.argument()), buffer, p);
+ InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer, p);
external::editExternal(p, buffer);
break;
}
case LFUN_INSET_MODIFY: {
Buffer const & buffer = cur.buffer();
InsetExternalParams p;
- InsetExternalMailer::string2params(lyx::to_utf8(cmd.argument()), buffer, p);
+ InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer, p);
setParams(p, buffer);
break;
}
}
-void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
{
renderer_->metrics(mi, dim);
+ bool const changed = dim_ != dim;
dim_ = dim;
+ return changed;
}
{
graphics::Params gparams;
- gparams.filename = eparams.filename.absFilename();
+ gparams.filename = eparams.filename;
gparams.scale = eparams.lyxscale;
if (eparams.clipdata.clip)
gparams.bb = eparams.clipdata.bbox;
if (gparams.display == graphics::DefaultDisplay)
gparams.display = lyxrc.display_graphics;
// Override the above if we're not using a gui
- if (!lyx::use_gui)
+ if (!use_gui)
gparams.display = graphics::NoDisplay;
return gparams;
if (!ptr)
// FIXME UNICODE
return support::bformat((_("External template %1$s is not installed")),
- lyx::from_utf8(params.templatename()));
+ from_utf8(params.templatename()));
// FIXME UNICODE
- return lyx::from_utf8(external::doSubstitution(params, buffer,
+ return from_utf8(external::doSubstitution(params, buffer,
ptr->guiName, false));
}
}
-int InsetExternal::latex(Buffer const & buf, ostream & os,
+int InsetExternal::latex(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
if (params_.draft) {
+ // FIXME UNICODE
os << "\\fbox{\\ttfamily{}"
- << params_.filename.outputFilename(buf.filePath())
+ << from_utf8(params_.filename.outputFilename(buf.filePath()))
<< "}\n";
return 1;
}
external::Template::Formats::const_iterator cit =
et.formats.find("PDFLaTeX");
- if (cit != et.formats.end())
+
+ if (cit != et.formats.end()) {
return external::writeExternal(params_, "PDFLaTeX",
- buf, os,
- *(runparams.exportdata),
- external_in_tmpdir,
- runparams.inComment);
+ buf, os,
+ *(runparams.exportdata),
+ external_in_tmpdir,
+ runparams.inComment);
+ }
+
}
+
return external::writeExternal(params_, "LaTeX", buf, os,
- *(runparams.exportdata),
- external_in_tmpdir,
- runparams.inComment);
+ *(runparams.exportdata),
+ external_in_tmpdir,
+ runparams.inComment);
}
-int InsetExternal::plaintext(Buffer const & buf, lyx::odocstream & os,
+int InsetExternal::plaintext(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
- std::ostringstream oss;
- int const retval = external::writeExternal(params_, "Ascii", buf, oss,
+ return external::writeExternal(params_, "Ascii", buf, os,
*(runparams.exportdata), false,
runparams.inComment);
- // FIXME UNICODE
- os << lyx::from_utf8(oss.str());
- return retval;
}
-int InsetExternal::docbook(Buffer const & buf, ostream & os,
+int InsetExternal::docbook(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
return external::writeExternal(params_, "DocBook", buf, os,
bool preview_wanted(InsetExternalParams const & params)
{
- string const included_file = params.filename.absFilename();
-
return params.display == external::PreviewDisplay &&
- support::isFileReadable(included_file);
+ support::isFileReadable(params.filename);
}
-string const latex_string(InsetExternal const & inset, Buffer const & buffer)
+docstring const latex_string(InsetExternal const & inset, Buffer const & buffer)
{
- ostringstream os;
+ odocstringstream os;
OutputParams runparams;
runparams.flavor = OutputParams::LATEX;
inset.latex(buffer, os, runparams);
-
return os.str();
}
if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
preview_wanted(params)) {
- renderer.setAbsFile(params.filename.absFilename());
- string const snippet = latex_string(inset, buffer);
+ renderer.setAbsFile(params.filename);
+ docstring const snippet = latex_string(inset, buffer);
renderer.addPreview(snippet, buffer);
renderer.startLoading(buffer);
}
return;
if (preview_wanted(params())) {
- ptr->setAbsFile(params_.filename.absFilename());
- string const snippet = latex_string(*this, ploader.buffer());
+ ptr->setAbsFile(params_.filename);
+ docstring const snippet = latex_string(*this, ploader.buffer());
ptr->addPreview(snippet, ploader);
}
}
data << "\\end_inset\n";
return data.str();
}
+
+} // namespace lyx