From a999ec6e8af5951c122366fc5a80d66cec2ff6f0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 30 Apr 2005 19:47:14 +0000 Subject: [PATCH] add space to variable list. --- ChangeLog | 4 ++++ Documentation/topdocs/NEWS.tely | 6 +++--- lily/parse-scm.cc | 4 ++-- lily/part-combine-engraver.cc | 2 +- lily/tweak-registration-scheme.cc | 2 +- scm/framework-ps.scm | 6 +++--- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e84af01875..c7b55c0c14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-04-30 Han-Wen Nienhuys + + * lily/part-combine-engraver.cc: add space to variable list. + 2005-04-30 Graham Percival * scm/define-grobs.scm: changed RemoveEmptyVerticalGroup's diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 2b26300f5d..0fad6e2c9c 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -215,9 +215,9 @@ using the @code{-f texstr} output backend. This provides exact metrics for texts, including kerning and accents. @item -LilyPond now uses FreeType read the Feta font as an OpenType -font. This is cleaner design and more robust. Recent versions of -FontForge (20041211 or newer) and Freetype are required. As a result, +LilyPond now uses FreeType read the Feta font as an OpenType font. This +is a cleaner design and more robust. Recent versions of FontForge (2004 +1211 or newer) and Freetype are required. As a result, @item the SVG backend is now a fully functional backend. diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index 78a3c52865..2f8aa221d1 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -29,11 +29,11 @@ internal_ly_parse_scm (Parse_start *ps) scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET)); SCM from = scm_ftell (port); - SCM form; SCM answer = SCM_UNSPECIFIED; + SCM form = scm_read (port); /* Read expression from port. */ - if (!SCM_EOF_OBJECT_P (form = scm_read (port))) + if (!SCM_EOF_OBJECT_P (form)) { if (ps->safe_) { diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index d5014356a9..9e10ff3e12 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -99,6 +99,6 @@ ADD_TRANSLATOR (Part_combine_engraver, /* accepts */ "part-combine-event", /* acks */ "multi-measure-rest-interface " "slur-interface stem-interface note-head-interface", - /* reads */ "printPartCombineTexts soloText soloIIText" + /* reads */ "printPartCombineTexts soloText soloIIText " "aDueText", /* write */ ""); diff --git a/lily/tweak-registration-scheme.cc b/lily/tweak-registration-scheme.cc index 0e13e326d5..694f4e4451 100644 --- a/lily/tweak-registration-scheme.cc +++ b/lily/tweak-registration-scheme.cc @@ -65,7 +65,7 @@ LY_DEFINE (ly_all_tweaks, "ly:all-tweaks", LY_DEFINE (ly_tweak_read_tweaks, "ly:tweak-define-tweaks", 1, 0, 0, (SCM tweaks), - "Read tweaks") + "Read tweaks") { for (SCM s = tweaks; scm_is_pair (s); s = scm_cdr (s)) global_registry_->insert_tweak_from_file (scm_car (s)); diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 0e2bdf78de..b7fbae4842 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -352,6 +352,7 @@ ) + ;; skip booktitles. (if (and (not @@ -363,14 +364,13 @@ (ly:paper-system-title? (list-ref systems 0)) (ly:paper-system-title? (list-ref systems 1))) (set! systems (cdr systems))) - (for-each (lambda (sys) (if (or (ly:paper-system-title? sys) - (and (pair? to-dump-systems) - (ly:paper-system-title? (car to-dump-systems)))) + (not (pair? to-dump-systems)) + (ly:paper-system-title? (car to-dump-systems))) (set! to-dump-systems (cons sys to-dump-systems)))) systems) -- 2.39.5