(all-user-grob-properties): add

same-direction-correction

diff --git a/ChangeLog b/ChangeLog
index 836e7e72ca1da11ff295c646b0c15ceebae00145..985c9113c1d2497068531bdf8e96590ee243d07a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/define-grob-properties.scm (all-user-grob-properties): add
+       same-direction-correction
+
+       * VERSION: release 2.5.18
+
 2005-04-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/midi-stream.cc: Handle unwritable midi file.

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 5b8bc0ed38a0208a2d082cdc336a745bd333472b..ac1942ed12c9bbda61f8be4966d32493bd5f914e 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -425,10 +425,10 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
        = (head_posns[LEFT][DOWN] > head_posns[RIGHT][UP]) ? RIGHT : LEFT;
 
       Real delta = head_posns[-lowest][DOWN] - head_posns[lowest][UP];
-      Real corr = robust_scm2double (me->get_property ("stem-spacing-correction"), 0);
-      corr = (delta <= 1) ? 0.0 : 0.25;
-
-      correction = -lowest * corr;
+      Real corr = robust_scm2double (me->get_property ("same-direction-correction"), 0);
+      
+      if (delta > 1)
+       correction = -lowest * corr;
     }
 
   *space += correction;

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 3036987af8450e7a3e6dcfaeaba6563fd40c4dc1..ac49dc6201f4f003bd1c85a73f5c7b2ef3e05948 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -438,7 +438,9 @@ stems that are placed in tight configurations. For opposite
 directions, this amount is the correction for two normal sized stems
 that overlap completely.")
 
-     
+     (same-direction-correction ,number? "Optical correction amount
+for stems that are placed in tight configurations. This amount is used
+for stems with the same direction to compensate for note-head to stem distance.")
      (string-count ,integer? "The number of strings in a fret diagram.")
      (stroke-style ,string? "set to \"grace\" to turn stroke through flag on.")
      

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f568348d6e0af4562c213eddd474cd39f982916e..d831ce8d72dbed642172881495711b7fadc0f32e 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -764,7 +764,7 @@
     (NoteSpacing
      . (
        (stem-spacing-correction . 0.5)
-
+       (same-direction-correction . 0.25)
        ;; Changed this from 0.75.
        ;; If you ever change this back, please document! --hwn
        (knee-spacing-correction . 1.0)