*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 1f80d6f4691e52ff5fea606992bb927d5e9a9000..b3ecd9cba0a2a1f9e61dce574efb7a51d7b07ce3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-11-06  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/tutorial/*.ly: update to new syntax.
+
        * lily/parser.yy (Composite_music): new transpose syntax,
        \transpose FROM TO MUSIC. 
 

diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly
index d2619e99bc5f1c977c0bd111c1fa1c2a8a133fea..287305ca2aab24e73d2230d768234a66ea2799ce 100644 (file)
--- a/input/tutorial/brahms-original.ly
+++ b/input/tutorial/brahms-original.ly
@@ -4,14 +4,14 @@
     \context Staff = up
     \relative c'' <
         {   \key d\major 
-            fis4-3_\p ( ~
-            fis16 )a-5 } \\
+            fis4-3_\p-(-~
+            fis16 a-)-5 } \\
         {
-            fis16( \> d \! b \translator Staff = down
-            \clef treble g ~ < g8 )e> } \\
+            fis16-(-\> d b-\! \translator Staff = down
+            \clef treble g-~ <<g e>>8-) } \\
         { s16
           d'
-          ~ < d4 b4  > }
+          ~ <<d b>>4 }
     >
     \context Staff = down {
         \key d \major

diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly
index 239839a5f01b9d0afeb473c60a471d447bacec8b..3f391addc06c68d4449a87c70d5774f89e604bf5 100644 (file)
--- a/input/tutorial/brahms-tweaked.ly
+++ b/input/tutorial/brahms-tweaked.ly
@@ -7,22 +7,23 @@
             \property Voice.Slur \set #'attachment = #'(stem . stem)
 
             \property Voice.Fingering \set #'extra-offset = #'(-0.3 . -1.8) 
-            fis4-3_\p ( ~
+           fis4-3_\p-(-~
+   
 
             \property Voice.Fingering \revert #'extra-offset
-            fis16 )a^" "^#'(finger "5") } \\
+            fis16 a-)^" "^#'(finger "5") } \\
         {
             \dynamicUp
             \property Voice.DynamicLineSpanner \override #'padding = #5.0
             \tieUp
-            fis16( \> d \! b \translator Staff = down
+            fis16-(-\> d b-\! \translator Staff = down
            \stemUp
-           \clef treble g ~ < g8 )e> } \\
+           \clef treble g-~ <<g e>>8-) } \\
         { s16
          \property Voice.Stem \set #'transparent = ##t
           d'
           \property Voice.Stem \revert #'transparent
-          ~ < d4 b4  > }
+          ~ <<d b>>4  > }
     >
     \context Staff = down {
         \key d \major

diff --git a/input/tutorial/galuppi.ly b/input/tutorial/galuppi.ly
index 6d9eb97d248c06fc0ff4e7d14750c9a6e7b296e1..d7376211a8cd355cf51e962ceace91a3a3767b04 100644 (file)
--- a/input/tutorial/galuppi.ly
+++ b/input/tutorial/galuppi.ly
@@ -3,8 +3,8 @@
 
 soprano = \notes \relative c''  {
        fis8 g  g8.-\trill fis32 g a8 d, r a
-       b4 ~ \times 2/3 { [b16 cis d] } \times 2/3 { [e fis g] }
-       a,4 ~ \times 2/3 { [a16 b cis] } \times 2/3 { [d e fis] }
+       b4-~ \times 2/3 { b16-[ cis d-] } \times 2/3 { e-[ fis g-] }
+       a,4-~ \times 2/3 { a16-[ b cis-] } \times 2/3 { d-[ e fis-] }
        a8 g16. fis32 g8.-\trill fis16 fis4
 }
 
@@ -16,8 +16,8 @@ bass = \notes \relative c {
 tenor = \notes \relative c' {
        \stemUp\slurUp\tieUp
        r8
-       d4 cis8 r d16. cis32 d4 | r8 e16. dis32 e4 ~ e8 d16. cis32 d4 ~ |
-       [d8 d8] [cis cis] d4
+       d4 cis8 r d16. cis32 d4 | r8 e16. dis32 e4 -~ e8 d16. cis32 d4 -~ |
+       d8-[ d8-] cis-[ cis-] d4
 }
 
 

diff --git a/input/tutorial/minuet.ly b/input/tutorial/minuet.ly
index 157a5c8c5c35f3cdfeb80ba5f68378e4a92cac69..8212a57f1045e54486477f7f30c143166d108665 100644 (file)
--- a/input/tutorial/minuet.ly
+++ b/input/tutorial/minuet.ly
@@ -12,8 +12,8 @@
        \repeat "volta" 2 \sequential {
            d4 g,8 a b c d4 g, g |
            e'4 c8 d e fis g4 g, g |
-           c4 d8( )c b a( )b4 c8 b a g |
-           a4 [b8 a] [g fis] g2.  |
+           c4 d8-( c-) b a( b4-) c8 b a g |
+           a4 b8-[ a-] g-[ fis-] g2.  |
        }
 
         b'4 g8 a b g

diff --git a/input/tutorial/os-music.ly b/input/tutorial/os-music.ly
index ed5759374d3dbcc1c1122dff5f3fd29a98304ef7..7b87cda72b27ad2e436725498cef976840be5368 100644 (file)
--- a/input/tutorial/os-music.ly
+++ b/input/tutorial/os-music.ly
@@ -18,7 +18,7 @@ flautoI = \notes\relative c'' {
   bes as bes as bes as bes as
 }
 flautoII = \notes\relative c'' {
-  as8 bes as bes R1 d4 ~ d
+  as8 bes as bes R1 d4-~ d
 }
 tromboI = \notes\relative c'' {
   c4. c8 c8 c4. es4 r as, r

diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly
index 0cb6dbae6a13e5ff26ca839a0e9c120d7f9587ec..28199b8b54a85c7715da6cf0099d718a02f92783 100644 (file)
--- a/input/tutorial/sammartini.ly
+++ b/input/tutorial/sammartini.ly
@@ -43,8 +43,8 @@ bassvoices = \notes \relative c' {
     
     [c8 c'8] r4
     <g d'> r4
-    < { r2 <e4 c'> <c8 g'> } \\
-      { g2 ~ | g4 c8 } >
+    < { r2 <<e c'>> <<c g'>> } \\
+      { g2-~ | g4 c8 } >
 }
 
 \score {

diff --git a/input/tutorial/solar.ly b/input/tutorial/solar.ly
index fd88ec2140165b5b033302fbf5c3728a38d12bfe..e3c49db451c02d75084eec49f3c21572e428069c 100644 (file)
--- a/input/tutorial/solar.ly
+++ b/input/tutorial/solar.ly
@@ -6,10 +6,9 @@
     \clef treble
     \key d \minor
     r4 r8 d''8 cis''4 e''4
-    d''8 a'4. ~ a'4. b'8
-    cis''4 cis''8 cis''8 bis'4 d''8 cis'' ~
+    d''8 a'4.-~ a'4. b'8
+    cis''4 cis''8 cis''8 bis'4 d''8 cis''-~
     cis''2 r2
-
   }
   \paper { }
 }