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 6d50d06d51031b3549bb8fe722af25c060e9649e..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,
@@ -66,7 +65,7 @@ Modified_font_metric::count () const
 }
 
 Offset
-Modified_font_metric::attachment_point (std::string s) const
+Modified_font_metric::attachment_point (string s) const
 {
   Offset o = orig_->attachment_point (s);
   return o * magnification_;
@@ -80,7 +79,7 @@ Modified_font_metric::get_indexed_wxwy (vsize k) const
 }
 
 vsize
-Modified_font_metric::name_to_index (std::string s) const
+Modified_font_metric::name_to_index (string s) const
 {
   return orig_->name_to_index (s);
 }
@@ -104,7 +103,7 @@ Modified_font_metric::derived_mark () const
 
 /* TODO: put this klutchness behind ly:option switch.  */
 Box
-Modified_font_metric::tex_kludge (std::string text) const
+Modified_font_metric::tex_kludge (string text) const
 {
   Interval ydims;
   Real w = 0;
@@ -159,7 +158,7 @@ Modified_font_metric::tex_kludge (std::string text) const
 }
 
 Stencil
-Modified_font_metric::text_stencil (std::string text) const
+Modified_font_metric::text_stencil (string text) const
 {
   Box b;
   if (Pango_font *pf = dynamic_cast<Pango_font *> (orig_))
@@ -177,18 +176,21 @@ Modified_font_metric::text_stencil (std::string text) const
 }
 
 Box
-Modified_font_metric::text_dimension (std::string text) const
+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;
     }
@@ -223,7 +225,7 @@ Modified_font_metric::sub_fonts () const
   return orig_->sub_fonts ();
 }
 
-std::string
+string
 Modified_font_metric::font_name () const
 {
   return original_font ()->font_name ();