CVSROOT: /cvsroot/lilypond Module name: lilypond Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/15 18:28:41
Modified files: . : ChangeLog input/regression: display-lily-tests.ly tuplet-full-length.ly lily : parser.yy smobs.cc ly : engraver-init.ly scm : define-music-display-methods.scm lily.scm Log message: * ly/engraver-init.ly: add Rest_engraver only once. * scm/define-music-display-methods.scm (KeyChangeEvent): only do (*parser*) lookup if (*parser*) != #f. CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4008&tr2=1.4009&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/display-lily-tests.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/tuplet-full-length.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.487&tr2=1.488&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/smobs.cc.diff?tr1=1.3&tr2=1.4&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.242&tr2=1.243&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-music-display-methods.scm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.374&tr2=1.375&r1=text&r2=text Patches: Index: lilypond/ChangeLog diff -u lilypond/ChangeLog:1.4008 lilypond/ChangeLog:1.4009 --- lilypond/ChangeLog:1.4008 Mon Aug 15 18:06:06 2005 +++ lilypond/ChangeLog Mon Aug 15 18:28:40 2005 @@ -1,3 +1,10 @@ +2005-08-15 Han-Wen Nienhuys <[EMAIL PROTECTED]> + + * ly/engraver-init.ly: add Rest_engraver only once. + + * scm/define-music-display-methods.scm (KeyChangeEvent): only do + (*parser*) lookup if (*parser*) != #f. + 2005-08-15 Jan Nieuwenhuizen <[EMAIL PROTECTED]> * input/regression/slur-script.ly: Add example of reverting Index: lilypond/input/regression/display-lily-tests.ly diff -u lilypond/input/regression/display-lily-tests.ly:1.1 lilypond/input/regression/display-lily-tests.ly:1.2 --- lilypond/input/regression/display-lily-tests.ly:1.1 Fri Jul 22 18:39:34 2005 +++ lilypond/input/regression/display-lily-tests.ly Mon Aug 15 18:28:41 2005 @@ -29,7 +29,6 @@ #(read-hash-extend #\[ my-read-lily-expression) -#(display-lily-init parser) #(define test-number 0) #(define (lily-string->markup str) Index: lilypond/input/regression/tuplet-full-length.ly diff -u lilypond/input/regression/tuplet-full-length.ly:1.1 lilypond/input/regression/tuplet-full-length.ly:1.2 --- lilypond/input/regression/tuplet-full-length.ly:1.1 Fri Aug 5 18:18:15 2005 +++ lilypond/input/regression/tuplet-full-length.ly Mon Aug 15 18:28:41 2005 @@ -10,7 +10,7 @@ \paper { raggedright = ##t indent = 0.0 } -\new Voice \with { +\relative c'' \new Voice \with { \remove Forbid_line_break_engraver allowBeamBreak = ##t } Index: lilypond/lily/parser.yy diff -u lilypond/lily/parser.yy:1.487 lilypond/lily/parser.yy:1.488 --- lilypond/lily/parser.yy:1.487 Thu Aug 4 13:36:43 2005 +++ lilypond/lily/parser.yy Mon Aug 15 18:28:41 2005 @@ -1779,7 +1779,6 @@ SCM proc = ly_lily_module_constant ("make-mark-set"); SCM result = scm_call_1 (proc, $2); - scm_gc_protect_object (result); $$ = unsmob_music (result); $$->protect (); } Index: lilypond/lily/smobs.cc diff -u lilypond/lily/smobs.cc:1.3 lilypond/lily/smobs.cc:1.4 --- lilypond/lily/smobs.cc:1.3 Sat Aug 13 21:35:22 2005 +++ lilypond/lily/smobs.cc Mon Aug 15 18:28:41 2005 @@ -8,6 +8,9 @@ #include "smobs.hh" +/* + The CDR contains the actual protected list. + */ static SCM smob_protection_list; void @@ -17,6 +20,16 @@ scm_permanent_object (smob_protection_list); } ADD_SCM_INIT_FUNC (init_smob_protection, init_smob_protection); + +LY_DEFINE(ly_smob_protects, "ly:smob-protects", + 0,0,0, (), + "Return lily's internal smob protection list") +{ + return scm_cdr (smob_protection_list); +} + + + void protect_smob (SCM smob, SCM *prot_cons) Index: lilypond/ly/engraver-init.ly diff -u lilypond/ly/engraver-init.ly:1.242 lilypond/ly/engraver-init.ly:1.243 --- lilypond/ly/engraver-init.ly:1.242 Fri Aug 5 13:44:36 2005 +++ lilypond/ly/engraver-init.ly Mon Aug 15 18:28:41 2005 @@ -243,7 +243,6 @@ \remove "Glissando_engraver" \remove "Ligature_bracket_engraver" \remove "Note_heads_engraver" - \consists "Rest_engraver" \consists "Drum_notes_engraver" \remove "New_fingering_engraver" Index: lilypond/scm/define-music-display-methods.scm diff -u lilypond/scm/define-music-display-methods.scm:1.2 lilypond/scm/define-music-display-methods.scm:1.3 --- lilypond/scm/define-music-display-methods.scm:1.2 Sun Jul 24 12:49:13 2005 +++ lilypond/scm/define-music-display-methods.scm Mon Aug 15 18:28:41 2005 @@ -561,7 +561,8 @@ (format #f "\\key ~a \\~a~a" (note-name->lily-string (ly:music-property key 'tonic)) (any (lambda (mode) - (if (equal? (ly:parser-lookup (*parser*) mode) c-pitch-alist) + (if (and (*parser*) + (equal? (ly:parser-lookup (*parser*) mode) c-pitch-alist)) (symbol->string mode) #f)) '(major minor ionian locrian aeolian mixolydian lydian phrygian dorian)) Index: lilypond/scm/lily.scm diff -u lilypond/scm/lily.scm:1.374 lilypond/scm/lily.scm:1.375 --- lilypond/scm/lily.scm:1.374 Thu Aug 4 01:01:13 2005 +++ lilypond/scm/lily.scm Mon Aug 15 18:28:41 2005 @@ -316,20 +316,24 @@ (display (format "Dumping gc protected objs to ~a...\n" out-file-name)) (display - (filter - (lambda (x) (not (symbol? x))) - (map (lambda (y) - (let ((x (car y)) - (c (cdr y))) - - (string-append - (string-join - (map object->string (list (object-address x) c x)) - " ") - "\n"))) + (map (lambda (y) + (let ((x (car y)) + (c (cdr y))) + + (string-append + (string-join + (map object->string (list (object-address x) c x)) + " ") + "\n"))) + + (filter + (lambda (x) + (not (symbol? (car x)))) protects)) outfile) +; (display (ly:smob-protects)) + (newline outfile) (if (defined? 'gc-live-object-stats) (let* ((stats #f)) (display "Live object statistics: GC'ing\n") @@ -375,17 +379,17 @@ (for-each (lambda (x) (lilypond-file handler x) - (ly:clear-anonymous-modules)) + (ly:clear-anonymous-modules) + (if (ly:get-option 'debug-gc) + (dump-gc-protects))) + files) failed)) (define (lilypond-file handler file-name) (catch 'ly-file-failed (lambda () (ly:parse-file file-name)) - (lambda (x . args) (handler x file-name))) - - (if (ly:get-option 'debug-gc) - (dump-gc-protects))) + (lambda (x . args) (handler x file-name)))) (use-modules (scm editor)) _______________________________________________ Lilypond-cvs mailing list Lilypond-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-cvs