* 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 66c1b6d83a26ef3f7755a6a946aefd24b1c2d4b2..1a01eced0b90a62c1e442c40f36c35249a0c1439 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,5 +1,5 @@
 /*   
-  text-item.cc -- implement Text_item
+  text-item.cc -- implement Text_interface
 
   source file of the GNU LilyPond music typesetter
   
@@ -7,105 +7,92 @@
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "text-item.hh"
+
 #include <math.h>
 
+#include "main.hh" 
+#include "config.hh"
+#include "pango-font.hh"
 #include "warn.hh"
 #include "grob.hh"
-#include "text-item.hh"
 #include "font-interface.hh"
-#include "virtual-font-metric.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
-#include "ly-module.hh"
 
-MAKE_SCHEME_CALLBACK (Text_item, interpret_string, 4)
+
+MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3)
 SCM
-Text_item::interpret_string (SCM paper_smob,
-                            SCM props, SCM input_encoding, SCM markup)
+Text_interface::interpret_string (SCM layout_smob,
+                                 SCM props,
+                                 SCM markup)
 {
-  Output_def *paper = unsmob_output_def (paper_smob);
+  Output_def *layout = unsmob_output_def (layout_smob);
   
-  SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
-                  __FUNCTION__, "Paper definition");
+  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
+                  __FUNCTION__, "Layout definition");
   SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
                   __FUNCTION__, "string");
-  SCM_ASSERT_TYPE (input_encoding == SCM_EOL || ly_c_symbol_p (input_encoding),
-                  input_encoding, SCM_ARG2, __FUNCTION__, "symbol");
-  
+
   String str = ly_scm2string (markup);
-  if (!ly_c_symbol_p (input_encoding))
-    {
-      SCM enc = paper->lookup_variable (ly_symbol2scm ("inputencoding"));
-      if (scm_is_string (enc))
-       input_encoding = scm_string_to_symbol (enc);
-      else if (ly_c_symbol_p (enc))
-       input_encoding = enc;
-    }
-  
-  Font_metric *fm = select_encoded_font (paper, props, input_encoding);
 
-  SCM lst = SCM_EOL;      
-  Box b;
-  if (Modified_font_metric* mf = dynamic_cast<Modified_font_metric*> (fm))
-    {
-      lst = scm_list_3 (ly_symbol2scm ("text"),
-                       mf->self_scm (),
-                       markup);
-       
-      b = mf->text_dimension (str);
-    }
-  else
-    {
-      /* ARGH. */
-      programming_error ("Must have Modified_font_metric for text.");
-      scm_display (fm->description_, scm_current_error_port ());
-    }
-      
-  return Stencil (b, lst).smobbed_copy ();
+  Font_metric *fm = select_encoded_font (layout, props);
+  return fm->text_stencil (str).smobbed_copy ();
 }
 
 
-MAKE_SCHEME_CALLBACK (Text_item, interpret_markup, 3)
+MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3)
 SCM
-Text_item::interpret_markup (SCM paper_smob, SCM props, SCM markup)
+Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
 {
   if (scm_is_string (markup))
-    return interpret_string (paper_smob, props, SCM_EOL, markup);
-  else if (ly_c_pair_p (markup))
+    return interpret_string (layout_smob, props, markup);
+  else if (scm_is_pair (markup))
     {
-      SCM func = ly_car (markup);
-      SCM args = ly_cdr (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, paper_smob, props, args);
+      return scm_apply_2 (func, layout_smob, props, args);
+    }
+  else
+    {
+      programming_error ("Is not a markup: ");
+      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();
     }
-  return SCM_EOL;
 }
 
-MAKE_SCHEME_CALLBACK (Text_item,print,1);
+MAKE_SCHEME_CALLBACK (Text_interface,print,1);
 SCM
-Text_item::print (SCM grob)
+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_paper ()->self_scm (), chain, t);
+  return interpret_markup (me->get_layout ()->self_scm (), chain, t);
 }
 
 /* Ugh. Duplicated from Scheme.  */
 bool
-Text_item::markup_p (SCM x)
+Text_interface::markup_p (SCM x)
 {
   return (scm_is_string (x)
-         || (ly_c_pair_p (x)
+         || (scm_is_pair (x)
              && SCM_BOOL_F
-             != scm_object_property (ly_car (x),
+             != scm_object_property (scm_car (x),
                                      ly_symbol2scm ("markup-signature"))));
 }
 
-ADD_INTERFACE (Text_item,"text-interface",
+ADD_INTERFACE (Text_interface,"text-interface",
               "A scheme markup text, see @usermanref{Text-markup}.",
               "text baseline-skip word-space");