* scm/output-gnome.scm (utf8-string): New function.

[lilypond.git] / lily / text-item.cc

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 31274c804ad536876dcb77c2ba814017f0d4ec6b..1a01eced0b90a62c1e442c40f36c35249a0c1439 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -19,13 +19,13 @@
 #include "font-interface.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
-#include "ly-module.hh"
 
 
-MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 4)
+MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3)
 SCM
 Text_interface::interpret_string (SCM layout_smob,
-                                 SCM props, SCM input_encoding, SCM markup)
+                                 SCM props,
+                                 SCM markup)
 {
   Output_def *layout = unsmob_output_def (layout_smob);
   
@@ -36,38 +36,17 @@ Text_interface::interpret_string (SCM layout_smob,
 
   String str = ly_scm2string (markup);
 
-#if HAVE_PANGO_FT2
-  if (output_format_global != "tex"
-      && output_format_global != "texstr")
-    {
-      Font_metric *fm = select_pango_font (layout, props);
-      return fm->text_stencil (str).smobbed_copy ();
-    }
-#endif
-  
-  SCM_ASSERT_TYPE (input_encoding == SCM_EOL || scm_is_symbol (input_encoding),
-                  input_encoding, SCM_ARG2, __FUNCTION__, "symbol");
-
-  if (!scm_is_symbol (input_encoding))
-    {
-      SCM enc = layout->lookup_variable (ly_symbol2scm ("inputencoding"));
-      if (scm_is_string (enc))
-       input_encoding = scm_string_to_symbol (enc);
-      else if (scm_is_symbol (enc))
-       input_encoding = enc;
-    }
-  
-  Font_metric *fm = select_encoded_font (layout, props, input_encoding);
-
-  return fm->text_stencil (str).smobbed_copy();
+  Font_metric *fm = select_encoded_font (layout, props);
+  return fm->text_stencil (str).smobbed_copy ();
 }
 
+
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3)
 SCM
 Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
 {
   if (scm_is_string (markup))
-    return interpret_string (layout_smob, props, SCM_EOL, markup);
+    return interpret_string (layout_smob, props, markup);
   else if (scm_is_pair (markup))
     {
       SCM func = scm_car (markup);