revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index d8f1cd7a0045bd8177eb46fa00b99a10fd2e02f1..c5b4270c3298113b0215705a6b236fbb35515f93 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -69,8 +69,8 @@ public:
                /// (returning 0) - if this was 0, then we'd
                /// try getInset() and crash. We should fix
                /// all these places.
-               META_INSET = 1
-               //META_INSET = 0x200001  // above 0x10ffff, for ucs-4
+               //META_INSET = 1 // as in trunk
+               META_INSET = 0x200001  // above 0x10ffff, for ucs-4
        };
        enum ChangeTracking
        {
@@ -146,17 +146,10 @@ public:
                             LyXFont const & outerfont, std::ostream &,
                             TexRow & texrow, OutputParams const &) const;
 
-       /// Writes to stream the content of the paragraph for linuxdoc
-       void simpleLinuxDocOnePar(Buffer const & buf,
-                                 std::ostream & os,
-                                 LyXFont const & outerfont,
-                                 OutputParams const & runparams,
-                                 lyx::depth_type depth) const;
-
        /// Can we drop the standard paragraph wrapper?
        bool emptyTag() const;
 
-       /// Get the id of the paragraph, usefull for docbook and linuxdoc
+       /// Get the id of the paragraph, usefull for docbook
        std::string getID(Buffer const & buf,
                          OutputParams const & runparams) const;
 
@@ -220,9 +213,6 @@ public:
        /// set entire paragraph to new text for change tracking
        void cleanChanges(ChangeTracking ct = trackingUnknown);
 
-       /// look up change type at given pos
-       Change::Type lookupChangeType(lyx::pos_type pos) const;
-
        /// look up change at given pos
        Change const lookupChange(lyx::pos_type pos) const;
 
@@ -232,11 +222,11 @@ public:
        /// 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);
+       /// set change type at given pos
+       void setChangeType(lyx::pos_type pos, Change::Type type);
 
-       /// set full change at pos
-       void setChangeFull(lyx::pos_type pos, Change change);
+       /// set change at given pos
+       void setChange(lyx::pos_type pos, Change change);
 
        /// accept change
        void acceptChange(lyx::pos_type start, lyx::pos_type end);
@@ -379,7 +369,7 @@ public:
        /// return true if we allow this par to stay empty
        bool allowEmpty() const;
        ///
-       unsigned char transformChar(unsigned char c, lyx::pos_type pos) const;
+       lyx::char_type transformChar(lyx::char_type c, lyx::pos_type pos) const;
        ///
        ParagraphParameters & params();
        ///
@@ -447,13 +437,13 @@ private:
 
 inline bool isInsertedText(Paragraph const & par, lyx::pos_type pos)
 {
-       return par.lookupChangeType(pos) == Change::INSERTED;
+       return par.lookupChange(pos).type == Change::INSERTED;
 }
 
 
 inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos)
 {
-       return par.lookupChangeType(pos) == Change::DELETED;
+       return par.lookupChange(pos).type == Change::DELETED;
 }
 
 #endif // PARAGRAPH_H