*
* 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 "Lsstream.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)
{
- if (cmd.action != LFUN_INSET_MODIFY)
- return UNDISPATCHED;
+ switch (cmd.action) {
- InsetInclude::Params p;
- InsetIncludeMailer::string2params(cmd.argument, p);
- if (p.cparams.getCmdName().empty())
- return UNDISPATCHED;
+ case LFUN_INSET_MODIFY: {
+ InsetInclude::Params p;
+ InsetIncludeMailer::string2params(cmd.argument, p);
+ if (!p.cparams.getCmdName().empty()) {
+ set(p);
+ params_.masterFilename_ = cmd.view()->buffer()->fileName();
+ cmd.view()->updateInset(this);
+ }
+ return DISPATCHED;
+ }
- set(p);
- params_.masterFilename_ = cmd.view()->buffer()->fileName();
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetIncludeMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
- cmd.view()->updateInset(this, true);
- return DISPATCHED;
+ case LFUN_MOUSE_RELEASE:
+ case LFUN_INSET_EDIT:
+ InsetIncludeMailer(*this).showDialog(cmd.view());
+ return DISPATCHED;
+
+ default:
+ return UNDISPATCHED;
+ }
}
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();
}
-void InsetInclude::edit(BufferView *, int, int, mouse_button::state)
-{
- InsetIncludeMailer mailer(*this);
- mailer.showDialog();
-}
-
-
-void InsetInclude::edit(BufferView * bv, bool)
-{
- edit(bv, 0, 0, mouse_button::none);
-}
-
-
void InsetInclude::write(Buffer const *, ostream & os) const
{
os << "Include " << params_.cparams.getCommand() << '\n'
}
-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()) {
void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
- float & xx, bool b) const
+ float & xx) const
{
cache(bv);
if (!preview_->previewReady()) {
- InsetButton::draw(bv, font, y, xx, b);
+ InsetButton::draw(bv, font, y, xx);
return;
}
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();
}
+string const InsetIncludeMailer::name_("include");
+
InsetIncludeMailer::InsetIncludeMailer(InsetInclude & inset)
- : name_("include"), inset_(inset)
+ : inset_(inset)
{}
string const InsetIncludeMailer::inset2string() const
{
- return params2string(name(), inset_.params());
+ return params2string(inset_.params());
}
{
params = InsetInclude::Params();
- string name;
- string body = split(in, name, ' ');
-
- if (name != "include" || body.empty())
+ if (in.empty())
return;
+
+ istringstream data(STRCONV(in));
+ LyXLex lex(0,0);
+ lex.setStream(data);
+
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != name_)
+ return;
+ }
// This is part of the inset proper that is usually swallowed
// by Buffer::readInset
- body = split(body, name, ' ');
- if (name != "Include")
- return;
-
- istringstream data(body);
- LyXLex lex(0,0);
- lex.setStream(data);
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != "Include")
+ return;
+ }
- InsetInclude inset(params);
- inset.read(0, lex);
- params = inset.params();
+ if (lex.isOK()) {
+ InsetInclude inset(params);
+ inset.read(0, lex);
+ params = inset.params();
+ }
}
string const
-InsetIncludeMailer::params2string(string const & name,
- InsetInclude::Params const & params)
+InsetIncludeMailer::params2string(InsetInclude::Params const & params)
{
InsetInclude inset(params);
inset.set(params);
ostringstream data;
- data << name << ' ';
+ data << name_ << ' ';
inset.write(0, data);
data << "\\end_inset\n";
-
- return data.str();
+ return STRCONV(data.str());
}
projects / lyx.git / blobdiff