From 761d9d702b12303257565fdc8e40e2b635e6c99b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 2 Mar 2004 00:34:06 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 10 ++++++++++ VERSION | 2 +- lily/arpeggio.cc | 3 +-- ly/engraver-init.ly | 1 + scm/define-grobs.scm | 1 + scm/define-music-types.scm | 5 ----- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca7659d090..e76d28de15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-03-01 Han-Wen Nienhuys + + * 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 * lily/paper-score.cc (process): Output titles using make-title. diff --git a/VERSION b/VERSION index f19de432f7..6b8a3817dd 100644 --- 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 49e03b48db..c1fa6b9777 100644 --- 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 1ac9cd3bad..71d682edf4 100644 --- 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 f484362760..a06502de5c 100644 --- 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 e6e6f2d230..410e4e4fce 100644 --- 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) -- 2.39.5