(scm_from_unsigned): add scm_from_unsigned().

diff --git a/ChangeLog b/ChangeLog
index 1fada840c7cf9ba18cfcd35bef26dd02845d40e3..095b44e663ef4a7379c32d0bef5a212833f2390d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * flower/include/guile-compatibility.hh (scm_from_unsigned): add scm_from_unsigned().
+
        * lily/beam.cc (calc_direction): take dir from visible stem in
        degenerate case.
 

diff --git a/THANKS b/THANKS
index c5f752f008a4ac6f58d9c52b131bd4e2d3a28020..6aa8fb83be1ccb96d65ddf0f3d9755fee1375d6b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -67,7 +67,7 @@ Joe Neeman
 Jukka Akkanen
 Lambros Lambrou
 Laura Conrad
-Mark Steinhauser
+Mark Steinheuser
 Matevž Jekovec
 Michael Welsh Duggan
 Milan Zamazal

diff --git a/flower/include/guile-compatibility.hh b/flower/include/guile-compatibility.hh
index 3b27b579ec49d95a533594da9369f9c0e805e880..022771812aab083ac819f1f038702fd5685af279 100644 (file)
--- a/flower/include/guile-compatibility.hh
+++ b/flower/include/guile-compatibility.hh
@@ -41,6 +41,7 @@ inline SCM scm_cadar (SCM x) { return SCM_CADAR (x); }
 #define scm_from_bool(x) (x ? SCM_BOOL_T : SCM_BOOL_F)
 #define scm_from_int(x) SCM_MAKINUM (x)
 #define scm_from_unsigned_integer(x) scm_uint2num (x)
+#define scm_from_unsigned(x) scm_uint2num (x)
 #define scm_is_integer(x) SCM_INUMP (x)
 #define scm_is_string(x) SCM_STRINGP (x)
 #define scm_hash_table_p scm_vector_p

diff --git a/python/convertrules.py b/python/convertrules.py
index 1a65a7281e3dfa09a0da7a1eb49105a46bed6259..343f7828075d8f769454db4902059c9438792164 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2680,3 +2680,10 @@ def conv (str):
 
 conversions.append (((2, 7, 28), conv,
                     """ly:spanner-get-bound -> ly:spanner-bound"""))
+
+def conv (str):
+       str = re.sub (r'\epsfile *#"', r'\\epsfile #X #10 #"', str)
+       return str
+
+conversions.append (((2, 7, 30), conv,
+                    """\\epsfile"""))

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9c22d98fa880c7635698dbdd5123f58c392a18fe..4d4850de1bea17baccddbaa0f69bfdb902949a40 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -175,7 +175,7 @@ def do_one_file (infile_name):
                        result = re.sub (lilypond_version_re_str,
                                         '\\' + newversion, result)
                elif add_version:
-                       result = newversion + '\n' + result
+
                        
                error_file.write ('\n')