X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.C;h=2e3e062714b477cf8c439775bbf551c8d4a99326;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=e4f207a1a549a13a44a56cb3e5d983ca0d0e1266;hpb=1d99b347196588babb1a66a86183ba71301ad8da;p=lyx.git
diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index e4f207a1a5..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();
}
@@ -295,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());
@@ -316,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
@@ -332,9 +332,9 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
}
if (isVerbatim()) {
- os << ""
- << "";
+ os << "";
} else
os << '&' << include_label << ';';
@@ -355,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
@@ -370,9 +370,9 @@ int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
}
if (isVerbatim()) {
- os << ""
- << "";
+ os << "";
} else
os << '&' << include_label << ';';
@@ -388,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