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 1f76e55af391e411556a1c17fb9dd63f7de0f6f1..7d2f268473d47de8c9f22c589356ec9af327f66c 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -43,12 +43,12 @@ namespace lyx {
 //////////////////////////////////////////////////////////////////////
 
 BibTeXInfo::BibTeXInfo(bool ib)
-       : isBibTeX_(ib)
+       : is_bibtex_(ib)
 {}
 
        
 BibTeXInfo::BibTeXInfo(docstring const & key, docstring const & type)
-       : isBibTeX_(true), bibKey_(key), entryType_(type)
+       : is_bibtex_(true), bib_key_(key), entry_type_(type)
 {}
 
        
@@ -102,7 +102,7 @@ static docstring familyName(docstring const & name)
 
 docstring const BibTeXInfo::getAbbreviatedAuthor() const
 {
-       if (!isBibTeX_) 
+       if (!is_bibtex_) 
                return docstring();
  
        docstring author = getValueForField("author");
@@ -110,7 +110,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
        if (author.empty()) {
                author = getValueForField("editor");
                if (author.empty())
-                       return bibKey_;
+                       return bib_key_;
        }
 
        // OK, we've got some names. Let's format them.
@@ -131,7 +131,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
 
 docstring const BibTeXInfo::getYear() const
 {
-       if (!isBibTeX_) 
+       if (!is_bibtex_) 
                return docstring();
  
        docstring year = getValueForField("year");
@@ -143,7 +143,7 @@ docstring const BibTeXInfo::getYear() const
 
 docstring const BibTeXInfo::getInfo() const
 {
-       if (!isBibTeX_) {
+       if (!is_bibtex_) {
                BibTeXInfo::const_iterator it = find(from_ascii("ref"));
                return it->second;
        }
@@ -232,8 +232,8 @@ vector<docstring> const BiblioInfo::getKeys() const
 vector<docstring> const BiblioInfo::getFields() const
 {
        vector<docstring> bibfields;
-       set<docstring>::const_iterator it = fieldNames.begin();
-       set<docstring>::const_iterator end = fieldNames.end();
+       set<docstring>::const_iterator it = field_names_.begin();
+       set<docstring>::const_iterator end = field_names_.end();
        for (; it != end; ++it)
                bibfields.push_back(*it);
        sort(bibfields.begin(), bibfields.end());
@@ -244,8 +244,8 @@ vector<docstring> const BiblioInfo::getFields() const
 vector<docstring> const BiblioInfo::getEntries() const
 {
        vector<docstring> bibentries;
-       set<docstring>::const_iterator it = entryTypes.begin();
-       set<docstring>::const_iterator end = entryTypes.end();
+       set<docstring>::const_iterator it = entry_types_.begin();
+       set<docstring>::const_iterator end = entry_types_.end();
        for (; it != end; ++it)
                bibentries.push_back(*it);
        sort(bibentries.begin(), bibentries.end());
@@ -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);
 }