Make targets: improve *clean, remove bin, cvs-clean and maintainerclean

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 17bbea995b1f7c7bf03005b4ffffea2d6c9fd221..af55cc8fde11557f70c010b2f827e073278275e8 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -316,7 +316,7 @@ and duration-log @var{log}."
 (define-public (rhythmic-location<=? a b)
   (not (rhythmic-location<? b a)))
 (define-public (rhythmic-location>=? a b)
-  (rhythmic-location<? a b))
+  (not (rhythmic-location<? a b)))
 (define-public (rhythmic-location>? a b)
   (rhythmic-location<? b a))
 
@@ -358,69 +358,8 @@ and duration-log @var{log}."
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Bar lines.
+;; neighbor-interface routines
 
-;;
-;; How should a  bar line behave at a break?
-(define bar-glyph-alist
-  '((":|:" . (":|" . "|:"))
-    (":|.|:" . (":|" . "|:"))
-    (":|.:" . (":|" . "|:"))
-    ("||:" . ("||" . "|:"))
-    ("dashed" . ("dashed" . '()))
-    ("|" . ("|" . ()))
-    ("||:" . ("||" . "|:"))
-    ("|s" . (() . "|"))
-    ("|:" . ("|" . "|:"))
-    ("|." . ("|." . ()))
-
-    ;; hmm... should we end with a bar line here?
-    (".|" . ("|" . ".|"))
-    (":|" . (":|" . ()))
-    ("||" . ("||" . ()))
-    (".|." . (".|." . ()))
-    ("|.|" . ("|.|" . ()))
-    ("" . ("" . ""))
-    (":" . (":" . ""))
-    ("." . ("." . ()))
-    ("'" . ("'" . ()))
-    ("empty" . (() . ()))
-    ("brace" . (() . "brace"))
-    ("bracket" . (() . "bracket"))
-
-    ;; segno bar lines
-    ("S" . ("||" . "S"))
-    ("|S" . ("|" . "S"))
-    ("S|" . ("S" . ()))
-    (":|S" . (":|" . "S"))
-    (":|S." . (":|S" . ()))
-    ("S|:" . ("S" . "|:"))
-    (".S|:" . ("|" . "S|:"))
-    (":|S|:" . (":|" . "S|:"))
-    (":|S.|:" . (":|S" . "|:"))
-
-    ;; ancient bar lines
-    ("kievan" . ("kievan" . ""))))
-
-(define-public (bar-line::calc-glyph-name grob)
-  (let* ((glyph (ly:grob-property grob 'glyph))
-        (dir (ly:item-break-dir grob))
-        (result (assoc-get glyph bar-glyph-alist))
-        (glyph-name (if (= dir CENTER)
-                        glyph
-                        (if (and result
-                                 (string? (index-cell result dir)))
-                            (index-cell result dir)
-                            #f))))
-    glyph-name))
-
-(define-public (bar-line::calc-break-visibility grob)
-  (let* ((glyph (ly:grob-property grob 'glyph))
-        (result (assoc-get glyph bar-glyph-alist)))
-
-    (if result
-       (vector (string? (car result)) #t (string? (cdr result)))
-       all-invisible)))
 
 (define-public (shift-right-at-line-begin g)
   "Shift an item to the right, but only at the start of the line."
@@ -434,7 +373,7 @@ and duration-log @var{log}."
       (cons -0.1 0.1)))
 
 (define-public (pure-from-neighbor-interface::extra-spacing-height grob)
-  (let* ((height (ly:grob::stencil-height grob))
+  (let* ((height (ly:grob-pure-height grob grob 0 10000000))
          (from-neighbors (interval-union
                             height
                             (ly:axis-group-interface::pure-height
@@ -900,7 +839,7 @@ and duration-log @var{log}."
 ;; dynamics
 
 (define-public (hairpin::calc-grow-direction grob)
-  (if (eq? (ly:event-property (event-cause grob) 'class) 'decrescendo-event)
+  (if (ly:in-event-class? (event-cause grob) 'decrescendo-event)
       START
       STOP))