Point fix, earlier forgotten

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index c89c15b787e06439330285ede006b3f86d7906fb..6f0c26648dcfeef62b8c697e26b92c5959717115 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -1,9 +1,16 @@
 // -*- C++ -*-
 /**
- *  \file paragraph.h
- *  Copyright 1995 Matthias Ettrich
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file paragraph.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PARAGRAPH_H
@@ -13,10 +20,11 @@
 #include "lyxfont.h" // Just for LyXFont::FONT_SIZE
 #include "InsetList.h"
 
-#include "insets/inset.h" // Just for Inset::Code
+#include "insets/inset.h" // Just for InsetOld::Code
 
 #include "support/types.h"
 #include "changes.h"
+#include "RowList.h"
 
 #include "LString.h"
 
@@ -71,13 +79,13 @@ public:
        bool isMultiLingual(BufferParams const &);
 
        ///
-       string const asString(Buffer const *, bool label) const;
+       string const asString(Buffer const &, bool label) const;
        ///
-       string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end,
+       string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end,
                              bool label) const;
 
        ///
-       void write(Buffer const *, std::ostream &, BufferParams const &,
+       void write(Buffer const &, std::ostream &, BufferParams const &,
                       depth_type & depth) const;
        ///
        void validate(LaTeXFeatures &) const;
@@ -95,7 +103,7 @@ public:
 
 
        ///
-       bool simpleTeXOnePar(Buffer const *, BufferParams const &,
+       bool simpleTeXOnePar(Buffer const &, BufferParams const &,
                             LyXFont const & outerfont, std::ostream &,
                             TexRow & texrow, LatexRunParams const &);
 
@@ -111,8 +119,6 @@ public:
        void setInsetOwner(UpdatableInset * inset);
        ///
        void deleteInsetsLyXText(BufferView *);
-       ///
-       void resizeInsetsLyXText(BufferView *);
 
        ///
        lyx::pos_type size() const;
@@ -222,6 +228,13 @@ public:
                                    LyXFont const & outerfont) const;
        LyXFont const getLabelFont(BufferParams const &,
                                   LyXFont const & outerfont) const;
+       /**
+        * The font returned by the above functions is the same in a
+        * span of characters. This method will return the last position
+        * in the paragraph for which that font is the same.
+        * This can be used to avoid unnecessary calls to getFont.
+        */
+       lyx::pos_type getEndPosOfFontSpan(lyx::pos_type pos) const;
        ///
        value_type getChar(lyx::pos_type pos) const;
        ///
@@ -242,23 +255,15 @@ public:
        ///
        bool checkInsertChar(LyXFont &);
        ///
-       void insertInset(lyx::pos_type pos, Inset * inset);
-       ///
-       void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &, Change change = Change(Change::INSERTED));
-       ///
-       bool insetAllowed(Inset::Code code);
+       void insertInset(lyx::pos_type pos, InsetOld * inset);
        ///
-       Inset * getInset(lyx::pos_type pos);
+       void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const &, Change change = Change(Change::INSERTED));
        ///
-       Inset const * getInset(lyx::pos_type pos) const;
-       /** important for cut and paste
-           Temporary change from BufferParams to Buffer. Will revert when we
-           get rid of the argument to Inset::clone(Buffer const &) */
-       void copyIntoMinibuffer(Buffer const &, lyx::pos_type pos) const;
+       bool insetAllowed(InsetOld::Code code);
        ///
-       void cutIntoMinibuffer(BufferParams const &, lyx::pos_type pos);
+       InsetOld * getInset(lyx::pos_type pos);
        ///
-       bool insertFromMinibuffer(lyx::pos_type pos);
+       InsetOld const * getInset(lyx::pos_type pos) const;
 
        ///
        bool isHfill(lyx::pos_type pos) const;
@@ -278,14 +283,17 @@ public:
        bool isWord(lyx::pos_type pos) const;
 
        /// returns -1 if inset not found
-       int getPositionOfInset(Inset const * inset) const;
+       int getPositionOfInset(InsetOld const * inset) const;
 
        ///
        int stripLeadingSpaces();
 
-       ///
+       /// return true if we allow multiple spaces
        bool isFreeSpacing() const;
 
+       /// return true if we allow this par to stay empty
+       bool allowEmpty() const;
+
        ///
        ParagraphParameters & params();
        ///
@@ -293,6 +301,11 @@ public:
        ///
        InsetList insetlist;
 
+       ///
+       mutable RowList rows;
+       /// last draw y position (baseline of top row)
+       int y;
+
 private:
        ///
        LyXLayout_ptr layout_;
@@ -317,7 +330,4 @@ inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos)
        return par.lookupChange(pos) == Change::DELETED;
 }
 
-
-bool operator==(Paragraph const & lhs, Paragraph const & rhs);
-
 #endif // PARAGRAPH_H