(err): robustness fix for

selecting afii61352.

diff --git a/ChangeLog b/ChangeLog
index f49951e374e93379247c52725b61e576976db500..16c9a7bf9d6707a29eb9032b66732e3222797b5b 100644 (file)
--- 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 6be20b5dcbf0cbfa40f6086738f3a140adb9018b..1c74f0ba12b1a01d5cbfb2919634adb12d5377c8 100644 (file)
--- 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 26354377f41641e00b980720c39a2c6f23828f8c..25562da9164f258a10fa8beb7bcda3814b968ab2 100644 (file)
--- 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))