Merge branch 'origin'

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

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index e0fb13044d14d239858aa83ccd0fb0e4aa9dae84..ad43d756bc38f4dd74846abc50707dbcdb293f9d 100644 (file)
--- 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 <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include <cctype>
 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);