lilypond-1.5.4

diff --git a/CHANGES b/CHANGES
index 1ed44c2eaf5ce219dd2ba38840c7081108d249fe..78a9eaa2a5614adda3b5bbb3b63062fdfd1ae659 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+1.5.3.hwn1
+==========
+
+* midi2ly bugfixes: don't print ';' in .ly output.
+
+* small cleanup of input/bugs/
+
+* bugfix: nested grace notes; added input/regression/grace-nest.ly
+
+* Bugfix: add double alterations to keyAccidentalOrder (Mats)
+
+* Fixes for PostScript beams and stems.
+
 1.5.2.hwn1
 ==========
 

diff --git a/input/bugs/grace-staff-length.ly b/input/bugs/grace-staff-length.ly
new file mode 100644 (file)
index 0000000..25b4037
--- /dev/null
+++ b/input/bugs/grace-staff-length.ly
@@ -0,0 +1,19 @@
+\header{
+texidoc="stripped version of trip.ly.  upper staff is too short, lower too long"
+}
+\score{
+  \context PianoStaff \notes <
+    \context Staff = treble {
+       r1
+       r1
+       \bar "|."
+    }
+    \context Staff = bass {
+      r1
+      \context Staff {
+       \grace { c16 } c1
+      }
+    }
+  > 
+  \paper { }
+}

diff --git a/lily/beam.cc b/lily/beam.cc
index fc96433688e963e099ab8be160f33b59b4016709..48c81d14cf764266d1db2665f99b643dbf370376 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -670,11 +670,12 @@ Beam::set_stem_lengths (Grob *me)
 
       Real stem_y = calc_stem_y_f (me, s, y, dy);
 
-#if 0 // doesn't play well with dvips
-      if (Stem::get_direction (s) == Directional_element_interface::get (me))
-       stem_y += Stem::get_direction (s)
-         * gh_scm2double (me->get_grob_property ("thickness")) / 2;
-#endif
+      // doesn't play well with dvips
+      if (scm_definedp (ly_symbol2scm ("ps-testing"), SCM_UNDEFINED)
+         == SCM_BOOL_T)
+       if (Stem::get_direction (s) == Directional_element_interface::get (me))
+         stem_y += Stem::get_direction (s)
+           * gh_scm2double (me->get_grob_property ("thickness")) / 2;
       
       /* caution: stem measures in staff-positions */
       Real id = me->relative_coordinate (common, Y_AXIS)

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 8a64dcf6eb0936c05bb69a951e4c4f4aecbc64ea..d2f3bac4c62e2c56ff48f2e25e440278d262fe03 100644 (file)
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -15,10 +15,8 @@
 
 % FIXME.  translate to middle of box.
 % Nice rectangle with rounded corners
-% FIXME: linewidth hardcoded.  check: too round?
 /draw_box % breapth width depth height
 {
-       %% FIXME: hardcoded
        currentdict /testing known {
                %% real thin lines for testing
                /blot 0.005 def
@@ -32,13 +30,6 @@
 
        blot 2 div sub /h exch def
        blot 2 div sub /d exch def
-
-       %% UGH huh?
-       %% Where does this correction come from?
-       %% Why don't we need this in x direction?
-       h blot 2 div sub /h exch def
-       d blot 2 div sub /d exch def
-
        blot 2 div sub /w exch def
        blot 2 div sub /b exch def
 
@@ -57,10 +48,8 @@
 } bind def
 
 % Nice beam with rounded corners
-% FIXME: linewidth hardcoded.  check: too round?
 /draw_beam % slope width thick 
 {
-       %% FIXME: hardcoded
        currentdict /testing known {
                %% real thin lines for testing
                /blot 0.005 def
@@ -72,11 +61,11 @@
        0 setlinecap
        1 setlinejoin
 
-       blot 2 mul sub /t exch def
-       blot 2 mul sub /w exch def
+       blot sub /t exch def
+       blot sub /w exch def
        w mul /h exch def
 
-       blot t 2 div neg moveto
+       blot 2 div t 2 div neg moveto
        w h rlineto
        0 t rlineto
        w neg h neg rlineto