Account for old versions of Pygments

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 415fe250762087f2a88a612d7fbd82aa6198dbb9..7534a8e7ca005cfb7c3f2a03777f3bb47996a9aa 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -20,6 +20,8 @@
 #include "support/strfwd.h"
 #include "support/Changer.h"
 
+#include "insets/Inset.h"
+
 
 #include <string>
 
@@ -28,24 +30,9 @@ 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,
-       ///
-       LM_ST_TEXT,
-       ///
-       LM_ST_SCRIPT,
-       ///
-       LM_ST_SCRIPTSCRIPT
-};
-
-
 //
 // This is the part common to MetricsInfo and PainterInfo
 //
@@ -59,21 +46,23 @@ public:
        BufferView * bv;
        /// current font
        FontInfo font;
-       /// current math style (display/text/script/..)
-       Styles style;
        /// name of current font - mathed specific
        std::string fontname;
        /// This is the width available in pixels
        int textwidth;
+       /// count wether the current mathdata is nested in macro(s)
+       int macro_nesting;
 
        /// 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);
+       Changer changeFontSet(std::string const & font);
+       /// Temporarily change the font to math if needed.
+       Changer changeEnsureMath(Inset::mode_type mode = Inset::MATH_MODE);
        // Temporarily change to the style suitable for use in fractions
-       Changer changeFrac(bool cond = true);
+       Changer changeFrac();
+       // Temporarily change to the style suitable for use in arrays
+       Changer changeArray();
        // Temporarily change the style to (script)script style
-       Changer changeScript(bool cond = true);
+       Changer changeScript();
        ///
        int solidLineThickness() const { return solid_line_thickness_; }
        ///
@@ -101,8 +90,6 @@ public:
 
        ///
        MetricsBase base;
-       /// count wether the current mathdata is nested in macro(s)
-       int macro_nesting;
        /// The context to resolve macros
        MacroContext const & macrocontext;
 };