From 441d6a313d3a51e9dd0dfc32e2ee14c2636cbf61 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 21 May 2002 16:23:05 +0000 Subject: [PATCH] mozart fixes --- ChangeLog | 20 ++++++++++++++ input/mozart-hrn-3.ly | 3 ++ input/mozart-hrn3-defs.ly | 53 ++++++++---------------------------- input/mozart-hrn3-romanze.ly | 4 +-- ly/grace-init.ly | 4 +-- scm/grob-description.scm | 13 --------- 6 files changed, 38 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index 649163dc4b..1d97d84456 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-21 Han-Wen + + * input/mozart-hrn3-defs.ly (startGraceMusic): typo (it's + startGraceMusic not startGraceContext). + 2002-05-20 Jan Nieuwenhuizen * stepmake/autogen.sh: Check for autoconf2.13, and abort if not @@ -5,6 +10,19 @@ 2002-05-20 Han-Wen + * lily/accidental-engraver.cc: remove old accidental engraver, + move new one to accidental-engraver.cc. + + * lily/local-key-item.cc: remove file + + * lily/include/local-key-item.hh: remove file + + * scripts/ly2dvi.py (make_preview): add --preview-resolution + option. + + * lily/accidental.cc (brew_molecule): support for cautionary + accidentals. + * lily/note-head.cc (internal_brew_molecule): warn if note head not found. @@ -35,6 +53,8 @@ * input/regression/collision-heads.ly: new file + * VERSION 1.5.57 released. + 2002-05-18 Juergen Reuter * mf/parmesan-heads.mf, scm/grob-description.scm, diff --git a/input/mozart-hrn-3.ly b/input/mozart-hrn-3.ly index 45b495d2a8..8a0fe4002e 100644 --- a/input/mozart-hrn-3.ly +++ b/input/mozart-hrn-3.ly @@ -17,6 +17,7 @@ maintainerWeb = "http://www.cs.uu.nl/~hanwen/" lastupdated = "2002/March/26" source = "Edition Breitkopf 2563" + footer = "Mutopia-2002/04/26-25" tagline = "\\parbox{\hsize}{\\thefooter\\quad\\small This music is part of the Mutopia project, \\texttt{http://sca.uwaterloo.ca/Mutopia/}. It has been typeset and placed in the public domain by " + \maintainer + ". Unrestricted modification and redistribution is permitted and encouraged---copy this music and share it!}" @@ -29,6 +30,8 @@ virtuoso that taught in Geneva. %} +\version "1.5.57" + \include "mozart-hrn3-defs.ly" \include "mozart-hrn3-allegro.ly" \include "mozart-hrn3-romanze.ly" diff --git a/input/mozart-hrn3-defs.ly b/input/mozart-hrn3-defs.ly index ba2550e090..d453e8fad9 100644 --- a/input/mozart-hrn3-defs.ly +++ b/input/mozart-hrn3-defs.ly @@ -27,52 +27,23 @@ cresc = \notes { \property Voice.crescendoSpanner = #'dashed-line } -startGraceContextOrig = \startGraceContext +%% +%% TODO: a better mechanism for tweaking Grace settings. +%% -startGraceContext = { - %% Huh? - %% \startGraceContextOrig - - - %%URG copy from original - \property Voice.Stem \override #'direction = #1 - \property Voice.Stem \override #'length = #6 - \property Voice.Stem \override #'lengths = - #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) - \property Voice.Stem \override #'beamed-lengths = - #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5)) - \property Voice.Stem \override #'beamed-minimum-lengths = - #(map (lambda (x) (* 0.8 x)) '(0.0 1.5 1.25 1.0)) - \property Voice.Stem \override #'no-stem-extend = ##t - \property Voice.Stem \override #'flag-style = #"grace" - \property Voice.Beam \override #'thickness = #0.384 - - %% Instead of calling Beam::space_function, we should invoke - %% the previously active beam function... - \property Voice.Beam \override #'space-function = - #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult))) - - \property Voice.Beam \override #'position-callbacks = - #`(,Beam::least_squares - ,Beam::check_concave - ,Beam::slope_damping) - - % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will - % be smaller as well. - - \property Voice.fontSize = #-2 - \property Staff.Accidentals \override #'font-relative-size = #-2 - \property Voice.Slur \override #'direction = #-1 - %% end copy - - - \property Voice.Beam \revert #'space-function +startGraceMusic = \sequential { + \startGraceMusic \property Voice.Beam \override #'space-function = #(lambda (beam mult) (* 0.8 0.8)) - \property Voice.Beam \revert #'thickness \property Voice.Beam \override #'thickness = #(* 0.384 (/ 0.6 0.48)) } +stopGraceMusic= \sequential { + \property Voice.Beam \revert #'thickness + \property Voice.Beam \revert #'space-function + \stopGraceMusic +} + \paper{ \stylesheet #my-sheet \translator { @@ -95,6 +66,4 @@ startGraceContext = { indent = 10. \mm linewidth = 189. \mm - % The piece should fit on 4 pages. - textheight = 275.\mm } diff --git a/input/mozart-hrn3-romanze.ly b/input/mozart-hrn3-romanze.ly index 5fb0a103f7..01c7501796 100644 --- a/input/mozart-hrn3-romanze.ly +++ b/input/mozart-hrn3-romanze.ly @@ -1,6 +1,6 @@ \version "1.5.49" -%\include "mozart-hrn3-defs.ly" +\include "mozart-hrn3-defs.ly" romanze = \notes \relative c' { \key f \major @@ -43,7 +43,7 @@ romanze = \notes \relative c' { [d8( e f )d] b4 r8 g [c ()e g g] [g( f e )d] c4( - \grace { \longgrace e16 } + \grace { \longgrace e16 \endlonggrace } [d8. )c16 \< ] [c8 c-.( c-. \! )c-.] \mark "C" des1\sfp diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 39079b3396..3465026455 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -26,13 +26,13 @@ startGraceMusic = { % be smaller as well. \property Voice.fontSize = #-2 - \property Staff.Accidentals \override #'font-relative-size = #-2 + \property Staff.Accidental \override #'font-relative-size = #-2 \property Voice.Slur \override #'direction = #-1 } stopGraceMusic = { \property Voice.Slur \revert #'direction - \property Staff.Accidentals \revert #'font-relative-size + \property Staff.Accidental \revert #'font-relative-size \property Voice.Beam \revert #'thickness \property Voice.Stem \revert #'flag-style diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 87bec4739c..7b631f9834 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -13,19 +13,6 @@ ;; TODO: junk the meta field in favor of something more compact? (define all-grob-descriptions `( - (Accidentals - . ( - (molecule-callback . ,Local_key_item::brew_molecule) - (X-offset-callbacks . (,Side_position_interface::aligned_side)) - (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (after-line-breaking-callback . ,Local_key_item::after_line_breaking) - (direction . -1) - (left-padding . 0.2) - (right-padding . 0.5) - (paren-cautionaries . #t) - (font-family . music) - (meta . ((interfaces . (accidentals-interface staff-symbol-referencer-interface font-interface side-position-interface)))) - )) (Accidental . ( (molecule-callback . ,Accidental_interface::brew_molecule) -- 2.39.5