fix typo that put too many include paths for most people

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

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 01cd2530ba5aa1e5f70c75cb9f6625b943384720..8d4370243f484c4a004a2a19b7d97741b39b431e 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -1,26 +1,28 @@
-
 #include <config.h>
 
-#include <cstdlib>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include "frontends/Dialogs.h"
-
 #include "insetinclude.h"
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView.h"
 #include "debug.h"
-#include "support/filetools.h"
 #include "lyxrc.h"
 #include "LyXView.h"
 #include "LaTeXFeatures.h"
 #include "gettext.h"
+#include "lyxtextclasslist.h"
+
+#include "frontends/Dialogs.h"
+
+#include "support/filetools.h"
 #include "support/FileInfo.h"
-#include "layout.h"
+#include "support/lstrings.h"
+
+#include <cstdlib>
+
 
 using std::ostream;
 using std::endl;
@@ -35,7 +37,7 @@ string const unique_id()
 {
        static unsigned int seed = 1000;
 
-       std::ostringstream ost;
+       ostringstream ost;
        ost << "file" << ++seed;
 
        // Needed if we use lyxstring.
@@ -51,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();
 }
 
 
@@ -75,7 +77,7 @@ bool InsetInclude::Params::operator==(Params const & o) const
        if (cparams == o.cparams && flag == o.flag &&
            noload == o.noload && masterFilename_ == o.masterFilename_)
                return true;
-       
+
        return false;
 }
 
@@ -92,27 +94,27 @@ void InsetInclude::set(Params const & p)
 
        // Just to be safe...
        string command;
- 
+
        switch (params_.flag) {
-               case INCLUDE:
-                       command="include";
-                       break;
-               case VERB:
-                       command="verbatiminput";
-                       break;
-               case INPUT:
-                       command="input";
-                       break;
-               case VERBAST:
-                       command="verbatiminput*";
-                       break;
+               case INCLUDE:
+                       command="include";
+                       break;
+               case VERB:
+                       command="verbatiminput";
+                       break;
+               case INPUT:
+                       command="input";
+                       break;
+               case VERBAST:
+                       command="verbatiminput*";
+                       break;
        }
- 
+
        params_.cparams.setCmdName(command);
 }
 
 
-Inset * InsetInclude::clone(Buffer const & buffer) const
+Inset * InsetInclude::clone(Buffer const & buffer, bool) const
 {
        Params p(params_);
        p.masterFilename_ = buffer.fileName();
@@ -127,6 +129,12 @@ void InsetInclude::edit(BufferView * bv, int, int, unsigned int)
 }
 
 
+void InsetInclude::edit(BufferView * bv, bool)
+{
+       edit(bv, 0, 0, 0);
+}
+
+
 void InsetInclude::write(Buffer const *, ostream & os) const
 {
        os << "Include " << params_.cparams.getCommand() << "\n";
@@ -136,7 +144,7 @@ void InsetInclude::write(Buffer const *, ostream & os) const
 void InsetInclude::read(Buffer const *, LyXLex & lex)
 {
        params_.cparams.read(lex);
-   
+
        if (params_.cparams.getCmdName() == "include")
                params_.flag = INCLUDE;
        else if (params_.cparams.getCmdName() == "input")
@@ -156,7 +164,7 @@ bool InsetInclude::display() const
 }
 
 
-string const InsetInclude::getScreenLabel() const
+string const InsetInclude::getScreenLabel(Buffer const *) const
 {
        string temp;
 
@@ -168,7 +176,7 @@ string const InsetInclude::getScreenLabel() const
        }
 
        temp += ": ";
-       
+
        if (params_.cparams.getContents().empty())
                temp += "???";
        else
@@ -183,7 +191,7 @@ string const InsetInclude::getRelFileBaseName() const
        return OnlyFilename(ChangeExtension(params_.cparams.getContents(), string()));
 }
 
- 
+
 string const InsetInclude::getFileName() const
 {
        return MakeAbsPath(params_.cparams.getContents(),
@@ -204,14 +212,16 @@ bool InsetInclude::loadIfNeeded() const
 
        if (!IsLyXFilename(getFileName()))
                return false;
-       
+
        if (bufferlist.exists(getFileName()))
                return true;
-       
+
        // the readonly flag can/will be wrong, not anymore I think.
        FileInfo finfo(getFileName());
-       bool const ro = !finfo.writable();
-       return bufferlist.readFile(getFileName(), ro) != 0;
+       if (!finfo.isOK())
+               return false;
+
+       return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
 }
 
 
@@ -219,11 +229,11 @@ int InsetInclude::latex(Buffer const * buffer, ostream & os,
                        bool /*fragile*/, bool /*fs*/) const
 {
        string incfile(params_.cparams.getContents());
-       
+
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
-   
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
 
@@ -232,13 +242,13 @@ int InsetInclude::latex(Buffer const * buffer, ostream & os,
                        lyxerr << "WARNING: Included file `"
                               << MakeDisplayPath(getFileName())
                               << "' has textclass `"
-                              << textclasslist.NameOfClass(tmp->params.textclass)
+                              << textclasslist[tmp->params.textclass].name()
                               << "' while parent file has textclass `"
-                              << textclasslist.NameOfClass(buffer->params.textclass)
+                              << textclasslist[buffer->params.textclass].name()
                               << "'." << endl;
                        //return 0;
                }
-               
+
                // write it to a file (so far the complete file)
                string writefile = ChangeExtension(getFileName(), ".tex");
 
@@ -254,9 +264,9 @@ int InsetInclude::latex(Buffer const * buffer, ostream & os,
                writefile = ChangeExtension(writefile, ".tex");
                lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
                lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-               
+
                tmp->markDepClean(buffer->tmppath);
-               
+
                tmp->makeLaTeXFile(writefile,
                                   OnlyPath(getMasterFilename()),
                                   buffer->niceFile, true);
@@ -285,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());
@@ -296,11 +306,11 @@ int InsetInclude::ascii(Buffer const *, std::ostream & os, int) const
 int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
 {
        string incfile(params_.cparams.getContents());
-       
+
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
-   
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
 
@@ -317,29 +327,29 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
 
                lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
                lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-               
+
                tmp->makeLinuxDocFile(writefile, buffer->niceFile, true);
        }
 
        if (isVerbatim()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
+               os << "<![CDATA["
+                  << GetFileContents(getFileName())
+                  << "]]>";
        } else
                os << '&' << include_label << ';';
-       
+
        return 0;
 }
 
 
-int InsetInclude::docBook(Buffer const * buffer, ostream & os) const
+int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
 {
        string incfile(params_.cparams.getContents());
 
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
-   
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
 
@@ -355,17 +365,17 @@ int InsetInclude::docBook(Buffer const * buffer, ostream & os) const
 
                lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
                lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-               
+
                tmp->makeDocBookFile(writefile, buffer->niceFile, true);
        }
 
        if (isVerbatim()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
+               os << "<inlinegraphic fileref=\""
+                  << '&' << include_label << ';'
+                  << "\" format=\"linespecific\">";
        } else
                os << '&' << include_label << ';';
-       
+
        return 0;
 }
 
@@ -378,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
@@ -387,19 +397,22 @@ void InsetInclude::validate(LaTeXFeatures & features) const
        if (IsLyXFilename(getFileName()))
                writefile = ChangeExtension(writefile, ".sgml");
 
-       features.IncludedFiles[include_label] = writefile;
+       features.includeFile(include_label, writefile);
 
        if (isVerbatim())
-               features.verbatim = true;
+               features.require("verbatim");
 
        // Here we must do the fun stuff...
        // Load the file in the include if it needs
        // to be loaded:
        if (loadIfNeeded()) {
                // a file got loaded
-               Buffer const * const tmp = bufferlist.getBuffer(getFileName());
-               if (tmp)
+               Buffer * const tmp = bufferlist.getBuffer(getFileName());
+               if (tmp) {
+                       if (b)
+                               tmp->niceFile = b->niceFile;
                        tmp->validate(features);
+               }
        }
 }
 
@@ -422,13 +435,13 @@ vector<string> const InsetInclude::getLabelList() const
 vector<pair<string,string> > const InsetInclude::getKeys() const
 {
        vector<pair<string,string> > keys;
-       
+
        if (loadIfNeeded()) {
                Buffer * tmp = bufferlist.getBuffer(getFileName());
                tmp->setParentName("");
                keys = tmp->getBibkeyList();
                tmp->setParentName(getMasterFilename());
        }
-       
+
        return keys;
 }