*** empty log message ***

[lilypond.git] / lily / lily-guile.cc

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 1c03bf92cb2e7cd33057928e7838036d6ebeae5e..9490490ac02db0f7fd4e09799771d3b07fa3b8b2 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -4,8 +4,7 @@
   source file of the GNU LilyPond music typesetter
 
   (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -135,24 +134,20 @@ ly_scm2string (SCM s)
 char *
 ly_scm2newstr (SCM str, size_t *lenp)
 {
-  char *new_str;
-  size_t len;
-
   SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
 
-  len = SCM_STRING_LENGTH (str);
-  new_str = (char *) malloc ((len + 1) * sizeof (char));
-  
-  if (new_str == NULL)
-    return NULL;
-
-  memcpy (new_str, SCM_STRING_CHARS (str), len);
-  new_str[len] = '\0';
-
-  if (lenp != NULL)
-      *lenp = len;
+  size_t len = SCM_STRING_LENGTH (str);
+  if (char *new_str = (char *) malloc ((len + 1) * sizeof (char)))
+    {
+      memcpy (new_str, SCM_STRING_CHARS (str), len);
+      new_str[len] = '\0';
 
-  return new_str;
+      if (lenp)
+       *lenp = len;
+      
+      return new_str;
+    }
+  return 0;
 }
 
 SCM
@@ -173,16 +168,21 @@ index_set_cell (SCM s, Direction d, SCM v)
   return s;
 }
   
-LY_DEFINE (ly_warning,"ly:warn", 1, 0, 0,
-  (SCM str), "Scheme callable function to issue the warning @code{msg}.")
+LY_DEFINE (ly_warn, "ly:warn",
+          1, 0, 1, (SCM str, SCM rest),
+          "Scheme callable function to issue the warning @code{msg}. "
+          "The message is formatted with @code{format} and @code{rest}.")
 {
   SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
   progress_indication ("\n");
+
+  str = scm_simple_format (SCM_BOOL_F, str, rest);
   warning ("lily-guile: " + ly_scm2string (str));
-  return SCM_BOOL_T;
+  return SCM_UNSPECIFIED;
 }
 
-LY_DEFINE (ly_dir_p,  "ly:dir?", 1,0, 0,  (SCM s),
+LY_DEFINE (ly_dir_p, "ly:dir?",
+          1, 0, 0, (SCM s),
          "type predicate. A direction is @code{-1}, @code{0} or "
           "@code{1}, where @code{-1} represents "
          "left or down and @code{1} represents right or up.")
@@ -198,7 +198,8 @@ LY_DEFINE (ly_dir_p,  "ly:dir?", 1,0, 0,  (SCM s),
 bool
 is_number_pair (SCM p)
 {
-  return ly_c_pair_p (p) && ly_c_number_p (ly_car (p)) && ly_c_number_p (ly_cdr (p));
+  return ly_c_pair_p (p)
+    && ly_c_number_p (ly_car (p)) && ly_c_number_p (ly_cdr (p));
 }
 
 typedef void (*Void_fptr) ();
@@ -212,7 +213,6 @@ void add_scm_init_func (void (*f) ())
   scm_init_funcs_->push (f);
 }
 
-
 void
 ly_init_ly_module (void *)
 {
@@ -234,13 +234,12 @@ ly_c_init_guile ()
   scm_c_use_module ("lily");
 }
 
-unsigned int ly_scm_hash (SCM s)
+unsigned int
+ly_scm_hash (SCM s)
 {
   return scm_ihashv (s, ~1u);
 }
 
-
-
 bool
 is_direction (SCM s)
 {
@@ -252,7 +251,6 @@ is_direction (SCM s)
   return false;
 }
 
-
 bool
 is_axis (SCM s)
 {
@@ -267,7 +265,7 @@ is_axis (SCM s)
 Direction
 to_dir (SCM s)
 {
-  return SCM_INUMP (s) ? (Direction) ly_scm2int (s) : CENTER;
+  return scm_is_integer (s) ? (Direction) ly_scm2int (s) : CENTER;
 }
 
 Interval
@@ -315,7 +313,6 @@ appendable_list_append (SCM l, SCM elt)
   scm_set_car_x (l, newcons);
 }
 
-
 SCM
 ly_offset2scm (Offset o)
 {
@@ -329,7 +326,6 @@ ly_scm2offset (SCM s)
                 ly_scm2double (ly_cdr (s)));
 }
 
-   
 LY_DEFINE (ly_number2string, "ly:number->string",
           1, 0, 0, (SCM s),
           "Convert @var{num} to a string without generating many decimals.")
@@ -779,9 +775,26 @@ alist_to_hashq (SCM alist)
 /*
   Debugging mem leaks:
  */
-LY_DEFINE (ly_protects, "ly:protects", 0, 0, 0, (),
+LY_DEFINE (ly_protects, "ly:protects",
+          0, 0, 0, (),
          "Return hash of protected objects.")
 {
   return scm_protects;
 }
 #endif
+
+
+#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+
+#include "pangofc-afm-decoder.hh"
+
+LY_DEFINE (ly_pango_add_afm_decoder, "ly:pango-add-afm-decoder",
+          1, 0, 0, (SCM font_family),
+          "Add pango afm decoder for FONT-FAMILY.")
+{
+  SCM_ASSERT_TYPE (ly_c_string_p (font_family), font_family, SCM_ARG1, __FUNCTION__, "font_family");
+  pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0));
+  return SCM_UNSPECIFIED;
+}
+
+#endif