*
* Full author contact details are available in file CREDITS
*/
-#include <config.h>
+#include <config.h>
#include "insetinclude.h"
#include "buffer.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 std::ostream;
using std::endl;
using std::vector;
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
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, true);
- 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 InsetButton::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_;
}
params_ = p;
string command;
-
+
switch (params_.flag) {
case INCLUDE:
command="include";
command="verbatiminput*";
break;
}
-
- params_.cparams.setCmdName(command);
-
+
+ params_.cparams.setCmdName(command);
+
if (preview_->monitoring())
preview_->stopMonitoring();
}
-Inset * InsetInclude::clone(Buffer const & buffer, bool) const
+Inset * 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);
-}
-
-
-void InsetInclude::edit(BufferView * bv, int, int, mouse_button::state)
-{
- InsetIncludeMailer mailer(*this);
- mailer.showDialog(bv);
-}
-
-
-void InsetInclude::edit(BufferView * bv, bool)
-{
- edit(bv, 0, 0, mouse_button::none);
+ return new InsetInclude(params_);
}
}
-string const InsetInclude::getRelFileBaseName() const
-{
- return OnlyFilename(ChangeExtension(params_.cparams.getContents(), string()));
-}
-
-
string const InsetInclude::getFileName() const
{
return MakeAbsPath(params_.cparams.getContents(),
if (!finfo.isOK())
return false;
- return bufferlist.loadLyXFile(getFileName(), false) != 0;
+ return bufferlist.loadLyXFile(getFileName(), false) != 0;
}
int InsetInclude::latex(Buffer const * buffer, ostream & os,
- bool /*fragile*/, bool /*fs*/) const
+ LatexRunParams const & runparams) const
{
string incfile(params_.cparams.getContents());
// 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, ':', '$');
tmp->markDepClean(buffer->tmppath);
- tmp->makeLaTeXFile(writefile,
- OnlyPath(getMasterFilename()),
- buffer->niceFile, true);
+ tmp->makeLaTeXFile(writefile, OnlyPath(getMasterFilename()),
+ runparams, true);
}
if (isVerbatim()) {
}
-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 {
+ InsetButton::metrics(mi, dim);
+ }
+ dim_ = dim;
}
-void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
- float & xx, bool b) 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, b);
+ InsetButton::draw(pi, x, 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;
+ Dimension dim;
+ MetricsInfo mi;
+ mi.base.bv = pi.base.bv;
+ mi.base.font = pi.base.font;
+ metrics(mi, dim);
+ dim_ = dim;
- bv->painter().image(x, y - a, w, h,
+ pi.pain.image(x, y - dim.asc, dim.wid, dim.height(),
*(preview_->pimage()->image()));
-
- xx += w;
}
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());
}
lyxerr << "restartLoading()" << std::endl;
removePreview();
if (view())
- view()->updateInset(&parent(), false);
+ view()->updateInset(&parent());
generatePreview();
}
{
params = InsetInclude::Params();
- istringstream data(in);
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
}
if (lex.isOK()) {
- InsetInclude inset(params);
+ InsetInclude inset(params);
inset.read(0, lex);
params = inset.params();
}
data << name_ << ' ';
inset.write(0, data);
data << "\\end_inset\n";
-
- return data.str();
+ return STRCONV(data.str());
}
projects / lyx.git / blobdiff