The inset newline patch I sent plus the requisite fixes. I couldn't reproduce a problem.

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 75e8097f32932419ae7eb55dcfffff8e2d8e2bb5..383a4c8ea2eeb71fcb3c6c1b8c8004bf783b9efc 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -23,7 +23,7 @@
 class BufferParams;
 class BufferView;
 class Counters;
-class InsetBibKey;
+class InsetBibitem;
 class Language;
 class LaTeXFeatures;
 class ParagraphParameters;
@@ -39,12 +39,12 @@ class Paragraph  {
 public:
        ///
        enum META_KIND {
-               ///
-               META_HFILL = 1,
-               ///
-               META_NEWLINE,
-               ///
-               META_INSET
+               /// Note that this is 1 right now to avoid
+               /// crashes where getChar() is called wrongly
+               /// (returning 0) - if this was 0, then we'd
+               /// try getInset() and crash. We should fix
+               /// all these places.
+               META_INSET = 1
        };
        ///
        typedef char value_type;
@@ -90,11 +90,6 @@ public:
        ///
        void read();
 
-       ///
-       Paragraph * TeXOnePar(Buffer const *, BufferParams const &,
-                                std::ostream &, TexRow & texrow,
-                                bool moving_arg);
-
        ///
        int startTeXParParams(BufferParams const &, std::ostream &, bool) const;
 
@@ -107,9 +102,6 @@ public:
                             std::ostream &, TexRow & texrow, bool moving_arg);
 
        ///
-       Paragraph * TeXEnvironment(Buffer const *, BufferParams const &,
-                                     std::ostream &, TexRow & texrow);
-       ///
        bool hasSameLayout(Paragraph const * par) const;
 
        ///
@@ -151,7 +143,7 @@ public:
        char itemdepth;
 
        ///
-       InsetBibKey * bibkey();  // ale970302
+       InsetBibitem * bibitem();  // ale970302
 
 #ifndef NO_NEXT
        ///
@@ -162,43 +154,47 @@ public:
        ///
        Paragraph const * next() const;
 
+       ///
+       void previous(Paragraph *);
+       ///
+       Paragraph * previous();
+       ///
+       Paragraph const * previous() const;
+#endif
+
        /// initialise tracking for this par
        void trackChanges(Change::Type = Change::UNCHANGED);
- 
+
        /// stop tracking
        void untrackChanges();
- 
+
        /// set entire paragraph to new text for change tracking
        void cleanChanges();
- 
+
        /// look up change type at given pos
        Change::Type lookupChange(lyx::pos_type pos) const;
- 
+
        /// look up change at given pos
        Change const lookupChangeFull(lyx::pos_type pos) const;
- 
+
        /// is there a change within the given range ?
        bool isChanged(lyx::pos_type start, lyx::pos_type end) const;
 
        /// is there a non-addition in this range ?
        bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
- 
+
+       /// set change at pos
+       void setChange(lyx::pos_type pos, Change::Type type);
+
        /// accept change
        void acceptChange(lyx::pos_type start, lyx::pos_type end);
 
        /// reject change
        void rejectChange(lyx::pos_type start, lyx::pos_type end);
- 
+
        /// mark whole par as erased
        void markErased();
- 
-       ///
-       void previous(Paragraph *);
-       ///
-       Paragraph * previous();
-       ///
-       Paragraph const * previous() const;
-#endif
+
        /// for the environments
        Paragraph * depthHook(depth_type depth);
        /// for the environments
@@ -207,8 +203,13 @@ public:
        Paragraph * outerHook();
        ///
        Paragraph const * outerHook() const;
-       ///
-       int beginningOfMainBody() const;
+
+       /// Paragraphs can contain "manual labels", for example, Description environment.
+       /// The text for this user-editable label is stored in 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;
+
        ///
        string const & getLabelstring() const;
 
@@ -224,12 +225,14 @@ public:
        depth_type getMaxDepthAfter() const;
        ///
        void applyLayout(LyXLayout_ptr const & new_layout);
- 
+
+       /// definite erase
+       void eraseIntern(lyx::pos_type pos);
        /// erase the char at the given position
        void erase(lyx::pos_type pos);
        /// erase the given range. Returns true if actually erased.
        bool erase(lyx::pos_type start, lyx::pos_type end);
- 
+
        /** Get uninstantiated font setting. Returns the difference
            between the characters font and the layoutfont.
            This is what is stored in the fonttable
@@ -321,10 +324,6 @@ public:
        InsetList insetlist;
        ///
        //Counters & counters();
-
-       friend void breakParagraph(BufferParams const & bparams,
-                    Paragraph * par, lyx::pos_type pos, int flag);
- 
 private:
        ///
        LyXLayout_ptr layout_;
@@ -343,16 +342,16 @@ private:
        Pimpl * pimpl_;
 };
 
- 
-inline bool isInsertedText(Paragraph const * par, lyx::pos_type pos)
+
+inline bool isInsertedText(Paragraph const & par, lyx::pos_type pos)
 {
-       return par->lookupChange(pos) == Change::INSERTED;
+       return par.lookupChange(pos) == Change::INSERTED;
 }
- 
- 
-inline bool isDeletedText(Paragraph const * par, lyx::pos_type pos)
+
+
+inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos)
 {
-       return par->lookupChange(pos) == Change::DELETED;
+       return par.lookupChange(pos) == Change::DELETED;
 }
- 
+
 #endif // PARAGRAPH_H