*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 452f8d5f0bac4e87e03b10055629635d3f1573bb..51938aab5b4aebf4c2ae37a506731da2a2d29920 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,96 @@
+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/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 8729c23b9860539b92b075b00c611c435c39e99f..5d94413f26b8fdf59d8fd2aa67eb9005b175d3a5 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -5574,6 +5574,7 @@ Examples: @inputfileref{input/@/regression,tag@/-filter@/.ly}.
 
 Multiple rests are not merged if you create the score with both tagged
 sections.
+ 
 
 @node Quoting other voices
 @subsection Quoting other voices
@@ -5752,7 +5753,7 @@ the original clef should be stated once again.
 
 
 
- 
+
 
 @node Ancient notation
 @section Ancient notation

diff --git a/THANKS b/THANKS
index b748ab65d2dd067922fb85c40cdf23ca452c4304..3af5083e21b6f086f6d6363d4b10a25c09df4a63 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,26 +1,4 @@
 
-Release 2.5
-***********
-
-
-DEVELOPMENT TEAM
-
-Han-Wen Nienhuys  - Core development
-Jan Nieuwenhuizen - Core development
-Erik Sandberg     - Bug Meister
-Pedro Kroger      - Build Meister
-Graham Percival   - Documentation Editor
-
-CONTRIBUTORS
-
-Werner Lemberg
-Heikki Junes
-
-BUG HUNTERS/SUGGESTIONS
-
-Fernando Pablo Lopez-Lezcano
-Jack O'Quin
-
 Release 2.4
 ***********
 
@@ -49,6 +27,7 @@ Werner Lemberg
 
 BUG HUNTERS/SUGGESTIONS
 
+
 Antti Kaihola
 Bertalan Fodor
 Brian Clements
@@ -61,7 +40,9 @@ David Bobroff
 David Brandon
 Doug Asherman
 Ed Jackson
+Fernando Pablo Lopez-Lezcano
 Heinz Stolba
+Jack O'Quin
 Jefferson dos Santos Felix
 Karl Hammar
 Marco Gusy

diff --git a/VERSION b/VERSION
index 7a3bd85580899d34897020c184b964f0a8446897..ed69297e14504f92cc93adad908a19e08a567d4d 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=hwn1
+MY_PATCH_LEVEL=hwn2
 

diff --git a/scm/lily.scm b/scm/lily.scm
index dd86ef5021d7d86423101f8439b094bf4ce1ede2..0b69cc7ebe2cc5f0539e08dffc5ef3fa3eb6b8a2 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -305,7 +305,6 @@ predicates. Print a message at LOCATION if any predicate failed."
 
 (define-public (postscript->pdf papersizename name)
   (let* ((cmd (string-append "ps2pdf "
-
                             (string-append
                              " -sPAPERSIZE="
                              (sanitize-command-option papersizename)

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 5fe821ff5f32a759885e14b3d47bbfd11715d2db..94872ae65764a3000fe8d1917ed32ce7c613f7ab 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -504,7 +504,7 @@ the mark when there are no spanners active."
         (context (ly:run-translator (context-spec-music mus 'Voice)
                                     part-combine-listener))
         (first-voice-handle (last-pair noticed)))
-q
+
     ;; (display (last-pair noticed))
     (if (pair? first-voice-handle)
        (hash-set! tab name