patch::: 1.5.11.jcn3

1.5.11.hwn1
===========

diff --git a/CHANGES b/CHANGES
index 6a3d0b3cfeff2f20804e71a607ce30fcfb9751d8..cec66bd7e5fab8292a54524b8b7423d397c96c25 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-1.5.11
-======
+1.5.11.hwn1
+===========
 
 * Allow breaks at measures starting with grace notes.
 
@@ -10,11 +10,11 @@ measure/line.
 
 * Midi module: add timestamps.
 
-* 
-
-1.5.11.jcn1
+1.5.11.jcn2
 ===========
 
+* guile > 1.4 fixes.
+
 * Add -p flag to package-diff.py's diff invocation, to show changed function.
 
 * Add configure checks for python headers.

diff --git a/VERSION b/VERSION
index 8de2d3c03b3685f1aa4a3af7235dfa2aa53d1e74..047ca1547f886111b916f0fae26eb350f3480702 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=11
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/afm.cc b/lily/afm.cc
index f09d63bad58ce915cad52de595cfcbc345318fdd..95161155872c4a3d0dce0d19d8555be60aadb55e 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -159,7 +159,7 @@ Adobe_font_metric::find_by_name (String s) const
       return m;
     }
   
-  SCM at = (scm_listify (ly_symbol2scm ("char"),
+  SCM at = (scm_list_n (ly_symbol2scm ("char"),
                      gh_int2scm (cm->code),
                      SCM_UNDEFINED));
   

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 8b5d8687f3185d2c4e228f64d461663e95e58bec..cc3db6529e8f8f1465943bc6b266bcfd3def6d23 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -109,19 +109,19 @@ Auto_beam_engraver::Auto_beam_engraver ()
 bool
 Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
 {
-  SCM wild = scm_listify (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
+  SCM wild = scm_list_n (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
   SCM function;
   if (dir == START)
-    function = scm_listify (ly_symbol2scm ("begin"), SCM_UNDEFINED);
+    function = scm_list_n (ly_symbol2scm ("begin"), SCM_UNDEFINED);
   else
-    function = scm_listify (ly_symbol2scm ("end"), SCM_UNDEFINED);
+    function = scm_list_n (ly_symbol2scm ("end"), SCM_UNDEFINED);
 
   Moment one_beat = *unsmob_moment (get_property ("beatLength"));
   int num = int ((*unsmob_moment (get_property ("measureLength")) / one_beat).main_part_);
   int den = one_beat.den ();
-  SCM time = scm_listify (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
+  SCM time = scm_list_n (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
 
-  SCM type = scm_listify (gh_int2scm (test_mom.num ()),
+  SCM type = scm_list_n (gh_int2scm (test_mom.num ()),
                      gh_int2scm (test_mom.den ()), SCM_UNDEFINED);
 
   SCM settings = get_property ("autoBeamSettings");

diff --git a/lily/beam.cc b/lily/beam.cc
index b45edf9b610bc17ea6bfcf9e211561904dd0be32..e25ca0db06988de11cb88206813ed48b68633829 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -703,7 +703,7 @@ Beam::quantise_y_f (Grob*me,Real y, Real dy, int quant_dir)
   SCM proc = me->get_grob_property ("vertical-position-quant-function");
   SCM quants = scm_apply (proc,
                          me->self_scm (),
-                         scm_listify (gh_int2scm (multiplicity),
+                         scm_list_n (gh_int2scm (multiplicity),
                                   gh_double2scm (dy/staff_space),
                                   gh_double2scm (thick/staff_space),
                                   SCM_EOL, SCM_UNDEFINED));

diff --git a/lily/chord.cc b/lily/chord.cc
index 01568367fe150009f725899c9913f9befc50062a..abe879cdbd299de24b8d79bc501b30d8bc27bcfa 100644 (file)
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -50,7 +50,7 @@ ly_remove_member (SCM s, SCM list)
 SCM
 ly_snoc (SCM s, SCM list)
 {
-  return gh_append2 (list, scm_listify (s, SCM_UNDEFINED));
+  return gh_append2 (list, scm_list_n (s, SCM_UNDEFINED));
 }
 
 

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index a086ac5808884c95155e7b31fd3842f6bee0cd81..5bad2d94fa18c742add30a3b3b0d3ea04a0f1287 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -84,7 +84,7 @@ Figured_bass_engraver::process_music ()
                                     figure_->get_grob_property ("accidental-alist"));
              if (gh_pair_p (alter))
                {
-                 one_fig = scm_listify (ly_symbol2scm ("columns"),
+                 one_fig = scm_list_n (ly_symbol2scm ("columns"),
                                     one_fig,
                                     ly_cdr(alter),
                                     SCM_UNDEFINED);

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 25f15ac822f2c80051747db1f49e40c1f0e32f04..c50b4cb316be326c8f4f10eeb7fe345e9b0d5e18 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -38,7 +38,7 @@ Font_interface::font_alist_chain (Grob *me)
   SCM defaults = ly_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
                                    me->paper_l ()->style_sheet_));
 
-  SCM ch = scm_listify (me->mutable_property_alist_,
+  SCM ch = scm_list_n (me->mutable_property_alist_,
                    me->immutable_property_alist_,
                    defaults,
                    SCM_UNDEFINED);
@@ -236,7 +236,7 @@ Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain)
     }
 
   warning (_ ("couldn't find any font satisfying "));
-  scm_write (scm_listify (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ());
+  scm_write (scm_list_n (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ());
   scm_flush (scm_current_error_port ());
  
   return ly_str02scm ("cmr10");

diff --git a/lily/grob.cc b/lily/grob.cc
index 314db7ae4e69798277b6d089036d03ddee2b9bd4..cdc887eab96903d74f1efed0324ff68a6711fca4 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -278,7 +278,7 @@ Grob::get_uncached_molecule ()const
 
   SCM  mol = SCM_EOL;
   if (gh_procedure_p (proc)) 
-    mol = gh_apply (proc, scm_listify (this->self_scm (), SCM_UNDEFINED));
+    mol = gh_apply (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED));
 
   
   Molecule *m = unsmob_molecule (mol);
@@ -296,7 +296,7 @@ Grob::get_uncached_molecule ()const
       // ugr.
       
       mol = Molecule (m->extent_box (),
-                     scm_listify (origin, m->get_expr (), SCM_UNDEFINED)
+                     scm_list_n (origin, m->get_expr (), SCM_UNDEFINED)
                      ). smobbed_copy ();
 
       m = unsmob_molecule (mol);

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 04b27283e98e24a30ad54bd9eecff02b36de3e03..798c0c285db54f4125526bfffc763216a5b776bd 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -116,7 +116,7 @@ Hairpin::brew_molecule (SCM smob)
 
     Lookup::line  (XY1, XY2).
   */
-  SCM hairpin = scm_listify (ly_symbol2scm ("hairpin"),
+  SCM hairpin = scm_list_n (ly_symbol2scm ("hairpin"),
                         gh_double2scm (thick),
                         gh_double2scm (width),
                         gh_double2scm (starth),

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 5db4d23d211859c3228c4f6226653f5692052b5e..a765be93e9fa7d17b746190ccb176b81fbe26602 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -87,18 +87,56 @@ SCM ly_type (SCM);
 bool type_check_assignment (SCM val, SCM sym,  SCM type_symbol) ;
 SCM ly_number2string (SCM s);
 
-
-#define ly_cdr(x) SCM_CDR(x)
-#define ly_car(x) SCM_CAR(x)
-#define ly_caar(x) SCM_CAAR(x)
-#define ly_cdar(x) SCM_CDAR(x)
-#define ly_cadr(x) SCM_CADR(x)
-#define ly_cddr(x) SCM_CDDR(x)
-
-#define ly_pair_p(x) SCM_PAIRP(x)
-#define ly_symbol_p(x) SCM_SYMBOLP(x)
-#define ly_number_p(x) SCM_NUMBERP(x)
-#define ly_procedure_p(x) SCM_NFALSEP(scm_procedure_p(x))
+inline SCM
+ly_cdr (SCM x)
+{
+  return SCM_CDR (x);
+}
+inline SCM
+ly_car (SCM x)
+{
+  return SCM_CAR (x);
+} 
+inline SCM
+ly_caar (SCM x)
+{
+  return SCM_CAAR (x);
+}
+inline SCM
+ly_cdar (SCM x)
+{
+  return SCM_CDAR (x);
+}
+inline SCM
+ly_cadr (SCM x)
+{
+  return SCM_CADR (x);
+}
+inline SCM
+ly_cddr (SCM x)
+{
+  return SCM_CDDR (x);
+}
+inline SCM
+ly_pair_p (SCM x)
+{
+  return scm_pair_p (x);
+}
+inline bool
+ly_symbol_p (SCM x)
+{
+  return SCM_SYMBOLP (x);
+}
+inline bool
+ly_number_p (SCM x)
+{
+  return SCM_NUMBERP (x);
+}
+inline bool
+ly_procedure_p (SCM x)
+{
+  return SCM_NFALSEP (scm_procedure_p(x));
+}
 
 /*
   display and print newline.

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 376a0a6928dc12ef2903dc583d6d36cdda933d25..278dac3694a1e980a085eba4c6f34bc0b37dfa6c 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -111,7 +111,7 @@ ly_parse_scm (char const* s, int* n)
 SCM
 ly_quote_scm (SCM s)
 {
-  return scm_listify (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
+  return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
 }
 
 

diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index cde23f37526f7ea626ad47368562609fc536fd45..b0a042b7c61b99729ef18037356bff070ade8e3e 100644 (file)
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -242,7 +242,7 @@ Line_of_score::output_molecule (SCM expr, Offset o)
          Input * ip = unsmob_input (head);
       
 
-         pscore_l_->outputter_l_->output_scheme (scm_listify (define_origin_sym,
+         pscore_l_->outputter_l_->output_scheme (scm_list_n (define_origin_sym,
                                                           ly_str02scm (ip->file_str ().ch_C ()),
                                                           gh_int2scm (ip->line_number ()),
                                                           gh_int2scm (ip->column_number ()),
@@ -251,7 +251,7 @@ Line_of_score::output_molecule (SCM expr, Offset o)
        }
       else  if (head ==  no_origin_sym)
        {
-         pscore_l_->outputter_l_->output_scheme (scm_listify (no_origin_sym, SCM_UNDEFINED));
+         pscore_l_->outputter_l_->output_scheme (scm_list_n (no_origin_sym, SCM_UNDEFINED));
          expr = gh_cadr (expr);
        }
       else if (head == offset_sym)
@@ -267,7 +267,7 @@ Line_of_score::output_molecule (SCM expr, Offset o)
       else
        {
          pscore_l_->outputter_l_->
-           output_scheme (scm_listify (placebox_sym,
+           output_scheme (scm_list_n (placebox_sym,
                                    gh_double2scm (o[X_AXIS]),
                                    gh_double2scm (o[Y_AXIS]),
                                    expr,
@@ -370,14 +370,14 @@ Line_of_score::post_processing (bool last_line)
     font defs;
    */
   SCM font_names = ly_quote_scm (paper_l ()->font_descriptions ());  
-  output_scheme (scm_listify (ly_symbol2scm ("define-fonts"),
+  output_scheme (scm_list_n (ly_symbol2scm ("define-fonts"),
                                        font_names,
                                        SCM_UNDEFINED));
 
   /*
     line preamble.
    */
-  output_scheme (scm_listify (ly_symbol2scm ("start-line"),
+  output_scheme (scm_list_n (ly_symbol2scm ("start-line"),
                          gh_double2scm (height),
                          SCM_UNDEFINED));
   
@@ -412,11 +412,11 @@ Line_of_score::post_processing (bool last_line)
   
   if (last_line)
     {
-      output_scheme (scm_listify (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED));
+      output_scheme (scm_list_n (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED));
     }
   else
     {
-      output_scheme (scm_listify (ly_symbol2scm ("stop-line"), SCM_UNDEFINED));
+      output_scheme (scm_list_n (ly_symbol2scm ("stop-line"), SCM_UNDEFINED));
     }
 }
 

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index c9071393cfb62c2ff185fef1278e8e851e4b15bf..391e73f8512ce2dfb70846acb7a2b4e27cd12fa1 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -48,7 +48,7 @@ Line_spanner::line_atom (Grob* me, Real dx, Real dy)
   Real on = length - thick;
   Real off = period - on;
 
-  SCM list = scm_listify (ly_symbol2scm ("dashed-line"),
+  SCM list = scm_list_n (ly_symbol2scm ("dashed-line"),
                      gh_double2scm (thick),
                      gh_double2scm (on),
                      gh_double2scm (off),
@@ -77,12 +77,12 @@ Line_spanner::line_molecule (Grob* me, Real dx, Real dy)
           && type == ly_symbol2scm ("trill"))
     {
       SCM alist_chain = Font_interface::font_alist_chain (me);
-      SCM style_chain = scm_listify (gh_cons (ly_symbol2scm ("font-family"),
+      SCM style_chain = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
                                          ly_symbol2scm ("music")),
                                 SCM_UNDEFINED);
       
       Font_metric *fm = Font_interface::get_font (me,
-                                                 scm_listify (style_chain,
+                                                 scm_list_n (style_chain,
                                                           alist_chain,
                                                           SCM_UNDEFINED));
       Molecule m = fm->find_by_name ("scripts-trill-element");

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index 9c490908892565929b473ee719097a4502d1e827..aefaee8e8c18981d00fe70a4f557e5db8a46f229 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -97,7 +97,7 @@ Local_key_item::after_line_breaking (SCM smob)
          if (!sp->original_l_)
            {
              /* there should be a better way to delete part of me */
-             scm_set_car_x (s, scm_listify (gh_caar (s),
+             scm_set_car_x (s, scm_list_n (gh_caar (s),
                                         ly_symbol2scm ("deleted"),
                                         SCM_UNDEFINED));
              me->set_grob_property ("molecule", SCM_EOL);

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 849be07c8161b136f34f3caf7adc492fbb729bb0..6504472983e0a6fbdf0d1ca32bc137ec4cd23d44 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -37,7 +37,7 @@ Lookup::beam (Real slope, Real width, Real thick)
         Interval (min_y, max_y));
 
   
-  SCM at = scm_listify (ly_symbol2scm ("beam"),
+  SCM at = scm_list_n (ly_symbol2scm ("beam"),
                    gh_double2scm (width),
                    gh_double2scm (slope),
                    gh_double2scm (thick),
@@ -57,7 +57,7 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash)
       l = gh_cons (ly_offset2scm (b.control_[i]), l);
     }
 
-  SCM at = (scm_listify (ly_symbol2scm ("dashed-slur"),
+  SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
                               gh_double2scm (thick), 
                               gh_double2scm (dash),
                               ly_quote_scm (l),
@@ -80,7 +80,7 @@ Lookup::blank (Box b)
 Molecule
 Lookup::filledbox (Box b) 
 {
-  SCM  at  = (scm_listify (ly_symbol2scm ("filledbox"),
+  SCM  at  = (scm_list_n (ly_symbol2scm ("filledbox"),
                     gh_double2scm (-b[X_AXIS][LEFT]),
                     gh_double2scm (b[X_AXIS][RIGHT]),                 
                     gh_double2scm (-b[Y_AXIS][DOWN]),
@@ -148,7 +148,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick)
     }
   
   
-  SCM at = (scm_listify (ly_symbol2scm ("bezier-sandwich"),
+  SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
                     ly_quote_scm (list),
                     gh_double2scm (linethick),
                     SCM_UNDEFINED));
@@ -365,7 +365,7 @@ Lookup::repeat_slash (Real w, Real s, Real t)
   SCM wid = gh_double2scm (w);
   SCM sl = gh_double2scm (s);
   SCM thick = gh_double2scm (t);
-  SCM slashnodot = scm_listify (ly_symbol2scm ("repeat-slash"),
+  SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
                            wid, sl, thick, SCM_UNDEFINED);
 
   Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))),

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 513f4b82ac186e6f5bef1f788809599186af7373..5e124b2e90c3147a1bc036e9591e13b9407b1439 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -61,7 +61,7 @@ Molecule::translate (Offset o)
       incr (a);
     }
 
-  expr_ = scm_listify (ly_symbol2scm ("translate-molecule"),
+  expr_ = scm_list_n (ly_symbol2scm ("translate-molecule"),
                   ly_offset2scm (o),
                   expr_, SCM_UNDEFINED);
   if (!empty_b ())
@@ -82,7 +82,7 @@ Molecule::translate_axis (Real x,Axis a)
 void
 Molecule::add_molecule (Molecule const &m)
 {
-  expr_ = scm_listify (ly_symbol2scm ("combine-molecule"),
+  expr_ = scm_list_n (ly_symbol2scm ("combine-molecule"),
                   m.expr_,
                   expr_, SCM_UNDEFINED);
   dim_.unite (m.dim_);
@@ -222,7 +222,7 @@ fontify_atom (Font_metric * met, SCM f)
   if (f == SCM_EOL)
     return f;
   else
-    return  scm_listify (ly_symbol2scm ("fontify"),
+    return  scm_list_n (ly_symbol2scm ("fontify"),
                     ly_quote_scm (met->description_), f, SCM_UNDEFINED);
 }
 

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 8059064dd1726d26a944c2c7ee47179702065a86..bda7f38c2d443e9025b14ec41efc7520992b254f 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -99,7 +99,7 @@ Note_head::brew_molecule (SCM smob)
     UGH: use grob-property.
   */
   Molecule out = Font_interface::get_default_font (me)->find_by_name (String ("noteheads-") + 
-               ly_scm2string (scm_primitive_eval (scm_listify (ly_symbol2scm ("find-notehead-symbol"),
+               ly_scm2string (scm_primitive_eval (scm_list_n (ly_symbol2scm ("find-notehead-symbol"),
                                                  me->get_grob_property ("duration-log"),
                                                  ly_quote_scm (style),
                                                            SCM_UNDEFINED))));
@@ -133,7 +133,7 @@ Note_head::brew_ez_molecule (SCM smob)
   int l = gh_scm2int (me->get_grob_property ("duration-log"));
 
   int b = (l >= 2);
-  SCM at = scm_listify (ly_symbol2scm ("ez-ball"),
+  SCM at = scm_list_n (ly_symbol2scm ("ez-ball"),
                    me->get_grob_property ("note-character"),
                    gh_int2scm (b),
                    gh_int2scm (1-b),
@@ -170,7 +170,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
     return 0.0;
 
   SCM st = me->get_grob_property ("style");
-  SCM result = gh_apply (v, scm_listify (st, SCM_UNDEFINED));
+  SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED));
 
   if (!gh_pair_p (result))
     return 0.0;

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 83a5045732a57e52a3f6313e0e3cb197fdfb5bab..f022bf56d7a072ae7c72c7a2a0096b184ac7347e 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -61,7 +61,7 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
        should typecheck pred. 
        */
       SCM result=gh_apply (pred,
-                          scm_listify (inf.elem_l_->self_scm (), SCM_UNDEFINED));
+                          scm_list_n (inf.elem_l_->self_scm (), SCM_UNDEFINED));
       if (to_boolean (result))
        {
          SCM sym = o->get_mus_property ("grob-property");

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 4ad9f06c095cbd00f2143186d66368c74de15fd1..e88c81aaa407894fe51c7bf8021dd94b901af4c8 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -74,7 +74,7 @@ Paper_outputter::output_header ()
       gh_define ("security-paranoia", SCM_BOOL_T);      
     }
 
-  SCM exp = scm_listify (ly_symbol2scm ((output_format_global + "-scm").ch_C ()),
+  SCM exp = scm_list_n (ly_symbol2scm ((output_format_global + "-scm").ch_C ()),
                     ly_quote_scm (ly_symbol2scm ("all-definitions")),
                     SCM_UNDEFINED);
   exp = scm_primitive_eval (exp);
@@ -93,7 +93,7 @@ Paper_outputter::output_header ()
   generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0)  ;
   
   SCM args_scm = 
-    scm_listify (ly_str02scm (creator.ch_l ()),
+    scm_list_n (ly_str02scm (creator.ch_l ()),
             ly_str02scm (generate.ch_l ()), SCM_UNDEFINED);
 
 
@@ -106,7 +106,7 @@ Paper_outputter::output_header ()
 void
 Paper_outputter::output_comment (String str)
 {
-  output_scheme (scm_listify (ly_symbol2scm ("comment"),
+  output_scheme (scm_list_n (ly_symbol2scm ("comment"),
                          ly_str02scm ((char*)str.ch_C ()),
                          SCM_UNDEFINED)
                 );
@@ -190,7 +190,7 @@ void
 Paper_outputter::output_Real_def (String k, Real v)
 {
   
-  SCM scm = scm_listify (ly_symbol2scm ("lily-def"),
+  SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
                     ly_str02scm (k.ch_l ()),
                     ly_str02scm (to_str (v).ch_l ()),
                     SCM_UNDEFINED);
@@ -201,7 +201,7 @@ void
 Paper_outputter::output_String_def (String k, String v)
 {
   
-  SCM scm = scm_listify (ly_symbol2scm ("lily-def"),
+  SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
                     ly_str02scm (k.ch_l ()),
                     ly_str02scm (v.ch_l ()),
                     SCM_UNDEFINED);
@@ -211,7 +211,7 @@ Paper_outputter::output_String_def (String k, String v)
 void
 Paper_outputter::output_int_def (String k, int v)
 {
-  SCM scm = scm_listify (ly_symbol2scm ("lily-def"),
+  SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
                     ly_str02scm (k.ch_l ()),
                     ly_str02scm (to_str (v).ch_l ()),
                     SCM_UNDEFINED);

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index ebf7d256bbe92ab0a9efcc25006ac8778a17ad6c..5605668c1c4072dc7ea2543fd0b58185aa5b94fb 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -117,12 +117,12 @@ Paper_score::process ()
   if (paper_l_->scope_p_)
     outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper");
 
-  SCM scm = scm_listify (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
 
   line_l_->output_lines ();
 
-  scm = scm_listify (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
+  scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
 
   progress_indication ("\n");

diff --git a/lily/parser.yy b/lily/parser.yy
index 3819a57f39a08f8c6da36fcb4150e14d2b68f68a..5afb5648a1b1175381857039a51443db0644c002 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1177,7 +1177,7 @@ command_element:
                Music *p2 = set_property_music (ly_symbol2scm ("measureLength"), len.smobbed_copy ());
                Music *p3 = set_property_music (ly_symbol2scm ("beatLength"), one_beat.smobbed_copy ());
 
-               SCM list = scm_listify (p1->self_scm (), p2->self_scm (), p3->self_scm(), SCM_UNDEFINED);
+               SCM list = scm_list_n (p1->self_scm (), p2->self_scm (), p3->self_scm(), SCM_UNDEFINED);
                Sequential_music *seq = new Sequential_music (SCM_EOL);
                seq->set_mus_property ("elements", list);
                
@@ -1764,7 +1764,7 @@ simple_element:
                        n->set_mus_property ("force-accidental", SCM_BOOL_T);
 
                Simultaneous_music*v = new Request_chord (SCM_EOL);
-               v->set_mus_property ("elements", scm_listify (n->self_scm (), SCM_UNDEFINED));
+               v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
                
                v->set_spot (i);
                n->set_spot (i);
@@ -1798,7 +1798,7 @@ simple_element:
                        e = rest_req_p->self_scm ();
                    }
                Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
-               velt_p-> set_mus_property ("elements", scm_listify (e,SCM_UNDEFINED));
+               velt_p-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED));
                velt_p->set_spot (i);
 
                $$ = velt_p;
@@ -1817,13 +1817,13 @@ simple_element:
                sp2->set_mus_property ("span-type", r);
 
                Request_chord * rqc1 = new Request_chord (SCM_EOL);
-               rqc1->set_mus_property ("elements", scm_listify (sp1->self_scm (), SCM_UNDEFINED));
+               rqc1->set_mus_property ("elements", scm_list_n (sp1->self_scm (), SCM_UNDEFINED));
                Request_chord * rqc2 = new Request_chord (SCM_EOL);
-               rqc2->set_mus_property ("elements", scm_listify (sk->self_scm (), SCM_UNDEFINED));;
+               rqc2->set_mus_property ("elements", scm_list_n (sk->self_scm (), SCM_UNDEFINED));;
                Request_chord * rqc3 = new Request_chord (SCM_EOL);
-               rqc3->set_mus_property ("elements", scm_listify (sp2->self_scm (), SCM_UNDEFINED));;
+               rqc3->set_mus_property ("elements", scm_list_n (sp2->self_scm (), SCM_UNDEFINED));;
 
-               SCM ms = scm_listify (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
+               SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
 
                $$ = new Sequential_music (SCM_EOL);
                $$->set_mus_property ("elements", ms);
@@ -1836,7 +1836,7 @@ simple_element:
                lreq_p->set_mus_property ("duration",$2);
                lreq_p->set_spot (i);
                Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
-               velt_p->set_mus_property ("elements", scm_listify (lreq_p->self_scm (), SCM_UNDEFINED));
+               velt_p->set_mus_property ("elements", scm_list_n (lreq_p->self_scm (), SCM_UNDEFINED));
 
                $$= velt_p;
        }
@@ -1910,7 +1910,7 @@ chord_step:
                $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
        }
        | CHORDMODIFIER_PITCH chord_note { /* Ugh. */
-               $$ = scm_listify (unsmob_pitch ($1)->smobbed_copy (),
+               $$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (),
                        $2, SCM_UNDEFINED);
        }
        ;

diff --git a/lily/porrectus.cc b/lily/porrectus.cc
index 439084b02087826f59edd31794e7d0303aadf058..a227330e0013daf4015955561de7393037b66d4f 100644 (file)
--- a/lily/porrectus.cc
+++ b/lily/porrectus.cc
@@ -432,7 +432,7 @@ Porrectus::brew_horizontal_slope(Real width, Real slope, Real thickness)
   SCM width_scm = gh_double2scm (width);
   SCM slope_scm = gh_double2scm (slope);
   SCM thickness_scm = gh_double2scm (thickness);
-  SCM horizontal_slope = scm_listify (ly_symbol2scm ("beam"),
+  SCM horizontal_slope = scm_list_n (ly_symbol2scm ("beam"),
                                  width_scm, slope_scm,
                                  thickness_scm, SCM_UNDEFINED);
   Box b (Interval (0, width),

diff --git a/lily/stem.cc b/lily/stem.cc
index d55e8d0738b7e9ef83c738cf6909bf098e61c546..b8dec893c0141305f3fd442319b5f615bceb2233 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -293,7 +293,7 @@ Stem::get_default_stem_end_position (Grob*me)
 
   // stem uses half-spaces
 
-  // fixme: use scm_listify_ref () iso. array[]
+  // fixme: use scm_list_n_ref () iso. array[]
   Real shorten_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
 
   /* URGURGURG

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index e4b36b5f1220f02122fa25d9ad7059e61ba4a8d9..48522d74c6aea3e4420fcaf7e6918c3b598b7a4c 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -23,7 +23,7 @@ System_start_delimiter::staff_bracket (Grob*me,Real height)
 {
   Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ;
   
-  SCM at = scm_listify (ly_symbol2scm ("bracket"),
+  SCM at = scm_list_n (ly_symbol2scm ("bracket"),
                    me->get_grob_property ("arch-angle"),
                    me->get_grob_property ("arch-width"),
                    gh_double2scm (arc_height),
@@ -143,12 +143,12 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
             name.  This is better than using find_font directly,
             esp. because that triggers mktextfm for non-existent
             fonts. */
-         SCM alist = scm_listify (gh_cons (ly_symbol2scm ("font-family"),
+         SCM alist = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
                                        ly_symbol2scm ("braces")),
                               gh_cons (ly_symbol2scm ("font-relative-size"),
                                        gh_int2scm (i)),
                               SCM_UNDEFINED);
-         fm = Font_interface::get_font (me, scm_listify (alist, SCM_UNDEFINED));
+         fm = Font_interface::get_font (me, scm_list_n (alist, SCM_UNDEFINED));
          /* Hmm, if lookup fails, we get cmr10 anyway */
          if (ly_scm2string (ly_car (fm->description_)) == "cmr10")
            break;
@@ -174,7 +174,7 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
     }
   while (hi - lo > 1);
       
-  SCM at = scm_listify (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
+  SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
   at = fontify_atom (fm, at);
   
   b = fm->get_char (lo);

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 7d4882acfce46270d763004492e2049972b5a8e1..5f7c4b8a3a575ab7186b3a3a7d612350fad7b6e1 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -43,7 +43,7 @@ Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain)
       /* urg, why not just do  this in markup_text2molecule ? */
       if (gh_string_p (ly_car (text)))
        return markup_text2molecule (me,
-                                    gh_append2 (scm_listify (SCM_EOL,
+                                    gh_append2 (scm_list_n (SCM_EOL,
                                                         SCM_UNDEFINED),
                                                 text),
                                     alist_chain);
@@ -116,7 +116,7 @@ Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text)
 #endif
   
 
-  SCM list = scm_listify (ly_symbol2scm ("text"), text, SCM_UNDEFINED);
+  SCM list = scm_list_n (ly_symbol2scm ("text"), text, SCM_UNDEFINED);
   list = fontify_atom (fm, list);
   
   return Molecule (fm->text_dimension (ly_scm2string (text)), list);
@@ -201,7 +201,7 @@ Text_item::markup_text2molecule (Grob *me, SCM markup_text,
        
       SCM next_p = SCM_EOL;
       if (gh_pair_p (ly_car (text)))
-       next_p = scm_listify (gh_call2 (f, sheet, gh_caar (text)), SCM_UNDEFINED);
+       next_p = scm_list_n (gh_call2 (f, sheet, gh_caar (text)), SCM_UNDEFINED);
       SCM next_k = ly_assoc_chain (ly_symbol2scm ("kern"), next_p);
       Real next_kern = kern[axis];
       if (gh_pair_p (next_k) && gh_number_p (ly_cdr (next_k)))

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 592bcd9844888cc2b4d39e2efaf8c6537b2de613..e5ee0362c85001fec2af7f579180f785552171d6 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -164,7 +164,7 @@ Tie_engraver::create_grobs ()
          if (!i)
            return;
          
-         SCM pair = scm_listify_ref (head_list, gh_int2scm (i/2));
+         SCM pair = scm_list_n_ref (head_list, gh_int2scm (i/2));
          
          Spanner * p = new Spanner (basic);
 

diff --git a/lily/translator-def.cc b/lily/translator-def.cc
index 47dacdee8d50e49d8b6274b215885c38d1c463b6..7f0a2bb34a336a3d3a03be2d7dfb2422a3f5f656 100644 (file)
--- a/lily/translator-def.cc
+++ b/lily/translator-def.cc
@@ -138,14 +138,14 @@ Translator_def::add_last_element (SCM s)
 void
 Translator_def::add_push_property (SCM props, SCM syms,  SCM vals)
 {
-  this->property_ops_ = gh_cons (scm_listify (push_sym, props, syms, vals, SCM_UNDEFINED),
+  this->property_ops_ = gh_cons (scm_list_n (push_sym, props, syms, vals, SCM_UNDEFINED),
                                 this->property_ops_);
 }
 
 void
 Translator_def::add_pop_property (SCM props, SCM syms)
 {
-  this->property_ops_ = gh_cons (scm_listify (push_sym, props, syms, SCM_UNDEFINED),
+  this->property_ops_ = gh_cons (scm_list_n (push_sym, props, syms, SCM_UNDEFINED),
                                 this->property_ops_);
 }
 
@@ -299,7 +299,7 @@ Translator_def::make_scm ()
 void
 Translator_def::add_property_assign (SCM nm, SCM val)
 {
-  this->property_ops_ = gh_cons (scm_listify (assign_sym, scm_string_to_symbol (nm), val, SCM_UNDEFINED),
+  this->property_ops_ = gh_cons (scm_list_n (assign_sym, scm_string_to_symbol (nm), val, SCM_UNDEFINED),
                                 this->property_ops_);
 }
 

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 316d88e7edbda58775d9342b895a21e0fbf57f05..bac89f1d2572ceb501873540e57128b72bdce353 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -113,7 +113,7 @@ Tuplet_bracket::brew_molecule (SCM smob)
       SCM thick = me->get_grob_property ("thick");
       SCM gap = me->get_grob_property ("number-gap");
          
-      SCM at =scm_listify (ly_symbol2scm ("tuplet"),
+      SCM at =scm_list_n (ly_symbol2scm ("tuplet"),
                       gh_double2scm (1.0),
                       gap,
                       gh_double2scm (w),

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 0a74c470530369c7cfe8870324786c684b77621c..aa3f0065e54a99e546a4be89b8e1ec0dcfdef6cd 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -85,7 +85,7 @@ Tuplet_engraver::create_grobs ()
       SCM proc = get_property ("tupletNumberFormatFunction");
       if (gh_procedure_p (proc))
        {
-         SCM t = gh_apply (proc, scm_listify (time_scaled_music_arr_[i]->self_scm (), SCM_UNDEFINED));
+         SCM t = gh_apply (proc, scm_list_n (time_scaled_music_arr_[i]->self_scm (), SCM_UNDEFINED));
          glep->set_grob_property ("text", t);
        }
       

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 61f8a5b2d826f3a960f4ecf122c91c3b87c10819..46ad0a4be934810a9f8c08e16572af6722bb24d8 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -165,7 +165,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
                }                 
              
              if (do_repcommands)
-               add_repeat_command (scm_listify (ly_symbol2scm ("volta"),
+               add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
                                             ly_str02scm (repstr.ch_C ()), SCM_UNDEFINED));
            }     
        }
@@ -199,7 +199,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
            alternative_cons_ = ly_cdr (alternative_cons_);
          
          if (do_repcommands)
-           add_repeat_command (scm_listify (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+           add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
 
          
          
@@ -223,7 +223,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
          if (do_repcommands)
            {
              String repstr = to_str (done_count_ + 1) + ".";
-             add_repeat_command (scm_listify (ly_symbol2scm ("volta"),
+             add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
                                           ly_str02scm (repstr.ch_C ()), SCM_UNDEFINED));
              add_repeat_command (ly_symbol2scm ("end-repeat"));
            }

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 35bfb1a6192165c43ed5ae5cf6072ed51009bdc1..5771f502cbab9eda29a940146cc0c5ec2855fdaf 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -93,7 +93,7 @@ Volta_spanner::brew_molecule (SCM smob)
   /*
     ugh: should build from line segments.
    */
-  SCM at = (scm_listify (ly_symbol2scm ("volta"),
+  SCM at = (scm_list_n (ly_symbol2scm ("volta"),
                     gh_double2scm (h),
                     gh_double2scm (w),
                     gh_double2scm (t),
@@ -104,7 +104,7 @@ Volta_spanner::brew_molecule (SCM smob)
   Box b (Interval (0, w), Interval (0, h));
   Molecule mol (b, at);
   SCM text = me->get_grob_property ("text");
-  SCM properties = scm_listify (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED);
+  SCM properties = scm_list_n (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED);
   Molecule num = Text_item::text2molecule (me, text, properties);
 
   mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()