(texidoc): demo 15ma too.

diff --git a/ChangeLog b/ChangeLog
index be2b2f2d19b280ecb6e274b3932824db454bec88..68428c7c6cb56699350b5ca9ee73a58261abd78e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-12  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/regression/ottava.ly (texidoc): demo 15ma too.
+
+       * GNUmakefile.in ($(outdir)/VERSION): add VERSION target 
+
        * input/mutopia/J.S.Bach/baerenreiter-sarabande.ly (sarabandeA):
        octave fixes.
 

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 0a32a084ec32eaafa3d6bada2b823e70e68f7302..9d8a46e8661085c61081b7fe96b276e4a946298b 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -13,11 +13,12 @@ use of the scheme function @code{set-octavation}.
 \score {
   \notes\relative c''' \notes {
   a b c a
-  #(set-octavation 1)
-  a b c a
+  #(set-octavation 2)
+  a' b
+  c a
   #(set-octavation 0)
 
-  a #(set-octavation 1) b
+  a, #(set-octavation 1) b
   #(set-octavation 0)
   c a 
 }

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index d30bf71a5b990a4f37d3a37ec91b67b5049f931a..3b074dd7b2021249834608f3e685d84ebb8c8f8d 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1285,6 +1285,14 @@ if 1:
                last_str = ''
                while last_str <> str:
                  last_str = str
+                 def sub_tremolos (m):
+                         tr = m.group (2)
+                         if tr not in slur_strs:
+                                 slur_strs.append (tr)
+                         return  m.group (1)
+                 
+                 str = re.sub (r"([a-z]+[',!? ]*)(:[0-9]+)", sub_tremolos, str)
+
                  def sub_dyn_end (m):
                          dyns.append (' \!')
                          return ' ' + m.group(2)