get rid of LYX_LIBS

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index d4ed74020c5ed4d5b04d7d6620822ddcdbb0542d..89ffc10999321b2ca65ff95b87524d9cb8973d9a 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -107,8 +107,6 @@ public:
                         lyx::pos_type pos, LyXFont const & font);
        void setCharFont(BufferView *, Paragraph * par,
                         lyx::pos_type pos, LyXFont const & font, bool toggleall);
-       /// returns a pointer to the very first Paragraph
-       Paragraph * firstParagraph() const;
   
        /// what you expect when pressing <enter> at cursor position
        void breakParagraph(BufferView *, char keep_layout = 0);
@@ -117,11 +115,11 @@ public:
          those paragraphs
          */
        Paragraph * setLayout(BufferView *, LyXCursor & actual_cursor,
-                                LyXCursor & selection_start,
-                                LyXCursor & selection_end,
-                                lyx::layout_type layout);
+                             LyXCursor & selection_start,
+                             LyXCursor & selection_end,
+                             string const & layout);
        ///
-       void setLayout(BufferView *, lyx::layout_type layout);
+       void setLayout(BufferView *, string const & layout);
        
        /// used in setlayout
        void makeFontEntriesLayoutSpecific(Buffer const *, Paragraph * par);
@@ -306,8 +304,8 @@ public:
        string const selectNextWordToSpellcheck(BufferView *, float & value) const;
        ///
        void selectSelectedWord(BufferView *);
-       ///
-       void setCursor(BufferView *, Paragraph * par,
+       /// returns true if par was empty and was removed
+       bool setCursor(BufferView *, Paragraph * par,
                       lyx::pos_type pos,
                       bool setfont = true,
                       bool boundary = false) const;
@@ -516,8 +514,7 @@ private:
          Asger has learned that this should be a buffer-property instead
          Lgb has learned that 'char' is a lousy type for non-characters
          */
-       lyx::layout_type copylayouttype;
-
+       string copylayouttype;
        /** inserts a new row behind the specified row, increments
            the touched counters */
        void insertRow(Row * row, Paragraph * par, lyx::pos_type pos) const;
@@ -590,6 +587,13 @@ private:
        /// paint env depth bar 
        void paintRowDepthBar(DrawRowParams & p);
  
+       /// get the on-screen size of the length marker
+       int getLengthMarkerHeight(BufferView * bv, VSpace const & vsp) const;
+ 
+       /// paint an added space marker
+       int drawLengthMarker(DrawRowParams & p, string const & str,
+               VSpace const & vsp, int start); 
+ 
        /// paint a first row in a paragraph
        void paintFirstRow(DrawRowParams & p);
  
@@ -605,8 +609,8 @@ private:
                                  LyXCursor & cur,
                                  LyXCursor const & where) const;
        
-       ///
-       void deleteEmptyParagraphMechanism(BufferView *,
+       /// delete double space (false) or empty paragraphs (true) around old_cursor 
+       bool deleteEmptyParagraphMechanism(BufferView *,
                                           LyXCursor const & old_cursor) const;
 
 public: