From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 12 Sep 2004 00:34:23 +0000 (+0000)
Subject: (all-grob-descriptions): fix order of
X-Git-Tag: release/2.3.17~58
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=906998d94fb34f6ba5f01d10073e4d5c5980e623;p=lilypond.git

(all-grob-descriptions): fix order of
key-cancellation.

This fixes: morgenlied.ly and input/regression/beam-concave.ly
---

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 6d1047ac05..3cef50cb1a 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -552,7 +552,7 @@ set_end_points (Grob *me)
     {
       Offset o = b.control_[i]
 	- Offset (me->relative_coordinate (common[X_AXIS], X_AXIS),
-		  me->relative_coordinate (common[Y_AXIS], Y_AXIS));
+ 		  me->relative_coordinate (common[Y_AXIS], Y_AXIS));
       controls = scm_cons (ly_offset2scm (o), controls);
     }
   me->set_property ("control-points", controls);
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 8f46f38bf5..ada043ee3e 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -131,17 +131,10 @@ middle C.")
 accidentals. Choices are @code{smaller} or
 @code{parentheses}.")
      (cautionary ,boolean? "Is this a cautionary accidental?")
-     (concaveness-gap ,ly:dimension? "A beam is printed horizontally
-if its concaveness-gap is larger than this value.  The concaveness-gap
-is the distance of an inner note head to the line between two outer
-note heads. ")
-     (concaveness-threshold ,number? "A beam is printed horizontally
-if its concaveness is bigger than this threshold.
-
-Concaveness is calculated as the sum of the vertical distances of
-inner note heads that fall outside the interval of the two outer
-note heads, to the vertically nearest outer note head, divided by the
-square of the inner notes involved.")
+     (concaveness ,number? "A beam is concave when its inner stems are
+closer to the beam than the two outside stems. This number is a
+measure of the closeness of the inner stems. It is used for damping
+the slope of the beam.")
      (collapse-height ,ly:dimension? "Minimum height of system start delimiter.  If equal or smaller, the bracket is removed.")
 
      ;;DOCME
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7fda58b9a3..7ce7c91608 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -170,8 +170,6 @@
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
 	(print-function . ,Beam::print)
-	(concaveness-gap . 1.85)
-	(concaveness-threshold . 0.26)
 	(gap . 0.8)
 	(positions . (#f . #f))
 	(position-callbacks . (,Beam::least_squares