update the ACM SIGPLAN files to latest layout and fileformat

[lyx.git] / src / BiblioInfo.h

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index ecff0ffbf2e38b1b2f0b8990df24b90d6827c0c7..11a6361da807387fead5b94929295f8b0a38a972 100644 (file)
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -11,11 +11,13 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef BIBLIO_H
-#define BIBLIO_H
+#ifndef BIBLIOINFO_H
+#define BIBLIOINFO_H
 
 #include "support/docstring.h"
 
+#include "Citation.h"
+
 #include <vector>
 #include <map>
 #include <set>
@@ -25,49 +27,14 @@ namespace lyx {
        
 class Buffer;
 
-namespace biblio {
-
-enum CiteEngine {
-       ENGINE_BASIC,
-       ENGINE_NATBIB_AUTHORYEAR,
-       ENGINE_NATBIB_NUMERICAL,
-       ENGINE_JURABIB
-};
-
-enum CiteStyle {
-       CITE,
-       NOCITE,
-       CITET,
-       CITEP,
-       CITEALT,
-       CITEALP,
-       CITEAUTHOR,
-       CITEYEAR,
-       CITEYEARPAR
-};
-
-
-class CitationStyle {
-public:
-       ///
-       CitationStyle(CiteStyle s = CITE, bool f = false, bool force = false)
-               : style(s), full(f), forceUCase(force) {}
-       /// \param latex_str a LaTeX command, "cite", "Citep*", etc
-       CitationStyle(std::string const & latex_str);
-       ///
-       std::string const asLatexStr() const;
-       ///
-       CiteStyle style;
-       ///
-       bool full;
-       ///
-       bool forceUCase;
-};
-
+/// FIXME: To Citation.cpp?
 /// Returns a vector of available Citation styles.
-std::vector<CiteStyle> const getCiteStyles(CiteEngine const );
+std::vector<CiteStyle> citeStyles(CiteEngine);
+/// \param latex_str a LaTeX command, "cite", "Citep*", etc
+CitationStyle citationStyleFromString(std::string const & latex_str);
+/// the other way rounf
+std::string citationStyleToString(CitationStyle const &);
 
-} // namespace biblio
 
 /// Class to represent information about a BibTeX or
 /// bibliography entry.
@@ -77,9 +44,11 @@ class BibTeXInfo {
 public:
        ///
        typedef std::map<docstring, docstring>::const_iterator const_iterator;
+       ///
+       BibTeXInfo() : is_bibtex_(true) {}
        /// argument sets isBibTeX_, so should be false only if it's coming
        /// from a bibliography environment
-       BibTeXInfo(bool ib = true);
+       BibTeXInfo(bool ib) : is_bibtex_(ib) {}
        /// constructor that sets the entryType
        BibTeXInfo(docstring const & key, docstring const & type);
        /// Search for the given field and return the associated info.
@@ -131,8 +100,6 @@ private:
 /// BiblioInfo.second is the data for that key
 class BiblioInfo {
 public:
-       ///
-       BiblioInfo() {}
        ///
        typedef std::map<docstring, BibTeXInfo>::const_iterator const_iterator;
        /// Returns a sorted vector of bibliography keys
@@ -141,9 +108,6 @@ public:
        std::vector<docstring> const getFields() const;
        /// Returns a sorted vector of BibTeX entry types in use
        std::vector<docstring> const getEntries() const;
-       /// Fills keys with BibTeX information derived from the various insets
-       /// in a given buffer, in its master document.
-       void fillWithBibKeys(Buffer const * const buf);
        /// return the short form of an authorlist
        docstring const getAbbreviatedAuthor(docstring const & key) const;
        /// return the year from the bibtex data record
@@ -192,6 +156,8 @@ public:
        ///
        const_iterator find(docstring const & f) const { return bimap_.find(f); }
        ///
+       void mergeBiblioInfo(BiblioInfo const & info);
+       ///
        BibTeXInfo & operator[](docstring const & f) { return bimap_[f]; }
        ///
        void addFieldName(docstring const & f) { field_names_.insert(f); }
@@ -207,4 +173,5 @@ private:
 };
 
 } // namespace lyx
-#endif
+
+#endif // BIBLIOINFO_H