Alfredo's second patch

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index d26fccac2e0b8d50716b726018f63d76f7c09eba..248107ff6c61ed4c9a6a7d91340317c8cb95843c 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -92,8 +92,6 @@ public:
 
        /// return the unique ID of this paragraph
        int id() const;
-       ///
-       void read();
 
        ///
        int startTeXParParams(BufferParams const &, std::ostream &, bool) const;
@@ -104,13 +102,14 @@ public:
 
        ///
        bool simpleTeXOnePar(Buffer const *, BufferParams const &,
-                            std::ostream &, TexRow & texrow, bool moving_arg);
+                            LyXFont const & outerfont, std::ostream &,
+                            TexRow & texrow, bool moving_arg);
 
        ///
-       bool hasSameLayout(Paragraph const * par) const;
+       bool hasSameLayout(Paragraph const & par) const;
 
        ///
-       void makeSameLayout(Paragraph const * par);
+       void makeSameLayout(Paragraph const & par);
 
        ///
        Inset * inInset() const;
@@ -126,7 +125,7 @@ public:
        ///
        bool empty() const;
        ///
-       void setContentsFromPar(Paragraph * par);
+       void setContentsFromPar(Paragraph const & par);
        ///
        void clearContents();
 
@@ -220,8 +219,8 @@ public:
        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);
+       /// erase the given range. Returns the number of chars actually erased
+       int erase(lyx::pos_type start, lyx::pos_type end);
 
        /** Get uninstantiated font setting. Returns the difference
            between the characters font and the layoutfont.
@@ -239,9 +238,12 @@ public:
            attributes with values LyXFont::INHERIT, LyXFont::IGNORE or
            LyXFont::TOGGLE.
        */
-       LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const;
-       LyXFont const getLayoutFont(BufferParams const &) const;
-       LyXFont const getLabelFont(BufferParams const &) const;
+       LyXFont const getFont(BufferParams const &, lyx::pos_type pos,
+                             LyXFont const & outerfont) const;
+       LyXFont const getLayoutFont(BufferParams const &,
+                                   LyXFont const & outerfont) const;
+       LyXFont const getLabelFont(BufferParams const &,
+                                  LyXFont const & outerfont) const;
        ///
        value_type getChar(lyx::pos_type pos) const;
        ///
@@ -333,6 +335,9 @@ private:
        friend struct Paragraph::Pimpl;
        ///
        Pimpl * pimpl_;
+
+       /// unimplemented
+       void operator=(Paragraph const &);
 };