CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/04/30 19:47:14

Modified files:
        .              : ChangeLog 
        Documentation/topdocs: NEWS.tely 
        lily           : parse-scm.cc part-combine-engraver.cc 
                         tweak-registration-scheme.cc 
        scm            : framework-ps.scm 

Log message:
        add space to variable list.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3518&tr2=1.3519&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parse-scm.cc.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/part-combine-engraver.cc.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tweak-registration-scheme.cc.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.92&tr2=1.93&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3518 lilypond/ChangeLog:1.3519
--- lilypond/ChangeLog:1.3518   Sat Apr 30 04:50:28 2005
+++ lilypond/ChangeLog  Sat Apr 30 19:47:13 2005
@@ -1,3 +1,7 @@
+2005-04-30  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * lily/part-combine-engraver.cc: add space to variable list.
+
 2005-04-30  Graham Percival  <[EMAIL PROTECTED]>
 
        * scm/define-grobs.scm: changed RemoveEmptyVerticalGroup's
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.32 
lilypond/Documentation/topdocs/NEWS.tely:1.33
--- lilypond/Documentation/topdocs/NEWS.tely:1.32       Thu Apr 21 16:07:26 2005
+++ lilypond/Documentation/topdocs/NEWS.tely    Sat Apr 30 19:47:14 2005
@@ -215,9 +215,9 @@
 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.
Index: lilypond/lily/parse-scm.cc
diff -u lilypond/lily/parse-scm.cc:1.43 lilypond/lily/parse-scm.cc:1.44
--- lilypond/lily/parse-scm.cc:1.43     Thu Mar 17 11:25:42 2005
+++ lilypond/lily/parse-scm.cc  Sat Apr 30 19:47:14 2005
@@ -29,11 +29,11 @@
   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_)
        {
Index: lilypond/lily/part-combine-engraver.cc
diff -u lilypond/lily/part-combine-engraver.cc:1.16 
lilypond/lily/part-combine-engraver.cc:1.17
--- lilypond/lily/part-combine-engraver.cc:1.16 Fri Apr 29 09:18:09 2005
+++ lilypond/lily/part-combine-engraver.cc      Sat Apr 30 19:47:14 2005
@@ -99,6 +99,6 @@
                /* 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 */ "");
Index: lilypond/lily/tweak-registration-scheme.cc
diff -u lilypond/lily/tweak-registration-scheme.cc:1.7 
lilypond/lily/tweak-registration-scheme.cc:1.8
--- lilypond/lily/tweak-registration-scheme.cc:1.7      Thu Mar 10 14:36:12 2005
+++ lilypond/lily/tweak-registration-scheme.cc  Sat Apr 30 19:47:14 2005
@@ -65,7 +65,7 @@
 
 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));
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.92 lilypond/scm/framework-ps.scm:1.93
--- lilypond/scm/framework-ps.scm:1.92  Wed Apr 27 13:00:50 2005
+++ lilypond/scm/framework-ps.scm       Sat Apr 30 19:47:14 2005
@@ -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)
 


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to