Allow using \binom without amsmath and add support for \brace and \brack

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 2c21aa9d4492926cb6f291b2415d5680f2900396..7d2f268473d47de8c9f22c589356ec9af327f66c 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -286,7 +286,7 @@ docstring const BiblioInfo::getInfo(docstring const & key) const
 vector<docstring> const BiblioInfo::getCiteStrings(
        docstring const & key, Buffer const & buf) const
 {
-       biblio::CiteEngine const engine = buf.params().getEngine();
+       biblio::CiteEngine const engine = buf.params().citeEngine();
        if (engine == biblio::ENGINE_BASIC || 
            engine == biblio::ENGINE_NATBIB_NUMERICAL)
                return getNumericalStrings(key, buf);
@@ -307,7 +307,7 @@ vector<docstring> const BiblioInfo::getNumericalStrings(
                return vector<docstring>();
 
        vector<biblio::CiteStyle> const & styles = 
-               biblio::getCiteStyles(buf.params().getEngine());
+               biblio::getCiteStyles(buf.params().citeEngine());
        
        vector<docstring> vec(styles.size());
        for (vector<docstring>::size_type i = 0; i != vec.size(); ++i) {
@@ -367,7 +367,7 @@ vector<docstring> const BiblioInfo::getAuthorYearStrings(
                return vector<docstring>();
 
        vector<biblio::CiteStyle> const & styles = 
-               getCiteStyles(buf.params().getEngine());
+               getCiteStyles(buf.params().citeEngine());
        
        vector<docstring> vec(styles.size());
        for (vector<docstring>::size_type i = 0; i != vec.size(); ++i) {
@@ -429,11 +429,8 @@ void BiblioInfo::fillWithBibKeys(Buffer const * const buf)
                return;
        }
 
-       // Pre-load all child documents.
-       buf->loadChildDocuments();
-
        for (InsetIterator it = inset_iterator_begin(buf->inset()); it; ++it)
-               it->fillWithBibKeys(*buf, *this, it);
+               it->fillWithBibKeys(*this, it);
 }