From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 2 Feb 2006 20:26:36 +0000 (+0000)
Subject: (err): robustness fix for
X-Git-Tag: release/2.7.31~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=67d4af325e2366a613b7f5fb2168c62eb9a6f2ff;p=lilypond.git

(err): robustness fix for
selecting afii61352.
---

diff --git a/ChangeLog b/ChangeLog
index f49951e374..16c9a7bf9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* buildscripts/pfx2ttf.fontforge (err): robustness fix for
+	selecting afii61352.
+
 2006-02-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* flower/include/std-vector.hh (boundary): Oops, reverse.
diff --git a/buildscripts/pfx2ttf.fontforge b/buildscripts/pfx2ttf.fontforge
index 6be20b5dcb..1c74f0ba12 100644
--- a/buildscripts/pfx2ttf.fontforge
+++ b/buildscripts/pfx2ttf.fontforge
@@ -4,7 +4,14 @@ Open($1);
 MergeKern($2)
 
 # Remove the No. glyph - for want of better FF fix.  
-Select("afii61352")
-Cut();
+err = SelectIf("afii61352");
+if ( err > 0 )
+   Cut();
+elseif ( err == 0 )
+   Print("Could not find \"numero\" glyph");
+elseif ( err < 0 )
+   Print("An error occurred while searching for the \"numero\" glyph");
+endif
+
 Generate($3 + $fontname + ".ttf");
 
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 26354377f4..25562da916 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -122,8 +122,7 @@ Syntax @code{\\translator Staff = @var{new-id}}.")
 	))
 
     (ClusterNoteEvent
-     . (
-	(description .	"A note that is part of a cluster.")
+     . ((description .	"A note that is part of a cluster.")
 
 	;; not a note-event, to ensure that Note_engraver doesn't eat it. 
 	(types . (general-music cluster-note-event melodic-event rhythmic-event event))