new file, move from

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 1c4e596bf1f091927548ca1e0df5b2cc1255043f..b03027b965ea9304bdc755dc5468d2aa8eb539db 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -13,55 +13,69 @@
 #include "text-item.hh"
 #include "font-interface.hh"
 #include "virtual-font-metric.hh"
-#include "paper-def.hh"
+#include "output-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 (gh_string_p (markup))
-    {
-      Paper_def *pap = unsmob_paper (paper);
-      Font_metric *fm = select_font (pap, props);
+  Output_def *pap = unsmob_output_def (paper);
   
-      SCM list = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED);
-      
-      if (dynamic_cast<Virtual_font_metric*> (fm))
-       {
-         /*
-           ARGH.
-         */
-         programming_error ("Can't use virtual font for text.");
-       }
-      else
-       list = fontify_atom (fm, list);
+  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);
 
-      Box b = fm->text_dimension (ly_scm2string (markup));
-      return Molecule (b, list).smobbed_copy();
+  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 if (gh_pair_p (markup))
+  else
+    {
+      /* ARGH. */
+      programming_error ("Must have Modified_font_metric for text.");
+    }
+      
+  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 = gh_car (markup);
-      SCM args = gh_cdr (markup);
+      SCM func = ly_car (markup);
+      SCM args = ly_cdr (markup);
       if (!markup_p (markup))
        programming_error ("Markup head has no markup signature.");
       
       return scm_apply_2 (func, paper, props, args);
     }
-  else
-    {
-      return SCM_EOL;
-    }
+  return SCM_EOL;
 }
 
-MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Text_item,print,1);
 SCM
-Text_item::brew_molecule (SCM grob)
+Text_item::print (SCM grob)
 {
-  Grob * me = unsmob_grob (grob);
+  Grob *me = unsmob_grob (grob);
   
-  SCM t = me->get_grob_property ("text");
-  SCM chain = Font_interface::font_alist_chain (me);
+  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);
 }
 
@@ -73,13 +87,13 @@ bool
 Text_item::markup_p (SCM x)
 {
   return
-    gh_string_p (x) ||
-    (gh_pair_p (x)
-     && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature")));
+    ly_c_string_p (x) ||
+    (ly_c_pair_p (x)
+     && SCM_BOOL_F != scm_object_property (ly_car (x), ly_symbol2scm ("markup-signature")));
 }
 
 ADD_INTERFACE (Text_item,"text-interface",
-  "A scheme markup text, see @ref{Markup functions}.",
+  "A scheme markup text, see @usermanref{Text-markup}.",
   "text baseline-skip word-space");