*** empty log message ***

diff --git a/VERSION b/VERSION
index 6bbe0596f02aba83df013d42c635aa309bcccab1..cfeb198b576dbae3fc7b34d4f31617bb796e48de 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=9
+PATCH_LEVEL=10
 MY_PATCH_LEVEL=
 

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

diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh
index 9ac45cd419dac02e7b497d1e1ae764951e78b8ec..6f494ac5dbdf3faddd722dfc3f59dd9c8ed5eb33 100644 (file)
--- a/lily/include/guile-compatibility.hh
+++ b/lily/include/guile-compatibility.hh
@@ -61,8 +61,8 @@ inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
 #define scm_c_string_length(x) SCM_STRING_LENGTH (x)
 #define scm_is_pair(x) (SCM_CONSP (x))
 
-#define SCM_VECTOR_LENGTH(x) scm_c_vector_length(x)
-#define SCM_VECTOR_REF(x,y) scm_c_vector_ref(x,y)
+#define scm_c_vector_length(x) SCM_VECTOR_LENGTH(x)
+#define scm_c_vector_ref(x,y)  SCM_VECTOR_REF(x,y)
 
 inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); }
 #define scm_to_double(x) (ly_scm2double (x))

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 6773c5c8e72dbf9b001db85c0b78e75cec1bbe81..d40599a72bf913ed9de19d3020d5decc9908c7e9 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -79,8 +79,6 @@ inline char ly_scm2char (SCM x) { return SCM_CHAR(x); }
 inline unsigned long ly_length (SCM x) {
   return scm_num2ulong (scm_length (x), 0, "ly_length");
 }
-inline unsigned long ly_vector_length (SCM x) { return SCM_VECTOR_LENGTH (x); }
-
 inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); }
 
 inline SCM ly_append2 (SCM x1, SCM x2) {

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index b8c06fad55bc3d7725d5d53eefac5f8eb215d79a..9c1ca6306d83e3fb0dc3ab74d398a2021e6c47a4 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -303,7 +303,7 @@ ly_deep_copy (SCM src)
 {
   if (scm_is_pair (src))
     return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (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/note-head.cc b/lily/note-head.cc
index b5781a7a018d5be680bfd7874df1910301bbe391..9f2dff2c80782b72bcbd1fb0927e961b7751c8ec 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -103,9 +103,9 @@ Note_head::brew_ez_stencil (SCM smob)
   SCM idx = scm_int2num (pit->get_notename ());
   SCM names = me->get_property ("note-names");
   SCM charstr = SCM_EOL;
-  if (ly_c_vector_p (names))
+  if (scm_is_vector (names))
     charstr = scm_vector_ref (names, idx);
-  else
+  else 
     {
       char s[2] = "a";
       s[0] = (pit->get_notename () + 2)%7 + 'a';

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 334b2506379f55e373bab0a59688e6208f0dac79..6e27d6551b3982324a531f2f414395fe82ba8579 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -89,7 +89,7 @@ Note_heads_engraver::process_music ()
        Shaped note heads change on step of the scale.
        */
       SCM shape_vector = get_property ("shapeNoteStyles");
-      if (ly_c_vector_p (shape_vector))
+      if (scm_is_vector (shape_vector))
        {
          SCM scm_tonic = get_property ("tonic");
          Pitch tonic (0,0,0); 

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index cf765e9d3b71e085e62fc19e0d00345738ca7b3f..c92d336cabc062228a3a2870fad43a294f1b71b3 100644 (file)
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -138,7 +138,7 @@ bool
 Quote_iterator::quote_ok () const
 {
   return (event_idx_ >= 0
-         && ly_c_vector_p (event_vector_)
+         && scm_is_vector (event_vector_)
          && event_idx_ <= end_idx_
 
          /*
@@ -181,7 +181,7 @@ Quote_iterator::process (Moment m)
   if (Music_wrapper_iterator::ok())
     Music_wrapper_iterator::process (m);
 
-  if (!ly_c_vector_p (event_vector_))
+  if (!scm_is_vector (event_vector_))
     return ;
   
   if (event_idx_ < 0)