layout as string

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

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index e5bdfa473608d710e0f598616be6ec58f7ddcd75..f2e598dffcbcc15e16ba4aa92ca45df7c4707b47 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();
 }
 
 
@@ -218,8 +218,10 @@ bool InsetInclude::loadIfNeeded() const
        
        // 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;
 }
 
 
@@ -240,9 +242,9 @@ 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;
                }
@@ -293,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());
@@ -314,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
@@ -330,9 +332,9 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
        }
 
        if (isVerbatim()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
+               os << "<![CDATA["
+                  << GetFileContents(getFileName())
+                  << "]]>";
        } else
                os << '&' << include_label << ';';
        
@@ -353,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
@@ -368,9 +370,9 @@ int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
        }
 
        if (isVerbatim()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
+               os << "<inlinegraphic fileref=\""
+                  << '&' << include_label << ';'
+                  << "\" format=\"linespecific\">";
        } else
                os << '&' << include_label << ';';
        
@@ -386,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