Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index d717a54282b612147c4c903df076a98dbcaf6ed2..d2dd8b7bcf4818d3e5d9649a43225f47fa77bf70 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -14,24 +14,26 @@
 #define METRICSINFO_H
 
 #include "Changes.h"
-#include "Color.h"
+#include "ColorCode.h"
 #include "FontInfo.h"
 
 #include "support/strfwd.h"
-#include "support/types.h"
+#include "support/Changer.h"
+
 
 #include <string>
 
-class BufferView;
 
 namespace lyx {
 
 namespace frontend { class Painter; }
+class BufferView;
 class Inset;
 class MacroContext;
 
 
 /// Standard Sizes (mode styles)
+/// note: These values are hard-coded in changeStyle
 enum Styles {
        ///
        LM_ST_DISPLAY = 0,
@@ -50,9 +52,8 @@ enum Styles {
 class MetricsBase {
 public:
        ///
-       MetricsBase();
-       ///
-       MetricsBase(BufferView * bv, FontInfo const & font, int textwidth);
+       MetricsBase(BufferView * bv = 0, FontInfo font = FontInfo(),
+                   int textwidth = 0);
 
        /// the current view
        BufferView * bv;
@@ -64,6 +65,25 @@ public:
        std::string fontname;
        /// This is the width available in pixels
        int textwidth;
+
+       /// Temporarily change a full font.
+       Changer changeFontSet(std::string const & font, bool cond = true);
+       /// Temporarily change the font size and the math style.
+       Changer changeStyle(Styles style, bool cond = true);
+       // Temporarily change to the style suitable for use in fractions
+       Changer changeFrac(bool cond = true);
+       // Temporarily change the style to (script)script style
+       Changer changeScript(bool cond = true);
+       ///
+       int solidLineThickness() const { return solid_line_thickness_; }
+       ///
+       int solidLineOffset() const { return solid_line_offset_; }
+       ///
+       int dottedLineThickness() const { return dotted_line_thickness_; }
+private:
+       int solid_line_thickness_;
+       int solid_line_offset_;
+       int dotted_line_thickness_;
 };
 
 
@@ -76,7 +96,8 @@ public:
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
+       MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
+                   MacroContext const & mc);
 
        ///
        MetricsBase base;
@@ -104,7 +125,7 @@ public:
        ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
 
        /// Determines the text color based on the intended color, the
-       /// change tracking state and the selectio state. 
+       /// change tracking state and the selection state. 
        /// \param color what the color should be by default
        Color textColor(Color const & color) const;
 
@@ -118,6 +139,8 @@ public:
        Change change_;
        /// Whether the parent is selected as a whole
        bool selected;
+       /// Whether the spell checker is enabled for the parent
+       bool do_spellcheck;
        ///
        bool full_repaint;
        /// Current background color
@@ -126,119 +149,6 @@ public:
 
 class TextMetricsInfo {};
 
-
-/// Generic base for temporarily changing things.
-/// The original state gets restored when the Changer is destructed.
-template <class Struct, class Temp = Struct>
-class Changer {
-public:
-       ///
-       Changer(Struct & orig) : orig_(orig) {}
-protected:
-       ///
-       Struct & orig_;
-       ///
-       Temp save_;
-};
-
-
-
-// temporarily change some aspect of a font
-class FontChanger : public Changer<FontInfo> {
-public:
-       ///
-       FontChanger(FontInfo & orig, docstring const & font);
-       FontChanger(MetricsBase & mb, char const * const font);
-       ///
-       ~FontChanger();
-};
-
-
-// temporarily change a full font
-class FontSetChanger : public Changer<MetricsBase> {
-public:
-       ///
-       FontSetChanger(MetricsBase & mb, docstring const & font,
-                       bool really_change_font = true);
-       FontSetChanger(MetricsBase & mb, char const * const font,
-                       bool really_change_font = true);
-       ///
-       ~FontSetChanger();
-private:
-       ///
-       bool change_;
-};
-
-
-// temporarily change the style
-class StyleChanger : public Changer<MetricsBase> {
-public:
-       ///
-       StyleChanger(MetricsBase & mb, Styles style);
-       ///
-       ~StyleChanger();
-};
-
-
-// temporarily change the style to script style
-class ScriptChanger : public StyleChanger {
-public:
-       ///
-       ScriptChanger(MetricsBase & mb);
-};
-
-
-// temporarily change the style suitable for use in fractions
-class FracChanger : public StyleChanger {
-public:
-       ///
-       FracChanger(MetricsBase & mb);
-};
-
-
-// temporarily change the style suitable for use in tabulars and arrays
-class ArrayChanger : public StyleChanger {
-public:
-       ///
-       ArrayChanger(MetricsBase & mb);
-};
-
-
-
-// temporarily change the shape of a font
-class ShapeChanger : public Changer<FontInfo, FontShape> {
-public:
-       ///
-       ShapeChanger(FontInfo & font, FontShape shape);
-       ///
-       ~ShapeChanger();
-};
-
-
-// temporarily change the available text width
-class WidthChanger : public Changer<MetricsBase>
-{
-public:
-       ///
-       WidthChanger(MetricsBase & mb, int width);
-       ///
-       ~WidthChanger();
-};
-
-
-// temporarily change the used color
-class ColorChanger : public Changer<FontInfo, ColorCode> {
-public:
-       ///
-       ColorChanger(FontInfo & font, docstring const & color,
-                    bool really_change_color = true);
-       ///
-       ~ColorChanger();
-private:
-       ///
-       bool change_;
-};
-
 } // namespace lyx
 
 #endif