From: hanwen Date: Sun, 16 Oct 2005 14:11:14 +0000 (+0000) Subject: remove beam dir functions. X-Git-Tag: release/2.7.16^2~80 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d775f70ee1b0ca2d84a420867b20c8ff0bd16747;p=lilypond.git remove beam dir functions. --- diff --git a/ChangeLog b/ChangeLog index bf4cd71383..2270144618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-10-16 Han-Wen Nienhuys + * scm/layout-beam.scm: remove beam dir functions. + * ly/engraver-init.ly (AncientRemoveEmptyStaffContext): use length-fraction. * lily/stem.cc (calc_length): multiply with length_fraction. Makes diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm index e92edc0e84..6c790e02b5 100644 --- a/scm/layout-beam.scm +++ b/scm/layout-beam.scm @@ -15,46 +15,6 @@ ((eq? type 1) 1.65) ;; FIXME: check what this should be and why (else 1.32))) -;; There are several ways to calculate the direction of a beam -;; -;; * majority: number count of up or down notes -;; * mean : mean centre distance of all notes -;; * median : mean centre distance weighted per note -;; -;; [Ross] states that the majority of the notes dictates the -;; direction (and not the mean of "center distance") -;; -;; But is that because it really looks better, or because he wants -;; to provide some real simple hands-on rules? -;; -;; We have our doubts, so we simply provide all sensible alternatives. - - -;; -;; DOCME: what goes into this func, what comes out. -(define (dir-compare up down) - (sign (- up down))) - -;; arguments are in the form (up . down) -(define-public (beam-dir-majority count total) - (dir-compare (car count) (cdr count))) - -(define-public (beam-dir-majority-median count total) - "First try majority. If that doesn't work, try median." - (let ((maj (dir-compare (car count) (cdr count)))) - (if (not (= maj 0)) - maj - (beam-dir-median count total)))) - -(define-public (beam-dir-mean count total) - (dir-compare (car total) (cdr total))) - -(define-public (beam-dir-median count total) - (if (and (> (car count) 0) - (> (cdr count) 0)) - (dir-compare (/ (car total) (car count)) (/ (cdr total) (cdr count))) - (dir-compare (car count) (cdr count)))) - (define ((check-beam-quant posl posr) beam) "Check whether BEAM has POSL and POSR quants. POSL are (POSITION . QUANT) pairs, where QUANT is -1 (hang), 0 (center), 1 (sit) or -2/ 2 (inter)