* lily/include/scm-hash.hh (class Scheme_hash_table): idem.

[lilypond.git] / lily / script-engraver.cc

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 74df559d3bd7145f3e94c7f7b205df8c40b153e5..3defd89c8d298c77dbc051320748097393f329d2 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -82,12 +82,14 @@ Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
                              int index)
 {
   SCM alist = tg->get_property ("scriptDefinitions");
-  SCM art = scm_assoc (event->get_mus_property ("articulation-type"), alist);
+  SCM art_type= event->get_mus_property ("articulation-type");
+  SCM art = scm_assoc (art_type, alist);
 
   if (art == SCM_BOOL_F)
     {
-      String a = ly_scm2string (event->get_mus_property ("articulation-type"));
-      event->origin ()->warning (_f ("Don't know how to interpret articulation `%s'", a.to_str0 ()));
+      event->origin ()->warning (_("Don't know how to interpret articulation:"));
+      event->origin ()->warning (_("Scheme encoding: "));
+      scm_write (art_type, scm_current_error_port ());
       return 0 ;
     }
 
@@ -97,7 +99,7 @@ Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
   *descr = art;  
 
   SCM force_dir = event->get_mus_property ("direction");
-  if (ly_dir_p (force_dir) && to_dir (force_dir))
+  if (is_direction (force_dir) && to_dir (force_dir))
     p->set_grob_property ("direction", force_dir);
 
   copy_property (p, ly_symbol2scm ("script-molecule"), art);