From c225073ce98f6270b8f2725296fc8f02f1fe0065 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 16 Mar 2006 10:52:27 +0000 Subject: [PATCH] * Documentation/topdocs/NEWS.tely (Top): show override. * scm/define-grobs.scm (all-grob-descriptions): reinstate neutral direction for stems. --- ChangeLog | 9 ++ Documentation/topdocs/NEWS.tely | 10 ++- THANKS | 1 + input/regression/stem-direction-context.ly | 7 +- lily/lexer.ll | 3 +- ly/engraver-init.ly | 5 +- ps/music-drawing-routines.ps | 3 +- python/convertrules.py | 2 +- scm/define-grobs.scm | 96 +++++++++++----------- 9 files changed, 78 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab5c7d9fe4..e1a008cfac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-16 Han-Wen Nienhuys + + * Documentation/topdocs/NEWS.tely (Top): show override. + + * scm/define-grobs.scm (all-grob-descriptions): reinstate neutral + direction for stems. + 2006-03-15 Graham Percival * Documentation/user/ changing-defaults, global: minor @@ -5,6 +12,8 @@ 2006-03-15 Han-Wen Nienhuys + * lily/lexer.ll (Lily_lexer): bump required version to 2.7.38 + * lily/spacing-spanner.cc (musical_column_spacing): crude fix for breakable items after uniformly stretched notes. diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 548a940d58..e983e791d4 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -232,11 +232,15 @@ It was sponsored by among others, Mark van den Borre, and Muziekacademie Lede. @item -Stem direction on the center staff line are now interpolated between -neighbors. This results in less stem direction changes, leading to a -more even appearance. For example, +Stem direction on the center staff line can now be interpolated +between neighbors. This results in less stem direction changes, +leading to a more even appearance. For example, @lilypond[ragged-right] +\new Voice \with { + \consists "Melody_engraver" + \override Stem +} \relative c'' { c4 b c b c c c r diff --git a/THANKS b/THANKS index d123d4f0fe..41cc80905a 100644 --- a/THANKS +++ b/THANKS @@ -81,6 +81,7 @@ Kieren Richard MacMillan Lambros Lambrou Laura Conrad Libero Mureddu +Marcus Macauley Mark Steinheuser Matevž Jekovec Michael Kiermaier diff --git a/input/regression/stem-direction-context.ly b/input/regression/stem-direction-context.ly index b7822c3b39..40a9beeee0 100644 --- a/input/regression/stem-direction-context.ly +++ b/input/regression/stem-direction-context.ly @@ -6,9 +6,10 @@ } \version "2.7.32" - - -\relative c'' \new Voice { +\relative c'' \new Voice \with { + \consists "Melody_engraver" + \revert Stem #'neutral-direction +} { c4 b c b c c c c b a b a diff --git a/lily/lexer.ll b/lily/lexer.ll index a31f25e43b..7ea74ff9d4 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -811,8 +811,7 @@ strip_trailing_white (string&s) -/* 2.1.2x something -> \property -> \set. */ -Lilypond_version oldest_version ("2.3.22"); +Lilypond_version oldest_version ("2.7.38"); bool diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index da897cdefa..e968d5fac4 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -190,7 +190,10 @@ contained staves are not connected vertically." \consists "Breathing_sign_engraver" \consists "Note_heads_engraver" \consists "Rest_engraver" - \consists "Melody_engraver" + + %% switch on to make stem directions interpolate for the + %% center line. + % \consists "Melody_engraver" \consists "Stem_engraver" \consists "Beam_engraver" diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index 82b06c7c70..ad75562e77 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -2,7 +2,8 @@ % % Functions for direct and embedded PostScript -% Don't use double % as comment prefix. These are interpreted as DSC comments. +% Careful with double % as comment prefix. +% Any %%X comment is interpreted as DSC comments. % TODO: use dicts or prefixes to prevent namespace pollution. diff --git a/python/convertrules.py b/python/convertrules.py index 028efef4dd..457616e0dd 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2715,10 +2715,10 @@ def conv (str): ('betweensystemspace', 'between-system-space'), ('betweensystempadding', 'between-system-padding'), ('pagetopspace', 'page-top-space'), + ('raggedlastbottom', 'ragged-last-bottom'), ('raggedright', 'ragged-right'), ('raggedlast', 'ragged-last'), ('raggedbottom', 'ragged-bottom'), - ('raggedlastbottom', 'ragged-last-bottom'), ('aftertitlespace', 'after-title-space'), ('beforetitlespace', 'before-title-space'), ('betweentitlespace', 'between-title-space'), diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 2ecce33581..eb54bfbec8 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1287,6 +1287,34 @@ (meta . ((class . Spanner) (interfaces . (slur-interface)))))) + (SostenutoPedal + . ( + (stencil . ,ly:text-interface::print) + (direction . ,RIGHT) + (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) + (no-spacing-rods . #t) + (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner + (font-shape . italic) + (self-alignment-X . 0) + (meta . ((class . Item) + (interfaces . (text-interface + self-alignment-interface + font-interface)))))) + + (SostenutoPedalLineSpanner + . ( + (axes . (1)) + (Y-extent . ,ly:axis-group-interface::height) + (Y-offset . ,ly:side-position-interface::y-aligned-side) + (side-axis . ,Y) + (staff-padding . 1.0) + (padding . 1.2) + (minimum-space . 1.0) + (direction . ,DOWN) + (meta . ((class . Spanner) + (interfaces . (piano-pedal-interface + axis-group-interface + side-position-interface)))))) (SpacingSpanner . ( (springs-and-rods . ,ly:spacing-spanner::set-springs) @@ -1339,24 +1367,6 @@ text-interface font-interface)))))) - (StringNumber - . ( - (stencil . ,print-circled-text-callback) - (padding . 0.5) - (staff-padding . 0.5) - (self-alignment-X . 0) - (self-alignment-Y . 0) - (script-priority . 100) - (font-encoding . fetaNumber) - (font-size . -5) ; don't overlap when next to heads. - (meta . ((class . Item) - (interfaces . (string-number-interface - font-interface - text-script-interface - text-interface - side-position-interface - self-alignment-interface - item-interface)))))) (StaffSpacing . ( @@ -1366,35 +1376,7 @@ (interfaces . (spacing-interface staff-spacing-interface)))))) - (SostenutoPedal - . ( - (stencil . ,ly:text-interface::print) - (direction . ,RIGHT) - (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) - (no-spacing-rods . #t) - (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner - (font-shape . italic) - (self-alignment-X . 0) - (meta . ((class . Item) - (interfaces . (text-interface - self-alignment-interface - font-interface)))))) - - (SostenutoPedalLineSpanner - . ( - (axes . (1)) - (Y-extent . ,ly:axis-group-interface::height) - (Y-offset . ,ly:side-position-interface::y-aligned-side) - (side-axis . ,Y) - (staff-padding . 1.0) - (padding . 1.2) - (minimum-space . 1.0) - (direction . ,DOWN) - (meta . ((class . Spanner) - (interfaces . (piano-pedal-interface - axis-group-interface - side-position-interface)))))) - + (StaffSymbol . ( (Y-extent . ,ly:staff-symbol::height) @@ -1410,6 +1392,7 @@ (direction . ,ly:stem::calc-direction) (default-direction . ,ly:stem::calc-default-direction) (stem-end-position . ,ly:stem::calc-stem-end-position) + (neutral-direction . ,DOWN) (stem-info . ,ly:stem::calc-stem-info) (positioning-done . ,ly:stem::calc-positioning-done) (stencil . ,ly:stem::print) @@ -1465,6 +1448,25 @@ (meta . ((class . Item) (interfaces . (stem-tremolo-interface)))))) + (StringNumber + . ( + (stencil . ,print-circled-text-callback) + (padding . 0.5) + (staff-padding . 0.5) + (self-alignment-X . 0) + (self-alignment-Y . 0) + (script-priority . 100) + (font-encoding . fetaNumber) + (font-size . -5) ; don't overlap when next to heads. + (meta . ((class . Item) + (interfaces . (string-number-interface + font-interface + text-script-interface + text-interface + side-position-interface + self-alignment-interface + item-interface)))))) + (SustainPedal . ( (no-spacing-rods . #t) -- 2.39.2