Alfredo's second patch

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 5ecd70bcf2df681072e6487eca0024b5745e6d07..1001208a5b8deb1810119497d448f412e89ebbfe 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -14,7 +14,7 @@
 #include "counters.h"
 
 #include <boost/scoped_ptr.hpp>
- 
+
 class LyXLayout;
 
 struct Paragraph::Pimpl {
@@ -36,7 +36,7 @@ struct Paragraph::Pimpl {
        ///
        void clear();
        ///
-       void setContentsFromPar(Paragraph const * par);
+       void setContentsFromPar(Paragraph const & par);
        /// set tracking mode
        void trackChanges(Change::Type type = Change::UNCHANGED);
        /// stop tracking
@@ -51,24 +51,24 @@ struct Paragraph::Pimpl {
        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);
- 
+
        /// mark as erased
        void markErased();
- 
+
        /// accept change
        void acceptChange(lyx::pos_type start, lyx::pos_type end);
 
        /// reject change
        void rejectChange(lyx::pos_type start, lyx::pos_type end);
- 
+
        /// are we tracking changes ?
        bool tracking() const {
                return changes_.get();
        }
- 
+
        ///
        value_type getChar(lyx::pos_type pos) const;
        ///
@@ -82,10 +82,7 @@ struct Paragraph::Pimpl {
        /// erase the given position
        void erase(lyx::pos_type pos);
        /// erase the given range
-       bool erase(lyx::pos_type start, lyx::pos_type end);
-       ///
-       LyXFont const realizeFont(LyXFont const & font,
-                                 BufferParams const & bparams) const;
+       int erase(lyx::pos_type start, lyx::pos_type end);
        ///
        Inset * inset_owner;
 
@@ -147,9 +144,6 @@ struct Paragraph::Pimpl {
        ///
        FontList fontlist;
 
-       ///
-       Paragraph * TeXDeeper(Buffer const *, BufferParams const &,
-                                std::ostream &, TexRow & texrow);
        ///
        void simpleTeXBlanks(std::ostream &, TexRow & texrow,
                             lyx::pos_type const i,
@@ -161,7 +155,9 @@ struct Paragraph::Pimpl {
                                   std::ostream &, TexRow & texrow,
                                   bool moving_arg,
                                   LyXFont & font, LyXFont & running_font,
-                                  LyXFont & basefont, bool & open_font,
+                                  LyXFont & basefont,
+                                  LyXFont const & outerfont,
+                                  bool & open_font,
                                   Change::Type & running_change,
                                   LyXLayout const & style,
                                   lyx::pos_type & i,
@@ -187,7 +183,7 @@ private:
 
        /// for recording and looking up changes in revision tracking mode
        boost::scoped_ptr<Changes> changes_;
- 
+
        /// Who owns us?
        Paragraph * owner_;
        ///