Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / modified-font-metric.cc

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 8e215863a6109a600344a11ae9c181491b2f5a39..e0fb13044d14d239858aa83ccd0fb0e4aa9dae84 100644 (file)
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -13,7 +13,6 @@ using namespace std;
 #include "text-metrics.hh"
 #include "warn.hh"
 #include "stencil.hh"
-#include "lookup.hh"
 #include "main.hh"
 
 Modified_font_metric::Modified_font_metric (Font_metric *fm,
@@ -180,15 +179,18 @@ Box
 Modified_font_metric::text_dimension (string text) const
 {
   SCM stext = scm_makfrom0str (text.c_str ());
-  Box b = lookup_tex_text_dimension (orig_, stext);
-  if (!b[Y_AXIS].is_empty ())
-    {
-      b.scale (magnification_);
-      return b;
-    }
-
+  
+  Box b;
   if (output_backend_global == "tex")
     {
+      b = lookup_tex_text_dimension (orig_, stext);
+
+      if (!b[Y_AXIS].is_empty ())
+       {
+         b.scale (magnification_);
+         return b;
+       }
+
       b = tex_kludge (text);
       return b;
     }