minimal effort implementation of:

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 367ef539a6d7e2f49abecab5631556642703cd62..466da5bc83be1b51b9604aa3db2215b72c2e2a15 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -41,7 +41,6 @@
 #include "output.h"
 #include "output_docbook.h"
 #include "output_latex.h"
-#include "output_linuxdoc.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -146,7 +145,7 @@ extern BufferList bufferlist;
 
 namespace {
 
-int const LYX_FORMAT = 248;
+int const LYX_FORMAT = 249;
 
 } // namespace anon
 
@@ -567,14 +566,15 @@ bool Buffer::readFile(string const & filename)
        paragraphs().clear();
        LyXLex lex(0, 0);
        lex.setFile(filename);
-       bool ret = readFile(lex, filename);
+       if (!readFile(lex, filename))
+               return false;
 
        // After we have read a file, we must ensure that the buffer
        // language is set and used in the gui.
        // If you know of a better place to put this, please tell me. (Lgb)
        updateDocLang(params().language);
 
-       return ret;
+       return true;
 }
 
 
@@ -957,12 +957,6 @@ bool Buffer::isLatex() const
 }
 
 
-bool Buffer::isLinuxDoc() const
-{
-       return params().getLyXTextClass().outputType() == LINUXDOC;
-}
-
-
 bool Buffer::isLiterate() const
 {
        return params().getLyXTextClass().outputType() == LITERATE;
@@ -975,83 +969,6 @@ bool Buffer::isDocBook() const
 }
 
 
-bool Buffer::isSGML() const
-{
-       LyXTextClass const & tclass = params().getLyXTextClass();
-
-       return tclass.outputType() == LINUXDOC ||
-              tclass.outputType() == DOCBOOK;
-}
-
-
-void Buffer::makeLinuxDocFile(string const & fname,
-                             OutputParams const & runparams,
-                             bool const body_only)
-{
-       lyxerr[Debug::LATEX] << "makeLinuxDocFile..." << endl;
-
-       ofstream ofs;
-       if (!openFileWrite(ofs, fname))
-               return;
-
-       writeLinuxDocSource(ofs, fname, runparams, body_only);
-
-       ofs.close();
-       if (ofs.fail())
-               lyxerr << "File '" << fname << "' was not closed properly." << endl;
-}
-
-
-void Buffer::writeLinuxDocSource(ostream &os, string const & fname,
-                             OutputParams const & runparams,
-                             bool const body_only)
-{
-       LaTeXFeatures features(*this, params(), runparams);
-       validate(features);
-
-       texrow().reset();
-
-       LyXTextClass const & tclass = params().getLyXTextClass();
-
-       string const & top_element = tclass.latexname();
-
-       if (!body_only) {
-               os << tclass.class_header();
-
-               string preamble = params().preamble;
-               string const name = runparams.nice ? changeExtension(pimpl_->filename, ".sgml")
-                        : fname;
-               preamble += features.getIncludedFiles(name);
-               preamble += features.getLyXSGMLEntities();
-
-               if (!preamble.empty()) {
-                       os << " [ " << preamble << " ]";
-               }
-               os << ">\n\n";
-
-               if (params().options.empty())
-                       sgml::openTag(os, top_element);
-               else {
-                       string top = top_element;
-                       top += ' ';
-                       top += params().options;
-                       sgml::openTag(os, top);
-               }
-       }
-
-       os << "<!-- LyX "  << lyx_version
-           << " created this file. For more info see http://www.lyx.org/"
-           << " -->\n";
-
-       linuxdocParagraphs(*this, paragraphs(), os, runparams);
-
-       if (!body_only) {
-               os << "\n\n";
-               sgml::closeTag(os, top_element);
-       }
-}
-
-
 void Buffer::makeDocBookFile(string const & fname,
                              OutputParams const & runparams,
                              bool const body_only)
@@ -1678,8 +1595,6 @@ void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type
                os << "% Preview source code\n\n";
                if (isLatex()) 
                        writeLaTeXSource(os, filePath(), runparams, true, true);
-               else if (isLinuxDoc())
-                       writeLinuxDocSource(os, fileName(), runparams, false);
                else 
                        writeDocBookSource(os, fileName(), runparams, false);
        } else {
@@ -1693,9 +1608,7 @@ void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type
                if (isLatex()) {
                        texrow().reset();
                        latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
-               } else if (isLinuxDoc())
-                       linuxdocParagraphs(*this, paragraphs(), os, runparams);
-               else // DocBook
+               } else // DocBook
                        docbookParagraphs(paragraphs(), *this, os, runparams);
        }
 }
@@ -1703,9 +1616,10 @@ void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type
 
 ErrorList const & Buffer::errorList(string const & type) const
 {
+       static ErrorList const emptyErrorList;
        std::map<std::string, ErrorList>::const_iterator I = errorLists_.find(type);
        if (I == errorLists_.end())
-               return emptyErrorList_;
+               return emptyErrorList;
 
        return I->second;
 }
@@ -1713,11 +1627,5 @@ ErrorList const & Buffer::errorList(string const & type) const
 
 ErrorList & Buffer::errorList(string const & type)
 {
-       std::map<std::string, ErrorList>::iterator I = errorLists_.find(type);
-       if (I == errorLists_.end()) {
-               errorLists_[type] = emptyErrorList_;
-               return errorLists_[type];
-       }
-
-       return I->second;
+       return errorLists_[type];
 }