From 0849262a1fd57ad3e68d879e7d129a3bf99273cd Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 27 Jan 2005 23:07:32 +0000 Subject: [PATCH] *** empty log message *** --- VERSION | 2 +- lily/break-align-interface.cc | 2 +- lily/include/guile-compatibility.hh | 4 ++-- lily/include/lily-guile.hh | 2 -- lily/lily-guile.cc | 2 +- lily/note-head.cc | 4 ++-- lily/note-heads-engraver.cc | 2 +- lily/quote-iterator.cc | 4 ++-- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index 6bbe0596f0..cfeb198b57 100644 --- 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 f73d0735ec..ab5e137eb9 100644 --- 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 9ac45cd419..6f494ac5db 100644 --- 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 6773c5c8e7..d40599a72b 100644 --- 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 b8c06fad55..9c1ca6306d 100644 --- 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 b5781a7a01..9f2dff2c80 100644 --- 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 334b250637..6e27d6551b 100644 --- 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 cf765e9d3b..c92d336cab 100644 --- 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) -- 2.39.5