de.po

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 60a004573e2d3d61c1c4bc3d4fe71d077f32a8b0..0e90876f19fa898b872675ed0b6964d9354d74d3 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -19,6 +19,7 @@
 
 #include "mathed/MathSupport.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "support/docstring.h"
@@ -94,6 +95,19 @@ Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
 }
 
 
+int MetricsBase::inPixels(Length const & len) const
+{
+       FontInfo fi = font;
+       if (len.unit() == Length::MU)
+               // mu is 1/18th of an em in the math symbol font
+               fi.setFamily(SYMBOL_FAMILY);
+       else
+               // Math style is only taken into account in the case of mu
+               fi.setStyle(LM_ST_TEXT);
+       return len.inPixels(textwidth, theFontMetrics(fi).em());
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // MetricsInfo
@@ -174,6 +188,9 @@ Changer MetricsBase::changeScript()
        case LM_ST_SCRIPT:
        case LM_ST_SCRIPTSCRIPT:
                return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+       case LM_ST_INHERIT:
+       case LM_ST_IGNORE:
+               return Changer();
        }
        //remove Warning
        return Changer();
@@ -190,6 +207,9 @@ Changer MetricsBase::changeFrac()
        case LM_ST_SCRIPT:
        case LM_ST_SCRIPTSCRIPT:
                return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+       case LM_ST_INHERIT:
+       case LM_ST_IGNORE:
+               return Changer();
        }
        //remove Warning
        return Changer();