Comments.

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 324b4a07628f9ae9f6fff7c503fdebe9ce06daa2..e7f9da374754862e4fdaee973b0b4ec7365c7229 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -513,15 +513,21 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                                              from_utf8(masterBuffer->filePath())));
        }
 
+       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)
        string exportfile;
        string mangled;
        // bug 5681
        if (type(params()) == LISTINGS) {
-               exportfile = incfile;
+               exportfile = exppath;
                mangled = DocFileName(included_file).mangledFileName();
        } else {
-               exportfile = changeExtension(incfile, ".tex");
+               exportfile = changeExtension(exppath, ".tex");
                mangled = DocFileName(changeExtension(included_file.absFileName(), ".tex")).
                        mangledFileName();
        }
@@ -617,7 +623,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                runparams.master_language = buffer().params().language;
                runparams.par_begin = 0;
                runparams.par_end = tmp->paragraphs().size();
-               if (!tmp->makeLaTeXFile(tmpwritefile, runparams, false)) {
+               if (!tmp->makeLaTeXFile(tmpwritefile, masterFileName(buffer()).
+                               onlyPath().absFileName(), runparams, Buffer::OnlyBody)) {
                        docstring msg = bformat(_("Included file `%1$s' "
                                        "was not exported correctly.\nWarning: "
                                        "LaTeX export is probably incomplete."),
@@ -656,8 +663,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                // In this case, it's not a LyX file, so we copy the file
                // to the temp dir, so that .aux files etc. are not created
                // in the original dir. Files included by this file will be
-               // found via the environment variable TEXINPUTS, which may be
-               // set in preferences and by default includes the original dir.
+               // found via either the environment variable TEXINPUTS, or
+               // input@path, see ../Buffer.cpp.
                unsigned long const checksum_in  = included_file.checksum();
                unsigned long const checksum_out = writefile.checksum();
 
@@ -693,8 +700,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                        os << '\\' << from_ascii(params().getCmdName())
                           << '{' << from_utf8(incfile) << '}';
                } else {
-               incfile = changeExtension(incfile, ".tex");
-               incfile = latex_path(incfile);
+                       incfile = changeExtension(incfile, ".tex");
+                       incfile = latex_path(incfile);
                        // FIXME UNICODE
                        os << '\\' << from_ascii(params().getCmdName())
                           << '{' << from_utf8(incfile) <<  '}';
@@ -702,6 +709,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                break;
        } 
        case LISTINGS: {
+               runparams.exportdata->addExternalFile(tex_format, writefile,
+                                                     exportfile);
                os << '\\' << from_ascii(params().getCmdName());
                string const opt = to_utf8(params()["lstparams"]);
                // opt is set in QInclude dialog and should have passed validation.
@@ -784,7 +793,7 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const
        if (all_pars) {
                op.par_begin = 0;
                op.par_end = 0;
-               ibuf->writeLyXHTMLSource(xs.os(), op, true);
+               ibuf->writeLyXHTMLSource(xs.os(), op, Buffer::OnlyBody);
        } else
                xs << XHTMLStream::ESCAPE_NONE 
                   << "<!-- Included file: " 
@@ -832,8 +841,14 @@ int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
                return 0;
        }
 
+       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)
-       string const exportfile = changeExtension(incfile, ".sgml");
+       string const exportfile = changeExtension(exppath, ".sgml");
        DocFileName writefile(changeExtension(included_file, ".sgml"));
 
        Buffer * tmp = loadIfNeeded();
@@ -848,7 +863,7 @@ int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
                LYXERR(Debug::LATEX, "exportfile:" << exportfile);
                LYXERR(Debug::LATEX, "writefile:" << writefile);
 
-               tmp->makeDocBookFile(writefile, runparams, true);
+               tmp->makeDocBookFile(writefile, runparams, Buffer::OnlyBody);
        }
 
        runparams.exportdata->addExternalFile("docbook", writefile,
@@ -970,9 +985,9 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetInclude::contextMenuName() const
+string InsetInclude::contextMenuName() const
 {
-       return from_ascii("context-include");
+       return "context-include";
 }