*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 51938aab5b4aebf4c2ae37a506731da2a2d29920..452f8d5f0bac4e87e03b10055629635d3f1573bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,96 +1,3 @@
-2004-11-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
-
-       * lily/lexer.ll: allow \encoding in lyrics as well.  Remove
-       optional semicolon. (backportme)
-
-2004-11-06  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-       * python/GNUmakefile (STEPMAKE_TEMPLATES): Unset USER_LDFLAGS, no
-       need to link to GUILE et al.
-
-2004-11-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
-
-       * scm/lily-library.scm: new file. Generic library routines.
-
-       * scm/lily.scm (sanitize-command-option): new function. (backportme)
-
-       * scm/framework-tex.scm (header): sanitize TeX paper size.
-       (backportme)
-
-2004-11-06  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-       * elisp/lilypond-indent.el (LilyPond-indent-level): 2 is now standard.
-
-       * tex/lilyponddefs.tex: If no inputencoding use latin1.  (backportme)
-
-       * scm/framework-tex.scm (font-load-command): Use T1 if no
-       font-encoding set.  (backportme)
-
-       * scm/lily.scm (postscript->pdf): Remove .pdf file if it
-       exists before converting.  (backportme)
-
-       * scm/framework-tex.scm (convert-to-dvi): Remove .dvi file if it
-       exists before converting.  (backportme)
-       (convert-to-ps): Remove .ps file if it exists before
-       converting.  (backportme)
-
-       * lily/lexer.ll: Remove extra progress newline, use present tense.
-
-       * scm/paper.scm (paper-alist): public.
-       * scm/framework-tex.scm (convert-to-ps):
-       * scm/lily.scm (postscript->pdf): Do not leak papersizename into
-       command line.
-
-2004-11-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
-
-       * scm/lily.scm (ly:system): add > /dev/null 2>&1 . (backportme)
-
-       * lily/recording-group-engraver.cc (derived_mark): mark
-       now_events_. (backportme)
-
-2004-11-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
-
-       * mf/GNUmakefile: use Fedora-3 in download link. (backportme.)
-
-       * scm/framework-tex.scm (convert-to-dvi): use ly:system for
-       invoking latex. (backportme.)
-
-       * lily/stem.cc (off_callback): center stems for all rest stems.
-
-2004-11-05  Werner Lemberg  <wl@gnu.org>
-
-       * Documentation/user/lilypond.tely: Add more guidelines for writing
-       lilypond texinfo documents.
-
-2004-11-05  Heikki Junes  <hjunes@cc.hut.fi>
-
-       * Documentation/index.html.in: remove <hr>.
-
-       * THANKS: change 2.3 to 2.4.
-
-2004-11-05  Jan Nieuwenhuizen  <jannneke@gnu.org>
-
-       * scm/output-gnome.scm: More fontconfig comment.
-
-2004-11-05  Pedro Kroger  <kroeger@pedrokroeger.net>
-
-       * GNUmakefile.in ($(builddir)/share/lilypond-force): create the
-       <package> directory in $(builddir)/share according with
-       PACKAGE_NAME defined in the VERSION file.
-
-2004-11-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
-       
-       * input/regression/new-slur.ly: mention forcing.
-  
-2004-11-04  Werner Lemberg  <wl@gnu.org>
-
-       * Documentation/user/*: A new round of layout fixes and document
-       structure cleanup.
-
-2004-11-04  Heikki Junes <hjunes@cc.hut.fi>
-  
-          * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x.
-
 2004-11-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/grace-engraver.cc (start_translation_timestep): split

diff --git a/VERSION b/VERSION
index ed69297e14504f92cc93adad908a19e08a567d4d..092ce9d7c95ac23ee15cc1c16aaf46c728c0ac7b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=hwn2
+MY_PATCH_LEVEL=hwn3
 

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index f0e3321a2ca9c3f6194f9244fc630e82a6b56f37..e48209d3b2240b9bc86fa879928b47aab2acb697 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -13,6 +13,7 @@
             (ice-9 format)
             (guile)
             (srfi srfi-13)
+            (srfi srfi-1)
             (lily))
 
 ;; FIXME: rename
@@ -239,7 +240,11 @@
 (define-public (output-preview-framework
                outputter book scopes fields basename )
   (let* ((paper (ly:paper-book-paper book))
-        (lines (ly:paper-book-systems book)))
+        (lines (ly:paper-book-systems book))
+        (first-notes-index (list-index
+                            (lambda (s) (not (ly:paper-system-title? s)))
+                            lines)))
+
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
@@ -251,7 +256,10 @@
       (define-fonts paper)
       (header-end)))
 
-    (dump-line outputter (car lines) #t)
+    (for-each
+     (lambda (l)
+       (dump-line outputter l (not (ly:paper-system-title? l))))
+     (take lines (1+ first-notes-index)))
     (ly:outputter-dump-string outputter "\\lilypondend\n")))
 
 (define-public (convert-to-pdf book name)