X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.C;h=2e3e062714b477cf8c439775bbf551c8d4a99326;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=a7f28753ad4df16b3b64488ad8575d86f1c4562e;hpb=61ccd8b8b58f7b6235ae4516a0ed2b1702af6286;p=lyx.git
diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index a7f28753ad..2e3e062714 100644
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -53,10 +53,10 @@ InsetInclude::InsetInclude(Params const & p)
InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
+ : include_label(unique_id())
{
params_.cparams = p;
params_.masterFilename_ = b.fileName();
- include_label = unique_id();
}
@@ -218,8 +218,10 @@ bool InsetInclude::loadIfNeeded() const
// the readonly flag can/will be wrong, not anymore I think.
FileInfo finfo(getFileName());
- bool const ro = !(!finfo.isOK() || finfo.writable());
- return bufferlist.readFile(getFileName(), ro) != 0;
+ if (!finfo.isOK())
+ return false;
+
+ return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
}
@@ -293,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());
@@ -314,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
@@ -330,9 +332,9 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
}
if (isVerbatim()) {
- os << ""
- << "";
+ os << "";
} else
os << '&' << include_label << ';';
@@ -353,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
@@ -368,9 +370,9 @@ int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
}
if (isVerbatim()) {
- os << ""
- << "";
+ os << "";
} else
os << '&' << include_label << ';';
@@ -386,7 +388,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const
Buffer const * const b = bufferlist.getBuffer(getMasterFilename());
- if (b && !b->tmppath.empty() && b->niceFile) {
+ if (b && !b->tmppath.empty() && b->niceFile && !isVerbatim()) {
incfile = subst(incfile, '/','@');
writefile = AddName(b->tmppath, incfile);
} else