From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 12 Apr 2004 14:28:49 +0000 (+0000)
Subject: * lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.
X-Git-Tag: release/2.3.1~93
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e7020dbb36a9e9c10bda48e5197213e8a3bacef6;p=lilypond.git

* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

* lily/lexer.ll: change is_string -> ly_c_string_p
---

diff --git a/ChangeLog b/ChangeLog
index fa650d9890..dca84c09bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.
+
 	* lily/lexer.ll: change is_string -> ly_c_string_p 
 
 	* input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): use \book.
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 0258e9d889..ef374b5014 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -163,7 +163,7 @@ number_accidentals (bool *different,
   int number = 0;
 
   *different = false;
-  if (ly_c_pair_p (accidentals) && !is_symbol (ly_car (accidentals)))
+  if (ly_c_pair_p (accidentals) && !ly_c_symbol_p (ly_car (accidentals)))
     warning (_f ("Accidental typesetting list must begin with context-name: %s", 
 		 ly_scm2string (ly_car (accidentals)).to_str0 ()));
   
@@ -178,9 +178,9 @@ number_accidentals (bool *different,
 	  SCM localsig = origin->get_property ("localKeySignature");
 	  
 	  bool same_octave_b = 
-	    is_eq (ly_symbol2scm ("same-octave"), type);
+	    ly_c_eq_p (ly_symbol2scm ("same-octave"), type);
 	  bool any_octave_b = 
-	    is_eq (ly_symbol2scm ("any-octave"), type);
+	    ly_c_eq_p (ly_symbol2scm ("any-octave"), type);
 
 	  if (same_octave_b || any_octave_b)
 	    {
@@ -199,7 +199,7 @@ number_accidentals (bool *different,
       /*
 	if symbol then it is a context name. Scan parent contexts to find it.
       */
-      else if (is_symbol (rule))
+      else if (ly_c_symbol_p (rule))
 	{
 	  Context * dad = origin;
 	  while (dad && !dad->is_alias (rule))
@@ -441,7 +441,7 @@ Accidental_engraver::acknowledge_grob (Grob_info info)
       && Rhythmic_head::has_interface (info.grob_))
     {
       if (to_boolean ( get_property ("harmonicAccidentals"))
-	  || !is_equal (info.grob_->get_property ("style"),
+	  || !ly_c_equal_p (info.grob_->get_property ("style"),
 			  ly_symbol2scm ("harmonic")))
 	{
 	  
diff --git a/lily/accidental.cc b/lily/accidental.cc
index 1464f922c0..755ce60e10 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -60,13 +60,13 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
   if (to_boolean (a->get_property ("cautionary")))
     {
       SCM cstyle = a->get_property ("cautionary-style");
-      parens = is_equal (cstyle, ly_symbol2scm ("parentheses"));
+      parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
 
     }
 
   SCM accs = a->get_property ("accidentals");
   SCM scm_style = a->get_property ("style");
-  if (!is_symbol (scm_style)
+  if (!ly_c_symbol_p (scm_style)
       && !parens
       && scm_ilength (accs) == 1)
     {
@@ -175,13 +175,13 @@ Accidental_interface::print (SCM smob)
   if (caut)
     {
       SCM cstyle = me->get_property ("cautionary-style");
-      parens = is_equal (cstyle, ly_symbol2scm ("parentheses"));
-      smaller = is_equal (cstyle, ly_symbol2scm ("smaller"));
+      parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+      smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller"));
     }
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (is_symbol (scm_style))
+  if (ly_c_symbol_p (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index b68b0721a3..30c1a9f281 100644
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -149,7 +149,7 @@ Ambitus::print (SCM smob)
 
   SCM scm_note_head_style = me->get_property ("note-head-style");
   String note_head_style;
-  if (is_symbol (scm_note_head_style))
+  if (ly_c_symbol_p (scm_note_head_style))
     {
       String note_head_style =
 	ly_symbol2string (scm_note_head_style);
@@ -244,7 +244,7 @@ Ambitus::print (SCM smob)
   SCM key_signature = me->get_property ("key-signature");
   SCM scm_accidentals_style = me->get_property ("accidentals-style");
   String accidentals_style;
-  if (is_symbol (scm_accidentals_style))
+  if (ly_c_symbol_p (scm_accidentals_style))
     {
       accidentals_style =
 	ly_symbol2string (scm_accidentals_style);
diff --git a/lily/balloon.cc b/lily/balloon.cc
index 6d1b0b0778..2530038c99 100644
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -29,7 +29,7 @@ Balloon_interface::print (SCM smob)
   SCM cb = me->get_property ("balloon-original-callback");
   SCM scm_mol  =  SCM_EOL;
 
-  if (is_procedure (cb))
+  if (ly_c_procedure_p (cb))
     {
       scm_mol = scm_call_1 (cb, smob);
     }
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 58d26c29af..6f51478f33 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 (ly_c_string_p (s) && is_procedure (barsiz_proc))
+  if (ly_c_string_p (s) && ly_c_procedure_p (barsiz_proc))
     {
       String str  =ly_scm2string (s);
       SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
@@ -170,7 +170,7 @@ Bar_line::before_line_breaking (SCM smob)
       // leave y_extent for spanbar? 
     }
 
-  if (! is_equal (g, orig))
+  if (! ly_c_equal_p (g, orig))
     me->set_property ("glyph", g);
 
   return SCM_UNSPECIFIED;
diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index a2be6ba670..931ca71890 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -54,7 +54,7 @@ Bar_number_engraver::process_music ()
 	{
 	  SCM bn = get_property ("currentBarNumber");
 	  SCM proc = get_property ("barNumberVisibility");
-	  if (is_number (bn) && is_procedure (proc)
+	  if (is_number (bn) && ly_c_procedure_p (proc)
 	      && to_boolean (scm_call_1(proc, bn)))
 	    {
 	      create_items ();
diff --git a/lily/beam.cc b/lily/beam.cc
index 53accaaf16..6909c464fb 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -79,7 +79,7 @@ Beam::get_beam_translation (Grob *me)
 {
   SCM func = me->get_property ("space-function");
 
-  if (is_procedure (func))
+  if (ly_c_procedure_p (func))
     {
       SCM s = scm_call_2 (func, me->self_scm (), scm_int2num (get_beam_count (me)));
       return ly_scm2double (s);
@@ -1525,7 +1525,7 @@ bool
 Beam::is_knee (Grob* me)
 {
   SCM k = me->get_property ("knee");
-  if (is_boolean (k))
+  if (ly_c_boolean_p (k))
     return ly_scm2bool (k);
 
   bool knee = false;
diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 8af78e6081..e462297fc8 100644
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -92,7 +92,7 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 	return ;
 
       SCM align_name = item->get_property ("break-align-symbol");
-      if (!is_symbol (align_name))
+      if (!ly_c_symbol_p (align_name))
 	return ;
 
       if (!align_)
diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index a7b0e718c1..b8c5c739ab 100644
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -76,7 +76,7 @@ Break_align_interface::ordered_elements (Grob *grob)
   Item *me  = dynamic_cast<Item*> (grob);
   SCM elts = me->get_property ("elements");
   SCM order_vec = me->get_property ("break-align-orders");
-  if (!is_vector (order_vec)
+  if (!ly_c_vector_p (order_vec)
       || ly_vector_length (order_vec) < 3)
     return  Pointer_group_interface__extract_grobs (me, (Grob*)0,
 						    "elements");
@@ -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) && ly_c_pair_p (s); s = ly_cdr (s))
+	   !ly_c_symbol_p (rsym) && ly_c_pair_p (s); s = ly_cdr (s))
 	{
 	  Grob * elt =unsmob_grob (ly_car (s));
 
@@ -197,14 +197,14 @@ Break_align_interface::do_alignment (Grob *grob)
 	edge_idx = next_idx;
 
       SCM entry = SCM_EOL;
-      if (is_symbol (rsym))
+      if (ly_c_symbol_p (rsym))
 	entry = scm_assq (rsym, alist);
 
       bool entry_found = ly_c_pair_p (entry);
       if (!entry_found)
 	{
 	  String sym_string;
-	  if (is_symbol (rsym))
+	  if (ly_c_symbol_p (rsym))
 	    sym_string = ly_symbol2string (rsym);
 
 	  String orig_string ;
diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 1c749d1bef..f7dee18a75 100644
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -91,7 +91,7 @@ do_break_substitution (SCM src)
  
   if (unsmob_grob (src))
     return substitute_grob (unsmob_grob (src));
-  else if (is_vector (src))
+  else if (ly_c_vector_p (src))
     {
       int len = SCM_VECTOR_LENGTH (src);
       SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 05f0dd75b5..c8ba1d2beb 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -114,7 +114,7 @@ Chord_name_engraver::process_music ()
   announce_grob (chord_name_, notes_[0]->self_scm ());
   SCM s = get_property ("chordChanges");
   if (to_boolean (s) && ly_c_pair_p (last_chord_) 
-      && is_equal (chord_as_scm, last_chord_))
+      && ly_c_equal_p (chord_as_scm, last_chord_))
     chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
   last_chord_ = chord_as_scm;
diff --git a/lily/cluster.cc b/lily/cluster.cc
index 6dfea67e99..86b062b809 100644
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -41,7 +41,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
   SCM shape_scm = me->get_property ("style");
   String shape;
 
-  if (is_symbol (shape_scm))
+  if (ly_c_symbol_p (shape_scm))
     {
       shape = ly_symbol2string (shape_scm);
     }
diff --git a/lily/context-def.cc b/lily/context-def.cc
index e782acbfda..e4719129cc 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -177,7 +177,7 @@ Context_def::get_accepted (SCM user_mod) const
 Link_array<Context_def>
 Context_def::path_to_acceptable_context (SCM type_sym, Music_output_def* odef) const
 {
-  assert (is_symbol (type_sym));
+  assert (ly_c_symbol_p (type_sym));
   
   SCM accepted = get_accepted (SCM_EOL);
 
@@ -196,7 +196,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Music_output_def* odef) c
       /*
 	don't check aliases, because \context Staff should not create RhythmicStaff.
       */
-      if (is_equal (accepteds[i]->get_context_name (), type_sym))
+      if (ly_c_equal_p (accepteds[i]->get_context_name (), type_sym))
 	{
 	  best_result.push (accepteds[i]);
 	  return best_result;
@@ -382,7 +382,7 @@ Context_def::to_alist () const
   l = scm_cons (scm_cons (ly_symbol2scm ("property-ops"),  property_ops_), l);
   l = scm_cons (scm_cons (ly_symbol2scm ("context-name"),  context_name_), l);
 
-  if (is_symbol (translator_group_type_))
+  if (ly_c_symbol_p (translator_group_type_))
     l = scm_cons (scm_cons (ly_symbol2scm ("group-type"),  translator_group_type_), l);    
 
   return l;  
diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc
index 5cbce02ddd..6457482b20 100644
--- a/lily/context-scheme.cc
+++ b/lily/context-scheme.cc
@@ -42,8 +42,8 @@ LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-property",
 {
   Context *tg = unsmob_context (context);
   SCM_ASSERT_TYPE (tg, context, SCM_ARG1, __FUNCTION__, "context");
-  SCM_ASSERT_TYPE (is_symbol (grob), grob, SCM_ARG2, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (is_symbol (eltprop), eltprop, SCM_ARG3, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (grob), grob, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (eltprop), eltprop, SCM_ARG3, __FUNCTION__, "symbol");
 
   execute_pushpop_property (tg, grob, eltprop, val);
 
@@ -57,7 +57,7 @@ LY_DEFINE (ly_context_property, "ly:context-property",
   Context *t = unsmob_context (c);
   Context * tr= (t);
   SCM_ASSERT_TYPE (tr, c, SCM_ARG1, __FUNCTION__, "Translator group");
-  SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
 
   return tr->internal_get_property (name);
 }
@@ -69,7 +69,7 @@ LY_DEFINE (ly_context_set_property, "ly:context-set-property!",
 {
   Context *tr = unsmob_context (context);
   SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
-  SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
 
   tr->internal_set_property (name, val);
 
@@ -83,7 +83,7 @@ LY_DEFINE (ly_context_property_where_defined, "ly:context-property-where-defined
 {
   Context *tr = unsmob_context (context);
   SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
-  SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
 
   tr = tr->where_defined (name);
   if (tr)
@@ -98,7 +98,7 @@ LY_DEFINE (ly_unset_context_property, "ly:context-unset-property", 2, 0, 0,
 {
   Context *tr = unsmob_context (context);
   SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
-  SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
 
   tr->unset_property (name);
   return SCM_UNSPECIFIED;
@@ -126,7 +126,7 @@ LY_DEFINE (ly_context_find, "ly:context-find",
 {
   Context *tr = unsmob_context (context);
   SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "context");
-  SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
   
   while (tr)
     {
diff --git a/lily/context.cc b/lily/context.cc
index c50193cc2d..fc7a17ff1f 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -184,7 +184,7 @@ Context::default_child_context_name () const
 bool
 Context::is_bottom_context () const
 {
-  return !is_symbol (default_child_context_name ());
+  return !ly_c_symbol_p (default_child_context_name ());
 }
 
 Context*
diff --git a/lily/custos.cc b/lily/custos.cc
index 1a4dcbb2d6..45f83c64dc 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -34,7 +34,7 @@ Custos::print (SCM smob)
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (is_symbol (scm_style))
+  if (ly_c_symbol_p (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index fd415cea7e..eb48fb48a2 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -98,7 +98,7 @@ Drum_notes_engraver::process_music ()
 	  
 	  if (scm_integer_p (pos) == SCM_BOOL_T)
 	    note->set_property ("staff-position", pos);
-	  if (is_symbol (style))
+	  if (ly_c_symbol_p (style))
 	    note->set_property ("style", style);
 
 	  if (ly_c_string_p (script))
diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 5e5b01d4f4..03ff0bf48d 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -39,7 +39,7 @@ Drum_note_performer::create_audio_elements ()
       SCM sym = n->get_property ("drum-type");
       SCM defn = SCM_EOL;
 
-      if (is_symbol (sym)
+      if (ly_c_symbol_p (sym)
 	  &&  (scm_hash_table_p (tab) == SCM_BOOL_T))
 	defn = scm_hashq_ref (tab, sym, SCM_EOL);
       
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index f84551d887..c58de021c1 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -220,7 +220,7 @@ Dynamic_engraver::process_music ()
 	    start_type = "crescendo";
 	  
 	  SCM s = get_property ((start_type + "Spanner").to_str0 ());
-	  if (!is_symbol (s) || s == ly_symbol2scm ("hairpin"))
+	  if (!ly_c_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
 	    {
 	      cresc_  = make_spanner ("Hairpin");
 	      cresc_->set_property ("grow-direction",
diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 1b3aa246ee..53e8a5e0d4 100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -46,7 +46,7 @@ Dynamic_performer::create_audio_elements ()
       SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
 
       SCM svolume  = SCM_EOL;
-      if (is_procedure (proc))
+      if (ly_c_procedure_p (proc))
 	{
 	  // urg
 	  svolume = scm_call_1 (proc, script_req_->get_property ("text"));
@@ -83,7 +83,7 @@ Dynamic_performer::create_audio_elements ()
 	  
 	  
 	  SCM eq = get_property ("instrumentEqualizer");
-	  if (is_procedure (eq))
+	  if (ly_c_procedure_p (eq))
 	    {
 	      s = scm_call_1 (eq, s);
 	    }
diff --git a/lily/event.cc b/lily/event.cc
index 7a1b9c6a7b..c52a0701af 100644
--- a/lily/event.cc
+++ b/lily/event.cc
@@ -195,7 +195,7 @@ alist_equal_p (SCM a, SCM b)
       SCM l = scm_assoc (key, b);
 
       if (l == SCM_BOOL_F
-	  || !is_equal ( ly_cdr (l), val))
+	  || !ly_c_equal_p ( ly_cdr (l), val))
 
 	return false;
     }
diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 23eeac3220..bed934002a 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -75,7 +75,7 @@ Figured_bass_engraver::process_music ()
   else if (figures_.size ())
     {
       SCM proc = get_property ("bassFigureFormatFunction");
-      if (is_procedure (proc)) 
+      if (ly_c_procedure_p (proc)) 
 	{
 	  SCM l = SCM_EOL;
 	  SCM * t = &l;
diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 6454c39989..dc05bb3088 100644
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -23,7 +23,7 @@ void ly_add_function_documentation (SCM func,
   if (!strlen (doc))
     return ; 
     
-  if (!is_vector (doc_hash_table ))
+  if (!ly_c_vector_p (doc_hash_table ))
     doc_hash_table = scm_make_vector (scm_int2num (59), SCM_EOL);
 
   String s = String (" - ") + "LilyPond procedure: " + fname + " " + varlist
diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 6043ac40e9..5a7e7d0f8d 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -29,10 +29,10 @@ void add_interface (const char * symbol,
 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 (ly_c_symbol_p (a), a, SCM_ARG1, __FUNCTION__, "symbol");
   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))
+  SCM_ASSERT_TYPE (ly_c_list_p (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
+  if (!ly_c_vector_p (all_ifaces))
     all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL);
 
   SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);
diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index 39590e6f65..80d468abe6 100644
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -21,7 +21,7 @@ LY_DEFINE (ly_grob_set_property,"ly:grob-set-property!", 3, 0, 0,
 {
   Grob * sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   if (!type_check_assignment (sym, val, ly_symbol2scm ("backend-type?")))
     error ("typecheck failed");
@@ -40,7 +40,7 @@ LY_DEFINE (ly_get_property, "ly:grob-property",
 {
   Grob *sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   return sc->internal_get_property (sym);
 }
diff --git a/lily/grob.cc b/lily/grob.cc
index 072f77a00a..6e3833f5fd 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -112,8 +112,8 @@ Grob::Grob (SCM basicprops)
       if (is_number_pair (xt))
 	cb = xt;
       else if (cb != SCM_BOOL_F
-	  && !is_procedure (cb) && !ly_c_pair_p (cb)
-	  && is_procedure (get_property ("print-function")))
+	  && !ly_c_procedure_p (cb) && !ly_c_pair_p (cb)
+	  && ly_c_procedure_p (get_property ("print-function")))
 	cb = stencil_extent_proc;
     
       dim_cache_[a].dimension_ = cb;
@@ -195,7 +195,7 @@ Grob::calculate_dependencies (int final, int busy, SCM funcname)
 
   
   SCM proc = internal_get_property (funcname);
-  if (is_procedure (proc))
+  if (ly_c_procedure_p (proc))
     scm_call_1 (proc, this->self_scm ());
  
   status_= final;
@@ -230,7 +230,7 @@ Grob::get_uncached_stencil ()const
   SCM proc = get_property ("print-function");
 
   SCM  mol = SCM_EOL;
-  if (is_procedure (proc)) 
+  if (ly_c_procedure_p (proc)) 
     mol = scm_apply_0 (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED));
   
   Stencil *m = unsmob_stencil (mol);
@@ -476,7 +476,7 @@ bool
 Grob::is_empty (Axis a)const
 {
   return ! (ly_c_pair_p (dim_cache_[a].dimension_) ||
-	    is_procedure (dim_cache_[a].dimension_));
+	    ly_c_procedure_p (dim_cache_[a].dimension_));
 }
 
 Interval
@@ -489,7 +489,7 @@ Grob::extent (Grob * refp, Axis a) const
   Interval ext ;   
   if (ly_c_pair_p (d->dimension_))
     ;
-  else if (is_procedure (d->dimension_))
+  else if (ly_c_procedure_p (d->dimension_))
     {
       /*
 	FIXME: add doco on types, and should typecheck maybe? 
@@ -593,7 +593,7 @@ Grob::name () const
   SCM meta = get_property ("meta");
   SCM nm = scm_assoc (ly_symbol2scm ("name"), meta);
   nm = (ly_c_pair_p (nm)) ? ly_cdr (nm) : SCM_EOL;
-  return  is_symbol (nm) ? ly_symbol2string (nm) :  classname (this);  
+  return  ly_c_symbol_p (nm) ? ly_symbol2string (nm) :  classname (this);  
 }
 
 void
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index c2fd7033c6..f9b1b2072c 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -191,16 +191,16 @@ 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 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 ly_c_symbol_pi (SCM x) { return SCM_SYMBOLP (x); }
+inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); }
+inline bool ly_c_char_p (SCM x) { return SCM_CHARP (x); }
 inline bool is_number (SCM x) { return SCM_NUMBERP (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)); }
-inline bool is_eq (SCM x, SCM y) { return SCM_EQ_P (x, y); }
-inline bool is_equal (SCM x, SCM y) { 
+inline bool ly_c_vector_p (SCM x) { return SCM_VECTORP (x); }
+inline bool ly_c_list_p (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
+inline bool ly_c_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
+inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
+inline bool ly_c_equal_p (SCM x, SCM y) { 
   return SCM_NFALSEP (scm_equal_p (x, y)); 
 }
 
diff --git a/lily/item.cc b/lily/item.cc
index cfaef8ae79..e9c0e6df46 100644
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -153,7 +153,7 @@ Item::handle_prebroken_dependencies ()
     more complicated things.
   */
   SCM vis = get_property ("break-visibility");
-  if (is_procedure (vis))
+  if (ly_c_procedure_p (vis))
     {
       SCM args = scm_list_n (scm_int2num (break_status_dir ()), SCM_UNDEFINED);
       SCM result = scm_apply_0 (vis, args);
diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 927cc6032f..c4209caa2e 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -79,7 +79,7 @@ Key_engraver::create_key (bool def)
   if (!def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
-      if (is_procedure (vis))
+      if (ly_c_procedure_p (vis))
 	item_->set_property ("break-visibility",vis);
     }
 }      
diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 1ba6e4ed5f..0616dcffcb 100644
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -104,7 +104,7 @@ Key_signature_interface::print (SCM smob)
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (is_symbol (scm_style))
+  if (ly_c_symbol_p (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
diff --git a/lily/lexer.ll b/lily/lexer.ll
index 2a2b403e42..cbed6fcc56 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -468,7 +468,7 @@ HYPHEN		--
 		String str (YYText () + 1);
 		SCM s = lookup_markup_command (str);
 
-		if (ly_c_pair_p (s) && is_symbol (ly_cdr (s)) ) {
+		if (ly_c_pair_p (s) && ly_c_symbol_p (ly_cdr (s)) ) {
 			yylval.scm = ly_car(s);
 			SCM tag = ly_cdr(s);
 			if (tag == ly_symbol2scm("markup0"))
@@ -683,7 +683,7 @@ My_lily_lexer::scan_bare_word (String str)
 			yylval.scm = ly_cdr (handle);
 			if (unsmob_pitch (yylval.scm)) 
 	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-			else if (is_symbol (yylval.scm))
+			else if (ly_c_symbol_p (yylval.scm))
 			    return DRUM_PITCH;
 		}
 		else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index ac0e1176a3..e821369ac2 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -73,7 +73,7 @@ ly_quote_scm (SCM s)
 String
 ly_symbol2string (SCM s)
 {
-  assert (is_symbol (s));
+  assert (ly_c_symbol_p (s));
   return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s));
 }
 
@@ -292,7 +292,7 @@ ly_interval2scm (Drul_array<Real> i)
 bool
 to_boolean (SCM s)
 {
-  return is_boolean (s) && ly_scm2bool (s);
+  return ly_c_boolean_p (s) && ly_scm2bool (s);
 }
 
 /* Appendable list L: the cdr contains the list, the car the last cons
@@ -386,7 +386,7 @@ ly_deep_copy (SCM 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))
+  else if (ly_c_vector_p (src))
     {
       int len = SCM_VECTOR_LENGTH (src);
       SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
@@ -527,7 +527,7 @@ type_check_assignment (SCM sym, SCM val,  SCM type_symbol)
   if (val == SCM_EOL || val == SCM_BOOL_F)
     return ok;
 
-  if (!is_symbol (sym))
+  if (!ly_c_symbol_p (sym))
 #if 0
     return false;
 #else
@@ -544,7 +544,7 @@ type_check_assignment (SCM sym, SCM val,  SCM type_symbol)
   
   SCM type = scm_object_property (sym, type_symbol);
 
-  if (type != SCM_EOL && !is_procedure (type))
+  if (type != SCM_EOL && !ly_c_procedure_p (type))
       {
 	warning (_f ("Can't find property type-check for `%s' (%s).",
 		     ly_symbol2string (sym).to_str0 (),
@@ -560,7 +560,7 @@ type_check_assignment (SCM sym, SCM val,  SCM type_symbol)
   else
     {
       if (val != SCM_EOL
-	  && is_procedure (type)
+	  && ly_c_procedure_p (type)
 	  && scm_call_1 (type, val) == SCM_BOOL_F)
 	{
 	  SCM errport = scm_current_error_port ();
@@ -595,7 +595,7 @@ ly_unique (SCM list)
   for (SCM i = list; ly_c_pair_p (i); i = ly_cdr (i))
     {
       if (!ly_c_pair_p (ly_cdr (i))
-	  || !is_equal (ly_car (i), ly_cadr (i)))
+	  || !ly_c_equal_p (ly_car (i), ly_cadr (i)))
 	unique = scm_cons (ly_car (i), unique);
     }
   return scm_reverse_x (unique, SCM_EOL);
@@ -658,7 +658,7 @@ ly_split_list (SCM s, SCM list)
     {
       SCM i = ly_car (after);
       after = ly_cdr (after);
-      if (is_equal (i, s))
+      if (ly_c_equal_p (i, s))
 	break;
       before = scm_cons (i, before);
     }
diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 854a641f63..023c504f21 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -98,7 +98,7 @@ Line_spanner::line_stencil (Grob *me,
 {
   Offset dz = to -from ; 
   SCM type = me->get_property ("style");
-  if (is_symbol (type)
+  if (ly_c_symbol_p (type)
       && (type == ly_symbol2scm ("line")
 	  || type == ly_symbol2scm ("dashed-line")
 	  || type == ly_symbol2scm ("dotted-line")
@@ -109,7 +109,7 @@ Line_spanner::line_stencil (Grob *me,
 	? zigzag_stencil (me, from, to)
 	: Line_interface::line (me, from, to);
     }
-  else if (is_symbol (type)
+  else if (ly_c_symbol_p (type)
 	   && type == ly_symbol2scm ("trill"))
     {
       SCM alist_chain = Font_interface::text_font_alist_chain (me);
diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 7281e21f54..18733b0527 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -113,7 +113,7 @@ Mark_engraver::process_music ()
       SCM m = mark_ev_->get_property ("label");
       SCM proc = get_property ("markFormatter");
       if (!Text_item::markup_p (m) &&
-	  is_procedure (proc))
+	  ly_c_procedure_p (proc))
 	{
 	  if (!is_number (m)) 
 	    m =  get_property ("rehearsalMark");
diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index d3bc1ec780..c4cf900dca 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -78,7 +78,7 @@ Music_iterator::get_static_get_iterator (Music *m)
 
   SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
-  if (is_procedure (ctor))
+  if (ly_c_procedure_p (ctor))
     {
       iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 5286085292..608b640ecb 100644
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -133,7 +133,7 @@ LY_DEFINE (ly_paper_lookup, "ly:paper-lookup",
 {
   Music_output_def *op = unsmob_music_output_def (pap);
   SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Paper");
-  SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   SCM var = ly_module_lookup (op->scope_, sym);
   if (SCM_VARIABLEP (var))
diff --git a/lily/music.cc b/lily/music.cc
index e63c20fabe..4c58b9c757 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -28,7 +28,7 @@ String
 Music::name () const
 {
   SCM nm = get_property ("name");
-  if (is_symbol (nm))
+  if (ly_c_symbol_p (nm))
     {
       return ly_symbol2string (nm);
     }
@@ -87,7 +87,7 @@ Music::get_length () const
   SCM lst = get_property ("length");
   if (unsmob_moment (lst))
     return *unsmob_moment (lst);
-  else if (is_procedure (lst))
+  else if (ly_c_procedure_p (lst))
     {
       SCM res = scm_call_1 (lst, self_scm ());
       return *unsmob_moment (res);
@@ -100,7 +100,7 @@ Moment
 Music::start_mom () const
 {
   SCM lst = get_property ("start-moment-function");
-  if (is_procedure (lst))
+  if (ly_c_procedure_p (lst))
     {
       SCM res = scm_call_1 (lst, self_scm ());
       return *unsmob_moment (res);
@@ -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) || ly_c_string_p (nm))
+  if (ly_c_symbol_p (nm) || ly_c_string_p (nm))
     scm_display (nm, p);
   else
     scm_puts (classname (m),p);
@@ -231,7 +231,7 @@ LY_DEFINE (ly_music_property,
 {
   Music * sc = unsmob_music (mus);
   SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music");
-  SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   return sc->internal_get_property (sym);
 }
@@ -242,7 +242,7 @@ LY_DEFINE (ly_music_set_property, "ly:music-set-property!",
 {
   Music * sc = unsmob_music (mus);
   SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music");
-  SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?"));
   if (ok)
diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 5f823b2a35..df34f77a9e 100644
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -155,7 +155,7 @@ LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click", 1, 0, 0,
     val = scm_c_eval_string ("line-location");
 
   scm_module_define (global_lily_module, ly_symbol2scm ("point-and-click"), val);
-  store_locations_global_b = is_procedure (val);
+  store_locations_global_b = ly_c_procedure_p (val);
   return SCM_UNSPECIFIED;
 }
 
diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 8d5083c286..a72e72cd90 100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -74,7 +74,7 @@ check_meshing_chords (Grob *me,
 
 
   /* Do not merge notes typeset in different style. */
-  if ( !is_equal (nu->get_property ("style"),
+  if ( !ly_c_equal_p (nu->get_property ("style"),
 		     nd->get_property ("style") ) )
     merge_possible = false;
   
diff --git a/lily/note-head.cc b/lily/note-head.cc
index 61603b23d4..a7accb9c75 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -122,7 +122,7 @@ Stencil
 internal_print (Grob *me, bool with_ledgers)
 {
   SCM style  = me->get_property ("style");
-  if (!is_symbol (style))
+  if (!ly_c_symbol_p (style))
     {
       return Stencil ();
     }
@@ -251,7 +251,7 @@ Note_head::brew_ez_stencil (SCM smob)
   SCM idx = scm_int2num (pit->get_notename ());
   SCM names = me->get_property ("note-names");
   SCM charstr = SCM_EOL;
-  if (is_vector (names))
+  if (ly_c_vector_p (names))
     charstr = scm_vector_ref (names, idx);
   else
     {
@@ -291,7 +291,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
   if (brewer == Note_head::print_proc)
     {
       SCM style  = me->get_property ("style");
-      if (!is_symbol (style))
+      if (!ly_c_symbol_p (style))
 	{
 	  return 0.0;
 	}
@@ -317,7 +317,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
     Fallback
    */
   SCM v = me->get_property ("stem-attachment-function");
-  if (!is_procedure (v))
+  if (!ly_c_procedure_p (v))
     return 0.0;
   
   SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a));
diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index c7a6759220..a0b2fbda7a 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -45,7 +45,7 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
 
 
 
-      if (is_procedure (pred))
+      if (ly_c_procedure_p (pred))
 	{
 	  /*
 	    should typecheck pred. 
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 8196e63f1e..d751a0eb87 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -129,7 +129,7 @@ Paper_def::find_scaled_font (Font_metric *f, Real m, SCM input_enc_name)
     {
       SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale"));
 
-      if (!is_symbol (input_enc_name))
+      if (!ly_c_symbol_p (input_enc_name))
 	{
 	  SCM var = ly_module_lookup (scope_, ly_symbol2scm ("inputencoding"));
 	  input_enc_name = scm_variable_ref (var);
diff --git a/lily/parser.yy b/lily/parser.yy
index 3798e3fbc2..f2089487d6 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -71,9 +71,9 @@ void
 tag_music (Music *m, SCM tag, Input ip)
 {
 	SCM tags = m->get_property ("tags");
-	if (is_symbol (tag))
+	if (ly_c_symbol_p (tag))
 		tags = scm_cons (tag, tags);
-	else if (is_list (tag))
+	else if (ly_c_list_p (tag))
 		tags = ly_append2 (tag, tags);
 	else
 		ip.warning (_ ("Tag must be symbol or list of symbols."));
@@ -106,7 +106,7 @@ SCM
 make_simple_markup (SCM encoding, SCM a)
 {
 	SCM simple = ly_scheme_function ("simple-markup");
-	if (is_symbol (encoding))
+	if (ly_c_symbol_p (encoding))
 		return scm_list_3 (ly_scheme_function ("encoded-simple-markup"),
 			   encoding, a);
 	return scm_list_2 (simple, a);
@@ -151,8 +151,8 @@ make_chord (SCM pitch, SCM dur, SCM modification_list)
 bool
 ly_input_procedure_p (SCM x)
 {
-	return is_procedure (x)
-		|| (ly_c_pair_p (x) && is_procedure (ly_car (x)));
+	return ly_c_procedure_p (x)
+		|| (ly_c_pair_p (x) && ly_c_procedure_p (ly_car (x)));
 }
 
 Music*
@@ -821,7 +821,7 @@ Repeated_music:
 		r->set_property ("repeat-count", scm_int2num (times >? 1));
 
 		r-> set_property ("elements",alts);
-		if (is_equal ($2, scm_makfrom0str ("tremolo"))) {
+		if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {
 			/*
 			TODO: move this code to Scheme.
 			*/
@@ -1398,7 +1398,7 @@ command_element:
 			evs = scm_hash_ref (tab, key, SCM_BOOL_F);
 		}
 		Music *quote = 0;
-		if (is_vector (evs))
+		if (ly_c_vector_p (evs))
 		{
 			quote = MY_MAKE_MUSIC ("QuoteMusic");
 			quote->set_property ("duration", $3);
@@ -2507,7 +2507,7 @@ property_op_to_music (SCM op)
 		bool itc = internal_type_checking_global_b;
 		/* UGH.
 		*/
-		bool autobeam = is_equal (symbol, ly_symbol2scm ("autoBeamSettings"));
+		bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
 		if (autobeam)
 			internal_type_checking_global_b = false;
 		m->set_property ("grob-property", grob_sym);
@@ -2531,7 +2531,7 @@ context_spec_music (SCM type, SCM id, Music *m, SCM ops)
 	scm_gc_unprotect_object (m->self_scm ());
 
 	csm->set_property ("context-type",
-		is_symbol (type) ? type : scm_string_to_symbol (type));
+		ly_c_symbol_p (type) ? type : scm_string_to_symbol (type));
 	csm->set_property ("property-operations", ops);
 
 	if (ly_c_string_p (id))
diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index ecc89ba0a6..0afb18d819 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -392,10 +392,10 @@ Part_combine_iterator::process (Moment m)
 	solo1 ();
       else if (tag == ly_symbol2scm ("solo2"))
 	solo2 ();
-      else if (is_symbol (tag))
+      else if (ly_c_symbol_p (tag))
 	{
 	  String s =  "Unknown split directive: "
-	    + (is_symbol (tag) ? ly_symbol2string (tag) : String ("not a symbol")); 
+	    + (ly_c_symbol_p (tag) ? ly_symbol2string (tag) : String ("not a symbol")); 
 	  programming_error (s);
 	}
     }
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index c6eef783c8..df0d26e6a2 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -163,7 +163,7 @@ Piano_pedal_engraver::try_music (Music *m)
       for (Pedal_info*p = info_list_; p->name_; p ++)
 	{
 	  String nm = p->name_ + String ("Event");
-	  if (is_equal (m->get_property ("name") ,
+	  if (ly_c_equal_p (m->get_property ("name") ,
 			  scm_str2symbol(nm.to_str0())))
 	    {
 	      Direction d = to_dir (m->get_property ("span-direction"));
diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index d18adc8d17..1dbdf10dcd 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -130,7 +130,7 @@ Piano_pedal_performer::try_music (Music* r)
       for (Pedal_info*p = info_alist_; p->name_; p ++)
 	{
 	  String nm = p->name_ + String ("Event");
-	  if (is_equal (r->get_property ("name") ,
+	  if (ly_c_equal_p (r->get_property ("name") ,
 			  scm_str2symbol (nm.to_str0())))
 	    {
 	      Direction d = to_dir (r->get_property ("span-direction"));
diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index acbc5e0f75..20f9dc68e8 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -21,7 +21,7 @@ void
 Property_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
-  if (is_symbol (sym))
+  if (ly_c_symbol_p (sym))
     {
       SCM val = get_music ()->get_property ("value");
       bool ok= true;
diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 582ba6bac9..8e0affdf28 100644
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -100,7 +100,7 @@ Quote_iterator::construct_children ()
   start_moment_ = now;
   event_vector_ = get_music ()->get_property ("quoted-events");
 
-  if (is_vector (event_vector_))
+  if (ly_c_vector_p (event_vector_))
     {
       event_idx_ = binsearch_scm_vector (event_vector_, now.smobbed_copy (), &moment_less);
       end_idx_ = binsearch_scm_vector (event_vector_, stop.smobbed_copy (), &moment_less);
diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc
index 42be7b9eb5..95be8f5638 100644
--- a/lily/recording-group-engraver.cc
+++ b/lily/recording-group-engraver.cc
@@ -80,7 +80,7 @@ Recording_group_engraver::finalize ()
   Engraver_group_engraver::finalize ();
   SCM proc = get_property ("recordEventSequence");
 
-  if (is_procedure (proc))
+  if (ly_c_procedure_p (proc))
     scm_call_2  (proc, get_parent_context ()->self_scm (), ly_cdr (accumulator_));
 
   accumulator_ = SCM_EOL;
diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index d025fa47d2..33a7c275ed 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -100,7 +100,7 @@ Repeat_acknowledge_engraver::process_music ()
    */
   SCM wb = get_property ("whichBar");
   SCM db  = get_property ("defaultBarType");
-  if (!ly_c_string_p (wb) || is_equal (db, wb))
+  if (!ly_c_string_p (wb) || ly_c_equal_p (db, wb))
     {
       if (s != "" || (volta_found && !ly_c_string_p (wb)))
 	{
diff --git a/lily/rest.cc b/lily/rest.cc
index 7e3ceab703..1886923037 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -127,7 +127,7 @@ Rest::brew_internal_stencil (SCM smob)
   
   String style; 
   SCM style_scm = me->get_property ("style");
-  if (is_symbol (style_scm))
+  if (ly_c_symbol_p (style_scm))
     style = ly_scm2string (scm_symbol_to_string (style_scm));
 
   Font_metric *fm = Font_interface::get_default_font (me);
diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc
index c3d9baa96e..0210c86c55 100644
--- a/lily/scaled-font-metric.cc
+++ b/lily/scaled-font-metric.cc
@@ -39,7 +39,7 @@ Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real
       coding_vector_ = scm_call_1 (ly_scheme_function ("get-coding-vector"),
 				   scm_makfrom0str (coding_scheme_.to_str0 ()));
 
-      if (!is_vector (coding_vector_))
+      if (!ly_c_vector_p (coding_vector_))
 	{
 	  programming_error ("get-coding-vector  should return vector");
 	  coding_vector_ = scm_c_make_vector (256, ly_symbol2scm (".notdef"));
@@ -96,7 +96,7 @@ Modified_font_metric::make_scaled_font_metric (SCM coding, Font_metric *m, Real
   /*
     UGOHR.
    */
-  if (is_symbol (coding))
+  if (ly_c_symbol_p (coding))
     coding = scm_symbol_to_string (coding);
   
   String scheme = ly_scm2string (coding);
@@ -268,7 +268,7 @@ Modified_font_metric::text_dimension (String text)
 
 	  Box char_box;
 
-	  if (!is_symbol (sym))
+	  if (!ly_c_symbol_p (sym))
 	    continue;
 
 	  char const * chars =  SCM_SYMBOL_CHARS(sym);
diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 7542b121d1..13c6ba0d5c 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -101,7 +101,7 @@ Scheme_hash_table::contains (SCM k) const
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  assert (is_symbol (k));
+  assert (ly_c_symbol_p (k));
   SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
   if (ly_cdr (handle) == SCM_UNDEFINED)
     {
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 143bbd9560..d5804fbd0a 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -50,7 +50,7 @@ Script_engraver::try_music (Music *r)
 	This is necessary for part-combining.
        */
       for (int j = 0; j < scripts_.size (); j++)
-	if (is_equal (scripts_[j]. event_->get_property ("articulation-type"),
+	if (ly_c_equal_p (scripts_[j]. event_->get_property ("articulation-type"),
 			r->get_property ("articulation-type")
 			))
 	  return true;
diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 81b8bee1fc..4a308146e1 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -144,7 +144,7 @@ Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d
     {
       Grob * break_item = unsmob_grob (ly_car (s));
       
-      if (!is_symbol (break_item->get_property ("break-align-symbol")))
+      if (!ly_c_symbol_p (break_item->get_property ("break-align-symbol")))
 	continue;
 
       Interval ext = break_item->extent (col, X_AXIS);
diff --git a/lily/slur.cc b/lily/slur.cc
index 9ff91ef379..a9454eba90 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -193,15 +193,15 @@ Slur::set_extremities (Grob *me)
   do 
     {
     
-      if (!is_symbol (index_get_cell (att, dir)))
+      if (!ly_c_symbol_p (index_get_cell (att, dir)))
 	{
 	  SCM p = me->get_property ("extremity-function");
 	  SCM res = ly_symbol2scm ("head");
 	  
-	  if (is_procedure (p))
+	  if (ly_c_procedure_p (p))
 	    res =  scm_call_2 (p, me->self_scm (), scm_int2num (dir));
 
-	  if (is_symbol (res))
+	  if (ly_c_symbol_p (res))
 	    index_set_cell (att, dir, res);
 	}
     }
@@ -288,7 +288,7 @@ Slur::get_attachment (Grob *me, Direction dir,
 		      Grob **common) 
 {
   SCM s = me->get_property ("attachment");
-  if (!ly_c_pair_p (s) || !is_symbol (index_get_cell (s, dir)))
+  if (!ly_c_pair_p (s) || !ly_c_symbol_p (index_get_cell (s, dir)))
     {
       s = set_extremities (me);
     }
@@ -655,8 +655,8 @@ Slur::get_curve (Grob*me)
 
   
   if (!get_grob_direction (me)
-      || ! is_symbol (index_get_cell (attach, LEFT))
-      || ! is_symbol (index_get_cell (attach, RIGHT)))
+      || ! ly_c_symbol_p (index_get_cell (attach, LEFT))
+      || ! ly_c_symbol_p (index_get_cell (attach, RIGHT)))
     set_extremities (me);
   
   if (!ly_c_pair_p (me->get_property ("control-points")))
diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 5829cbcb29..b2ab37db86 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -69,7 +69,7 @@ Span_bar_engraver::stop_translation_timestep ()
 
       SCM vissym =ly_symbol2scm ("break-visibility");
       SCM vis = bars_[0]->internal_get_property (vissym);	  
-      if (is_equal (spanbar_->internal_get_property (vissym), vis))
+      if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis))
 	spanbar_->internal_set_property (vissym, vis);
 
       typeset_grob (spanbar_);
diff --git a/lily/stem.cc b/lily/stem.cc
index 27711414dd..b53fac3897 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -576,7 +576,7 @@ Stem::flag (Grob*me)
   String flag_style;
   
   SCM flag_style_scm = me->get_property ("flag-style");
-  if (is_symbol (flag_style_scm))
+  if (ly_c_symbol_p (flag_style_scm))
     {
       flag_style = ly_symbol2string (flag_style_scm);
     }
diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index b5988eac2a..5d4c4342b0 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 (ly_c_string_p (gl) && is_equal (gl, scm_makfrom0str  ("brace"))
-	  && ly_c_string_p (my_gl) && is_equal (my_gl, scm_makfrom0str  ("bracket")))
+      if (ly_c_string_p (gl) && ly_c_equal_p (gl, scm_makfrom0str  ("brace"))
+	  && ly_c_string_p (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str  ("bracket")))
 	inf.grob_->translate_axis (-0.8, X_AXIS); // ugh
-      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")))
+      else if (ly_c_string_p (gl) && ly_c_equal_p (gl, scm_makfrom0str  ("bracket"))
+	       && ly_c_string_p (my_gl) && ly_c_equal_p (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 93e218bc42..3ab6cc37ed 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -75,7 +75,7 @@ System_start_delimiter::after_line_breaking (SCM smob)
 {
   Grob * me = unsmob_grob (smob);
   SCM   gl = me->get_property ("glyph");
-  if (is_equal (gl,scm_makfrom0str ("bar-line")))
+  if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line")))
     {
       int count = 0;
 
diff --git a/lily/system.cc b/lily/system.cc
index 779987b6dc..87373b5de8 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -288,7 +288,7 @@ System::pre_processing ()
     {
       Grob * e = unsmob_grob (ly_car (s));
       SCM proc = e->get_property ("spacing-procedure");
-      if (is_procedure (proc))
+      if (ly_c_procedure_p (proc))
 	scm_call_1 (proc, e->self_scm ());
     }
 }
diff --git a/lily/text-item.cc b/lily/text-item.cc
index 591b1f6ec1..782cd4d1c1 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -25,7 +25,7 @@ Text_item::interpret_string (SCM paper, SCM props, SCM encoding, SCM markup)
   SCM_ASSERT_TYPE(pap, paper, SCM_ARG1, __FUNCTION__, "Paper definition");
   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");
+		  || ly_c_symbol_p (encoding), encoding, SCM_ARG2, __FUNCTION__, "symbol");
   
   String str = ly_scm2string (markup);
   Font_metric *fm = select_encoded_font (pap, props, encoding);
diff --git a/lily/tfm.cc b/lily/tfm.cc
index b1043a5acb..942cffb3af 100644
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -134,7 +134,7 @@ Tex_font_metric::name_to_index (String s) const
   SCM sym = ly_symbol2scm (s.to_str0 ());
 
   SCM idx = scm_hash_ref (encoding_table_, sym, SCM_BOOL_F);
-  if (is_char (idx))
+  if (ly_c_char_p (idx))
     {
       return (unsigned char) ly_scm2char (idx);
     }
diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 181ede0912..28559aeac5 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -94,7 +94,7 @@ Tie_engraver::acknowledge_grob (Grob_info i)
 	    maybe should check positions too.
 	   */
 	  if (right_mus && left_mus
-	      && is_equal (right_mus->get_property ("pitch"),
+	      && ly_c_equal_p (right_mus->get_property ("pitch"),
 			     left_mus->get_property ("pitch")))
 	    {
 	      Grob * p = make_spanner ("Tie");
diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index a44bf7df7e..f2efe82f7d 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -74,7 +74,7 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 	  Music * left_mus = heads_to_tie_[i].event_;
 
 	  if (right_mus && left_mus
-	      && is_equal (right_mus->get_property ("pitch"),
+	      && ly_c_equal_p (right_mus->get_property ("pitch"),
 			     left_mus->get_property ("pitch")))
 	    {
 	      an->tie_to (th);
diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index f13e6008a2..3d3e26d327 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 (ly_c_pair_p (fr) && !is_equal (fr, prev_fraction_))
+  if (ly_c_pair_p (fr) && !ly_c_equal_p (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 f249bfc1c4..7cb072fa00 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -41,7 +41,7 @@ Time_signature::print (SCM smob)
     }
 
   Stencil m;
-  if (is_symbol (st))
+  if (ly_c_symbol_p (st))
     {
       String style (ly_scm2string (scm_symbol_to_string (st)));
       if (style[0]=='1')
diff --git a/lily/translator-property.cc b/lily/translator-property.cc
index 28c3753cee..cb0658bf84 100644
--- a/lily/translator-property.cc
+++ b/lily/translator-property.cc
@@ -32,7 +32,7 @@ void
 execute_pushpop_property (Context * trg,
 			  SCM prop, SCM eltprop, SCM val)
 {
-  if (is_symbol (prop) && is_symbol (eltprop))
+  if (ly_c_symbol_p (prop) && ly_c_symbol_p (eltprop))
     {
       if (val != SCM_UNDEFINED)
 	{
@@ -88,7 +88,7 @@ execute_pushpop_property (Context * trg,
 
 	  while (prev_alist != daddy)
 	    {
-	      if (is_equal (ly_caar (prev_alist), eltprop))
+	      if (ly_c_equal_p (ly_caar (prev_alist), eltprop))
 		{
 		  prev_alist = ly_cdr (prev_alist);
 		  break ;
@@ -151,7 +151,7 @@ apply_property_operations (Context *tg, SCM pre_init_ops)
 SCM
 updated_grob_properties (Context * tg, SCM sym)
 {
-  assert (is_symbol (sym));
+  assert (ly_c_symbol_p (sym));
   
   tg = tg->where_defined (sym);
   if (!tg)
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 3bdfe4bf6f..ba44e4446b 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -133,7 +133,7 @@ Tuplet_bracket::print (SCM smob)
     Fixme: the type of this prop is sucky.
    */
   SCM bracket = me->get_property ("bracket-visibility");
-  if (is_boolean (bracket))
+  if (ly_c_boolean_p (bracket))
     {
       bracket_visibility = ly_scm2bool (bracket);
     }
@@ -141,7 +141,7 @@ Tuplet_bracket::print (SCM smob)
     bracket_visibility = !par_beam;
 
   SCM numb = me->get_property ("number-visibility");  
-  if (is_boolean (numb))
+  if (ly_c_boolean_p (numb))
     {
       number_visibility = ly_scm2bool (numb);
     }
diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 42a5185118..6ec076d044 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -79,7 +79,7 @@ Tuplet_engraver::process_acknowledged_grobs ()
       
 
       SCM proc = get_property ("tupletNumberFormatFunction");
-      if (is_procedure (proc))
+      if (ly_c_procedure_p (proc))
 	{
 	  SCM t = scm_apply_0 (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
 	  glep->set_property ("text", t);