Partly fix for bug 1231

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index c616edbac61579546d04970932174e76384d83e3..2d25f20d2dd4fa6869af21490bc4813db1aaa177 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -21,6 +21,8 @@
 #include "lyxlayout_ptr_fwd.h"
 #include "RowList_fwd.h"
 
+#include "insets/insetbase.h" // only for InsetBase::Code
+
 #include "support/types.h"
 
 #include <string>
@@ -29,11 +31,12 @@ class Buffer;
 class BufferParams;
 class BufferView;
 class Counters;
+class InsetBase;
 class InsetBibitem;
 class InsetOld_code;
 class Language;
 class LaTeXFeatures;
-class LatexRunParams;
+class OutputParams;
 class LyXFont;
 class LyXFont_size;
 class ParagraphParameters;
@@ -44,7 +47,7 @@ class UpdatableInset;
 class Paragraph  {
 public:
        ///
-       enum META_KIND {
+       enum {
                /// Note that this is 1 right now to avoid
                /// crashes where getChar() is called wrongly
                /// (returning 0) - if this was 0, then we'd
@@ -61,12 +64,11 @@ public:
 
        ///
        Paragraph();
-
        ///
        Paragraph(Paragraph const &);
        ///
-       void operator=(Paragraph const &);
-       /// the destructor removes the new paragraph from the list
+       Paragraph & operator=(Paragraph const &);
+       ///
        ~Paragraph();
 
        ///
@@ -80,11 +82,11 @@ public:
        void changeLanguage(BufferParams const & bparams,
                            Language const * from, Language const * to);
        ///
-       bool isMultiLingual(BufferParams const &);
+       bool isMultiLingual(BufferParams const &) const;
 
        ///
        std::string const asString(Buffer const &,
-                                  LatexRunParams const & runparams,
+                                  OutputParams const & runparams,
                                   bool label) const;
        ///
        std::string const asString(Buffer const &, bool label) const;
@@ -92,10 +94,10 @@ public:
        std::string const Paragraph::asString(Buffer const & buffer,
                                              lyx::pos_type beg,
                                              lyx::pos_type end,
-                                             bool label) const;        
+                                             bool label) const;
        ///
        std::string const asString(Buffer const &,
-                                  LatexRunParams const & runparams,
+                                  OutputParams const & runparams,
                                   lyx::pos_type beg,
                                   lyx::pos_type end,
                                   bool label) const;
@@ -116,22 +118,22 @@ public:
        ///
        bool simpleTeXOnePar(Buffer const &, BufferParams const &,
                             LyXFont const & outerfont, std::ostream &,
-                            TexRow & texrow, LatexRunParams const &);
+                            TexRow & texrow, OutputParams const &);
 
        ///
        void simpleLinuxDocOnePar(Buffer const & buf,
                                  std::ostream & os,
                                  LyXFont const & outerfont,
-                                 LatexRunParams const & runparams,
+                                 OutputParams const & runparams,
                                  lyx::depth_type depth) const;
 
        ///
        void simpleDocBookOnePar(Buffer const & buf,
                                 std::ostream &,
                                 LyXFont const & outerfont,
-                                int & desc_on,
-                                LatexRunParams const & runparams,
-                                lyx::depth_type depth) const;
+                                OutputParams const & runparams,
+                                lyx::depth_type depth,
+                                bool labelid) const;
 
        ///
        bool hasSameLayout(Paragraph const & par) const;
@@ -139,12 +141,16 @@ public:
        ///
        void makeSameLayout(Paragraph const & par);
 
+       ///
+       void setInsetOwner(UpdatableInset * inset);
        ///
        UpdatableInset * inInset() const;
        ///
-       void setInsetOwner(UpdatableInset * inset);
+       InsetBase::Code ownerCode() const;
        ///
-       void deleteInsetsLyXText(BufferView *);
+       bool autoBreakRows() const;
+       ///
+       bool forceDefaultParagraphs() const;
 
        ///
        lyx::pos_type size() const { return text_.size(); }
@@ -204,7 +210,9 @@ public:
        /// the paragraph alongside the text of the rest of the paragraph
        /// (the body). This function returns the starting position of the
        /// body of the text in the paragraph.
-       int beginningOfBody() const;
+       lyx::pos_type beginOfBody() const;
+       /// recompute this value
+       void setBeginOfBody();
 
        ///
        std::string const & getLabelstring() const;
@@ -271,26 +279,31 @@ public:
                                        lyx::pos_type endpos,
                                        LyXFont_size def_size) const;
        ///
+       void insert(lyx::pos_type pos, std::string const & str,
+                   LyXFont const & font);
+       ///
        void insertChar(lyx::pos_type pos, value_type c);
        ///
-       void insertChar(lyx::pos_type pos, value_type c, LyXFont const &, Change change = Change(Change::INSERTED));
+       void insertChar(lyx::pos_type pos, value_type c,
+               LyXFont const &, Change change = Change(Change::INSERTED));
        ///
        bool checkInsertChar(LyXFont &);
        ///
-       void insertInset(lyx::pos_type pos, InsetOld * inset);
+       void insertInset(lyx::pos_type pos, InsetBase * inset);
        ///
-       void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const &, Change change = Change(Change::INSERTED));
+       void insertInset(lyx::pos_type pos, InsetBase * inset,
+               LyXFont const &, Change change = Change(Change::INSERTED));
        ///
        bool insetAllowed(InsetOld_code code);
        ///
-       InsetOld * getInset(lyx::pos_type pos);
+       InsetBase * getInset(lyx::pos_type pos);
        ///
-       InsetOld const * getInset(lyx::pos_type pos) const;
+       InsetBase const * getInset(lyx::pos_type pos) const;
 
        ///
        bool isHfill(lyx::pos_type pos) const;
-       ///
-       bool isInset(lyx::pos_type pos) const;
+       /// hinted by profiler
+       bool isInset(lyx::pos_type pos) const { return getChar(pos) == META_INSET; }
        ///
        bool isNewline(lyx::pos_type pos) const;
        ///
@@ -305,7 +318,7 @@ public:
        bool isWord(lyx::pos_type pos) const;
 
        /// returns -1 if inset not found
-       int getPositionOfInset(InsetOld const * inset) const;
+       int getPositionOfInset(InsetBase const * inset) const;
 
        ///
        int stripLeadingSpaces();
@@ -324,6 +337,10 @@ public:
 
        ///
        RowList::iterator getRow(lyx::pos_type pos);
+       ///
+       RowList::const_iterator getRow(lyx::pos_type pos) const;
+       ///
+       size_t row(lyx::pos_type pos) const;
 
        ///
        InsetList insetlist;
@@ -343,6 +360,8 @@ private:
        /// keeping this here instead of in the pimpl makes LyX >10% faster
        // for average tasks as buffer loading/switching etc.
        TextContainer text_;
+       /// end of label
+       lyx::pos_type begin_of_body_;
 
        struct Pimpl;
        ///