-/*
- script-interface.cc -- implement Script_interface
-
+/*
+ script-interface.cc -- implement Script_interface
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "script-interface.hh"
#include "directional-element-interface.hh"
+#include "item.hh"
#include "warn.hh"
-#include "script-interface.hh"
#include "font-interface.hh"
#include "side-position-interface.hh"
#include "output-def.hh"
-#include "item.hh"
-#include "stencil.hh"
#include "lookup.hh"
#include "stem.hh"
#include "note-column.hh"
SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
: name_entry);
return Font_interface::get_default_font (me)
- ->find_by_name ("scripts-" + ly_scm2string (str));
+ ->find_by_name ("scripts." + ly_scm2string (str));
}
else if (key == ly_symbol2scm ("accordion"))
return Lookup::accordion (scm_cdr (s), 1.0,
return Stencil ();
}
-MAKE_SCHEME_CALLBACK (Script_interface, before_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Script_interface, calc_direction, 1);
SCM
-Script_interface::before_line_breaking (SCM smob)
+Script_interface::calc_direction (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
Direction d = Side_position_interface::get_direction (me);
if (!d)
{
- /* FIXME: This should never happen: `arbitrary' directions. */
- programming_error ("Script direction not yet known!");
+ me->programming_error ("script direction not yet known");
d = DOWN;
}
- set_grob_direction (me, d);
-
if (Grob *par = me->get_parent (X_AXIS))
{
Grob *stem = Note_column::get_stem (par);
if (stem && Stem::first_head (stem))
me->set_parent (Stem::first_head (stem), X_AXIS);
}
- return SCM_UNSPECIFIED;
+
+ return scm_from_int (d);
}
MAKE_SCHEME_CALLBACK (Script_interface, print, 1);
SCM
Script_interface::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
+
+ Direction dir = get_grob_direction (me);
- Direction dir = Side_position_interface::get_direction (me);
- if (!dir)
- {
- programming_error ("Script direction not known, but stencil wanted.");
- dir = DOWN;
- }
return get_stencil (me, dir).smobbed_copy ();
}
struct Text_script
{
- static bool has_interface (Grob*);
+ DECLARE_GROB_INTERFACE();
};
-ADD_INTERFACE (Text_script,"text-script-interface",
- "An object that is put above or below a note",
- "add-stem-support slur script-priority inside-slur");
+ADD_INTERFACE (Text_script,
+ "An object that is put above or below a note",
+ /* properties */
+ "add-stem-support "
+ "avoid-slur "
+ "script-priority "
+ "slur "
+ );
/*
Hmm. Where should we put add-stem-support ?
- */
-ADD_INTERFACE (Script_interface, "script-interface",
- "An object that is put above or below a note",
- "add-stem-support slur script-priority script-stencil inside-slur");
+*/
+ADD_INTERFACE (Script_interface,
+ "An object that is put above or below a note",
+ "add-stem-support "
+ "avoid-slur "
+ "script-priority "
+ "script-stencil "
+ "slur "
+ "slur-padding "
+ );