Don't remove cell selections after fontchange.

[lyx.git] / src / insets / insetinclude.C

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 57c3d64905550fb98f50cf46383947c872b23a2b..2e3e062714b477cf8c439775bbf551c8d4a99326 100644 (file)
--- 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();
 }
 
 
@@ -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
@@ -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
@@ -388,18 +388,14 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 
        Buffer const * const b = bufferlist.getBuffer(getMasterFilename());
 
-       if (!b->isSGML()) {
-               if (b && !b->tmppath.empty() && b->niceFile) {
-                       incfile = subst(incfile, '/','@');
-                       writefile = AddName(b->tmppath, incfile);
-               } else
-                       writefile = getFileName();
-       } else {
+       if (b && !b->tmppath.empty() && b->niceFile && !isVerbatim()) {
+               incfile = subst(incfile, '/','@');
+               writefile = AddName(b->tmppath, incfile);
+       } else
                writefile = getFileName();
 
-               if (IsLyXFilename(getFileName()))
-                       writefile = ChangeExtension(writefile, ".sgml");
-       }
+       if (IsLyXFilename(getFileName()))
+               writefile = ChangeExtension(writefile, ".sgml");
 
        features.includeFile(include_label, writefile);