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

diff --combined scm/define-grobs.scm
index 22a81789eb2fa21d15bc49fdb7233ba95ba2f356,a9309621b95c041fcb2ea3b15ad844e57269936d..4f5f9a6f51af9cce35233ecd7148ea34a36ce8b3
--- 1/scm/define-grobs.scm
--- 2/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -672,7 -672,6 +672,6 @@@
        (style . line)
        (gap . 0.5)
        (zigzag-width . 0.75)
-       (non-musical . #t)
        (X-extent . #f)
        (Y-extent . #f)
        (stencil . ,ly:line-spanner::print)
@@@ -1876,7 -1875,6 +1875,7 @@@
        (axes . (,X))
        (font-size . -4)
        (stencil . ,parenthesize-elements)
 +      (stencils . ,parentheses-item::calc-parenthesis-stencils)
        (direction . ,RIGHT)
        (side-axis . ,X)
        (padding . 0.3)