*** empty log message ***

diff --git a/buildscripts/new-chords.py b/buildscripts/new-chords.py
index 47f4023ae09c0a0e534d0db2d9f04f6525c4eca1..a2aa3c076852194d3b557dea373ad0d3c8d85a65 100644 (file)
--- a/buildscripts/new-chords.py
+++ b/buildscripts/new-chords.py
@@ -109,8 +109,12 @@ if old_syntax:
        chordend = '>>'
 
 
+marker_str = '%% new-chords-done %%'
 
 def sub_chords (str):
+       if re.search (marker_str,str):
+               return str
+       
        str= re.sub (r'\\<', '@STARTCRESC@', str)
        str= re.sub (r'\\>', '@STARTDECRESC@', str)
        str= re.sub (r'([_^-])>', r'\1@ACCENT@', str)
@@ -126,4 +130,4 @@ def sub_chords (str):
        return str
 
 
-print  sub_chords (open (sys.argv[1]).read())
+print sub_chords (open (sys.argv[1]).read())  + marker_str 

diff --git a/input/tutorial/flowing.ly b/input/tutorial/flowing.ly
index 84a9d48504cd44fa68a75240d7e4510cb3bd3f13..cc2345e34d2ed74f90a99c73cf6f50df835b8183 100644 (file)
--- a/input/tutorial/flowing.ly
+++ b/input/tutorial/flowing.ly
@@ -10,8 +10,8 @@
 melody = \notes \relative c' {
         \partial 8
         g8 |
-        c4 c8 d [es () d] c4 | f4 f8 g [es() d] c g |
-        c4 c8 d [es () d] c4 | d4 es8 d c4.
+        c4 c8 d es-[ ( d-]-) c4 | f4 f8 g es-(-[ d-)-] c g |
+        c4 c8 d es-[ ( d-]-) c4 | d4 es8 d c4.
         \bar "|."
 }
 

diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly
index 28199b8b54a85c7715da6cf0099d718a02f92783..23036b5e98bc6a176a34e4d5f3f013502f4860c7 100644 (file)
--- a/input/tutorial/sammartini.ly
+++ b/input/tutorial/sammartini.ly
@@ -3,7 +3,7 @@
 \include "paper16.ly"
  
 viola = \notes \relative c'  \context Voice = viola {
-    <c4-\arpeggio g' c>
+    <<c g' c>>4-\arpeggio
     \voiceTwo
     g'8. b,16
     s1 s2. r4
@@ -12,18 +12,18 @@ viola = \notes \relative c'  \context Voice = viola {
 
 oboes = \notes \relative c'' \context Voice = oboes {
     \voiceOne
-    s4  g8. b,16 c8 r <e'8. g> <f16 a>
-    \grace <e8( g> <d4 )f> <c2 e>
-    \times 2/3 { <d8  f> <e g> <f a> }
+    s4  g8. b,16 c8 r <<e' g>>8. <<f a>>16
+    \grace <<e g>>8-( <<d f>>4-) <<c e>>2
+    \times 2/3 { <<d  f>>8 <<e g>> <<f a>> }
     <
         { \times 2/3 { a8 g c }  c2 }
        \\
         { f,8 e e2 }  
     >
 
-    \grace <c,8( e> <)b8. d8.-\trill> <c16 e> | 
-    [<d ( f> < )f8. a>] <)b,8 d> r [<d16( f> <f8. )a>] <b,8 d> r  |
-    [<c16( e>  < )e8. g>] <c8 e,>
+    \grace <<c, e>>8-( <<b d>>8.-)-\trill <<c e>>16 | 
+    [<<d  f>>-( << f a>>8.-)] <<b, d>>8 r [<<d f>>16-( <<f a>>8.-)] <<b, d>>8 r  |
+    [<<c e>>16-(  << e g>>8.-)] <<c e,>>8
 }
 
 hoomPah = \repeat unfold 8 \notes
@@ -42,8 +42,8 @@ bassvoices = \notes \relative c' {
     \stemBoth 
     
     [c8 c'8] r4
-    <g d'> r4
-    < { r2 <<e c'>> <<c g'>> } \\
+    <<g d'>> r4
+    < { r2 <<e c'>>4  <<c g'>>8 } \\
       { g2-~ | g4 c8 } >
 }
 
@@ -62,3 +62,5 @@ bassvoices = \notes \relative c' {
         indent = 0.0
         linewidth = 15.0 \cm }
 }
+%% new-chords-done %%
+

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index dfc6008aad0cc212ac5f7467294799799d8d9ff2..da2571f6bc5cc8e4797e38ebab6381b8a5292a7c 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -162,7 +162,7 @@ VoiceContext = \translator {
        \consists "Phrasing_slur_engraver"
        \consists "Slur_engraver"
        \consists "Tie_engraver"
-       %%\consists "New_tie_engraver"
+       \consists "New_tie_engraver"
        \consists "Porrectus_engraver"
        \consists "Tuplet_engraver"
        \consists "A2_engraver"