From 17df6db8a0cc921278ffb4e509042a814448a081 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 18 Dec 2008 15:06:36 +0100 Subject: [PATCH] New alterations for microtones and default names for notes with arrowed accidentals in english.ly --- ly/english.ly | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ scm/lily-library.scm | 5 ++++ scm/output-lib.scm | 5 ++++ 3 files changed, 69 insertions(+), 0 deletions(-) diff --git a/ly/english.ly b/ly/english.ly index 4f7983c..bb185fb 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -125,6 +125,65 @@ pitchnamesEnglish = #`( (btqs . ,(ly:make-pitch -1 6 THREE-Q-SHARP)) (bss . ,(ly:make-pitch -1 6 DOUBLE-SHARP)) (bx . ,(ly:make-pitch -1 6 DOUBLE-SHARP)) + + ;; arrowed accidentals + (cflatdown . ,(ly:make-pitch -1 0 FLAT-MICRO-DOWN)) + (cflatup . ,(ly:make-pitch -1 0 FLAT-MICRO-UP)) + (csharpdown . ,(ly:make-pitch -1 0 SHARP-MICRO-DOWN)) + (csharpup . ,(ly:make-pitch -1 0 SHARP-MICRO-UP)) + (dflatdown . ,(ly:make-pitch -1 1 FLAT-MICRO-DOWN)) + (dflatup . ,(ly:make-pitch -1 1 FLAT-MICRO-UP)) + (dsharpdown . ,(ly:make-pitch -1 1 SHARP-MICRO-DOWN)) + (dsharpup . ,(ly:make-pitch -1 1 SHARP-MICRO-UP)) + (eflatdown . ,(ly:make-pitch -1 2 FLAT-MICRO-DOWN)) + (eflatup . ,(ly:make-pitch -1 2 FLAT-MICRO-UP)) + (esharpdown . ,(ly:make-pitch -1 2 SHARP-MICRO-DOWN)) + (esharpup . ,(ly:make-pitch -1 2 SHARP-MICRO-UP)) + (fflatdown . ,(ly:make-pitch -1 3 FLAT-MICRO-DOWN)) + (fflatup . ,(ly:make-pitch -1 3 FLAT-MICRO-UP)) + (fsharpdown . ,(ly:make-pitch -1 3 SHARP-MICRO-DOWN)) + (fsharpup . ,(ly:make-pitch -1 3 SHARP-MICRO-UP)) + (gflatdown . ,(ly:make-pitch -1 4 FLAT-MICRO-DOWN)) + (gflatup . ,(ly:make-pitch -1 4 FLAT-MICRO-UP)) + (gsharpdown . ,(ly:make-pitch -1 4 SHARP-MICRO-DOWN)) + (gsharpup . ,(ly:make-pitch -1 4 SHARP-MICRO-UP)) + (aflatdown . ,(ly:make-pitch -1 5 FLAT-MICRO-DOWN)) + (aflatup . ,(ly:make-pitch -1 5 FLAT-MICRO-UP)) + (asharpdown . ,(ly:make-pitch -1 5 SHARP-MICRO-DOWN)) + (asharpup . ,(ly:make-pitch -1 5 SHARP-MICRO-UP)) + (bflatdown . ,(ly:make-pitch -1 6 FLAT-MICRO-DOWN)) + (bflatup . ,(ly:make-pitch -1 6 FLAT-MICRO-UP)) + (bsharpdown . ,(ly:make-pitch -1 6 SHARP-MICRO-DOWN)) + (bsharpup . ,(ly:make-pitch -1 6 SHARP-MICRO-UP)) + + (csu . ,(ly:make-pitch -1 0 SHARP-MICRO-UP)) + (csd . ,(ly:make-pitch -1 0 SHARP-MICRO-DOWN)) + (cfu . ,(ly:make-pitch -1 0 FLAT-MICRO-UP)) + (cfd . ,(ly:make-pitch -1 0 FLAT-MICRO-DOWN)) + (dsu . ,(ly:make-pitch -1 1 SHARP-MICRO-UP)) + (dsd . ,(ly:make-pitch -1 1 SHARP-MICRO-DOWN)) + (dfu . ,(ly:make-pitch -1 1 FLAT-MICRO-UP)) + (dfd . ,(ly:make-pitch -1 1 FLAT-MICRO-DOWN)) + (esu . ,(ly:make-pitch -1 2 SHARP-MICRO-UP)) + (esd . ,(ly:make-pitch -1 2 SHARP-MICRO-DOWN)) + (efu . ,(ly:make-pitch -1 2 FLAT-MICRO-UP)) + (efd . ,(ly:make-pitch -1 2 FLAT-MICRO-DOWN)) + (fsu . ,(ly:make-pitch -1 3 SHARP-MICRO-UP)) + (fsd . ,(ly:make-pitch -1 3 SHARP-MICRO-DOWN)) + (ffu . ,(ly:make-pitch -1 3 FLAT-MICRO-UP)) + (ffd . ,(ly:make-pitch -1 3 FLAT-MICRO-DOWN)) + (gsu . ,(ly:make-pitch -1 4 SHARP-MICRO-UP)) + (gsd . ,(ly:make-pitch -1 4 SHARP-MICRO-DOWN)) + (gfu . ,(ly:make-pitch -1 4 FLAT-MICRO-UP)) + (gfd . ,(ly:make-pitch -1 4 FLAT-MICRO-DOWN)) + (asu . ,(ly:make-pitch -1 5 SHARP-MICRO-UP)) + (asd . ,(ly:make-pitch -1 5 SHARP-MICRO-DOWN)) + (afu . ,(ly:make-pitch -1 5 FLAT-MICRO-UP)) + (afd . ,(ly:make-pitch -1 5 FLAT-MICRO-DOWN)) + (bsu . ,(ly:make-pitch -1 6 SHARP-MICRO-UP)) + (bsd . ,(ly:make-pitch -1 6 SHARP-MICRO-DOWN)) + (bfu . ,(ly:make-pitch -1 6 FLAT-MICRO-UP)) + (bfd . ,(ly:make-pitch -1 6 FLAT-MICRO-DOWN)) ) pitchnames = \pitchnamesEnglish diff --git a/scm/lily-library.scm b/scm/lily-library.scm index 8176db1..7ebf478 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -41,6 +41,11 @@ (define-safe-public DOUBLE-SHARP 1) (define-safe-public SEMI-TONE 1/2) +(define-safe-public SHARP-MICRO-DOWN 499/1000) +(define-safe-public SHARP-MICRO-UP 501/1000) +(define-safe-public FLAT-MICRO-UP -499/1000) +(define-safe-public FLAT-MICRO-DOWN -501/1000) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; moments diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 9b813a5..c803225 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -391,6 +391,11 @@ centered, X==1 is at the right, X == -1 is at the left." (1/4 . "accidentals.sharp.slashslash.stem") (-1/4 . "accidentals.mirroredflat") (-3/4 . "accidentals.mirroredflat.flat") + + (499/1000 . "accidentals.sharp.arrowdown") + (501/1000 . "accidentals.sharp.arrowup") + (-499/1000 . "accidentals.flat.arrowup") + (-501/1000 . "accidentals.flat.arrowdown") )) ;; FIXME: standard vs default, alteration-FOO vs FOO-alteration -- 1.5.4.3