Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

diff --combined scm/define-grob-properties.scm
index 140cf382b7ba71a14059eee106f206dcb6c7c0fc,7fe48c14c5326fd71c76722d2fe33a611f092d13..b46dc5aae7a55f641f85e6125c98dc98798a1b19
--- 1/scm/define-grob-properties.scm
--- 2/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@@ -201,6 -201,7 +201,7 @@@ of note-column for horizontal shifting
       (avoid-slur ,symbol? "Method of handling slur collisions.
  Choices are @code{around}, @code{inside}, @code{outside}.  If unset, script
  and slur ignore eachother.")
+      (ignore-collision ,boolean? "If set, don't do note collision resolution on this NoteColumn.")
       (inspect-quants ,number-pair? "If debugging is set,
  set beam/slur quant to this position, and print the respective scores.")
       (inspect-index ,integer? "If debugging is set,
@@@ -348,7 -349,7 +349,7 @@@ note that starts here."
  object.")
       (side-axis ,number? "If the value is #X (or equivalently 1), the object is placed horizontally next to the other object. If the value is #Y or 0, it is placed vertically.")
       (size ,number? "Size of object, relative to standard size.")
 -     (skylines ,pair? "A pair of lists of (x height) pairs.")
 +     (skylines ,ly:skyline-pair? "Two skylines, one above and one below this grob (or, for some grobs, to the left and to the right).")
       (slope ,number? "The slope of this object.")
       (slur-padding ,number? "Extra distance between slur and script.")
       (space-alist ,list? "A table that specifies distances between
@@@ -562,6 -563,8 +563,6 @@@ than a whole rest."
       (spaceable-staves ,ly:grob-array? "Objects to be spaced during page layout.")
       (skyline-distance ,number? "The distance between this staff and the next one, as determined by a skyline algorithm.")
       (skyline-horizontal-padding ,number? "For determining the vertical distance between 2 staves, it is possible to have a configuration which would result in a tight interleaving of grobs from the top staff and the bottom staff. The larger this parameter is, the farther apart the staves will be placed in such a configuration.")
 -     (skyline-spacing ,boolean? "When true, this axis-group will vertically space its children
 -using a skyline algorithm.")
  
       
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --combined scm/define-grobs.scm
index 10a35dc68dd02a88c059c57a81fabd2ec7b0721d,7aad372102825fbbe3882e3a7d255cfc7b6cfed1..47ef19a696235f613e50a13b3d06eb7c7dfc0dd2
--- 1/scm/define-grobs.scm
--- 2/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -275,7 -275,6 +275,7 @@@
       . (
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
 +      (skylines . ,ly:axis-group-interface::calc-skylines)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                ))))))
@@@ -602,6 -601,7 +602,6 @@@
        (font-shape . italic)
        (avoid-slur . around)
        (no-spacing-rods . #t)
 -      (script-priority . 100)
        (outside-staff-priority . 250)
        (meta . ((class . Item)
                 (interfaces . (font-interface
@@@ -1132,6 -1132,9 +1132,6 @@@
        
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (stencil . ,ly:text-interface::print)
 -
 -      ;; no Y dimensions, because of lyrics under tenor clef.
 -      (Y-extent . (0 . 0))
        (font-shape . italic)
        (padding . 0.6)
        (staff-padding . 0.2)
@@@ -1653,7 -1656,7 +1653,7 @@@
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
 -      (skyline-spacing . #t)
 +      (skylines . ,ly:axis-group-interface::calc-skylines)
        (skyline-horizontal-padding . 1.0)
        (meta . ((class . System)
                 (interfaces . (system-interface
@@@ -1974,8 -1977,7 +1974,8 @@@
        (Y-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:axis-group-interface::width)
        (stacking-dir . -1)
 -      (padding . 0.1) 
 +      (padding . 0.1)
 +      (skylines . ,ly:axis-group-interface::combine-skylines)
        (meta . ((class . Spanner)
                 (interfaces . (align-interface
                                axis-group-interface))))))
@@@ -1985,7 -1987,7 +1985,7 @@@
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (X-extent . ,ly:axis-group-interface::width)
 -      (skyline-spacing . #t)
 +      (skylines . ,ly:axis-group-interface::calc-skylines);
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                hara-kiri-group-spanner-interface
@@@ -2081,7 -2083,6 +2081,7 @@@
  
  (define pure-print-callbacks
    (list
 +   ly:bar-line::print
     ly:note-head::print
     ly:accidental-interface::print
     ly:dots::print
@@@ -2096,6 -2097,7 +2096,6 @@@
         (ly:stencil? sten)
         (memq sten pure-print-callbacks))
        (ly:grob::stencil-height grob)
 -
        '(0 . 0))))
  
  (define pure-conversions-alist
@@@ -2137,4 -2139,7 +2137,7 @@@
              (apply unpure args)
              (let ((pure (assq unpure pure-conversions-alist)))
                (if pure
-                   (apply (cdr pure) (append (list (car args) start end) (cdr args)))))))))
+                   (apply (cdr pure)
+                          (append
+                           (list (car args) start end)
+                           (cdr args)))))))))