From: Han-Wen Nienhuys Date: Thu, 17 Mar 2005 23:13:28 +0000 (+0000) Subject: * lily/key-performer.cc (create_audio_elements): don't use X-Git-Tag: release/2.5.16~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=83c97b87ac1673c7d67d663e62a41272944f13cc;p=lilypond.git * lily/key-performer.cc (create_audio_elements): don't use scm_eval_string. Check for minor 3rd directly. * input/mutopia/J.S.Bach/baerenreiter-sarabande.ly (sarabandeCelloGlobal): key is D minor, not F major. --- diff --git a/ChangeLog b/ChangeLog index df5e7e8d9b..bc6c210e11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-03-18 Han-Wen Nienhuys + + * lily/key-performer.cc (create_audio_elements): don't use + scm_eval_string. Check for minor 3rd directly. + + * input/mutopia/J.S.Bach/baerenreiter-sarabande.ly + (sarabandeCelloGlobal): key is D minor, not F major. + 2005-03-17 Jan Nieuwenhuizen Fix truncated --png output (Peter Danenberg). @@ -39,6 +47,9 @@ 2005-03-15 Han-Wen Nienhuys + * mf/GNUmakefile ($(outdir)/lilypond.map): capitalize + Emmentaler/Aybabtu. + * GNUmakefile.in: fix lilypond-words path. * po/tr.po: update to 2.3.21 diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index bcbb6b030b..5957c0d72b 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -129,7 +129,7 @@ sarabandeA = \context Voice \relative c { sarabandeCelloGlobal = { \time 3/4 - \key f \major + \key d \minor \clef bass \repeat "volta" 2 { s2.*12 diff --git a/input/typography-demo.ly b/input/typography-demo.ly index 1ac8e069f8..462b10b550 100644 --- a/input/typography-demo.ly +++ b/input/typography-demo.ly @@ -103,7 +103,7 @@ pianoLH = \relative c'' \repeat volta 2\new Voice { \change Staff = down \oneVoice d,) | - g4.( c,8) r r + g4.( b,8) r r \clef treble \grace s16 r8 8-> 8->([ )] r | \clef bass r8 dis( e) r c c | diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 9c05a1bb4d..693fc792d3 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -59,10 +59,16 @@ Key_performer::create_audio_elements () /* MIDI keys are too limited for lilypond scales. We check for minor scale and assume major otherwise. */ - SCM minor = scm_c_eval_string ("minor"); - audio_ = new Audio_key (scm_to_int (acc), - SCM_BOOL_T != scm_equal_p (minor, c_pitchlist)); + SCM third = scm_assoc (scm_from_int (2), + c_pitchlist); + bool minor = (scm_is_pair (third) + && scm_is_integer (scm_cdr (third)) + && scm_to_int (scm_cdr (third)) == FLAT); + + audio_ = new Audio_key (scm_to_int (acc), + !minor); + Audio_element_info info (audio_, key_ev_); announce_element (info); key_ev_ = 0; diff --git a/mf/GNUmakefile b/mf/GNUmakefile index e66b7490b3..28fc569d3c 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -175,16 +175,16 @@ fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.s $(outdir)/lilypond.map: $(AFM_FILES) for i in $(FETA_FONTS); do echo $$i $$i '<'$$i.pfa; done > $@ for i in $(STAFF_SIZES); \ - do echo "emmentaler-$$i emmentaler-$$i > $@ - echo "aybabtu aybabtu > $@ + echo "Aybabtu Aybabtu > $@ $(outdir)/Fontmap.lily: for i in $(FETA_FONTS); do echo "/$$i ($$i.pfa);" ; done > $@ for i in $(STAFF_SIZES); \ - do echo "/emmentaler-$$i (emmentaler-$$i.cff.ps);" ; done \ + do echo "/Emmentaler-$$i (emmentaler-$$i.cff.ps);" ; done \ >> $@ - echo "/aybabtu (aybabtu.cff.ps);" >> $@ + echo "/Aybabtu (aybabtu.cff.ps);" >> $@ local-clean: diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index e715554fb7..724281b723 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -428,7 +428,7 @@ (time-signature . (extra-space . 0.0)) (staff-bar . (extra-space . 0.0)) (breathing-sign . (minimum-space . 0.0)) - (clef . (extra-space . 0.7)) + (clef . (extra-space . 0.8)) (first-note . (fixed-space . 1.0)) (right-edge . (extra-space . 0.0)) (key-signature . (extra-space . 0.0)) @@ -1284,7 +1284,7 @@ (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) (print-function . ,Tuplet_bracket::print) (font-shape . italic) - (font-series . bold) +; (font-series . bold) (font-size . -2) (meta . ((interfaces . (text-interface line-interface tuplet-bracket-interface font-interface spanner-interface)))) diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index 66d8fbee9a..777cfd1eaa 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -503,10 +503,9 @@ class Key: s = '' if self.sharps and self.flats: - s = '\\keysignature %s ' % 'TODO' + pass else: - - if self.flats: + if self.flats: k = (ord ('cfbeadg'[self.flats % 7]) - ord ('a') - 2 -2 * self.minor + 7) % 7 else: k = (ord ('cgdaebf'[self.sharps % 7]) - ord ('a') - 2 -2 * self.minor + 7) % 7 @@ -1064,6 +1063,7 @@ for opt in options: else: flats = - alterations key = Key (sharps, flats, minor) + print key elif o == '--start-quant' or o == '-s': start_quant = string.atoi (a) elif o == '--allow-tuplet' or o == '-t':