add space to variable list.

diff --git a/ChangeLog b/ChangeLog
index e84af018753a4404f0ac5c562d3fd371ca9b345f..c7b55c0c149304a5619e30530e9b623d6eb01450 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/part-combine-engraver.cc: add space to variable list.
+
 2005-04-30  Graham Percival  <gperlist@shaw.ca>
 
        * scm/define-grobs.scm: changed RemoveEmptyVerticalGroup's

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 2b26300f5d3efdfaf85e343f21a9b4831c11aa93..0fad6e2c9c5bdc664eca64d6c0c341682e57eb00 100644 (file)
--- 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 78a3c52865fa33c768a04911493aaffa56428e8d..2f8aa221d132976e0b95abff519623dc5e32c2a4 100644 (file)
--- 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 d5014356a932d1e5c6c04f56475288aaaa4e06c8..9e10ff3e12026539f72ea6a6ed3bedac267e7c49 100644 (file)
--- 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 0e13e326d5ea2ffb2e424cdfc1dafb0cf6d69be5..694f4e4451d765f704c3def7f49779185b375531 100644 (file)
--- 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 0e2bdf78dec4024d2b70ffc7cdc67db6632357ec..b7fbae4842105290a354fda2c368ac9f69cfed41 100644 (file)
--- 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)