Take into account the latex encoding when generating math preview snippets.

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 5bb93b6e8c4fdc156e668c56c8d9d17bb7ad55d3..e091dc78308ff55760e03d2867223997332dbe59 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -5,6 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author André Pönitz
+ * \author Stefan Schimanski
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -25,6 +26,7 @@ class BufferView;
 namespace lyx {
 
 namespace frontend { class Painter; }
+class MacroContext;
 
 
 /// Standard Sizes (mode styles)
@@ -72,10 +74,12 @@ public:
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth);
+       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
 
        ///
        MetricsBase base;
+       /// The context to resolve macros
+       MacroContext const & macrocontext;
 };
 
 
@@ -108,38 +112,9 @@ public:
 
 class TextMetricsInfo {};
 
-enum ScreenUpdateStrategy {
-       NoScreenUpdate,
-       SingleParUpdate,
-       FullScreenUpdate,
-       DecorationUpdate
-};
-
-class ViewMetricsInfo
-{
-public:
-       ViewMetricsInfo()
-                       : p1(0), p2(0), y1(0), y2(0),
-                       update_strategy(FullScreenUpdate), size(0)
-               {}
-       ViewMetricsInfo(pit_type p1, pit_type p2, int y1, int y2,
-                       ScreenUpdateStrategy updatestrategy, pit_type size)
-                       : p1(p1), p2(p2), y1(y1), y2(y2),
-                       update_strategy(updatestrategy), size(size)
-               {}
-
-       pit_type p1;
-       pit_type p2;
-       int y1;
-       int y2;
-       ScreenUpdateStrategy update_strategy;
-       pit_type size;
-};
-
-
-// Generic base for temporarily changing things.
-// The original state gets restored when the Changer is destructed.
 
+/// 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: