Merge remote-tracking branch 'features/str-metrics'

[features.git] / src / rowpainter.h

diff --git a/src/rowpainter.h b/src/rowpainter.h
index 644cb3773d07447c1f9ba12b33bcbb76f21d30ce..7e29c0ef1611655a56b2bc47dac0509b8698f5da 100644 (file)
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -36,6 +36,21 @@ class TextMetrics;
 
 namespace frontend { class Painter; }
 
+/**
+ * FIXME: Re-implement row painting using row elements.
+ *
+ * This is not difficult in principle, but the code is intricate and
+ * needs some careful analysis. The first thing that needs to be done
+ * is to break row elements with the same criteria. Currently breakRow
+ * does not consider on-the-fly spell-checking, but it is not clear to
+ * me that it is required. Moreover, this thing would only work if we
+ * are sure that the Row object is up-to-date when drawing happens.
+ * This depends on the update machinery.
+ *
+ * This would allow to get rid of the Bidi class.
+ */
+
+
 /**
  * A class used for painting an individual row of text.
  * FIXME: get rid of that class.
@@ -61,10 +76,7 @@ private:
        void paintSeparator(double orig_x, double width, FontInfo const & font);
        void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
        void paintMisspelledMark(double orig_x, bool changed);
-       void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);
-       void paintArabicComposeChar(pos_type & vpos, FontInfo const & font);
-       void paintChars(pos_type & vpos, FontInfo const & font,
-                       bool hebrew, bool arabic);
+       void paintChars(pos_type & vpos, Font const & font);
        int paintAppendixStart(int y);
        void paintFromPos(pos_type & vpos, bool changed);
        void paintInset(Inset const * inset, pos_type const pos);