release commit

diff --git a/ChangeLog b/ChangeLog
index e777d505080b08c048b7abc1a0fbcaaf5fee1927..bcae26fd0ce2914d1b893403837cd53dfc68eea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scripts/convert-ly.py (conv): 
+
 2004-02-29  Heikki Junes <hjunes@cc.hut.fi>
 
        * ly/property-init: new functions: \arpeggioUp, \arpeggioDown,

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 14c7427f5e1b97e19062eff6fff617d049e5cfca..2377c3327c135a1a4ef0ae0ccae97d118517a380 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -4,7 +4,7 @@
 @node Introduction
 @chapter Introduction
 
-
+trn
 The art of music typography is called @emph{(plate) engraving}. The
 term derives from the traditional process of music printing. Only a
 few decades ago, sheet music was made by cutting and stamping the

diff --git a/VERSION b/VERSION
index 861e691d256661983a3fd0c7be99cc3b9145ade7..f19de432f7420957158ebdec56159cb3c61d3b0e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=27
-MY_PATCH_LEVEL=hjj1
+PATCH_LEVEL=28
+MY_PATCH_LEVEL=
 

diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 612df905c896347d7a6eb88602f52449320bb34a..dadc2c9407ab72b51a98195e8635c671ef750092 100644 (file)
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -18,7 +18,7 @@ C scale to Ais.
 % how useful these enharmonic modifications are. Mats B.
 % 
 % Why not to have a function that minimizes the number of accidentals? -HJJ
-i%
+%
 
 #(define  (unhair-pitch p)
   (let* ((o (ly:pitch-octave p))

diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc
index a5e7af14df8811b702d878068b5c535716b8374f..3755089f3596bbcc8a75f42f7ab0ba1e7de70096 100644 (file)
--- a/lily/input-file-results.cc
+++ b/lily/input-file-results.cc
@@ -171,5 +171,9 @@ do_one_file (String init, String in_file, String out_file)
       return;
     }
 
+  static  SCM proc;
+  if (!proc)
+    proc = scm_c_eval_string ("dump-gc-protects");
+
   Input_file_results inp_file (init, in_file, out_file);
 }

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 5526aebf35e465a071d91b29915da0509ec43376..773f072aa350ea52d1e24f651d17fdff1b5359f8 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -786,7 +786,7 @@ alist_to_hashq (SCM alist)
   return tab; 
 }
 
-#if 0
+#if 1
 /*
   Debugging mem leaks:
  */

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 8fe1b2a63aaa0d5ab154ec262ef3fcf8afb2c231..1ac9cd3badfad01cbfcdcce5c8d78f78e5dfe467 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -582,6 +582,7 @@ EasyNotation = \translator {
        \consists "Figured_bass_engraver"
        \consists "Rest_swallow_translator"
        \consists "Note_swallow_translator"
+       \consists "Skip_event_swallow_translator"
        \consists "Separating_line_group_engraver"
        
        \consistsend "Hara_kiri_engraver"

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 67261ab8386fb9857f7ba4c6f827d1aa69f70e12..39e9e8882734e1edc87aeb947e00ac8da7038ffb 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -66,7 +66,7 @@ make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}"  ma
 
 %if %{info}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-gzip -9fn $RPM_BUILD_ROOT%{_infodir}/*
+gzip -9fn `find $RPM_BUILD_ROOT%{_infodir}/ -name '*.info'`
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d

diff --git a/scm/lily.scm b/scm/lily.scm
index 296f8de6572a86e1c70cd483e890969c84f2aa0b..161e8932fdec2c88f8869d8984a1b24c46bd89b4 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -478,28 +478,33 @@ L1 is copied, L2 not.
 (define gc-protect-stat-count 0)
 (define-public (dump-gc-protects)
   (set! gc-protect-stat-count (1+ gc-protect-stat-count) )
-  
-  (display 
-   (map (lambda (y)
-         (let
-             ((x (car y))
-              (c (cdr y)))
-
-           (string-append
-            (string-join
-             (map object->string (list (object-address x) c x))
-             " ")
-            "\n")))
-
-         (sort
+  (let*
+      ((protects (sort
           (hash-table->alist (ly:protects))
           (lambda (a b)
             (< (object-address (car a))
-               (object-address (car b)))))
-         
-         )
-      (open-file (string-append
+               (object-address (car b))))))
+       (outfile    (open-file (string-append
               "gcstat-" (number->string gc-protect-stat-count)
               ".scm"
-              ) "w")))
+              ) "w"))
+       )
+
+    (display
+     (filter
+      (lambda (x) (not (symbol? x))) 
+      (map (lambda (y)
+            (let
+                ((x (car y))
+                 (c (cdr y)))
+
+              (string-append
+               (string-join
+                (map object->string (list (object-address x) c x))
+                " ")
+               "\n")))
+          protects))
+     outfile)
+
+    ))
 

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 7f85e0867a2f6724700cf289343446240442b05f..a8c410762c77b4d7e6a25597b852ffe1a8351b34 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1972,10 +1972,13 @@ def conv (str):
 conversions.append (((2,1,27), conv, """property transposing -> tuning"""))
 
 def conv (str):
+       str = re.sub (r'make-music-by-name', 'make-music', str)
        str = re.sub (r"\\override\s+.*Arpeggio\s+#.print-function\s+=\s+\\arpeggioBracket", r"\\arpeggioBracket", str)
        return str
 
-conversions.append (((2,1,28), conv, """new syntax for setting \\arpeggioBracket"""))
+conversions.append (((2,1,28), conv,
+                    """make-music-by-name -> make-music,
+new syntax for setting \\arpeggioBracket"""))
 
 ################################
 #      END OF CONVERSIONS