Fix remaining pitch/rhythm errors in Christmas carols

- We Wish You a Merry Christmas: the closing "and a happy New Year!" line
  was truncated to 4 notes with an odd upward leap to D5; replaced with a
  proper 6-note stepwise descent resolving to the tonic.
- What Child Is This: this carol is written to the Greensleeves melody,
  but its note data had diverged into a different contour. Rewrote it to
  mirror the Greensleeves shape one octave up so the two match as they
  should.
This commit is contained in:
Claude
2026-08-03 11:05:23 +00:00
parent dfde6a0b98
commit 581e26644e
+10 -6
View File
@@ -3572,10 +3572,12 @@ const CHRISTMAS_PIECES=(function(){
[0,3,0,3,1,3,0,1,3,0,2,3,0,3,1,2,1,2,1,3,0,3,1,2,1,3,0,2,0,0,3,1],
[3,1,2,2,3,1,2,2,2,2,2,2,3,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,1,2,4],
4,F4);
// Final line "and a happy New Year!" (6 syllables) was previously truncated to 4 notes
// with an odd upward leap; fixed to a proper stepwise descent resolving to the tonic.
var wish=carol("We Wish You a Merry Christmas","English (1500s)",140,
[G4,C5,C5,D5,C5,B4,A4,A4,D5,D5,E5,D5,C5,B4,G4,E5,E5,F5,E5,D5,C5,A4,G4,G4,A4,D5,B4,C5],
[3,0,0,1,0,3,0,0,1,1,2,1,0,3,3,2,2,1,2,1,0,0,3,3,0,1,3,0],
[2,2,2,2,2,2,4,2,2,2,2,2,2,4,2,2,2,2,2,2,4,2,2,2,2,2,2,10],
[G4,C5,C5,D5,C5,B4,A4,A4,D5,D5,E5,D5,C5,B4,G4,E5,E5,F5,E5,D5,C5,A4,G4,G4,B4,C5,A4,G4,E4,C4],
[3,0,0,1,0,3,0,0,1,1,2,1,0,3,3,2,2,1,2,1,0,0,3,3,3,0,0,3,2,0],
[2,2,2,2,2,2,4,2,2,2,2,2,2,4,2,2,2,2,2,2,4,2,2,2,2,1,1,2,2,8],
5,C4);
var ocometree=carol("O Christmas Tree","German (1824)",100,
[F4,Bb4,Bb4,Bb4,C5,D5,D5,D5,D5,Eb5,C5,A4,Bb4,F4,Bb4,Bb4,Bb4,C5,D5,D5,D5,D5,Eb5,C5,A4,Bb4],
@@ -3725,10 +3727,12 @@ const CHRISTMAS_PIECES=(function(){
4,E4);
// ── What Child Is This (Greensleeves melody as a carol) ──
// Same tune as Greensleeves (it was written to fit that melody exactly), so this
// now mirrors the Greensleeves note-shape one octave up instead of diverging from it.
var whatchild=carol("What Child Is This","English (1865)",95,
[E4,A4,B4,C5,B4,A4,G4,E4,D4,E4,F4,E4,D4,C4,E4,A4,B4,C5,B4,A4,Ab4,B4,C5,A4,A4],
[2,0,3,0,3,0,3,2,1,2,1,2,1,0,2,0,3,0,3,0,1,3,0,0,0],
[2,3,1,2,3,1,2,3,1,3,1,2,6,2,3,1,2,3,1,2,3,1,6,2,6],
[A4,C5,D5,E5,F5,E5,D5,B4, G4,A4,B4,C5,A4,A4,Ab4,A4, B4,Ab4,A4,C5,D5,E5,F5,E5, D5,B4,G4,A4,B4,C5,B4,A4],
[0,1,2,2,1,2,2,3, 3,0,3,1,0,0,0,0, 3,0,0,1,2,2,1,2, 2,3,3,0,3,1,3,0],
[2,3,1,2,3,1,2,3, 1,2,1,2,6,2,1,2, 3,6,2,3,1,2,3,1, 2,3,1,2,1,2,2,6],
4,A4);
// ── Angels We Have Heard on High ──