* lily/paper-outputter.cc (output_stencil): dump font definitions

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index c767c2d5ccdf5928846aa9f9d7755c9549563969..782cd4d1c1457e2eeecea74e0ecf6cb69ed54e1b 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -16,35 +16,47 @@
 #include "paper-def.hh"
 #include "scaled-font-metric.hh"
 
-MAKE_SCHEME_CALLBACK (Text_item, interpret_markup, 3)
+MAKE_SCHEME_CALLBACK (Text_item, interpret_string, 4)
 SCM
-Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
+Text_item::interpret_string (SCM paper, SCM props, SCM encoding, SCM markup)
 {
-  if (ly_string_p (markup))
+  Paper_def *pap = unsmob_paper (paper);
+  
+  SCM_ASSERT_TYPE(pap, paper, SCM_ARG1, __FUNCTION__, "Paper definition");
+  SCM_ASSERT_TYPE(ly_c_string_p (markup), markup, SCM_ARG3, __FUNCTION__, "string");
+  SCM_ASSERT_TYPE(encoding == SCM_EOL
+                 || ly_c_symbol_p (encoding), encoding, SCM_ARG2, __FUNCTION__, "symbol");
+  
+  String str = ly_scm2string (markup);
+  Font_metric *fm = select_encoded_font (pap, props, encoding);
+
+  SCM lst = SCM_EOL;      
+  Box b;
+  if (Modified_font_metric* mf = dynamic_cast<Modified_font_metric*> (fm))
     {
-      String str = ly_scm2string (markup);
-      
-      Paper_def *pap = unsmob_paper (paper);
-      Font_metric *fm = select_font (pap, props);
-      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);
+      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.");
-       }
-      
-      return Stencil (b, lst).smobbed_copy ();
+      b = mf->text_dimension (str);
+    }
+  else
+    {
+      /* ARGH. */
+      programming_error ("Must have Modified_font_metric for text.");
     }
-  else if (ly_pair_p (markup))
+      
+  return Stencil (b, lst).smobbed_copy ();
+}
+
+
+MAKE_SCHEME_CALLBACK (Text_item, interpret_markup, 3)
+SCM
+Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
+{
+  if (ly_c_string_p (markup))
+    return interpret_string (paper, props, SCM_EOL, markup);
+  else if (ly_c_pair_p (markup))
     {
       SCM func = ly_car (markup);
       SCM args = ly_cdr (markup);
@@ -60,7 +72,7 @@ MAKE_SCHEME_CALLBACK (Text_item,print,1);
 SCM
 Text_item::print (SCM grob)
 {
-  Grob * me = unsmob_grob (grob);
+  Grob *me = unsmob_grob (grob);
   
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);
@@ -75,8 +87,8 @@ bool
 Text_item::markup_p (SCM x)
 {
   return
-    ly_string_p (x) ||
-    (ly_pair_p (x)
+    ly_c_string_p (x) ||
+    (ly_c_pair_p (x)
      && SCM_BOOL_F != scm_object_property (ly_car (x), ly_symbol2scm ("markup-signature")));
 }