From 535a0a12c66a571491248e4256722db259fd0a72 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 31 Jan 2006 22:28:14 +0000 Subject: [PATCH] (scm_from_unsigned): add scm_from_unsigned(). --- ChangeLog | 2 ++ THANKS | 2 +- flower/include/guile-compatibility.hh | 1 + python/convertrules.py | 7 +++++++ scripts/convert-ly.py | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fada840c7..095b44e663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-31 Han-Wen Nienhuys + * 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 c5f752f008..6aa8fb83be 100644 --- 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 3b27b579ec..022771812a 100644 --- 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 1a65a7281e..343f782807 100644 --- 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 9c22d98fa8..4d4850de1b 100644 --- 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') -- 2.39.2