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 260e05ce78e678a885518a6e54cb35efd08c3656..b9f9b350bff0ec463aefc34e3cdfebbf80746547 100644 (file)
--- 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 8a96551d0c066c763b345c0dbb6634a63011aa34..cfb235d2774102d3aefbb858230498a8f9991160 100644 (file)
--- a/Documentation/footer.html.in
+++ b/Documentation/footer.html.in
@@ -24,7 +24,7 @@ Please send GNU LilyPond questions and comments to
 <p>
 
 Please send comments on these web pages to 
-<a href="mailto:@MAIL_ADDRESS@"><em>@MAIL_ADDRESS@</em></a>
+<a href="mailto:@MAILADDRESS@"><em>@MAILADDRESS@</em></a>
 
 <p>
 

diff --git a/VERSION b/VERSION
index b236aa99dc7f221524bc70af4782ad8f69c77128..30b786ca9fab8993044128da51c2ac65507f5ab1 100644 (file)
--- 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 f49e505447109bd0f439e5334392e8f077e5a116..9a0b5d2bd38a984c5dcb1f2ffa768ba6eb88e084 100644 (file)
--- 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 b8bc8d8d03a28577e4fcecda3ca6b57286eea00d..7eeb67188b0be14174725b23465942b5fe43bc3d 100644 (file)
--- 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 68200445301bf29ae7959af9698122bfec924786..fd9f367df62f796acf4c64007e79288d46e00e10 100644 (file)
--- 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 7c0f83c036ffb7aeccc983025030d1d64cb844f5..da47dab1e557d8c4acf66c43dee4d09da850fcfb 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -42,7 +42,7 @@ built = r"""<hr>
 <p><font size="-1">
 This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ by<br>
 </font>
-<address><font size="-1">@GCOS@ &lt;<a href="mailto:%s">@MAIL_ADDRESS@</a>&gt;,
+<address><font size="-1">@GCOS@ &lt;<a href="mailto:%s">@MAILADDRESS@</a>&gt;,
 @LOCALTIME@.</font></address>"""
 
 
@@ -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 ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
        while m: