From 35a21e88df0f7adebbca2a4e531bbeb46f5195b2 Mon Sep 17 00:00:00 2001 From: hanwen Date: Sun, 24 Jul 2005 19:54:14 +0000 Subject: [PATCH] * flower/include/guile-compatibility.hh (SCM_I_CONSP): add SCM_I_CONSP * lily/include/lily-guile.hh: inline scm_c[ad]r, scm_is_pair. --- ChangeLog | 3 +++ flower/include/guile-compatibility.hh | 1 + lily/bar-number-engraver.cc | 2 +- lily/include/lily-guile.hh | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a2e6912b9..279501be59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-07-24 Han-Wen Nienhuys + * flower/include/guile-compatibility.hh (SCM_I_CONSP): add + SCM_I_CONSP + * Documentation/user/invoking.itely (Invoking lilypond): add LILYPOND_GC_YIELD documentation. diff --git a/flower/include/guile-compatibility.hh b/flower/include/guile-compatibility.hh index 98cc83b22a..a3a1a511f0 100644 --- a/flower/include/guile-compatibility.hh +++ b/flower/include/guile-compatibility.hh @@ -24,6 +24,7 @@ inline SCM scm_car (SCM x) abort (); return SCM_CAR (x); } +#define SCM_I_CONSP(x) SCM_CONSP(x) inline SCM scm_caar (SCM x) { return SCM_CAAR (x); } inline SCM scm_cdar (SCM x) { return SCM_CDAR (x); } inline SCM scm_cadr (SCM x) { return SCM_CADR (x); } diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index fb3c132511..f54bcc97a9 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -53,7 +53,7 @@ Bar_number_engraver::process_music () create_items (); // guh. text_->set_property - ("text", scm_makfrom0str (to_string (scm_to_int (bn)).to_str0 ())); + ("text", scm_number_to_string (bn, scm_from_int (10))); } } } diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 29db1df396..803be9db63 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -163,7 +163,10 @@ typedef SCM (*Scheme_function_3) (...); #define scm_cdr ly_cdr #define scm_car ly_car + +#ifndef scm_is_pair #define scm_is_pair ly_is_pair +#endif inline SCM ly_car (SCM x) { return SCM_CAR (x); } inline SCM ly_cdr (SCM x) { return SCM_CDR (x); } -- 2.39.5