X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.C;h=2e3e062714b477cf8c439775bbf551c8d4a99326;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=e5bff61a18190f2c473a2f373bf1ff8e099e5059;hpb=9356012089091a9c47b51ced9c27c516bf766637;p=lyx.git diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index e5bff61a18..2e3e062714 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -1,26 +1,28 @@ - #include -#include - #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 + using std::ostream; using std::endl; @@ -29,32 +31,32 @@ using std::pair; 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(InsetIncludeParams const & p) -{ - include_label = unique_id(); - setFromParams(p); - params_.buffer = p.buffer; -} + +InsetInclude::InsetInclude(Params const & p) + : params_(p), include_label(unique_id()) +{} InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b) + : include_label(unique_id()) { - include_label = unique_id(); - params_.buffer = &b; - setFromParams(p); + params_.cparams = p; + params_.masterFilename_ = b.fileName(); } @@ -64,66 +66,84 @@ InsetInclude::~InsetInclude() } -InsetInclude::InsetIncludeParams const & InsetInclude::params() const +InsetInclude::Params const & InsetInclude::params() const { return params_; } -void InsetInclude::setFromParams(InsetIncludeParams const & p) +bool InsetInclude::Params::operator==(Params const & o) const { - params_.cparams.setContents(p.cparams.getContents()); - params_.noload = p.noload; - if (params_.flag == p.flag) - return; + if (cparams == o.cparams && flag == o.flag && + noload == o.noload && masterFilename_ == o.masterFilename_) + return true; + + return false; +} - params_.flag = p.flag; - string command; +bool InsetInclude::Params::operator!=(Params const & o) const +{ + return !(*this == o); +} + +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; + case INCLUDE: + command="include"; + break; + case VERB: + command="verbatiminput"; + break; + case INPUT: + command="input"; + break; + case VERBAST: + command="verbatiminput*"; + break; } - + params_.cparams.setCmdName(command); } -Inset * InsetInclude::Clone(Buffer const & buffer) const +Inset * InsetInclude::clone(Buffer const & buffer, bool) const { - InsetIncludeParams p(params_); - p.buffer = &buffer; + Params p(params_); + p.masterFilename_ = buffer.fileName(); - return new InsetInclude (p); + 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 " << params_.cparams.getCommand() << "\n"; } -void InsetInclude::Read(Buffer const *, LyXLex & lex) +void InsetInclude::read(Buffer const *, LyXLex & lex) { - params_.cparams.Read(lex); + params_.cparams.read(lex); if (params_.cparams.getCmdName() == "include") params_.flag = INCLUDE; @@ -144,7 +164,7 @@ bool InsetInclude::display() const } -string const InsetInclude::getScreenLabel() const +string const InsetInclude::getScreenLabel(Buffer const *) const { string temp; @@ -181,7 +201,7 @@ string const InsetInclude::getFileName() const string const InsetInclude::getMasterFilename() const { - return params_.buffer->fileName(); + return params_.masterFilename_; } @@ -198,12 +218,14 @@ bool InsetInclude::loadIfNeeded() const // 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(params_.cparams.getContents()); @@ -273,7 +295,7 @@ int InsetInclude::Latex(Buffer const * buffer, ostream & os, } -int InsetInclude::Ascii(Buffer const *, std::ostream & os, int) const +int InsetInclude::ascii(Buffer const *, ostream & os, int) const { if (isVerbatim()) os << GetFileContents(getFileName()); @@ -281,7 +303,7 @@ int InsetInclude::Ascii(Buffer const *, std::ostream & os, int) const } -int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const +int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const { string incfile(params_.cparams.getContents()); @@ -294,7 +316,7 @@ int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const // 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 @@ -310,9 +332,9 @@ int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const } if (isVerbatim()) { - os << "" - << ""; + os << ""; } else os << '&' << include_label << ';'; @@ -320,7 +342,7 @@ int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const } -int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const +int InsetInclude::docbook(Buffer const * buffer, ostream & os) const { string incfile(params_.cparams.getContents()); @@ -333,7 +355,7 @@ int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const // 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 @@ -348,9 +370,9 @@ int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const } if (isVerbatim()) { - os << "" - << ""; + os << ""; } else os << '&' << include_label << ';'; @@ -358,35 +380,36 @@ int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const } -void InsetInclude::Validate(LaTeXFeatures & features) const +void InsetInclude::validate(LaTeXFeatures & features) const { string incfile(params_.cparams.getContents()); string writefile; - Buffer const & b = *params_.buffer; + Buffer const * const b = bufferlist.getBuffer(getMasterFilename()); - if (!b.tmppath.empty() && b.niceFile) { + if (b && !b->tmppath.empty() && b->niceFile && !isVerbatim()) { incfile = subst(incfile, '/','@'); - writefile = AddName(b.tmppath, incfile); + writefile = AddName(b->tmppath, incfile); } else writefile = getFileName(); if (IsLyXFilename(getFileName())) writefile = ChangeExtension(writefile, ".sgml"); - features.IncludedFiles[include_label] = writefile; + features.includeFile(include_label, writefile); if (isVerbatim()) - features.verbatim = true; + 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); } }