From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 19 Jul 2006 13:36:56 +0000 (+0000)
Subject: (all-internal-grob-properties):
X-Git-Tag: release/2.10.0-2~450
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=051572146f6a056b6297d67acc0645764eb26e33;hp=b742b25b80d6be8f434c622f379c235fa638e274;p=lilypond.git

(all-internal-grob-properties):
remove delta-pitch. Use delta-position everywhere.
---

diff --git a/ChangeLog b/ChangeLog
index 6151491b8e..9745c5222a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-19  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* scm/define-grob-properties.scm (all-internal-grob-properties):
+	remove delta-pitch. Use delta-position everywhere.
+
 	* scm/output-lib.scm (fall::print): use new order.
 
 	* scm/output-ps.scm (path): reorder arguments.
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 32d7949faf..f357cd2611 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -69,10 +69,9 @@ which scares away people.
 Falls and doits can be added to notes
 
 @lilypond[fragment,ragged-right,relative=2]
-  \override Score.SpacingSpanner #'shortest-duration-space = #3.0
-  c4-\bendAfter #+5
-  c4-\bendAfter #-3
-}
+\override Score.SpacingSpanner #'shortest-duration-space = #3.0
+c4-\bendAfter #+5
+c4-\bendAfter #-3
 @end lilypond
 
 This feature was sponsored by Anthony Youngman and Paul Scott.
diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index ff1691ef64..957106d4d7 100644
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -179,13 +179,13 @@ compute_delta_pitches (vector<Grob_info> primitives)
       if (prev_primitive)
 	{
 	  delta_pitch = pitch - prev_pitch;
-	  prev_primitive->set_property ("delta-pitch",
+	  prev_primitive->set_property ("delta-position",
 					scm_from_int (delta_pitch));
 	}
       prev_pitch = pitch;
       prev_primitive = primitive;
     }
-  primitive->set_property ("delta-pitch", scm_from_int (0));
+  primitive->set_property ("delta-position", scm_from_int (0));
 }
 
 void
diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index a36f1b1723..c327da0b55 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -110,7 +110,7 @@ internal_brew_primitive (Grob *me)
 
   if (primitive & MLP_FLEXA)
     {
-      delta_pitch = robust_scm2int (me->get_property ("delta-pitch"),
+      delta_pitch = robust_scm2int (me->get_property ("delta-position"),
 				    0);
       width
 	= robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
@@ -221,5 +221,12 @@ Mensural_ligature::print (SCM)
 
 ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
 	       "A mensural ligature",
-	       "delta-pitch flexa-width head-width join-right-amount " // "add-join "
-	       "primitive thickness");
+
+	       "delta-position "
+	       "flexa-width "
+	       "head-width "
+	       "join-right-amount "
+	       "primitive "
+	       "thickness"
+	       );
+
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 22c42c1cd2..6bfd470c09 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -205,13 +205,13 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
       int delta_pitch = 0;
       if (prev_primitive) /* urgh, need prev_primitive only here */
 	{
-	  SCM delta_pitch_scm = prev_primitive->get_property ("delta-pitch");
+	  SCM delta_pitch_scm = prev_primitive->get_property ("delta-position");
 	  if (delta_pitch_scm != SCM_EOL)
 	    delta_pitch = scm_to_int (delta_pitch_scm);
 	  else
 	    {
 	      primitive->programming_error ("Vaticana_ligature:"
-					    "delta-pitch undefined -> "
+					    "delta-position undefined -> "
 					    "ignoring grob");
 	      continue;
 	    }
@@ -368,13 +368,13 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
       Item *primitive = dynamic_cast<Item *> (primitives[i].grob ());
 
       int delta_pitch;
-      SCM delta_pitch_scm = primitive->get_property ("delta-pitch");
+      SCM delta_pitch_scm = primitive->get_property ("delta-position");
       if (delta_pitch_scm != SCM_EOL)
 	delta_pitch = scm_to_int (delta_pitch_scm);
       else
 	{
 	  primitive->programming_error ("Vaticana_ligature:"
-					"delta-pitch undefined -> "
+					"delta-position undefined -> "
 					"ignoring grob");
 	  continue;
 	}
diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 85e88b51ed..6c0beaf387 100644
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -210,7 +210,7 @@ vaticana_brew_primitive (Grob *me)
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
-  SCM delta_pitch_scm = me->get_property ("delta-pitch");
+  SCM delta_pitch_scm = me->get_property ("delta-position");
   int delta_pitch;
   if (delta_pitch_scm != SCM_EOL)
     delta_pitch = scm_to_int (delta_pitch_scm);
@@ -303,6 +303,6 @@ ADD_INTERFACE (Vaticana_ligature, "vaticana-ligature-interface",
 	       "add-cauda "
 	       "add-stem "
 	       "add-join "
-	       "delta-pitch "
+	       "delta-position "
 	       "x-offset "
 	       );
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 4bde5b1c3c..9e7f8e3989 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -589,7 +589,7 @@ debugging")
 ;;; the next note could be seen
      (join-right-amount ,number? "")
 
-     (delta-pitch ,number? "the interval between this and the next note, or, more precisely, their vertical distance; this is used in ligatures for calculation of the height of vertical joins flexa shapes")
+     (delta-position ,number? "vertical position difference")
      (head-width ,ly:dimension? "width of this ligature head")
 
      ;; [TODO: change this]