From f4f34c5e49b6998386fa0e5eb218c07d19c0636c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 7 Jan 2006 12:37:15 +0000 Subject: [PATCH] * scm/define-grob-properties.scm (all-user-grob-properties): add line-positions. * input/regression/staff-line-positions.ly: new file. --- ChangeLog | 14 ++++++++++++++ Documentation/topdocs/NEWS.tely | 14 ++++++++++++++ VERSION | 4 ++-- input/regression/staff-line-positions.ly | 17 +++++++++++++++++ scm/define-grob-properties.scm | 3 ++- scm/define-grobs.scm | 3 +-- 6 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 input/regression/staff-line-positions.ly diff --git a/ChangeLog b/ChangeLog index ca82b054d3..797cbf989d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-01-07 Han-Wen Nienhuys + + * 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 * input/test/add-staccato.ly: remove reference to old file. diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 95fb07435c..8939f8f22d 100644 --- 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 e68052c8b6..14c743e705 100644 --- 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 index 0000000000..2d27ba825e --- /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 f4dc310d75..21afb9af58 100644 --- 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 9a3a8432f2..e075119ea4 100644 --- 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) -- 2.39.5