X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=8778f5c6d316b8dbda9b4157aa81906260ac1fcf;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f23cc9c21f950aa9b133abb803202a95c1b3e138;hpb=afc519eae4c31fe515371ec68b077d6532a7e5cf;p=lilypond.git diff --git a/lily/script-interface.cc b/lily/script-interface.cc index f23cc9c21f..8778f5c6d3 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -1,15 +1,27 @@ -/* - script-interface.cc -- implement Script_interface - - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1999--2015 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#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" @@ -28,43 +40,81 @@ Script_interface::get_stencil (Grob *me, Direction d) { SCM name_entry = scm_cdr (s); SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d) - : name_entry); + : 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, - Font_interface::get_default_font (me)); else assert (false); return Stencil (); } -MAKE_SCHEME_CALLBACK (Script_interface, before_line_breaking, 1); +MAKE_SCHEME_CALLBACK (Script_interface, calc_positioning_done, 1); SCM -Script_interface::before_line_breaking (SCM smob) +Script_interface::calc_positioning_done (SCM smob) +{ + Grob *me = Grob::unsmob (smob); + 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_BOOL_T; +} + +Direction +Script_interface::get_direction (Grob *me) { - Grob *me = unsmob_grob (smob); + Direction relative_dir = Direction (1); + SCM reldir = me->get_property ("side-relative-direction"); + if (is_direction (reldir)) + relative_dir = to_dir (reldir); - Direction d = Side_position_interface::get_direction (me); + SCM other_elt = me->get_object ("direction-source"); + Grob *e = Grob::unsmob (other_elt); + if (e) + return (Direction) (relative_dir * get_grob_direction (e)); + + return CENTER; +} + +MAKE_SCHEME_CALLBACK (Script_interface, calc_direction, 1); +SCM +Script_interface::calc_direction (SCM smob) +{ + Grob *me = Grob::unsmob (smob); + Direction d = Script_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); + (void) me->get_property ("positioning-done"); + return scm_from_int (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; +MAKE_SCHEME_CALLBACK (Script_interface, calc_cross_staff, 1); +SCM +Script_interface::calc_cross_staff (SCM smob) +{ + Grob *me = Grob::unsmob (smob); + Grob *stem = Note_column::get_stem (me->get_parent (X_AXIS)); + + if (stem && to_boolean (stem->get_property ("cross-staff"))) + return SCM_BOOL_T; + + Grob *slur = Grob::unsmob (me->get_object ("slur")); + SCM avoid_slur = me->get_property ("avoid-slur"); + if (slur && to_boolean (slur->get_property ("cross-staff")) + && (avoid_slur == ly_symbol2scm ("outside") + || avoid_slur == ly_symbol2scm ("around"))) + return SCM_BOOL_T; + + return SCM_BOOL_F; } MAKE_SCHEME_CALLBACK (Script_interface, print, 1); @@ -72,31 +122,42 @@ MAKE_SCHEME_CALLBACK (Script_interface, print, 1); SCM Script_interface::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (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 */ + "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-padding slur script-priority script-stencil inside-slur"); +*/ +ADD_INTERFACE (Script_interface, + "An object that is put above or below a note.", + + /* properties */ + "avoid-slur " + "direction-source " + "positioning-done " + "script-priority " + "script-stencil " + "side-relative-direction " + "slur " + "slur-padding " + "toward-stem-shift " + );