*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
-#include <config.h>
+#include <config.h>
#include "insetinclude.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferlist.h"
#include "BufferView.h"
#include "debug.h"
#include "funcrequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
+#include "Lsstream.h"
#include "lyxlex.h"
#include "lyxrc.h"
+#include "metricsinfo.h"
+#include "dimension.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
#include "support/FileMonitor.h"
-#include "support/lstrings.h"
+#include "support/lstrings.h" // contains
+#include "support/tostr.h"
#include "graphics/PreviewedInset.h"
#include "graphics/PreviewImage.h"
#include <cstdlib>
+using namespace lyx::support;
using std::ostream;
using std::endl;
using std::vector;
using std::pair;
+using std::auto_ptr;
+
extern BufferList bufferlist;
-class InsetInclude::PreviewImpl : public grfx::PreviewedInset {
+class InsetInclude::PreviewImpl : public lyx::graphics::PreviewedInset {
public:
///
PreviewImpl(InsetInclude & p) : PreviewedInset(p) {}
string const uniqueID()
{
static unsigned int seed = 1000;
-
- ostringstream ost;
- ost << "file" << ++seed;
-
- // Needed if we use lyxstring.
- return STRCONV(ost.str());
+ return "file" + tostr(++seed);
}
} // namespace anon
InsetInclude::InsetInclude(Params const & p)
: params_(p), include_label(uniqueID()),
- preview_(new PreviewImpl(*this))
+ preview_(new PreviewImpl(*this)),
+ set_label_(false)
{}
InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
: include_label(uniqueID()),
- preview_(new PreviewImpl(*this))
+ preview_(new PreviewImpl(*this)),
+ set_label_(false)
{
params_.cparams = p;
params_.masterFilename_ = b.fileName();
}
+InsetInclude::InsetInclude(InsetInclude const & other)
+ : InsetOld(other),
+ params_(other.params_),
+ include_label(other.include_label),
+ preview_(new PreviewImpl(*this)),
+ set_label_(other.set_label_)
+{}
+
+
InsetInclude::~InsetInclude()
{
InsetIncludeMailer mailer(*this);
dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
{
- dispatch_result result = UNDISPATCHED;
-
switch (cmd.action) {
+
case LFUN_INSET_MODIFY: {
InsetInclude::Params p;
InsetIncludeMailer::string2params(cmd.argument, p);
- if (p.cparams.getCmdName().empty())
- break;
-
- set(p);
- params_.masterFilename_ = cmd.view()->buffer()->fileName();
-
- cmd.view()->updateInset(this);
- result = DISPATCHED;
+ if (!p.cparams.getCmdName().empty()) {
+ set(p);
+ params_.masterFilename_ = cmd.view()->buffer()->fileName();
+ cmd.view()->updateInset(this);
+ }
+ return DISPATCHED;
}
- break;
- case LFUN_INSET_DIALOG_UPDATE: {
- InsetIncludeMailer mailer(*this);
- mailer.updateDialog(cmd.view());
- }
- break;
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetIncludeMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
case LFUN_MOUSE_RELEASE:
- edit(cmd.view(), cmd.x, cmd.y, cmd.button());
- break;
+ case LFUN_INSET_EDIT:
+ InsetIncludeMailer(*this).showDialog(cmd.view());
+ return DISPATCHED;
default:
- break;
+ return InsetOld::localDispatch(cmd);
}
-
- return result;
}
bool InsetInclude::Params::operator==(Params const & o) const
{
- if (cparams == o.cparams && flag == o.flag &&
- masterFilename_ == o.masterFilename_)
- return true;
-
- return false;
+ return cparams == o.cparams && flag == o.flag &&
+ masterFilename_ == o.masterFilename_;
}
if (preview_->monitoring())
preview_->stopMonitoring();
- if (grfx::PreviewedInset::activated() && params_.flag == INPUT)
+ if (lyx::graphics::PreviewedInset::activated() && params_.flag == INPUT)
preview_->generatePreview();
}
-Inset * InsetInclude::clone(Buffer const & buffer, bool) const
+auto_ptr<InsetBase> InsetInclude::clone() const
{
- Params p(params_);
- p.masterFilename_ = buffer.fileName();
+ //Params p(params_);
+ //p.masterFilename_ = buffer.fileName();
+#warning FIXME: broken cross-doc copy/paste - must fix
- return new InsetInclude(p);
+ return auto_ptr<InsetBase>(new InsetInclude(params_));
}
-void InsetInclude::edit(BufferView * bv, int, int, mouse_button::state)
+void InsetInclude::write(Buffer const &, ostream & os) const
{
- InsetIncludeMailer mailer(*this);
- mailer.showDialog(bv);
+ write(os);
}
-void InsetInclude::edit(BufferView * bv, bool)
+void InsetInclude::write(ostream & os) const
{
- edit(bv, 0, 0, mouse_button::none);
+ os << "Include " << params_.cparams.getCommand() << '\n'
+ << "preview " << tostr(params_.cparams.preview()) << '\n';
}
-void InsetInclude::write(Buffer const *, ostream & os) const
+void InsetInclude::read(Buffer const &, LyXLex & lex)
{
- os << "Include " << params_.cparams.getCommand() << '\n'
- << "preview " << tostr(params_.cparams.preview()) << '\n';
+ read(lex);
}
-void InsetInclude::read(Buffer const *, LyXLex & lex)
+void InsetInclude::read(LyXLex & lex)
{
params_.cparams.read(lex);
}
-bool InsetInclude::display() const
-{
- return !(params_.flag == INPUT);
-}
-
-
-string const InsetInclude::getScreenLabel(Buffer const *) const
+string const InsetInclude::getScreenLabel(Buffer const &) const
{
string temp;
FileInfo finfo(getFileName());
if (!finfo.isOK())
return false;
-
- return bufferlist.loadLyXFile(getFileName(), false) != 0;
+ return loadLyXFile(bufferlist.newBuffer(getFileName()),
+ getFileName());
}
-int InsetInclude::latex(Buffer const * buffer, ostream & os,
- bool /*fragile*/, bool /*fs*/) const
+int InsetInclude::latex(Buffer const & buffer, ostream & os,
+ LatexRunParams const & runparams) const
{
string incfile(params_.cparams.getContents());
Buffer * tmp = bufferlist.getBuffer(getFileName());
// FIXME: this should be a GUI warning
- if (tmp->params.textclass != buffer->params.textclass) {
+ if (tmp->params.textclass != buffer.params.textclass) {
lyxerr << "WARNING: Included file `"
<< MakeDisplayPath(getFileName())
<< "' has textclass `"
<< tmp->params.getLyXTextClass().name()
<< "' while parent file has textclass `"
- << buffer->params.getLyXTextClass().name()
+ << buffer.params.getLyXTextClass().name()
<< "'." << endl;
//return 0;
}
// write it to a file (so far the complete file)
string writefile = ChangeExtension(getFileName(), ".tex");
- if (!buffer->tmppath.empty()
- && !buffer->niceFile) {
+ if (!buffer.tmppath.empty() && !runparams.nice) {
incfile = subst(incfile, '/','@');
#ifdef __EMX__
incfile = subst(incfile, ':', '$');
#endif
- writefile = AddName(buffer->tmppath, incfile);
+ writefile = AddName(buffer.tmppath, incfile);
} else
writefile = getFileName();
writefile = ChangeExtension(writefile, ".tex");
lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
- tmp->markDepClean(buffer->tmppath);
+ tmp->markDepClean(buffer.tmppath);
- tmp->makeLaTeXFile(writefile,
- OnlyPath(getMasterFilename()),
- buffer->niceFile, true);
+ tmp->makeLaTeXFile(writefile, OnlyPath(getMasterFilename()),
+ runparams, false);
}
if (isVerbatim()) {
}
-int InsetInclude::ascii(Buffer const *, ostream & os, int) const
+int InsetInclude::ascii(Buffer const &, ostream & os, int) const
{
if (isVerbatim())
os << GetFileContents(getFileName());
}
-int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
+int InsetInclude::linuxdoc(Buffer const & buffer, ostream & os) const
{
string incfile(params_.cparams.getContents());
// write it to a file (so far the complete file)
string writefile = ChangeExtension(getFileName(), ".sgml");
- if (!buffer->tmppath.empty() && !buffer->niceFile) {
+ if (!buffer.tmppath.empty() && !buffer.niceFile) {
incfile = subst(incfile, '/','@');
- writefile = AddName(buffer->tmppath, incfile);
+ writefile = AddName(buffer.tmppath, incfile);
} else
writefile = getFileName();
lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
- tmp->makeLinuxDocFile(writefile, buffer->niceFile, true);
+ tmp->makeLinuxDocFile(writefile, buffer.niceFile, true);
}
if (isVerbatim()) {
}
-int InsetInclude::docbook(Buffer const * buffer, ostream & os,
+int InsetInclude::docbook(Buffer const & buffer, ostream & os,
bool /*mixcont*/) const
{
string incfile(params_.cparams.getContents());
// write it to a file (so far the complete file)
string writefile = ChangeExtension(getFileName(), ".sgml");
- if (!buffer->tmppath.empty() && !buffer->niceFile) {
+ if (!buffer.tmppath.empty() && !buffer.niceFile) {
incfile = subst(incfile, '/','@');
- writefile = AddName(buffer->tmppath, incfile);
+ writefile = AddName(buffer.tmppath, incfile);
} else
writefile = getFileName();
if (IsLyXFilename(getFileName()))
lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
- tmp->makeDocBookFile(writefile, buffer->niceFile, true);
+ tmp->makeDocBookFile(writefile, buffer.niceFile, true);
}
if (isVerbatim()) {
string incfile(params_.cparams.getContents());
string writefile;
- Buffer const * const b = bufferlist.getBuffer(getMasterFilename());
+ Buffer const & b = *bufferlist.getBuffer(getMasterFilename());
- if (b && !b->tmppath.empty() && !b->niceFile && !isVerbatim()) {
+ if (!b.tmppath.empty() && !b.niceFile && !isVerbatim()) {
incfile = subst(incfile, '/','@');
- writefile = AddName(b->tmppath, incfile);
+ writefile = AddName(b.tmppath, incfile);
} else
writefile = getFileName();
// a file got loaded
Buffer * const tmp = bufferlist.getBuffer(getFileName());
if (tmp) {
- if (b)
- tmp->niceFile = b->niceFile;
+ tmp->niceFile = b.niceFile;
tmp->validate(features);
}
}
}
-vector<string> const InsetInclude::getLabelList() const
+void InsetInclude::getLabelList(std::vector<string> & list) const
{
- vector<string> l;
-
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
tmp->setParentName("");
- l = tmp->getLabelList();
+ tmp->getLabelList(list);
tmp->setParentName(getMasterFilename());
}
-
- return l;
}
-void InsetInclude::fillWithBibKeys(vector<pair<string,string> > & keys) const
+void InsetInclude::fillWithBibKeys(std::vector<std::pair<string,string> > & keys) const
{
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
}
-int InsetInclude::ascent(BufferView * bv, LyXFont const & font) const
-{
- return preview_->previewReady() ?
- preview_->pimage()->ascent() : InsetButton::ascent(bv, font);
-}
-
-
-int InsetInclude::descent(BufferView * bv, LyXFont const & font) const
-{
- return preview_->previewReady() ?
- preview_->pimage()->descent() : InsetButton::descent(bv, font);
-}
-
-
-int InsetInclude::width(BufferView * bv, LyXFont const & font) const
+void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
{
- return preview_->previewReady() ?
- preview_->pimage()->width() : InsetButton::width(bv, font);
+ if (preview_->previewReady()) {
+ dim.asc = preview_->pimage()->ascent();
+ dim.des = preview_->pimage()->descent();
+ dim.wid = preview_->pimage()->width();
+ } else {
+ if (!set_label_) {
+ set_label_ = true;
+ button_.update(getScreenLabel(*mi.base.bv->buffer()),
+ editable() != NOT_EDITABLE);
+ }
+ button_.metrics(mi, dim);
+ }
+ if (params_.flag == INPUT)
+ center_indent_ = 0;
+ else
+ center_indent_ = (mi.base.textwidth - dim.wid) / 2;
+ dim.wid = mi.base.textwidth;
+ dim_ = dim;
}
-void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
- float & xx) const
+void InsetInclude::draw(PainterInfo & pi, int x, int y) const
{
- cache(bv);
+ cache(pi.base.bv);
if (!preview_->previewReady()) {
- InsetButton::draw(bv, font, y, xx);
+ button_.draw(pi, x + center_indent_, y);
return;
}
if (!preview_->monitoring())
preview_->startMonitoring();
- int const x = int(xx);
- int const w = width(bv, font);
- int const d = descent(bv, font);
- int const a = ascent(bv, font);
- int const h = a + d;
-
- bv->painter().image(x, y - a, w, h,
+ pi.pain.image(x + center_indent_, y - dim_.asc, dim_.wid, dim_.height(),
*(preview_->pimage()->image()));
+}
+
- xx += w;
+BufferView * InsetInclude::view() const
+{
+ return button_.view();
}
// preview stuff
//
-void InsetInclude::addPreview(grfx::PreviewLoader & ploader) const
+void InsetInclude::addPreview(lyx::graphics::PreviewLoader & ploader) const
{
preview_->addPreview(ploader);
}
return string();
ostringstream os;
- parent().latex(view()->buffer(), os, false, false);
+ LatexRunParams runparams;
+ runparams.flavor = LatexRunParams::LATEX;
+ parent().latex(*view()->buffer(), os, runparams);
return STRCONV(os.str());
}
{}
-string const InsetIncludeMailer::inset2string() const
+string const InsetIncludeMailer::inset2string(Buffer const &) const
{
return params2string(inset_.params());
}
if (in.empty())
return;
-
- istringstream data(in);
+
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
if (lex.isOK()) {
InsetInclude inset(params);
- inset.read(0, lex);
+ inset.read(lex);
params = inset.params();
}
}
inset.set(params);
ostringstream data;
data << name_ << ' ';
- inset.write(0, data);
+ inset.write(data);
data << "\\end_inset\n";
-
- return data.str();
+ return STRCONV(data.str());
}
projects / lyx.git / blobdiff