Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 9eeef130fb4e96795582347e177d2e90193ef991..13c99ca873527bec4efddf25eb3b39fb9e9dad43 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -48,10 +48,14 @@ class TexRow;
 
 class FontSpan {
 public:
-       FontSpan() : first(0), last(0) {}
+       /// Invalid font span containing no character
+       FontSpan() : first(0), last(-1) {}
+       /// Span including first and last
        FontSpan(lyx::pos_type f, lyx::pos_type l) : first(f), last(l) {}
-       lyx::pos_type first;
-       lyx::pos_type last;
+
+public:
+       /// Range including first and last.
+       lyx::pos_type first, last;
 };
 
        
@@ -227,8 +231,8 @@ public:
        /// reject change
        void rejectChange(lyx::pos_type start, lyx::pos_type end);
 
-       /// mark whole par as erased
-       void markErased();
+       /// mark whole par as erased or not
+       void markErased(bool erased);
 
        /// Paragraphs can contain "manual labels", for example, Description
        /// environment. The text for this user-editable label is stored in
@@ -323,23 +327,27 @@ public:
        ///
        bool insetAllowed(InsetBase_code code);
        ///
-       InsetBase * getInset(lyx::pos_type pos);
-       ///
-       InsetBase const * getInset(lyx::pos_type pos) const;
+       InsetBase * getInset(lyx::pos_type pos) {
+               return insetlist.get(pos);
+       }
        ///
-       InsetList insetlist;
-
+       InsetBase const * getInset(lyx::pos_type pos) const {
+               return insetlist.get(pos);
+       }
 
        ///
-       bool isHfill(lyx::pos_type pos) const;
+       bool isHfill(lyx::pos_type pos) const {
+       return isInset(pos)
+               && getInset(pos)->lyxCode() == InsetBase::HFILL_CODE;
+       }
        /// hinted by profiler
        bool isInset(lyx::pos_type pos) const {
                return getChar(pos) == static_cast<value_type>(META_INSET);
        }
        ///
        bool isNewline(lyx::pos_type pos) const;
-       ///
-       bool isSeparator(lyx::pos_type pos) const;
+       /// return true if the char is a word separator
+       bool isSeparator(lyx::pos_type pos) const { return getChar(pos) == ' '; }
        ///
        bool isLineSeparator(lyx::pos_type pos) const;
        /// True if the character/inset at this point can be part of a word
@@ -389,6 +397,11 @@ public:
 
        /// dump some information to lyxerr
        void dump() const;
+
+public:
+       ///
+       InsetList insetlist;
+
 private:
        /// cached dimensions of paragraph
        Dimension dim_;
@@ -405,6 +418,7 @@ private:
        /// end of label
        lyx::pos_type begin_of_body_;
 
+       /// Pimpl away stuff
        class Pimpl;
        ///
        friend class Paragraph::Pimpl;