* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 3a4965eaa12aed8dbbeb2d5b1c571f120a95dca3..36d745ffaab50d50390a14dbced97131035e6018 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -30,6 +30,7 @@
 #include "lyxlex.h"
 #include "metricsinfo.h"
 #include "outputparams.h"
+#include "TocBackend.h"
 
 #include "frontends/Alert.h"
 #include "frontends/Painter.h"
@@ -39,7 +40,6 @@
 
 #include "insets/render_preview.h"
 
-#include "support/filename.h"
 #include "support/filetools.h"
 #include "support/lstrings.h" // contains
 #include "support/lyxalgo.h"
@@ -49,10 +49,6 @@
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
 
-#include "support/std_ostream.h"
-
-#include <sstream>
-
 
 namespace lyx {
 
@@ -62,6 +58,7 @@ using support::bformat;
 using support::changeExtension;
 using support::contains;
 using support::copy;
+using support::DocFileName;
 using support::FileName;
 using support::getFileContents;
 using support::isFileReadable;
@@ -220,7 +217,7 @@ string const parentFilename(Buffer const & buffer)
 }
 
 
-string const includedFilename(Buffer const & buffer,
+FileName const includedFilename(Buffer const & buffer,
                              InsetCommandParams const & params)
 {
        return makeAbsPath(to_utf8(params["filename"]),
@@ -321,8 +318,7 @@ docstring const InsetInclude::getScreenLabel(Buffer const &) const
        if (params_["filename"].empty())
                temp += "???";
        else
-               // FIXME: We don't know the encoding of the filename
-               temp += from_ascii(onlyFilename(to_utf8(params_["filename"])));
+               temp += from_utf8(onlyFilename(to_utf8(params_["filename"])));
 
        return temp;
 }
@@ -336,7 +332,7 @@ Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params
        if (isVerbatim(params))
                return 0;
 
-       string const included_file = includedFilename(buffer, params);
+       string const included_file = includedFilename(buffer, params).absFilename();
        if (!isLyXFilename(included_file))
                return 0;
 
@@ -350,16 +346,16 @@ bool loadIfNeeded(Buffer const & buffer, InsetCommandParams const & params)
        if (isVerbatim(params))
                return false;
 
-       string const included_file = includedFilename(buffer, params);
-       if (!isLyXFilename(included_file))
+       FileName const included_file = includedFilename(buffer, params);
+       if (!isLyXFilename(included_file.absFilename()))
                return false;
 
-       Buffer * buf = theBufferList().getBuffer(included_file);
+       Buffer * buf = theBufferList().getBuffer(included_file.absFilename());
        if (!buf) {
                // the readonly flag can/will be wrong, not anymore I think.
-               if (!fs::exists(included_file))
+               if (!fs::exists(included_file.toFilesystemEncoding()))
                        return false;
-               buf = theBufferList().newBuffer(included_file);
+               buf = theBufferList().newBuffer(included_file.absFilename());
                if (!loadLyXFile(buf, included_file))
                        return false;
        }
@@ -381,21 +377,21 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
        if (incfile.empty())
                return 0;
 
-       string const included_file = includedFilename(buffer, params_);
+       FileName const included_file(includedFilename(buffer, params_));
        Buffer const * const m_buffer = buffer.getMasterBuffer();
 
        // if incfile is relative, make it relative to the master
        // buffer directory.
        if (!absolutePath(incfile)) {
-               incfile = makeRelPath(included_file,
+               incfile = makeRelPath(included_file.absFilename(),
                                      m_buffer->filePath());
        }
 
        // write it to a file (so far the complete file)
        string const exportfile = changeExtension(incfile, ".tex");
-       string const mangled = FileName(changeExtension(included_file,
+       string const mangled = DocFileName(changeExtension(included_file.absFilename(),
                                                        ".tex")).mangledFilename();
-       string const writefile = makeAbsPath(mangled, m_buffer->temppath());
+       FileName const writefile(makeAbsPath(mangled, m_buffer->temppath()));
 
        if (!runparams.nice)
                incfile = mangled;
@@ -407,14 +403,14 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                // Don't try to load or copy the file
                ;
        else if (loadIfNeeded(buffer, params_)) {
-               Buffer * tmp = theBufferList().getBuffer(included_file);
+               Buffer * tmp = theBufferList().getBuffer(included_file.absFilename());
 
                if (tmp->params().textclass != m_buffer->params().textclass) {
                        // FIXME UNICODE
                        docstring text = bformat(_("Included file `%1$s'\n"
                                                "has textclass `%2$s'\n"
                                                             "while parent file has textclass `%3$s'."),
-                                             makeDisplayPath(included_file),
+                                             makeDisplayPath(included_file.absFilename()),
                                              from_utf8(tmp->params().getLyXTextClass().name()),
                                              from_utf8(m_buffer->params().getLyXTextClass().name()));
                        Alert::warning(_("Different textclasses"), text);
@@ -446,7 +442,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                                lyxerr[Debug::LATEX]
                                        << to_utf8(bformat(_("Could not copy the file\n%1$s\n"
                                                                  "into the temporary directory."),
-                                                  from_utf8(included_file)))
+                                                  from_utf8(included_file.absFilename())))
                                        << endl;
                                return 0;
                        }
@@ -465,7 +461,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                                                      exportfile);
 
                // \input wants file with extension (default is .tex)
-               if (!isLyXFilename(included_file)) {
+               if (!isLyXFilename(included_file.absFilename())) {
                        incfile = latex_path(incfile);
                        // FIXME UNICODE
                        os << '\\' << from_ascii(params_.getCmdName())
@@ -518,16 +514,16 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
        if (incfile.empty())
                return 0;
 
-       string const included_file = includedFilename(buffer, params_);
+       string const included_file = includedFilename(buffer, params_).absFilename();
 
        // write it to a file (so far the complete file)
        string const exportfile = changeExtension(incfile, ".sgml");
-       string writefile = changeExtension(included_file, ".sgml");
+       DocFileName writefile(changeExtension(included_file, ".sgml"));
 
        if (loadIfNeeded(buffer, params_)) {
                Buffer * tmp = theBufferList().getBuffer(included_file);
 
-               string const mangled = FileName(writefile).mangledFilename();
+               string const mangled = writefile.mangledFilename();
                writefile = makeAbsPath(mangled,
                                        buffer.getMasterBuffer()->temppath());
                if (!runparams.nice)
@@ -545,7 +541,6 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
        runparams.exportdata->addExternalFile("docbook-xml", writefile,
                                              exportfile);
 
-        // FIXME UNICODE
        if (isVerbatim(params_)) {
                os << "<inlinegraphic fileref=\""
                   << '&' << include_label << ';'
@@ -564,7 +559,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 
        Buffer const & buffer = features.buffer();
 
-       string const included_file = includedFilename(buffer, params_);
+       string const included_file = includedFilename(buffer, params_).absFilename();
 
        if (isLyXFilename(included_file))
                writefile = changeExtension(included_file, ".sgml");
@@ -572,9 +567,9 @@ void InsetInclude::validate(LaTeXFeatures & features) const
                writefile = included_file;
 
        if (!features.runparams().nice && !isVerbatim(params_)) {
-               incfile = FileName(writefile).mangledFilename();
+               incfile = DocFileName(writefile).mangledFilename();
                writefile = makeAbsPath(incfile,
-                                       buffer.getMasterBuffer()->temppath());
+                                       buffer.getMasterBuffer()->temppath()).absFilename();
        }
 
        features.includeFile(include_label, writefile);
@@ -604,7 +599,7 @@ void InsetInclude::getLabelList(Buffer const & buffer,
                                std::vector<docstring> & list) const
 {
        if (loadIfNeeded(buffer, params_)) {
-               string const included_file = includedFilename(buffer, params_);
+               string const included_file = includedFilename(buffer, params_).absFilename();
                Buffer * tmp = theBufferList().getBuffer(included_file);
                tmp->setParentName("");
                tmp->getLabelList(list);
@@ -614,10 +609,10 @@ void InsetInclude::getLabelList(Buffer const & buffer,
 
 
 void InsetInclude::fillWithBibKeys(Buffer const & buffer,
-                                  std::vector<std::pair<string,string> > & keys) const
+               std::vector<std::pair<string, docstring> > & keys) const
 {
        if (loadIfNeeded(buffer, params_)) {
-               string const included_file = includedFilename(buffer, params_);
+               string const included_file = includedFilename(buffer, params_).absFilename();
                Buffer * tmp = theBufferList().getBuffer(included_file);
                tmp->setParentName("");
                tmp->fillWithBibKeys(keys);
@@ -637,22 +632,22 @@ void InsetInclude::updateBibfilesCache(Buffer const & buffer)
 }
 
 
-std::vector<string> const &
+std::vector<FileName> const &
 InsetInclude::getBibfilesCache(Buffer const & buffer) const
 {
        Buffer * const tmp = getChildBuffer(buffer, params_);
        if (tmp) {
                tmp->setParentName("");
-               std::vector<string> const & cache = tmp->getBibfilesCache();
+               std::vector<FileName> const & cache = tmp->getBibfilesCache();
                tmp->setParentName(parentFilename(buffer));
                return cache;
        }
-       static std::vector<string> const empty;
+       static std::vector<FileName> const empty;
        return empty;
 }
 
 
-void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
 
@@ -677,7 +672,9 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
        Box b(0, dim.wid, -dim.asc, dim.des);
        button_.setBox(b);
 
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
@@ -728,7 +725,7 @@ namespace {
 
 bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer)
 {
-       string const included_file = includedFilename(buffer, params);
+       FileName const included_file = includedFilename(buffer, params);
 
        return type(params) == INPUT && params.preview() &&
                isFileReadable(included_file);
@@ -772,6 +769,31 @@ void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
 }
 
 
+void InsetInclude::addToToc(TocList & toclist, Buffer const & buffer) const
+{
+       Buffer const * const childbuffer = getChildBuffer(buffer, params_);
+       if (!childbuffer)
+               return;
+
+       TocList const & childtoclist = childbuffer->tocBackend().tocs();
+       TocList::const_iterator it = childtoclist.begin();
+       TocList::const_iterator const end = childtoclist.end();
+       for(; it != end; ++it)
+               toclist[it->first].insert(toclist[it->first].end(),
+                               it->second.begin(), it->second.end());
+}
+
+
+void InsetInclude::updateLabels(Buffer const & buffer) const
+{
+       Buffer const * const childbuffer = getChildBuffer(buffer, params_);
+       if (!childbuffer)
+               return;
+
+       lyx::updateLabels(*childbuffer, true);
+}
+
+
 string const InsetIncludeMailer::name_("include");
 
 InsetIncludeMailer::InsetIncludeMailer(InsetInclude & inset)