* Documentation/topdocs/NEWS.tely (Top): show override.

* scm/define-grobs.scm (all-grob-descriptions): reinstate neutral
direction for stems.

diff --git a/ChangeLog b/ChangeLog
index ab5c7d9fe4a3e8b42cff37359ceb4d455172bc7c..e1a008cfac0c628c3c73ac173b1f6bd209ce9d91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/topdocs/NEWS.tely (Top): show override.
+
+       * scm/define-grobs.scm (all-grob-descriptions): reinstate neutral
+       direction for stems.
+       
 2006-03-15  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ changing-defaults, global: minor
@@ -5,6 +12,8 @@
 
 2006-03-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 548a940d580550b607b1e67d4cf0e9b8c6c78d18..e983e791d4ac61ee1c81e78bf6b8d598d14fdfdb 100644 (file)
--- 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 d123d4f0fe3ae13e9628aa6a73ff34b9414c2916..41cc80905af87ef55b5c1ef8c4134e6987dd6d1f 100644 (file)
--- 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 b7822c3b397fb84dc01b598f1feeb4715c0ee6de..40a9beeee0b180bdda588b45701da131e7b24b19 100644 (file)
--- 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 a31f25e43bc3d1c785092ea045147e541c6bfd0f..7ea74ff9d4327744c65f63cbf1af14056b78411d 100644 (file)
--- 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 da897cdefaaee21b451774f437395af27fc98dd1..e968d5fac49fbb57fd503b391cac7fbfb2dbb0e1 100644 (file)
--- 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 82b06c7c704bd2b85bffd61974ed77e4aecf6e66..ad75562e77c67f0c38a58277cb003d8879fa377b 100644 (file)
--- 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 028efef4dd33c924e6c38a50aa1af8e636ddbc33..457616e0dd3dea18c28ea73ce95f0ba268937510 100644 (file)
--- 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 2ecce335814a7fd5b629da832f5b8b81a19a5c9f..eb54bfbec8b1e885ffae78a2137f2ebaa34a8e05 100644 (file)
--- 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)