* do not ignore "requires" field in MathMacro

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 1ce02e81e52ad84a2678eaaf1547313efc4ee445..e7a5d41bd77a2224d42e3fb7571e886e1c8f9a66 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -33,7 +33,7 @@
 #include "LaTeXFeatures.h"
 #include "LyXAction.h"
 #include "Lexer.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
 #include "Messages.h"
@@ -141,7 +141,7 @@ using std::string;
 
 namespace {
 
-int const LYX_FORMAT = 265;
+int const LYX_FORMAT = 267;
 
 } // namespace anon
 
@@ -184,7 +184,7 @@ public:
         */
        bool file_fully_loaded;
 
-       /// our LyXText that should be wrapped in an InsetText
+       /// our Text that should be wrapped in an InsetText
        InsetText inset;
 
        ///
@@ -236,9 +236,9 @@ Buffer::~Buffer()
 }
 
 
-LyXText & Buffer::text() const
+Text & Buffer::text() const
 {
-       return const_cast<LyXText &>(pimpl_->inset.text_);
+       return const_cast<Text &>(pimpl_->inset.text_);
 }
 
 
@@ -497,8 +497,8 @@ bool Buffer::readDocument(Lexer & lex)
        BOOST_ASSERT(paragraphs().empty());
 
        readHeader(lex);
-       if (!params().getLyXTextClass().load(filePath())) {
-               string theclass = params().getLyXTextClass().name();
+       if (!params().getTextClass().load(filePath())) {
+               string theclass = params().getTextClass().name();
                Alert::error(_("Can't load document class"), bformat(
                        _("Using the default document class, because the "
                                     "class %1$s could not be loaded."), from_utf8(theclass)));
@@ -517,9 +517,9 @@ bool Buffer::readDocument(Lexer & lex)
 // needed to insert the selection
 void Buffer::insertStringAsLines(ParagraphList & pars,
        pit_type & pit, pos_type & pos,
-       LyXFont const & fn, docstring const & str, bool autobreakrows)
+       Font const & fn, docstring const & str, bool autobreakrows)
 {
-       LyXFont font = fn;
+       Font font = fn;
 
        // insert the string, don't insert doublespace
        bool space_inserted = true;
@@ -1023,19 +1023,19 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
 bool Buffer::isLatex() const
 {
-       return params().getLyXTextClass().outputType() == LATEX;
+       return params().getTextClass().outputType() == LATEX;
 }
 
 
 bool Buffer::isLiterate() const
 {
-       return params().getLyXTextClass().outputType() == LITERATE;
+       return params().getTextClass().outputType() == LITERATE;
 }
 
 
 bool Buffer::isDocBook() const
 {
-       return params().getLyXTextClass().outputType() == DOCBOOK;
+       return params().getTextClass().outputType() == DOCBOOK;
 }
 
 
@@ -1067,7 +1067,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
        texrow().reset();
 
-       LyXTextClass const & tclass = params().getLyXTextClass();
+       TextClass const & tclass = params().getTextClass();
        string const top_element = tclass.latexname();
 
        if (!only_body) {
@@ -1122,7 +1122,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
            << " file was created by LyX " << lyx_version
            << "\n  See http://www.lyx.org/ for more information -->\n";
 
-       params().getLyXTextClass().counters().reset();
+       params().getTextClass().counters().reset();
 
        sgml::openTag(os, top);
        os << '\n';
@@ -1176,7 +1176,7 @@ int Buffer::runChktex()
 
 void Buffer::validate(LaTeXFeatures & features) const
 {
-       LyXTextClass const & tclass = params().getLyXTextClass();
+       TextClass const & tclass = params().getTextClass();
 
        if (features.isAvailable("dvipost") && params().outputChanges)
                features.require("dvipost");
@@ -1451,11 +1451,7 @@ Language const * Buffer::getLanguage() const
 
 docstring const Buffer::B_(string const & l10n) const
 {
-       Language const * lang = pimpl_->params.language;
-       if (lang)
-               return getMessages(lang->code()).get(l10n);
-
-       return _(l10n);
+       return params().B_(l10n);
 }