From b27034ad5185b64d4bf317a18cceed8ed5d9a54f Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Sat, 20 Dec 2008 19:34:30 +0100 Subject: [PATCH] Add default names for accidentals with arrows in both directions --- ly/english.ly | 28 ++++++++++++++++++++++++++++ scm/lily-library.scm | 2 ++ scm/output-lib.scm | 2 ++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/ly/english.ly b/ly/english.ly index 1b92d55..8c6691f 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -128,61 +128,89 @@ pitchnamesEnglish = #`( ;; arrowed accidentals (cflatdown . ,(ly:make-pitch -1 0 FLAT-MICRO-DOWN)) + (cflatboth . ,(ly:make-pitch -1 0 FLAT-MICRO-BOTH)) (cflatup . ,(ly:make-pitch -1 0 FLAT-MICRO-UP)) (csharpdown . ,(ly:make-pitch -1 0 SHARP-MICRO-DOWN)) + (csharpboth . ,(ly:make-pitch -1 0 SHARP-MICRO-BOTH)) (csharpup . ,(ly:make-pitch -1 0 SHARP-MICRO-UP)) (dflatdown . ,(ly:make-pitch -1 1 FLAT-MICRO-DOWN)) + (dflatboth . ,(ly:make-pitch -1 1 FLAT-MICRO-BOTH)) (dflatup . ,(ly:make-pitch -1 1 FLAT-MICRO-UP)) (dsharpdown . ,(ly:make-pitch -1 1 SHARP-MICRO-DOWN)) + (dsharpboth . ,(ly:make-pitch -1 1 SHARP-MICRO-BOTH)) (dsharpup . ,(ly:make-pitch -1 1 SHARP-MICRO-UP)) (eflatdown . ,(ly:make-pitch -1 2 FLAT-MICRO-DOWN)) + (eflatboth . ,(ly:make-pitch -1 2 FLAT-MICRO-BOTH)) (eflatup . ,(ly:make-pitch -1 2 FLAT-MICRO-UP)) (esharpdown . ,(ly:make-pitch -1 2 SHARP-MICRO-DOWN)) + (esharpboth . ,(ly:make-pitch -1 2 SHARP-MICRO-BOTH)) (esharpup . ,(ly:make-pitch -1 2 SHARP-MICRO-UP)) (fflatdown . ,(ly:make-pitch -1 3 FLAT-MICRO-DOWN)) + (fflatboth . ,(ly:make-pitch -1 3 FLAT-MICRO-BOTH)) (fflatup . ,(ly:make-pitch -1 3 FLAT-MICRO-UP)) (fsharpdown . ,(ly:make-pitch -1 3 SHARP-MICRO-DOWN)) + (fsharpboth . ,(ly:make-pitch -1 3 SHARP-MICRO-BOTH)) (fsharpup . ,(ly:make-pitch -1 3 SHARP-MICRO-UP)) (gflatdown . ,(ly:make-pitch -1 4 FLAT-MICRO-DOWN)) + (gflatboth . ,(ly:make-pitch -1 4 FLAT-MICRO-BOTH)) (gflatup . ,(ly:make-pitch -1 4 FLAT-MICRO-UP)) (gsharpdown . ,(ly:make-pitch -1 4 SHARP-MICRO-DOWN)) + (gsharpboth . ,(ly:make-pitch -1 4 SHARP-MICRO-BOTH)) (gsharpup . ,(ly:make-pitch -1 4 SHARP-MICRO-UP)) (aflatdown . ,(ly:make-pitch -1 5 FLAT-MICRO-DOWN)) + (aflatboth . ,(ly:make-pitch -1 5 FLAT-MICRO-BOTH)) (aflatup . ,(ly:make-pitch -1 5 FLAT-MICRO-UP)) (asharpdown . ,(ly:make-pitch -1 5 SHARP-MICRO-DOWN)) + (asharpboth . ,(ly:make-pitch -1 5 SHARP-MICRO-BOTH)) (asharpup . ,(ly:make-pitch -1 5 SHARP-MICRO-UP)) (bflatdown . ,(ly:make-pitch -1 6 FLAT-MICRO-DOWN)) + (bflatboth . ,(ly:make-pitch -1 6 FLAT-MICRO-BOTH)) (bflatup . ,(ly:make-pitch -1 6 FLAT-MICRO-UP)) (bsharpdown . ,(ly:make-pitch -1 6 SHARP-MICRO-DOWN)) + (bsharpboth . ,(ly:make-pitch -1 6 SHARP-MICRO-BOTH)) (bsharpup . ,(ly:make-pitch -1 6 SHARP-MICRO-UP)) (csu . ,(ly:make-pitch -1 0 SHARP-MICRO-UP)) + (csb . ,(ly:make-pitch -1 0 SHARP-MICRO-BOTH)) (csd . ,(ly:make-pitch -1 0 SHARP-MICRO-DOWN)) (cfu . ,(ly:make-pitch -1 0 FLAT-MICRO-UP)) + (cfb . ,(ly:make-pitch -1 0 FLAT-MICRO-BOTH)) (cfd . ,(ly:make-pitch -1 0 FLAT-MICRO-DOWN)) (dsu . ,(ly:make-pitch -1 1 SHARP-MICRO-UP)) + (dsb . ,(ly:make-pitch -1 1 SHARP-MICRO-BOTH)) (dsd . ,(ly:make-pitch -1 1 SHARP-MICRO-DOWN)) (dfu . ,(ly:make-pitch -1 1 FLAT-MICRO-UP)) + (dfb . ,(ly:make-pitch -1 1 FLAT-MICRO-BOTH)) (dfd . ,(ly:make-pitch -1 1 FLAT-MICRO-DOWN)) (esu . ,(ly:make-pitch -1 2 SHARP-MICRO-UP)) + (esb . ,(ly:make-pitch -1 2 SHARP-MICRO-BOTH)) (esd . ,(ly:make-pitch -1 2 SHARP-MICRO-DOWN)) (efu . ,(ly:make-pitch -1 2 FLAT-MICRO-UP)) + (efb . ,(ly:make-pitch -1 2 FLAT-MICRO-BOTH)) (efd . ,(ly:make-pitch -1 2 FLAT-MICRO-DOWN)) (fsu . ,(ly:make-pitch -1 3 SHARP-MICRO-UP)) + (fsb . ,(ly:make-pitch -1 3 SHARP-MICRO-BOTH)) (fsd . ,(ly:make-pitch -1 3 SHARP-MICRO-DOWN)) (ffu . ,(ly:make-pitch -1 3 FLAT-MICRO-UP)) + (ffb . ,(ly:make-pitch -1 3 FLAT-MICRO-BOTH)) (ffd . ,(ly:make-pitch -1 3 FLAT-MICRO-DOWN)) (gsu . ,(ly:make-pitch -1 4 SHARP-MICRO-UP)) + (gsb . ,(ly:make-pitch -1 4 SHARP-MICRO-BOTH)) (gsd . ,(ly:make-pitch -1 4 SHARP-MICRO-DOWN)) (gfu . ,(ly:make-pitch -1 4 FLAT-MICRO-UP)) + (gfb . ,(ly:make-pitch -1 4 FLAT-MICRO-BOTH)) (gfd . ,(ly:make-pitch -1 4 FLAT-MICRO-DOWN)) (asu . ,(ly:make-pitch -1 5 SHARP-MICRO-UP)) + (asb . ,(ly:make-pitch -1 5 SHARP-MICRO-BOTH)) (asd . ,(ly:make-pitch -1 5 SHARP-MICRO-DOWN)) (afu . ,(ly:make-pitch -1 5 FLAT-MICRO-UP)) + (afb . ,(ly:make-pitch -1 5 FLAT-MICRO-BOTH)) (afd . ,(ly:make-pitch -1 5 FLAT-MICRO-DOWN)) (bsu . ,(ly:make-pitch -1 6 SHARP-MICRO-UP)) + (bsb . ,(ly:make-pitch -1 6 SHARP-MICRO-BOTH)) (bsd . ,(ly:make-pitch -1 6 SHARP-MICRO-DOWN)) (bfu . ,(ly:make-pitch -1 6 FLAT-MICRO-UP)) + (bfb . ,(ly:make-pitch -1 6 FLAT-MICRO-BOTH)) (bfd . ,(ly:make-pitch -1 6 FLAT-MICRO-DOWN)) ) diff --git a/scm/lily-library.scm b/scm/lily-library.scm index 22d1123..370510c 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -46,8 +46,10 @@ (define-safe-public SHARP-MICRO-DOWN 499/1000) (define-safe-public SHARP-MICRO-UP 501/1000) +(define-safe-public SHARP-MICRO-BOTH 502/1000) (define-safe-public FLAT-MICRO-UP -499/1000) (define-safe-public FLAT-MICRO-DOWN -501/1000) +(define-safe-public FLAT-MICRO-BOTH -502/1000) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; moments diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 9bb2627..cbfa983 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -443,8 +443,10 @@ centered, X==1 is at the right, X == -1 is at the left." (499/1000 . "accidentals.sharp.arrowdown") (501/1000 . "accidentals.sharp.arrowup") + (502/1000 . "accidentals.sharp.arrowboth") (-499/1000 . "accidentals.flat.arrowup") (-501/1000 . "accidentals.flat.arrowdown") + (-502/1000 . "accidentals.flat.arrowboth") )) ;; FIXME: standard vs default, alteration-FOO vs FOO-alteration -- 1.6.0.4