* lily/text-item.cc (interpret_string): insert encoding setting

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index eeaf40c30ab1cf982209b97df18f22dee5b89cf8..10fdc67ec0fa7783d9568d811bf2da7fb8a653a0 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,29 +3,110 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
  */
+#include <math.h>
 
+#include "warn.hh"
+#include "grob.hh"
 #include "text-item.hh"
-#include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
+#include "virtual-font-metric.hh"
+#include "output-def.hh"
+#include "scaled-font-metric.hh"
+#include "ly-module.hh"
 
-Molecule*
-Text_item::do_brew_molecule_p () const
+MAKE_SCHEME_CALLBACK (Text_item, interpret_string, 4)
+SCM
+Text_item::interpret_string (SCM paper, SCM props, SCM encoding, SCM markup)
 {
-  SCM style = get_elt_property (style_scm_sym);
-  String st = (style == SCM_BOOL_F) ? "" : ly_scm2string (gh_cdr (style));
+  Output_def *pap = unsmob_output_def (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);
+  if (!ly_c_symbol_p (encoding))
+    {
+      SCM var = ly_module_lookup (pap->scope_,
+                                 ly_symbol2scm ("inputencoding"));
+      if (var != SCM_BOOL_F) 
+       encoding = scm_variable_ref (var);
+      
+    }
   
-  Molecule a= paper_l ()->lookup_l(0)->text (st, text_str_, paper_l ());
+  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))
+    {
+      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 ();
+}
+
+
+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);
+      if (!markup_p (markup))
+       programming_error ("Markup head has no markup signature.");
+      
+      return scm_apply_2 (func, paper, props, args);
+    }
+  return SCM_EOL;
+}
 
-  return new Molecule (a);
+MAKE_SCHEME_CALLBACK (Text_item,print,1);
+SCM
+Text_item::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);
 }
 
-void
-Text_item::do_print () const
+
+/*
+  Ugh. Duplicated from Scheme.
+ */
+bool
+Text_item::markup_p (SCM x)
 {
-  DEBUG_OUT <<  "text= " << text_str_;
+  return
+    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 @usermanref{Text-markup}.",
+  "text baseline-skip word-space");
+
+
+
+