X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=0edbb7b6cf19d092f03ca5bb802c996565d9c434;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=a8fbc49fcdb51d3b446e12eca0848b1541ea9f19;hpb=b211365d1ec87e80d94913fcc71de72491410ed6;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index a8fbc49fcd..0edbb7b6cf 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -1,9 +1,20 @@
 /*
-  script-interface.cc -- implement Script_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "script-interface.hh"
@@ -29,9 +40,9 @@ 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
     assert (false);
@@ -48,17 +59,33 @@ Script_interface::calc_positioning_done (SCM smob)
     {
       Grob *stem = Note_column::get_stem (par);
       if (stem && Stem::first_head (stem))
-	me->set_parent (Stem::first_head (stem), X_AXIS);
+        me->set_parent (Stem::first_head (stem), X_AXIS);
     }
   return SCM_BOOL_T;
 }
 
+Direction
+Script_interface::get_direction (Grob *me)
+{
+  Direction relative_dir = Direction (1);
+  SCM reldir = me->get_property ("side-relative-direction");
+  if (is_direction (reldir))
+    relative_dir = to_dir (reldir);
+
+  SCM other_elt = me->get_object ("direction-source");
+  Grob *e = unsmob_grob (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 = unsmob_grob (smob);
-  Direction d = Side_position_interface::get_direction (me);
+  Direction d = Script_interface::get_direction (me);
 
   if (!d)
     {
@@ -84,7 +111,7 @@ Script_interface::calc_cross_staff (SCM smob)
   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")))
+          || avoid_slur == ly_symbol2scm ("around")))
     return SCM_BOOL_T;
 
   return SCM_BOOL_F;
@@ -108,28 +135,29 @@ struct Text_script
 };
 
 ADD_INTERFACE (Text_script,
-	       "An object that is put above or below a note.",
+               "An object that is put above or below a note.",
 
-	       /* properties */
-	       "add-stem-support "
-	       "avoid-slur "
-	       "script-priority "
-	       "slur "
-	       );
+               /* properties */
+               "avoid-slur "
+               "script-priority "
+               "slur "
+              );
 
 /*
   Hmm. Where should we put add-stem-support ?
 */
 ADD_INTERFACE (Script_interface,
-	       "An object that is put above or below a note.",
-
-	       /* properties */
-	       "add-stem-support "
-	       "avoid-slur "
-	       "positioning-done "
-	       "script-priority "
-	       "script-stencil "
-	       "slur "
-	       "slur-padding "
-	       );
+               "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 "
+              );