X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=34eda6b2de971a1e01ddf60ebb75cabfab734896;hb=fc2658eff011adb08192cf897416698c34aab268;hp=57cf9b3f129b0b11d0bba9142c02a50cd5dbda0c;hpb=40484482361a369bd77f1a6f41769127ea388a3d;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 57cf9b3f12..34eda6b2de 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -14,19 +14,16 @@
 #ifndef TEXT_METRICS_H
 #define TEXT_METRICS_H
 
+#include "Font.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;
@@ -36,17 +33,62 @@ class TextMetrics
 {
 public:
 	/// Default constructor (only here for STL containers).
-	TextMetrics(): text_(0) {}
+	TextMetrics() : text_(0) {}
 	/// The only useful constructor.
 	TextMetrics(BufferView *, Text *);
+	
+	///
+	bool has(pit_type pit) const;
 	///
 	ParagraphMetrics const & parMetrics(pit_type) const;
 	///
-	Dimension const & dimension() const;
-	Dimension const & dimension();
+	std::pair<pit_type, ParagraphMetrics const *> first() const;
+	///
+	std::pair<pit_type, ParagraphMetrics const *> last() 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.
+	/// The difference is that this one is used for displaying, and thus we
+	/// are allowed to make cosmetic improvements. For instance make footnotes
+	/// smaller. (Asger)
+	Font getDisplayFont(pit_type pit,
+		pos_type pos) const;
+
+	/// There are currently two font mechanisms in LyX:
+	/// 1. The font attributes in a lyxtext, and
+	/// 2. The inset-specific font properties, defined in an inset's
+	/// metrics() and draw() methods and handed down the inset chain through
+	/// the pi/mi parameters, and stored locally in a lyxtext in font_.
+	/// This is where the two are integrated in the final fully realized
+	/// font.
+	void applyOuterFont(Font &) const;
+
+	/// is this position in the paragraph right-to-left?
+	bool isRTL(CursorSlice const & sl, bool boundary) const;
+	/// is between pos-1 and pos an RTL<->LTR boundary?
+	bool isRTLBoundary(pit_type pit,
+	  pos_type pos) const;
+	/// would be a RTL<->LTR boundary between pos and the given font?
+	bool isRTLBoundary(pit_type pit,
+	  pos_type pos, Font const & font) const;
+
 
 	/// Rebreaks the given paragraph.
 	/// \retval true if a full screen redraw is needed.
@@ -75,12 +117,10 @@ 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;
-	/// draw textselection
-	void drawSelection(PainterInfo & pi, int x, int y) const;
 	
 	void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
@@ -110,8 +150,8 @@ private:
 		pos_type const end
 		) const;
 
-	/// Calculate and set the height of the row
-	boost::tuple<int, int> rowHeight(
+	/// Calculate and set the height of the row (width member is set to 0)
+	Dimension rowHeight(
 		pit_type const pit,
 		pos_type const first,
 		pos_type const end
@@ -174,6 +214,17 @@ public:
 	void cursorPrevious(Cursor & cur);
 	///
 	void cursorNext(Cursor & cur);
+	///
+	bool cursorHome(Cursor & cur);
+	///
+	bool cursorEnd(Cursor & cur);
+	///
+	void deleteLineForward(Cursor & cur);
+
+	/// is this row the last in the text?
+	bool isLastRow(pit_type pit, Row const & row) const;
+	/// is this row the first in the text?
+	bool isFirstRow(pit_type pit, Row const & row) const;
 
 	/// Returns an inset if inset was hit, or 0 if not.
 	/// \warning This method is not recursive! It will return the
@@ -191,6 +242,7 @@ public:
 	int leftMargin(int max_width, pit_type pit) const;
 
 private:
+	friend class BufferView;
 
 	/// The BufferView owner.
 	BufferView * bv_;
@@ -206,16 +258,17 @@ private:
 	mutable ParMetricsCache par_metrics_;
 	Dimension dim_;
 	int max_width_;
+	mutable Point origin_;
 
-	/// FIXME: transfer this code in CoordCache here.
-	/*
-	/// A map from paragraph index number to screen point
-	typedef std::map<pit_type, Point> InnerParPosCache;
-	/// A map from a Text to the map of paragraphs to screen points
-	typedef std::map<Text const *, InnerParPosCache> ParPosCache;
-	/// Paragraph grouped by owning text
-	ParPosCache pars_;
-	*/
+// temporary public:
+public:
+	/// our 'outermost' font.
+	/// This is handed down from the surrounding
+	/// inset through the pi/mi parameter (pi.base.font)
+	/// It is used in applyOuterFont() and setCharFont() for reasons 
+	/// that are not clear... to hand hand the outermost language and
+	/// also for char style apparently.
+	Font font_;
 };
 
 /// return the default height of a row in pixels, considering font zoom