More requires --> required, for C++2a.

[lyx.git] / src / BiblioInfo.h

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 61e525d2d994bbc0a6968104b1caf48303c192de..8a36183d03088fbbef007ee23ce2e49147805d1f 100644 (file)
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -49,10 +49,10 @@ public:
        ///
        typedef std::vector<BibTeXInfo const *> const BibTeXInfoList;
        ///
-       BibTeXInfo() : is_bibtex_(true), modifier_(0) {}
+       BibTeXInfo() : is_bibtex_(true), num_bib_key_(0), modifier_(0) {}
        /// argument sets isBibTeX_, so should be false only if it's coming
        /// from a bibliography environment
-       BibTeXInfo(bool ib) : is_bibtex_(ib), modifier_(0) {}
+       BibTeXInfo(bool ib) : is_bibtex_(ib), num_bib_key_(0), modifier_(0) {}
        /// constructor that sets the entryType
        BibTeXInfo(docstring const & key, docstring const & type);
        /// \return an author or editor list (short form by default),
@@ -69,7 +69,7 @@ public:
        docstring const getYear() const;
        /// \return formatted BibTeX data suitable for framing.
        /// \param vector of pointers to crossref/xdata information
-       docstring const & getInfo(BibTeXInfoList const xrefs,
+       docstring const & getInfo(BibTeXInfoList const & xrefs,
                        Buffer const & buf, CiteItem const & ci) const;
        /// \return formatted BibTeX data for a citation label
        docstring const getLabel(BibTeXInfoList const xrefs,
@@ -97,6 +97,9 @@ public:
        void label(docstring const & d) { label_= d; }
        ///
        void key(docstring const & d) { bib_key_= d; }
+       /// Record the number of occurences of the same key
+       /// (duplicates are allowed with qualified citation lists)
+       void numKey(int const i) { num_bib_key_ = i; }
        ///
        docstring const & label() const { return label_; }
        ///
@@ -120,7 +123,7 @@ private:
        /// to get the data from xref BibTeXInfo objects, which would normally
        /// be the one referenced in the crossref or xdata field.
        docstring getValueForKey(std::string const & key, Buffer const & buf,
-               CiteItem const & ci, BibTeXInfoList const xrefs, size_t maxsize = 4096) const;
+               CiteItem const & ci, BibTeXInfoList const & xrefs, size_t maxsize = 4096) const;
        /// replace %keys% in a format string with their values
        /// called from getInfo()
        /// format strings may contain:
@@ -138,13 +141,15 @@ private:
        /// moreover, keys that look like "%_key%" are treated as translatable
        /// so that things like "pp." and "vol." can be translated.
        docstring expandFormat(docstring const & fmt,
-               BibTeXInfoList const xrefs, int & counter,
+               BibTeXInfoList const & xrefs, int & counter,
                Buffer const & buf, CiteItem const & ci,
                bool next = false, bool second = false) const;
        /// true if from BibTeX; false if from bibliography environment
        bool is_bibtex_;
        /// the BibTeX key for this entry
        docstring bib_key_;
+       /// Number of occurences of the same key
+       int num_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