* gcc does not like missing characters in keywords

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 44624913becaaea590b4e590ea9f06e86e854779..1d6f479bc62bcf323fcb57b238f6f31646620b80 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -15,22 +15,19 @@
 #define TEXT_METRICS_H
 
 #include "Font.h"
-// FIXME: We only need Point class definition, not the full
-// CoordCache.
+// FIXME: We only need Point class definition, not the full CoordCache.
 #include "CoordCache.h"
 #include "ParagraphMetrics.h"
 
 #include "support/types.h"
 
-#include <boost/utility.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include <map>
-
-
 namespace lyx {
 
 class BufferView;
+class Cursor;
+class CursorSlice;
 class DocIterator;
 class MetricsInfo;
 class Text;
@@ -40,7 +37,7 @@ class TextMetrics
 {
 public:
        /// Default constructor (only here for STL containers).
-       TextMetrics(): text_(0) {}
+       TextMetrics() : text_(0) {}
        /// The only useful constructor.
        TextMetrics(BufferView *, Text *);
        
@@ -48,15 +45,27 @@ public:
        bool has(pit_type pit) const;
        ///
        ParagraphMetrics const & parMetrics(pit_type) const;
+       ///
+       std::pair<pit_type, ParagraphMetrics const *> first() const;
+       ///
+       std::pair<pit_type, ParagraphMetrics const *> last() const;
 
        ///
-       Dimension const & dimension() const;
+       int parPosition(pit_type pit) const;
 
+       ///
+       Dimension const & dimension() const { return dim_; }
+       ///
        Point const & origin() const { return origin_; }
 
 
        /// compute text metrics.
-       bool metrics(MetricsInfo & mi, Dimension & dim);
+       bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
+
+       ///
+       void newParMetricsDown();
+       ///
+       void newParMetricsUp();
 
        /// Gets the fully instantiated font at a given position in a paragraph
        /// Basically the same routine as Paragraph::getFont() in Paragraph.cpp.
@@ -112,7 +121,7 @@ public:
 
        /** this calculates the specified parameters. needed when setting
         * the cursor and when creating a visible row */
-       void computeRowMetrics(pit_type pit, Row & row) const;
+       void computeRowMetrics(pit_type pit, Row & row, int width) const;
 
        ///
        void draw(PainterInfo & pi, int x, int y) const;