* input/test/spacing-optical.ly (Module): new file.

* lily/staff-spacing.cc: add same-direction-correction

diff --git a/ChangeLog b/ChangeLog
index e5a003c5719ebb24cd26ecfe650a3d04b0fcdfd9..a7cf271a2334d100be92d4faa056ebc1e876fa0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * input/test/spacing-optical.ly (Module): new file.
+
+       * lily/staff-spacing.cc: add same-direction-correction
+
 2005-04-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/user/introduction.itely (Engraving): Comment-out

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index ca61f9b69ae98bace9adcfb94c25d2d9ba13b16c..b72e36916fee3f63bb77f78f5334785a55ddfce1 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -109,7 +109,7 @@ exact mathematical spacing, and once with corrections.  Can you
 spot which fragment is which?
 
 @cindex optical spacing
-@c @lily pondfile[quote,noindent]{spacing-optical.ly}
+@lilypondfile[quote,noindent]{spacing-optical.ly}
 
 @cindex regular rhythms
 @cindex regular spacing

diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly
index ad8a65720a7c356ef5f8461bdcc7bd9678c65822..d2694952c5730d0ed9f34b9d69fe541e2d4fe242 100644 (file)
--- a/input/regression/backend-excercise.ly
+++ b/input/regression/backend-excercise.ly
@@ -10,6 +10,8 @@
       {
        #(set-octavation 1)
        \times 2/3 {  c'8[\< f]( f''\!)  }
+       #(set-octavation 0)
+       <f \5>
       }
       \skip 1 >>
     \new Staff \relative c'' {

diff --git a/input/test/spacing-optical.ly b/input/test/spacing-optical.ly
new file mode 100644 (file)
index 0000000..e87bdfb
--- /dev/null
+++ b/input/test/spacing-optical.ly
@@ -0,0 +1,44 @@
+
+\header {
+texidoc  = "Stem directions and head positions are taken into account for spacing "
+
+}
+
+\paper {
+  raggedright = ##t
+  indent = #0.0
+}
+
+music = {
+   c'4 e''4 e'4 b'4 |
+   \stemDown
+   b'8[ e'' a' e'']
+   \stemNeutral
+   e'8[ e'8 e'8 e'8]  
+}
+
+
+
+\score
+{
+  \music
+  \layout {
+    \context {
+      \Staff
+      \override NoteSpacing #'stem-spacing-correction = #0.6
+    }
+  }
+}
+
+\score
+{
+  \music
+  \layout {
+    \context {
+      \Staff
+      \override NoteSpacing #'stem-spacing-correction = #0.0
+      \override NoteSpacing #'same-direction-correction = #0.0
+      \override StaffSpacing #'stem-spacing-correction = #0.0
+    }
+  }
+}

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 90e6882ea2614d61e583893e55acfecaa4950061..4aed2ddb2b36cea3768c710fe1f6b8602ed1aaf8 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -238,4 +238,4 @@ ADD_INTERFACE (Staff_spacing, "staff-spacing-interface",
               "This object calculates spacing details from a "
               " breakable symbol (left) to another object. For example, it takes care "
               " of  optical spacing from  a bar lines to a note.",
-              "stem-spacing-correction left-items right-items");
+              "same-direction-correction stem-spacing-correction left-items right-items");