fix reading the author field.

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index 512a5a26bab229eec5bf1663ac14f034cc518108..2e401c3eb7c3cb172b9d2433249162c4110056f5 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -1,8 +1,20 @@
+// -*- C++ -*-
+/**
+ * \file metricsinfo.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "LString.h"
+
+#include <string>
 
 class Painter;
 class BufferView;
@@ -21,14 +33,14 @@ enum Styles {
 };
 
 
-// 
+//
 // This is the part common to MetricsInfo and PainterInfo
 //
 struct MetricsBase {
        ///
        MetricsBase();
        ///
-       MetricsBase(BufferView * bv, LyXFont const & font);
+       MetricsBase(BufferView * bv, LyXFont const & font, int textwidth);
 
        /// the current view
        BufferView * bv;
@@ -36,24 +48,22 @@ struct MetricsBase {
        LyXFont font;
        /// current math style (display/text/script/..)
        Styles style;
-       /// name of current font
-       string fontname;
-       /// if this is set...
-       bool restrictwidth;
-       /// ... this is valid
+       /// name of current font - mathed specific
+       std::string fontname;
+       /// This is the width available in pixels
        int textwidth;
 };
 
 
 //
-// This contains a Metricsbase and Information that's only relevant during
+// This contains a MetricsBase and information that's only relevant during
 // the first phase of the two-phase draw
 //
 struct MetricsInfo {
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, LyXFont const & font);
+       MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth);
 
        ///
        MetricsBase base;
@@ -61,12 +71,12 @@ struct MetricsInfo {
 
 
 //
-// This contains a Metricsbase and Information that's only relevant during
+// This contains a MetricsBase and information that's only relevant during
 // the second phase of the two-phase draw
 //
 struct PainterInfo {
        ///
-       explicit PainterInfo(BufferView * bv);
+       PainterInfo(BufferView * bv, Painter & pain);
        ///
        void draw(int x, int y, char c);
 
@@ -74,8 +84,8 @@ struct PainterInfo {
        MetricsBase base;
        ///
        Painter & pain;
-       /// width of current item
-       int width;
+       /// Whether the text at this point is right-to-left (for InsetNewline)
+       bool ltr_pos;
 };
 
 
@@ -166,4 +176,12 @@ struct WidthChanger : public Changer<MetricsBase>
 };
 
 
+// temporarily change the used color
+struct ColorChanger : public Changer<LyXFont, std::string> {
+       ///
+       ColorChanger(LyXFont & font, std::string const & color);
+       ///
+       ~ColorChanger();
+};
+
 #endif