From: Jan Nieuwenhuizen Date: Mon, 1 Oct 2001 11:45:09 +0000 (+0200) Subject: patch::: 1.4.8.jcn1 X-Git-Tag: release/1.4.9~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a43cbef2acaaa980e52480b83a081ed6cb4d26fd;p=lilypond.git patch::: 1.4.8.jcn1 1.4.8.jcn1 ========== * Backported more guile > 1.4 compatibility stuff. 1.4.8 ===== --- diff --git a/CHANGES b/CHANGES index b38296f88a..b52916675b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +1.4.8.jcn1 +========== + +* Backported more guile > 1.4 compatibility stuff. + +1.4.8 +===== + 1.4.7.jcn2 ========== diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index 8a96551d0c..cfb235d277 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -24,7 +24,7 @@ Please send GNU LilyPond questions and comments to

Please send comments on these web pages to -@MAIL_ADDRESS@ +@MAILADDRESS@

diff --git a/VERSION b/VERSION index 0a9c5c333d..28c826a5dc 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=8 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 1cf59b1171..6ac10571c0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,3 +1,5 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 8bad438909..d4d4e8d03c 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -122,9 +122,9 @@ Break_align_interface::do_alignment (Grob *me) next_origin = ly_symbol2scm ("begin-of-note"); SCM alist = me->get_grob_property ("space-alist"); - SCM e = scm_assoc (scm_listify (current_origin, - next_origin, - SCM_UNDEFINED), alist); + SCM e = scm_assoc (scm_list_n (current_origin, + next_origin, + SCM_UNDEFINED), alist); SCM extra_space; if (e != SCM_BOOL_F) @@ -136,7 +136,7 @@ Break_align_interface::do_alignment (Grob *me) warning (_f ("unknown spacing pair `%s', `%s'", ly_symbol2string (current_origin), ly_symbol2string (next_origin))); - extra_space = scm_listify (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED); + extra_space = scm_list_n (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED); } SCM symbol = gh_car (extra_space); diff --git a/lily/cxx-function-smob.cc b/lily/cxx-function-smob.cc index 26ceeed091..18369c87f2 100644 --- a/lily/cxx-function-smob.cc +++ b/lily/cxx-function-smob.cc @@ -25,8 +25,8 @@ print_smob (SCM, SCM port, scm_print_state *) return 1; } -static -scm_sizet free_smob (SCM) +static size_t +free_smob (SCM) { return 0; } diff --git a/lily/grob.cc b/lily/grob.cc index 40f92a3876..3415e1a05a 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -49,7 +49,7 @@ Grob::Grob (SCM basicprops) */ pscore_l_=0; - status_i_ = 0; + status_c_ = 0; original_l_ = 0; immutable_property_alist_ = basicprops; mutable_property_alist_ = SCM_EOL; @@ -97,7 +97,7 @@ Grob::Grob (Grob const&s) immutable_property_alist_ = s.immutable_property_alist_; mutable_property_alist_ = SCM_EOL; - status_i_ = s.status_i_; + status_c_ = s.status_c_; pscore_l_ = s.pscore_l_; smobify_self (); @@ -222,18 +222,16 @@ Grob::paper_l () const void Grob::calculate_dependencies (int final, int busy, SCM funcname) { - assert (status_i_ >=0); - - if (status_i_ >= final) + if (status_c_ >= final) return; - if (status_i_== busy) + if (status_c_== busy) { programming_error ("Element is busy, come back later"); return; } - status_i_= busy; + status_c_= busy; for (SCM d= get_grob_property ("dependencies"); gh_pair_p (d); d = gh_cdr (d)) { @@ -247,7 +245,7 @@ Grob::calculate_dependencies (int final, int busy, SCM funcname) if (gh_procedure_p (proc)) gh_call1 (proc, this->self_scm ()); - status_i_= final; + status_c_= final; } diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 2de2b88fc2..e1820f9d07 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -46,7 +46,7 @@ public: 0 means ORPHAN, */ - char status_i_; + char status_c_; String name () const; /* @@ -89,7 +89,7 @@ public: /** Recursively track all dependencies of this Grob. The - status_i_ field is used as a mark-field. It is marked with + status_c_ field is used as a mark-field. It is marked with #busy# during execution of this function, and marked with #final# when finished. diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc index 00c61e4e87..c721d4835a 100644 --- a/lily/include/ly-smobs.icc +++ b/lily/include/ly-smobs.icc @@ -50,15 +50,17 @@ CL::smob_p (SCM s) \ void \ CL::init_smobs () \ { \ - smob_tag_ = scm_make_smob_type_mfpe ( \ - #CL, 0, CL::mark_smob, CL::free_smob, CL::print_smob, \ - CL::equal_p); \ + smob_tag_ = scm_make_smob_type (#CL, 0); \ + scm_set_smob_mark (smob_tag_, CL::mark_smob); \ + scm_set_smob_free (smob_tag_, CL::free_smob); \ + scm_set_smob_print (smob_tag_, CL::print_smob); \ + scm_set_smob_equalp (smob_tag_, CL::equal_p); \ } \ SCM CL::smobbed_self () const \ { \ SCM s; \ s = gh_cons (SCM_PACK (CL::smob_tag_), SCM_PACK (this)); \ - scm_done_malloc (sizeof (CL)); \ + scm_done_malloc (sizeof (CL)); \ \ return s; \ } \ @@ -70,7 +72,7 @@ CL::unsmob (SCM s) \ else \ return 0; \ } \ -scm_sizet \ +size_t \ CL::free_smob (SCM ses) \ { \ CL * s = (CL*) SCM_CDR (ses); \ diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index c2169f3fdb..5b50c22c01 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -45,7 +45,7 @@ typedef std::map Scm_stl_map; 2. UPON DESTRUCTION, DO - scm_unprotect_object (tab->self_scm_); + scm_gc_unprotect_object (tab->self_scm_); diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 297bf08385..1fcdfbcb75 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -28,8 +28,8 @@ print_smob (SCM s, SCM port, scm_print_state *) return 1; } -static -scm_sizet free_smob (SCM s) +static size_t +free_smob (SCM s) { delete unsmob_input (s); return 0; @@ -44,12 +44,14 @@ ly_input_p (SCM x) static void start_input_smobs () { - input_tag - = scm_make_smob_type_mfpe ("input", 0, - mark_smob, free_smob, - print_smob, 0); - scm_c_define_gsubr ("ly-input-location?", 1, 0, 0, (Scheme_function_unknown)ly_input_p); - + input_tag = scm_make_smob_type ("input", 0); + scm_set_smob_mark (input_tag, mark_smob); + scm_set_smob_free (input_tag, free_smob); + scm_set_smob_print (input_tag, print_smob); + scm_set_smob_equalp (input_tag, 0); + + scm_c_define_gsubr ("ly-input-location?", 1, 0, 0, + (Scheme_function_unknown)ly_input_p); } SCM @@ -70,7 +72,7 @@ unsmob_input (SCM s) { if (SCM_IMP (s)) return 0; - if ((long)SCM_CAR (s) == input_tag) // ugh. + if (SCM_CAR (s) == (SCM)input_tag) // ugh. return (Input*) SCM_CDR (s); else return 0; diff --git a/lily/item.cc b/lily/item.cc index 52f647f732..eeed9d86cc 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -160,7 +160,7 @@ Item::handle_prebroken_dependencies () SCM vis = get_grob_property ("visibility-lambda"); if (gh_procedure_p (vis)) { - SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED); + SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED); SCM result = gh_apply (vis, args); bool trans = gh_scm2bool (gh_car (result)); bool empty = gh_scm2bool (gh_cdr (result)); diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 74f702c6af..e945412924 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -47,9 +47,9 @@ Key_performer::create_audio_elements () if (key_req_l_) { SCM pitchlist = key_req_l_->get_mus_property ("pitch-alist"); - SCM proc = scm_eval2 (ly_symbol2scm ("accidentals-in-key"), SCM_EOL); + SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key")); SCM acc = gh_call1 (proc, pitchlist); - proc = scm_eval2 (ly_symbol2scm ("major-key"), SCM_EOL); + proc = scm_primitive_eval (ly_symbol2scm ("major-key")); SCM major = gh_call1 (proc, pitchlist); audio_p_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); Audio_element_info info (audio_p_, key_req_l_); diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 93a32caa02..da3193526e 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -45,7 +45,7 @@ ly_write2scm (SCM s) SCM_OPN | SCM_WRTNG, "ly_write2string"); // SCM write = scm_eval_3 (ly_symbol2scm ("write"), s, SCM_EOL); - SCM write = scm_eval2 (ly_symbol2scm ("write"), SCM_EOL); + SCM write = scm_primitive_eval (ly_symbol2scm ("write")); // scm_apply (write, port, SCM_EOL); gh_call2 (write, s, port); @@ -74,8 +74,8 @@ ly_parse_scm (char const* s, int* n) /* Read expression from port */ if (!SCM_EOF_OBJECT_P (form = scm_read (port))) - answer = scm_eval_3 (form, 1, SCM_EOL); // guh? - + answer = scm_primitive_eval (form); + /* After parsing @@ -126,7 +126,7 @@ String ly_symbol2string (SCM s) { assert (gh_symbol_p (s)); - return String ((Byte*)SCM_CHARS (s), (int) SCM_LENGTH (s)); + return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s)); } diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 80d3e6e6bc..067d57cc15 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -130,7 +130,7 @@ Midi_instrument::str() const { Byte program_byte = 0; bool found = false; - SCM proc = scm_eval2 (ly_symbol2scm ("midi-program"), SCM_EOL); + SCM proc = scm_primitive_eval (ly_symbol2scm ("midi-program")); SCM program = gh_call1 (proc, ly_symbol2scm (audio_l_->str_.ch_C())); found = (program != SCM_BOOL_F); if (found) diff --git a/lily/music-list.cc b/lily/music-list.cc index e3e188e9e2..5870ae3ec2 100644 --- a/lily/music-list.cc +++ b/lily/music-list.cc @@ -1,8 +1,6 @@ /* music-list.cc -- implement Music_sequence, Simultaneous_music, Sequential_music - source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/note-head.cc b/lily/note-head.cc index f7ef57ecc9..2a1c813a84 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -99,11 +99,10 @@ 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_eval2 (gh_list (ly_symbol2scm ("find-notehead-symbol"), + ly_scm2string (scm_primitive_eval (gh_list (ly_symbol2scm ("find-notehead-symbol"), me->get_grob_property ("duration-log"), ly_quote_scm (style), - SCM_UNDEFINED), - SCM_EOL))); + SCM_UNDEFINED)))); if (streepjes_i) { diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index c146d194a3..59d4fb4ba5 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -77,8 +77,8 @@ Paper_outputter::output_header () SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C ()), ly_quote_scm (ly_symbol2scm ("all-definitions")), SCM_UNDEFINED); - exp = scm_eval2 (exp, SCM_EOL); - scm_eval2 (exp, SCM_EOL); + exp = scm_primitive_eval (exp); + scm_primitive_eval (exp); String creator = gnu_lilypond_version_str (); @@ -139,7 +139,7 @@ Paper_outputter::dump_scheme (SCM s) } else { - SCM result = scm_eval2 (s, SCM_EOL); + SCM result = scm_primitive_eval (s); char *c=gh_scm2newstr (result, NULL); *stream_p_ << c; diff --git a/lily/parser.yy b/lily/parser.yy index 043d5a812c..591cfe1d42 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -713,7 +713,7 @@ Repeated_music: r-> set_mus_property ("alternatives", alts->self_scm ()); scm_gc_unprotect_object (alts->self_scm ()); } - SCM func = scm_eval2 (ly_symbol2scm ("repeat-name-to-ctor"), SCM_EOL); + SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor")); SCM result = gh_call1 (func, $2); set_music_properties (r, result); @@ -1090,7 +1090,7 @@ command_element: sp-> set_mus_property ("context-type", ly_str02scm ( "Score")); } | CLEF STRING { - SCM func = scm_eval2 (ly_symbol2scm ("clef-name-to-properties"), SCM_EOL); + SCM func = scm_primitive_eval (ly_symbol2scm ("clef-name-to-properties")); SCM result = gh_call1 (func, $2); SCM l = SCM_EOL; @@ -1926,7 +1926,7 @@ string: $$ = $1; } | string '+' string { - $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED)); + $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED)); } ; diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 043f83c557..3a871b4aeb 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -202,11 +202,10 @@ Part_combine_music_iterator::get_state (Moment) if (first_pitches != SCM_EOL && second_pitches != SCM_EOL) { scm_sort_list_x (first_pitches, - scm_eval2 (ly_str02scm ("Pitch::less_p"), - SCM_EOL)); + scm_primitive_eval (ly_str02scm ("Pitch::less_p"))); scm_sort_list_x (second_pitches, - scm_eval2 (ly_str02scm ("Pitch::less_p"), - SCM_EOL)); + scm_primitive_eval (ly_str02scm ("Pitch::less_p"))); + interval = gh_int2scm (unsmob_pitch (gh_car (first_pitches))->steps () - unsmob_pitch (gh_car (scm_last_pair (second_pitches)))->steps ()); } @@ -214,16 +213,14 @@ Part_combine_music_iterator::get_state (Moment) if (first_durations != SCM_EOL) { scm_sort_list_x (first_durations, - scm_eval2 (ly_str02scm ("Duration::less_p"), - SCM_EOL)); + scm_primitive_eval (ly_str02scm ("Duration::less_p"))); first_mom += unsmob_duration (gh_car (first_durations))->length_mom (); } if (second_durations != SCM_EOL) { scm_sort_list_x (second_durations, - scm_eval2 (ly_str02scm ("Duration::less_p"), - SCM_EOL)); + scm_primitive_eval (ly_str02scm ("Duration::less_p"))); second_mom += unsmob_duration (gh_car (second_durations))->length_mom (); } diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index cb234ad6b7..6209637314 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -111,7 +111,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) if (val == SCM_EOL) ; // Not defined in context. - else if (gh_apply (type_p, scm_listify (val, SCM_UNDEFINED)) + else if (gh_apply (type_p, scm_list_n (val, SCM_UNDEFINED)) == SCM_BOOL_T) // defined and right type: do it { e->set_grob_property (elt_prop_sym, val); @@ -140,7 +140,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) if (val != SCM_EOL) { // not the right type: error message. SCM errport = scm_current_error_port (); - SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); + SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name")); SCM type_name = gh_call1 (typefunc, type_p); warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s", ly_symbol2string (prop_sym).ch_C (), diff --git a/lily/slur.cc b/lily/slur.cc index 33d0ce5757..d48c91d7b6 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -336,7 +336,7 @@ Slur::get_attachment (Grob *me, Direction dir, int stemdir = stem ? Stem::get_direction (stem) : 1; int slurdir = gh_scm2int (me->get_grob_property ("direction")); SCM l = scm_assoc - (scm_listify (a, + (scm_list_n (a, gh_int2scm (stemdir * dir), gh_int2scm (slurdir * dir), SCM_UNDEFINED), alist); diff --git a/lily/spanner.cc b/lily/spanner.cc index 0fba92f847..15f0ad8a8c 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -287,7 +287,7 @@ Spanner::do_derived_mark () { /* We'd be fucked if this is called before spanned_drul_[] is inited. */ - if (status_i_ == ORPHAN) + if (status_c_ == ORPHAN) return SCM_EOL; Direction d = LEFT; diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index f79bf760f2..aee7edc6a0 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -91,7 +91,7 @@ Staff_performer::create_audio_elements () void Staff_performer::stop_translation_timestep () { - SCM proc = scm_eval2 (ly_symbol2scm ("percussion-p"), SCM_EOL); + SCM proc = scm_primitive_eval (ly_symbol2scm ("percussion-p")); SCM drums_p = gh_call1 (proc, ly_symbol2scm (instrument_str_.ch_C())); audio_staff_p_->channel_i_ = (drums_p == SCM_BOOL_T ? 9 : -1 ); if (name_p_) diff --git a/lily/stem.cc b/lily/stem.cc index aca140aaf7..1e229e1f0f 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -450,7 +450,7 @@ Stem::set_spacing_hints (Grob*me) Item* item = dynamic_cast (me); Item * col = item->column_l (); SCM dirlist =col->get_grob_property ("dir-list"); - if (scm_sloppy_memq (scmdir, dirlist) == SCM_BOOL_F) + if (scm_c_memq (scmdir, dirlist) == SCM_BOOL_F) { dirlist = gh_cons (scmdir, dirlist); col->set_grob_property ("dir-list", dirlist); diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 6225859dd1..31b887671e 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -422,7 +422,7 @@ type_check_assignment (SCM val, SCM sym, SCM type_symbol) { SCM errport = scm_current_error_port (); ok = false; - SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); + SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name")); SCM type_name = gh_call1 (typefunc, type_p); scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", diff --git a/scm/ascii-script.scm b/scm/ascii-script.scm index ddbeacd7c1..b899092088 100644 --- a/scm/ascii-script.scm +++ b/scm/ascii-script.scm @@ -269,4 +269,4 @@ ) (define (scm-as-output) - (ly-eval (as-scm 'all-definitions))) + (primitive-eval (as-scm 'all-definitions))) diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 5afd9e34f0..d275e1ea5e 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -349,7 +349,7 @@ bass-and-inversion steps))) (define (chord::restyle name style) - (ly-eval (string->symbol + (primitive-eval (string->symbol (string-append (symbol->string name) (symbol->string style))))) diff --git a/scm/drums.scm b/scm/drums.scm index 187844cd5d..683f0d29b4 100644 --- a/scm/drums.scm +++ b/scm/drums.scm @@ -1,7 +1,7 @@ ;;;; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly ;;;; 2001/03/25 Rune Zedeler -;;;; changed eval to ly-eval for guile 1.4/1.4.1 compatibility --jcn +;;;; changed eval to primitive-eval for guile 1.4/1.4.1 compatibility --jcn (define (seq-music-list elts) (let* ( (ml (ly-make-music "Sequential_music")) ) @@ -100,7 +100,7 @@ (begin (display p) ;; UGH. FIXME. pitch->string ??? (ly-warn " unknown drumpitch.") - (cdar (ly-eval kit)) + (cdar (primitive-eval kit)) )) ((eq? p (caddr (car pitches))) ((name->paper kit) (caar pitches)) ) (else (p2p (cdr pitches) ) ) @@ -108,12 +108,12 @@ ) ) (define ((name->paper kit) n) - (let n2p ((pitches (ly-eval kit))) + (let n2p ((pitches (primitive-eval kit))) (cond ((eq? pitches '()) (begin (ly-warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n "'\nSee lily/drumpitch.ly for supported drums.")) - (cdar (ly-eval kit)) + (cdar (primitive-eval kit)) )) ((eq? n (caar pitches)) (cdar pitches) ) (else (n2p (cdr pitches) ) ) diff --git a/scm/interface-description.scm b/scm/interface-description.scm index d63e131639..3dd45314c4 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -773,7 +773,7 @@ direction = Forced direction for all ties" )) -(ly-eval (cons +(primitive-eval (cons 'begin (map (lambda (x) (list 'define (car x) (list 'quote (cdr x)))) all-interfaces))) diff --git a/scm/lily.scm b/scm/lily.scm index a0bfc1dec2..b8f28858fe 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -54,7 +54,9 @@ ;;; Un-assorted stuff ;; URG guile-1.4/1.4.x compatibility -(define (ly-eval x) (eval2 x #f)) +(if (not (defined? 'primitive-eval)) + (define (primitive-eval form) + (eval2 form #f))) (define (sign x) (if (= x 0) diff --git a/scm/pdf.scm b/scm/pdf.scm index b5a3cb6352..50c674e88f 100644 --- a/scm/pdf.scm +++ b/scm/pdf.scm @@ -281,7 +281,7 @@ ) (define (scm-pdf-output) - (ly-eval (pdf-scm 'all-definitions))) + (primitive-eval (pdf-scm 'all-definitions))) ; Local Variables: ; scheme-program-name: "guile" diff --git a/scm/pdftex.scm b/scm/pdftex.scm index 01d16ec145..736cf9bcbf 100644 --- a/scm/pdftex.scm +++ b/scm/pdftex.scm @@ -245,4 +245,4 @@ ) (define (scm-pdftex-output) - (ly-eval (pdftex-scm 'all-definitions))) + (primitive-eval (pdftex-scm 'all-definitions))) diff --git a/scm/ps.scm b/scm/ps.scm index 8e4dc95ecf..9875dd3904 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -258,4 +258,4 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale ) (define (scm-ps-output) - (ly-eval (ps-scm 'all-definitions))) + (primitive-eval (ps-scm 'all-definitions))) diff --git a/scm/tex.scm b/scm/tex.scm index c5c886914c..ff1225781a 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -257,4 +257,4 @@ ) (define (scm-tex-output) - (ly-eval (tex-scm 'all-definitions))) + (primitive-eval (tex-scm 'all-definitions))) diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 6a08f29e0a..4e23ef714c 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -42,7 +42,7 @@ built = r"""

This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ by
 -

@GCOS@ <@MAIL_ADDRESS@>, +
@GCOS@ <@MAILADDRESS@>, @LOCALTIME@.
""" @@ -195,7 +195,7 @@ def do_file (f): s = re.sub ('@WEBMASTER@', webmaster, s) s = re.sub ('@GCOS@', gcos, s) s = re.sub ('@LOCALTIME@', localtime, s) - s = re.sub ('@MAIL_ADDRESS@', mail_address, s) + s = re.sub ('@MAILADDRESS@', mail_address, s) open (f, 'w').write (s)