From: Han-Wen Nienhuys Date: Mon, 15 Sep 2003 19:12:18 +0000 (+0000) Subject: add X names for double sharp. X-Git-Tag: release/1.9.6~8 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bc3f350df801069910cff27512d9bd4a3b20de9e;p=lilypond.git add X names for double sharp. --- diff --git a/ChangeLog b/ChangeLog index c5e97d07a5..7e84582c17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-15 Han-Wen Nienhuys + + * input/template/*.ly: remove old relative. + + * ly/english.ly: add X names for double sharp. + 2003-09-14 Han-Wen Nienhuys * lily/font-select.cc: new file handle font selection routines. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index cfbfede34e..853dda01c1 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -116,6 +116,7 @@ and the note names they define are: Note Names sharp flat nederlands.ly c d e f g a bes b -is -es english.ly c d e f g a bf b -s/-sharp -f/-flat + -x (double) deutsch.ly c d e f g a b h -is -es norsk.ly c d e f g a b h -iss/-is -ess/-es svenska.ly c d e f g a b h -iss -ess diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index 4f3df05c56..8461f40cb8 100644 --- a/input/template/gregorian-transcription.ly +++ b/input/template/gregorian-transcription.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly index ea462ae084..9ac648d133 100644 --- a/input/template/melody-lyrics-chords.ly +++ b/input/template/melody-lyrics-chords.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 2dd7b50cb8..44a1ab855a 100644 --- a/input/template/melody-lyrics.ly +++ b/input/template/melody-lyrics.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/input/template/melody.ly b/input/template/melody.ly index 47d4afdce8..af42dc294c 100644 --- a/input/template/melody.ly +++ b/input/template/melody.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly index 20f94fe6e9..4f14ba4a7e 100644 --- a/input/template/piano-4-voices.ly +++ b/input/template/piano-4-voices.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index 08e1641226..bd0b6cd517 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { texidoc =" diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 61767502f5..e0830f219d 100644 --- a/input/template/piano-lyrics.ly +++ b/input/template/piano-lyrics.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index 6e557fd2a4..b7be9188f9 100644 --- a/input/template/piano-melody-lyrics.ly +++ b/input/template/piano-melody-lyrics.ly @@ -1,5 +1,3 @@ -#(ly:set-option 'old-relative) -\version "1.9.4" \header { texidoc ="Classical song format: one staff with melody and lyrics, diff --git a/input/template/piano.ly b/input/template/piano.ly index d13f00edbc..0e9cfd4888 100644 --- a/input/template/piano.ly +++ b/input/template/piano.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/input/template/satb.ly b/input/template/satb.ly index 62e91b2614..b82816c090 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { diff --git a/ly/english.ly b/ly/english.ly index 71450351ff..000f57fddd 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -45,37 +45,44 @@ (c . ,(ly:make-pitch -1 0 0 )) (cs . ,(ly:make-pitch -1 0 1 )) (css . ,(ly:make-pitch -1 0 2 )) + (cx . ,(ly:make-pitch -1 0 2 )) (dff . ,(ly:make-pitch -1 1 -2 )) (df . ,(ly:make-pitch -1 1 -1 )) (d . ,(ly:make-pitch -1 1 0 )) (ds . ,(ly:make-pitch -1 1 1 )) (dss . ,(ly:make-pitch -1 1 2 )) + (dx . ,(ly:make-pitch -1 1 2 )) (eff . ,(ly:make-pitch -1 2 -2 )) (ef . ,(ly:make-pitch -1 2 -1 )) (e . ,(ly:make-pitch -1 2 0 )) (es . ,(ly:make-pitch -1 2 1 )) (ess . ,(ly:make-pitch -1 2 2 )) + (ex . ,(ly:make-pitch -1 2 2 )) (fff . ,(ly:make-pitch -1 3 -2 )) (ff . ,(ly:make-pitch -1 3 -1 )) (f . ,(ly:make-pitch -1 3 0 )) (fs . ,(ly:make-pitch -1 3 1 )) (fss . ,(ly:make-pitch -1 3 2 )) + (fx . ,(ly:make-pitch -1 3 2 )) (gff . ,(ly:make-pitch -1 4 -2 )) (gf . ,(ly:make-pitch -1 4 -1 )) (g . ,(ly:make-pitch -1 4 0 )) (gs . ,(ly:make-pitch -1 4 1 )) (gss . ,(ly:make-pitch -1 4 2 )) + (gx . ,(ly:make-pitch -1 4 2 )) (aff . ,(ly:make-pitch -1 5 -2 )) (af . ,(ly:make-pitch -1 5 -1 )) (a . ,(ly:make-pitch -1 5 0 )) (as . ,(ly:make-pitch -1 5 1 )) (ass . ,(ly:make-pitch -1 5 2 )) + (ax . ,(ly:make-pitch -1 5 2 )) (bff . ,(ly:make-pitch -1 6 -2 )) (bf . ,(ly:make-pitch -1 6 -1 )) (b . ,(ly:make-pitch -1 6 0 )) (bs . ,(ly:make-pitch -1 6 1 )) (bss . ,(ly:make-pitch -1 6 2 )) + (bx . ,(ly:make-pitch -1 6 2 )) ) \version "1.9.1" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 5c5c763d8c..a95e6241ca 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -335,7 +335,7 @@ LyricsContext = \translator { %% To get folded repeats right. \consists Vertical_align_engraver - \consistsend "Hara_kiri_engraver" +% \consistsend "Hara_kiri_engraver" minimumVerticalExtent = ##f extraVerticalExtent = ##f verticalExtent = ##f