-
#include <config.h>
-#include <cstdlib>
-
#ifdef __GNUG__
#pragma implementation
#endif
-#include "frontends/Dialogs.h"
-
#include "insetinclude.h"
#include "buffer.h"
#include "bufferlist.h"
+#include "BufferView.h"
#include "debug.h"
-#include "support/filetools.h"
#include "lyxrc.h"
#include "LyXView.h"
#include "LaTeXFeatures.h"
#include "gettext.h"
+#include "lyxtextclasslist.h"
+
+#include "frontends/Dialogs.h"
+
+#include "support/filetools.h"
#include "support/FileInfo.h"
-#include "layout.h"
-#include "lyxfunc.h"
+#include "support/lstrings.h"
+
+#include <cstdlib>
+
using std::ostream;
using std::endl;
extern BufferList bufferlist;
+namespace {
-static inline
-string unique_id() {
+string const unique_id()
+{
static unsigned int seed = 1000;
- std::ostringstream ost;
+ ostringstream ost;
ost << "file" << ++seed;
// Needed if we use lyxstring.
return ost.str().c_str();
}
+} // namespace anon
+
+
+InsetInclude::InsetInclude(Params const & p)
+ : params_(p), include_label(unique_id())
+{}
-InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & bf)
- : InsetCommand(p), master(&bf)
+
+InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
+ : include_label(unique_id())
{
- flag = InsetInclude::INCLUDE;
- noload = false;
- include_label = unique_id();
+ params_.cparams = p;
+ params_.masterFilename_ = b.fileName();
}
InsetInclude::~InsetInclude()
{
+ hideDialog();
+}
+
+
+InsetInclude::Params const & InsetInclude::params() const
+{
+ return params_;
+}
+
+
+bool InsetInclude::Params::operator==(Params const & o) const
+{
+ if (cparams == o.cparams && flag == o.flag &&
+ noload == o.noload && masterFilename_ == o.masterFilename_)
+ return true;
+
+ return false;
+}
+
+
+bool InsetInclude::Params::operator!=(Params const & o) const
+{
+ return !(*this == o);
}
-Inset * InsetInclude::Clone(Buffer const & buffer) const
-{
- InsetInclude * ii = new InsetInclude (params(), buffer);
- ii->setNoLoad(isNoLoad());
- // By default, the newly created inset is of `include' type,
- // so we do not test this case.
- if (isInput())
- ii->setInput();
- else if (isVerb()) {
- ii->setVerb();
- ii->setVisibleSpace(isVerbVisibleSpace());
+void InsetInclude::set(Params const & p)
+{
+ params_ = p;
+
+ // Just to be safe...
+ string command;
+
+ switch (params_.flag) {
+ case INCLUDE:
+ command="include";
+ break;
+ case VERB:
+ command="verbatiminput";
+ break;
+ case INPUT:
+ command="input";
+ break;
+ case VERBAST:
+ command="verbatiminput*";
+ break;
}
- return ii;
+
+ params_.cparams.setCmdName(command);
+}
+
+
+Inset * InsetInclude::clone(Buffer const & buffer, bool) const
+{
+ Params p(params_);
+ p.masterFilename_ = buffer.fileName();
+
+ return new InsetInclude(p);
}
-void InsetInclude::Edit(BufferView * bv, int, int, unsigned int)
+void InsetInclude::edit(BufferView * bv, int, int, unsigned int)
{
bv->owner()->getDialogs()->showInclude(this);
}
-void InsetInclude::Write(Buffer const *, ostream & os) const
+void InsetInclude::edit(BufferView * bv, bool)
+{
+ edit(bv, 0, 0, 0);
+}
+
+
+void InsetInclude::write(Buffer const *, ostream & os) const
{
- os << "Include " << getCommand() << "\n";
+ os << "Include " << params_.cparams.getCommand() << "\n";
}
-void InsetInclude::Read(Buffer const * buf, LyXLex & lex)
+void InsetInclude::read(Buffer const *, LyXLex & lex)
{
- InsetCommand::Read(buf, lex);
-
- if (getCmdName() == "include")
- setInclude();
- else if (getCmdName() == "input")
- setInput();
- else if (contains(getCmdName(), "verbatim")) {
- setVerb();
- if (getCmdName() == "verbatiminput*")
- setVisibleSpace(true);
+ params_.cparams.read(lex);
+
+ if (params_.cparams.getCmdName() == "include")
+ params_.flag = INCLUDE;
+ else if (params_.cparams.getCmdName() == "input")
+ params_.flag = INPUT;
+ /* FIXME: is this logic necessary now ? */
+ else if (contains(params_.cparams.getCmdName(), "verbatim")) {
+ params_.flag = VERB;
+ if (params_.cparams.getCmdName() == "verbatiminput*")
+ params_.flag = VERBAST;
}
}
-bool InsetInclude::display() const
+bool InsetInclude::display() const
{
- return !isInput();
+ return !(params_.flag == INPUT);
}
-string const InsetInclude::getScreenLabel() const
+string const InsetInclude::getScreenLabel(Buffer const *) const
{
string temp;
- if (isInput())
- temp += _("Input");
- else if (isVerb()) {
- temp += _("Verbatim Input");
- if (isVerbVisibleSpace()) temp += '*';
- } else temp += _("Include");
+
+ switch (params_.flag) {
+ case INPUT: temp += _("Input"); break;
+ case VERB: temp += _("Verbatim Input"); break;
+ case VERBAST: temp += _("Verbatim Input*"); break;
+ case INCLUDE: temp += _("Include"); break;
+ }
+
temp += ": ";
- if (getContents().empty()) {
- temp+= "???";
- } else {
- temp+= getContents();
- }
+ if (params_.cparams.getContents().empty())
+ temp += "???";
+ else
+ temp += params_.cparams.getContents();
+
return temp;
}
+string const InsetInclude::getRelFileBaseName() const
+{
+ return OnlyFilename(ChangeExtension(params_.cparams.getContents(), string()));
+}
+
+
string const InsetInclude::getFileName() const
{
- return MakeAbsPath(getContents(),
+ return MakeAbsPath(params_.cparams.getContents(),
OnlyPath(getMasterFilename()));
}
string const InsetInclude::getMasterFilename() const
{
- return master->fileName();
+ return params_.masterFilename_;
}
bool InsetInclude::loadIfNeeded() const
{
- if (isNoLoad() || isVerb()) return false;
- if (!IsLyXFilename(getFileName())) return false;
+ if (params_.noload || isVerbatim())
+ return false;
+
+ if (!IsLyXFilename(getFileName()))
+ return false;
- if (bufferlist.exists(getFileName())) return true;
+ if (bufferlist.exists(getFileName()))
+ return true;
// the readonly flag can/will be wrong, not anymore I think.
FileInfo finfo(getFileName());
- bool const ro = !finfo.writable();
- return bufferlist.readFile(getFileName(), ro) != 0;
+ if (!finfo.isOK())
+ return false;
+
+ return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
}
-int InsetInclude::Latex(Buffer const * buffer, ostream & os,
+int InsetInclude::latex(Buffer const * buffer, ostream & os,
bool /*fragile*/, bool /*fs*/) const
{
- string incfile(getContents());
+ string incfile(params_.cparams.getContents());
// Do nothing if no file name has been specified
if (incfile.empty())
return 0;
-
+
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
+ // FIXME: this should be a GUI warning
if (tmp->params.textclass != buffer->params.textclass) {
lyxerr << "WARNING: Included file `"
<< MakeDisplayPath(getFileName())
// write it to a file (so far the complete file)
string writefile = ChangeExtension(getFileName(), ".tex");
+
if (!buffer->tmppath.empty()
&& !buffer->niceFile) {
incfile = subst(incfile, '/','@');
tmp->markDepClean(buffer->tmppath);
tmp->makeLaTeXFile(writefile,
- OnlyPath(getMasterFilename()),
+ OnlyPath(getMasterFilename()),
buffer->niceFile, true);
- }
+ }
- if (isVerb()) {
- os << '\\' << getCmdName() << '{' << incfile << '}';
- } else if (isInput()) {
+ if (isVerbatim()) {
+ os << '\\' << params_.cparams.getCmdName() << '{' << incfile << '}';
+ } else if (params_.flag == INPUT) {
// \input wants file with extension (default is .tex)
if (!IsLyXFilename(getFileName())) {
- os << '\\' << getCmdName() << '{' << incfile << '}';
+ os << '\\' << params_.cparams.getCmdName() << '{' << incfile << '}';
} else {
- os << '\\' << getCmdName() << '{'
+ os << '\\' << params_.cparams.getCmdName() << '{'
<< ChangeExtension(incfile, ".tex")
<< '}';
}
} else {
// \include don't want extension and demands that the
// file really have .tex
- os << '\\' << getCmdName() << '{'
+ os << '\\' << params_.cparams.getCmdName() << '{'
<< ChangeExtension(incfile, string())
<< '}';
}
}
-int InsetInclude::Ascii(Buffer const *, std::ostream & os, int) const
+int InsetInclude::ascii(Buffer const *, ostream & os, int) const
{
- if (isVerb())
+ if (isVerbatim())
os << GetFileContents(getFileName());
return 0;
}
-int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const
+int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
{
- string incfile(getContents());
+ string incfile(params_.cparams.getContents());
// Do nothing if no file name has been specified
if (incfile.empty())
return 0;
-
+
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
// 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);
} else
lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
tmp->makeLinuxDocFile(writefile, buffer->niceFile, true);
- }
+ }
- if (isVerb()) {
- os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
- << "\" format=\"linespecific\">"
- << "</inlinegraphic>";
- } else
+ if (isVerbatim()) {
+ os << "<![CDATA["
+ << GetFileContents(getFileName())
+ << "]]>";
+ } else
os << '&' << include_label << ';';
return 0;
}
-int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const
+int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
{
- string incfile(getContents());
+ string incfile(params_.cparams.getContents());
// Do nothing if no file name has been specified
if (incfile.empty())
return 0;
-
+
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
// 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);
} else
lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
tmp->makeDocBookFile(writefile, buffer->niceFile, true);
- }
+ }
- if (isVerb()) {
- os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
- << "\" format=\"linespecific\">"
- << "</inlinegraphic>";
- } else
+ if (isVerbatim()) {
+ os << "<inlinegraphic fileref=\""
+ << '&' << include_label << ';'
+ << "\" format=\"linespecific\">";
+ } else
os << '&' << include_label << ';';
return 0;
}
-void InsetInclude::Validate(LaTeXFeatures & features) const
+void InsetInclude::validate(LaTeXFeatures & features) const
{
- string incfile(getContents());
- string writefile; // = ChangeExtension(getFileName(), ".sgml");
+ string incfile(params_.cparams.getContents());
+ string writefile;
+
+ Buffer const * const b = bufferlist.getBuffer(getMasterFilename());
- if (!master->tmppath.empty() && !master->niceFile) {
+ if (b && !b->tmppath.empty() && b->niceFile && !isVerbatim()) {
incfile = subst(incfile, '/','@');
- writefile = AddName(master->tmppath, incfile);
+ writefile = AddName(b->tmppath, incfile);
} else
writefile = getFileName();
- // Use the relative path.
- //writefile = incfile;
if (IsLyXFilename(getFileName()))
writefile = ChangeExtension(writefile, ".sgml");
- features.IncludedFiles[include_label] = writefile;
+ features.includeFile(include_label, writefile);
- if (isVerb())
- features.verbatim = true;
+ if (isVerbatim())
+ features.require("verbatim");
// Here we must do the fun stuff...
// Load the file in the include if it needs
// to be loaded:
if (loadIfNeeded()) {
// a file got loaded
- Buffer * tmp = bufferlist.getBuffer(getFileName());
- tmp->validate(features);
+ Buffer const * const tmp = bufferlist.getBuffer(getFileName());
+ if (tmp)
+ tmp->validate(features);
}
}
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
- tmp->setParentName("");
+ tmp->setParentName("");
l = tmp->getLabelList();
tmp->setParentName(getMasterFilename());
}
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
- tmp->setParentName("");
+ tmp->setParentName("");
keys = tmp->getBibkeyList();
tmp->setParentName(getMasterFilename());
}
projects / lyx.git / blobdiff