X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodified-font-metric.cc;h=114b8e38248e4236f69a8b461285aa016c52f62c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e0fb13044d14d239858aa83ccd0fb0e4aa9dae84;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index e0fb13044d..114b8e3824 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ #include using namespace std; @@ -14,6 +14,7 @@ using namespace std; #include "warn.hh" #include "stencil.hh" #include "main.hh" +#include "program-option.hh" Modified_font_metric::Modified_font_metric (Font_metric *fm, Real magnification) @@ -178,10 +179,10 @@ Modified_font_metric::text_stencil (string text) const Box Modified_font_metric::text_dimension (string text) const { - SCM stext = scm_makfrom0str (text.c_str ()); + SCM stext = ly_string2scm (text); Box b; - if (output_backend_global == "tex") + if (get_output_backend_name () == "tex") { b = lookup_tex_text_dimension (orig_, stext);