remove TEXMF from variables.

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 31274c804ad536876dcb77c2ba814017f0d4ec6b..a45a3c84b873699ec3e1056750e4c3c379cd499c 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,17 +1,17 @@
-/*   
+/*
   text-item.cc -- implement Text_interface
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "text-item.hh"
 
 #include <math.h>
 
-#include "main.hh" 
+#include "main.hh"
 #include "config.hh"
 #include "pango-font.hh"
 #include "warn.hh"
@@ -19,16 +19,15 @@
 #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);
-  
+
   SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
                   __FUNCTION__, "Layout definition");
   SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
@@ -36,67 +35,45 @@ 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)
+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);
       SCM args = scm_cdr (markup);
       if (!markup_p (markup))
        programming_error ("Markup head has no markup signature.");
-      
+
       return scm_apply_2 (func, layout_smob, props, args);
     }
   else
     {
       programming_error ("Is not a markup: ");
-      scm_display (markup, scm_current_error_port());
+      scm_display (markup, scm_current_error_port ());
       assert (false);
       Box b;
-      b[X_AXIS].set_empty();
-      b[Y_AXIS].set_empty();
-      
-      Stencil s(b, SCM_EOL);
-      return s.smobbed_copy();
+      b[X_AXIS].set_empty ();
+      b[Y_AXIS].set_empty ();
+
+      Stencil s (b, SCM_EOL);
+      return s.smobbed_copy ();
     }
 }
 
-MAKE_SCHEME_CALLBACK (Text_interface,print,1);
+MAKE_SCHEME_CALLBACK (Text_interface, print, 1);
 SCM
 Text_interface::print (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  
+
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);
   return interpret_markup (me->get_layout ()->self_scm (), chain, t);
@@ -113,10 +90,7 @@ Text_interface::markup_p (SCM x)
                                      ly_symbol2scm ("markup-signature"))));
 }
 
-ADD_INTERFACE (Text_interface,"text-interface",
+ADD_INTERFACE (Text_interface, "text-interface",
               "A scheme markup text, see @usermanref{Text-markup}.",
               "text baseline-skip word-space");
 
-
-
-