add X names for double sharp.

diff --git a/ChangeLog b/ChangeLog
index c5e97d07a5868be48a8839b4a5dd311e106bbf9c..7e84582c177bf265c48f5e005234b3263466b40b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/template/*.ly: remove old relative.
+
+       * ly/english.ly: add X names for double sharp.
+
 2003-09-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/font-select.cc: new file handle font selection routines.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cfbfede34e5df29c21c9c6bcfbf230cab0370780..853dda01c109a2a94219c1b5c37f924ae1cfd172 100644 (file)
--- 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 4f3df05c568b1eed8c941229d0b7f9480e982b13..8461f40cb8aacae04bf1999ab489fc6efcd1dd23 100644 (file)
--- 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 ea462ae0843e39ef4fcbec2c0fc2355f571aaaca..9ac648d133f90511c0001584ef2e133e68d1f9c1 100644 (file)
--- 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 2dd7b50cb8c134dc860187f8086042cf6e610e1f..44a1ab855ac95806d413bb6f9b28012bb00737f4 100644 (file)
--- 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 47d4afdce87ad31c5a2081f6ad6a5b01ea4e2987..af42dc294cf18e30e607a6db66bce72c2ddd5fe2 100644 (file)
--- 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 20f94fe6e9de847cad9ea2275e6faac5f44a788e..4f14ba4a7e2214b8c91e93fe1878246aac9defa8 100644 (file)
--- 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 08e1641226e5ccb7daec4b6a2bf94ed2d45b4ec6..bd0b6cd517bd4bcf253e99b2bc976d867a70a34b 100644 (file)
--- 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 61767502f59e1a6b5d0e765d088e81db1c979cff..e0830f219dddea6fb3806f95370a4c78e088f828 100644 (file)
--- 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 6e557fd2a4ac01d2cfd5e30cf8480ea044c2363c..b7be9188f9d35f638f84d436b0e5f9487601b8d0 100644 (file)
--- 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 d13f00edbc800e166b2abdd7d6294fa0d30c2542..0e9cfd4888dfe04d8329c32c051abb83853c094a 100644 (file)
--- 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 62e91b26144425302a4705c9e99b90d6243290e2..b82816c0909047efbbfc3057cac655ab8b0b3309 100644 (file)
--- 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 71450351ffb37fbea8d14438f60a409955cd63b9..000f57fddd566a180fe9338421bfd9e47ad717e4 100644 (file)
--- 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 5c5c763d8c73b77c0e6a6c68be81493888fa8a1a..a95e6241ca33d513c04f374f3401c09e587bf44a 100644 (file)
--- 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