tex2lyx: improve module support

[lyx.git] / src / RowPainter.h

diff --git a/src/RowPainter.h b/src/RowPainter.h
index ca719bd228e1b06ca249a0c9c5c3493e8fdbe6bb..fc7c36f036b9469e67c1f8a8dbd45cc0b5f52654 100644 (file)
--- a/src/RowPainter.h
+++ b/src/RowPainter.h
@@ -29,7 +29,6 @@ class Language;
 class PainterInfo;
 class Paragraph;
 class ParagraphList;
-class ParagraphMetrics;
 class Text;
 class TextMetrics;
 
@@ -58,15 +57,18 @@ public:
        void paintSelection() const;
 
 private:
+       void paintLanguageMarkings(Row::Element const & e) const;
        void paintForeignMark(Row::Element const & e) const;
+       void paintNoSpellingMark(Row::Element const & e) const;
        void paintStringAndSel(Row::Element const & e) const;
+       void paintTextDecoration(Row::Element const & e) const;
        void paintMisspelledMark(Row::Element const & e) const;
        void paintChange(Row::Element const & e) const;
        void paintAppendixStart(int y) const;
        void paintInset(Row::Element const & e) const;
 
-       /// return the label font for this row
-       FontInfo labelFont() const;
+       /// return the label font for this row (end label when \c end is true)
+       FontInfo labelFont(bool end) const;
 
        ///
        void paintLabel() const;
@@ -79,7 +81,7 @@ private:
 
        /// Text for the row
        Text const & text_;
-       TextMetrics const & text_metrics_;
+       TextMetrics const & tm_;
        ParagraphList const & pars_;
 
        /// The row to paint
@@ -87,7 +89,6 @@ private:
 
        /// Row's paragraph
        Paragraph const & par_;
-       ParagraphMetrics const & pm_;
 
        /// row changed? (change tracking)
        Change const change_;
@@ -96,7 +97,6 @@ private:
        double const xo_;
        int const yo_;    // current baseline
        double x_;
-       int width_;
 };
 
 } // namespace lyx