* scm/define-grob-properties.scm (all-user-grob-properties): add

line-positions.

* input/regression/staff-line-positions.ly:  new file.

diff --git a/ChangeLog b/ChangeLog
index ca82b054d381f2b7711ee4620fb106c116e010ae..797cbf989dd2bc92b7be02245119c5744f404781 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-01-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/bar-line.cc (calc_bar_size): inspect staff->extent (Y_AXIS)
+       for determining bar size.
+
+       * lily/staff-symbol.cc (print): place lines at distance line-positions
+
+       * scm/define-grob-properties.scm (all-user-grob-properties): add
+       line-positions.
+
+       * lily/staff-symbol.cc (height): new function.
+
+       * input/regression/staff-line-positions.ly:  new file.
+
 2006-01-06  Graham Percival  <gpermus@gmail.com>
 
        * input/test/add-staccato.ly: remove reference to old file.

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 95fb07435c8d75e1982901a627cbd383cfa2bd54..8939f8f22d34e54f87b88cd4962409642575d2f9 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -46,6 +46,20 @@ the @uref{../,LilyPond Documentation}
 
 
 @itemize @bullet
+
+@item Positions of staff lines may now be set individually, for
+example
+
+@lilypond[raggedright]
+\new Staff  \relative c' {
+  \override Staff.StaffSymbol #'line-positions = #'(-7 -2 0 3 9)
+  g c f b e a
+}
+@end lilypond
+
+This feature  was sponsored by Andrea Valle.
+
+
 @item A MusicXML importer is included now.
 
 It was sponsored by among others, Mark van den Borre, 

diff --git a/VERSION b/VERSION
index e68052c8b66f119e266eb39a89c7c2ee5cc22dfb..14c743e705f7cab92d2d12e55547c70eb764bc54 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=26
-MY_PATCH_LEVEL=1
+PATCH_LEVEL=27
+MY_PATCH_LEVEL=
 

diff --git a/input/regression/staff-line-positions.ly b/input/regression/staff-line-positions.ly
new file mode 100644 (file)
index 0000000..2d27ba8
--- /dev/null
+++ b/input/regression/staff-line-positions.ly
@@ -0,0 +1,17 @@
+\header {
+
+  texidoc = "The vertical positions of staff lines may be specified
+  individually, by setting the @code{line-positions} property of the
+  StaffSymbol."
+
+}
+
+\version "2.7.26"
+
+
+\new Staff \relative c'  {
+  \override Staff.StaffSymbol #'line-positions = #'(-7 -2 0 3 9)
+  g c f b e a
+}
+  
+  

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index f4dc310d758f49d70668f85291966a9cd76141d7..21afb9af586ada434e8a27d9a6351176898efc9a 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -271,8 +271,9 @@ determining ledger lines and stem lengths.")
      (line-break-system-details ,list?
                                "Alist of properties to use when this
 column is the start of a system.")
-     
+
      (line-count ,integer? "The number of staff lines.")
+     (line-positions ,list? "Vertical positions of staff lines.")
      (measure-length ,ly:moment? "Length of a
 measure. Used in some spacing situations.")
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 9a3a8432f2afdae5e8d503837f59bb9bcda87642..e075119ea48b134d8ea8b13b0c15813b1bfc1046 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1486,9 +1486,8 @@
 
     (StaffSymbol
      . (
-
+       (Y-extent . ,Staff_symbol::height)
        (stencil . ,Staff_symbol::print)
-
        (line-count . 5)
        (ledger-line-thickness . (1.0 . 0.1))
        (layer . 0)