Restore the version number position on the splash screen

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index efb347c2494dfbdc341c305c42a8c9b325ec72cb..df899b695db235082778e9e99b41d4ebadd16959 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -26,6 +26,7 @@
 
 namespace lyx {
 
+class Encoding;
 class LyXLayout;
 
 
@@ -40,17 +41,20 @@ public:
        // Change tracking
        //
        /// look up change at given pos
-       Change const lookupChange(pos_type pos) const;
+       Change const & lookupChange(pos_type pos) const;
        /// is there a change within the given range ?
        bool isChanged(pos_type start, pos_type end) const;
-        /// set change for the entire par
-        void setChange(Change const & change);
+       /// will the paragraph be physically merged with the next
+       /// one if the imaginary end-of-par character is logically deleted?
+       bool isMergedOnEndOfParDeletion(bool trackChanges) const;
+       /// set change for the entire par
+       void setChange(Change const & change);
        /// set change at given pos
        void setChange(pos_type pos, Change const & change);
        /// accept changes within the given range
-       void acceptChanges(pos_type start, pos_type end);
+       void acceptChanges(BufferParams const & bparams, pos_type start, pos_type end);
        /// reject changes within the given range
-       void rejectChanges(pos_type start, pos_type end);
+       void rejectChanges(BufferParams const & bparams, pos_type start, pos_type end);
 
        ///
        value_type getChar(pos_type pos) const;
@@ -120,17 +124,24 @@ public:
        ///
        FontList fontlist;
 
-       ///
-       void simpleTeXBlanks(odocstream &, TexRow & texrow,
-                            pos_type const i,
+       /// Output the surrogate pair formed by \p c and \p next to \p os.
+       /// \return the number of characters written.
+       int latexSurrogatePair(odocstream & os, value_type c, value_type next,
+                              Encoding const &);
+       /// Output a space in appropriate formatting (or a surrogate pair
+       /// if the next character is a combining character).
+       /// \return whether a surrogate pair was output.
+       bool simpleTeXBlanks(BufferParams const &, Encoding const &,
+                            odocstream &, TexRow & texrow,
+                            pos_type & i,
                             unsigned int & column,
                             LyXFont const & font,
                             LyXLayout const & style);
        ///
        void simpleTeXSpecialChars(Buffer const &, BufferParams const &,
-                                  odocstream &, TexRow & texrow,
-                                  OutputParams const &,
-                                  LyXFont & font, LyXFont & running_font,
+                                  Encoding const &, odocstream &,
+                                  TexRow & texrow, OutputParams const &,
+                                  LyXFont & running_font,
                                   LyXFont & basefont,
                                   LyXFont const & outerfont,
                                   bool & open_font,