Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index ca843991f7d028f810d68b69819c464b0e698a53..641cf27a59be7a4217626739083146ca92dd4362 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -154,7 +154,8 @@ public:
        void setId(int id);
 
        ///
-       void addChangesToToc(DocIterator const & cdit, Buffer const & buf) const;
+       void addChangesToToc(DocIterator const & cdit, Buffer const & buf,
+               bool output_active) const;
        ///
        Language const * getParLanguage(BufferParams const &) const;
        ///
@@ -182,18 +183,19 @@ public:
 
        /// Extract only the explicitly visible text (without any formatting),
        /// descending into insets
-       docstring stringify(pos_type beg, pos_type end, int options, OutputParams & runparams) const;
+       docstring stringify(pos_type beg, pos_type end, int options,
+               OutputParams const & runparams) const;
 
        ///
        void write(std::ostream &, BufferParams const &,
-                  depth_type & depth) const;
+               depth_type & depth) const;
        ///
        void validate(LaTeXFeatures &) const;
 
        /// \param force means: output even if layout.inpreamble is true.
        void latex(BufferParams const &, Font const & outerfont, otexstream &,
-                  TexRow & texrow, OutputParams const &,
-                  int start_pos = 0, int end_pos = -1, bool force = false) const;
+               OutputParams const &, int start_pos = 0, int end_pos = -1,
+               bool force = false) const;
 
        /// Can we drop the standard paragraph wrapper?
        bool emptyTag() const;
@@ -420,6 +422,9 @@ public:
        bool isChar(pos_type pos) const;
        /// True if the element at this point is a space
        bool isSpace(pos_type pos) const;
+       /// True if the element at this point is a hard hyphen or a apostrophe
+       /// If it is enclosed by spaces return false
+       bool isHardHyphenOrApostrophe(pos_type pos) const;
 
        /// returns true if at least one line break or line separator has been deleted
        /// at the beginning of the paragraph (either physically or logically)
@@ -437,6 +442,8 @@ public:
        ///
        ParagraphParameters const & params() const;
 
+       /// Check whether a call to fixBiblio is needed.
+       bool brokenBiblio() const;
        /// Check if we are in a Biblio environment and insert or
        /// delete InsetBibitems as necessary.
        /// \retval int 1, if we had to add an inset, in which case
@@ -444,7 +451,7 @@ public:
        /// an inset, in which case pos is the position from which the inset
        /// was deleted, and the cursor will need to be moved back one if it
        /// was previously past that position. Return 0 otherwise.
-       int checkBiblio(Buffer const & buffer);
+       int fixBiblio(Buffer const & buffer);
 
        /// For each author, set 'used' to true if there is a change
        /// by this author in the paragraph.