(print): only do padding for nonmusical bounds

diff --git a/ChangeLog b/ChangeLog
index 2a51426e8b73136e2290c0feb60de91bc4709625..f62b454c901cd8603f76b9ae6777464fce6419d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/hairpin.cc (print): only do padding for nonmusical bounds
+
 2006-05-21  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/basic-notation.itely: reorg.

diff --git a/THANKS b/THANKS
index 2130dc7271217707decfdb1271f429264451e1ce..af050992236336b089a21a096b13b2bffba822ad 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -5,26 +5,28 @@ DEVELOPMENT TEAM
 
 Han-Wen Nienhuys  - Core development
 Jan Nieuwenhuizen - Core development
-Erik Sandberg     - Bug Meister
 Pedro Kroger      - Build Meister
 Graham Percival   - Documentation Editor
 Mats Bengtsson    - Support Guru 
 
-
 CONTRIBUTORS
 
 Erlend Aasland
 David Feuer
 Heikki Junes
 Joe Neeman
+Erik Sandberg
 
 
 SPONSORS
 
+Trevor Bača
+Andrew Sidwell
 Chris Sawer
 Jamie Bullock
 Steve Doonan
 
+
 DOCUMENTATION HELPERS
 
 Cameron Horsburgh

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 8f0252acd252c00d5fdd4320f066f71879e69f5e..37337d45bc77aadd9f75da0eef79c343b9730d5a 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -162,7 +162,11 @@ Hairpin::print (SCM smob)
                    x_points[d] = e.center () - d * padding / 3;
                }
              else
-               x_points[d] = e[d] - d * padding;
+               {
+                 x_points[d] = e[d];
+                 if (me->get_bound (d)->is_non_musical ())
+                   x_points[d] -=  d * padding;
+               }
            }
        }
     }

diff --git a/lily/main.cc b/lily/main.cc
index af092830bf32567c66c3fe7e6b5123d4de4b982a..f640801b84a647ecffec6878d371c6b4a3706915 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -57,6 +57,7 @@ string init_name_global;
 /* Selected output backend
    One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */
 string output_backend_global = "ps";
+
 /* Output formats to generate.  */
 string output_format_global = "";