lilypond-1.3.41

diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely
index 0a4cd198cfc112b623cacbd8c008e6cdf2fc7ccb..dc4a9de032c0a67872deab670458965735bf3ec2 100644 (file)
--- a/Documentation/regression-test.tely
+++ b/Documentation/regression-test.tely
@@ -41,7 +41,7 @@ should go up, but in case of multiple parts, the down stems have down
 shifted dots.  (Wanske p. 186) In case of chords, all dots should be in
 a column.  The dots go along as rests are shifted to avoid collisions.
 
-@mudelafile{dots.fly}
+@mudelafile{dots.ly}
 
 Multiple measure rests do not collide with barlines and clefs.  They
 are not expanded when you set @code{Score.skipBars}.  Although the
@@ -78,7 +78,7 @@ leave a gap.  Chord tremolo beams on half notes are not ambiguous,
 as half notes cannot appear in a regular beam, and should reach the 
 stems.
   
-@mudelafile{chord-tremolo.sly}
+@mudelafile{chord-tremolo.ly}
 
 Beams, stems and noteheads often have communication troubles, since
 the two systems for y dimensions (1 unit = staffspace, 1 unit = 1
@@ -88,7 +88,7 @@ Stems, beams, ties and slurs should behave similarly, when placed
 on the middle staff line. Of course stem-direction is down for high
 notes, and up for low notes.
 
-@mudelafile{stem-direction.sly}
+@mudelafile{stem-direction.ly}
 
 Similarly, if @code{stem_default_neutral_direction} is set to @code{-1}.
 
@@ -99,7 +99,7 @@ Similarly, if @code{stem_default_neutral_direction} is set to @code{-1}.
 The staccato dot (and all scripts with follow-into-staff set), must
 not be on staff lines.
 
-@mudelafile{staccato-pos.sly}
+@mudelafile{staccato-pos.ly}
 
 @section Grace notes
 
@@ -136,7 +136,7 @@ counting from the note head side, should never be lower than the
 second staff line.  This does not hold for grace note beams.
 Override with @code{noStemExtend}.
 
-@mudelafile{beam-position.sly}
+@mudelafile{beam-position.ly}
 
 Slurs should look nice and symmetric.  The curvature may increase
 only to avoid noteheads, and as little as possible.
@@ -196,7 +196,7 @@ LilyPond has three modes for repeats: folded, unfolded and
 semi-unfolded.  Unfolded repeats are fully written out. Semi unfolded
 repeats have the body written and all alternatives sequentially.
 Folded repeats have the body written and all alternatives
-simultaneously.  If the number of alternatives is larger than the
+simultaneo.ly.  If the number of alternatives is larger than the
 repeat count, the excess alternatives are ignored.  If the number of
 alternatives is smaller, the first alternative is multiplied to get to
 the number of repeats.
@@ -248,14 +248,14 @@ numberOfStaffLines.  Ledger lines both on note heads and rests are
 adjusted.  Barlines also are adjusted.
 
 
-@mudelafile{number-staff-lines.fly}
+@mudelafile{number-staff-lines.ly}
 
 @section Spacing
 
 In a limited number of cases, LilyPond corrects for optical spacing
 effects.  In this example, space for opposite pointed stems is adjusted
 
-@mudelafile{stem-spacing.sly}
+@mudelafile{stem-spacing.ly}
 
 If there are accidentals in the music, we add space, but the space
 between note and accidentals is less than between the notes with the
@@ -349,7 +349,7 @@ with style ``old'', 2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and
 layout. The style ``1'', gives single number signatures for all
 signatures. 
 %
-\mu delafile{time.fly}
+\mu delafile{time.ly}
 @end ignore
 
 @bye

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 7e2ea57cbe108b48eadb2aeb8e2795f1fe7b393d..ad61134692719361cf21c5378e07910fe584bea6 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -9,8 +9,8 @@ DOC_FILES = $(wildcard *.doc)
 
 DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi)  $(TELY_FILES:.tely=.dvi))
 
-EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES)  $(wildcard *.itexi *.itely)
-
+EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES)  $(wildcard *.itexi *.itely) 
+ 
 HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))
 
 PS_FILES = $(DVI_FILES:.dvi=.ps)  $(OUTDOC_FILES:.doc=.ps) $(OUTTEX_FILES:.tex=.ps)
@@ -28,9 +28,6 @@ ps: $(PS_FILES)
 # urg
 default:
 
-GENHTMLS = engraving colorado glossary computer-notation
-OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
-
 local-WWW: $(HTML_FILES)   $(datafiles) $(PS_GZ_FILES)
        $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
           $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \

diff --git a/VERSION b/VERSION
index 9f46e71982cf09cc7e8341e042e533e1af7bf164..7c8fb2092674f5cc92cafddd4f9d480362bc5997 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=40
+PATCH_LEVEL=41
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/configure b/configure
index c17460b7f152fbd3e4048e37eb9fec44137003ef..9a27b707610bfdbe9d8b5a12835d9319de00695f 100755 (executable)
--- a/configure
+++ b/configure
@@ -2663,7 +2663,7 @@ echo "configure:2645: checking for TeX TFM directory" >&5
     ## First, let's just see if we can find Guile at all.
     echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6
 echo "configure:2666: checking "for guile-config"" >&5
-    for guile_config in guile-config $build-guile-config; do
+    for guile_config in guile-config $target-guile-config $build-guile-config; do
        echo "$ac_t"""$guile_config"" 1>&6
        if ! $guile_config --version > /dev/null 2>&1 ; then
            echo "configure: warning: "cannot execute $guile_config"" 1>&2

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 8c2e6891ace698c7dae28d268385119b8db55c47..d64dfcddb9d43d0929bc7af1d1d73c09dd894f92 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -20,7 +20,7 @@ import os
 import sys
 import __main__
 import getopt
-from string import *
+import  string
 import re
 import time
 
@@ -81,10 +81,10 @@ def gulp_file(f):
        return s
 
 def str_to_tuple (s):
-       return tuple (map (atoi, split (s,'.')))
+       return tuple (map (string.atoi, string.split (s,'.')))
 
 def tup_to_str (t):
-       return join (map (lambda x: '%s' % x, list (t)), '.')
+       return string.join (map (lambda x: '%s' % x, list (t)), '.')
 
 def version_cmp (t1, t2):
        for x in [0,1,2]:
@@ -438,6 +438,24 @@ if 1:
 
        conversions.append ((1,3,38), conv, '\musicalpitch { a b c } -> #\'(a b c)')
 
+if 1:
+       def conv (str):
+               def replace (match):
+                       return '\\key %s;' % string.lower (match.group (1))
+               
+               str = re.sub ("\\\\key ([^;]+);",  replace, str)
+               return str
+       
+       conversions.append ((1,3,39), conv, '\\key A ;  ->\\key a;')
+
+if 1:
+       def conv (str):
+               if re.search ('\\[:',str):
+                       sys.stderr.write ('\nNot smart enough to convert to new tremolo format')
+               return str
+
+       conversions.append ((1,3,41), conv,
+                           '[:16 c4 d4 ] -> \repeat "tremolo" 2 { c16 d16 }')
 
 ############################
        
@@ -452,7 +470,6 @@ def latest_version ():
        return conversions[-1][0]
 
 def do_conversion (infile, from_version, outfile, to_version):
-       
        conv_list = get_conversions (from_version, to_version)
 
        sys.stderr.write ('Applying conversions: ')