Do not output deleted rows columns if show changes in output is false

[lyx.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 2810515..09d4be3
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -480,8 +480,10 @@ Buffer * InsetInclude::loadIfNeeded() const
        Buffer * child = theBufferList().getBuffer(included_file);
        if (!child) {
                // the readonly flag can/will be wrong, not anymore I think.
-               if (!included_file.exists())
+               if (!included_file.exists()) {
+                       failedtoload_ = true;
                        return 0;
+               }
 
                child = theBufferList().newBuffer(included_file.absFileName());
                if (!child)
@@ -572,7 +574,6 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
        string exppath = incfile;
        if (!runparams.export_folder.empty()) {
                exppath = makeAbsPath(exppath, runparams.export_folder).realPath();
-               FileName(exppath).onlyPath().createPath();
        }
 
        // write it to a file (so far the complete file)
@@ -849,8 +850,11 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                Language const * const oldLang = runparams.master_language;
                // If the master uses non-TeX fonts (XeTeX, LuaTeX),
                // the children must be encoded in plain utf8!
-               runparams.encoding = masterBuffer->params().useNonTeXFonts ?
-                       encodings.fromLyXName("utf8-plain") : oldEnc;
+               if (masterBuffer->params().useNonTeXFonts)
+                       runparams.encoding = encodings.fromLyXName("utf8-plain");
+               else if (oldEnc)
+                       runparams.encoding = oldEnc;
+               else runparams.encoding = &tmp->params().encoding();
                runparams.master_language = buffer().params().language;
                runparams.par_begin = 0;
                runparams.par_end = tmp->paragraphs().size();
@@ -884,15 +888,15 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                // If needed, use converters to produce a latex file from the child
                if (tmpwritefile != writefile) {
                        ErrorList el;
-                       Converters::RetVal const retval =
+                       Converters::RetVal const conv_retval =
                                theConverters().convert(tmp, tmpwritefile, writefile,
                                    included_file, inc_format, tex_format, el);
-                       if (retval == Converters::KILLED && buffer().isClone() &&
+                       if (conv_retval == Converters::KILLED && buffer().isClone() &&
                            buffer().isExporting()) {
                                // We really shouldn't get here, I don't think.
                                LYXERR0("No conversion exception?");
                                throw ConversionException();
-                       } else if (retval != Converters::SUCCESS && !runparams.silent) {
+                       } else if (conv_retval != Converters::SUCCESS && !runparams.silent) {
                                docstring msg = bformat(_("Included file `%1$s' "
                                                "was not exported correctly.\n "
                                                "LaTeX export is probably incomplete."),