Merge commit 'origin'

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 2f61d53f3fb821746b6a64e29b98d6a867b1cbdd..655d992123f4859cbc4d73cbdf430d22fbaafc4e 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -188,7 +188,7 @@ Stencil
 Font_metric::text_stencil (string str) const
 {
   (void) str;
-  assert (false);
+  programming_error("Cannot get a text stencil from this font");
   return Stencil (Box (), SCM_EOL);
 }
 

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 2265e249c29ff6f8d926c8b738c55a29154b88ca..30288179980b59882737786f655b922c08d1948f 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -101,7 +101,7 @@ inline bool ly_is_equal (SCM x, SCM y)
 }
 
 inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); }
-inline char ly_scm2char (SCM x) { return SCM_CHAR (x); }
+inline char ly_scm2char (SCM x) { return (char)SCM_CHAR (x); }
 inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); }
 
 inline SCM ly_append2 (SCM x1, SCM x2)