From 2c66e3da46201b89bd841f9a9c9df7ba302a71e0 Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Thu, 20 Aug 2009 13:11:36 -0700 Subject: [PATCH] Organize pitchname files. --- ly/catalan.ly | 32 ++++++++++++++++++-------------- ly/deutsch.ly | 34 ++++++++++++++++++++++++++-------- ly/english.ly | 32 +++++++++++++++++++------------- ly/espanol.ly | 36 ++++++++++++++++++++++-------------- ly/italiano.ly | 36 ++++++++++++++++++++++++++---------- ly/nederlands.ly | 24 ++++++++++++++++++++---- ly/norsk.ly | 41 +++++++++++++++++------------------------ ly/portugues.ly | 28 ++++++++++++++++++++-------- ly/suomi.ly | 29 +++++++++++++++++++++-------- ly/svenska.ly | 25 ++++++++++++++++++++----- ly/vlaams.ly | 22 +++++++++++++++------- 11 files changed, 224 insertions(+), 115 deletions(-) diff --git a/ly/catalan.ly b/ly/catalan.ly index aab7edf..7116562 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -1,23 +1,29 @@ +%%%% catalan.ly -- common Catalan names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1998--2009 Jaume Obrador + +\version "2.12.0" + %{ - Common catalan names for notes. "b" means flat (bemoll), "d" means sharp - (diesi). Also "s" is included for sharp (sostingut). Both "diesi" and - "sostingut" are approved by "Diccionari de la Llengua Catalana" from - "Institut d'Estudis Catalans". + b = flat (bemoll) + bb = double-flat - Adapted from italiano.ly. + d = sharp (diesi) + dd = double-sharp - English: a b c d e f g - Catalan: la si do re mi fa sol + s = sharp (sostingut) + ss = double-sharp - For spanish naming just use the sharp sign "s" (sostenido) instead of "s" -(sostenido) . -%} + English: c d e f g a b + Catalan: do re mi fa sol la si -% contributed by Jaume Obrador <> + Adapted from italiano.ly. +%} -% For using "sostingut" notation, which is also correct pitchnamesCatalan = #`( (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) (dob . ,(ly:make-pitch -1 0 FLAT)) @@ -74,6 +80,4 @@ pitchnamesCatalan = #`( pitchnames = \pitchnamesCatalan -\version "2.12.0" - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 0967f4c..2300bfc 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -1,11 +1,31 @@ -% common german names for notes. "es" means flat, "is" means sharp -% -% by Roland Meier <> -% based on swedish.ly by Mats Bengtsson. +%%%% deutsch.ly -- common German names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1997--2009 Roland Meier +%%%% Bjoern Jacke +%%%% (added asas; added comment to ases) -% 1999/06/09 Bjoern Jacke <> -% added asas and marked ases as `unusual' +\version "2.12.0" + +%{ + + es = flat + eses = double-flat + eh = quarter-tone flat + eseh = three-quarter-tones flat + + is = sharp + isis = double-sharp + ih = quarter-tone sharp + isih = three-quarter-tones sharp + English: c d e f g a bf b + German: c d e f g a b h + + Adapted from svenska.ly + +%} pitchnamesDeutsch = #`( (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) @@ -84,6 +104,4 @@ pitchnamesDeutsch = #`( pitchnames = \pitchnamesDeutsch -\version "2.12.0" - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/english.ly b/ly/english.ly index fec9b11..6085683 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -1,15 +1,24 @@ +%%%% english.ly -- common English names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1996--2009 Han-Wen Nienhuys + +\version "2.12.0" + %{ - English note names spelled out in full, and abbreviated - ff for double-flat - tqf for three-quarters flat - f for flat - qf for quarter-flat - - qs for quarter-sharp - s for sharp - tqs for three-quarters sharp - x for double-sharp + f = flat + ff = double-flat + qf = quarter-flat + tqf = three-quarters flat + + s = sharp + x = double-sharp + ss = double-sharp + qs = quarter-sharp + tqs = three-quarters sharp + %} pitchnamesEnglish = #`( @@ -129,7 +138,4 @@ pitchnamesEnglish = #`( pitchnames = \pitchnamesEnglish -\version "2.12.0" - - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/espanol.ly b/ly/espanol.ly index 432aa09..5111e88 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -1,20 +1,30 @@ -%{ +%%%% espanol.ly -- common Spanish names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 2002--2009 Carlos García Suárez +%%%% Maximiliano G. G. +%%%% (double-flats, double-sharps, quarter-tones, etc.) - Common Spanish names for notes. "b" means flat (bemol), "s" means sharp (sostenido). - Adapted from italiano.ly. +\version "2.12.0" - English: a b c d e f g - Spanish: la si do re mi fa sol +%{ -%} + b = flat (bemol) + bb = double-flat + cb = quarter-tone flat (cuarto [de tono] bemol) + tcb = three-quarters-tone flat (trés cuarto [de tono] bemol) -%{ + s = sharp (sostenido) + x = double-sharp + ss = double-sharp + cs = quarter-tone sharp (cuarto de tono sostenido) + tcs = three-quarters-tone sharp (trés cuarto [de tono] sostenido) + + English: c d e f g a b + Spanish: do re mi fa sol la si - contributed by Carlos García Suárez <> - - and contributed by Maximiliano G. G. <> con: - doble alteración alternativa, x para doble sostenido - cuartos de tono: tcb, cb, cs, tcs + Adapted from italiano.ly. %} @@ -100,6 +110,4 @@ pitchnamesEspanol = #`( pitchnames = \pitchnamesEspanol -\version "2.12.0" - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/italiano.ly b/ly/italiano.ly index c22292b..cc39acf 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -1,15 +1,33 @@ +%%%% italiano.ly -- common Italian names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1998--2009 Paolo Zuliani +%%%% Eric Wurbel +%%%% (additions for semi-sharps and semi-flats) + +\version "2.12.0" + %{ - Common italian names for notes. "b" means flat (bemolle), "d" means sharp (diesis) and "s" means semi- (semi-). - Adapted from dutch.ly. - English: a b c d e f g - Italian: la si do re mi fa sol + b = flat (bemolle) + bb = double-flat + sb = quarter-tone flat (semi-bemolle) + bsb = three-quarters-tone flat - For french naming just change 'do' in 'ut'. -%} + d = sharp (diesis) + dd = double-sharp + sd = quarter-tone sharp (semi-diesis) + dsd = three-quarters-tone sharp + + English: c d e f g a b + Italian: do re mi fa sol la si -% contributed by Paolo Zuliani <> -% additions for semi-sharps and semi-flats by Eric Wurbel <> + Adapted from nederlands.ly. + + For french naming just change 'do' to 'ut'. + +%} pitchnamesItaliano = #`( (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) @@ -86,6 +104,4 @@ pitchnamesItaliano = #`( pitchnames = \pitchnamesItaliano -\version "2.12.0" - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 9a1eaab..4ee1971 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,14 +1,30 @@ +%%%% nederlands.ly -- common Dutch names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1996--2009 Han-Wen Nienhuys + \version "2.12.0" + %{ - common dutch names for notes. es means flat, is means sharp -notenames should only contain letters. No digits or punctuation. + es = flat + eses = double-flat + eh = quarter-tone flat + eseh = three-quarter-tones flat + + is = sharp + isis = double-sharp + ih = quarter-tone sharp + isih = three-quarter-tones sharp + + English: c d e f g a bf b + Dutch: c d e f g a b h %} dutchPitchnames = #`( (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) - (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT)) (ces . ,(ly:make-pitch -1 0 FLAT)) (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT)) @@ -83,6 +99,6 @@ dutchPitchnames = #`( (bisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP)) ) +pitchnames = \dutchPitchnames -pitchnames = \dutchPitchnames #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/norsk.ly b/ly/norsk.ly index 5b02889..f4805bc 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -1,29 +1,25 @@ +%%%% norsk.ly -- common Norwegian names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1998--2009 Arvid Grøtting -% Idx norsk.ly,v 1.1 1998/03/25 11:38:28 arvidg Exp arvidg $ +\version "2.12.0" %{ - Common norwegian names for notes, including versions without the - double s-es to save typing, as well as the traditional names with - them not to confuse musicians. "es" or "ess" means flat, "is" or - "iss" means sharp. - - Otherwise, the main difference from the dutch names is the that the - "b" is called "h" in norwegian, while the dutch "bes" is a norwegian - "b". - - Staying within the (proud?) naming convention for norwegian language - setup used in LaTeX, this file is called "norsk.ly" instead of - "norwegian.ly", even if all other languages' files use the english - name. + es = flat + ess = flat + eses = double-flat + essess = double-flat - This file is based on "dutch.ly". Basically, I copied "dutch.ly", - duplicated all lines containing at least one "is" or "es", changed - every other "is" into an "iss" and every other "es" into an "ess", - added "ass" et al, and made some b->h-related changes. There may be - bugs in here please tell me (or send patches) if you find any. + is = sharp + iss = sharp + isis = double-sharp + ississ = double-sharp - Arvid Gr=F8tting <> + English: c d e f g a bf b + Norwegian: c d e f g a b h %} @@ -102,9 +98,6 @@ pitchnamesNorsk = #`( (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP)) ) - -pitchnames =\pitchnamesNorsk - -\version "2.12.0" +pitchnames = \pitchnamesNorsk #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/portugues.ly b/ly/portugues.ly index 4810c85..d1311f4 100644 --- a/ly/portugues.ly +++ b/ly/portugues.ly @@ -1,15 +1,29 @@ +%%%% portugues.ly -- common Portuguese names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 2004--2009 Pedro Kröger + +\version "2.12.0" + %{ - Common Portuguese names for notes. "b" means flat (bemol), "s" means - sharp (sustenido). Adapted from espanol.ly and italian.ly. + b = flat (bemol) + bb = double-flat + bqt = quarter-tone flat + btqt = three-quarters-tone flat - English: a b c d e f g - Portuguese: la si do re mi fa sol + s = sharp (sustenido) + ss = double-sharp + sqt = quarter-tone sharp + stqt = three-quarters-tone sharp -%} + English: c d e f g a b + Portuguese: do re mi fa sol la si -% contributed by Pedro Kröger <> + Adapted from espanol.ly and italiano.ly. +%} pitchnamesPortuguese = #`( (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) @@ -86,6 +100,4 @@ pitchnamesPortuguese = #`( pitchnames = \pitchnamesPortuguese -\version "2.12.0" - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/suomi.ly b/ly/suomi.ly index 10e1cbf..4b80c80 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -1,10 +1,25 @@ -% common finnish names for notes. "es" means flat, "is" means sharp -% -% by Heikki Junes <> -% based on svenska.ly by Mats Bengtsson. +%%%% suomi.ly -- common Finnish names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 2001--2009 Heikki Junes -% 2001/08/28 Heikki Junes <> -% added bb and marked heses as `unusual' +\version "2.12.0" + +%{ + + es = flat + eses = double-flat + + is = sharp + isis = double-sharp + + English: c d e f g a bf b + Finnish: c d e f g a b h + + Adapted from svenska.ly + +%} pitchnamesSuomi = #`( (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) @@ -49,6 +64,4 @@ pitchnamesSuomi = #`( pitchnames = \pitchnamesSuomi -\version "2.12.0" - #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/svenska.ly b/ly/svenska.ly index 2606389..79ff956 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -1,7 +1,23 @@ -% -% common Swedish names for notes. "ess" means flat, "iss" means sharp -% -% by Mats Bengtsson. +%%%% svenska.ly -- common Swedish names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 1997--2009 Mats Bengtsson + +\version "2.12.0" + +%{ + + ess = flat + essess = double-flat + + iss = sharp + ississ = double-sharp + + English: c d e f g a bf b + Swedish: c d e f g a b h + +%} pitchnamesSvenska = #`( (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) @@ -42,6 +58,5 @@ pitchnamesSvenska = #`( ) pitchnames = \pitchnamesSvenska -\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/vlaams.ly b/ly/vlaams.ly index eb35589..08d0f5f 100644 --- a/ly/vlaams.ly +++ b/ly/vlaams.ly @@ -1,17 +1,25 @@ -\version "2.12.0" %hier stond 2.1.36, mocht ik dat wel veranderen? +%%%% vlaams.ly -- common Flemish names for notes +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 2004--2009 Hendrik Maryns + +\version "2.12.0" %{ - Common Flemish names for notes. "b" means flat (bemol), "k" means sharp (kruis). - Adapted from espanol.ly. + b = flat (bemol) + bb = double-flat - English: a b c d e f g - Flemish: la si do re mi fa sol + k = sharp (kruis) + kk = double-sharp -%} + English: c d e f g a b + Flemish: do re mi fa sol la si -% contributed by Hendrik Maryns <> 06/06/2004 + Adapted from espanol.ly. +%} pitchnamesVlaams = #`( (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) -- 1.6.4.msysgit.0