CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/24 19:54:14
Modified files:
. : ChangeLog
flower/include : guile-compatibility.hh
lily : bar-number-engraver.cc
lily/include : lily-guile.hh
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3925&tr2=1.3926&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/guile-compatibility.hh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/bar-number-engraver.cc.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-guile.hh.diff?tr1=1.161&tr2=1.162&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3925 lilypond/ChangeLog:1.3926
--- lilypond/ChangeLog:1.3925 Sun Jul 24 19:37:46 2005
+++ lilypond/ChangeLog Sun Jul 24 19:54:13 2005
@@ -1,5 +1,8 @@
2005-07-24 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * flower/include/guile-compatibility.hh (SCM_I_CONSP): add
+ SCM_I_CONSP
+
* Documentation/user/invoking.itely (Invoking lilypond): add
LILYPOND_GC_YIELD documentation.
Index: lilypond/flower/include/guile-compatibility.hh
diff -u lilypond/flower/include/guile-compatibility.hh:1.4
lilypond/flower/include/guile-compatibility.hh:1.5
--- lilypond/flower/include/guile-compatibility.hh:1.4 Wed Jul 13 20:42:40 2005
+++ lilypond/flower/include/guile-compatibility.hh Sun Jul 24 19:54:14 2005
@@ -24,6 +24,7 @@
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); }
Index: lilypond/lily/bar-number-engraver.cc
diff -u lilypond/lily/bar-number-engraver.cc:1.88
lilypond/lily/bar-number-engraver.cc:1.89
--- lilypond/lily/bar-number-engraver.cc:1.88 Sun Jul 24 18:58:42 2005
+++ lilypond/lily/bar-number-engraver.cc Sun Jul 24 19:54:14 2005
@@ -53,7 +53,7 @@
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)));
}
}
}
Index: lilypond/lily/include/lily-guile.hh
diff -u lilypond/lily/include/lily-guile.hh:1.161
lilypond/lily/include/lily-guile.hh:1.162
--- lilypond/lily/include/lily-guile.hh:1.161 Sun Jul 24 18:58:43 2005
+++ lilypond/lily/include/lily-guile.hh Sun Jul 24 19:54:14 2005
@@ -163,7 +163,10 @@
#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); }
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
