Kornel's gcc compile fix.

[lyx.git] / src / BiblioInfo.h

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 0baa06c5c2d97b57d7e5122a081282ac1d54d63b..e0f8f645887fc94ab62fd436f35e4fffeb500f1e 100644 (file)
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -59,8 +59,11 @@ public:
        docstring const getAbbreviatedAuthor() const;
        /// 
        docstring const getYear() const;
+       ///
+       docstring const getXRef() const;
        /// \return formatted BibTeX data suitable for framing.
-       docstring const getInfo() const;
+       /// \param pointer to crossref information
+       docstring const & getInfo(BibTeXInfo const * const xref = 0) const;
        ///
        int count(docstring const & f) const { return bimap_.count(f); }
        ///
@@ -82,16 +85,33 @@ public:
        ///
        void setAllData(docstring const & d) { all_data_ = d; }
        ///
+       void label(docstring const & d) { label_= d; }
+       ///
+       docstring const & label() const { return label_; }
+       ///
+       docstring const & key() const { return bib_key_; }
+       ///
        docstring entryType() const { return entry_type_; }
 private:
+       /// like operator[], except, if the field is empty, it will attempt
+       /// to get the data from xref BibTeXInfo object, which would normally
+       /// be the one referenced in the crossref field.
+       docstring getValueForKey(std::string const & key, 
+                       BibTeXInfo const * const xref = 0) const;
        /// true if from BibTeX; false if from bibliography environment
        bool is_bibtex_;
        /// the BibTeX key for this entry
        docstring bib_key_;
+       /// the label that will appear in citations
+       /// this is easily set from bibliography environments, but has
+       /// to be calculated for entries we get from BibTeX
+       docstring label_;
        /// a single string containing all BibTeX data associated with this key
        docstring all_data_;
        /// the BibTeX entry type (article, book, incollection, ...)
        docstring entry_type_;
+       /// a cache for getInfo()
+       mutable docstring info_;
        /// our map: <field, value>
        std::map <docstring, docstring> bimap_;
 };
@@ -112,9 +132,12 @@ public:
        /// \return the short form of an authorlist
        docstring const getAbbreviatedAuthor(docstring const & key) const;
        /// \return the year from the bibtex data record
+       /// Note that this will get the year from the crossref if it's
+       /// not present in the record itself
        docstring const getYear(docstring const & key) const;
        /// \return formatted BibTeX data associated with a given key.
        /// Empty if no info exists. 
+       /// Note that this will retrieve data from the crossref as needed.
        docstring const getInfo(docstring const & key) const;
        /**
          * "Translates" the available Citation Styles into strings for a given key,