patch::: 1.3.96.jcn8

diff --git a/VERSION b/VERSION
index 0716cceb700e972f9908e5f8d14a33ef74f85445..bcd827905b8d0e0f69ec64d0dca3dc634462afd1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=96
-MY_PATCH_LEVEL=jcn7
+MY_PATCH_LEVEL=jcn8
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/denneboom.ly b/input/denneboom.ly
index 3fa6b727a0e723c649eb3c293c1863edbc66bb76..2600ab0ed0236ca60c9280f963696cb3f211af6f 100644 (file)
--- a/input/denneboom.ly
+++ b/input/denneboom.ly
@@ -7,7 +7,7 @@ copyright =      "public domain";
 
 \include "paper20.ly"
 
-\version "1.3.93";
+\version "1.3.96";
 
 oden = \lyrics{ 
        O |

diff --git a/input/example-1.ly b/input/example-1.ly
index 839690d4c7fa1a517eef55311c127061b4b0be45..f9ac3b298b9e769f7a2f1d19abae1f3860e2aa51 100644 (file)
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -17,4 +17,4 @@
   }
   \paper {  }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/example-2.ly b/input/example-2.ly
index 982027eb406ee2e9339cd331538385a0b5ba987f..1c7c56208c1064252a116601559e2adecbe25b7e 100644 (file)
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -17,4 +17,4 @@
   }
   \paper {  }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/example-3.ly b/input/example-3.ly
index 7446e2eb473064b2913f1d2be33a3d1cbf8c530e..1819d7680526db84b19a710e2c0e400d650810ee 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 one = \notes\relative c{
        c'' d e f

diff --git a/input/just-friends.ly b/input/just-friends.ly
index 82b34fc94d603d7a08095b3ae5bfbcc44053d13d..8eef71faa1505edd0c34932381e10b81b28055e3 100644 (file)
--- a/input/just-friends.ly
+++ b/input/just-friends.ly
@@ -48,7 +48,7 @@ of a certain tune (Jazz, Real Book, for example), like
                indent = 0.0\mm;
                linewidth = 100.0\mm;
                \translator{
-                       \ChordNameContext
+                       \ChordNamesContext
                        barAuto = "1";
                        \consists Bar_engraver;
                        \consists "Repeat_engraver";
@@ -56,4 +56,4 @@ of a certain tune (Jazz, Real Book, for example), like
        }
 }
 
-\version "1.3.93";
+\version "1.3.96";

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index e6680033fb45406d10c735fcd29b19497d8db9b1..6fe81a6229e755d1074b639268a4a1994567b91c 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -22,7 +22,7 @@
    * organ staff...
 %}
 
-\version "1.3.93";
+\version "1.3.96";
 
 
 

diff --git a/input/rhythm.ly b/input/rhythm.ly
index c0eebab78b72850928b7c771c182b9b9fc56f5c1..ded45e189002e2236c462ad97dd6e94f3f10785d 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,7 +7,7 @@ TestedFeatures =         "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "1.3.93";
+\version "1.3.96";
 
 ritme = \notes\transpose c'' {
        \time  4/4;

diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly
index b364b406d20f82d4a350608fcad4af75c5d268d8..52e9c4fb8a06517dbb4472a9e382ef5c32b3b6f9 100644 (file)
--- a/input/scarlatti-properties.ly
+++ b/input/scarlatti-properties.ly
@@ -1,7 +1,7 @@
 
 
 
-\version "1.3.93";
+\version "1.3.96";
 
 rh=\property Thread.NoteHead \push #'style = #'default
 lh=\property Thread.NoteHead \push #'style = #'diamond

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index 1416f5bf830359d3830eca209be9ee224fcb082b..f3033e00f88135268cbabedd0c3e356f29da8738 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html
 http://www.Arkkra.com/doc/star.ps
 %}
 
-\version "1.3.93";
+\version "1.3.96";
 
 % TODO: 
 %

diff --git a/input/test/accid.ly b/input/test/accid.ly
index fb00fbc50e6bea503a9e66a2d79dba669b10587f..ec686fadc0f9258aeb8def24df3b23ac2f2401f8 100644 (file)
--- a/input/test/accid.ly
+++ b/input/test/accid.ly
@@ -10,4 +10,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/accidental-spacing.ly b/input/test/accidental-spacing.ly
index 19d07f138b5cd41a60e1162c8541bf2410f8b88d..22217e12085ac1dbdf5c63b4da0b5684fa4a7be8 100644 (file)
--- a/input/test/accidental-spacing.ly
+++ b/input/test/accidental-spacing.ly
@@ -7,4 +7,4 @@
     linewidth=-1.0;
   }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/as.ly b/input/test/as.ly
index 3aa062eec9ccc53c4c74fac95a4a571d965f3215..06cc24dea390f4a025c8c08eac5e421c0f7eae3a 100644 (file)
--- a/input/test/as.ly
+++ b/input/test/as.ly
@@ -6,4 +6,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/as1.ly b/input/test/as1.ly
index cd66621667b3dd44f0b6b89112fe8d436a972e17..2003013d42061aa4b57666fafbb06138c60270fe 100644 (file)
--- a/input/test/as1.ly
+++ b/input/test/as1.ly
@@ -7,4 +7,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/auto-isknee.ly b/input/test/auto-isknee.ly
index b53ec2924a6c08e1c3de86709ed737870735c44c..ea22d212a7ce183a8cf067d58d7c8a9d8c711339 100644 (file)
--- a/input/test/auto-isknee.ly
+++ b/input/test/auto-isknee.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score {
        \notes \context PianoStaff <
                \context Staff = "up" {

diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index 89689d43580f34d1ba76576f83faf7e4b3ed711b..e9be547c7a0ee66a3a4ecd98f3f2e360a740e76e 100644 (file)
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,4 +1,4 @@
-\version "1.3.80";
+\version "1.3.96";
 % bagpipe music.
 
 \header
@@ -12,20 +12,20 @@
   \translator {
        \GraceContext
 
-       basicNoteHeadProperties \push #'font-size = #-2
-       basicNoteHeadProperties \push #'font-size = #-2 
-        basicStemProperties \push #'flag-style = ##f
+       NoteHead \push #'font-size = #-2
+       NoteHead \push #'font-size = #-2        
+        Stem \push #'flag-style = ##f
     % The following determines the length of stems without beams
     % default is between 2.8 and 4.0 depending on the number of flags
-         basicStemProperties \push #'length = #6       
-        basicStemProperties \push #'font-size = #-2
-       basicGraceAlignItemProperties \push #'horizontal-space = #1
-       basicStemProperties \push #'flag-style = #""
+         Stem \push #'length = #6      
+        Stem \push #'font-size = #-2
+       GraceAlignItem \push #'horizontal-space = #1
+       Stem \push #'flag-style = #""
  
   }
   \translator { \StaffContext
-       basicTimeSignatureProperties \push #'style = #"C4/4"
-       basicTimeSignatureProperties \push #'visibility-function = #begin-of-line-visible
+       TimeSignature \push #'style = #"C4/4"
+       TimeSignature \push #'visibility-function = #begin-of-line-visible
   }    
 }
 
@@ -72,7 +72,7 @@ gcdg = \notes{ \grace { [g'32 c d]}}
 \score {
   \notes { \time 6/8; \partial 4;
   \property Voice.tieVerticalDirection = \up
-  \slurup
+  \slurUp
 f4 |
 \gg f4 e8 \thrd d4. |
 \eg a4.()a4 d8 |

diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly
index 91691f59785b61c0a5e57d76f53824b69fa43a47..f1f0284d9f9e43f23daea8b365deb7e6ea1c41cf 100644 (file)
--- a/input/test/banter-chords.ly
+++ b/input/test/banter-chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \header{
 enteredby =     "jcn";

diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly
index c40ab56b4126c89961a839c6e74cf2312d26ffd6..2ab1966e14e3056795010aed7468fa259d9764bc 100644 (file)
--- a/input/test/bar-scripts.ly
+++ b/input/test/bar-scripts.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 
 onestaff = \context Staff = foo\notes  {
        \property Staff.instr = instr

diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly
index e23cb2d40761cb3c5e06ae0b5878978e36dec3cb..3d64f71efa8cb32dc8ef19e09f00b528ae45edf5 100644 (file)
--- a/input/test/beam-abbrev.ly
+++ b/input/test/beam-abbrev.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score { 
   \context Voice \notes\relative c {
     c'1:16 

diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly
index ac00bc9b3ca7bf5bebe3b03eb6a4ff9f0f42e9ea..447c03554e0a2bf47e2bd4d805e784c8175146d5 100644 (file)
--- a/input/test/beam-chord.ly
+++ b/input/test/beam-chord.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        \notes\transpose c'{

diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index 0c27c6b744e77003aceb9aacaaf1f1b8dc1ac603..f15ddae723d05ffcc261e390ae142225ad66ca7b 100644 (file)
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -20,4 +20,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly
index 7bdd5232b467af6ecb62c00cdad87b59b9eaa56f..7ba56ff4379dcc9e479be047c441783ef30b29b3 100644 (file)
--- a/input/test/beam-cross-staff.ly
+++ b/input/test/beam-cross-staff.ly
@@ -22,4 +22,4 @@
        >
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly
index 5cfc6bcd04edd070045bb519c22e2700dbe96148..b4d50f4560437f2147eacbbe152f03ef4d9b8d10 100644 (file)
--- a/input/test/beam-damp.ly
+++ b/input/test/beam-damp.ly
@@ -17,4 +17,4 @@
                linewidth=-1.;
        }
 }
-\version "1.3.93";
+\version "1.3.96";

diff --git a/input/test/beam-dir.ly b/input/test/beam-dir.ly
index 3b431ef15b84803dff47cd7c41120cbae995d290..6b95542399a7276d98db1d1a4d8c2973189066e0 100644 (file)
--- a/input/test/beam-dir.ly
+++ b/input/test/beam-dir.ly
@@ -5,4 +5,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/beam-extreme.ly b/input/test/beam-extreme.ly
index 9d84d557094fcf2d4f10dc22f3e1decb2e084de2..d538b2318d3225fd4b353e511fa34ec3f16871dd 100644 (file)
--- a/input/test/beam-extreme.ly
+++ b/input/test/beam-extreme.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score{
        \notes\relative c''{
                [g8 c c,]

diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly
index d8e3197d30c557e46e517bcfa26c6dfc0a36a731..376bb4b36955ec26a3df47f3af593608107c698f 100644 (file)
--- a/input/test/beam-isknee.ly
+++ b/input/test/beam-isknee.ly
@@ -16,4 +16,4 @@
        }
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/beam-length.ly b/input/test/beam-length.ly
index c408e64b2c134412d53bc2d0ddfcffd7d63f3e44..0b39c8e46afad720cd85b02a060f51e4c4d77aa5 100644 (file)
--- a/input/test/beam-length.ly
+++ b/input/test/beam-length.ly
@@ -7,4 +7,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/beam-position.ly b/input/test/beam-position.ly
index 2d912fd9e3d25c5c68e22c7c09f7cbd529e01feb..940843afc5295b5268dedbe7dde1aaa37b19c4db 100644 (file)
--- a/input/test/beam-position.ly
+++ b/input/test/beam-position.ly
@@ -9,4 +9,4 @@
     linewidth=-1.0;
   }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/beam-slope.ly b/input/test/beam-slope.ly
index 90316d2ea43444ae6da941fff8f8463164724d88..47eb49c3b530cc879f169bff9ff3ccd4a0bcbae0 100644 (file)
--- a/input/test/beam-slope.ly
+++ b/input/test/beam-slope.ly
@@ -5,4 +5,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly
index 9ae29bcfd11e05672e673eb67a39399202884ee6..46fc2afd7fb552ef5fd11c192da3a4daa5245ea5 100644 (file)
--- a/input/test/beam-suspect.ly
+++ b/input/test/beam-suspect.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score{
        \notes\relative c'{
                \stemUp

diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly
index 7c1357fec4dff24fcb32bf90219845b75964750d..7182e5c82d457d5371e3c2f39512701b6b91342d 100644 (file)
--- a/input/test/beam-trend.ly
+++ b/input/test/beam-trend.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score{
        \notes\relative c'{
                \stemUp

diff --git a/input/test/beams.ly b/input/test/beams.ly
index f219590cc54d7791d7f05c7266f71d39e988bc1a..018bd4c032bd5800f57a7ed1382a2a963ac581e5 100644 (file)
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -6,7 +6,7 @@ copyright =      "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        <

diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly
index 9eaaa673b8d17d7af804f658058b1ebfd71aa533..634ee257f2d08c76607f12351318c3ba5ebd1bad 100644 (file)
--- a/input/test/breathing-sign.ly
+++ b/input/test/breathing-sign.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
   \notes \relative c' {

diff --git a/input/test/broken.ly b/input/test/broken.ly
index 38cf583388e7f7fe0d59bedd80131fcca8d68b77..ed1f191cbd880f6ed72fdf24bddad07a02b0ed4b 100644 (file)
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs" +
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 shortlong = \notes{
        c4()c( c c  |

diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly
index fe78836b81f88a8dfe456bfa6efc60f23837a6f8..5d717e02f96168a6f5c09f9603794984fb5deda1 100644 (file)
--- a/input/test/chord-inversion.ly
+++ b/input/test/chord-inversion.ly
@@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{
        >
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly
index 6527e63723834f913217bc3d66cae5aef57d3260..3ec0e0ec1a3872d993b6200b9d485e036761a5e9 100644 (file)
--- a/input/test/chord-table.ly
+++ b/input/test/chord-table.ly
@@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{
 
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/chords.ly b/input/test/chords.ly
index 8a6b07823fa9ec7d68e024fb55f934a8810147c5..c5b31dcfb5f684ab296735225318ee01d55a6fe3 100644 (file)
--- a/input/test/chords.ly
+++ b/input/test/chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 %{
 Would this be acceptable/good enough/convenient for entry?
@@ -61,8 +61,8 @@ keys = \notes{
        >
        \paper{
                \translator { 
-                       \ChordNameContext
-                       ChordName \push #'word-space = #1 
+                       \ChordNamesContext
+                       ChordNames \push #'word-space = #1 
                }
        }
 }

diff --git a/input/test/clefs.ly b/input/test/clefs.ly
index 7a70aaf0c1345dd4003f44f019d55b8181b5da3b..6ede9ce6ccc45aa9b6159aabca8427afec131593 100644 (file)
--- a/input/test/clefs.ly
+++ b/input/test/clefs.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
        \notes{ 

diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly
index 9fa2d0749c09f079bb42b84ad13f8f849b299d3a..21bec97b8187f3398a39192bccddd2c4a710cd56 100644 (file)
--- a/input/test/collision-merge-dotted.ly
+++ b/input/test/collision-merge-dotted.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score { 
   \context Voice \notes\relative c {
     

diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index e31e717b5742b80c71b1e81b65275795e0453b75..6ae299fb0b14c0e428577bdab9f0acde14880770 100644 (file)
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,7 +5,7 @@ enteredby =      "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "1.3.93";
+\version "1.3.96";
 
 twovoice = \context Staff \notes < 
        \context Voice=i { \stemDown c4 d e f g2~  g4 a [c8 d e f] c2| }

diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly
index 05fa27508e1afe5aaf4d6b67e52661754833d434..4eaee5361951493b3adcc57009c22fc786b586a3 100644 (file)
--- a/input/test/defaultbars.ly
+++ b/input/test/defaultbars.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 
 \score {

diff --git a/input/test/dots.ly b/input/test/dots.ly
index a4ffc101a26e80380d47fad2d5e370cb5764f840..b21cd00eeee87360b9352617246a94cc0a296f04 100644 (file)
--- a/input/test/dots.ly
+++ b/input/test/dots.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score { 
   \context Voice \notes\relative c'' {
     \time 6/8;

diff --git a/input/test/drarn-chords.ly b/input/test/drarn-chords.ly
index 5842761fb9ff796820e63ce019c9e46c8483b7e5..875761201a692aae35add307dd1af90d024c72fe 100644 (file)
--- a/input/test/drarn-chords.ly
+++ b/input/test/drarn-chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 %{
 Would this be acceptable/good enough/convenient for entry?
@@ -31,7 +31,7 @@ scales = \notes \transpose c'' \chords{
        \paper{
 %              \paper_as_nine
                \translator {
-                       \ChordNameContext
+                       \ChordNamesContext
                        }
        }
 }

diff --git a/input/test/dynamics.ly b/input/test/dynamics.ly
index cd8b8d8a9f7b077e7daebe94e174d98b19235017..05fca1aacab07f5506e9c9af928b5b7451b50239 100644 (file)
--- a/input/test/dynamics.ly
+++ b/input/test/dynamics.ly
@@ -7,4 +7,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index 0effb0a789c16135a24fdf3cea621060b4a2bc51..25580ed50b0181d8228528a431896c4a342da3e1 100644 (file)
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -42,4 +42,4 @@ extra-staff.ly:
 }
 
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 846928eedecd85e094ebbd91afa9fbaadb3528a0..f1643d54385e8142610b4fbbf674c6c530ffb09c 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 FontBody=      \notes\transpose c''{ 
                \bar "|:";

diff --git a/input/test/font.ly b/input/test/font.ly
index 415401f2f5863dd5d4e4d7121d7037fd799aa549..32ed3fbaab6cd08aff4bb6078d246564a5026c0e 100644 (file)
--- a/input/test/font.ly
+++ b/input/test/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 \include "font-body.ly"
 \score{

diff --git a/input/test/font16.ly b/input/test/font16.ly
index 95564bde080f09fbb7da0d247aacaa3928968f11..1126c75eea2c3b6051bef6bc0a66d8b8c0d59cae 100644 (file)
--- a/input/test/font16.ly
+++ b/input/test/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 \include "paper16.ly"
 \include "font-body.ly"
 

diff --git a/input/test/font20.ly b/input/test/font20.ly
index 6d43a2be28ebdfe235ae1c148b7b4639edf2fc4b..04b49aa649f24423235c2dfd82363ab76e65981b 100644 (file)
--- a/input/test/font20.ly
+++ b/input/test/font20.ly
@@ -17,5 +17,5 @@ TestedFeatures =
            gourlay_maxmeasures =5.;
        }
 }
-\version "1.3.93"; 
+\version "1.3.96"; 
 

diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly
index b70d20084ea3364b8c925d86412e9c700c3324e8..097ddc3812f55d56b40a1d66b436aeff80887682 100644 (file)
--- a/input/test/force-hshift.ly
+++ b/input/test/force-hshift.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score { 
   \context Voice \notes\relative c {
     

diff --git a/input/test/generic-property-override.ly b/input/test/generic-property-override.ly
index adb56e4b3c98b1feb1c66145929c58a825798775..c6b503c983b23b4bd67668c408d4eafa97ed01c4 100644 (file)
--- a/input/test/generic-property-override.ly
+++ b/input/test/generic-property-override.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
  \notes \relative c'' \context Voice {

diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly
index 8f20ee9a0b87fda7efd6838c9591ae75155e7943..71b5dd504204e23942a6b63003fd89c9f2fe4947 100644 (file)
--- a/input/test/gmsusd.ly
+++ b/input/test/gmsusd.ly
@@ -3,7 +3,7 @@
 
 % perhaps the current modifier approach is too simplistic
 
-\version "1.3.93";
+\version "1.3.96";
 
 gmsus=\notes\relative c \chords{ 
        g1

diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index e0f5a644d8bfaa0cb2034b426614198b9ebd6316..53f5258c6164ddf316d249a4cbda8583ab35b541 100644 (file)
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 %{
 

diff --git a/input/test/grace-end.ly b/input/test/grace-end.ly
index d61b1047b71bf19541005a03382f1f838096b492..0fbacee5326ac4103900bb1e5fda5842a20905e9 100644 (file)
--- a/input/test/grace-end.ly
+++ b/input/test/grace-end.ly
@@ -6,4 +6,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/hara-kiri-short.ly b/input/test/hara-kiri-short.ly
index 5a27380cdcfce8c25e89d5c1312f986c8c7cc655..3566b27fa07995c2b325acb8a55a84507322d692 100644 (file)
--- a/input/test/hara-kiri-short.ly
+++ b/input/test/hara-kiri-short.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 zager = \context Staff = zager \notes \relative c'' {
        \clef treble;
        c1

diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly
index ae042f764da70318d443f675ea0cf5094b077c5f..e1c41c282ce72da3663a30c716f0b936577bc64a 100644 (file)
--- a/input/test/hara-kiri-switch.ly
+++ b/input/test/hara-kiri-switch.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 voiceOne = \notes \relative c'' {
        a1 a a

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 30dce01a5cb928f3dff26e6178e01caaeeb23f33..918b085f274153510183f67bcf2d1e56b3264bce 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 toeter_i = \notes\relative c <{
                \property Staff.instrument = #"Toeters"

diff --git a/input/test/harmonics.ly b/input/test/harmonics.ly
index 1a8eb472950161805881be8a0ae655a7fe42d742..30c4db462268fb96462538b373b00d49704e6020 100644 (file)
--- a/input/test/harmonics.ly
+++ b/input/test/harmonics.ly
@@ -4,4 +4,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/hshift.ly b/input/test/hshift.ly
index 44fc9806983ac485c3e91e0cbe4c417ef5e5bed0..be09c586ab434dd2ae6d494a963a328a1b203609 100644 (file)
--- a/input/test/hshift.ly
+++ b/input/test/hshift.ly
@@ -14,4 +14,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/incipit.ly b/input/test/incipit.ly
index 8813591d7e98a7d552610d24fff0d4cc56b313bd..9cfe6f60e29c83a7d65a391eec922c7c79fd2d0d 100644 (file)
--- a/input/test/incipit.ly
+++ b/input/test/incipit.ly
@@ -6,7 +6,7 @@
    /Mats B
 %}
 
-\version "1.3.93";
+\version "1.3.96";
 
 incipit = \notes\relative c'{
   <b1 fis' b d>

diff --git a/input/test/keys.ly b/input/test/keys.ly
index c5bd953e7f73cf40cad07087ae3b77203c350e56..c4809ee7e5c24cc778fe05c078d92c9e0ed33628 100644 (file)
--- a/input/test/keys.ly
+++ b/input/test/keys.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
   \notes \relative c''

diff --git a/input/test/keys2.ly b/input/test/keys2.ly
index 66c040fc5f12a4cf477f1165f468f294f2f35976..5c161a06417e13782e729d7ec25819b60e22b639 100644 (file)
--- a/input/test/keys2.ly
+++ b/input/test/keys2.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 
 blah = \notes {

diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly
index e710d252e3319f57aa67a29b05c044821af18c54..c1116065af7f163e1cbf4492b9d38c4bebe4c941 100644 (file)
--- a/input/test/knee-mult.ly
+++ b/input/test/knee-mult.ly
@@ -16,4 +16,4 @@
        }
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/knee.ly b/input/test/knee.ly
index 3b86f0c937969c2481c9e33eb865de6e4b5bf1c2..2c61a32858ea58b164ce419d5f2f7302bf1ef759 100644 (file)
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score{
        \notes\relative c'{
                [c16 \stemDown c'' \stemBoth c,, d]

diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly
index bfb58c36aa66c6326fe2c1d3b5e92ac95e18f77a..85ac0efab431e74aaf96b6a49156afb6078311a8 100644 (file)
--- a/input/test/lyric-combine.ly
+++ b/input/test/lyric-combine.ly
@@ -7,7 +7,7 @@ enteredby =      "HWN, chords by Johan Vromans";
 copyright =     "public domain";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 m =\notes  \relative c'' {
        \property Staff.automaticMelismata = ##t

diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly
index 42a416b99bb92244071bcc87a441fe71c5f33245..a238fbd7424ec6e6afa9f7e014424730ae8834e4 100644 (file)
--- a/input/test/lyric-extender.ly
+++ b/input/test/lyric-extender.ly
@@ -5,4 +5,4 @@
        >
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly
index a27a19b1d7f856350edd429fa73b93a4a689ed81..4efb6251f479a53bf1914f7c0a23073a227d02e5 100644 (file)
--- a/input/test/lyric-hyphen.ly
+++ b/input/test/lyric-hyphen.ly
@@ -5,7 +5,7 @@
        >
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 
 
 
 

diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly
index 0e2dbec58105e2d30611ec7e7c5daffa6e32a857..8c790f35fdac4dbe0989d56c95cf5031b94f41ad 100644 (file)
--- a/input/test/lyric-phrasing.ly
+++ b/input/test/lyric-phrasing.ly
@@ -7,7 +7,7 @@ enteredby =      "HWN, chords by Johan Vromans";
 copyright =     "public domain";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 m =\notes  \relative c'' {
        \property Staff.automaticMelismata = ##t
@@ -40,4 +40,4 @@ textIII =  \lyrics  { la -- da __ doo dah; dargh la dargh loo.  }
   \paper {
   }
 
-}
\ No newline at end of file
+}

diff --git a/input/test/lyrics-multi-stanza.ly b/input/test/lyrics-multi-stanza.ly
index d998078f911f192f653be3299dc18bd9f327e916..d80bcba78b6a736c656a85b93b325b83e77e05c0 100644 (file)
--- a/input/test/lyrics-multi-stanza.ly
+++ b/input/test/lyrics-multi-stanza.ly
@@ -3,7 +3,7 @@
 % * Stanza_number_engraver
 % * Automatic melismata on beamed notes
 
-\version "1.3.93";
+\version "1.3.96";
 \include "english.ly"
 
 \header{

diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly
index 31b8354b63838df8522c7815286b5c5138e9193f..72a2f9a8b6977ed5fac7d65031a6ed980a4cf96b 100644 (file)
--- a/input/test/lyrics.ly
+++ b/input/test/lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 $somewhat_long = \lyrics{
        \property Lyrics . textStyle = "roman" 

diff --git a/input/test/mark.ly b/input/test/mark.ly
index 754beeedd51e1e3e804c5d827d4ed3d4923e4268..f48ceba0ff7689436a829b7f7f4b195dc2da3316 100644 (file)
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 global = \notes {
   s1 | \mark "A";

diff --git a/input/test/memory.ly b/input/test/memory.ly
index ae76027ad9328bc4439387a7a0022c7eb2a7c082..00c039596acb258c0f261ae75a5ebf21c552f197 100644 (file)
--- a/input/test/memory.ly
+++ b/input/test/memory.ly
@@ -11,5 +11,5 @@ bla = \notes {
        >
        \paper { Gourlay_maxmeaures = 2.; }
 }
-\version "1.3.93"; 
+\version "1.3.96"; 
 

diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly
index ba4aedffa266dc8aa125e6718ca35e6a768cb38d..def26a27f3779071e9331168a84318059635ebb2 100644 (file)
--- a/input/test/multi-measure-rest.ly
+++ b/input/test/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score { \notes { \time 3/4; \key cis \major;
            R2.*15 R2. R2.*7 }

diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly
index 0738d53849e5c5fc19bd18c4b0001490416073db..88e11166bfd22ec16ee91fe93eef4c2eb047a882 100644 (file)
--- a/input/test/multi-rest.ly
+++ b/input/test/multi-rest.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 voice_one = \notes\transpose c''{  \stemUp
        R1 * 2 | f'4-. r r2 | R1 * 3 |

diff --git a/input/test/multi-slope.ly b/input/test/multi-slope.ly
index 1cea6506b32a4619298ff205b6c797dc4891faf7..045d649728432874e7abaaf3c08983475b0e28c2 100644 (file)
--- a/input/test/multi-slope.ly
+++ b/input/test/multi-slope.ly
@@ -5,4 +5,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/no-stem-extend.ly b/input/test/no-stem-extend.ly
index 2f43ce8586db81b2d6140f252ee65c7b93518b6c..fe48d84f5d323737e8ead38d13b1ac3d63735c68 100644 (file)
--- a/input/test/no-stem-extend.ly
+++ b/input/test/no-stem-extend.ly
@@ -17,4 +17,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly
index ade385f56931641b3265adeaa10c0c8dc42d0899..51b38a8bc6e5f3052d239783871bb320bca5fb57 100644 (file)
--- a/input/test/non-empty-text.ly
+++ b/input/test/non-empty-text.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
        
 \score{
        \notes\relative c''{

diff --git a/input/test/note-shift.ly b/input/test/note-shift.ly
index c81ae2efe35e41e117e1685bb01f1ff2e97bfb4a..d4affe5ea9a11b68ca40a68f7d38364dac1e9214 100644 (file)
--- a/input/test/note-shift.ly
+++ b/input/test/note-shift.ly
@@ -29,4 +29,4 @@
     linewidth=-1.0;
   }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly
index 4e2185811ead56cd637da5e0927089bb3105c27f..70e879a476959f3a16c1ce8789f3fc82d7c778ca 100644 (file)
--- a/input/test/noteheadstyle.ly
+++ b/input/test/noteheadstyle.ly
@@ -40,4 +40,4 @@ c4 c2 c8  c16 c16  c1 c\breve c\longa
        
     }
 }
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly
index 60fb93fe1cd41f48fa8e4c1b622500c006164a6e..9290c19b05573032264a24dba9904609033d05db 100644 (file)
--- a/input/test/notemode-chords.ly
+++ b/input/test/notemode-chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        \notes \transpose c''{

diff --git a/input/test/number-staff-lines.ly b/input/test/number-staff-lines.ly
index d1d42d05af49d83aadae0bbb4fd4879266fccae8..f275c84ccf8bab1e5dd185ce0932aabc6a6cabbc 100644 (file)
--- a/input/test/number-staff-lines.ly
+++ b/input/test/number-staff-lines.ly
@@ -6,4 +6,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index f938c5bc3fa7c073e9fb3dc0ff3f12c58aa705d6..0668bd2b506bbda05d4a138ca4d0a7bd7d05ffc1 100644 (file)
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 m = \notes \relative c''{
 

diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index bab09a904bdd227e1b6ec5c024230a918d74ebf0..6de5602752ff8c7b6e69370d79d71e67e27fef39 100644 (file)
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
 

diff --git a/input/test/perform-grace.ly b/input/test/perform-grace.ly
index 39a88c14fe328f78951886164d5186e80ad2fa6e..7842d1715642b634fddee3947a51e6bfde0b0089 100644 (file)
--- a/input/test/perform-grace.ly
+++ b/input/test/perform-grace.ly
@@ -9,4 +9,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/perform-tie.ly b/input/test/perform-tie.ly
index 7ec02e5e6a02ad6f62e214098bd3a00e0a43d87c..e4cbd458440973c32c7895a96797ae9dff99de00 100644 (file)
--- a/input/test/perform-tie.ly
+++ b/input/test/perform-tie.ly
@@ -6,4 +6,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly
index 31e996899ea87567a24a5b7e7eb7ef227469065c..c91a964ede06ab1232f6af7f8bdb81794ad31b58 100644 (file)
--- a/input/test/pushproperty.ly
+++ b/input/test/pushproperty.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 %{
 

diff --git a/input/test/repeatbar.ly b/input/test/repeatbar.ly
index 4631d472e923c9c3889812aa5dcff5946cd58aa9..b606718f0963fba2cf696f22149d894e0581c782 100644 (file)
--- a/input/test/repeatbar.ly
+++ b/input/test/repeatbar.ly
@@ -7,4 +7,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly
index 7e65f5cd4715320dff108ced90c7894b4f243d77..5dc05f149bb2bd1420863836ad001bc41c79b2d0 100644 (file)
--- a/input/test/rest-collision.ly
+++ b/input/test/rest-collision.ly
@@ -49,4 +49,4 @@ restsII = \context Staff \notes {
        }
 }      
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/rests.ly b/input/test/rests.ly
index a52025ae070c7b2a1a5cab00ad3e546b7871e8e3..7c944f5f98db0058a9f1e1fa72667cd23148c1b2 100644 (file)
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -9,4 +9,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/scripts.ly b/input/test/scripts.ly
index b426bd6129da6c22e409ca1a63ad5323c0d94f28..80e18cbbbc22eff4c8d5af4c52e9a4cac0765200 100644 (file)
--- a/input/test/scripts.ly
+++ b/input/test/scripts.ly
@@ -1,5 +1,5 @@
        
-\version "1.3.93";
+\version "1.3.96";
 
 
 blah =         \notes{ \transpose c'' {

diff --git a/input/test/sizes.ly b/input/test/sizes.ly
index 420decf0b9036118d5789965f90c3284e2237459..c4a32baebf5e6754507e13b9c01fe3cca373c529 100644 (file)
--- a/input/test/sizes.ly
+++ b/input/test/sizes.ly
@@ -14,4 +14,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 0d3ccb443eb939d5bf2c714e1fb77e1f47ad0caa..bc329381abe0f1775efca482f5ef8c9ff3596fd8 100644 (file)
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs" +
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 shortlong = \notes{
        c4()c( c c  |

diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly
index 1dcc5cfd204d91d7eb0b6b8122f930936bb5832e..3cb178686ab9b0bc2402cd4f1ef1605222812b32 100644 (file)
--- a/input/test/slur-cross-staff.ly
+++ b/input/test/slur-cross-staff.ly
@@ -28,4 +28,4 @@
        >
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index b7c52f3bfd9e5f7051fbead4c8bd07a7c3be87a9..aac38e2428da86f1c8e2025282612b61ecd871c6 100644 (file)
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -1,5 +1,5 @@
 % test damping
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        \notes\relative c'{

diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index f7473dacbd8d08ae242e7f1dbac372b1ee8c686d..14da7cbc58c887cc9f129a82c5eb0f9fd4ec5c27 100644 (file)
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        \notes{

diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly
index 04da8d37d660b2306e466cd1b3be68ad6e53796e..8787b5cd918f5e4c231bce3007025930e7f71452 100644 (file)
--- a/input/test/slur-follow-music.ly
+++ b/input/test/slur-follow-music.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 \score { 
   \context Voice \notes\relative c {
     % CASE 3

diff --git a/input/test/slur-nice.ly b/input/test/slur-nice.ly
index 5bf4da02bcbc2f232652c748957b04a04134262f..5e30aca285296a5c1a0b47bb77115c1424d853ca 100644 (file)
--- a/input/test/slur-nice.ly
+++ b/input/test/slur-nice.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 \score{
        \notes\relative c''{
                \time 3/4;

diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index 6b3cf27f357c4c1535cc560b3e05bbd4379fb992..05ab47eca7abc205afc4f07fc50cbcb13fb8a389 100644 (file)
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        \notes\transpose c'{

diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly
index 7492df7db909d9e1db6a33e12acda2561c02938a..4b9413cb5df6c59bbb9f4b46c7bad9ca59e07ef4 100644 (file)
--- a/input/test/spacing-2.ly
+++ b/input/test/spacing-2.ly
@@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues.  Urtext. Editions Henry Lemoine, Paris.";
 }
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 6b9b98dfbdec5efd88e1b9b2ce7f071b82c4e5f8..8ef16c4cfaefa304bcda12c60a8208f1b436215a 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 multipart = \notes \relative c'{ 
     \context StaffGroup < 

diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly
index 8723c11a9ee56676fd419d21872c95d5de642f1f..a5bbdb81e9bace48e18ad732564d4b28d4032ad7 100644 (file)
--- a/input/test/span-bars.ly
+++ b/input/test/span-bars.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 nt = \notes { c1 \break c1 c1 } 
 stuff = \notes \relative c'' <
   \context Staff = stone  { \nt }

diff --git a/input/test/staccato-pos.ly b/input/test/staccato-pos.ly
index a6a34895111c8e2fcba7c61a7febd0bf58eef7d8..dc0150a47772e74465ebc4ca93c61cad067601e2 100644 (file)
--- a/input/test/staccato-pos.ly
+++ b/input/test/staccato-pos.ly
@@ -9,4 +9,4 @@
     linewidth=-1.0;
   }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly
index d9648fc6737ca9bc32dfe00157621d9df8775080..40bfe1d92c33417cb3e095921a0bfb2c421e9990 100644 (file)
--- a/input/test/staff-margin-partial.ly
+++ b/input/test/staff-margin-partial.ly
@@ -1,6 +1,6 @@
 % test staff margin with partial measure.
 
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
 \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 }

diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly
index 0737be1ff9a91ef943f2615823b78e19f817ca6e..981b2a598f5355151977a936573f0579b558bca0 100644 (file)
--- a/input/test/staff-margin.ly
+++ b/input/test/staff-margin.ly
@@ -1,6 +1,6 @@
 
        
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
 

diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly
index e4a04ba2bbee673c888641ace82896d558e6cfe5..f4c0541ac1d02d1ecfe03b81a7e93b45fe6ffdac 100644 (file)
--- a/input/test/staff-side-slur.ly
+++ b/input/test/staff-side-slur.ly
@@ -18,4 +18,4 @@
 }
 
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index 486ead240b6ca34003f105f5483f941f108a105e..d53dbc04015abf5114469efe77dfc9b31be6a042 100644 (file)
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -14,4 +14,4 @@
 >
 \paper { linewidth = -1.; }
 }
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly
index ca1aec23248f44ace9bd9bda99855a8d37919faf..2061a8262d149d30ac0873d7803fa594346f1111 100644 (file)
--- a/input/test/stem-length.ly
+++ b/input/test/stem-length.ly
@@ -6,4 +6,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/stem-spacing.ly b/input/test/stem-spacing.ly
index 9c391a6142fddddc1956b98f49a73689976b5a8c..772cca797bf67a24f16de416f9e2a0ef9bf527ca 100644 (file)
--- a/input/test/stem-spacing.ly
+++ b/input/test/stem-spacing.ly
@@ -8,4 +8,4 @@
     linewidth=-1.0;
   }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly
index 5c9d7d86e38d00e0fdea6f39e7704dc0075a7266..9dce9f94d47ff6ed26c4eed9b7158b945feff61d 100644 (file)
--- a/input/test/stem-tremolo.ly
+++ b/input/test/stem-tremolo.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 \score{
        \context Voice\notes \relative c''{
                %%?

diff --git a/input/test/stem.ly b/input/test/stem.ly
index af01e1e777a5942e68a30f01c49fdc2f5a9ac06a..f884cc1aab22fd02859b5924eeb4e461930058d3 100644 (file)
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 beamintervals = \notes{
                \time 7/4;

diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly
index 81542e6a0ab1bb79ed77434c480c8d06b88ce0ad..9f70867255d8dfc33fb32aa38071be7d0e325ec9 100644 (file)
--- a/input/test/tchaikovsky.ly
+++ b/input/test/tchaikovsky.ly
@@ -7,7 +7,7 @@ enteredby =     "Maarten Storm";
 instrument=    "Violoncello";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 % this is an example of extreme dynamics
 

diff --git a/input/test/thumb.ly b/input/test/thumb.ly
index e23b193a641790a3c7d43908ab56c689ef1cd0e9..7dc3a251b7a5326a369ef5286cdd1adee5266ded 100644 (file)
--- a/input/test/thumb.ly
+++ b/input/test/thumb.ly
@@ -7,7 +7,7 @@
 % the thumb-script is used in cello music to indicate a note that should
 % be played with your thumb. 
 
-\version "1.3.93";
+\version "1.3.96";
 
 \score { \notes \relative c'' {
                [<a8_\thumb a'8-3(> <)b_\thumb b'-3>

diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly
index a3b30ae2dc973b50a5720dffc1558eebe97b91e4..e00e10e64857cc34d523042299d8aea63ce34b7d 100644 (file)
--- a/input/test/tie-sparse.ly
+++ b/input/test/tie-sparse.ly
@@ -10,4 +10,4 @@
     linewidth=-1.0;
   }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/time.ly b/input/test/time.ly
index e9cae53f819b899f88f102fe911a8ae3c1dc6617..d97e700df666cfbf2bb11d8cdef159cf2c7c7f87 100644 (file)
--- a/input/test/time.ly
+++ b/input/test/time.ly
@@ -143,4 +143,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/timing.ly b/input/test/timing.ly
index cd8ba855c47e7448b32958af9b7914182bd2f808..4c0f7a5f8098e7ec3f7332c962f35e45a519224d 100644 (file)
--- a/input/test/timing.ly
+++ b/input/test/timing.ly
@@ -20,4 +20,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/title.ly b/input/test/title.ly
index dd96c2ff6a470434d34ceb495c1469becef12949..ea16a1a0ff9dc7f6f55d45893c86881b74bdc405 100644 (file)
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -10,7 +10,7 @@ source =      "urtext";
 instrument=    "Instrument";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 \score{
        \notes

diff --git a/input/test/transposing.ly b/input/test/transposing.ly
index 3c2ebc2478e32a0420b18f6e4658d9f1a643dd4f..f4439b55292330160ac81a43c3134faf8a194164 100644 (file)
--- a/input/test/transposing.ly
+++ b/input/test/transposing.ly
@@ -14,4 +14,4 @@
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/transposition.ly b/input/test/transposition.ly
index 1f483df4e0baad7a5db236c9f6a1e021d25ace63..926600cd7878f5e79cbe8458a11375ecf98adf09 100644 (file)
--- a/input/test/transposition.ly
+++ b/input/test/transposition.ly
@@ -22,7 +22,7 @@ copyright =    "public domain";
 }
 
 
-\version "1.3.93";
+\version "1.3.96";
 
 vOne = \notes \relative c''{
         \clef"violin";

diff --git a/input/test/tup.ly b/input/test/tup.ly
index 0be36c81c9608fdf7d9200f9bcb975a8c1c9fec4..4b1e6717603570985b1266815a7a5cb4384ec903 100644 (file)
--- a/input/test/tup.ly
+++ b/input/test/tup.ly
@@ -8,4 +8,4 @@
                 }
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly
index 0afb1f27ddcc3376272f39981f477cb27fbdc0ed..375e9b5c7cff5976533a6ed67f221ba4bb1cf9c1 100644 (file)
--- a/input/test/tuplet.ly
+++ b/input/test/tuplet.ly
@@ -1,4 +1,4 @@
-\version "1.3.93"
+\version "1.3.96"
 
 \score { 
   \context Voice \notes\relative c'' {

diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly
index 78e40399d5152e7dbd0bd40911c9feb5d19db07c..43fa026a46341e98a4a21e8cf78815ed0d188a4c 100644 (file)
--- a/input/test/twinkle-as5.ly
+++ b/input/test/twinkle-as5.ly
@@ -6,7 +6,7 @@ enteredby =     "hwn and jcn";
 copyright =    "public domain";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 \include "paper-as5.ly"
 

diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly
index 9475f78274e0e0bee162f95fad8b7603829712cf..854080fe56b72f358d2c74953e104975f57bdfe5 100644 (file)
--- a/input/test/two-slurs.ly
+++ b/input/test/two-slurs.ly
@@ -1,4 +1,4 @@
-\version "1.3.93";
+\version "1.3.96";
 %
 % We'd want to combine the stems, but have two slurs too...
 % Looks like the a-due engraver

diff --git a/input/test/updown.ly b/input/test/updown.ly
index fe5faf77fca1b880440ab0c63573567a20b01a29..3ae0713b60d113a2c0685bcc98fec9b5c4a52368 100644 (file)
--- a/input/test/updown.ly
+++ b/input/test/updown.ly
@@ -10,9 +10,9 @@
        {\voiceTwo c}>
        
        
-       \version "1.3.93"; 
+       \version "1.3.96"; 
        
   }
   \paper { }  
   \midi { }
-}
\ No newline at end of file
+}

diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly
index 57fff1e03fdf7c416372520ebd5831aa3bdf2e0f..4262f80194cb111b71fbba879f3bfb2c88674c8f 100644 (file)
--- a/input/test/vertical-align.ly
+++ b/input/test/vertical-align.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93";
+\version "1.3.96";
 
 \score {
 \notes <

diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly
index c4972238566068d2d70a1e8e03724771fef288ed..f51f88c136e0f1d2d45f7200fa48fa6c76a8d5c4 100644 (file)
--- a/input/test/vertical-text.ly
+++ b/input/test/vertical-text.ly
@@ -15,4 +15,4 @@
        }
 }
 
-\version "1.3.93"; 
+\version "1.3.96"; 

diff --git a/input/trip.ly b/input/trip.ly
index 4b588fe39b2a9d1fe9dcc05e1255a66d0b903943..071311620e41791aa46996ff71d46e4ca56ead34 100644 (file)
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -19,7 +19,7 @@ TODO:
 
 %}
 
-\version "1.3.93";
+\version "1.3.96";
 praeludiumRight =  \notes {
    \key e \major;
   \clef violin;

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 24bf8face82af6f1569ffdfc031792851e71c9a3..b82341d10b430e3c4a900e6af9b6800028c72834 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -7,7 +7,7 @@ enteredby =      "HWN, chords by Johan Vromans";
 copyright =     "public domain";
 }
 
-\version "1.3.93";
+\version "1.3.96";
 
 melodie = \notes\relative c'' {
         \clef "violin";

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 759ccbc25f5b065865602f282ee7fe821795c1f1..d5788e083d8749dfb6e94105498718e45e561fe5 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats,
        auto beaming, adding lyrics to notes, hyphens
 %}
 
-\version "1.3.93";
+\version "1.3.96";
 
 melody = \notes \relative c'' {
        \clef violin;

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 7578496b8e4a8d19a979d081a5199852432fff74..9a0944e2ee072ae843566989f8e80afa55409a11 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -116,7 +116,7 @@ void
 Chord_name_engraver::create_chord_name ()
 {
   assert (chord_p_);
-  chord_name_p_ = new Item (get_property ("ChordName"));
+  chord_name_p_ = new Item (get_property ("ChordNames"));
   /*
     Hmm, why not represent complete chord as list?
     ((tonic third fifth) (inversion bass))

diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly
index 2ed7db67fb76937557972a5881e5ee76a668eff6..3124f362a1d856bd22b2e8f4144e9acae4ee710d 100644 (file)
--- a/ly/book-fragment.ly
+++ b/ly/book-fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.93";
+\version "1.3.96";
 
 
 \include "declarations.ly"

diff --git a/ly/book-init.ly b/ly/book-init.ly
index b88f349620e527e83705ded4fd0ca5f2d9e2ce74..adf2523e797729dd01450b3c2c10a657ac600b54 100644 (file)
--- a/ly/book-init.ly
+++ b/ly/book-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.93";
+\version "1.3.96";
 
 
 \include "declarations.ly";

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 1c71d9722f894b3215ff1221c477c772c7798563..1739ae0862a5546cc139a9a2ba5b62ac74cef896 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -71,4 +71,4 @@
 
 
 
-\version "1.3.93";
+\version "1.3.96";

diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly
index 6f87babb9b685241831a754a0ca5d817a40b5d09..52ac0fde26b81de749d60affecc8e998d0ae4a75 100644 (file)
--- a/ly/center-fragment.ly
+++ b/ly/center-fragment.ly
@@ -1,7 +1,7 @@
 % Toplevel initialisation file. 
        
 
-\version "1.3.93";
+\version "1.3.96";
 
 
 \include "declarations.ly"

diff --git a/ly/center.ly b/ly/center.ly
index ebd09b43fd7713fdcb73245dba6d94ccac25c2cd..1ccfa5bc74004b3e00e77229b51f02c6faa5f330 100644 (file)
--- a/ly/center.ly
+++ b/ly/center.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.93";
+\version "1.3.96";
 
 
 \include "declarations.ly"

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index ae99df64f964eb09641abc7e1e21a442a7ad3a01..25f2f87431c04936d5df6869e2ca06596b1fd586 100644 (file)
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -49,4 +49,4 @@
 
 
 
-\version "1.3.93";
+\version "1.3.96";

diff --git a/ly/english.ly b/ly/english.ly
index bd89faceb76dcef82e17decdffa8bd27339581b4..4f125fe76448b2a9e394ea6451dd872072d25c39 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -77,5 +77,5 @@
        (bss . ( -1 6 2 ))
 )
 
-\version "1.3.93";
+\version "1.3.96";
 

diff --git a/ly/engraver.ly b/ly/engraver.ly
index b99cb6ffd30e54ebd14b5514f9bab2f892ba3749..ee09f7bee8ac7dc4a10e3b85af359e52998cadf0 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.93"
+\version "1.3.96"
        %
 % setup for Request->Element conversion. Guru-only
 %
@@ -266,23 +266,23 @@ LyricsContext = \translator {
        \accepts "LyricVoice";
 }
 
-ChordNameVoiceContext = \translator {
+ChordNamesVoiceContext = \translator {
        \type "Engraver_group_engraver";
-       \name ChordNameVoice ;
+       \name ChordNamesVoice ;
 
        \consists "Output_property_engraver";   
        \consistsend "Axis_group_engraver";
        \consists "Separating_line_group_engraver";
        \consists "Chord_name_engraver";
 }
-ChordNameContext = \translator {
+ChordNamesContext = \translator {
        \type "Engraver_group_engraver";
        \name ChordNames;
 
        Generic_property_list = #generic-chord-staff-properties
        \consists "Property_engraver";  
        \consists "Output_property_engraver";   
-       \accepts "ChordNameVoice";
+       \accepts "ChordNamesVoice";
        \consistsend "Axis_group_engraver";
        }
 
@@ -524,12 +524,16 @@ ScoreContext = \translator {
           (name . "Clef")
        )
 
-       ChordName = #`(
+       ChordNames = #`(
                (molecule-callback . ,Chord_name::brew_molecule)
                (interfaces . (chord-name-interface))
                (after-line-breaking-callback . ,Chord_name::after_line_breaking)
                (chord-name-function . ,default-chord-name-function)
-               (name . "ChordName")  
+               (properties-to-font-name . ,properties-to-font-name)
+               (style-to-font-name . ,style-to-font-name)
+               (markup-to-properties . ,markup-to-properties)
+               (font-family . roman)
+               (name . "ChordNames")  
        )
 
        NoteCollision = #`(

diff --git a/ly/fragment.ly b/ly/fragment.ly
index 3989fbe6aa0d9d59c627372898869f6a33b78be8..13973739a044be2647fa82e92871f7b51bb48ce0 100644 (file)
--- a/ly/fragment.ly
+++ b/ly/fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.93";
+\version "1.3.96";
 
 
 \include "declarations.ly"

diff --git a/ly/init-as.fly b/ly/init-as.fly
index 76d3082bb8d3247c21a8466cfa4f7fdf16a47865..1b73300c31e2e7d5ed43fc74f7342317b9098bbd 100644 (file)
--- a/ly/init-as.fly
+++ b/ly/init-as.fly
@@ -1,6 +1,6 @@
 % Toplevel AsciiScript initialisation file. 
 
-\version "1.3.93";
+\version "1.3.97";
 
 \include "declarations-as.ly"
 

diff --git a/ly/init-as.ly b/ly/init-as.ly
index 0c581e973354b20355bbd7b0895ebf4c46ec4ea2..191ae8741e2804450a00d090973ee4078e04880d 100644 (file)
--- a/ly/init-as.ly
+++ b/ly/init-as.ly
@@ -1,6 +1,6 @@
 % Toplevel AsciiScript initialisation file. 
 
-\version "1.3.93";
+\version "1.3.96";
 
 \include "declarations-as.ly"
 

diff --git a/ly/init.fly b/ly/init.fly
index 40f7f94c06d14de37681986f9fd72409f0b99c4b..423594cb63f245acc180931526693215c647001f 100644 (file)
--- a/ly/init.fly
+++ b/ly/init.fly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.93";
+\version "1.3.97";
 
 
 \include "declarations.ly"

diff --git a/ly/init.ly b/ly/init.ly
index f26b2cc1f4f9fa546176b5676f3adfe59677b5dd..ae95b0139f4fdd790013ac9962a614d65df6c2dd 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,7 +1,7 @@
 % Toplevel initialisation file. 
 
 
-\version "1.3.93";
+\version "1.3.96";
 
 \include "declarations.ly";
 

diff --git a/ly/init.sly b/ly/init.sly
index 44844549827d3dfad76c019dc9402b7700bab9c3..34bcf9312d254e50d191dbfbfca29446fc337629 100644 (file)
--- a/ly/init.sly
+++ b/ly/init.sly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.93";
+\version "1.3.97";
 
 
 \include "declarations.ly"

diff --git a/ly/italiano.ly b/ly/italiano.ly
index 4f741f6b1e79ded2b42d7611ec9aa6384f607a66..28bbc0599567ef5da0e9128519af0666b6e02a08 100644 (file)
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -48,4 +48,4 @@
        (sidd . ( -1 6 2 ))
 )
 
-\version "1.3.93";
+\version "1.3.96";

diff --git a/ly/norsk.ly b/ly/norsk.ly
index 3ef63e733e3cbfccfd9d8542068c1fc39647d0e0..8af9f332a7921750dabe591a6a8ca8fbf924bde8 100644 (file)
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -104,4 +104,4 @@
 
 
 
-\version "1.3.93";
+\version "1.3.96";

diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly
index 78974f206e7a68d6c96d1aabf1dc294aae7b94f3..2c7689ef9a79e85dfc65bc15c27c0812206d53c6 100644 (file)
--- a/ly/paper-as5.ly
+++ b/ly/paper-as5.ly
@@ -1,6 +1,6 @@
 % paper-as5.ly
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_as_five = \paper {
        staffheight = 5.\char;

diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly
index 323bd921a456e4aa3658b47ad636cc6a7ceb82f7..2c183e4e6c98bb749203c5dbf2da63b8238867fd 100644 (file)
--- a/ly/paper-as9.ly
+++ b/ly/paper-as9.ly
@@ -1,6 +1,6 @@
 % paper-as9.ly
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_as_nine = \paper {
        staffheight = 9.\char;

diff --git a/ly/paper11.ly b/ly/paper11.ly
index ea8f9973f619eb936395c4b06bc13f40d29eb2b1..a842af3e9e4add6e3dde4a373e18d61ddbcdcc23 100644 (file)
--- a/ly/paper11.ly
+++ b/ly/paper11.ly
@@ -1,6 +1,6 @@
 % paper11.ly
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_eleven = \paper {
        staffheight = 11.0\pt;

diff --git a/ly/paper13.ly b/ly/paper13.ly
index fafc2bbc47f6ea2f5ee374f9cb6efb50653a53be..11c7697affaf0c03f15cd0edab634533db58c702 100644 (file)
--- a/ly/paper13.ly
+++ b/ly/paper13.ly
@@ -1,6 +1,6 @@
 % paper13.ly
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_thirteen = \paper {
        staffheight = 13.0\pt;

diff --git a/ly/paper16.ly b/ly/paper16.ly
index ebad79992049d3965984b2c7818214b2d0831a41..f5b6bdb5d536921afaeb80abab630ad773d30b6d 100644 (file)
--- a/ly/paper16.ly
+++ b/ly/paper16.ly
@@ -1,12 +1,10 @@
 % paper16.ly
 
-
-
-\version "1.3.93";
+\version "1.3.96";
 
 paper_sixteen = \paper {
        staffheight = 16.0\pt;
-       style_sheet = "paper20";
+       style_sheet = "paper16";
 
        0 = \font "feta16" 
        -1 = \font "feta13"

diff --git a/ly/paper20.ly b/ly/paper20.ly
index 1264bfad23ef3cd7fadf02a0cffcf8e110ae5493..d4dbebacc93f79c8e7c1b5d4e04a063e9855ce7e 100644 (file)
--- a/ly/paper20.ly
+++ b/ly/paper20.ly
@@ -1,7 +1,7 @@
 % paper20.ly
 
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_twenty = \paper {
        staffheight = 20.0\pt;

diff --git a/ly/paper23.ly b/ly/paper23.ly
index 748707df81d7bb0e1eff5f3455d9f09b77c734f4..79008874ccdd1f23a92e97db96d9e5446f9c7360 100644 (file)
--- a/ly/paper23.ly
+++ b/ly/paper23.ly
@@ -1,7 +1,7 @@
 % paper23.ly
 
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_twentythree = \paper {
        staffheight = 23.0\pt;

diff --git a/ly/paper26.ly b/ly/paper26.ly
index e5006513336f7cd1cdbea3c3bfb4f192c7b8fa29..28902384c6bbf665859cc62255bf430cee517982 100644 (file)
--- a/ly/paper26.ly
+++ b/ly/paper26.ly
@@ -1,6 +1,6 @@
 % paper26.ly
 
-\version "1.3.93";
+\version "1.3.96";
 
 paper_twentysix = \paper {
        staffheight = 26.0\pt;

diff --git a/ly/params.ly b/ly/params.ly
index 5e89fd3f35b4e9de43e11c47362951e632b86768..209e4da9514820138f6f56a06633a2c6c17d4927 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -127,8 +127,8 @@ compression_energy_factor = 0.6;
 \translator { \StaffContext }
 \translator { \VoiceContext}
 \translator { \StaffGroupContext }
-\translator { \ChordNameContext }
-\translator { \ChordNameVoiceContext}
+\translator { \ChordNamesContext }
+\translator { \ChordNamesVoiceContext}
 \translator { \GrandStaffContext}
 \translator { \LyricsContext }
 \translator { \ThreadContext}

diff --git a/ly/property.ly b/ly/property.ly
index d5e2211674b5c0012b9b419d3b86c5044b539767..15656a9161d51c29cbd803de404ba0a578f92d23 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -1,6 +1,6 @@
 % property.ly
 
-\version "1.3.93";
+\version "1.3.96";
 
 stemUp = \property Voice.Stem \push #'direction = #1
 stemDown = \property Voice.Stem \push #'direction = #-1 

diff --git a/ly/svenska.ly b/ly/svenska.ly
index 39c808c5df04de1a274284e48207600558d3b5a8..09cfad936e503baa39842a99b701ded664d8ed04 100644 (file)
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -40,4 +40,4 @@
        (hiss . ( -1 6 1 ))
        (hississ . ( -1 6 2 ))
 )
-\version "1.3.93";
+\version "1.3.96";

diff --git a/scm/chord-names.scm b/scm/chord-names.scm
index 27f4314bfb3147cff75c0f18dfe1dc7ce922fe47..ed54054cee925eca2385610cffa8ca20ad4c54e1 100644 (file)
--- a/scm/chord-names.scm
+++ b/scm/chord-names.scm
@@ -50,19 +50,19 @@
        ; C iso C.no5
        (((0 . 0) (2 . 0)) . #f)
        ; Cm iso Cm.no5
-       (((0 . 0) (2 . -1)) . ("m"))
+       (((0 . 0) (2 . -1)) . (("m")))
        ; C2 iso C2.no3
-       (((0 . 0) (1 . 0) (4 . 0)) . (("2" (type . "super"))))
+       (((0 . 0) (1 . 0) (4 . 0)) . (super "2"))
        ; C4 iso C4.no3
-       (((0 . 0) (3 . 0) (4 . 0)) . (("4" (type . "super"))))
+       (((0 . 0) (3 . 0) (4 . 0)) . (super "4"))
        ; Cdim iso Cm5-
        (((0 . 0) (2 . -1) (4 . -1)) . ("dim"))
        ; Co iso Cm5-7-
        ; urg
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("o" (type . "super"))))
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (super "o"))
        ; Cdim9
-       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1)) . ("dim" ("9" (type . "super"))))
-       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1) (3 . -1)) . ("dim" ("11" (type . "super"))))
+       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1)) . ("dim" (super "9")))
+       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1) (3 . -1)) . ("dim" (super "11")))
        )
       chord::names-alist-banter))
 

diff --git a/scm/font.scm b/scm/font.scm
index 403cca53991118bc0ed777b0cb734f647abb6199..a0df641b4d2d8c06342de16e7b98db203e8433ac 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -116,7 +116,8 @@
      (bold . (font-series . "bold"))
      (italic . (font-shape . "italic"))
      (named . (lookup . name))
-     (text . (lookup . value)))
+     (text . (lookup . value))
+     (super . (font-size . -1)))
    (map (lambda (x) (cons (car x) (cons 'font-style (car x))))
        style-to-font-alist)))
   

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 33401136d1f5b7a567ff7c3f2ea9139b00411808..3dfc56f3b523b8311ab67124157a14a31c240548 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -538,7 +538,13 @@ if 1:
                            'property definiton case (eg. onevoice -> oneVoice)')
 
 
+if 1:
+       def conv (str):
+               str = re.sub ('ChordNames*', 'ChordNames', str)
 
+               return str
+       
+       conversions.append ((1,3,97), conv, 'ChordName -> ChordNames')
 
 ############################