update support for

LILYPONDPREFIX

diff --git a/ChangeLog b/ChangeLog
index dad18360b4ef089b053b69708bfa20ed47a82035..53f7cea2a39f4f7773f5b952aad46c10c5118fea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * buildscripts/lilypond-profile.sh: update support for
+       LILYPONDPREFIX
+
 2002-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/user/refman.itely (Point and click): Add info
@@ -7,6 +12,8 @@
 
        * lily/accidental-placement.cc (extent_callback): remove function
        (position_accidentals): do nothing if not live.
+       Use accidental-grobs property i.s.o. accidentals, to maintain
+       proper typing. 
 
 2002-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index f78003f8be52a57ee85bbbde22e3c01f079b964d..3a60de2191e0d986d30cf1f5390789b016fafddb 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -11,16 +11,8 @@
 if [ -z "$LILYPONDPREFIX" ]; then
     datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
 else
-    if [ -d "$LILYPONDPREFIX/fonts" ]; then
+    if [ -d "$LILYPONDPREFIX/share" ]; then
        datadir=$LILYPONDPREFIX
-    else
-       eval `cat $LILYPONDPREFIX/VERSION`
-       FULLVERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL"
-       if [ "" != "$MY_PATCH_LEVEL" ]; then
-           FULLVERSION="$FULLVERSION.$MY_PATCH_LEVEL"
-       fi 
-       
-       datadir="$LILYPONDPREFIX/share/lilypond/$FULLVERSION"
     fi
     echo "Setting tree to $datadir"
 fi

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 5cbd46c9f23f179b585591d04c38425f3d242bc4..69feb745fbd153550cb5a66b1fe6a9aa49f1f449 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -56,7 +56,7 @@ Accidental_placement::add_accidental (Grob* me, Grob* a)
 
   int n = p->notename_i_;
 
-  SCM accs = me->get_grob_property ("accidentals");
+  SCM accs = me->get_grob_property ("accidental-grobs");
   SCM key = gh_int2scm (n);
   SCM entry = scm_assq (key, accs);
   if (entry == SCM_BOOL_F)
@@ -70,7 +70,7 @@ Accidental_placement::add_accidental (Grob* me, Grob* a)
 
   accs = scm_assq_set_x (accs,  key, entry);
 
-  me->set_grob_property ("accidentals", accs);
+  me->set_grob_property ("accidental-grobs", accs);
 }
 
 /*
@@ -81,7 +81,7 @@ Accidental_placement::split_accidentals (Grob * accs,
                                         Link_array<Grob> *break_reminder,
                                         Link_array<Grob> *real_acc)
 {
-  for (SCM acs =accs->get_grob_property ("accidentals"); gh_pair_p (acs);
+  for (SCM acs =accs->get_grob_property ("accidental-grobs"); gh_pair_p (acs);
        acs =gh_cdr (acs))
     for (SCM s = gh_cdar (acs); gh_pair_p (s); s = gh_cdr (s))
       {
@@ -241,7 +241,7 @@ Accidental_placement::position_accidentals (Grob * me)
   if (!me->live ())
     return SCM_UNSPECIFIED;
   
-  SCM accs = me->get_grob_property ("accidentals");
+  SCM accs = me->get_grob_property ("accidental-grobs");
 
   /*
     TODO: there is a bug in this code. If two accs are on the same
@@ -455,4 +455,4 @@ Accidental_placement::position_accidentals (Grob * me)
 ADD_INTERFACE(Accidental_placement,
              "accidental-placement-interface",
              "Take care of complex accidental collisions.",
-             "left-padding padding right-padding accidentals alignment-done")
+             "left-padding padding right-padding accidental-grobs alignment-done")

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 9e995156cfb638cdd3f51996cf73a3d82d1a2ee5..09c170db5197bc037913574ed1dc1c02f60e10bc 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -41,8 +41,13 @@ Staff_spacing::next_note_correction (Grob * me,
    */
   if (Grob * a = Note_column::accidentals (g))
     {
-      Interval v= Accidental_placement::get_relevant_accidental_extent
-       (a, col, me);
+      Interval v;
+      if (Accidental_placement::has_interface (a))
+       {
+         v = Accidental_placement::get_relevant_accidental_extent(a, col, me);
+       }
+      else
+       v = a->extent (col, X_AXIS);
       
       max_corr = max_corr >? (- v[LEFT]);
     }

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index f7983f893682ccbabcf1028f1023b4160092081f..9376fc0539b4c38062b2980cca1ecf43823e4bc9 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -58,12 +58,9 @@ the grob to the nearest open space.
 ")
 (grob-property-description 'Y-extent-callback procedure? "see @code{X-extent-callback}.")
 (grob-property-description 'Y-offset-callbacks list? "see @code{X-offset-callbacks}.")
-(grob-property-description 'accidentals list? "Alist with (PITCH
-. OPTION-LIST) entries. OPTION-LIST can contain 'cautionary, 'natural
-and 'tie-break-reminder
 
-FIXME: outdated.
-")
+(grob-property-description 'accidental-grobs list? "Alis with (NOTENAME . GROBLIST) entries")
+(grob-property-description 'accidentals list? "List of alteration numbers.")
 (grob-property-description 'add-stem boolean? "Add stem to porrectus?.")
 (grob-property-description 'adjust-if-on-staffline boolean? "If this grob is on a staff line, adjust its appearance, so that it better fits into the staff.  E.g., if set true on stem grobs, flares of mensural flags will always be aligned with the staff lines, regardless if the associated note head is printed on a staff line or inbetween.")
 (grob-property-description 'after-line-breaking-callback procedure? "Procedure taking a grob as argument.