lilypond-1.3.74

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 51ac50d50980babc739c3550b0dd093f63335f4d..4527bbf41b56cdfc80e43db89942ab1b776b87ba 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -138,7 +138,7 @@ Align_interface::get_count (Score_element*me,Score_element*s)
   int c =0;
   while (gh_pair_p (e))
     {
-      if (gh_car (e) == s->self_scm_)
+      if (gh_car (e) == s->self_scm ())
        break;
       c++;
       e = gh_cdr (e);

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index facf059ace39a0a9d27e3053f0d52539a9992780..34a0cb2eae3228113aa22b72c3212cd03c693f43 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -70,7 +70,7 @@ Bar_number_engraver::acknowledge_element (Score_element_info inf)
   Score_element * s = inf.elem_l_;
   if (Staff_symbol::has_interface (s))
     {
-      staffs_ = gh_cons (inf.elem_l_->self_scm_, staffs_);
+      staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_);
     }
   else if (text_p_
           && dynamic_cast<Item*> (s)

diff --git a/lily/bar.cc b/lily/bar.cc
index bb91147180bebba77fc9a8670eed611ebf761295..cb956edf231d2ae475200eb4598db5f27bfd527f 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -32,7 +32,7 @@ Bar::brew_molecule (SCM smob)
   if (gh_string_p (s) && gh_procedure_p (barsiz_proc))
     {
       String str  =ly_scm2string (s);
-      SCM siz = gh_call1 (barsiz_proc, me->self_scm_);
+      SCM siz = gh_call1 (barsiz_proc, me->self_scm ());
       return compound_barline (me, str, gh_scm2double (siz)).create_scheme ();
     }
   return SCM_EOL;

diff --git a/lily/beam.cc b/lily/beam.cc
index 1356abe3333460dec86d01cff87cfb3751ad198c..25fe6e901901559e2c556541f8f3f4b05189290b 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -45,7 +45,7 @@ Beam::add_stem (Score_element*me, Score_element*s)
   s->add_dependency (me);
 
   assert (!Stem::beam_l (s));
-  s->set_elt_property ("beam", me->self_scm_);
+  s->set_elt_property ("beam", me->self_scm ());
 
   add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (s));
 }

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 3ca38f7db74572d81620e40948ca48b7c5a10a02..b48f31b25ac870527f12041d59b552e6dda41f86 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -111,10 +111,10 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          */
          edge->set_extent_callback (Score_element::point_dimension_callback,X_AXIS);
          
-         align_l_->set_elt_property ("group-center-element", edge->self_scm_);
+         align_l_->set_elt_property ("group-center-element", edge->self_scm ());
 
          announce_element (edge, 0);
-         column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm_);
+         column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ());
        }
 
       SCM s = scm_assoc (align_name, column_alist_);
@@ -136,7 +136,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          group->set_elt_property ("break-align-symbol", align_name);
          group->set_parent (align_l_, Y_AXIS);
          announce_element (group, 0);
-         column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm_);
+         column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
        }
       Axis_group_interface::add_element (group, item_l);
     }

diff --git a/lily/collision.cc b/lily/collision.cc
index 8d1f6d1232ca0fa1d63cce82821b665af6be83db..c0bec3356d87cea6d52fad9362f7ba91fbf79ea1 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -32,7 +32,7 @@ Collision::force_shift_callback (Score_element * c, Axis a)
    */
   if (!unsmob_element (me->get_elt_property ("done")))
     {
-      me->set_elt_property ("done", me->self_scm_);
+      me->set_elt_property ("done", me->self_scm ());
       do_shifts (me);
     }
   
@@ -195,7 +195,7 @@ Collision::automatic_shift (Score_element *me)
   do
     {
       for (int i=0; i < clash_groups[d].size (); i++)
-       tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm_, gh_double2scm (offsets[d][i])),
+       tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm (), gh_double2scm (offsets[d][i])),
                                 tups);
     }
   while (flip (&d) != UP);
@@ -216,7 +216,7 @@ Collision::forced_shift (Score_element *me)
       SCM force =  se->remove_elt_property ("force-hshift");
       if (gh_number_p (force))
        {
-         tups = gh_cons (gh_cons (se->self_scm_, force),
+         tups = gh_cons (gh_cons (se->self_scm (), force),
                          tups);
        }
     }

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index c57c5332657d662ee5742947f1cf201be12666e9..cfd5eae9a234c79b72bc0525074bda483c825112 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -256,10 +256,10 @@ Dynamic_engraver::do_process_music ()
          if (text_p_)
            {
              index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"),
-                             LEFT, text_p_->self_scm_);
+                             LEFT, text_p_->self_scm ());
              if (finished_cresc_p_)
                index_set_cell (finished_cresc_p_->get_elt_property ("dynamic-drul"),
-                               RIGHT, text_p_->self_scm_);
+                               RIGHT, text_p_->self_scm ());
            }
 
          Axis_group_interface::add_element (line_spanner_, cresc_p_);

diff --git a/lily/item.cc b/lily/item.cc
index d9531c6dfb100eeb69c759b34ffaa4ce7c4d09c5..eac4533b4c9eee8898b416c994bff2e43e7ba7da 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -180,8 +180,8 @@ SCM
 Item::do_derived_mark ()
 {
   if (broken_to_drul_[LEFT])
-    scm_gc_mark (broken_to_drul_[LEFT]->self_scm_);
+    scm_gc_mark (broken_to_drul_[LEFT]->self_scm ());
   if (broken_to_drul_[RIGHT])
-    scm_gc_mark (broken_to_drul_[RIGHT]->self_scm_);
+    scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ());
   return SCM_EOL;
 }

diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index 3d104e93775104d5e74748a36bbd2cf5a32b766c..9af28cc404ac0d90858fc6ff97992a3d8e16fc22 100644 (file)
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -52,7 +52,7 @@ Line_of_score::typeset_element (Score_element * elem_p)
 {
   elem_p->pscore_l_ = pscore_l_;
   Pointer_group_interface (this, "all-elements").add_element (elem_p);
-  scm_unprotect_object (elem_p->self_scm_);
+  scm_unprotect_object (elem_p->self_scm ());
 }
 
 void
@@ -235,7 +235,7 @@ Line_of_score::add_column (Paper_column*p)
 
 
 
-  me->set_elt_property ("columns",  gh_cons (p->self_scm_, cs));
+  me->set_elt_property ("columns",  gh_cons (p->self_scm (), cs));
 
   Axis_group_interface::add_element (me, p);
 }
@@ -272,7 +272,7 @@ Line_of_score::pre_processing ()
       Score_element * e = unsmob_element (gh_car (s));
       SCM proc = e->get_elt_property ("spacing-procedure");
       if (gh_procedure_p (proc))
-       gh_call1 (proc, e->self_scm_);
+       gh_call1 (proc, e->self_scm ());
     }
 }
 
@@ -364,13 +364,13 @@ Line_of_score::broken_col_range (Item const*l, Item const*r) const
   r = r->column_l ();
   SCM s = get_elt_property ("columns");
 
-  while (gh_pair_p (s) && gh_car (s) != r->self_scm_)
+  while (gh_pair_p (s) && gh_car (s) != r->self_scm ())
     s = gh_cdr  (s);
     
   if (gh_pair_p (s))
     s = gh_cdr (s);
   
-  while (gh_pair_p (s) && gh_car (s) != l->self_scm_)
+  while (gh_pair_p (s) && gh_car (s) != l->self_scm ())
     {
       Paper_column*c = dynamic_cast<Paper_column*> ( unsmob_element (gh_car (s)));
       if (Item::breakable_b (c) && !c->line_l_)

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index d6e42d2cbced0d83353e119fbf25710115e6ffce..0b1f86b332836e5d207d0f9164dea67942bceb97 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -12,8 +12,8 @@
 
 Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
 {
-  set_mus_property ("music", m->self_scm_);
-  set_mus_property ("lyrics", l->self_scm_);  
+  set_mus_property ("music", m->self_scm ());
+  set_mus_property ("lyrics", l->self_scm ());  
 }
 
 

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 6b37780158ebaf01594677c936093b670a93a6cc..0f2df8fcdf5e3b05744eb83ad47bbdfe92d6e83d 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -64,7 +64,7 @@ Mark_engraver::acknowledge_element (Score_element_info inf)
   Score_element * s = inf.elem_l_;
   if (Staff_symbol::has_interface (s))
     {
-      staffs_ = gh_cons (inf.elem_l_->self_scm_, staffs_);
+      staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_);
     }
   else if (text_p_ && Bar::has_interface (s))
     {

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index aa3bc2eb352b91c5a7b818f993a8927462d554a8..32c386c323df7e3fcdcb41091ac8a6093f44564c 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -47,7 +47,7 @@ void
 Music_sequence::append_music (Music *m)
 {
   set_mus_property ("list",
-                   gh_append2( music_list(), gh_cons (m->self_scm_, SCM_EOL)));
+                   gh_append2( music_list(), gh_cons (m->self_scm (), SCM_EOL)));
 }
 Music_sequence::Music_sequence(SCM h)
 {

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 59d3c43441064334e4aad394820672088ab82254..641c83b91ba32d5256186f79230a6d95deeaa95a 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -27,7 +27,7 @@ Music_wrapper::transpose (Musical_pitch p)
 
 Music_wrapper::Music_wrapper(Music*p)
 {
-  set_mus_property ("element", p->self_scm_);
+  set_mus_property ("element", p->self_scm ());
 }
 
 Moment

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 3e4bbb602b96b022c0b277055689e60b2369b915..f77e59a4dfcfa7214a94bd5a1edebf2faf40410a 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -126,14 +126,14 @@ My_lily_parser::get_chord (Musical_pitch tonic,
     {
       Inversion_req* i = new Inversion_req;
       i->pitch_ = chord.inversion_pitch_;
-      l = gh_cons (i->self_scm_, l);
+      l = gh_cons (i->self_scm (), l);
     }
 
   if (chord.bass_b_)
     {
       Bass_req* b = new Bass_req;
       b->pitch_ = chord.bass_pitch_;
-      l = gh_cons (b->self_scm_, l);      
+      l = gh_cons (b->self_scm (), l);      
     }
 
   Array<Musical_pitch> pitch_arr = chord.to_pitch_arr ();
@@ -143,7 +143,7 @@ My_lily_parser::get_chord (Musical_pitch tonic,
       Note_req* n = new Note_req;
       n->pitch_ = p;
       n->duration_ = d;
-      l = gh_cons (n->self_scm_, l);
+      l = gh_cons (n->self_scm (), l);
     }
 
   Simultaneous_music*v = new Request_chord (l);

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 473c0146636dbcff21dd5d5e5c27df7ffa40b342..f9711fc9549ca057bb6cb013cb3e66f258a604ac 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -86,7 +86,7 @@ Note_column::dir (Score_element*  me)
 void
 Note_column::set_stem (Score_element*me,Score_element * stem_l)
 {
-  me->set_elt_property ("stem", stem_l->self_scm_);
+  me->set_elt_property ("stem", stem_l->self_scm ());
   me->add_dependency (stem_l);
   Axis_group_interface::add_element (me, stem_l);
 }
@@ -96,7 +96,7 @@ Note_column::add_head (Score_element*me,Score_element *h)
 {
   if (Rest::has_interface (h))
     {
-      me->set_elt_property ("rest", h->self_scm_);
+      me->set_elt_property ("rest", h->self_scm ());
     }
   else if (Note_head::has_interface (h))
     {

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 40036ec0af177d3055ea5382bda806b5c7894461..b20f3d7ca2bc0ed14fa39b2df47bef3e1e4eb750 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -48,7 +48,7 @@ Output_property_engraver::acknowledge_element (Score_element_info inf)
        should typecheck pred. 
        */
       SCM result=gh_apply (pred,
-                          gh_list (inf.elem_l_->self_scm_, SCM_UNDEFINED));
+                          gh_list (inf.elem_l_->self_scm (), SCM_UNDEFINED));
       if (to_boolean (result))
        {
          SCM sym = o->get_mus_property ("symbol");

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index ec2c83f65f0f0052a5b7bc62785d030c101183c3..9c13a867eacf3556eac97c61bdce22f09d745e5d 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -38,11 +38,11 @@ Paper_score::typeset_line (Line_of_score *l)
     {
       line_l_ = l;             // ugh.
     }
-  main_smob_ = gh_cons (l->self_scm_, main_smob_);
+  main_smob_ = gh_cons (l->self_scm (), main_smob_);
   l->pscore_l_ = this;
 
   /*
-    We don't unprotect l->self_scm_, we haven't got any place else to
+    We don't unprotect l->self_scm (), we haven't got any place else to
     protect it from collection.  */
 
 }

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index cb9c413a9dacc9aedb75609d9d476f70a62d280b..f1a6ae4011d00daaf127246ca0c6f8df850a264b 100644 (file)
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -34,7 +34,7 @@ void
 Pointer_group_interface::add_element (Score_element*p) 
 {
   elt_l_->set_elt_property (name_.ch_C(),
-                          gh_cons (p->self_scm_,
+                          gh_cons (p->self_scm (),
                                    elt_l_->get_elt_property (name_.ch_C())));
 }
 

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index f2e9b77daae147c1212967f29a1609bd511d2f0b..2e8e0e3d0204ece0397d25e1b17a86c6d2ffebd6 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -26,14 +26,14 @@ Repeated_music::alternatives ()const
 
 Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts)
 {
-  set_mus_property ("body", beg->self_scm_);
+  set_mus_property ("body", beg->self_scm ());
   fold_b_ = false;
   repeats_i_ = times;
   volta_fold_b_ = true;
   if (alts)
     {
       alts->truncate (times);
-      set_mus_property ("alternatives", alts->self_scm_);
+      set_mus_property ("alternatives", alts->self_scm ());
     }
 }
 

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 5427a20c6ddf74507c726d48bd50fad14227cdaa..6429df3684cbdb10f4d1d98bfe1df3f44e9fd2ce 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -48,7 +48,7 @@ Rest_collision::add_column (Score_element*me,Score_element *p)
   gi.add_element (p);
 
   p->add_offset_callback (&Rest_collision::force_shift_callback, Y_AXIS);
-  p->set_elt_property ("rest-collision", me->self_scm_);
+  p->set_elt_property ("rest-collision", me->self_scm ());
 }
 
 static SCM

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 63006674fce24236e9fbea65d6eca5ddb9d51984..cf188631529d4b35566cb3265218bfa0139895bc 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -51,7 +51,7 @@ Rhythmic_head::dot_count (Score_element*me)
 void
 Rhythmic_head::set_dots (Score_element*me,Item *dot_l)
 {
-  me->set_elt_property ("dot", dot_l->self_scm_);
+  me->set_elt_property ("dot", dot_l->self_scm ());
 }
 
 

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index c360b9964934f975c89ab5e483f3189b8aee287b..80ad78157a8fea3c180ebaf92b7911a18b58faad 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -35,9 +35,8 @@ Score_engraver::prepare (Moment w)
   SCM props = get_property (ly_symbol2scm ("basicPaperColumnProperties"));
   set_columns (new Paper_column (props),  new Paper_column (props));
   
-  SCM when = smobify (new Moment (w));
-  command_column_l_->set_elt_property ("when", when);
-  musical_column_l_->set_elt_property ("when", when);
+  command_column_l_->set_elt_property ("when", w.make_scm());
+  musical_column_l_->set_elt_property ("when", w.make_scm());
   command_column_l_->set_elt_property ("breakable", SCM_BOOL_T);
   
   Score_element_info i1(command_column_l_, 0), i2 (musical_column_l_,0);
@@ -206,9 +205,9 @@ Score_engraver::set_columns (Paper_column *new_command_l,
     }
 
   if (new_musical_l)
-    set_property ("currentMusicalColumn", new_musical_l->self_scm_);
+    set_property ("currentMusicalColumn", new_musical_l->self_scm ());
   if (new_command_l)
-    set_property ("currentCommandColumn", new_command_l->self_scm_);  
+    set_property ("currentCommandColumn", new_command_l->self_scm ());  
 }
 
 Music_output*

diff --git a/lily/score.cc b/lily/score.cc
index 8a4e348d0d46d65b44bd9ab95e4fd6df2aec6fed..75e397aab8a9686fdedfe48f88944e3b264a0a1a 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -39,7 +39,7 @@ Score::Score (Score const &s)
   : Input (s)
 {
   Music * m =unsmob_music (s.music_);
-  music_ =  m?m->clone()->self_scm_ : SCM_EOL;
+  music_ =  m?m->clone()->self_scm () : SCM_EOL;
   for (int i=0; i < s.def_p_arr_.size (); i++)
     def_p_arr_.push(s.def_p_arr_[i]->clone());
   errorlevel_i_ = s.errorlevel_i_;

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index db95e855f47163e67171f40afc89502f563d161e..3f47d8f7142715cd294bb8e14905a6531ce97851 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -128,7 +128,7 @@ Script_engraver::acknowledge_element (Score_element_info inf)
        {
          Score_element*e = script_p_arr_[i];
 
-         e->set_elt_property ("direction-source", inf.elem_l_->self_scm_);
+         e->set_elt_property ("direction-source", inf.elem_l_->self_scm ());
          Side_position::add_support (e, inf.elem_l_);
        }
     }

diff --git a/lily/slur.cc b/lily/slur.cc
index 19cabbc6c1d29a117ffade4201b08ed8f4be3fd0..ccad52d81cd9172fdc879cacb1180f2923cbcaf2 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -177,7 +177,7 @@ Slur::set_extremities (Score_element*me)
          for (SCM s = scm_eval (ly_symbol2scm ("slur-extremity-rules"));
               s != SCM_EOL; s = gh_cdr (s))
            {
-             SCM r = gh_call2 (gh_caar (s), me->self_scm_,
+             SCM r = gh_call2 (gh_caar (s), me->self_scm (),
                                 gh_int2scm ((int)dir));
              if (r != SCM_BOOL_F)
                {

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 5c8f4a1977699ba5ddcbc360e8afd8a0ab29fd96..04387ef9f702f89d4dee623f6d19d69452bc2a9b 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -271,11 +271,11 @@ Spanner::do_derived_mark ()
   Direction d = LEFT;
   do
     if (spanned_drul_[d])
-      scm_gc_mark (spanned_drul_[d]->self_scm_);
+      scm_gc_mark (spanned_drul_[d]->self_scm ());
   while (flip (&d) != LEFT);
 
   for (int i= broken_into_l_arr_.size () ; i--;)
-    scm_gc_mark (broken_into_l_arr_[i]->self_scm_);
+    scm_gc_mark (broken_into_l_arr_[i]->self_scm ());
 
   return SCM_EOL;
 }

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index d5fb4860f227987f1a723af0a4c0c7aa58bb9910..410cbac927eedb45b81705bc6b15c520df7474e8 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -70,7 +70,7 @@ Staff_symbol_engraver::do_removal_processing()
 void
 Staff_symbol_engraver::acknowledge_element (Score_element_info s)
 {
-  s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm_);
+  s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm ());
   s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
 }
 

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index fff6f5c056729e2aadd355b67fd8601ca95728ea..fc0ed1023f31f51ff49c0c2eacfb60344a46e430 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -126,6 +126,6 @@ Stem_tremolo::brew_molecule (SCM smob)
 void
 Stem_tremolo::set_stem (Score_element*me,Score_element *s)
 {
-  me->set_elt_property ("stem", s->self_scm_);
+  me->set_elt_property ("stem", s->self_scm ());
 }
 

diff --git a/lily/stem.cc b/lily/stem.cc
index 9a0f2b468881c936591192ce256989e312e99811..9332b6532d515b313947d1107719c438c44d69d2 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -200,7 +200,7 @@ Stem::extremal_heads (Score_element*me)
 void
 Stem::add_head (Score_element*me, Score_element *n)
 {
-  n->set_elt_property ("stem", me->self_scm_);
+  n->set_elt_property ("stem", me->self_scm ());
   n->add_dependency (me);
 
   if (Note_head::has_interface (n))
@@ -209,7 +209,7 @@ Stem::add_head (Score_element*me, Score_element *n)
     }
   else
     {
-      n->set_elt_property ("rest", n->self_scm_);
+      n->set_elt_property ("rest", n->self_scm ());
     }
 }
 

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index aa3180f7f620a603649f1d91ab01e0eb0e2a9376..68121fb2bbf1753c89f1348c68fdd5fc0bf34e6f 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -156,8 +156,8 @@ Tie_engraver::process_acknowledged ()
            }
          else
            {
-             head_list  = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm_,
-                                            now_heads_[i].head_l_->self_scm_),
+             head_list  = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm (),
+                                            now_heads_[i].head_l_->self_scm ()),
                                    head_list);
 
              past_notes_pq_. insert (now_heads_[i]);
@@ -250,8 +250,8 @@ Tie_engraver::typeset_tie (Score_element *her)
       new_head_drul[d] = Tie::head(her,(Direction)-d);
   } while (flip(&d) != LEFT);
 
-  index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm_ );
-  index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm_ );
+  index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm () );
+  index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm () );
 
   typeset_element (her);
 }

diff --git a/lily/tie.cc b/lily/tie.cc
index 4eae4439cb4d49bb220ede7af3326aeeb27c3f9f..2b214131b1f4d5f4ee03169d1bfa4a0b5ac7d24f 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -38,7 +38,7 @@ void
 Tie::set_head (Score_element*me,Direction d, Item * head_l)
 {
   assert (!head (me,d));
-  index_set_cell (me->get_elt_property ("heads"), d, head_l->self_scm_);
+  index_set_cell (me->get_elt_property ("heads"), d, head_l->self_scm ());
   
   dynamic_cast<Spanner*> (me)->set_bound (d, head_l);
   me->add_dependency (head_l);

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 4303d0cbf470bdeef0991cf46efd761aeafb2273..8d92fb8ac15b9d7d528923ffe7b695cec7751f1b 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -28,7 +28,7 @@ Translator_group::~Translator_group ()
 {
   assert (removable_b());
   trans_p_list_.junk ();
-  delete properties_dict_;
+  scm_unprotect_object (properties_dict_->self_scm ());
 }
 
 
@@ -358,7 +358,7 @@ Translator_group::do_print() const
   if (!flower_dstream)
     return ;
 
-  gh_display (properties_dict_->self_scm_);
+  gh_display (properties_dict_->self_scm ());
   if (status == ORPHAN)
     {
       DEBUG_OUT << "consists of: ";