CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/11 11:51:43
Modified files:
. : ChangeLog
lily : accidental-engraver.cc accidental.cc
all-font-metrics.cc apply-context-iterator.cc
balloon.cc bar-line.cc bar-number-engraver.cc
beam.cc chord-name-engraver.cc context-def.cc
context-property.cc dynamic-performer.cc
event.cc figured-bass-engraver.cc
grob-interface-scheme.cc grob.cc hairpin.cc
item.cc key-engraver.cc lily-guile.cc
mark-engraver.cc music-function.cc
music-iterator.cc music.cc note-collision.cc
note-head.cc output-property-engraver.cc
paper-book.cc paper-outputter-scheme.cc
paper-outputter.cc parser.yy
piano-pedal-engraver.cc
piano-pedal-performer.cc
recording-group-engraver.cc
repeat-acknowledge-engraver.cc
script-engraver.cc slur-scoring.cc
span-bar-engraver.cc stencil-scheme.cc
system-start-delimiter-engraver.cc
system-start-delimiter.cc system.cc
tie-engraver.cc tie-performer.cc
time-signature-performer.cc tuplet-engraver.cc
tweak-registration-scheme.cc
lily/include : lily-guile.hh paper-outputter.hh
scm : framework-ps.scm framework-svg.scm
framework-tex.scm framework-texstr.scm
Log message:
* lily/include/lily-guile.hh: rename ly_c_X_p -> ly_is_X
* lily/paper-outputter.cc (Paper_outputter): take port argument.
* lily/paper-outputter-scheme.cc (LY_DEFINE): take port argument.
* scm/framework-texstr.scm (output-framework):
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3864&tr2=1.3865&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/accidental-engraver.cc.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/accidental.cc.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/all-font-metrics.cc.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/apply-context-iterator.cc.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/balloon.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/bar-line.cc.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/bar-number-engraver.cc.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam.cc.diff?tr1=1.302&tr2=1.303&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/chord-name-engraver.cc.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-def.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-property.cc.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-performer.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/event.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/figured-bass-engraver.cc.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grob-interface-scheme.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grob.cc.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/hairpin.cc.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/item.cc.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/key-engraver.cc.diff?tr1=1.109&tr2=1.110&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-guile.cc.diff?tr1=1.213&tr2=1.214&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/mark-engraver.cc.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-function.cc.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-iterator.cc.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music.cc.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-collision.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-head.cc.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/output-property-engraver.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.108&tr2=1.109&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-outputter-scheme.cc.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-outputter.cc.diff?tr1=1.160&tr2=1.161&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.476&tr2=1.477&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/piano-pedal-engraver.cc.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/piano-pedal-performer.cc.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/recording-group-engraver.cc.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/repeat-acknowledge-engraver.cc.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/script-engraver.cc.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-scoring.cc.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/span-bar-engraver.cc.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stencil-scheme.cc.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/system-start-delimiter-engraver.cc.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/system-start-delimiter.cc.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/system.cc.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie-engraver.cc.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie-performer.cc.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/time-signature-performer.cc.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tuplet-engraver.cc.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tweak-registration-scheme.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-guile.hh.diff?tr1=1.159&tr2=1.160&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-outputter.hh.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-svg.scm.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-tex.scm.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-texstr.scm.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3864 lilypond/ChangeLog:1.3865
--- lilypond/ChangeLog:1.3864 Mon Jul 11 10:52:53 2005
+++ lilypond/ChangeLog Mon Jul 11 11:51:40 2005
@@ -1,5 +1,15 @@
2005-07-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/framework-*.scm: use port arguments throughout.
+
+ * lily/include/lily-guile.hh: rename ly_c_X_p -> ly_is_X
+
+ * lily/paper-outputter.cc (Paper_outputter): take port argument.
+
+ * lily/paper-outputter-scheme.cc (LY_DEFINE): take port argument.
+
+ * scm/framework-texstr.scm (output-framework):
+
* input/regression/repeat-fold.ly (texidoc): remove TeX strings.
* scm/output-lib.scm (tablature-stem-attachment-function):
Index: lilypond/lily/accidental-engraver.cc
diff -u lilypond/lily/accidental-engraver.cc:1.99
lilypond/lily/accidental-engraver.cc:1.100
--- lilypond/lily/accidental-engraver.cc:1.99 Fri Jul 8 22:16:27 2005
+++ lilypond/lily/accidental-engraver.cc Mon Jul 11 11:51:42 2005
@@ -486,7 +486,7 @@
&& Rhythmic_head::has_interface (info.grob ()))
{
if (to_boolean (get_property ("harmonicAccidentals"))
- || !ly_c_equal_p (info.grob ()->get_property ("style"),
+ || !ly_is_equal (info.grob ()->get_property ("style"),
ly_symbol2scm ("harmonic")))
{
Accidental_entry entry;
Index: lilypond/lily/accidental.cc
diff -u lilypond/lily/accidental.cc:1.57 lilypond/lily/accidental.cc:1.58
--- lilypond/lily/accidental.cc:1.57 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/accidental.cc Mon Jul 11 11:51:42 2005
@@ -57,7 +57,7 @@
if (to_boolean (a->get_property ("cautionary")))
{
SCM cstyle = a->get_property ("cautionary-style");
- parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+ parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses"));
}
SCM accs = a->get_property ("accidentals");
@@ -191,8 +191,8 @@
if (caut)
{
SCM cstyle = me->get_property ("cautionary-style");
- parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
- smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller"));
+ parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses"));
+ smaller = ly_is_equal (cstyle, ly_symbol2scm ("smaller"));
}
SCM scm_style = me->get_property ("style");
Index: lilypond/lily/all-font-metrics.cc
diff -u lilypond/lily/all-font-metrics.cc:1.88
lilypond/lily/all-font-metrics.cc:1.89
--- lilypond/lily/all-font-metrics.cc:1.88 Wed Apr 27 09:12:33 2005
+++ lilypond/lily/all-font-metrics.cc Mon Jul 11 11:51:42 2005
@@ -106,7 +106,7 @@
return path;
SCM kpath = ly_lily_module_constant ("ly:kpathsea-find-file");
- if (ly_c_procedure_p (kpath))
+ if (ly_is_procedure (kpath))
{
SCM kp_result = scm_call_1 (kpath, scm_makfrom0str (name.to_str0 ()));
if (scm_is_string (kp_result))
Index: lilypond/lily/apply-context-iterator.cc
diff -u lilypond/lily/apply-context-iterator.cc:1.11
lilypond/lily/apply-context-iterator.cc:1.12
--- lilypond/lily/apply-context-iterator.cc:1.11 Thu Mar 10 14:36:16 2005
+++ lilypond/lily/apply-context-iterator.cc Mon Jul 11 11:51:42 2005
@@ -27,7 +27,7 @@
{
SCM proc = get_music ()->get_property ("procedure");
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
scm_call_1 (proc, get_outlet ()->self_scm ());
else
get_music ()->origin ()->warning (_ ("\\applycontext argument is not a
procedure"));
Index: lilypond/lily/balloon.cc
diff -u lilypond/lily/balloon.cc:1.23 lilypond/lily/balloon.cc:1.24
--- lilypond/lily/balloon.cc:1.23 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/balloon.cc Mon Jul 11 11:51:42 2005
@@ -31,7 +31,7 @@
SCM cb = me->get_property ("balloon-original-callback");
SCM stil = SCM_EOL;
- if (ly_c_procedure_p (cb))
+ if (ly_is_procedure (cb))
stil = scm_call_1 (cb, smob);
if (!unsmob_stencil (stil))
Index: lilypond/lily/bar-line.cc
diff -u lilypond/lily/bar-line.cc:1.54 lilypond/lily/bar-line.cc:1.55
--- lilypond/lily/bar-line.cc:1.54 Sun May 29 10:01:32 2005
+++ lilypond/lily/bar-line.cc Mon Jul 11 11:51:42 2005
@@ -26,7 +26,7 @@
SCM s = me->get_property ("glyph");
SCM barsiz_proc = me->get_property ("bar-size-procedure");
- if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
+ if (scm_is_string (s) && ly_is_procedure (barsiz_proc))
{
String str = ly_scm2string (s);
SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
@@ -180,7 +180,7 @@
// leave y_extent for spanbar?
}
- if (! ly_c_equal_p (g, orig))
+ if (! ly_is_equal (g, orig))
me->set_property ("glyph", g);
return SCM_UNSPECIFIED;
Index: lilypond/lily/bar-number-engraver.cc
diff -u lilypond/lily/bar-number-engraver.cc:1.82
lilypond/lily/bar-number-engraver.cc:1.83
--- lilypond/lily/bar-number-engraver.cc:1.82 Sun May 8 23:30:50 2005
+++ lilypond/lily/bar-number-engraver.cc Mon Jul 11 11:51:42 2005
@@ -44,7 +44,7 @@
{
SCM bn = get_property ("currentBarNumber");
SCM proc = get_property ("barNumberVisibility");
- if (scm_is_number (bn) && ly_c_procedure_p (proc)
+ if (scm_is_number (bn) && ly_is_procedure (proc)
&& to_boolean (scm_call_1 (proc, bn)))
{
create_items ();
Index: lilypond/lily/beam.cc
diff -u lilypond/lily/beam.cc:1.302 lilypond/lily/beam.cc:1.303
--- lilypond/lily/beam.cc:1.302 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/beam.cc Mon Jul 11 11:51:42 2005
@@ -72,7 +72,7 @@
{
SCM func = me->get_property ("space-function");
- if (ly_c_procedure_p (func))
+ if (ly_is_procedure (func))
{
SCM s = scm_call_2 (func, me->self_scm (), scm_int2num (get_beam_count
(me)));
return scm_to_double (s);
Index: lilypond/lily/chord-name-engraver.cc
diff -u lilypond/lily/chord-name-engraver.cc:1.88
lilypond/lily/chord-name-engraver.cc:1.89
--- lilypond/lily/chord-name-engraver.cc:1.88 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/chord-name-engraver.cc Mon Jul 11 11:51:42 2005
@@ -118,7 +118,7 @@
SCM s = get_property ("chordChanges");
if (to_boolean (s) && scm_is_pair (last_chord_)
- && ly_c_equal_p (chord_as_scm, last_chord_))
+ && ly_is_equal (chord_as_scm, last_chord_))
chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
last_chord_ = chord_as_scm;
Index: lilypond/lily/context-def.cc
diff -u lilypond/lily/context-def.cc:1.40 lilypond/lily/context-def.cc:1.41
--- lilypond/lily/context-def.cc:1.40 Sun May 29 09:56:00 2005
+++ lilypond/lily/context-def.cc Mon Jul 11 11:51:42 2005
@@ -211,7 +211,7 @@
{
/* do not check aliases, because \context Staff should not
create RhythmicStaff. */
- if (ly_c_equal_p (accepteds[i]->get_context_name (), type_sym))
+ if (ly_is_equal (accepteds[i]->get_context_name (), type_sym))
{
best_result.push (accepteds[i]);
return best_result;
Index: lilypond/lily/context-property.cc
diff -u lilypond/lily/context-property.cc:1.12
lilypond/lily/context-property.cc:1.13
--- lilypond/lily/context-property.cc:1.12 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/context-property.cc Mon Jul 11 11:51:42 2005
@@ -86,7 +86,7 @@
while (prev_alist != daddy)
{
- if (ly_c_equal_p (scm_caar (prev_alist), eltprop))
+ if (ly_is_equal (scm_caar (prev_alist), eltprop))
{
prev_alist = scm_cdr (prev_alist);
break;
Index: lilypond/lily/dynamic-performer.cc
diff -u lilypond/lily/dynamic-performer.cc:1.40
lilypond/lily/dynamic-performer.cc:1.41
--- lilypond/lily/dynamic-performer.cc:1.40 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/dynamic-performer.cc Mon Jul 11 11:51:42 2005
@@ -44,7 +44,7 @@
SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
SCM svolume = SCM_EOL;
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
{
// urg
svolume = scm_call_1 (proc, script_req_->get_property ("text"));
@@ -80,7 +80,7 @@
s = scm_makfrom0str ("piano");
SCM eq = get_property ("instrumentEqualizer");
- if (ly_c_procedure_p (eq))
+ if (ly_is_procedure (eq))
{
s = scm_call_1 (eq, s);
}
Index: lilypond/lily/event.cc
diff -u lilypond/lily/event.cc:1.40 lilypond/lily/event.cc:1.41
--- lilypond/lily/event.cc:1.40 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/event.cc Mon Jul 11 11:51:42 2005
@@ -27,7 +27,7 @@
Event::Event (SCM i)
: Music (i)
{
- if (!ly_c_procedure_p (length_callback_))
+ if (!ly_is_procedure (length_callback_))
{
length_callback_ = length_callback_proc;
}
Index: lilypond/lily/figured-bass-engraver.cc
diff -u lilypond/lily/figured-bass-engraver.cc:1.36
lilypond/lily/figured-bass-engraver.cc:1.37
--- lilypond/lily/figured-bass-engraver.cc:1.36 Sat Jul 9 08:27:54 2005
+++ lilypond/lily/figured-bass-engraver.cc Mon Jul 11 11:51:42 2005
@@ -67,7 +67,7 @@
else if (figures_.size ())
{
SCM proc = get_property ("bassFigureFormatFunction");
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
{
SCM l = SCM_EOL;
SCM *t = &l;
Index: lilypond/lily/grob-interface-scheme.cc
diff -u lilypond/lily/grob-interface-scheme.cc:1.8
lilypond/lily/grob-interface-scheme.cc:1.9
--- lilypond/lily/grob-interface-scheme.cc:1.8 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/grob-interface-scheme.cc Mon Jul 11 11:51:42 2005
@@ -17,7 +17,7 @@
{
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");
+ SCM_ASSERT_TYPE (ly_is_list (c), c, SCM_ARG3, __FUNCTION__, "list of syms");
if (!scm_is_vector (all_ifaces))
all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL);
Index: lilypond/lily/grob.cc
diff -u lilypond/lily/grob.cc:1.131 lilypond/lily/grob.cc:1.132
--- lilypond/lily/grob.cc:1.131 Tue May 31 15:25:26 2005
+++ lilypond/lily/grob.cc Mon Jul 11 11:51:42 2005
@@ -110,12 +110,12 @@
{
dim_cache_[a].dimension_ = xt;
}
- else if (ly_c_procedure_p (cb))
+ else if (ly_is_procedure (cb))
{
dim_cache_[a].dimension_callback_ = cb;
}
else if (cb == SCM_EOL
- && ly_c_procedure_p (get_property ("print-function")))
+ && ly_is_procedure (get_property ("print-function")))
dim_cache_[a].dimension_callback_ = stencil_extent_proc;
}
}
@@ -199,7 +199,7 @@
unsmob_grob (scm_car (d))->calculate_dependencies (final, busy, funcname);
SCM proc = internal_get_property (funcname);
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
scm_call_1 (proc, this->self_scm ());
status_ = final;
@@ -231,7 +231,7 @@
SCM proc = get_property ("print-function");
SCM stil = SCM_EOL;
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
stil = scm_apply_0 (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED));
if (Stencil *m = unsmob_stencil (stil))
@@ -419,14 +419,14 @@
Grob::is_empty (Axis a) const
{
return !(scm_is_pair (dim_cache_[a].dimension_)
- || ly_c_procedure_p (dim_cache_[a].dimension_callback_));
+ || ly_is_procedure (dim_cache_[a].dimension_callback_));
}
void
Grob::flush_extent_cache (Axis axis)
{
Dimension_cache *d = &dim_cache_[axis];
- if (ly_c_procedure_p (d->dimension_callback_)
+ if (ly_is_procedure (d->dimension_callback_)
&& scm_is_pair (d->dimension_))
{
d->dimension_ = SCM_EOL;
@@ -447,7 +447,7 @@
SCM dimpair = d->dimension_;
if (scm_is_pair (dimpair))
;
- else if (ly_c_procedure_p (d->dimension_callback_)
+ else if (ly_is_procedure (d->dimension_callback_)
&& d->dimension_ == SCM_EOL)
d->dimension_ = scm_call_2 (d->dimension_callback_, self_scm (),
scm_int2num (a));
else
Index: lilypond/lily/hairpin.cc
diff -u lilypond/lily/hairpin.cc:1.52 lilypond/lily/hairpin.cc:1.53
--- lilypond/lily/hairpin.cc:1.52 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/hairpin.cc Mon Jul 11 11:51:42 2005
@@ -37,7 +37,7 @@
while (flip (&d) != LEFT);
if (broken[LEFT]
- && ly_c_equal_p (bounds[RIGHT]->get_column ()->get_property ("when"),
+ && ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"),
bounds[LEFT]->get_property ("when")))
{
me->suicide ();
Index: lilypond/lily/include/lily-guile.hh
diff -u lilypond/lily/include/lily-guile.hh:1.159
lilypond/lily/include/lily-guile.hh:1.160
--- lilypond/lily/include/lily-guile.hh:1.159 Mon May 2 12:39:28 2005
+++ lilypond/lily/include/lily-guile.hh Mon Jul 11 11:51:42 2005
@@ -72,9 +72,12 @@
{
return scm_acons (key, val, scm_assoc_remove_x (alist, key));
}
-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)
+inline bool ly_is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
+inline bool ly_is_procedure (SCM x) { return SCM_NFALSEP (scm_procedure_p
(x)); }
+inline bool ly_is_port (SCM x) { return SCM_NFALSEP (scm_port_p (x)); }
+
+
+inline bool ly_is_equal (SCM x, SCM y)
{
return SCM_NFALSEP (scm_equal_p (x, y));
}
Index: lilypond/lily/include/paper-outputter.hh
diff -u lilypond/lily/include/paper-outputter.hh:1.51
lilypond/lily/include/paper-outputter.hh:1.52
--- lilypond/lily/include/paper-outputter.hh:1.51 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/paper-outputter.hh Mon Jul 11 11:51:42 2005
@@ -29,10 +29,10 @@
DECLARE_SMOBS (Paper_outputter,);
public:
- SCM file ();
+ SCM file () const;
SCM dump_string (SCM);
void output_scheme (SCM scm);
- Paper_outputter (String nm, String format);
+ Paper_outputter (SCM port, String format);
SCM scheme_to_string (SCM);
void output_stencil (Stencil);
void close ();
Index: lilypond/lily/item.cc
diff -u lilypond/lily/item.cc:1.113 lilypond/lily/item.cc:1.114
--- lilypond/lily/item.cc:1.113 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/item.cc Mon Jul 11 11:51:42 2005
@@ -156,7 +156,7 @@
more complicated things.
*/
SCM vis = get_property ("break-visibility");
- if (ly_c_procedure_p (vis))
+ if (ly_is_procedure (vis))
{
SCM args = scm_list_n (scm_int2num (break_status_dir ()), SCM_UNDEFINED);
SCM result = scm_apply_0 (vis, args);
Index: lilypond/lily/key-engraver.cc
diff -u lilypond/lily/key-engraver.cc:1.109 lilypond/lily/key-engraver.cc:1.110
--- lilypond/lily/key-engraver.cc:1.109 Sun May 8 23:30:50 2005
+++ lilypond/lily/key-engraver.cc Mon Jul 11 11:51:42 2005
@@ -80,7 +80,7 @@
if (!def)
{
SCM vis = get_property ("explicitKeySignatureVisibility");
- if (ly_c_procedure_p (vis))
+ if (ly_is_procedure (vis))
item_->set_property ("break-visibility", vis);
}
}
Index: lilypond/lily/lily-guile.cc
diff -u lilypond/lily/lily-guile.cc:1.213 lilypond/lily/lily-guile.cc:1.214
--- lilypond/lily/lily-guile.cc:1.213 Sun May 15 23:44:06 2005
+++ lilypond/lily/lily-guile.cc Mon Jul 11 11:51:42 2005
@@ -453,7 +453,7 @@
SCM type = scm_object_property (sym, type_symbol);
- if (type != SCM_EOL && !ly_c_procedure_p (type))
+ if (type != SCM_EOL && !ly_is_procedure (type))
{
warning (_f ("can't find property type-check for `%s' (%s).",
ly_symbol2string (sym).to_str0 (),
@@ -469,7 +469,7 @@
else
{
if (val != SCM_EOL
- && ly_c_procedure_p (type)
+ && ly_is_procedure (type)
&& scm_call_1 (type, val) == SCM_BOOL_F)
{
ok = false;
@@ -499,7 +499,7 @@
for (SCM i = list; scm_is_pair (i); i = scm_cdr (i))
{
if (!scm_is_pair (scm_cdr (i))
- || !ly_c_equal_p (scm_car (i), scm_cadr (i)))
+ || !ly_is_equal (scm_car (i), scm_cadr (i)))
unique = scm_cons (scm_car (i), unique);
}
return scm_reverse_x (unique, SCM_EOL);
@@ -560,7 +560,7 @@
{
SCM i = scm_car (after);
after = scm_cdr (after);
- if (ly_c_equal_p (i, s))
+ if (ly_is_equal (i, s))
break;
before = scm_cons (i, before);
}
@@ -686,7 +686,7 @@
SCM l = scm_assoc (key, b);
if (l == SCM_BOOL_F
- || !ly_c_equal_p (scm_cdr (l), val))
+ || !ly_is_equal (scm_cdr (l), val))
return false;
}
Index: lilypond/lily/mark-engraver.cc
diff -u lilypond/lily/mark-engraver.cc:1.99 lilypond/lily/mark-engraver.cc:1.100
--- lilypond/lily/mark-engraver.cc:1.99 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/mark-engraver.cc Mon Jul 11 11:51:42 2005
@@ -102,7 +102,7 @@
SCM m = mark_ev_->get_property ("label");
SCM proc = get_property ("markFormatter");
if (!Text_interface::markup_p (m)
- && ly_c_procedure_p (proc))
+ && ly_is_procedure (proc))
{
if (!scm_is_number (m))
m = get_property ("rehearsalMark");
Index: lilypond/lily/music-function.cc
diff -u lilypond/lily/music-function.cc:1.12
lilypond/lily/music-function.cc:1.13
--- lilypond/lily/music-function.cc:1.12 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/music-function.cc Mon Jul 11 11:51:42 2005
@@ -43,7 +43,7 @@
str += "music";
else if (scm_car (s) == ly_lily_module_constant ("markup?"))
str += "markup";
- else if (ly_c_procedure_p (scm_car (s)))
+ else if (ly_is_procedure (scm_car (s)))
str += "scm";
}
if (str == "") str = "noarg";
Index: lilypond/lily/music-iterator.cc
diff -u lilypond/lily/music-iterator.cc:1.99
lilypond/lily/music-iterator.cc:1.100
--- lilypond/lily/music-iterator.cc:1.99 Sat Apr 9 14:31:55 2005
+++ lilypond/lily/music-iterator.cc Mon Jul 11 11:51:42 2005
@@ -78,7 +78,7 @@
SCM ctor = m->get_property ("iterator-ctor");
SCM iter = SCM_EOL;
- if (ly_c_procedure_p (ctor))
+ if (ly_is_procedure (ctor))
{
iter = scm_call_0 (ctor);
p = unsmob_iterator (iter);
Index: lilypond/lily/music.cc
diff -u lilypond/lily/music.cc:1.135 lilypond/lily/music.cc:1.136
--- lilypond/lily/music.cc:1.135 Sun Jul 10 11:25:24 2005
+++ lilypond/lily/music.cc Mon Jul 11 11:51:42 2005
@@ -100,7 +100,7 @@
if (unsmob_moment (lst))
return *unsmob_moment (lst);
- if (ly_c_procedure_p (length_callback_))
+ if (ly_is_procedure (length_callback_))
{
SCM res = scm_call_1 (length_callback_, self_scm ());
return *unsmob_moment (res);
@@ -113,7 +113,7 @@
Music::start_mom () const
{
SCM lst = start_callback_;
- if (ly_c_procedure_p (lst))
+ if (ly_is_procedure (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
return *unsmob_moment (res);
@@ -195,7 +195,7 @@
Music::to_relative_octave (Pitch last)
{
SCM callback = get_property ("to-relative-callback");
- if (ly_c_procedure_p (callback))
+ if (ly_is_procedure (callback))
{
Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (),
last.smobbed_copy ()));
return *p;
Index: lilypond/lily/note-collision.cc
diff -u lilypond/lily/note-collision.cc:1.48
lilypond/lily/note-collision.cc:1.49
--- lilypond/lily/note-collision.cc:1.48 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/note-collision.cc Mon Jul 11 11:51:42 2005
@@ -71,7 +71,7 @@
bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
/* Do not merge notes typeset in different style. */
- if (!ly_c_equal_p (nu->get_property ("style"),
+ if (!ly_is_equal (nu->get_property ("style"),
nd->get_property ("style")))
merge_possible = false;
Index: lilypond/lily/note-head.cc
diff -u lilypond/lily/note-head.cc:1.140 lilypond/lily/note-head.cc:1.141
--- lilypond/lily/note-head.cc:1.140 Fri Jul 8 17:53:40 2005
+++ lilypond/lily/note-head.cc Mon Jul 11 11:51:42 2005
@@ -42,7 +42,7 @@
SCM proc = me->get_property ("glyph-name-procedure");
String suffix = to_string (robust_scm2int (me->get_property
("duration-log"), 2));
- if (scm_procedure_p (proc) == SCM_BOOL_T)
+ if (ly_is_procedure (proc))
suffix = ly_scm2string (scm_call_2 (proc, log, style));
Font_metric *fm = Font_interface::get_default_font (me);
@@ -115,7 +115,7 @@
Fallback
*/
SCM v = me->get_property ("stem-attachment-function");
- if (!ly_c_procedure_p (v))
+ if (!ly_is_procedure (v))
return 0.0;
SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a));
Index: lilypond/lily/output-property-engraver.cc
diff -u lilypond/lily/output-property-engraver.cc:1.40
lilypond/lily/output-property-engraver.cc:1.41
--- lilypond/lily/output-property-engraver.cc:1.40 Sun May 8 23:30:50 2005
+++ lilypond/lily/output-property-engraver.cc Mon Jul 11 11:51:42 2005
@@ -44,7 +44,7 @@
- if (ly_c_procedure_p (pred))
+ if (ly_is_procedure (pred))
{
/*
should typecheck pred.
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.108 lilypond/lily/paper-book.cc:1.109
--- lilypond/lily/paper-book.cc:1.108 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/paper-book.cc Mon Jul 11 11:51:42 2005
@@ -160,7 +160,7 @@
scopes = scm_cons (header_, scopes);
SCM tit = SCM_EOL;
- if (ly_c_procedure_p (title_func))
+ if (ly_is_procedure (title_func))
tit = scm_call_2 (title_func,
paper_->self_scm (),
scopes);
@@ -189,7 +189,7 @@
scopes = scm_cons (header, scopes);
SCM tit = SCM_EOL;
- if (ly_c_procedure_p (title_func))
+ if (ly_is_procedure (title_func))
tit = scm_call_2 (title_func,
paper_->self_scm (),
scopes);
Index: lilypond/lily/paper-outputter-scheme.cc
diff -u lilypond/lily/paper-outputter-scheme.cc:1.7
lilypond/lily/paper-outputter-scheme.cc:1.8
--- lilypond/lily/paper-outputter-scheme.cc:1.7 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/paper-outputter-scheme.cc Mon Jul 11 11:51:42 2005
@@ -10,25 +10,25 @@
#include "warn.hh"
#include "stencil.hh"
+
+
LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
- 2, 0, 0, (SCM outname, SCM format),
+ 2, 0, 0, (SCM port, SCM format),
"Create an outputter that evaluates within "
- "@[EMAIL PROTECTED], writing to file @var{outname}.")
+ "@[EMAIL PROTECTED], writing to @var{port}.")
{
- SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG1, __FUNCTION__,
- "String");
+ SCM_ASSERT_TYPE (ly_is_port (port), port, SCM_ARG1, __FUNCTION__,
+ "port");
SCM_ASSERT_TYPE (scm_is_string (format), format, SCM_ARG2, __FUNCTION__,
"String");
- String outname_str = ly_scm2string (outname);
String f = ly_scm2string (format);
message (_f ("Layout output to `%s'...",
- outname_str == "-"
- ? String ("<stdout>")
- : outname_str));
+ ly_scm2string (scm_port_filename (port)).to_str0 ()));
+
progress_indication ("\n");
- Paper_outputter *po = new Paper_outputter (outname_str, f);
+ Paper_outputter *po = new Paper_outputter (port, f);
scm_gc_unprotect_object (po->self_scm ());
return po->self_scm ();
Index: lilypond/lily/paper-outputter.cc
diff -u lilypond/lily/paper-outputter.cc:1.160
lilypond/lily/paper-outputter.cc:1.161
--- lilypond/lily/paper-outputter.cc:1.160 Fri Jun 17 23:39:16 2005
+++ lilypond/lily/paper-outputter.cc Mon Jul 11 11:51:42 2005
@@ -27,13 +27,12 @@
#include "ly-smobs.icc"
-Paper_outputter::Paper_outputter (String file_name, String format)
+Paper_outputter::Paper_outputter (SCM port, String format)
{
- file_ = SCM_EOL;
+ file_ = port;
output_module_ = SCM_EOL;
smobify_self ();
- file_name_ = file_name;
String module_name = "scm output-" + format;
output_module_ = scm_c_resolve_module (module_name.to_str0 ());
}
@@ -62,18 +61,8 @@
}
SCM
-Paper_outputter::file ()
+Paper_outputter::file () const
{
- if (file_ == SCM_EOL)
- if (file_name_ == "-")
- file_ = scm_current_output_port ();
- else
- /*
- Opening binary sucks a little for DOS, since PS doesn't look like
- ASCII anymore, but binary CFFs will get embedded correctly.
- */
- file_ = scm_open_file (scm_makfrom0str (file_name_.to_str0 ()),
- scm_makfrom0str ("wb"));
return file_;
}
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.476 lilypond/lily/parser.yy:1.477
--- lilypond/lily/parser.yy:1.476 Sun Jul 10 11:25:24 2005
+++ lilypond/lily/parser.yy Mon Jul 11 11:51:42 2005
@@ -84,7 +84,7 @@
SCM tags = m->get_property ("tags");
if (scm_is_symbol (tag))
tags = scm_cons (tag, tags);
- else if (ly_c_list_p (tag))
+ else if (ly_is_list (tag))
tags = ly_append2 (tag, tags);
else
ip.warning (_ ("tag must be symbol or list of symbols"));
@@ -171,8 +171,8 @@
bool
ly_input_procedure_p (SCM x)
{
- return ly_c_procedure_p (x)
- || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x)));
+ return ly_is_procedure (x)
+ || (scm_is_pair (x) && ly_is_procedure (scm_car (x)));
}
Music*
@@ -999,7 +999,7 @@
r->set_property ("repeat-count", scm_int2num (max (times, 1)));
r-> set_property ("elements",alts);
- if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {
+ if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) {
/*
TODO: move this code to Scheme.
*/
@@ -2756,7 +2756,7 @@
bool itc = do_internal_type_checking_global;
/* UGH.
*/
- bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm
("autoBeamSettings"));
+ bool autobeam = ly_is_equal (symbol, ly_symbol2scm
("autoBeamSettings"));
if (autobeam)
do_internal_type_checking_global = false;
m->set_property ("grob-property", grob_sym);
Index: lilypond/lily/piano-pedal-engraver.cc
diff -u lilypond/lily/piano-pedal-engraver.cc:1.91
lilypond/lily/piano-pedal-engraver.cc:1.92
--- lilypond/lily/piano-pedal-engraver.cc:1.91 Sun May 8 23:30:50 2005
+++ lilypond/lily/piano-pedal-engraver.cc Mon Jul 11 11:51:42 2005
@@ -154,7 +154,7 @@
for (Pedal_info *p = info_list_; p->name_; p++)
{
String nm = p->name_ + String ("Event");
- if (ly_c_equal_p (m->get_property ("name"),
+ if (ly_is_equal (m->get_property ("name"),
scm_str2symbol (nm.to_str0 ())))
{
Direction d = to_dir (m->get_property ("span-direction"));
Index: lilypond/lily/piano-pedal-performer.cc
diff -u lilypond/lily/piano-pedal-performer.cc:1.36
lilypond/lily/piano-pedal-performer.cc:1.37
--- lilypond/lily/piano-pedal-performer.cc:1.36 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/piano-pedal-performer.cc Mon Jul 11 11:51:42 2005
@@ -128,7 +128,7 @@
for (Pedal_info *p = info_alist_; p->name_; p++)
{
String nm = p->name_ + String ("Event");
- if (ly_c_equal_p (r->get_property ("name"),
+ if (ly_is_equal (r->get_property ("name"),
scm_str2symbol (nm.to_str0 ())))
{
Direction d = to_dir (r->get_property ("span-direction"));
Index: lilypond/lily/recording-group-engraver.cc
diff -u lilypond/lily/recording-group-engraver.cc:1.24
lilypond/lily/recording-group-engraver.cc:1.25
--- lilypond/lily/recording-group-engraver.cc:1.24 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/recording-group-engraver.cc Mon Jul 11 11:51:42 2005
@@ -68,7 +68,7 @@
Engraver_group_engraver::finalize ();
SCM proc = get_property ("recordEventSequence");
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
scm_call_2 (proc, context ()->self_scm (), scm_cdr (accumulator_));
}
Index: lilypond/lily/repeat-acknowledge-engraver.cc
diff -u lilypond/lily/repeat-acknowledge-engraver.cc:1.38
lilypond/lily/repeat-acknowledge-engraver.cc:1.39
--- lilypond/lily/repeat-acknowledge-engraver.cc:1.38 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/repeat-acknowledge-engraver.cc Mon Jul 11 11:51:42 2005
@@ -96,7 +96,7 @@
*/
SCM wb = get_property ("whichBar");
SCM db = get_property ("defaultBarType");
- if (!scm_is_string (wb) || ly_c_equal_p (db, wb))
+ if (!scm_is_string (wb) || ly_is_equal (db, wb))
{
if (s != "" || (volta_found && !scm_is_string (wb)))
{
Index: lilypond/lily/script-engraver.cc
diff -u lilypond/lily/script-engraver.cc:1.119
lilypond/lily/script-engraver.cc:1.120
--- lilypond/lily/script-engraver.cc:1.119 Sun May 8 23:30:51 2005
+++ lilypond/lily/script-engraver.cc Mon Jul 11 11:51:42 2005
@@ -60,7 +60,7 @@
/* Discard double articulations for part-combining. */
int script_count = scripts_.size ();
for (int i = 0; i < script_count; i++)
- if (ly_c_equal_p (scripts_[i].event_
+ if (ly_is_equal (scripts_[i].event_
->get_property ("articulation-type"),
m->get_property ("articulation-type")))
return true;
@@ -116,7 +116,7 @@
{
SCM sym = scm_caar (s);
SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
- if (!ly_c_procedure_p (type))
+ if (!ly_is_procedure (type))
continue;
SCM val = scm_cdar (s);
Index: lilypond/lily/slur-scoring.cc
diff -u lilypond/lily/slur-scoring.cc:1.53 lilypond/lily/slur-scoring.cc:1.54
--- lilypond/lily/slur-scoring.cc:1.53 Wed Jun 1 15:04:56 2005
+++ lilypond/lily/slur-scoring.cc Mon Jul 11 11:51:42 2005
@@ -824,7 +824,7 @@
if (to_boolean (g->get_property ("cautionary")))
{
SCM cstyle = g->get_property ("cautionary-style");
- parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+ parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses"));
}
SCM accs = g->get_property ("accidentals");
Index: lilypond/lily/span-bar-engraver.cc
diff -u lilypond/lily/span-bar-engraver.cc:1.54
lilypond/lily/span-bar-engraver.cc:1.55
--- lilypond/lily/span-bar-engraver.cc:1.54 Sun May 8 23:30:51 2005
+++ lilypond/lily/span-bar-engraver.cc Mon Jul 11 11:51:42 2005
@@ -64,7 +64,7 @@
SCM vissym = ly_symbol2scm ("break-visibility");
SCM vis = bars_[0]->internal_get_property (vissym);
- if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis))
+ if (ly_is_equal (spanbar_->internal_get_property (vissym), vis))
spanbar_->internal_set_property (vissym, vis);
spanbar_ = 0;
Index: lilypond/lily/stencil-scheme.cc
diff -u lilypond/lily/stencil-scheme.cc:1.46
lilypond/lily/stencil-scheme.cc:1.47
--- lilypond/lily/stencil-scheme.cc:1.46 Wed Jun 1 14:26:13 2005
+++ lilypond/lily/stencil-scheme.cc Mon Jul 11 11:51:42 2005
@@ -293,7 +293,7 @@
4, 0, 0, (SCM expr, SCM func, SCM arg1, SCM offset),
"Parse EXPR, feed bits to FUNC with first arg ARG1")
{
- SCM_ASSERT_TYPE (ly_c_procedure_p (func), func, SCM_ARG1, __FUNCTION__,
+ SCM_ASSERT_TYPE (ly_is_procedure (func), func, SCM_ARG1, __FUNCTION__,
"procedure");
Stencil_interpret_arguments a;
Index: lilypond/lily/system-start-delimiter-engraver.cc
diff -u lilypond/lily/system-start-delimiter-engraver.cc:1.64
lilypond/lily/system-start-delimiter-engraver.cc:1.65
--- lilypond/lily/system-start-delimiter-engraver.cc:1.64 Mon Jun 6
20:58:23 2005
+++ lilypond/lily/system-start-delimiter-engraver.cc Mon Jul 11 11:51:42 2005
@@ -45,11 +45,11 @@
/*
UGH UGH
*/
- if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("brace"))
- && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str
("bracket")))
+ if (scm_is_string (gl) && ly_is_equal (gl, scm_makfrom0str ("brace"))
+ && scm_is_string (my_gl) && ly_is_equal (my_gl, scm_makfrom0str
("bracket")))
inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
- else if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str
("bracket"))
- && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str
("bracket")))
+ else if (scm_is_string (gl) && ly_is_equal (gl, scm_makfrom0str
("bracket"))
+ && scm_is_string (my_gl) && ly_is_equal (my_gl, scm_makfrom0str
("bracket")))
{
inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
}
Index: lilypond/lily/system-start-delimiter.cc
diff -u lilypond/lily/system-start-delimiter.cc:1.100
lilypond/lily/system-start-delimiter.cc:1.101
--- lilypond/lily/system-start-delimiter.cc:1.100 Mon Jun 6 18:44:50 2005
+++ lilypond/lily/system-start-delimiter.cc Mon Jul 11 11:51:42 2005
@@ -65,7 +65,7 @@
Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
SCM gl = me->get_property ("glyph");
- if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line")))
+ if (ly_is_equal (gl, scm_makfrom0str ("bar-line")))
{
int count = 0;
Paper_column *left_column = me->get_bound (LEFT)->get_column ();
Index: lilypond/lily/system.cc
diff -u lilypond/lily/system.cc:1.105 lilypond/lily/system.cc:1.106
--- lilypond/lily/system.cc:1.105 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/system.cc Mon Jul 11 11:51:42 2005
@@ -243,7 +243,7 @@
{
Grob *e = unsmob_grob (scm_car (s));
SCM proc = e->get_property ("spacing-procedure");
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
scm_call_1 (proc, e->self_scm ());
}
}
Index: lilypond/lily/tie-engraver.cc
diff -u lilypond/lily/tie-engraver.cc:1.103 lilypond/lily/tie-engraver.cc:1.104
--- lilypond/lily/tie-engraver.cc:1.103 Sun May 8 23:30:51 2005
+++ lilypond/lily/tie-engraver.cc Mon Jul 11 11:51:42 2005
@@ -115,7 +115,7 @@
maybe should check positions too.
*/
if (right_mus && left_mus
- && ly_c_equal_p (right_mus->get_property ("pitch"),
+ && ly_is_equal (right_mus->get_property ("pitch"),
left_mus->get_property ("pitch")))
{
Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
Index: lilypond/lily/tie-performer.cc
diff -u lilypond/lily/tie-performer.cc:1.50 lilypond/lily/tie-performer.cc:1.51
--- lilypond/lily/tie-performer.cc:1.50 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/tie-performer.cc Mon Jul 11 11:51:42 2005
@@ -69,7 +69,7 @@
Music *left_mus = heads_to_tie_[i].event_;
if (right_mus && left_mus
- && ly_c_equal_p (right_mus->get_property ("pitch"),
+ && ly_is_equal (right_mus->get_property ("pitch"),
left_mus->get_property ("pitch")))
{
an->tie_to (th);
Index: lilypond/lily/time-signature-performer.cc
diff -u lilypond/lily/time-signature-performer.cc:1.42
lilypond/lily/time-signature-performer.cc:1.43
--- lilypond/lily/time-signature-performer.cc:1.42 Tue Apr 5 10:22:50 2005
+++ lilypond/lily/time-signature-performer.cc Mon Jul 11 11:51:42 2005
@@ -47,7 +47,7 @@
Time_signature_performer::create_audio_elements ()
{
SCM fr = get_property ("timeSignatureFraction");
- if (scm_is_pair (fr) && !ly_c_equal_p (fr, prev_fraction_))
+ if (scm_is_pair (fr) && !ly_is_equal (fr, prev_fraction_))
{
prev_fraction_ = fr;
int b = scm_to_int (scm_car (fr));
Index: lilypond/lily/tuplet-engraver.cc
diff -u lilypond/lily/tuplet-engraver.cc:1.73
lilypond/lily/tuplet-engraver.cc:1.74
--- lilypond/lily/tuplet-engraver.cc:1.73 Sun May 8 23:30:51 2005
+++ lilypond/lily/tuplet-engraver.cc Mon Jul 11 11:51:42 2005
@@ -76,7 +76,7 @@
tuplets_[i].spanner_ = spanner;
SCM proc = get_property ("tupletNumberFormatFunction");
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
{
SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm
()));
spanner->set_property ("text", t);
Index: lilypond/lily/tweak-registration-scheme.cc
diff -u lilypond/lily/tweak-registration-scheme.cc:1.8
lilypond/lily/tweak-registration-scheme.cc:1.9
--- lilypond/lily/tweak-registration-scheme.cc:1.8 Sat Apr 30 19:47:14 2005
+++ lilypond/lily/tweak-registration-scheme.cc Mon Jul 11 11:51:42 2005
@@ -26,7 +26,7 @@
Grob *gr = unsmob_grob (grob);
SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "Grob");
SCM_ASSERT_TYPE (scm_list_p (tweak) == SCM_BOOL_T
- && ly_c_procedure_p (scm_car (tweak)),
+ && ly_is_procedure (scm_car (tweak)),
tweak, SCM_ARG2, __FUNCTION__, "Tweak");
global_registry_->insert_grob_tweak (gr, tweak);
@@ -41,7 +41,7 @@
Grob *gr = unsmob_grob (grob);
SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "Grob");
SCM_ASSERT_TYPE (scm_list_p (tweak) == SCM_BOOL_T
- && ly_c_procedure_p (scm_car (tweak)),
+ && ly_is_procedure (scm_car (tweak)),
tweak, SCM_ARG2, __FUNCTION__, "Tweak");
global_registry_->replace_grob_tweak (gr, tweak);
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.125 lilypond/scm/framework-ps.scm:1.126
--- lilypond/scm/framework-ps.scm:1.125 Tue Jun 28 11:10:24 2005
+++ lilypond/scm/framework-ps.scm Mon Jul 11 11:51:43 2005
@@ -408,7 +408,9 @@
(define-public (output-framework basename book scopes fields)
(let* ((filename (format "~a.ps" basename))
- (outputter (ly:make-paper-outputter filename "ps"))
+ (outputter (ly:make-paper-outputter
+ (open-file filename "wb")
+ "ps"))
(paper (ly:paper-book-paper book))
(pages (ly:paper-book-pages book))
(landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
@@ -449,7 +451,11 @@
(max (1+ (car box)) (caddr box))
(max (1+ (cadr box)) (cadddr box)))))
- (let* ((outputter (ly:make-paper-outputter (format "~a.eps" filename) "ps"))
+ (let* ((outputter (ly:make-paper-outputter
+
+ ;; need to have binary for embedding CFFs
+ (open-file (format "~a.eps" filename) "wb")
+ "ps"))
(port (ly:outputter-port outputter))
(xext (ly:stencil-extent dump-me X))
(yext (ly:stencil-extent dump-me Y))
Index: lilypond/scm/framework-svg.scm
diff -u lilypond/scm/framework-svg.scm:1.14 lilypond/scm/framework-svg.scm:1.15
--- lilypond/scm/framework-svg.scm:1.14 Tue Jun 14 00:22:03 2005
+++ lilypond/scm/framework-svg.scm Mon Jul 11 11:51:43 2005
@@ -18,7 +18,7 @@
(define-public (output-framework basename book scopes fields)
(let* ((filename (format "~a.svg" basename))
- (outputter (ly:make-paper-outputter filename
+ (outputter (ly:make-paper-outputter (open-file filename "wb")
(ly:output-backend)))
(dump (lambda (str) (display str (ly:outputter-port outputter))))
(paper (ly:paper-book-paper book))
Index: lilypond/scm/framework-tex.scm
diff -u lilypond/scm/framework-tex.scm:1.84 lilypond/scm/framework-tex.scm:1.85
--- lilypond/scm/framework-tex.scm:1.84 Tue Jun 14 00:22:03 2005
+++ lilypond/scm/framework-tex.scm Mon Jul 11 11:51:43 2005
@@ -191,7 +191,7 @@
(define-public (output-framework basename book scopes fields)
(let* ((filename (format "~a.tex" basename))
- (outputter (ly:make-paper-outputter filename "tex"))
+ (outputter (ly:make-paper-outputter (open-file filename "wb") "tex"))
(paper (ly:paper-book-paper book))
(pages (ly:paper-book-pages book))
(last-page (car (last-pair pages)))
@@ -233,7 +233,8 @@
(define-public (output-classic-framework
basename book scopes fields)
(let* ((filename (format "~a.tex" basename))
- (outputter (ly:make-paper-outputter filename "tex"))
+ (outputter (ly:make-paper-outputter
+ (open-file filename "w") "tex"))
(paper (ly:paper-book-paper book))
(lines (ly:paper-book-systems book))
(last-line (car (last-pair lines))))
@@ -259,7 +260,7 @@
(define-public (output-preview-framework
basename book scopes fields)
(let* ((filename (format "~a.tex" basename))
- (outputter (ly:make-paper-outputter filename
+ (outputter (ly:make-paper-outputter (open-file filename "wb")
"tex"))
(paper (ly:paper-book-paper book))
(lines (ly:paper-book-systems book))
Index: lilypond/scm/framework-texstr.scm
diff -u lilypond/scm/framework-texstr.scm:1.9
lilypond/scm/framework-texstr.scm:1.10
--- lilypond/scm/framework-texstr.scm:1.9 Tue Apr 12 22:49:25 2005
+++ lilypond/scm/framework-texstr.scm Mon Jul 11 11:51:43 2005
@@ -32,7 +32,9 @@
(define-public (output-classic-framework basename book scopes fields)
(let* ((filename (format "~a.texstr" basename))
- (outputter (ly:make-paper-outputter filename (ly:output-backend)))
+ (outputter (ly:make-paper-outputter
+ (open-file filename "wb")
+ (ly:output-backend)))
(paper (ly:paper-book-paper book))
(lines (ly:paper-book-systems book)))
(ly:outputter-dump-string outputter (header basename))
@@ -44,7 +46,10 @@
(define-public (output-framework basename book scopes fields )
(let* ((filename (format "~a.texstr" basename))
- (outputter (ly:make-paper-outputter filename (ly:output-backend)))
+ (outputter
+ (ly:make-paper-outputter
+ (open-file filename "wb")
+ (ly:output-backend)))
(paper (ly:paper-book-paper book))
(pages (ly:paper-book-pages book)))
(ly:outputter-dump-string outputter (header basename))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
