From: Jan Nieuwenhuizen Date: Sat, 29 Sep 2001 20:53:29 +0000 (+0200) Subject: patch::: 1.5.14.jcn1 X-Git-Tag: release/1.5.15~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=637eff7ba745bbeb96d347d1798615529cea9e5f;p=lilypond.git patch::: 1.5.14.jcn1 1.5.14.jcn1 =========== * Guile > 1.4 compilation fixes. * Website bugfix: mailto: (thanks David Boersma). 1.5.14 ====== --- diff --git a/CHANGES b/CHANGES index 260e05ce78..b9f9b350bf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +1.5.14.jcn1 +=========== + +* Guile > 1.4 compilation fixes. + +* Website bugfix: mailto: (thanks David Boersma). + +1.5.14 +====== + 1.5.13.hwn2 =========== diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index 8a96551d0c..cfb235d277 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -24,7 +24,7 @@ Please send GNU LilyPond questions and comments to

Please send comments on these web pages to -@MAIL_ADDRESS@ +@MAILADDRESS@

diff --git a/VERSION b/VERSION index b236aa99dc..30b786ca9f 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=14 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index f49e505447..9a0b5d2bd3 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -48,6 +48,8 @@ #define scm_list_n scm_listify #define SCM_STRING_CHARS SCM_CHARS #define SCM_STRING_LENGTH SCM_LENGTH +#define SCM_SYMBOL_CHARS SCM_CHARS +#define SCM_SYMBOL_LENGTH SCM_LENGTH #endif diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index b8bc8d8d03..7eeb67188b 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -14,7 +14,7 @@ void copy_scm_hashes (SCM dest, SCM src) { - for (int i = SCM_LENGTH(src); i--;) + for (int i = SCM_SYMBOL_LENGTH (src); i--;) for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); ly_pair_p(s); s = ly_cdr (s)) { scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s)); @@ -108,7 +108,7 @@ Scheme_hash_table::set (SCM k, SCM v) /* resize if getting too large. */ - if (elt_count_ > 2 * SCM_LENGTH (hash_tab_)) + if (elt_count_ > 2 * SCM_SYMBOL_LENGTH (hash_tab_)) { SCM nh = scm_make_vector (gh_int2scm (3* elt_count_+1), SCM_EOL); copy_scm_hashes (nh, hash_tab_); @@ -142,7 +142,7 @@ SCM Scheme_hash_table::to_alist () const { SCM l = SCM_EOL; - for (int i = SCM_LENGTH(hash_tab_); i--;) + for (int i = SCM_SYMBOL_LENGTH (hash_tab_); i--;) for (SCM s = scm_vector_ref (hash_tab_, gh_int2scm (i)); ly_pair_p(s); s = ly_cdr (s)) { l = scm_acons (ly_caar (s), ly_cdar (s), l); diff --git a/lily/translator.cc b/lily/translator.cc index 6820044530..fd9f367df6 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -160,7 +160,7 @@ Translator::name (SCM trans) if (unsmob_translator (trans)) { char const* nm = classname (unsmob_translator (trans)); - return gh_str02scm (nm); + return ly_str02scm (nm); } return SCM_EOL; diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 7c0f83c036..da47dab1e5 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -42,7 +42,7 @@ built = r"""

This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ by
 -

@GCOS@ <@MAIL_ADDRESS@>, +
@GCOS@ <@MAILADDRESS@>, @LOCALTIME@.
""" @@ -226,7 +226,7 @@ def do_file (f): s = re.sub ('@WEBMASTER@', webmaster, s) s = re.sub ('@GCOS@', gcos, s) s = re.sub ('@LOCALTIME@', localtime, s) - s = re.sub ('@MAIL_ADDRESS@', mail_address, s) + s = re.sub ('@MAILADDRESS@', mail_address, s) m = re.match ('.*?', s, re.DOTALL) while m: