*** empty log message ***

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index 88fb549dea0500a95096f6ca145138868626b539..f73d0735eca127d22d08aefb0c77000deff9ff6a 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -75,7 +75,7 @@ Break_align_interface::ordered_elements (Grob *grob)
   Item *me  = dynamic_cast<Item*> (grob);
   SCM elts = me->get_property ("elements");
   SCM order_vec = me->get_property ("break-align-orders");
-  if (!ly_c_vector_p (order_vec)
+  if (!scm_is_vector (order_vec)
       || ly_vector_length (order_vec) < 3)
     return  Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                    "elements");

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 355386bdf94ed10eaf6bb97c0a29f1c791d546f5..8c28b6fe8e6e9fa4817dd1c16a603d29b03c849e 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -89,7 +89,7 @@ do_break_substitution (SCM src)
  
   if (unsmob_grob (src))
     return substitute_grob (unsmob_grob (src));
-  else if (ly_c_vector_p (src))
+  else if (scm_is_vector (src))
     {
       int len = scm_c_vector_length (src);
       SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index f0ba20d55485b9e5a467e7a5b4d971b0af282be1..5f861ab9f1d28ecc9f2123ae31a3000a37034a24 100644 (file)
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -22,7 +22,7 @@ void ly_add_function_documentation (SCM func,
   if (!strlen (doc))
     return ; 
     
-  if (!ly_c_vector_p (doc_hash_table ))
+  if (!scm_is_vector (doc_hash_table ))
     doc_hash_table = scm_make_vector (scm_int2num (59), SCM_EOL);
 
   String s = String (" - ") + "LilyPond procedure: " + fname + " " + varlist

diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc
index 9eccbd906e624818216f8a3415542035d7d67ffe..18762369235c372d4eb194065b6d35cb787c83a0 100644 (file)
--- a/lily/grob-interface-scheme.cc
+++ b/lily/grob-interface-scheme.cc
@@ -19,7 +19,7 @@ LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c),
   SCM_ASSERT_TYPE (scm_is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol");
   SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string");  
   SCM_ASSERT_TYPE (ly_c_list_p (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
-  if (!ly_c_vector_p (all_ifaces))
+  if (!scm_is_vector (all_ifaces))
     all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL);
 
   SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);

diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh
index 35e516e8963961770abef53e81e2121306556a2a..9ac45cd419dac02e7b497d1e1ae764951e78b8ec 100644 (file)
--- a/lily/include/guile-compatibility.hh
+++ b/lily/include/guile-compatibility.hh
@@ -35,6 +35,7 @@ inline SCM scm_caadr (SCM x) { return SCM_CAADR (x); }
 inline SCM scm_cadar (SCM x) { return SCM_CADAR (x); }
 #define scm_gc_unregister_collectable_memory(a, b, c) scm_done_free (b)
 #define scm_gc_register_collectable_memory(a, b, c) scm_done_malloc (b)
+#define scm_is_vector(x) (SCM_VECTORP(x))
 #define SCM_HASHTABLE_P(x) (SCM_VECTORP (x))
 #define SCM_VECTOR_REF(v, i) (SCM_VELTS ((v))[(i)])
 #define scm_from_bool(x) (x ? SCM_BOOL_T : SCM_BOOL_F)

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index f6cb2c1482646f5c1a97070670aa141b0705cbe7..6773c5c8e72dbf9b001db85c0b78e75cec1bbe81 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -67,8 +67,6 @@ inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val)
 {
   return scm_acons(key, val, scm_assoc_remove_x (alist, key));
 }
-inline bool ly_c_char_p (SCM x) { return SCM_CHARP (x); }
-inline bool ly_c_vector_p (SCM x) { return SCM_VECTORP (x); }
 inline bool ly_c_list_p (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
 inline bool ly_c_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
 inline bool ly_c_equal_p (SCM x, SCM y) {