From ba858880848d6aca1de4401d185860eb2017a01c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 12 Apr 2004 12:48:42 +0000 Subject: [PATCH] * lily/lexer.ll: change is_string -> ly_c_string_p * lily/lyric-engraver.cc (get_voice_to_lyrics): recursively go higher for finding Voice. (backportme) --- ChangeLog | 2 ++ lily/accidental-engraver.cc | 10 +++---- lily/accidental-placement.cc | 8 ++--- lily/accidental.cc | 2 +- lily/all-font-metrics.cc | 2 +- lily/ambitus.cc | 2 +- lily/arpeggio.cc | 8 ++--- lily/auto-beam-engraver.cc | 2 +- lily/auto-change-iterator.cc | 2 +- lily/axis-group-interface.cc | 6 ++-- lily/bar-engraver.cc | 2 +- lily/bar-line.cc | 6 ++-- lily/bar-number-engraver.cc | 2 +- lily/beam-quanting.cc | 2 +- lily/beam.cc | 24 +++++++-------- lily/break-align-engraver.cc | 2 +- lily/break-align-interface.cc | 12 ++++---- lily/break-substitution.cc | 10 +++---- lily/chord-name-engraver.cc | 2 +- lily/clef-engraver.cc | 2 +- lily/clef.cc | 4 +-- lily/cluster.cc | 6 ++-- lily/coherent-ligature-engraver.cc | 2 +- lily/context-def.cc | 16 +++++----- lily/context-specced-music-iterator.cc | 2 +- lily/context.cc | 8 ++--- lily/custos-engraver.cc | 2 +- lily/drum-note-engraver.cc | 4 +-- lily/dynamic-engraver.cc | 4 +-- lily/dynamic-performer.cc | 4 +-- lily/engraver-group-engraver.cc | 12 ++++---- lily/event-chord-iterator.cc | 2 +- lily/event.cc | 6 ++-- lily/extender-engraver.cc | 2 +- lily/font-metric.cc | 4 +-- lily/font-select.cc | 8 ++--- lily/forbid-break-engraver.cc | 4 +-- lily/global-context.cc | 4 +-- lily/grob-interface.cc | 4 +-- lily/grob-pq-engraver.cc | 4 +-- lily/grob-property.cc | 2 +- lily/grob.cc | 24 +++++++-------- lily/hara-kiri-group-spanner.cc | 2 +- lily/hyphen-engraver.cc | 2 +- lily/include/group-interface.hh | 2 +- lily/include/lily-guile.hh | 4 +-- lily/input-smob.cc | 2 +- lily/instrument-name-engraver.cc | 2 +- lily/key-engraver.cc | 10 +++---- lily/key-signature-interface.cc | 8 ++--- lily/kpath.cc | 2 +- lily/lexer.ll | 8 ++--- lily/lily-guile.cc | 38 ++++++++++++------------ lily/lyric-combine-music-iterator.cc | 4 +-- lily/lyric-combine-music.cc | 6 ++-- lily/lyric-engraver.cc | 4 +-- lily/lyric-performer.cc | 2 +- lily/measure-grouping-engraver.cc | 4 +-- lily/multi-measure-rest-engraver.cc | 2 +- lily/multi-measure-rest.cc | 2 +- lily/music-output-def.cc | 2 +- lily/music-sequence.cc | 14 ++++----- lily/music.cc | 10 +++---- lily/my-lily-lexer.cc | 6 ++-- lily/my-lily-parser.cc | 2 +- lily/new-fingering-engraver.cc | 4 +-- lily/new-lyric-combine-music-iterator.cc | 2 +- lily/note-collision.cc | 8 ++--- lily/note-column.cc | 8 ++--- lily/note-head.cc | 2 +- lily/note-spacing.cc | 8 ++--- lily/ottava-bracket.cc | 2 +- lily/ottava-engraver.cc | 2 +- lily/paper-column.cc | 6 ++-- lily/paper-def.cc | 8 ++--- lily/paper-outputter.cc | 4 +-- lily/parser.yy | 26 ++++++++-------- lily/part-combine-iterator.cc | 2 +- lily/performer-group-performer.cc | 4 +-- lily/piano-pedal-engraver.cc | 2 +- lily/quote-iterator.cc | 4 +-- lily/recording-group-engraver.cc | 4 +-- lily/repeat-acknowledge-engraver.cc | 8 ++--- lily/repeated-music.cc | 6 ++-- lily/rest-collision.cc | 2 +- lily/scm-hash.cc | 8 ++--- lily/score.cc | 2 +- lily/script-column.cc | 4 +-- lily/script-engraver.cc | 6 ++-- lily/script.cc | 4 +-- lily/separating-group-spanner.cc | 4 +-- lily/separation-item.cc | 6 ++-- lily/sequential-iterator.cc | 8 ++--- lily/simple-spacer.cc | 6 ++-- lily/simultaneous-music-iterator.cc | 16 +++++----- lily/slur.cc | 14 ++++----- lily/spaceable-grob.cc | 4 +-- lily/spacing-spanner.cc | 26 ++++++++-------- lily/span-arpeggio-engraver.cc | 4 +-- lily/span-bar.cc | 14 ++++----- lily/staff-performer.cc | 2 +- lily/staff-spacing.cc | 12 ++++---- lily/stanza-number-engraver.cc | 2 +- lily/stem.cc | 14 ++++----- lily/sustain-pedal.cc | 2 +- lily/system-start-delimiter-engraver.cc | 8 ++--- lily/system-start-delimiter.cc | 4 +-- lily/system.cc | 34 ++++++++++----------- lily/tab-note-heads-engraver.cc | 2 +- lily/text-item.cc | 10 +++---- lily/text-spanner.cc | 2 +- lily/tie.cc | 6 ++-- lily/time-signature-engraver.cc | 2 +- lily/time-signature-performer.cc | 2 +- lily/time-signature.cc | 2 +- lily/timing-engraver.cc | 6 ++-- lily/translator-ctors.cc | 2 +- lily/translator-group.cc | 12 ++++---- lily/translator-property.cc | 10 +++---- lily/tuplet-bracket.cc | 4 +-- lily/unfolded-repeat-iterator.cc | 2 +- lily/virtual-font-metric.cc | 14 ++++----- lily/volta-bracket.cc | 2 +- lily/volta-engraver.cc | 12 ++++---- 124 files changed, 391 insertions(+), 389 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd18b203d9..fa650d9890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-04-12 Han-Wen Nienhuys + * lily/lexer.ll: change is_string -> ly_c_string_p + * input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): use \book. * input/mutopia/W.A.Mozart/mozart-hrn-3.ly: use \book. diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 4d86929756..0258e9d889 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -73,7 +73,7 @@ static void set_property_on_children (Context * trans, const char * sym, SCM val) { trans->set_property (sym, val); - for (SCM p = trans->children_contexts (); is_pair (p); p = ly_cdr (p)) + for (SCM p = trans->children_contexts (); ly_c_pair_p (p); p = ly_cdr (p)) { Context *trg = unsmob_context (ly_car (p)); set_property_on_children (trg, sym, ly_deep_copy (val)); @@ -127,7 +127,7 @@ number_accidentals_from_sig (bool *different, prev = scm_assoc (scm_cons (scm_int2num (o), scm_int2num (n)), sig); /* should really be true unless prev == SCM_BOOL_F */ - if (is_pair (prev) && is_pair (ly_cdr (prev))) + if (ly_c_pair_p (prev) && ly_c_pair_p (ly_cdr (prev))) { accbarnum_i = ly_scm2int (ly_cddr (prev)); prev = scm_cons (ly_car (prev), ly_cadr (prev)); @@ -163,15 +163,15 @@ number_accidentals (bool *different, int number = 0; *different = false; - if (is_pair (accidentals) && !is_symbol (ly_car (accidentals))) + if (ly_c_pair_p (accidentals) && !is_symbol (ly_car (accidentals))) warning (_f ("Accidental typesetting list must begin with context-name: %s", ly_scm2string (ly_car (accidentals)).to_str0 ())); - for (; is_pair (accidentals) && origin; accidentals = ly_cdr (accidentals)) + for (; ly_c_pair_p (accidentals) && origin; accidentals = ly_cdr (accidentals)) { // If pair then it is a new accidentals typesetting rule to be checked SCM rule = ly_car (accidentals); - if (is_pair (rule)) + if (ly_c_pair_p (rule)) { SCM type = ly_car (rule); SCM lazyness = ly_cdr (rule); diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index c45947629e..71d48910b8 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -81,9 +81,9 @@ Accidental_placement::split_accidentals (Grob * accs, Link_array *break_reminder, Link_array *real_acc) { - for (SCM acs =accs->get_property ("accidental-grobs"); is_pair (acs); + for (SCM acs =accs->get_property ("accidental-grobs"); ly_c_pair_p (acs); acs =ly_cdr (acs)) - for (SCM s = ly_cdar (acs); is_pair (s); s = ly_cdr (s)) + for (SCM s = ly_cdar (acs); ly_c_pair_p (s); s = ly_cdr (s)) { Grob *a = unsmob_grob (ly_car (s)); @@ -260,12 +260,12 @@ Accidental_placement::position_accidentals (Grob * me) Y-position, they share an Ape, and will be printed in overstrike. */ Link_array apes; - for (SCM s = accs; is_pair (s); s =ly_cdr (s)) + for (SCM s = accs; ly_c_pair_p (s); s =ly_cdr (s)) { Accidental_placement_entry *ape = new Accidental_placement_entry; ape->notename_ = ly_scm2int (ly_caar (s)); - for (SCM t = ly_cdar (s); is_pair (t); t =ly_cdr (t)) + for (SCM t = ly_cdar (s); ly_c_pair_p (t); t =ly_cdr (t)) ape->grobs_.push (unsmob_grob (ly_car (t))); apes.push (ape); diff --git a/lily/accidental.cc b/lily/accidental.cc index 8de4544957..1464f922c0 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -208,7 +208,7 @@ Accidental_interface::print (SCM smob) Stencil mol; for (SCM s = me->get_property ("accidentals"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { int alteration = ly_scm2int (ly_car (s)); String font_char = get_fontcharname (style, alteration); diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 304139cd95..94655c48c8 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -211,7 +211,7 @@ LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, (SCM name), "Load the font @var{name}. ") { - SCM_ASSERT_TYPE (is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); Font_metric * fm = all_fonts_global->find_font (ly_scm2string (name)); diff --git a/lily/ambitus.cc b/lily/ambitus.cc index 2320c9fba1..b68b0721a3 100644 --- a/lily/ambitus.cc +++ b/lily/ambitus.cc @@ -90,7 +90,7 @@ number_accidentals (SCM key_signature, Pitch *pitch, key_signature); /* should really be true unless prev == SCM_BOOL_F */ - if (is_pair (prev) && is_pair (ly_cdr (prev))) + if (ly_c_pair_p (prev) && ly_c_pair_p (ly_cdr (prev))) { prev = scm_cons (ly_car (prev), ly_cadr (prev)); } diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 8cf27663c1..ce076af4d8 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -25,7 +25,7 @@ Arpeggio::print (SCM smob) Grob *me = unsmob_grob (smob); Grob * common = me; - for (SCM s = me->get_property ("stems"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * stem = unsmob_grob (ly_car (s)); common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), @@ -43,7 +43,7 @@ Arpeggio::print (SCM smob) Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - for (SCM s = me->get_property ("stems"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * stem = unsmob_grob (ly_car (s)); Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem); @@ -104,7 +104,7 @@ Arpeggio::brew_chord_bracket (SCM smob) Grob *me = unsmob_grob (smob); Grob * common = me; - for (SCM s = me->get_property ("stems"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * stem = unsmob_grob (ly_car (s)); common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), @@ -114,7 +114,7 @@ Arpeggio::brew_chord_bracket (SCM smob) Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - for (SCM s = me->get_property ("stems"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * stem = unsmob_grob (ly_car (s)); Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem); diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 0f9f414390..585e407fa5 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -78,7 +78,7 @@ private: void Auto_beam_engraver::process_music () { - if (is_string (get_property ("whichBar"))) + if (ly_c_string_p (get_property ("whichBar"))) { consider_end (shortest_mom_); junk_beam (); diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 3ab3f6b427..01a46fd93c 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -91,7 +91,7 @@ Auto_change_iterator::process (Moment m) Moment now = get_outlet ()->now_mom (); Moment *splitm = 0; - for (; is_pair (split_list_); split_list_ = ly_cdr (split_list_)) + for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_)) { splitm = unsmob_moment (ly_caar (split_list_)); if ((*splitm + start_moment_) > now) diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index d07ed65005..764a523df7 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -41,7 +41,7 @@ Interval Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts) { Interval r; - for (SCM s = elts; is_pair (s); s = ly_cdr (s)) + for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s)) { Grob * se = unsmob_grob (ly_car (s)); Interval dims = se->extent (common, a); @@ -75,7 +75,7 @@ Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2) SCM axes = me->get_property ("axes"); - if (!is_pair (axes) + if (!ly_c_pair_p (axes) || scm_c_memq (sa1, axes) == SCM_BOOL_F || scm_c_memq (sa2, axes) == SCM_BOOL_F) { @@ -108,7 +108,7 @@ Axis_group_interface::get_children (Grob*me) if (!has_interface (me)) return childs; - for (SCM ep = me->get_property ("elements"); is_pair (ep); ep = ly_cdr (ep)) + for (SCM ep = me->get_property ("elements"); ly_c_pair_p (ep); ep = ly_cdr (ep)) { Grob* e = unsmob_grob (ly_car (ep)); if (e) diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 3802d20f6d..031609a75b 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -77,7 +77,7 @@ Bar_engraver::finalize () void Bar_engraver::process_acknowledged_grobs () { - if (!bar_ && is_string (get_property ("whichBar"))) + if (!bar_ && ly_c_string_p (get_property ("whichBar"))) { create_bar (); } diff --git a/lily/bar-line.cc b/lily/bar-line.cc index c112c3ddf4..58d26c29af 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -30,7 +30,7 @@ Bar_line::print (SCM smob) SCM s = me->get_property ("glyph"); SCM barsiz_proc = me->get_property ("bar-size-procedure"); - if (is_string (s) && is_procedure (barsiz_proc)) + if (ly_c_string_p (s) && is_procedure (barsiz_proc)) { String str =ly_scm2string (s); SCM siz = scm_call_1 (barsiz_proc, me->self_scm ()); @@ -157,13 +157,13 @@ Bar_line::before_line_breaking (SCM smob) SCM g = me->get_property ("glyph"); SCM orig = g; Direction bsd = item->break_status_dir (); - if (is_string (g) && bsd) + if (ly_c_string_p (g) && bsd) { SCM proc = me->get_property ("break-glyph-function"); g = scm_call_2 (proc, g, scm_int2num (bsd)); } - if (!is_string (g)) + if (!ly_c_string_p (g)) { me->set_property ("print-function", SCM_EOL); me->set_extent (SCM_EOL, X_AXIS); diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index df7af56bef..a2be6ba670 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -45,7 +45,7 @@ Bar_number_engraver::process_music () SCM wb = get_property ("whichBar"); - if (is_string (wb)) + if (ly_c_string_p (wb)) { SCM smp = get_property ("measurePosition"); diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index d8d97cba92..3a7503bcaa 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -282,7 +282,7 @@ Beam::quanting (SCM smob) #if DEBUG_QUANTING SCM inspect_quants = me->get_property ("inspect-quants"); if (debug_beam_quanting_flag - && is_pair (inspect_quants)) + && ly_c_pair_p (inspect_quants)) { Drul_array ins = ly_scm2interval (inspect_quants); diff --git a/lily/beam.cc b/lily/beam.cc index 91b0fb5543..53accaaf16 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -95,7 +95,7 @@ int Beam::get_beam_count (Grob *me) { int m = 0; - for (SCM s = me->get_property ("stems"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob *stem = unsmob_grob (ly_car (s)); m = m >? (Stem::beam_multiplicity (stem).length () + 1); @@ -209,7 +209,7 @@ position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, (i - lslice[left_dir])* left_dir <= 0 ; i+= left_dir) { int count =0; - for ( SCM s = ly_car (right_beaming); is_pair (s); s = ly_cdr (s)) + for ( SCM s = ly_car (right_beaming); ly_c_pair_p (s); s = ly_cdr (s)) { int k = - right_dir * ly_scm2int (ly_car (s)) + i; if (scm_c_memq (scm_int2num (k), left_beaming) != SCM_BOOL_F) @@ -242,7 +242,7 @@ Beam::connect_beams (Grob *me) SCM this_beaming = this_stem->get_property ("beaming"); Direction this_dir = get_grob_direction (this_stem); - if (is_pair (last_beaming) && is_pair (this_beaming)) + if (ly_c_pair_p (last_beaming) && ly_c_pair_p (this_beaming)) { int start_point = position_with_maximal_common_beams (last_beaming, this_beaming, @@ -257,7 +257,7 @@ Beam::connect_beams (Grob *me) new_slice.set_empty (); SCM s = index_get_cell (this_beaming, d); - for (; is_pair (s); s = ly_cdr (s)) + for (; ly_c_pair_p (s); s = ly_cdr (s)) { int new_beam_pos = start_point - this_dir * ly_scm2int (ly_car (s)); @@ -277,7 +277,7 @@ Beam::connect_beams (Grob *me) { scm_set_car_x ( this_beaming, SCM_EOL); SCM s = ly_cdr (this_beaming); - for (; is_pair (s); s = ly_cdr (s)) + for (; ly_c_pair_p (s); s = ly_cdr (s)) { int np = - this_dir * ly_scm2int (ly_car (s)); scm_set_car_x (s, scm_int2num (np)); @@ -377,7 +377,7 @@ Beam::print (SCM grob) Array rfliebertjes; for (SCM s = left; - is_pair (s); s =ly_cdr (s)) + ly_c_pair_p (s); s =ly_cdr (s)) { int b = ly_scm2int (ly_car (s)); if (scm_c_memq (ly_car (s), right) != SCM_BOOL_F) @@ -390,7 +390,7 @@ Beam::print (SCM grob) } } for (SCM s = right; - is_pair (s); s =ly_cdr (s)) + ly_c_pair_p (s); s =ly_cdr (s)) { int b = ly_scm2int (ly_car (s)); if (scm_c_memq (ly_car (s), left) == SCM_BOOL_F) @@ -511,7 +511,7 @@ Beam::print (SCM grob) #if (DEBUG_QUANTING) SCM quant_score = me->get_property ("quant-score"); if (debug_beam_quanting_flag - && is_string (quant_score)) + && ly_c_string_p (quant_score)) { /* @@ -830,7 +830,7 @@ Beam::position_beam (Grob *me) { // one wonders if such genericity is necessary --hwn. SCM callbacks = me->get_property ("position-callbacks"); - for (SCM i = callbacks; is_pair (i); i = ly_cdr (i)) + for (SCM i = callbacks; ly_c_pair_p (i); i = ly_cdr (i)) scm_call_1 (ly_car (i), me->self_scm ()); } @@ -1223,7 +1223,7 @@ where_are_the_whole_beams (SCM beaming) { Slice l; - for ( SCM s = ly_car (beaming); is_pair (s) ; s = ly_cdr (s)) + for ( SCM s = ly_car (beaming); ly_c_pair_p (s) ; s = ly_cdr (s)) { if (scm_c_memq (ly_car (s), ly_cdr (beaming)) != SCM_BOOL_F) @@ -1472,7 +1472,7 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) Drul_array pos (0, 0); SCM s = beam->get_property ("positions"); - if (is_pair (s) && is_number (ly_car (s))) + if (ly_c_pair_p (s) && is_number (ly_car (s))) pos = ly_scm2interval (s); Real staff_space = Staff_symbol_referencer::staff_space (rest); @@ -1530,7 +1530,7 @@ Beam::is_knee (Grob* me) bool knee = false; int d = 0; - for (SCM s = me->get_property ("stems"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { Direction dir = get_grob_direction (unsmob_grob (ly_car (s))); if (d && d != dir) diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 4053a63b2c..8af78e6081 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -48,7 +48,7 @@ Break_align_engraver::finalize () void Break_align_engraver::stop_translation_timestep () { - for (SCM p = column_alist_; is_pair (p); p = ly_cdr (p)) + for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p)) { SCM pair = ly_car (p); add_column (ly_cdr (pair)); diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index a79998b989..a7b0e718c1 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -88,11 +88,11 @@ Break_align_interface::ordered_elements (Grob *grob) Copy in order specified in BREAK-ALIGN-ORDER. */ Link_array new_elts; - for (; is_pair (order); order = ly_cdr (order)) + for (; ly_c_pair_p (order); order = ly_cdr (order)) { SCM sym = ly_car (order); - for (SCM s =elts; is_pair (s); s = ly_cdr (s)) + for (SCM s =elts; ly_c_pair_p (s); s = ly_cdr (s)) { Grob *g = unsmob_grob (ly_car (s)); if (g && sym == g->get_property ("break-align-symbol")) @@ -161,7 +161,7 @@ Break_align_interface::do_alignment (Grob *grob) Find the first grob with a space-alist entry. */ for (SCM s = l->get_property ("elements"); - is_pair (s) ; s = ly_cdr (s)) + ly_c_pair_p (s) ; s = ly_cdr (s)) { Grob *elt = unsmob_grob (ly_car (s)); @@ -171,7 +171,7 @@ Break_align_interface::do_alignment (Grob *grob) edge_idx = idx; SCM l =elt->get_property ("space-alist"); - if (is_pair (l)) + if (ly_c_pair_p (l)) { alist= l; break; @@ -186,7 +186,7 @@ Break_align_interface::do_alignment (Grob *grob) reason. */ for (SCM s = r ? r->get_property ("elements") : SCM_EOL; - !is_symbol (rsym) && is_pair (s); s = ly_cdr (s)) + !is_symbol (rsym) && ly_c_pair_p (s); s = ly_cdr (s)) { Grob * elt =unsmob_grob (ly_car (s)); @@ -200,7 +200,7 @@ Break_align_interface::do_alignment (Grob *grob) if (is_symbol (rsym)) entry = scm_assq (rsym, alist); - bool entry_found = is_pair (entry); + bool entry_found = ly_c_pair_p (entry); if (!entry_found) { String sym_string; diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index f19cece1d5..1c749d1bef 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -102,7 +102,7 @@ do_break_substitution (SCM src) do_break_substitution (scm_vector_ref (src, si))); } } - else if (is_pair (src)) + else if (ly_c_pair_p (src)) { /* UGH! breaks on circular lists. @@ -111,7 +111,7 @@ do_break_substitution (SCM src) SCM oldcdr = ly_cdr (src); if (newcar == SCM_UNDEFINED - && (is_pair (oldcdr) || oldcdr == SCM_EOL)) + && (ly_c_pair_p (oldcdr) || oldcdr == SCM_EOL)) { /* This is tail-recursion, ie. @@ -142,7 +142,7 @@ substitute_grob_list (SCM grob_list) SCM l = SCM_EOL; SCM * tail = &l; - for (SCM s = grob_list; is_pair (s); s = ly_cdr (s)) + for (SCM s = grob_list; ly_c_pair_p (s); s = ly_cdr (s)) { SCM n= substitute_grob (unsmob_grob (ly_car (s))); @@ -350,7 +350,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym, int sp_index = len; int it_index = 0; - for (SCM s = grob_list; is_pair (s); s = ly_cdr (s)) + for (SCM s = grob_list; ly_c_pair_p (s); s = ly_cdr (s)) { Grob * g = unsmob_grob (ly_car (s)); @@ -467,7 +467,7 @@ substitute_mutable_property_alist (SCM alist) SCM l = SCM_EOL; SCM *tail = &l; - for (SCM s = alist; is_pair (s); s = ly_cdr (s)) + for (SCM s = alist; ly_c_pair_p (s); s = ly_cdr (s)) { SCM sym = ly_caar (s); SCM val = ly_cdar (s); diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 6f3c3e33d7..05f0dd75b5 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -113,7 +113,7 @@ Chord_name_engraver::process_music () chord_name_->set_property ("text", markup); announce_grob (chord_name_, notes_[0]->self_scm ()); SCM s = get_property ("chordChanges"); - if (to_boolean (s) && is_pair (last_chord_) + if (to_boolean (s) && ly_c_pair_p (last_chord_) && is_equal (chord_as_scm, last_chord_)) chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T); diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 46a2108012..361ce607fc 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -76,7 +76,7 @@ Clef_engraver::acknowledge_grob (Grob_info info) if (item) { if (Bar_line::has_interface (info.grob_) - && is_string (get_property ("clefGlyph"))) + && ly_c_string_p (get_property ("clefGlyph"))) create_clef (); } } diff --git a/lily/clef.cc b/lily/clef.cc index 27e4788b2b..7774d1920e 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -23,7 +23,7 @@ Clef::before_line_breaking (SCM smob) SCM glyph = s->get_property ("glyph-name"); - if (is_string (glyph)) + if (ly_c_string_p (glyph)) { String str = ly_scm2string (glyph); @@ -53,7 +53,7 @@ Clef::print (SCM smob) { Grob *me = unsmob_grob (smob); SCM glyph_scm = me->get_property ("glyph-name"); - if (!is_string (glyph_scm)) + if (!ly_c_string_p (glyph_scm)) return SCM_EOL; String glyph = String (ly_scm2string (glyph_scm)); diff --git a/lily/cluster.cc b/lily/cluster.cc index 77b63cb884..6dfea67e99 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -144,7 +144,7 @@ Cluster::print (SCM smob) Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS); SCM cols =me->get_property ("columns"); - if (!is_pair (cols)) + if (!ly_c_pair_p (cols)) { me->warning ("junking empty cluster"); me->suicide (); @@ -165,7 +165,7 @@ Cluster::print (SCM smob) line with the center of the note heads? */ - for (SCM s = cols; is_pair (s); s = ly_cdr (s)) + for (SCM s = cols; ly_c_pair_p (s); s = ly_cdr (s)) { Grob * col = unsmob_grob (ly_car (s)); Interval yext = col->extent (commony, Y_AXIS); @@ -186,7 +186,7 @@ Cluster::print (SCM smob) { Spanner * next = orig->broken_intos_[spanner->get_break_index () + 1]; SCM cols = next->get_property ("columns"); - if (is_pair (cols)) + if (ly_c_pair_p (cols)) { Grob *next_commony = common_refpoint_of_list (cols, next, Y_AXIS); Grob * col = unsmob_grob (ly_car (scm_last_pair (cols))); diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 4f1ceabbd0..b015a6255e 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -127,7 +127,7 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column) // also for all associated grobs (NoteSpacing, SeparationItem). Grob *sl = Staff_symbol_referencer::get_staff_symbol (item); for (SCM tail = parent->get_property ("elements"); - is_pair (tail); + ly_c_pair_p (tail); tail = ly_cdr (tail)) { Item *sibling = unsmob_item (ly_car (tail)); diff --git a/lily/context-def.cc b/lily/context-def.cc index 72d13e6276..e782acbfda 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -104,7 +104,7 @@ Context_def::add_context_mod (SCM mod) } SCM sym = ly_cadr (mod); - if (is_string (sym)) + if (ly_c_string_p (sym)) sym = scm_string_to_symbol (sym); if (ly_symbol2scm ("consists") == tag @@ -161,7 +161,7 @@ Context_def::get_accepted (SCM user_mod) const SCM mods = scm_reverse_x (scm_list_copy (accept_mods_), user_mod); SCM acc = SCM_EOL; - for (SCM s = mods; is_pair (s); s = ly_cdr (s)) + for (SCM s = mods; ly_c_pair_p (s); s = ly_cdr (s)) { SCM tag = ly_caar (s); SCM sym = ly_cadar (s); @@ -182,7 +182,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Music_output_def* odef) c SCM accepted = get_accepted (SCM_EOL); Link_array accepteds; - for (SCM s = accepted; is_pair (s); s = ly_cdr (s)) + for (SCM s = accepted; ly_c_pair_p (s); s = ly_cdr (s)) { Context_def *t = unsmob_context_def (odef->find_context_def (ly_car (s))); if (!t) @@ -239,12 +239,12 @@ Context_def::get_translator_names (SCM user_mod) const SCM mods = scm_reverse_x (scm_list_copy (translator_mods_), user_mod); - for (SCM s = mods; is_pair (s); s = ly_cdr (s)) + for (SCM s = mods; ly_c_pair_p (s); s = ly_cdr (s)) { SCM tag = ly_caar (s); SCM arg = ly_cadar (s); - if (is_string (arg)) + if (ly_c_string_p (arg)) arg = scm_string_to_symbol (arg); if (ly_symbol2scm ("consists") == tag) @@ -265,7 +265,7 @@ Context_def::get_translator_names (SCM user_mod) const SCM filter_performers (SCM l) { - for (SCM *tail = &l; is_pair (*tail); tail = SCM_CDRLOC (*tail)) + for (SCM *tail = &l; ly_c_pair_p (*tail); tail = SCM_CDRLOC (*tail)) { if (dynamic_cast (unsmob_translator (ly_car (*tail)))) { @@ -279,7 +279,7 @@ filter_performers (SCM l) SCM filter_engravers (SCM l) { - for (SCM *tail = &l; is_pair (*tail) ; tail = SCM_CDRLOC (*tail)) + for (SCM *tail = &l; ly_c_pair_p (*tail) ; tail = SCM_CDRLOC (*tail)) { if (dynamic_cast (unsmob_translator (ly_car (*tail)))) { @@ -309,7 +309,7 @@ Context_def::instantiate (SCM ops) g->simple_trans_list_ = SCM_EOL; - for (SCM s = trans_names; is_pair (s) ; s = ly_cdr (s)) + for (SCM s = trans_names; ly_c_pair_p (s) ; s = ly_cdr (s)) { Translator * t = get_translator (ly_car (s)); if (!t) diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc index e6eba727e8..fb5968b980 100644 --- a/lily/context-specced-music-iterator.cc +++ b/lily/context-specced-music-iterator.cc @@ -25,7 +25,7 @@ Context_specced_music_iterator::construct_children () String c_id; SCM ci = get_music ()->get_property ("context-id"); - if (is_string (ci)) + if (ly_c_string_p (ci)) c_id = ly_scm2string (ci); SCM ops = get_music ()->get_property ("property-operations"); diff --git a/lily/context.cc b/lily/context.cc index d9f4b2ccef..c50193cc2d 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -28,7 +28,7 @@ Context::is_removable () const void Context::check_removal () { - for (SCM p = context_list_; is_pair (p); p = ly_cdr (p)) + for (SCM p = context_list_; ly_c_pair_p (p); p = ly_cdr (p)) { Context *trg = unsmob_context (ly_car (p)); @@ -175,7 +175,7 @@ Context::find_create_context (SCM n, String id, SCM Context::default_child_context_name () const { - return is_pair (accepts_list_) + return ly_c_pair_p (accepts_list_) ? ly_car (scm_last_pair (accepts_list_)) : SCM_EOL; } @@ -245,7 +245,7 @@ bool Context::is_alias (SCM sym) const { if (sym == ly_symbol2scm ("Bottom") - && !is_pair (accepts_list_)) + && !ly_c_pair_p (accepts_list_)) return true; if (sym == unsmob_context_def (definition_)->get_context_name ()) return true; @@ -309,7 +309,7 @@ find_context_below (Context * where, Context * found = 0; for (SCM s = where->children_contexts (); - !found && is_pair (s); s = ly_cdr (s)) + !found && ly_c_pair_p (s); s = ly_cdr (s)) { Context * tr = unsmob_context (ly_car (s)); diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index f96daf267d..5b110886c3 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -97,7 +97,7 @@ Custos_engraver::acknowledge_grob (Grob_info info) void Custos_engraver::process_acknowledged_grobs () { - if (is_string (get_property ("whichBar"))) + if (ly_c_string_p (get_property ("whichBar"))) custos_permitted = true; if (custos_permitted) diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index 7437d08b5f..fd415cea7e 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -90,7 +90,7 @@ Drum_notes_engraver::process_music () if (scm_hash_table_p (tab) == SCM_BOOL_T) defn = scm_hashq_ref (tab, drum_type, SCM_EOL); - if (is_pair (defn)) + if (ly_c_pair_p (defn)) { SCM pos = ly_caddr (defn); SCM style =ly_car (defn); @@ -101,7 +101,7 @@ Drum_notes_engraver::process_music () if (is_symbol (style)) note->set_property ("style", style); - if (is_string (script)) + if (ly_c_string_p (script)) { Item *p = make_item ("Script"); SCM desc = SCM_EOL; diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 0e6573db92..f84551d887 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -245,7 +245,7 @@ Dynamic_engraver::process_music () /* FIXME: use get_markup () to check type. */ - if (is_string (s) || is_pair (s)) + if (ly_c_string_p (s) || ly_c_pair_p (s)) { cresc_->set_property ("edge-text", scm_cons (s, scm_makfrom0str (""))); @@ -400,7 +400,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i) if (script_ && !script_->get_parent (X_AXIS)) { SCM head = scm_last_pair (i.grob_->get_property ("note-heads")); - if (is_pair (head)) + if (ly_c_pair_p (head)) script_->set_parent (unsmob_grob (ly_car (head)), X_AXIS); } diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index 3410543f4c..1b3aa246ee 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -75,10 +75,10 @@ Dynamic_performer::create_audio_elements () */ SCM s = get_property ("midiInstrument"); - if (!is_string (s)) + if (!ly_c_string_p (s)) s = get_property ("instrument"); - if (!is_string (s)) + if (!ly_c_string_p (s)) s = scm_makfrom0str ("piano"); diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 057cd0d22c..9b33ad9398 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -44,7 +44,7 @@ Engraver_group_engraver::acknowledge_grobs () SCM meta = info.grob_->internal_get_property (meta_sym); SCM nm = scm_assoc (name_sym, meta); - if (is_pair (nm)) + if (ly_c_pair_p (nm)) nm = ly_cdr (nm); else { @@ -67,7 +67,7 @@ Engraver_group_engraver::acknowledge_grobs () scm_hashq_set_x (tab, nm, acklist); } - for (SCM p = acklist; is_pair (p); p = ly_cdr (p)) + for (SCM p = acklist; ly_c_pair_p (p); p = ly_cdr (p)) { Translator * t = unsmob_translator (ly_car (p)); Engraver * eng = dynamic_cast (t); @@ -126,7 +126,7 @@ engraver_valid (Translator*tr, SCM ifaces) { SCM ack_ifs = scm_assoc (ly_symbol2scm ("interfaces-acked"), tr->translator_description ()); ack_ifs = ly_cdr (ack_ifs); - for (SCM s = ifaces; is_pair (s); s = ly_cdr (s)) + for (SCM s = ifaces; ly_c_pair_p (s); s = ly_cdr (s)) if (scm_c_memq (ly_car (s), ack_ifs) != SCM_BOOL_F) return true; return false; @@ -140,7 +140,7 @@ find_acknowledge_engravers (SCM gravlist, SCM meta_alist) SCM ifaces = ly_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta_alist)); SCM l = SCM_EOL; - for (SCM s = gravlist; is_pair (s); s = ly_cdr (s)) + for (SCM s = gravlist; ly_c_pair_p (s); s = ly_cdr (s)) { Translator* tr = unsmob_translator (ly_car (s)); if (engraver_valid (tr, ifaces)) @@ -168,7 +168,7 @@ recurse_down_engravers (Context * c, Engraver_method ptr, bool context_first) (tg->*ptr) (); } - for (SCM s = c->children_contexts () ; is_pair (s); + for (SCM s = c->children_contexts () ; ly_c_pair_p (s); s =ly_cdr (s)) { recurse_down_engravers (unsmob_context (ly_car (s)), ptr, context_first); @@ -186,7 +186,7 @@ recurse_down_engravers (Context * c, Engraver_method ptr, bool context_first) void engraver_each (SCM list, Engraver_method method) { - for (SCM p = list; is_pair (p); p = ly_cdr (p)) + for (SCM p = list; ly_c_pair_p (p); p = ly_cdr (p)) { Engraver * e = dynamic_cast(unsmob_translator (ly_car (p))); if (e) diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc index 074e2142f0..e588574020 100644 --- a/lily/event-chord-iterator.cc +++ b/lily/event-chord-iterator.cc @@ -47,7 +47,7 @@ Event_chord_iterator::process (Moment m) if (last_processed_mom_ < Moment (0)) { for (SCM s = dynamic_cast (get_music ())->music_list (); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Music *mus = unsmob_music (ly_car (s)); diff --git a/lily/event.cc b/lily/event.cc index baec1ce0d7..7a1b9c6a7b 100644 --- a/lily/event.cc +++ b/lily/event.cc @@ -142,11 +142,11 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist", SCM newlist = SCM_EOL; Pitch *p = unsmob_pitch (pit); - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { SCM key = ly_caar (s); SCM alter = ly_cdar (s); - if (is_pair (key)) + if (ly_c_pair_p (key)) { Pitch orig (ly_scm2int (ly_car (key)), ly_scm2int (ly_cdr (key)), @@ -188,7 +188,7 @@ bool alist_equal_p (SCM a, SCM b) { for (SCM s = a; - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { SCM key = ly_caar (s); SCM val = ly_cdar (s); diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index e90cc50c1d..6ddab140ff 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -121,7 +121,7 @@ completize_extender (Spanner* sp) if (!sp->get_bound (RIGHT)) { SCM heads = sp->get_property ("heads"); - if (is_pair (heads)) + if (ly_c_pair_p (heads)) { Item* it = dynamic_cast (unsmob_grob (ly_car (heads))); if (it) diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 81bf4e3dcd..6e07465592 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -139,7 +139,7 @@ LY_DEFINE (ly_find_glyph_by_name, "ly:find-glyph-by-name", { Font_metric *fm = unsmob_metrics (font); SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (is_string (name), name, SCM_ARG2, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG2, __FUNCTION__, "string"); Stencil m = fm->find_by_name (ly_scm2string (name)); @@ -171,7 +171,7 @@ LY_DEFINE (ly_text_dimension,"ly:text-dimension", Modified_font_metric*fm = dynamic_cast (unsmob_metrics (font)); SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "modified font metric"); - SCM_ASSERT_TYPE (is_string (text), text, SCM_ARG2, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (text), text, SCM_ARG2, __FUNCTION__, "string"); b = fm->text_dimension (ly_scm2string (text)); diff --git a/lily/font-select.cc b/lily/font-select.cc index 1e6ca35bb1..3fa108f064 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -110,7 +110,7 @@ select_encoded_font (Paper_def *paper, SCM chain, SCM encoding_name) { SCM name = ly_assoc_chain (ly_symbol2scm ("font-name"), chain); - if (!is_pair (name) || !is_string (ly_cdr (name))) + if (!ly_c_pair_p (name) || !ly_c_string_p (ly_cdr (name))) { SCM fonts = paper->lookup_variable (ly_symbol2scm ("fonts")); name = properties_to_font_size_family (fonts, chain); @@ -118,11 +118,11 @@ select_encoded_font (Paper_def *paper, SCM chain, SCM encoding_name) else name = ly_cdr (name); - if (is_string (name)) + if (ly_c_string_p (name)) { SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain); - Real rmag = is_pair (mag) ? robust_scm2double (ly_cdr (mag), 1.0) : 1; + Real rmag = ly_c_pair_p (mag) ? robust_scm2double (ly_cdr (mag), 1.0) : 1; Font_metric * fm = all_fonts_global->find_font (ly_scm2string (name)); @@ -136,7 +136,7 @@ select_encoded_font (Paper_def *paper, SCM chain, SCM encoding_name) SCM font_size = ly_assoc_chain (ly_symbol2scm ("font-size"), chain); Real req = 0.0; - if (is_pair (font_size)) + if (ly_c_pair_p (font_size)) req = ly_scm2double (ly_cdr (font_size)); return get_font_by_mag_step (paper, req, diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc index 20714ec959..242866e2f0 100644 --- a/lily/forbid-break-engraver.cc +++ b/lily/forbid-break-engraver.cc @@ -21,11 +21,11 @@ Forbid_line_break_engraver::start_translation_timestep () SCM busy = get_property ("busyGrobs"); Moment now = now_mom (); - while (is_pair (busy) && unsmob_moment (ly_caar (busy))->main_part_ == now.main_part_) + while (ly_c_pair_p (busy) && unsmob_moment (ly_caar (busy))->main_part_ == now.main_part_) busy = ly_cdr (busy); - while (is_pair (busy)) + while (ly_c_pair_p (busy)) { Grob *g = unsmob_grob (ly_cdar (busy)); if (Rhythmic_head::has_interface (g)) diff --git a/lily/global-context.cc b/lily/global-context.cc index 2059cecba2..7b43d2b174 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -81,7 +81,7 @@ Global_context::now_mom () const Score_context* Global_context::get_score_context () const { - return (is_pair (context_list_)) + return (ly_c_pair_p (context_list_)) ? dynamic_cast (unsmob_context (ly_car (context_list_))) : 0; } @@ -166,7 +166,7 @@ Global_context::apply_finalizations () { SCM lst = get_property ("finalizations"); set_property ("finalizations" , SCM_EOL); - for (SCM s = lst ; is_pair (s); s = ly_cdr (s)) + for (SCM s = lst ; ly_c_pair_p (s); s = ly_cdr (s)) { scm_primitive_eval (ly_car (s)); // TODO: make safe. } diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index 58706d5b74..6043ac40e9 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -30,7 +30,7 @@ LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c), "Add an interface description.") { SCM_ASSERT_TYPE (is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol"); - SCM_ASSERT_TYPE (is_string (b), b, SCM_ARG2, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (b), b, SCM_ARG2, __FUNCTION__, "string"); SCM_ASSERT_TYPE (is_list (c), c, SCM_ARG3, __FUNCTION__, "list of syms"); if (!is_vector (all_ifaces)) all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL); @@ -65,7 +65,7 @@ check_interfaces_for_property (Grob const *me, SCM sym) SCM ifs = me->get_property ("interfaces"); bool found = false; - for (; !found && is_pair (ifs); ifs =ly_cdr (ifs)) + for (; !found && ly_c_pair_p (ifs); ifs =ly_cdr (ifs)) { SCM iface = scm_hashq_ref (all_ifaces , ly_car (ifs), SCM_BOOL_F); if (iface == SCM_BOOL_F) diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index f83866ac4c..2cd1509693 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -82,7 +82,7 @@ Grob_pq_engraver::stop_translation_timestep () Moment now = now_mom (); SCM start_busy = get_property ("busyGrobs"); SCM busy = start_busy; - while (is_pair (busy) && *unsmob_moment (ly_caar (busy)) == now) + while (ly_c_pair_p (busy) && *unsmob_moment (ly_caar (busy)) == now) { busy = ly_cdr (busy); } @@ -98,7 +98,7 @@ Grob_pq_engraver::start_translation_timestep () SCM start_busy = get_property ("busyGrobs"); SCM busy = start_busy; - while (is_pair (busy) && *unsmob_moment (ly_caar (busy)) < now) + while (ly_c_pair_p (busy) && *unsmob_moment (ly_caar (busy)) < now) { /* The grob-pq-engraver is not water tight, and stuff like diff --git a/lily/grob-property.cc b/lily/grob-property.cc index 5b0950c676..8cb4b84cd7 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -92,7 +92,7 @@ Grob::internal_get_property (SCM sym) const s = scm_sloppy_assq (sym, immutable_property_alist_); - if (internal_type_checking_global_b && is_pair (s)) + if (internal_type_checking_global_b && ly_c_pair_p (s)) { if (!type_check_assignment (sym, ly_cdr (s), ly_symbol2scm ("backend-type?"))) diff --git a/lily/grob.cc b/lily/grob.cc index a98e2db627..072f77a00a 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -65,7 +65,7 @@ Grob::Grob (SCM basicprops) #endif SCM meta = get_property ("meta"); - if (is_pair (meta)) + if (ly_c_pair_p (meta)) { SCM ifs = scm_assoc (ly_symbol2scm ("interfaces"), meta); @@ -112,7 +112,7 @@ Grob::Grob (SCM basicprops) if (is_number_pair (xt)) cb = xt; else if (cb != SCM_BOOL_F - && !is_procedure (cb) && !is_pair (cb) + && !is_procedure (cb) && !ly_c_pair_p (cb) && is_procedure (get_property ("print-function"))) cb = stencil_extent_proc; @@ -186,7 +186,7 @@ Grob::calculate_dependencies (int final, int busy, SCM funcname) status_= busy; - for (SCM d = get_property ("dependencies"); is_pair (d); + for (SCM d = get_property ("dependencies"); ly_c_pair_p (d); d = ly_cdr (d)) { unsmob_grob (ly_car (d)) @@ -310,7 +310,7 @@ Grob::handle_broken_dependencies () because some Spanners have enormously long lists in their properties. */ - for (SCM s = mutable_property_alist_; is_pair (s); + for (SCM s = mutable_property_alist_; ly_c_pair_p (s); s = ly_cdr (s)) { sp->substitute_one_mutable_property (ly_caar (s), @@ -475,7 +475,7 @@ Grob::get_offset (Axis a) const bool Grob::is_empty (Axis a)const { - return ! (is_pair (dim_cache_[a].dimension_) || + return ! (ly_c_pair_p (dim_cache_[a].dimension_) || is_procedure (dim_cache_[a].dimension_)); } @@ -487,7 +487,7 @@ Grob::extent (Grob * refp, Axis a) const Dimension_cache * d = (Dimension_cache *)&dim_cache_[a]; Interval ext ; - if (is_pair (d->dimension_)) + if (ly_c_pair_p (d->dimension_)) ; else if (is_procedure (d->dimension_)) { @@ -499,7 +499,7 @@ Grob::extent (Grob * refp, Axis a) const else return ext; - if (!is_pair (d->dimension_)) + if (!ly_c_pair_p (d->dimension_)) return ext; ext = ly_scm2interval (d->dimension_); @@ -511,7 +511,7 @@ Grob::extent (Grob * refp, Axis a) const /* signs ? */ - if (is_pair (extra)) + if (ly_c_pair_p (extra)) { ext[BIGGER] += ly_scm2double (ly_cdr (extra)); ext[SMALLER] += ly_scm2double (ly_car (extra)); @@ -520,7 +520,7 @@ Grob::extent (Grob * refp, Axis a) const extra = get_property (a == X_AXIS ? "minimum-X-extent" : "minimum-Y-extent"); - if (is_pair (extra)) + if (ly_c_pair_p (extra)) { ext.unite (Interval (ly_scm2double (ly_car (extra)), ly_scm2double (ly_cdr (extra)))); @@ -553,7 +553,7 @@ Grob::common_refpoint (Grob const* s, Axis a) const Grob * common_refpoint_of_list (SCM elist, Grob *common, Axis a) { - for (; is_pair (elist); elist = ly_cdr (elist)) + for (; ly_c_pair_p (elist); elist = ly_cdr (elist)) { Grob * s = unsmob_grob (ly_car (elist)); if (!s) @@ -592,7 +592,7 @@ Grob::name () const { SCM meta = get_property ("meta"); SCM nm = scm_assoc (ly_symbol2scm ("name"), meta); - nm = (is_pair (nm)) ? ly_cdr (nm) : SCM_EOL; + nm = (ly_c_pair_p (nm)) ? ly_cdr (nm) : SCM_EOL; return is_symbol (nm) ? ly_symbol2string (nm) : classname (this); } @@ -773,7 +773,7 @@ ly_scm2grobs (SCM l) { Link_array arr; - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { SCM e = ly_car (s); arr.push (unsmob_grob (e)); diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index f49a83566e..4cf8465f3f 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -32,7 +32,7 @@ Hara_kiri_group_spanner::consider_suicide (Grob*me) { Spanner*sp = dynamic_cast (me); SCM worth = me->get_property ("items-worth-living"); - if (is_pair (worth)) + if (ly_c_pair_p (worth)) return ; if (!to_boolean (me->get_property ("remove-first")) diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index 9e87e8ecb1..26deb72817 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -73,7 +73,7 @@ completize_hyphen (Spanner* sp) if (!sp->get_bound (RIGHT)) { SCM heads = sp->get_property ("heads"); - if (is_pair (heads)) + if (ly_c_pair_p (heads)) { Item* it = dynamic_cast (unsmob_grob (ly_car (heads))); if (it) diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index 9dda6fc5b2..196eea71f9 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -42,7 +42,7 @@ Pointer_group_interface__extract_grobs (Grob const *elt, T *, const char* name) { Link_array arr; - for (SCM s = elt->get_property (name); is_pair (s); s = ly_cdr (s)) + for (SCM s = elt->get_property (name); ly_c_pair_p (s); s = ly_cdr (s)) { SCM e = ly_car (s); arr.push (dynamic_cast (unsmob_grob (e))); diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 35690a1da8..c2fd7033c6 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -190,12 +190,12 @@ inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val) { return scm_acons(key, val, scm_assoc_remove_x (alist, key)); } -inline bool is_pair (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); } +inline bool ly_c_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); } inline bool is_symbol (SCM x) { return SCM_SYMBOLP (x); } inline bool is_boolean (SCM x) { return SCM_BOOLP (x); } inline bool is_char (SCM x) { return SCM_CHARP (x); } inline bool is_number (SCM x) { return SCM_NUMBERP (x); } -inline bool is_string (SCM x) { return SCM_STRINGP (x); } +inline bool ly_c_string_p (SCM x) { return SCM_STRINGP (x); } inline bool is_vector (SCM x) { return SCM_VECTORP (x); } inline bool is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); } inline bool is_procedure (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); } diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 13635df3d1..0a6f86c7b3 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -85,7 +85,7 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg), { Input *ip = unsmob_input (sip); SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location"); - SCM_ASSERT_TYPE (is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (msg), msg, SCM_ARG2, __FUNCTION__, "string"); String m = ly_scm2string (msg); ip->message (m); diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 039d941230..fd39cdfe36 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -122,7 +122,7 @@ Instrument_name_engraver::process_music () Also create text if barlines in other groups. This allows a name to be attached to lyrics or chords. */ - if (is_string (get_property ("whichBar"))) + if (ly_c_string_p (get_property ("whichBar"))) create_text (); } diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 716f6fb0c1..927cc6032f 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -117,7 +117,7 @@ Key_engraver::acknowledge_grob (Grob_info info) } } else if (Bar_line::has_interface (info.grob_) - && is_pair (get_property ("keySignature"))) + && ly_c_pair_p (get_property ("keySignature"))) { create_key (true); } @@ -148,22 +148,22 @@ void Key_engraver::read_ev (Music const * r) { SCM p = r->get_property ("pitch-alist"); - if (!is_pair (p)) + if (!ly_c_pair_p (p)) return; SCM n = scm_list_copy (p); SCM accs = SCM_EOL; for (SCM s = get_property ("keyAccidentalOrder"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { - if (is_pair (scm_member (ly_car (s), n))) + if (ly_c_pair_p (scm_member (ly_car (s), n))) { accs = scm_cons (ly_car (s), accs); n = scm_delete_x (ly_car (s), n); } } - for (SCM s = n ; is_pair (s); s = ly_cdr (s)) + for (SCM s = n ; ly_c_pair_p (s); s = ly_cdr (s)) if (ly_scm2int (ly_cdar (s))) accs = scm_cons (ly_car (s), accs); diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index bb2b15db75..1ba6e4ed5f 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -56,7 +56,7 @@ const int NATURAL_TOP_PITCH = 4; int alteration_pos (SCM what, int alter, int c0p) { - if (is_pair (what)) + if (ly_c_pair_p (what)) return ly_scm2int (ly_car (what)) * 7 + ly_scm2int (ly_cdr (what)) + c0p; int p = ly_scm2int (what); @@ -127,7 +127,7 @@ Key_signature_interface::print (SCM smob) */ Font_metric *fm = Font_interface::get_default_font (me); - for (SCM s = newas; is_pair (s); s = ly_cdr (s)) + for (SCM s = newas; ly_c_pair_p (s); s = ly_cdr (s)) { int alteration = ly_scm2int (ly_cdar (s)); String font_char = @@ -163,11 +163,11 @@ Key_signature_interface::print (SCM smob) mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)), 0, 0); Stencil natural; - if (is_pair (old)) + if (ly_c_pair_p (old)) natural=Font_interface::get_default_font (me)-> find_by_name (String ("accidentals-") + style + String ("0")); - for (; is_pair (old); old = ly_cdr (old)) + for (; ly_c_pair_p (old); old = ly_cdr (old)) { SCM found = scm_assoc (ly_caar (old), newas); if (found == SCM_BOOL_F diff --git a/lily/kpath.cc b/lily/kpath.cc index b108346cfa..63b288bea2 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -152,7 +152,7 @@ LY_DEFINE (ly_kpathsea_gulp_file, "ly:kpathsea-gulp-file", "Read the file @var{name}, and return its contents in a string. " "The file is looked up using the search path and kpathsea.") { - SCM_ASSERT_TYPE (is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); return scm_makfrom0str (kpathsea_gulp_file_to_string (ly_scm2string (name)).to_str0 ()); } diff --git a/lily/lexer.ll b/lily/lexer.ll index 787b324204..2a2b403e42 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -250,7 +250,7 @@ HYPHEN -- s = s.left_string (s.length () - 1); SCM sid = lookup_identifier (s); - if (is_string (sid)) { + if (ly_c_string_p (sid)) { new_input (ly_scm2string (sid), sources_); yy_pop_state (); } else { @@ -468,7 +468,7 @@ HYPHEN -- String str (YYText () + 1); SCM s = lookup_markup_command (str); - if (is_pair (s) && is_symbol (ly_cdr (s)) ) { + if (ly_c_pair_p (s) && is_symbol (ly_cdr (s)) ) { yylval.scm = ly_car(s); SCM tag = ly_cdr(s); if (tag == ly_symbol2scm("markup0")) @@ -676,10 +676,10 @@ My_lily_lexer::scan_bare_word (String str) SCM sym = ly_symbol2scm (str.to_str0 ()); if ((YYSTATE == notes) || (YYSTATE == chords)) { SCM handle = SCM_BOOL_F; - if (is_pair (pitchname_tab_stack_)) + if (ly_c_pair_p (pitchname_tab_stack_)) handle = scm_hashq_get_handle (ly_car (pitchname_tab_stack_), sym); - if (is_pair (handle)) { + if (ly_c_pair_p (handle)) { yylval.scm = ly_cdr (handle); if (unsmob_pitch (yylval.scm)) return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 20fff1c730..ac0e1176a3 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -107,7 +107,7 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file", "Read the file @var{name}, and return its contents in a string. " "The file is looked up using the search path.") { - SCM_ASSERT_TYPE (is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ()); } @@ -125,7 +125,7 @@ ly_display_scm (SCM s) String ly_scm2string (SCM s) { - assert (is_string (s)); + assert (ly_c_string_p (s)); char *p = SCM_STRING_CHARS (s); String r (p); @@ -138,7 +138,7 @@ ly_scm2newstr (SCM str, size_t *lenp) char *new_str; size_t len; - SCM_ASSERT_TYPE (is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); len = SCM_STRING_LENGTH (str); new_str = (char *) malloc ((len + 1) * sizeof (char)); @@ -176,7 +176,7 @@ index_set_cell (SCM s, Direction d, SCM v) LY_DEFINE (ly_warning,"ly:warn", 1, 0, 0, (SCM str), "Scheme callable function to issue the warning @code{msg}.") { - SCM_ASSERT_TYPE (is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); progress_indication ("\n"); warning ("lily-guile: " + ly_scm2string (str)); return SCM_BOOL_T; @@ -198,7 +198,7 @@ LY_DEFINE (ly_dir_p, "ly:dir?", 1,0, 0, (SCM s), bool is_number_pair (SCM p) { - return is_pair (p) && is_number (ly_car (p)) && is_number (ly_cdr (p)); + return ly_c_pair_p (p) && is_number (ly_car (p)) && is_number (ly_cdr (p)); } typedef void (*Void_fptr) (); @@ -384,7 +384,7 @@ LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d), SCM ly_deep_copy (SCM src) { - if (is_pair (src)) + if (ly_c_pair_p (src)) return scm_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); else if (is_vector (src)) { @@ -405,10 +405,10 @@ ly_deep_copy (SCM src) SCM ly_assoc_chain (SCM key, SCM achain) { - if (is_pair (achain)) + if (ly_c_pair_p (achain)) { SCM handle = scm_assoc (key, ly_car (achain)); - if (is_pair (handle)) + if (ly_c_pair_p (handle)) return handle; else return ly_assoc_chain (key, ly_cdr (achain)); @@ -439,10 +439,10 @@ corresponds to call SCM ly_assoc_cdr (SCM key, SCM alist) { - if (is_pair (alist)) + if (ly_c_pair_p (alist)) { SCM trykey = ly_caar (alist); - if (is_pair (trykey) && to_boolean (scm_equal_p (key, ly_cdr (trykey)))) + if (ly_c_pair_p (trykey) && to_boolean (scm_equal_p (key, ly_cdr (trykey)))) return ly_car (alist); else return ly_assoc_cdr (key, ly_cdr (alist)); @@ -493,10 +493,10 @@ ly_truncate_list (int k, SCM lst) { SCM s = lst; k--; - for (; is_pair (s) && k--; s = ly_cdr (s)) + for (; ly_c_pair_p (s) && k--; s = ly_cdr (s)) ; - if (is_pair (s)) + if (ly_c_pair_p (s)) scm_set_cdr_x (s, SCM_EOL); } return lst; @@ -592,9 +592,9 @@ SCM ly_unique (SCM list) { SCM unique = SCM_EOL; - for (SCM i = list; is_pair (i); i = ly_cdr (i)) + for (SCM i = list; ly_c_pair_p (i); i = ly_cdr (i)) { - if (!is_pair (ly_cdr (i)) + if (!ly_c_pair_p (ly_cdr (i)) || !is_equal (ly_car (i), ly_cadr (i))) unique = scm_cons (ly_car (i), unique); } @@ -654,7 +654,7 @@ ly_split_list (SCM s, SCM list) { SCM before = SCM_EOL; SCM after = list; - for (; is_pair (after);) + for (; ly_c_pair_p (after);) { SCM i = ly_car (after); after = ly_cdr (after); @@ -684,7 +684,7 @@ display_list (SCM s) SCM p = scm_current_output_port (); scm_puts ("(", p); - for (; is_pair (s); s =ly_cdr (s)) + for (; ly_c_pair_p (s); s =ly_cdr (s)) { scm_display (ly_car (s), p); scm_puts (" ", p); @@ -698,7 +698,7 @@ int_list_to_slice (SCM l) { Slice s; s.set_empty (); - for (; is_pair (l); l = ly_cdr (l)) + for (; ly_c_pair_p (l); l = ly_cdr (l)) if (is_number (ly_car (l))) s.add_point (ly_scm2int (ly_car (l))); return s; @@ -711,7 +711,7 @@ int_list_to_slice (SCM l) SCM robust_list_ref (int i, SCM l) { - while (i-- > 0 && is_pair (ly_cdr (l))) + while (i-- > 0 && ly_c_pair_p (ly_cdr (l))) l = ly_cdr (l); return ly_car (l); } @@ -767,7 +767,7 @@ alist_to_hashq (SCM alist) return scm_make_vector (scm_int2num (0), SCM_EOL); SCM tab = scm_make_vector (scm_int2num (i), SCM_EOL); - for (SCM s = alist; is_pair (s); s = ly_cdr (s)) + for (SCM s = alist; ly_c_pair_p (s); s = ly_cdr (s)) { SCM pt = ly_cdar (s); scm_hashq_set_x (tab, ly_caar (s), pt); diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index c3fc90d65b..39d2418507 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -45,7 +45,7 @@ melisma_busy (Context* tr) SCM melisma_properties = tr->get_property ("melismaBusyProperties"); bool busy = false; - for (; is_pair (melisma_properties); + for (; ly_c_pair_p (melisma_properties); melisma_properties = ly_cdr (melisma_properties)) busy = busy || to_boolean (tr->internal_get_property (ly_car (melisma_properties))); @@ -128,7 +128,7 @@ Lyric_combine_music_iterator::get_busy_status () const SCM grobs = tr->get_property ("busyGrobs"); Moment now = tr->now_mom (); - for (; is_pair (grobs); grobs = ly_cdr (grobs)) + for (; ly_c_pair_p (grobs); grobs = ly_cdr (grobs)) { SCM grob = ly_cdar (grobs); Moment end =*unsmob_moment (ly_caar (grobs)); diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index c7f9286b4e..9abad8a958 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -25,7 +25,7 @@ Music* Lyric_combine_music::get_music () const { SCM l = get_property ("elements"); - if (!is_pair (l)) + if (!ly_c_pair_p (l)) return 0; return unsmob_music (ly_car (l)); } @@ -35,10 +35,10 @@ Music* Lyric_combine_music::get_lyrics () const { SCM l = get_property ("elements"); - if (!is_pair (l)) + if (!ly_c_pair_p (l)) return 0; l = ly_cdr (l); - if (!is_pair (l)) + if (!ly_c_pair_p (l)) return 0; return unsmob_music (ly_car (l)); } diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index cc7356d847..2691b7d9cc 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -76,7 +76,7 @@ get_voice_to_lyrics (Context *lyrics) SCM voice_name = lyrics->get_property ("associatedVoice"); String nm = lyrics->id_string_; - if (is_string (voice_name)) + if (ly_c_string_p (voice_name)) nm = ly_scm2string (voice_name); else { @@ -111,7 +111,7 @@ Grob * get_current_note_head (Context * voice) { for (SCM s = voice->get_property ("busyGrobs"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Item*g = dynamic_cast (unsmob_grob (ly_cdar (s))); diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 3d41c21be6..09a38f40b0 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -40,7 +40,7 @@ Lyric_performer::create_audio_elements () { // FIXME: won't work with fancy lyrics if (lreqs_.size () - && is_string (lreqs_[0]->get_property ("text")) + && ly_c_string_p (lreqs_[0]->get_property ("text")) && ly_scm2string (lreqs_[0]->get_property ("text")).length ()) { audio_ = new Audio_text (Audio_text::LYRIC, diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index f6d3e5618d..6ae17ceedd 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -64,7 +64,7 @@ Measure_grouping_engraver::process_music () return; SCM grouping = get_property ("beatGrouping"); - if (is_pair (grouping)) + if (ly_c_pair_p (grouping)) { Moment *measpos = unsmob_moment (get_property ("measurePosition")); Rational mp = measpos->main_part_; @@ -73,7 +73,7 @@ Measure_grouping_engraver::process_music () Rational bl = beatlen->main_part_; Rational where (0); - for (SCM s = grouping; is_pair (s); + for (SCM s = grouping; ly_c_pair_p (s); where += Rational (ly_scm2int (ly_car (s))) * bl, s = ly_cdr (s) ) diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index eae97c7df9..d33828dc1f 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -136,7 +136,7 @@ Multi_measure_rest_engraver::process_music () = ly_scm2int (get_property ("currentBarNumber")); } - bar_seen_ = is_string (get_property ("whichBar")); + bar_seen_ = ly_c_string_p (get_property ("whichBar")); } void diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 056c75d2f0..81a5d4013a 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -282,7 +282,7 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, } Stencil mol; - for (SCM s = mols; is_pair (s); s = ly_cdr (s)) + for (SCM s = mols; ly_c_pair_p (s); s = ly_cdr (s)) { mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (ly_car (s)), inner_padding, 0); } diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index 71b8b3f63f..5286085292 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -170,7 +170,7 @@ LY_DEFINE(ly_output_description, "ly:output-description", Music_output_def *id = unsmob_music_output_def (output_def); SCM al = id->translator_tab_->to_alist (); SCM l = SCM_EOL; - for (SCM s = al ; is_pair (s); s = ly_cdr (s)) + for (SCM s = al ; ly_c_pair_p (s); s = ly_cdr (s)) { Context_def * td = unsmob_context_def (ly_cdar (s)); l = scm_cons (scm_cons (ly_caar (s), td->to_alist ()), l); diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 5c033c0a26..90b5258f1d 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -36,7 +36,7 @@ Music_sequence::Music_sequence ( ) void transpose_music_list (SCM l, Pitch rq) { - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) unsmob_music (ly_car (s))->transpose (rq); } @@ -46,7 +46,7 @@ Music_sequence::cumulative_length (SCM l) Moment cumulative; Moment last_len; - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { Moment l = unsmob_music (ly_car (s))->get_length (); if (last_len.grace_part_ && l.main_part_) @@ -67,7 +67,7 @@ Moment Music_sequence::maximum_length (SCM l) { Moment dur = 0; - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { Music * m = unsmob_music (ly_car (s)); Moment l = m->get_length (); @@ -84,7 +84,7 @@ music_list_to_relative (SCM l,Pitch p, bool ret_first) int count=0; Pitch last = p; - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { if (Music *m = unsmob_music (ly_car (s))) { @@ -101,7 +101,7 @@ music_list_to_relative (SCM l,Pitch p, bool ret_first) void compress_music_list (SCM l, Moment m) { - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) unsmob_music (ly_car (s))->compress (m); } @@ -112,7 +112,7 @@ Music_sequence::minimum_start (SCM l) { Moment m; - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { m = m start_mom (); } @@ -124,7 +124,7 @@ Music_sequence::first_start (SCM l) { Moment m; - for (SCM s = l; is_pair (s); s = ly_cdr (s)) + for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s)) { Music * mus = unsmob_music (ly_car (s)); Moment l = mus->get_length (); diff --git a/lily/music.cc b/lily/music.cc index df6e3d99e5..e63c20fabe 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -114,7 +114,7 @@ void print_alist (SCM a, SCM port) { /* SCM_EOL -> catch malformed lists. */ - for (SCM s = a; is_pair (s); s = ly_cdr (s)) + for (SCM s = a; ly_c_pair_p (s); s = ly_cdr (s)) { scm_display (ly_caar (s), port); scm_puts (" = ", port); @@ -130,7 +130,7 @@ Music::print_smob (SCM s, SCM p, scm_print_state*) Music* m = unsmob_music (s); SCM nm = m->get_property ("name"); - if (is_symbol (nm) || is_string (nm)) + if (is_symbol (nm) || ly_c_string_p (nm)) scm_display (nm, p); else scm_puts (classname (m),p); @@ -275,7 +275,7 @@ LY_DEFINE (ly_extended_make_music, "ly:make-bare-music", "for creating music objects. " ) { - SCM_ASSERT_TYPE (is_string (type), type, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); SCM s = make_music (ly_scm2string (type))->self_scm (); unsmob_music (s)->immutable_property_alist_ = props; scm_gc_unprotect_object (s); @@ -301,7 +301,7 @@ LY_DEFINE (ly_music_list_p,"ly:music-list?", "of music objects.") { if (scm_list_p (lst) == SCM_BOOL_T) - while (is_pair (lst)) + while (ly_c_pair_p (lst)) { if (!unsmob_music (ly_car (lst))) return SCM_BOOL_F; @@ -321,7 +321,7 @@ LY_DEFINE (ly_deep_mus_copy, "ly:music-deep-copy", copy = unsmob_music (m)->clone ()->self_scm (); scm_gc_unprotect_object (copy); } - else if (is_pair (m)) + else if (ly_c_pair_p (m)) copy = scm_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m))); return copy; diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index ae20b4d8ef..d070a412c9 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -118,7 +118,7 @@ My_lily_lexer::add_scope (SCM module) { ly_reexport_module (scm_current_module ()); scm_set_current_module (module); - for (SCM s = scopes_; is_pair (s); s = ly_cdr (s)) + for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s)) { /* UGH. how to do this more neatly? */ SCM expr @@ -152,7 +152,7 @@ SCM My_lily_lexer::lookup_identifier (String s) { SCM sym = ly_symbol2scm (s.to_str0()); - for (SCM s = scopes_; is_pair (s); s = ly_cdr (s)) + for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s)) { SCM var = ly_module_lookup (ly_car (s), sym); if (var != SCM_BOOL_F) @@ -178,7 +178,7 @@ My_lily_lexer::start_main_input () void My_lily_lexer::set_identifier (SCM name, SCM s) { - assert (is_string (name)); + assert (ly_c_string_p (name)); if (lookup_keyword (ly_scm2string (name)) >= 0) { diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 1a0513ad24..5f823b2a35 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -194,7 +194,7 @@ LY_DEFINE(ly_parse_file, "ly:parse-file", "Parse a single @code{.ly} file. If this fails, then throw @code{ly-file-failed} key. " ) { - SCM_ASSERT_TYPE (is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); char const *file = SCM_STRING_CHARS(name); String infile (file); diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index b5e17e9f58..5b846f57c6 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -67,7 +67,7 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf) SCM arts = note_ev->get_property ("articulations"); - for (SCM s = arts; is_pair (s); s = ly_cdr (s)) + for (SCM s = arts; ly_c_pair_p (s); s = ly_cdr (s)) { Music * m = unsmob_music (ly_car (s)); @@ -304,7 +304,7 @@ New_fingering_engraver::stop_translation_timestep () sc->set_property ("direction-source", stem_->self_scm ()); SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), articulations_[i].description_); - if (is_pair (follow) && to_boolean (ly_cdr (follow))) + if (ly_c_pair_p (follow) && to_boolean (ly_cdr (follow))) { sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS); sc->set_property ("staff-padding" , SCM_EOL); diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc index 03f82646af..8613ee2c10 100644 --- a/lily/new-lyric-combine-music-iterator.cc +++ b/lily/new-lyric-combine-music-iterator.cc @@ -160,7 +160,7 @@ New_lyric_combine_music_iterator::find_voice () { SCM voice_name = get_music ()->get_property ("associated-context"); - if (is_string (voice_name)) + if (ly_c_string_p (voice_name)) { Context *t = get_outlet (); while (t && t->get_parent_context ()) diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 1a6d65eff3..8d5083c286 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -302,7 +302,7 @@ Note_collision_interface::do_shifts (Grob* me) while (flip (&d) != UP); Link_array done; - for (; is_pair (hand); hand =ly_cdr (hand)) + for (; ly_c_pair_p (hand); hand =ly_cdr (hand)) { Grob * s = unsmob_grob (ly_caar (hand)); Real amount = ly_scm2double (ly_cdar (hand)); @@ -310,7 +310,7 @@ Note_collision_interface::do_shifts (Grob* me) s->translate_axis (amount *wid, X_AXIS); done.push (s); } - for (; is_pair (autos); autos =ly_cdr (autos)) + for (; ly_c_pair_p (autos); autos =ly_cdr (autos)) { Grob * s = unsmob_grob (ly_caar (autos)); Real amount = ly_scm2double (ly_cdar (autos)); @@ -326,7 +326,7 @@ Note_collision_interface::get_clash_groups (Grob *me) Drul_array > clash_groups; SCM s = me->get_property ("elements"); - for (; is_pair (s); s = ly_cdr (s)) + for (; ly_c_pair_p (s); s = ly_cdr (s)) { SCM car = ly_car (s); @@ -452,7 +452,7 @@ Note_collision_interface::forced_shift (Grob *me) SCM tups = SCM_EOL; SCM s = me->get_property ("elements"); - for (; is_pair (s); s = ly_cdr (s)) + for (; ly_c_pair_p (s); s = ly_cdr (s)) { Grob * se = unsmob_grob (ly_car (s)); diff --git a/lily/note-column.cc b/lily/note-column.cc index cf3ea20be6..bc09959fc0 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -55,7 +55,7 @@ Note_column::head_positions_interval (Grob *me) iv.set_empty (); SCM h = me->get_property ("note-heads"); - for (; is_pair (h); h = ly_cdr (h)) + for (; ly_c_pair_p (h); h = ly_cdr (h)) { Grob *se = unsmob_grob (ly_car (h)); @@ -71,7 +71,7 @@ Note_column::dir (Grob* me) Grob *stem = unsmob_grob (me->get_property ("stem")); if (stem && Stem::has_interface (stem)) return Stem::get_direction (stem); - else if (is_pair (me->get_property ("note-heads"))) + else if (ly_c_pair_p (me->get_property ("note-heads"))) return (Direction)sign (head_positions_interval (me).center ()); programming_error ("Note column without heads and stem!"); @@ -100,7 +100,7 @@ Note_column::add_head (Grob*me,Grob *h) bool both = false; if (Rest::has_interface (h)) { - if (is_pair (me->get_property ("note-heads"))) + if (ly_c_pair_p (me->get_property ("note-heads"))) both = true; else me->set_property ("rest", h->self_scm ()); @@ -158,7 +158,7 @@ Note_column::accidentals (Grob *me) { SCM heads = me->get_property ("note-heads"); Grob * acc = 0; - for (;is_pair (heads); heads =ly_cdr (heads)) + for (;ly_c_pair_p (heads); heads =ly_cdr (heads)) { Grob * h = unsmob_grob (ly_car (heads)); acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0; diff --git a/lily/note-head.cc b/lily/note-head.cc index 1c4c98c0c4..61603b23d4 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -321,7 +321,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a) return 0.0; SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); - if (!is_pair (result)) + if (!ly_c_pair_p (result)) return 0.0; result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc index f3e54e904c..a3b94a5749 100644 --- a/lily/note-spacing.cc +++ b/lily/note-spacing.cc @@ -42,7 +42,7 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, Interval left_head_wid; do { - for (SCM s = props[d]; is_pair (s); s = ly_cdr (s)) + for (SCM s = props[d]; ly_c_pair_p (s); s = ly_cdr (s)) { Item * it= dynamic_cast (unsmob_grob (ly_car (s))); @@ -188,7 +188,7 @@ Note_spacing::right_column (Grob*me) Item *mincol = 0; int min_rank = INT_MAX; bool prune = false; - for (SCM s = right ; is_pair (s) ; s = ly_cdr (s)) + for (SCM s = right ; ly_c_pair_p (s) ; s = ly_cdr (s)) { Item * ri = unsmob_item (ly_car (s)); @@ -209,7 +209,7 @@ Note_spacing::right_column (Grob*me) { // I'm a lazy bum. We could do this in-place. SCM newright = SCM_EOL; - for (SCM s = right ; is_pair (s) ; s =ly_cdr (s)) + for (SCM s = right ; ly_c_pair_p (s) ; s =ly_cdr (s)) { if (unsmob_item (ly_car (s))->get_column () == mincol) newright = scm_cons (ly_car (s), newright); @@ -264,7 +264,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, do { - for (SCM s = props[d]; is_pair (s); s = ly_cdr (s)) + for (SCM s = props[d]; ly_c_pair_p (s); s = ly_cdr (s)) { Item * it= dynamic_cast (unsmob_grob (ly_car (s))); diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index adc106edcc..afea781d86 100644 --- a/lily/ottava-bracket.cc +++ b/lily/ottava-bracket.cc @@ -88,7 +88,7 @@ Ottava_bracket::print (SCM smob) Interval ext; if (Note_column::has_interface (b)) { - for (SCM s = b->get_property ("note-heads"); is_pair (s); s =ly_cdr (s)) + for (SCM s = b->get_property ("note-heads"); ly_c_pair_p (s); s =ly_cdr (s)) ext.unite (unsmob_grob (ly_car (s))->extent (common, X_AXIS)); } diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 338100e7a6..20f629e1b6 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -46,7 +46,7 @@ Ottava_spanner_engraver::process_music () { finished_= span_; span_ = 0; - if (is_string (ott)) + if (ly_c_string_p (ott)) { span_ = make_spanner ("OttavaBracket"); span_->set_property ("text", ott); diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 6b8d7a4364..0c06555920 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -99,8 +99,8 @@ Paper_column::is_musical (Grob *me) bool Paper_column::is_used (Grob*me) { - return is_pair (me->get_property ("elements")) || Item::is_breakable (me) - || is_pair (me->get_property ("bounded-by-me")) + return ly_c_pair_p (me->get_property ("elements")) || Item::is_breakable (me) + || ly_c_pair_p (me->get_property ("bounded-by-me")) ; } @@ -147,7 +147,7 @@ Paper_column::before_line_breaking (SCM grob) SCM c = me->get_property ("bounded-by-me"); SCM *ptrptr = &c; - while (is_pair (*ptrptr)) + while (ly_c_pair_p (*ptrptr)) { Grob * g = unsmob_grob (ly_car (*ptrptr)); diff --git a/lily/paper-def.cc b/lily/paper-def.cc index fb2874327c..8196e63f1e 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -93,7 +93,7 @@ Paper_def::find_scaled_font (Font_metric *f, Real m, SCM input_enc_name) if (sizes != SCM_BOOL_F) { SCM met = scm_assoc (scm_make_real (m), sizes); - if (is_pair (met)) + if (ly_c_pair_p (met)) return unsmob_metrics (ly_cdr (met)); } else @@ -114,7 +114,7 @@ Paper_def::find_scaled_font (Font_metric *f, Real m, SCM input_enc_name) Virtual_font (Scaled (Font1), Scaled (Font2)) */ SCM lst = SCM_EOL; SCM *t = &lst; - for (SCM s = vf->get_font_list (); is_pair (s); s = ly_cdr (s)) + for (SCM s = vf->get_font_list (); ly_c_pair_p (s); s = ly_cdr (s)) { Font_metric *scaled = find_scaled_font (unsmob_metrics (ly_car (s)), m, input_enc_name); @@ -154,10 +154,10 @@ Paper_def::font_descriptions () const SCM func = ly_scheme_function ("hash-table->alist"); SCM l = SCM_EOL; - for (SCM s = scm_call_1 (func, scaled_fonts_); is_pair (s); s = ly_cdr (s)) + for (SCM s = scm_call_1 (func, scaled_fonts_); ly_c_pair_p (s); s = ly_cdr (s)) { SCM entry = ly_car (s); - for (SCM t = ly_cdr (entry); is_pair (t); t = ly_cdr (t)) + for (SCM t = ly_cdr (entry); ly_c_pair_p (t); t = ly_cdr (t)) { Font_metric *fm= unsmob_metrics (ly_cdar (t)); diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 8540ae1efb..a648426da8 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -173,7 +173,7 @@ Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) ly_quote_scm (ly_offset2scm (*origin)), ly_quote_scm (ly_offset2scm (dim)))); - for (SCM s = pl->stencils (); is_pair (s); s = ly_cdr (s)) + for (SCM s = pl->stencils (); ly_c_pair_p (s); s = ly_cdr (s)) output_expr (unsmob_stencil (ly_car (s))->get_expr (), Offset (0, 0)); output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), @@ -196,7 +196,7 @@ Paper_outputter::output_expr (SCM expr, Offset o) { while (1) { - if (!is_pair (expr)) + if (!ly_c_pair_p (expr)) return; SCM head =ly_car (expr); diff --git a/lily/parser.yy b/lily/parser.yy index b64ed2615f..3798e3fbc2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -121,7 +121,7 @@ is_duration (int t) void set_music_properties (Music *p, SCM a) { - for (SCM k = a; is_pair (k); k = ly_cdr (k)) + for (SCM k = a; ly_c_pair_p (k); k = ly_cdr (k)) p->internal_set_property (ly_caar (k), ly_cdar (k)); } @@ -152,7 +152,7 @@ bool ly_input_procedure_p (SCM x) { return is_procedure (x) - || (is_pair (x) && is_procedure (ly_car (x))); + || (ly_c_pair_p (x) && is_procedure (ly_car (x))); } Music* @@ -591,7 +591,7 @@ context_def_spec_body: | context_def_spec_body GROBDESCRIPTIONS embedded_scm { Context_def*td = unsmob_context_def ($$); - for (SCM p = $3; is_pair (p); p = ly_cdr (p)) { + for (SCM p = $3; ly_c_pair_p (p); p = ly_cdr (p)) { SCM tag = ly_caar (p); /* TODO: should make new tag "grob-definition" ? */ @@ -649,7 +649,7 @@ score_body: guh. */ SCM check_funcs = ly_scheme_function ("toplevel-music-functions"); - for (; is_pair (check_funcs); check_funcs = ly_cdr (check_funcs)) + for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs)) m = scm_call_1 (ly_car (check_funcs), m); $$->music_ = m; @@ -769,7 +769,7 @@ Music_list: SCM s = $$; SCM c = scm_cons ($2->self_scm (), SCM_EOL); scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ - if (is_pair (ly_cdr (s))) + if (ly_c_pair_p (ly_cdr (s))) scm_set_cdr_x (ly_cdr (s), c); /* append */ else scm_set_car_x (s, c); /* set first cons */ @@ -799,7 +799,7 @@ Repeated_music: { Music *beg = $4; int times = $3; - SCM alts = is_pair ($5) ? ly_car ($5) : SCM_EOL; + SCM alts = ly_c_pair_p ($5) ? ly_car ($5) : SCM_EOL; if (times < scm_ilength (alts)) { unsmob_music (ly_car (alts)) ->origin ()->warning ( @@ -1297,7 +1297,7 @@ note_chord_element: SCM es = $1->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); - for (SCM s = es; is_pair (s); s = ly_cdr (s)) + for (SCM s = es; ly_c_pair_p (s); s = ly_cdr (s)) unsmob_music (ly_car (s))->set_property ("duration", dur); es = ly_append2 (es, postevs); @@ -1345,7 +1345,7 @@ chord_body_element: if ($2 % 2 || $3 % 2) n->set_property ("force-accidental", SCM_BOOL_T); - if (is_pair ($4)) { + if (ly_c_pair_p ($4)) { SCM arts = scm_reverse_x ($4, SCM_EOL); n->set_property ("articulations", arts); } @@ -1357,7 +1357,7 @@ chord_body_element: n->set_property ("drum-type", $1); n->set_spot (THIS->here_input ()); - if (is_pair ($2)) { + if (ly_c_pair_p ($2)) { SCM arts = scm_reverse_x ($2, SCM_EOL); n->set_property ("articulations", arts); } @@ -1652,7 +1652,7 @@ direction_reqd_event: | script_abbreviation { SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); - if (is_string (s)) + if (ly_c_string_p (s)) a->set_property ("articulation-type", s); else THIS->parser_error (_ ("Expecting string as script definition")); $$ = a; @@ -2060,7 +2060,7 @@ simple_element: Music *m = unsmob_music ($1); Input i = THIS->pop_spot (); m->set_spot (i); - for (SCM s = m->get_property ("elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = m->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s)) { unsmob_music (ly_car (s))->set_property ("duration", $2); } @@ -2428,7 +2428,7 @@ otherwise, we have to import music classes into the lexer. int My_lily_lexer::try_special_identifiers (SCM *destination, SCM sid) { - if (is_string (sid)) { + if (ly_c_string_p (sid)) { *destination = sid; return STRING_IDENTIFIER; } else if (is_number (sid)) { @@ -2534,7 +2534,7 @@ context_spec_music (SCM type, SCM id, Music *m, SCM ops) is_symbol (type) ? type : scm_string_to_symbol (type)); csm->set_property ("property-operations", ops); - if (is_string (id)) + if (ly_c_string_p (id)) csm->set_property ("context-id", id); return csm; } diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc index a40151ee15..ecc89ba0a6 100644 --- a/lily/part-combine-iterator.cc +++ b/lily/part-combine-iterator.cc @@ -370,7 +370,7 @@ Part_combine_iterator::process (Moment m) Moment now = get_outlet ()->now_mom (); Moment *splitm = 0; - for (; is_pair (split_list_); split_list_ = ly_cdr (split_list_)) + for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_)) { splitm = unsmob_moment (ly_caar (split_list_)); if (splitm && *splitm + start_moment_ > now) diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index b7312e8878..0a6011df88 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -41,7 +41,7 @@ Performer_group_performer::acknowledge_audio_elements () { Audio_element_info info = announce_infos_[j]; - for (SCM p = get_simple_trans_list (); is_pair (p); p = ly_cdr (p)) + for (SCM p = get_simple_trans_list (); ly_c_pair_p (p); p = ly_cdr (p)) { Translator * t = unsmob_translator (ly_car (p)); Performer * eng = dynamic_cast (t); @@ -76,7 +76,7 @@ Performer_group_performer::Performer_group_performer () void performer_each (SCM list, Performer_method method) { - for (SCM p = list; is_pair (p); p = ly_cdr (p)) + for (SCM p = list; ly_c_pair_p (p); p = ly_cdr (p)) { Performer * e = dynamic_cast(unsmob_translator (ly_car (p))); if (e) diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 95cc99d30e..c6eef783c8 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -291,7 +291,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed) } } - if (is_string (s)) + if (ly_c_string_p (s)) { String propname = String (p->name_) + "Pedal"; diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc index 163f9256e5..582ba6bac9 100644 --- a/lily/quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -144,12 +144,12 @@ Quote_iterator::process (Moment m) event_idx_++; } - if (is_pair (entry)) + if (ly_c_pair_p (entry)) { Pitch * quote_pitch = unsmob_pitch (ly_cdar (entry)); Pitch * me_pitch = unsmob_pitch (get_outlet ()->get_property ("instrumentTransposition")); - for (SCM s = ly_cdr (entry); is_pair (s); s = ly_cdr (s)) + for (SCM s = ly_cdr (entry); ly_c_pair_p (s); s = ly_cdr (s)) { SCM ev_acc = ly_car (s); diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc index a40f45bff0..42be7b9eb5 100644 --- a/lily/recording-group-engraver.cc +++ b/lily/recording-group-engraver.cc @@ -52,9 +52,9 @@ Recording_group_engraver::start_translation_timestep () void Recording_group_engraver::start () { - if (!is_pair (accumulator_)) + if (!ly_c_pair_p (accumulator_)) accumulator_ = scm_cons (SCM_EOL, SCM_EOL); - if (!is_pair (ly_car (accumulator_))) + if (!ly_c_pair_p (ly_car (accumulator_))) { /* Need to store transposition for every moment; transposition changes during pieces. diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 5ae53695aa..d025fa47d2 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -71,14 +71,14 @@ Repeat_acknowledge_engraver::process_music () bool start = false; bool end = false; bool volta_found = false; - while (is_pair (cs)) + while (ly_c_pair_p (cs)) { SCM command = ly_car (cs); if (command == ly_symbol2scm ("start-repeat")) start = true; else if (command == ly_symbol2scm ("end-repeat")) end = true; - else if (is_pair (command) && ly_car (command) == ly_symbol2scm ("volta")) + else if (ly_c_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta")) volta_found = true; cs = ly_cdr (cs); } @@ -100,9 +100,9 @@ Repeat_acknowledge_engraver::process_music () */ SCM wb = get_property ("whichBar"); SCM db = get_property ("defaultBarType"); - if (!is_string (wb) || is_equal (db, wb)) + if (!ly_c_string_p (wb) || is_equal (db, wb)) { - if (s != "" || (volta_found && !is_string (wb))) + if (s != "" || (volta_found && !ly_c_string_p (wb))) { get_parent_context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ())); } diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index daf7611a70..db95698b5b 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -42,7 +42,7 @@ Repeated_music::to_relative_octave (Pitch p) { lily_1_8_compatibility_used = true; - for (SCM s = alternatives (); is_pair (s); s = ly_cdr (s)) + for (SCM s = alternatives (); ly_c_pair_p (s); s = ly_cdr (s)) unsmob_music (ly_car (s))->to_relative_octave (p); } @@ -68,7 +68,7 @@ Repeated_music::alternatives_get_length (bool fold) const int done =0; SCM p = alternatives (); - while (is_pair (p) && done < repeat_count ()) + while (ly_c_pair_p (p) && done < repeat_count ()) { m = m + unsmob_music (ly_car (p))->get_length (); done ++; @@ -90,7 +90,7 @@ Repeated_music::alternatives_volta_get_length () const Moment m; SCM p = alternatives (); - while (is_pair (p)) + while (ly_c_pair_p (p)) { m = m + unsmob_music (ly_car (p))->get_length (); p = ly_cdr (p); diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 0bd15d3ecc..490f17fbc6 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -87,7 +87,7 @@ Rest_collision::do_shift (Grob *me) Link_array rests; Link_array notes; - for (SCM s = elts; is_pair (s); s = ly_cdr (s)) + for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s)) { Grob * e = unsmob_grob (ly_car (s)); if (unsmob_grob (e->get_property ("rest"))) diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 16c3a80bb0..7542b121d1 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -19,7 +19,7 @@ copy_scm_hashes (SCM dest, SCM src) { int k = 0; for (int i = SCM_VECTOR_LENGTH (src); i--;) - for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); is_pair (s); s = ly_cdr (s)) + for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); ly_c_pair_p (s); s = ly_cdr (s)) { scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s)); k++; @@ -82,7 +82,7 @@ bool Scheme_hash_table::try_retrieve (SCM k, SCM *v) { SCM handle = scm_hashq_get_handle (hash_tab_, k); - if (is_pair (handle)) + if (ly_c_pair_p (handle)) { *v = ly_cdr (handle); return true; @@ -95,7 +95,7 @@ Scheme_hash_table::try_retrieve (SCM k, SCM *v) bool Scheme_hash_table::contains (SCM k) const { - return is_pair (scm_hashq_get_handle (hash_tab_, k)); + return ly_c_pair_p (scm_hashq_get_handle (hash_tab_, k)); } void @@ -150,7 +150,7 @@ Scheme_hash_table::to_alist () const { SCM l = SCM_EOL; for (int i = SCM_VECTOR_LENGTH (hash_tab_); i--;) - for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); is_pair (s); s = ly_cdr (s)) + for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); ly_c_pair_p (s); s = ly_cdr (s)) { l = scm_acons (ly_caar (s), ly_cdar (s), l); } diff --git a/lily/score.cc b/lily/score.cc index 00da8b5f77..e793931efb 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -149,7 +149,7 @@ LY_DEFINE (ly_format_output, "ly:format-output", { Global_context *g = dynamic_cast (unsmob_context (context)); SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); - SCM_ASSERT_TYPE (is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output filename"); + SCM_ASSERT_TYPE (ly_c_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename"); Music_output *output = g->get_output (); progress_indication ("\n"); diff --git a/lily/script-column.cc b/lily/script-column.cc index b84c18de3e..2f059721ab 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -44,7 +44,7 @@ Script_column::before_line_breaking (SCM smob) Drul_array scripts (SCM_EOL, SCM_EOL); Link_array staff_sided; - for (SCM s = me->get_property ("scripts"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("scripts"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob *sc = unsmob_grob (ly_car (s)); @@ -74,7 +74,7 @@ Script_column::before_line_breaking (SCM smob) ss = scm_stable_sort_x (ss, grob_script_priority_less_proc); Grob * last = 0; - for (SCM s = ss; is_pair (s); s = ly_cdr (s)) + for (SCM s = ss; ly_c_pair_p (s); s = ly_cdr (s)) { Grob *g = unsmob_grob (ly_car (s)); if (last) diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 0abfc68605..143bbd9560 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -70,7 +70,7 @@ copy_property (Grob * g , SCM sym, SCM alist) if (g->internal_get_property (sym) == SCM_EOL) { SCM entry = scm_assoc (sym,alist); - if (is_pair (entry)) + if (ly_c_pair_p (entry)) { g->internal_set_property (sym, ly_cdr (entry)); } @@ -110,7 +110,7 @@ void make_script_from_event (Grob *p, int prio =0; SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art); - if (is_pair (sprio)) + if (ly_c_pair_p (sprio)) prio = ly_scm2int (ly_cdr (sprio)); @@ -219,7 +219,7 @@ Script_engraver::stop_translation_timestep () Grob * sc = scripts_[i].script_; SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), scripts_[i].description_); - if (is_pair (follow) && to_boolean (ly_cdr (follow))) + if (ly_c_pair_p (follow) && to_boolean (ly_cdr (follow))) { sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS); sc->set_property ("staff-padding", SCM_EOL); diff --git a/lily/script.cc b/lily/script.cc index 3d16fc7f5c..d314e976a8 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -23,14 +23,14 @@ Stencil Script_interface::get_stencil (Grob * me, Direction d) { SCM s = me->get_property ("script-stencil"); - assert (is_pair (s)); + assert (ly_c_pair_p (s)); SCM key = ly_car (s); if (key == ly_symbol2scm ("feta")) { SCM name_entry = ly_cdr (s); - SCM str = (is_pair (name_entry)) ? index_get_cell (name_entry, d) : name_entry; + SCM str = (ly_c_pair_p (name_entry)) ? index_get_cell (name_entry, d) : name_entry; return Font_interface::get_default_font (me)->find_by_name ("scripts-" + ly_scm2string (str)); } diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 5ac17e5b17..0ca1a16471 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -28,7 +28,7 @@ Separating_group_spanner::find_rods (Item * r, SCM next, Real padding) return; - for (; is_pair (next); next = ly_cdr (next)) + for (; ly_c_pair_p (next); next = ly_cdr (next)) { Item *l = dynamic_cast (unsmob_grob (ly_car ( next))); Item *lb = l->find_prebroken_piece (RIGHT); @@ -83,7 +83,7 @@ Separating_group_spanner::set_spacing_rods (SCM smob) */ Real padding = robust_scm2double (me->get_property ("padding"), 0.1); - for (SCM s = me->get_property ("elements"); is_pair (s) && is_pair (ly_cdr (s)); s = ly_cdr (s)) + for (SCM s = me->get_property ("elements"); ly_c_pair_p (s) && ly_c_pair_p (ly_cdr (s)); s = ly_cdr (s)) { /* Order of elements is reversed! diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 5024a98a70..81b8bee1fc 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -40,7 +40,7 @@ Separation_item::conditional_width (Grob * me, Grob * left) Paper_column * pc = item->get_column (); - for (SCM s = me->get_property ("conditional-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("conditional-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { SCM elt = ly_car (s); if (!unsmob_grob (elt)) @@ -84,7 +84,7 @@ Separation_item::width (Grob *me) Paper_column * pc = item->get_column (); Interval w; - for (SCM s = me->get_property ("elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s)) { SCM elt = ly_car (s); if (!unsmob_grob (elt)) @@ -140,7 +140,7 @@ Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d last_ext->set_empty (); Grob *last_grob = 0; for (SCM s = separation_item->get_property ("elements"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Grob * break_item = unsmob_grob (ly_car (s)); diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 25cdb05cd5..105126cc75 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -23,7 +23,7 @@ Invariant for the data structure. - if (is_pair (cursor_)) + if (ly_c_pair_p (cursor_)) iter_->music_ == unsmob_music (ly_car (cursor_)) else iter_ == 0; @@ -85,7 +85,7 @@ create_grace_fixup_list (SCM cursor) Grace_fixup *head = 0; Grace_fixup **tail = &head; - for (; is_pair (cursor); cursor = ly_cdr (cursor)) + for (; ly_c_pair_p (cursor); cursor = ly_cdr (cursor)) { Music *mus = unsmob_music (ly_car (cursor)); Moment s = mus->start_mom (); @@ -123,7 +123,7 @@ Sequential_iterator::construct_children () cursor_ = get_music_list (); iter_ = 0; - if (is_pair (cursor_)) + if (ly_c_pair_p (cursor_)) { Music *m = unsmob_music (ly_car (cursor_)); iter_ = unsmob_iterator (get_iterator (m)); @@ -188,7 +188,7 @@ Sequential_iterator::next_element (bool) cursor_ = ly_cdr (cursor_); iter_->quit (); - if (is_pair (cursor_)) + if (ly_c_pair_p (cursor_)) iter_ = unsmob_iterator (get_iterator (unsmob_music (ly_car (cursor_)))); else iter_ = 0; diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index cf695409a1..3682dc1443 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -215,7 +215,7 @@ Simple_spacer::add_columns (Link_array const &icols) Link_array cols (icols); for (int i = cols.size (); i--;) - if (is_pair (cols[i]->get_property ("between-cols"))) + if (ly_c_pair_p (cols[i]->get_property ("between-cols"))) { loose_cols_.push (cols[i]); cols.del (i); @@ -227,7 +227,7 @@ Simple_spacer::add_columns (Link_array const &icols) Spring_smob *spring = 0; for (SCM s = cols[i]->get_property ("ideal-distances"); - !spring && is_pair (s); + !spring && ly_c_pair_p (s); s = ly_cdr (s)) { Spring_smob *sp = unsmob_spring (ly_car (s)); @@ -285,7 +285,7 @@ Simple_spacer::add_columns (Link_array const &icols) for (int i=0; i < cols.size () - 1; i++) { for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Grob * other = unsmob_grob (ly_caar (s)); int oi = cols.find_index (other); diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 9dcf354f16..c90cd21767 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -29,7 +29,7 @@ Simultaneous_music_iterator::derived_mark () const void Simultaneous_music_iterator::derived_substitute (Context *f,Context *t) { - for (SCM s = children_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = children_list_; ly_c_pair_p (s); s = ly_cdr (s)) unsmob_iterator (ly_car (s))-> substitute_outlet (f,t); } @@ -42,7 +42,7 @@ Simultaneous_music_iterator::construct_children () children_list_ = SCM_EOL; SCM * tail = &children_list_; - for (; is_pair (i); i = ly_cdr (i), j++) + for (; ly_c_pair_p (i); i = ly_cdr (i), j++) { Music *mus = unsmob_music (ly_car (i)); @@ -77,7 +77,7 @@ void Simultaneous_music_iterator::process (Moment until) { SCM *proc = &children_list_; - while (is_pair (*proc)) + while (ly_c_pair_p (*proc)) { Music_iterator * i = unsmob_iterator (ly_car (*proc)); if (i->run_always () @@ -103,7 +103,7 @@ Simultaneous_music_iterator::pending_moment () const Moment next; next.set_infinite (1); - for (SCM s = children_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = children_list_; ly_c_pair_p (s); s = ly_cdr (s)) { Music_iterator * it = unsmob_iterator (ly_car (s)); next = next pending_moment (); @@ -116,7 +116,7 @@ bool Simultaneous_music_iterator::ok () const { bool run_always_ok = false; - for (SCM s = children_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = children_list_; ly_c_pair_p (s); s = ly_cdr (s)) { Music_iterator * it = unsmob_iterator (ly_car (s)); if (!it->run_always ()) @@ -130,7 +130,7 @@ Simultaneous_music_iterator::ok () const bool Simultaneous_music_iterator::run_always () const { - for (SCM s = children_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = children_list_; ly_c_pair_p (s); s = ly_cdr (s)) { Music_iterator * it = unsmob_iterator (ly_car (s)); if (it->run_always ()) @@ -143,7 +143,7 @@ Music_iterator* Simultaneous_music_iterator::try_music_in_children (Music *m) const { Music_iterator * b=0; - for (SCM s = children_list_; !b && is_pair (s); s = ly_cdr (s)) + for (SCM s = children_list_; !b && ly_c_pair_p (s); s = ly_cdr (s)) b =unsmob_iterator (ly_car (s))->try_music (m); return b; } @@ -151,7 +151,7 @@ Simultaneous_music_iterator::try_music_in_children (Music *m) const void Simultaneous_music_iterator::do_quit () { - for (SCM s = children_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = children_list_; ly_c_pair_p (s); s = ly_cdr (s)) unsmob_iterator (ly_car (s))->quit (); } diff --git a/lily/slur.cc b/lily/slur.cc index 635d5b3bed..9ff91ef379 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -120,7 +120,7 @@ Slur::after_line_breaking (SCM smob) return SCM_UNSPECIFIED; } set_extremities (me); - if (!is_pair (me->get_property ("control-points"))) + if (!ly_c_pair_p (me->get_property ("control-points"))) set_control_points (me); return SCM_UNSPECIFIED; } @@ -182,7 +182,7 @@ Slur::set_extremities (Grob *me) SCM att = me->get_property ("attachment"); /* */ - if (!is_pair (att)) + if (!ly_c_pair_p (att)) { programming_error ("attachment is not a cons?!"); att = scm_cons (SCM_EOL, SCM_EOL); @@ -218,7 +218,7 @@ Slur::get_boundary_notecolumn_y (Grob *me, Direction dir) { SCM cols = me->get_property ("note-columns"); - if (!is_pair (cols)) + if (!ly_c_pair_p (cols)) { programming_error ("No note-columns in slur?"); me->suicide (); @@ -288,7 +288,7 @@ Slur::get_attachment (Grob *me, Direction dir, Grob **common) { SCM s = me->get_property ("attachment"); - if (!is_pair (s) || !is_symbol (index_get_cell (s, dir))) + if (!ly_c_pair_p (s) || !is_symbol (index_get_cell (s, dir))) { s = set_extremities (me); } @@ -604,7 +604,7 @@ Slur::set_control_points (Grob*me) bb.minimise_enclosed_area (sb, details); SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details); Real bff = 1.0; - if (is_pair (sbf) && is_number (ly_cdr (sbf))) + if (ly_c_pair_p (sbf) && is_number (ly_cdr (sbf))) bff = ly_scm2double (ly_cdr (sbf)); bb.curve_.control_[1][Y_AXIS] *= bff; @@ -650,7 +650,7 @@ Slur::get_curve (Grob*me) int i = 0; SCM attach = me->get_property ("attachment"); - if (!is_pair (attach)) + if (!ly_c_pair_p (attach)) attach = set_extremities (me); @@ -659,7 +659,7 @@ Slur::get_curve (Grob*me) || ! is_symbol (index_get_cell (attach, RIGHT))) set_extremities (me); - if (!is_pair (me->get_property ("control-points"))) + if (!ly_c_pair_p (me->get_property ("control-points"))) set_control_points (me); // set_control_points may suicide diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 7c5c670313..5477f624ad 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -31,7 +31,7 @@ Spaceable_grob::add_rod (Grob *me , Grob * p, Real d) SCM mins = get_minimum_distances (me); SCM newdist = scm_make_real (d); - for (SCM s = mins; is_pair (s); s = ly_cdr (s)) + for (SCM s = mins; ly_c_pair_p (s); s = ly_cdr (s)) { SCM dist = ly_car (s); if (ly_car (dist) == p->self_scm ()) @@ -70,7 +70,7 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan #ifndef NDEBUG SCM mins = me->get_property ("ideal-distances"); - for (SCM s = mins; is_pair (s); s = ly_cdr (s)) + for (SCM s = mins; ly_c_pair_p (s); s = ly_cdr (s)) { Spring_smob * sp = unsmob_spring(ly_car (s)); if (sp->other_ == p) diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index efeaf3524f..e83dedf53f 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -96,7 +96,7 @@ loose_column (Grob *l, Grob *c, Grob *r) such a borderline case.) */ - if (!is_pair (lns) || !is_pair (rns)) + if (!ly_c_pair_p (lns) || !ly_c_pair_p (rns)) return false; Item * l_neighbor = dynamic_cast (unsmob_grob (ly_car (lns))); @@ -133,12 +133,12 @@ loose_column (Grob *l, Grob *c, Grob *r) in any case, we don't want to move bar lines. */ - for (SCM e = c->get_property ("elements"); is_pair (e); e = ly_cdr (e)) + for (SCM e = c->get_property ("elements"); ly_c_pair_p (e); e = ly_cdr (e)) { Grob * g = unsmob_grob (ly_car (e)); if (g && Break_align_interface::has_interface (g)) { - for (SCM s = g->get_property ("elements"); is_pair (s); + for (SCM s = g->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob *h = unsmob_grob (ly_car (s)); @@ -177,10 +177,10 @@ Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational s if (loose_column (cols->elem (i-1), c, cols->elem (i+1))) { SCM lns = c->get_property ("left-neighbors"); - lns = is_pair (lns) ? ly_car (lns) : SCM_BOOL_F; + lns = ly_c_pair_p (lns) ? ly_car (lns) : SCM_BOOL_F; SCM rns = c->get_property ("right-neighbors"); - rns = is_pair (rns) ? ly_car (rns) : SCM_BOOL_F; + rns = ly_c_pair_p (rns) ? ly_car (rns) : SCM_BOOL_F; /* Either object can be non existent, if the score ends @@ -206,7 +206,7 @@ Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational s Item *rc = dynamic_cast (d == LEFT ? c : next_door[RIGHT]); for (SCM s = lc->get_property ("spacing-wishes"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Grob *sp = unsmob_grob (ly_car (s)); if (Note_spacing::left_column (sp) != lc @@ -273,7 +273,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array cols) SCM wishes= cols[i]->get_property ("spacing-wishes"); - for (SCM s =wishes; is_pair (s); s = ly_cdr (s)) + for (SCM s =wishes; ly_c_pair_p (s); s = ly_cdr (s)) { Item * wish = dynamic_cast (unsmob_grob (ly_car (s))); @@ -305,7 +305,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array cols) */ int maxrank = 0; SCM left_neighs = rc->get_property ("left-neighbors"); - if (is_pair (left_neighs) + if (ly_c_pair_p (left_neighs) && unsmob_grob (ly_car (left_neighs))) { Item * it = dynamic_cast (unsmob_grob (ly_car (left_neighs))); @@ -322,7 +322,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array cols) } } - if (is_pair (right_neighbors)) + if (ly_c_pair_p (right_neighbors)) { cols[i]->set_property ("right-neighbors", right_neighbors); } @@ -348,13 +348,13 @@ Spacing_spanner::set_implicit_neighbor_columns (Link_array cols) sloppy with typnig left/right-neighbors should take list, but paper-column found instead. */ SCM ln = cols[i] ->get_property ("left-neighbors"); - if (!is_pair (ln) && i ) + if (!ly_c_pair_p (ln) && i ) { cols[i]->set_property ("left-neighbors", scm_cons (cols[i-1]->self_scm (), SCM_EOL)); } SCM rn = cols[i] ->get_property ("right-neighbors"); - if (!is_pair (rn) && i < cols.size () - 1) + if (!ly_c_pair_p (rn) && i < cols.size () - 1) { cols[i]->set_property ("right-neighbors", scm_cons (cols[i + 1]->self_scm (), SCM_EOL)); } @@ -569,7 +569,7 @@ Spacing_spanner::musical_column_spacing (Grob *me, Item * lc, Item *rc, Real inc happens after the current note (this is set in the grob property SPACING-SEQUENCE. */ - for (SCM s = seq; is_pair (s); s = ly_cdr (s)) + for (SCM s = seq; ly_c_pair_p (s); s = ly_cdr (s)) { Grob * wish = unsmob_grob (ly_car (s)); @@ -733,7 +733,7 @@ Spacing_spanner::breakable_column_spacing (Grob*me, Item* l, Item *r,Moment shor if (dt == Moment (0,0)) { for (SCM s = l->get_property ("spacing-wishes"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Item * spacing_grob = dynamic_cast (unsmob_grob (ly_car (s))); diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index d2b8676744..2bd12b0b31 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -82,10 +82,10 @@ Span_arpeggio_engraver::stop_translation_timestep () for (int i=0; i < arpeggios_.size (); i ++) { for (SCM s = arpeggios_[i]->get_property ("stems"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("stems"), ly_car (s)); for (SCM s = arpeggios_[i]->get_property ("side-support-elements"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("side-support-elements"), ly_car (s)); /* diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 60ef61de0b..b54e4a74d5 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -53,7 +53,7 @@ Span_bar::print (SCM smobbed_me) /* compute common refpoint of elements */ Grob *refp = me; - for (SCM elts = first_elt; is_pair (elts); elts = ly_cdr (elts)) + for (SCM elts = first_elt; ly_c_pair_p (elts); elts = ly_cdr (elts)) { SCM smobbed_staff_bar = ly_car (elts); Grob *staff_bar = unsmob_grob (smobbed_staff_bar); @@ -65,7 +65,7 @@ Span_bar::print (SCM smobbed_me) /* glyph may not be a string, when ME is killed by Hara Kiri in between. */ - if (!is_string (glyph)) + if (!ly_c_string_p (glyph)) return SCM_EOL; String glyph_string = ly_scm2string (glyph); @@ -74,7 +74,7 @@ Span_bar::print (SCM smobbed_me) Stencil span_bar_mol; Interval prev_extent; - for (SCM elts = first_elt; is_pair (elts); elts = ly_cdr (elts)) + for (SCM elts = first_elt; ly_c_pair_p (elts); elts = ly_cdr (elts)) { SCM smobbed_staff_bar = ly_car (elts); Grob *staff_bar = unsmob_grob (smobbed_staff_bar); @@ -167,7 +167,7 @@ Span_bar::evaluate_empty (Grob*me) /* TODO: filter all hara-kiried out of ELEMENS list, and then optionally do suicide. Call this cleanage function from center_on_spanned_callback () as well. */ - if (!is_pair (me->get_property ("elements"))) + if (!ly_c_pair_p (me->get_property ("elements"))) { me->suicide (); } @@ -178,17 +178,17 @@ Span_bar::evaluate_glyph (Grob*me) { SCM gl = me->get_property ("glyph"); - if (is_string (gl)) + if (ly_c_string_p (gl)) return ; for (SCM s = me->get_property ("elements"); - !is_string (gl) && is_pair (s); s = ly_cdr (s)) + !ly_c_string_p (gl) && ly_c_pair_p (s); s = ly_cdr (s)) { gl = unsmob_grob (ly_car (s)) ->get_property ("glyph"); } - if (!is_string (gl)) + if (!ly_c_string_p (gl)) { me->suicide (); return; diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 5de18f26ed..5d20f881fe 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -130,7 +130,7 @@ Staff_performer::new_instrument_string () // mustn't ask Score for instrument: it will return piano! SCM minstr = get_property ("midiInstrument"); - if (!is_string (minstr) + if (!ly_c_string_p (minstr) || ly_scm2string (minstr) == instrument_string_) return ""; diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index ecd9625c8b..cd2827297d 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -101,7 +101,7 @@ Staff_spacing::bar_y_positions (Grob *bar_grob) { SCM glyph = bar_grob->get_property ("glyph"); - String glyph_string = is_string (glyph) ? ly_scm2string (glyph) : ""; + String glyph_string = ly_c_string_p (glyph) ? ly_scm2string (glyph) : ""; if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".") { SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm ()); @@ -128,13 +128,13 @@ Staff_spacing::next_notes_correction (Grob *me, Grob * last_grob) Real max_corr =0.0; for (SCM s = me->get_property ("right-items"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Grob * g = unsmob_grob (ly_car (s)); max_corr = max_corr >? next_note_correction (me, g, bar_size); for (SCM t = g->get_property ("elements"); - is_pair (t); t = ly_cdr (t)) + ly_c_pair_p (t); t = ly_cdr (t)) max_corr = max_corr >? next_note_correction (me, unsmob_grob (ly_car (t)), bar_size); } @@ -152,7 +152,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed) Item * me_item = dynamic_cast (me); for (SCM s = me->get_property ("left-items"); - is_pair (s); s = ly_cdr (s)) + ly_c_pair_p (s); s = ly_cdr (s)) { Grob * cand = unsmob_grob (ly_car (s)); if (cand && Separation_item::has_interface (cand)) @@ -197,12 +197,12 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed) if (me_item->break_status_dir () == CENTER) { SCM nndef = scm_sloppy_assq (ly_symbol2scm ("next-note"), alist); - if (is_pair (nndef)) + if (ly_c_pair_p (nndef)) space_def = nndef; } - if (!is_pair (space_def)) + if (!ly_c_pair_p (space_def)) { programming_error ("Unknown prefatory spacing. "); return; diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 96696bc7c1..b8443e75b5 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -45,7 +45,7 @@ Stanza_number_engraver::process_music () { SCM stanza = get_property ("stanza"); - if (is_string (stanza) && stanza != last_stanza_) + if (ly_c_string_p (stanza) && stanza != last_stanza_) { last_stanza_ = stanza; diff --git a/lily/stem.cc b/lily/stem.cc index 7a07ac749b..27711414dd 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -40,7 +40,7 @@ Stem::set_beaming (Grob*me, int beam_count, Direction d) { SCM pair = me->get_property ("beaming"); - if (!is_pair (pair)) + if (!ly_c_pair_p (pair)) { pair = scm_cons (SCM_EOL, SCM_EOL); me->set_property ("beaming", pair); @@ -189,7 +189,7 @@ Stem::extremal_heads (Grob*me) Drul_array exthead; exthead[LEFT] = exthead[RIGHT] =0; - for (SCM s = me->get_property ("note-heads"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("note-heads"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * n = unsmob_grob (ly_car (s)); @@ -222,7 +222,7 @@ Array Stem::note_head_positions (Grob *me) { Array ps ; - for (SCM s = me->get_property ("note-heads"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("note-heads"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * n = unsmob_grob (ly_car (s)); int p = Staff_symbol_referencer::get_rounded_position (n); @@ -296,7 +296,7 @@ Stem::get_default_stem_end_position (Grob*me) else { s = me->get_property ("lengths"); - if (is_pair (s)) + if (ly_c_pair_p (s)) { length = 2* ly_scm2double (robust_list_ref (durlog -2, s)); } @@ -317,7 +317,7 @@ Stem::get_default_stem_end_position (Grob*me) if (dir * head_positions (me)[dir] >= 0) { SCM sshorten = me->get_property ("stem-shorten"); - SCM scm_shorten = is_pair (sshorten) ? + SCM scm_shorten = ly_c_pair_p (sshorten) ? robust_list_ref ((duration_log (me) - 2) >? 0, sshorten): SCM_EOL; Real shorten = 2* robust_scm2double (scm_shorten,0); @@ -649,7 +649,7 @@ Stem::flag (Grob*me) } SCM stroke_style_scm = me->get_property ("stroke-style"); - if (is_string (stroke_style_scm)) + if (ly_c_string_p (stroke_style_scm)) { String stroke_style = ly_scm2string (stroke_style_scm); if (!stroke_style.is_empty ()) @@ -824,7 +824,7 @@ Stem::get_stem_info (Grob *me) { /* Return cached info if available */ SCM scm_info = me->get_property ("stem-info"); - if (!is_pair (scm_info)) + if (!ly_c_pair_p (scm_info)) { calc_stem_info (me); scm_info = me->get_property ("stem-info"); diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index 7085615b56..f57ba09a9e 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -42,7 +42,7 @@ Sustain_pedal::print (SCM smob) Stencil mol; SCM glyph = e->get_property ("text"); - if (!is_string (glyph)) + if (!ly_c_string_p (glyph)) return mol.smobbed_copy (); String text = ly_scm2string (glyph); diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 994302f225..b5988eac2a 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -48,11 +48,11 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf) /* UGH UGH */ - if (is_string (gl) && is_equal (gl, scm_makfrom0str ("brace")) - && is_string (my_gl) && is_equal (my_gl, scm_makfrom0str ("bracket"))) + if (ly_c_string_p (gl) && is_equal (gl, scm_makfrom0str ("brace")) + && ly_c_string_p (my_gl) && is_equal (my_gl, scm_makfrom0str ("bracket"))) inf.grob_->translate_axis (-0.8, X_AXIS); // ugh - else if (is_string (gl) && is_equal (gl, scm_makfrom0str ("bracket")) - && is_string (my_gl) && is_equal (my_gl, scm_makfrom0str ("bracket"))) + else if (ly_c_string_p (gl) && is_equal (gl, scm_makfrom0str ("bracket")) + && ly_c_string_p (my_gl) && is_equal (my_gl, scm_makfrom0str ("bracket"))) { inf.grob_->translate_axis ( -0.8, X_AXIS); // ugh inf.grob_->set_property ("arch-height", diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 9c59d8930e..93e218bc42 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -84,7 +84,7 @@ System_start_delimiter::after_line_breaking (SCM smob) */ SCM elts = me->get_property ("elements"); Grob *common = common_refpoint_of_list (elts, me, Y_AXIS); - for (SCM s = elts; is_pair (s); s = ly_cdr (s)) + for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s)) { Interval v = unsmob_grob (ly_car (s))->extent (common, Y_AXIS); @@ -109,7 +109,7 @@ System_start_delimiter::print (SCM smob) Grob * me = unsmob_grob (smob); SCM s = me->get_property ("glyph"); - if (!is_string (s)) + if (!ly_c_string_p (s)) return SCM_EOL; SCM gsym = scm_string_to_symbol (s) ; diff --git a/lily/system.cc b/lily/system.cc index 00a7caf69b..779987b6dc 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -41,7 +41,7 @@ int System::spanner_count () const { int k = 0; - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) if (dynamic_cast (unsmob_grob (ly_car (s)))) k++; return k; @@ -62,7 +62,7 @@ System::typeset_grob (Grob * elem) static void fixup_refpoints (SCM s) { - for (; is_pair (s); s = ly_cdr (s)) + for (; ly_c_pair_p (s); s = ly_cdr (s)) { Grob::fixup_refpoint (ly_car (s)); } @@ -71,7 +71,7 @@ fixup_refpoints (SCM s) SCM System::get_lines () { - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob *g = unsmob_grob (ly_car (s)); if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface"))) @@ -99,7 +99,7 @@ System::get_lines () { Grob *se = broken_intos_[i]; SCM all = se->get_property ("all-elements"); - for (SCM s = all; is_pair (s); s = ly_cdr (s)) + for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) fixup_refpoint (ly_car (s)); count += scm_ilength (all); } @@ -109,7 +109,7 @@ System::get_lines () */ fixup_refpoints (get_property ("all-elements")); - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) unsmob_grob (ly_car (s))->handle_broken_dependencies (); handle_broken_dependencies (); @@ -171,7 +171,7 @@ set_loose_columns (System* which, Column_x_positions const *posns) while (1) { SCM between = loose->get_property ("between-cols"); - if (!is_pair (between)) + if (!ly_c_pair_p (between)) break; Item *le = dynamic_cast (unsmob_grob (ly_car (between))); @@ -253,7 +253,7 @@ System::add_column (Paper_column*p) { Grob *me = this; SCM cs = me->get_property ("columns"); - Grob * prev = is_pair (cs) ? unsmob_grob (ly_car (cs)) : 0; + Grob * prev = ly_c_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0; p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0; @@ -265,26 +265,26 @@ System::add_column (Paper_column*p) void System::pre_processing () { - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) unsmob_grob (ly_car (s))->discretionary_processing (); if (verbose_global_b) progress_indication (_f ("Grob count %d", element_count ())); - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) unsmob_grob (ly_car (s))->handle_prebroken_dependencies (); fixup_refpoints (get_property ("all-elements")); - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob* sc = unsmob_grob (ly_car (s)); sc->calculate_dependencies (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback")); } progress_indication ("\n" + _ ("Calculating line breaks...") + " "); - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * e = unsmob_grob (ly_car (s)); SCM proc = e->get_property ("spacing-procedure"); @@ -296,7 +296,7 @@ System::pre_processing () void System::post_processing () { - for (SCM s = get_property ("all-elements"); is_pair (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob *g = unsmob_grob (ly_car (s)); g->calculate_dependencies (POSTCALCED, POSTCALCING, @@ -316,7 +316,7 @@ System::post_processing () all = ly_list_qsort_uniq_x (all); this->get_stencil (); - for (SCM s = all; is_pair (s); s = ly_cdr (s)) + for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) { Grob *g = unsmob_grob (ly_car (s)); g->get_stencil (); @@ -339,7 +339,7 @@ System::get_line () Real penalty = 0; for (int i = LAYER_COUNT; i--;) - for (SCM s = all; is_pair (s); s = ly_cdr (s)) + for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) { Grob *g = unsmob_grob (ly_car (s)); Stencil *stil = g->get_stencil (); @@ -393,13 +393,13 @@ System::broken_col_range (Item const*l, Item const*r) const r = r->get_column (); SCM s = get_property ("columns"); - while (is_pair (s) && ly_car (s) != r->self_scm ()) + while (ly_c_pair_p (s) && ly_car (s) != r->self_scm ()) s = ly_cdr (s); - if (is_pair (s)) + if (ly_c_pair_p (s)) s = ly_cdr (s); - while (is_pair (s) && ly_car (s) != l->self_scm ()) + while (ly_c_pair_p (s) && ly_car (s) != l->self_scm ()) { Paper_column*c = dynamic_cast (unsmob_grob (ly_car (s))); if (Item::is_breakable (c) && !c->system_) diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 61bae836a4..af564200bd 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -81,7 +81,7 @@ Tab_note_heads_engraver::process_music () Music * tabstring_event=0; for (SCM s =event->get_property ("articulations"); - !tabstring_event && is_pair (s); s = ly_cdr (s)) + !tabstring_event && ly_c_pair_p (s); s = ly_cdr (s)) { Music * art = unsmob_music (ly_car (s)); diff --git a/lily/text-item.cc b/lily/text-item.cc index 8964c525e1..591b1f6ec1 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -23,7 +23,7 @@ Text_item::interpret_string (SCM paper, SCM props, SCM encoding, SCM markup) Paper_def *pap = unsmob_paper (paper); SCM_ASSERT_TYPE(pap, paper, SCM_ARG1, __FUNCTION__, "Paper definition"); - SCM_ASSERT_TYPE(is_string (markup), markup, SCM_ARG3, __FUNCTION__, "string"); + SCM_ASSERT_TYPE(ly_c_string_p (markup), markup, SCM_ARG3, __FUNCTION__, "string"); SCM_ASSERT_TYPE(encoding == SCM_EOL || is_symbol (encoding), encoding, SCM_ARG2, __FUNCTION__, "symbol"); @@ -54,9 +54,9 @@ MAKE_SCHEME_CALLBACK (Text_item, interpret_markup, 3) SCM Text_item::interpret_markup (SCM paper, SCM props, SCM markup) { - if (is_string (markup)) + if (ly_c_string_p (markup)) return interpret_string (paper, props, SCM_EOL, markup); - else if (is_pair (markup)) + else if (ly_c_pair_p (markup)) { SCM func = ly_car (markup); SCM args = ly_cdr (markup); @@ -87,8 +87,8 @@ bool Text_item::markup_p (SCM x) { return - is_string (x) || - (is_pair (x) + ly_c_string_p (x) || + (ly_c_pair_p (x) && SCM_BOOL_F != scm_object_property (ly_car (x), ly_symbol2scm ("markup-signature"))); } diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index cd41ce6f37..6f07666a68 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -80,7 +80,7 @@ Text_spanner::print (SCM smob) SCM properties = Font_interface::text_font_alist_chain (me); SCM edge_text = me->get_property ("edge-text"); Drul_array edge; - if (is_pair (edge_text)) + if (ly_c_pair_p (edge_text)) { Direction d = LEFT; do diff --git a/lily/tie.cc b/lily/tie.cc index 0fc35b6705..0ac50e5e85 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -59,7 +59,7 @@ Tie::head (Grob*me, Direction d) { SCM c = me->get_property ("head-pair"); - if (is_pair (c)) + if (ly_c_pair_p (c)) return unsmob_grob (index_get_cell (c, d)); else return 0; @@ -326,13 +326,13 @@ Tie::print (SCM smob) Grob*me = unsmob_grob (smob); SCM cp = me->get_property ("control-points"); - if (!is_pair (cp)) // list is more accurate + if (!ly_c_pair_p (cp)) // list is more accurate { cp = get_control_points (smob); me->set_property ("control-points", cp); } - if (!is_pair (cp)) + if (!ly_c_pair_p (cp)) return Stencil ().smobbed_copy (); Real thick diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index be062c5fda..c29863f989 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -44,7 +44,7 @@ Time_signature_engraver::process_music () SCM fr= get_property ("timeSignatureFraction"); if (!time_signature_ && last_time_fraction_ != fr - && is_pair (fr)) + && ly_c_pair_p (fr)) { int den = ly_scm2int (ly_cdr (fr)); if (den != (1 << intlog2 (den))) diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 46e42cb8b5..f13e6008a2 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -44,7 +44,7 @@ void Time_signature_performer::create_audio_elements () { SCM fr = get_property ("timeSignatureFraction"); - if (is_pair (fr) && !is_equal (fr, prev_fraction_)) + if (ly_c_pair_p (fr) && !is_equal (fr, prev_fraction_)) { prev_fraction_ = fr; int b = ly_scm2int (ly_car (fr)); diff --git a/lily/time-signature.cc b/lily/time-signature.cc index f6d2cd81c5..f249bfc1c4 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -34,7 +34,7 @@ Time_signature::print (SCM smob) SCM frac = me->get_property ("fraction"); int n = 4; int d = 4; - if (is_pair (frac)) + if (ly_c_pair_p (frac)) { n = ly_scm2int (ly_car (frac)); d = ly_scm2int (ly_cdr (frac)); diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc index 1d6302f041..5740034be7 100644 --- a/lily/timing-engraver.cc +++ b/lily/timing-engraver.cc @@ -45,7 +45,7 @@ Timing_engraver::initialize () Moment now = now_mom (); /* Set the first bar of the score? */ - if (!is_string (which)) + if (!ly_c_string_p (which)) which = (now.main_part_ || now.main_part_ == last_moment_.main_part_) ? SCM_EOL : scm_makfrom0str ("|"); @@ -63,7 +63,7 @@ Timing_engraver::start_translation_timestep () SCM which = get_property ("whichBar"); /* Set the first bar of the score? */ - if (!is_string (which)) + if (!ly_c_string_p (which)) which = SCM_EOL; Moment mp = measure_position (); @@ -77,7 +77,7 @@ Timing_engraver::start_translation_timestep () ->set_property ("measure-length", mlen.smobbed_copy ()); } - if (!is_string (which) && to_boolean (automatic_bars)) + if (!ly_c_string_p (which) && to_boolean (automatic_bars)) { SCM always = get_property ("barAlways"); diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 557d986f90..5998b4f234 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -22,7 +22,7 @@ LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0, (), { SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL; - for (SCM s =l; is_pair (s); s = ly_cdr (s)) + for (SCM s =l; ly_c_pair_p (s); s = ly_cdr (s)) { scm_set_car_x (s, ly_cdar (s)); } diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 85c473db18..f4126189c7 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -29,7 +29,7 @@ Translator_group::get_daddy_translator () const void translator_each (SCM list, Translator_method method) { - for (SCM p = list; is_pair (p); p = ly_cdr (p)) + for (SCM p = list; ly_c_pair_p (p); p = ly_cdr (p)) (unsmob_translator (ly_car (p))->*method) (); } @@ -48,7 +48,7 @@ translator_accepts_any_of (Translator*tr, SCM ifaces) SCM ack_ifs = scm_assoc (ly_symbol2scm ("events-accepted"), tr->translator_description ()); ack_ifs = ly_cdr (ack_ifs); - for (SCM s = ifaces; is_pair (s); s = ly_cdr (s)) + for (SCM s = ifaces; ly_c_pair_p (s); s = ly_cdr (s)) if (scm_c_memq (ly_car (s), ack_ifs) != SCM_BOOL_F) return true; return false; @@ -58,7 +58,7 @@ SCM find_accept_translators (SCM gravlist, SCM ifaces) { SCM l = SCM_EOL; - for (SCM s = gravlist; is_pair (s); s = ly_cdr (s)) + for (SCM s = gravlist; ly_c_pair_p (s); s = ly_cdr (s)) { Translator* tr = unsmob_translator (ly_car (s)); if (translator_accepts_any_of (tr, ifaces)) @@ -76,7 +76,7 @@ Translator_group::try_music (Music* m) SCM name = scm_sloppy_assq (ly_symbol2scm ("name"), m->get_property_alist (false)); - if (!is_pair (name)) + if (!ly_c_pair_p (name)) return false; name = ly_cdr (name); @@ -88,7 +88,7 @@ Translator_group::try_music (Music* m) scm_hashq_set_x (tab, name, accept_list); } - for (SCM p = accept_list; is_pair (p); p = ly_cdr (p)) + for (SCM p = accept_list; ly_c_pair_p (p); p = ly_cdr (p)) { Translator * t = unsmob_translator (ly_car (p)); if (t && t->try_music (m)) @@ -122,7 +122,7 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir) (tg->*ptr) (); } - for (SCM s = c->children_contexts () ; is_pair (s); + for (SCM s = c->children_contexts () ; ly_c_pair_p (s); s =ly_cdr (s)) { recurse_over_translators (unsmob_context (ly_car (s)), ptr, dir); diff --git a/lily/translator-property.cc b/lily/translator-property.cc index ece48c1bc5..28c3753cee 100644 --- a/lily/translator-property.cc +++ b/lily/translator-property.cc @@ -54,7 +54,7 @@ execute_pushpop_property (Context * trg, else prev = trg->internal_get_property (prop); - if (!is_pair (prev)) + if (!ly_c_pair_p (prev)) { programming_error ("Grob definition should be cons."); return ; @@ -62,7 +62,7 @@ execute_pushpop_property (Context * trg, SCM prev_alist = ly_car (prev); - if (is_pair (prev_alist) || prev_alist == SCM_EOL) + if (ly_c_pair_p (prev_alist) || prev_alist == SCM_EOL) { bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?")); @@ -124,7 +124,7 @@ void apply_property_operations (Context *tg, SCM pre_init_ops) { SCM correct_order = scm_reverse (pre_init_ops); - for (SCM s = correct_order; is_pair (s); s = ly_cdr (s)) + for (SCM s = correct_order; ly_c_pair_p (s); s = ly_cdr (s)) { SCM entry = ly_car (s); SCM type = ly_car (entry); @@ -133,7 +133,7 @@ apply_property_operations (Context *tg, SCM pre_init_ops) if (type == ly_symbol2scm ("push") || type == ly_symbol2scm ("poppush")) { SCM val = ly_cddr (entry); - val = is_pair (val) ? ly_car (val) : SCM_UNDEFINED; + val = ly_c_pair_p (val) ? ly_car (val) : SCM_UNDEFINED; execute_pushpop_property (tg, ly_car (entry), ly_cadr (entry), val); } @@ -164,7 +164,7 @@ updated_grob_properties (Context * tg, SCM sym) SCM props = tg->internal_get_property (sym); - if (!is_pair (props)) + if (!ly_c_pair_p (props)) { programming_error ("grob props not a pair?"); return SCM_EOL; diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 863071cf9c..3bdfe4bf6f 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -170,7 +170,7 @@ Tuplet_bracket::print (SCM smob) Paper_def *pap = me->get_paper (); Stencil num; - if (is_string (number) && number_visibility) + if (ly_c_string_p (number) && number_visibility) { SCM properties = Font_interface::text_font_alist_chain (me); SCM snum = Text_item::interpret_markup (pap->self_scm (), properties, number); @@ -515,7 +515,7 @@ Direction Tuplet_bracket::get_default_dir (Grob*me) { Drul_array dirs (0,0); - for (SCM s = me->get_property ("note-columns"); is_pair (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("note-columns"); ly_c_pair_p (s); s = ly_cdr (s)) { Grob * nc = unsmob_grob (ly_car (s)); Direction d = Note_column::dir (nc); diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index d4636778c9..0dd91b2352 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -109,7 +109,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what) Context * where = get_outlet ()->where_defined (reps); if (where - && current_reps == SCM_EOL || is_pair (current_reps)) + && current_reps == SCM_EOL || ly_c_pair_p (current_reps)) { current_reps = scm_cons (what, current_reps); where->internal_set_property (reps, current_reps); diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc index f4305a1cb9..f25e6a9c16 100644 --- a/lily/virtual-font-metric.cc +++ b/lily/virtual-font-metric.cc @@ -26,7 +26,7 @@ Virtual_font_metric::Virtual_font_metric (SCM font_list) SCM name_list = SCM_EOL; SCM *name_tail = &name_list; - for (SCM s = font_list; is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list; ly_c_pair_p (s); s = ly_cdr (s)) { if (Font_metric *fm = unsmob_metrics (ly_car (s))) { @@ -61,7 +61,7 @@ int Virtual_font_metric::count () const { int k = 0; - for (SCM s = font_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s)) k += unsmob_metrics (ly_car (s))->count (); return k; } @@ -70,7 +70,7 @@ Stencil Virtual_font_metric::find_by_name (String glyph) const { Stencil m; - for (SCM s = font_list_; m.is_empty () && is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list_; m.is_empty () && ly_c_pair_p (s); s = ly_cdr (s)) { m = unsmob_metrics (ly_car (s))->find_by_name (glyph); } @@ -96,7 +96,7 @@ Offset Virtual_font_metric::get_indexed_wxwy (int code) const { int total = 0; - for (SCM s = font_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s)) { Font_metric *fm = unsmob_metrics (ly_car (s)); if (code < total + fm->count ()) @@ -110,7 +110,7 @@ Box Virtual_font_metric::get_indexed_char (int code) const { int total = 0; - for (SCM s = font_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s)) { Font_metric *fm = unsmob_metrics (ly_car (s)); if (code < total + fm->count ()) @@ -125,7 +125,7 @@ Virtual_font_metric::name_to_index (String glyph) const { Stencil m; int total = 0; - for (SCM s = font_list_; m.is_empty () && is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list_; m.is_empty () && ly_c_pair_p (s); s = ly_cdr (s)) { Font_metric *m =unsmob_metrics (ly_car (s)); int k = m->name_to_index (glyph); @@ -143,7 +143,7 @@ Virtual_font_metric::get_indexed_char_stencil (int code) const Stencil m ; int total = 0; - for (SCM s = font_list_; is_pair (s); s = ly_cdr (s)) + for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s)) { Font_metric *fm = unsmob_metrics (ly_car (s)); if (code < total + fm->count ()) diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index 359cf5b6eb..1309e98837 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -56,7 +56,7 @@ Volta_bracket_interface::print (SCM smob) SCM glyph = endbar->get_property ("glyph"); String str; - if (is_string (glyph)) + if (ly_c_string_p (glyph)) str = ly_scm2string (glyph); else return SCM_EOL; diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 7a9cbe25f4..fd313e4762 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -82,7 +82,7 @@ Volta_engraver::staff_eligible () volta engraver in score context or somesuch. */ - if (!is_pair (staffs)) + if (!ly_c_pair_p (staffs)) { programming_error ("Huh? Volta engraver can't find staffs?"); return false; @@ -106,13 +106,13 @@ Volta_engraver::process_music () bool end = false; start_string_ = SCM_EOL; - while (is_pair (cs)) + while (ly_c_pair_p (cs)) { SCM c = ly_car (cs); - if (is_pair (c) + if (ly_c_pair_p (c) && ly_car (c) == ly_symbol2scm ("volta") - && is_pair (ly_cdr (c))) + && ly_c_pair_p (ly_cdr (c))) { if (ly_cadr (c) == SCM_BOOL_F) end = true; @@ -146,7 +146,7 @@ Volta_engraver::process_music () } if (volta_span_ && - (is_string (start_string_) || is_pair (start_string_))) + (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_))) { warning (_ ("Already have a volta spanner. Stopping that one prematurely.")); @@ -161,7 +161,7 @@ Volta_engraver::process_music () } if (!volta_span_ && - (is_string (start_string_) || is_pair (start_string_))) + (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_))) { started_mom_ = now_mom () ; -- 2.39.5