From be6c74a90d99a1d25cc2dd6998149050cfaaca3a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 29 Feb 2004 14:35:27 +0000
Subject: [PATCH] release commit
---
ChangeLog | 4 +++
Documentation/user/introduction.itely | 2 +-
VERSION | 4 +--
input/test/smart-transpose.ly | 2 +-
lily/input-file-results.cc | 4 +++
lily/lily-guile.cc | 2 +-
ly/engraver-init.ly | 1 +
make/lilypond.redhat.spec.in | 2 +-
scm/lily.scm | 43 +++++++++++++++------------
scripts/convert-ly.py | 5 +++-
10 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e777d50508..bcae26fd0c 100644
--- 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 14c7427f5e..2377c3327c 100644
--- 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 861e691d25..f19de432f7 100644
--- 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 612df905c8..dadc2c9407 100644
--- 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 a5e7af14df..3755089f35 100644
--- 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 5526aebf35..773f072aa3 100644
--- 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 8fe1b2a63a..1ac9cd3bad 100644
--- 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 67261ab838..39e9e88827 100644
--- 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 296f8de657..161e8932fd 100644
--- 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 7f85e0867a..a8c410762c 100644
--- 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
--
2.39.5