release: 1.3.90

[lilypond.git] / scm / slur.scm

diff --git a/scm/slur.scm b/scm/slur.scm
index 540ce7ac7f3a21307a600e575b74fd689b768cc9..f3f010acb3230b91e54381cc74a32ee4e6d3b112 100644 (file)
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -1,12 +1,12 @@
 
 (define (attached-to-stem slur dir)
-  (let* ((note-columns (ly-get-elt-pointer slur 'note-columns))
+  (let* ((note-columns (ly-get-elt-property slur 'note-columns))
         (col (if (= dir 1) (car note-columns) (car (reverse note-columns))))
-        (stem (ly-get-elt-pointer col 'stem)))
+        (stem (ly-get-elt-property col 'stem)))
     (and
      (eq? col (ly-get-spanner-bound slur dir))
      stem
-     (ly-get-elt-pointer stem 'heads))))
+     (ly-get-elt-property stem 'heads))))
 
 
 ;; Slur-extremity-rules is a list of rules.  Each rule is a pair 
@@ -23,27 +23,41 @@
 ;;    'head 'along-side-stem 'stem 'loose-end
 ;;
 
-(define slur-extremity-rules
+(define default-slur-extremity-rules
   (list
+
+   ;; (cons (lambda (slur dir) (begin (display "before sanity check") (newline))#f) #f)
+
+   ;; urg: don't crash on a slur without note-columns
+   (cons (lambda (slur dir)
+          (< (length (ly-get-elt-property slur 'note-columns)) 1)) 'head)
+
+   ;; (cons (lambda (slur dir) (begin (display "before loose-end") (newline))#f) #f)
+   (cons (lambda (slur dir) (not (attached-to-stem slur dir)))  'loose-end)
+
+   ;; (cons (lambda (slur dir) (begin (display "before head") (newline))#f) #f)
+
    (cons (lambda (slur dir)
           ;; urg, code dup
-          (let* ((note-columns (ly-get-elt-pointer slur 'note-columns))
+          (let* ((note-columns (ly-get-elt-property slur 'note-columns))
                  (col (if (= dir 1) (car note-columns) (car (reverse note-columns))))
-                 (stem (ly-get-elt-pointer col 'stem)))
+                 (stem (ly-get-elt-property col 'stem)))
             (and stem
                  (not (= (ly-get-elt-property slur 'direction) 
                          (ly-get-elt-property stem 'direction))))))  'head)
 
+   ;; (cons (lambda (slur dir) (begin (display "before stem") (newline))#f) #f)
+
    (cons (lambda (slur dir)
           ;; if attached-to-stem
           (and (attached-to-stem slur dir)
                ;; and got beam
                ;; urg, code dup
-               (let* ((note-columns (ly-get-elt-pointer slur 'note-columns))
+               (let* ((note-columns (ly-get-elt-property slur 'note-columns))
                       (col (if (= dir 1) (car note-columns) (car (reverse note-columns))))
-                      (stem (ly-get-elt-pointer col 'stem)))
+                      (stem (ly-get-elt-property col 'stem)))
                  (and stem
-                      (ly-get-elt-pointer stem 'beam)
+                      (ly-get-elt-property stem 'beam)
                       ;; and beam on same side as slur
                       (let ((beaming (ly-get-elt-property stem 'beaming)))
                         (if (pair? beaming)
@@ -52,7 +66,9 @@
                             #f))))))
         'stem)
 
+   ;;(cons (lambda (slur dir) (begin (display "before loose-end") (newline))#f) #f)
    (cons (lambda (slur dir) (not (attached-to-stem slur dir)))  'loose-end)
+   ;; (cons (lambda (slur dir) (begin (display "after loose-end") (newline))#f) #f)
 
    ;; default case, attach to head
    (cons (lambda (x y) #t)  'head)
@@ -61,19 +77,42 @@
 
 ;; This list defines the offsets for each type of attachment.
 ;; The format of each element is
-;; (attachment stem-dir * attachment-dir slur-dir)
+;; (stem-dir * dir . slur-dir * dir)
 ;; Different attachments have different default points:
 ;;
 ;; head: Default position is centered in X, on outer side of head Y
 ;; along-side-stem: Default position is on stem X, on outer side of head Y
 ;; stem: Default position is on stem X, at stem end Y
-(define slur-extremity-offset-alist
+(define default-slur-extremity-offset-alist
   '(
-    ((head 1 1) . (-0.25 . 0.2))
+    ((head 1 1) . (-0.25 . 0.25))
     ((head 1 -1) . (-0.25 . -0.25))
     ((head -1 1) . (-0.25 . 0.25))
-    ((head -1 -1) . (-0.85 . -0.2))
+    ((head -1 -1) . (-0.85 . -0.25))
 
     ((stem 1 1) . (0 . 0.5))
     ((stem -1 -1) . (0 . -0.5))
+
+    ((loose-end 1 1) . (-0.4 . 0))
+    ((loose-end 1 -1) . (-0.4 . 0))
+    ((loose-end -1 -1) . (-4 . 0))
+    ((loose-end -1 1) . (-4 . 0))
     ))
+
+
+(define default-basic-slur-properties
+  `(
+   (interfaces . (slur-interface))
+   (molecule-callback . ,Slur::brew_molecule)
+   (thickness . 1.2)           
+   (spacing-procedure . ,Slur::set_spacing_rods)               
+   (minimum-length . 1.5)
+   (after-line-breaking-callback . ,Slur::after_line_breaking)
+   (extremity-rules . ,default-slur-extremity-rules)
+   (extremity-offset-alist . ,default-slur-extremity-offset-alist)
+   (de-uglify-parameters . ( 1.5  0.8  -2.0))
+   (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 0.5)))
+   (y-free . 0.75)
+   (name . "slur")
+   )
+  )