*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ca7659d090d064991a641133f0f70d0e67675171..e76d28de15ba88aa36cec1474f19aac930a83f40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/arpeggio.cc (width_callback): remove padding.
+ 
+       * scm/define-grobs.scm (all-grob-descriptions): add padding.
+
+       * scm/define-music-types.scm: remove make-music-by-name.
+
+       * Documentation/user/lilypond.tely: doc patch by Edward Sutton.
+
 2004-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/paper-score.cc (process): Output titles using make-title.

diff --git a/VERSION b/VERSION
index f19de432f7420957158ebdec56159cb3c61d3b0e..6b8a3817dd7a566858100ce06c905265a62d79e9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
 PATCH_LEVEL=28
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 49e03b48db83cc9fbf468dee8593b74dfe35fa9f..c1fa6b9777e0e51bfc5cdce1447426c6471f8bef 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -137,7 +137,6 @@ Arpeggio::brew_chord_bracket (SCM smob)
 /*
   We have to do a callback, because print () triggers a
   vertical alignment if it is cross-staff.
-  This callback also adds padding.
 */
 MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2);
 SCM
@@ -148,7 +147,7 @@ Arpeggio::width_callback (SCM smob, SCM axis)
   assert (a == X_AXIS);
   Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
 
-  return ly_interval2scm (arpeggio.extent (X_AXIS) * 1.5);
+  return ly_interval2scm (arpeggio.extent (X_AXIS));
 }
 
 

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 1ac9cd3badfad01cbfcdcce5c8d78f78e5dfe467..71d682edf49f0aeb976d8d7abc823b58d09c89c1 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -124,6 +124,7 @@
     localKeySignature = #'()
 
     \consists "Pitch_squash_engraver"
+    squashedPosition = #0
     \consists "Separating_line_group_engraver" 
     \name RhythmicStaff
     \alias "Staff"

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f484362760b3e04cc7021fe65475f4a6f9bb4f0c..a06502de5c150a76a5b638bb31942d8da72648c3 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -60,6 +60,7 @@
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
        (X-offset-callbacks . (,Side_position_interface::aligned_side))
        (direction . -1)
+       (padding . 0.5)  
        (staff-position . 0.0)
        (meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface item-interface font-interface))))
        ))

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index e6e6f2d23021244936d7e5ddcbaad3805bbe55f7..410e4e4fce82d9384472adb129863b875e05ab93 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -749,11 +749,6 @@ and values. E.g:
       (set-props music-properties)
       m)))
 
-;; TODO remove make-music-by-name
-(define-public (make-music-by-name x)
-  "Deprecated. See make-music."
-  (ly:warn "make-music-by-name is deprecated. Use make-music instead.")
-  (make-music x))
 
 (define-public (make-repeated-music name)
   (let* ((handle (assoc name '(("volta" . VoltaRepeatedMusic)