This is the first of a series of commits that will make InsetLayout a real class.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 9ee108efe7600a9b5ad969b884cf7a95dc3ac722..e00f644f15b74305cf0d8d48443d46fe4f1b3935 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -16,14 +16,13 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
+#include "FontEnums.h"
 #include "LayoutPtr.h"
 
 #include "insets/InsetCode.h"
 
-#include "support/docstring.h"
-// FIXME: would be nice to forward declare odocstream instead of
-// including this:
-#include "support/docstream.h"
+#include "support/strfwd.h"
+#include "support/types.h"
 
 namespace lyx {
 
@@ -146,8 +145,11 @@ public:
        ///
        InsetCode ownerCode() const;
        ///
-       bool forceDefaultParagraphs() const;
-
+       bool forceEmptyLayout() const;
+       ///
+       bool allowParagraphCustomization() const;
+       ///
+       bool useEmptyLayout() const;
        ///
        pos_type size() const;
        ///
@@ -225,6 +227,9 @@ public:
        /// (logically) erase the given range; return the number of chars actually erased
        int eraseChars(pos_type start, pos_type end, bool trackChanges);
 
+       ///
+       void resetFonts(Font const & font);
+
        /** Get uninstantiated font setting. Returns the difference
            between the characters font and the layoutfont.
            This is what is stored in the fonttable
@@ -238,8 +243,8 @@ public:
            font attached to this paragraph.
            If pos == -2, use the label font of the layout attached here.
            In all cases, the font is instantiated, i.e. does not have any
-           attributes with values Font::INHERIT, Font::IGNORE or
-           Font::TOGGLE.
+           attributes with values FONT_INHERIT, FONT_IGNORE or
+           FONT_TOGGLE.
        */
        Font const getFont(BufferParams const &, pos_type pos,
                              Font const & outerfont) const;
@@ -261,8 +266,8 @@ public:
        /// pos <= size() (there is a dummy font change at the end of each par)
        void setFont(pos_type pos, Font const & font);
        /// Returns the height of the highest font in range
-       Font_size highestFontInRange(pos_type startpos,
-                                       pos_type endpos, Font_size def_size) const;
+       FontSize highestFontInRange(pos_type startpos,
+                                       pos_type endpos, FontSize def_size) const;
        ///
        void insert(pos_type pos, docstring const & str,
                    Font const & font, Change const & change);
@@ -348,7 +353,7 @@ public:
 
        ///
        void changeCase(BufferParams const & bparams, pos_type pos,
-               pos_type right, TextCase action);
+               pos_type & right, TextCase action);
 
        /// find \param str string inside Paragraph.
        /// \return true if the specified string is at the specified position