release commit

diff --git a/ChangeLog b/ChangeLog
index d57f00960cd715b71b92f4f82a1665c929c35208..ea894594f195e31a5bb678d42147f2c4522b4737 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-12-30  Han-Wen Nienhuys   <hanwen@cs.uu.nl>
 
+       * scripts/convert-ly.py (FatalConversionError.func): add rule for
+       deprecated #'ancient font family
+
        * lily/mark-engraver.cc (process_music): only set rehearsalMark if
        it is a string or number.
 

diff --git a/VERSION b/VERSION
index 3ff2a68cfe785fa19d6b219e71ce076c88d3e568..aa9226608c5a938d892d16f9459b43fba07b2474 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=3
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=4
+MY_PATCH_LEVEL=
 

diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly
index 4e458b563ffbc048f7c13cd46d94b2acd4a9a6db..15b08cf36c3251f5cac5f08556871a05d7e6e3da 100644 (file)
--- a/input/regression/mensural.ly
+++ b/input/regression/mensural.ly
@@ -9,7 +9,6 @@ both for up and down stems."
 
 
 \score {\notes { \context Voice { 
-    \property Voice.NoteHead \set #'font-family = #'ancient
     \property Voice.NoteHead \override #'style = #'mensural
 \transpose c d'' {  c4 c2 c8  c16 c16  c1 c\breve c\longa }
 \transpose c c' { c4 c2 c8  c16 c16  c1 c\breve c\longa }

diff --git a/lily/note-head.cc b/lily/note-head.cc
index d40d2fe12f61283c697616e208f740766f00d679..76eb2a69395e94fbac1a18a3a678d1e993ead025 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -278,14 +278,18 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
       SCM scm_font_char = scm_call_2 (proc, log, style);
       String font_char = "noteheads-" + ly_scm2string (scm_font_char);
 
-      int k = fm->name_to_index (font_char);
-      Box b = fm->get_indexed_char (k);
-      Offset wxwy = fm->get_indexed_wxwy (k);
-      Interval v = b[a];
-      if (!v.empty_b ())
-       return 2 * (wxwy[a] - v.center()) / v.length ();
-    }
+      int k = fm->name_to_index (font_char) ;
 
+      if (k >= 0)
+       {
+         Box b = fm->get_indexed_char (k);
+         Offset wxwy = fm->get_indexed_wxwy (k);
+         Interval v = b[a];
+         if (!v.empty_b ())
+           return 2 * (wxwy[a] - v.center()) / v.length ();
+       }
+    }
+  
   /*
     Fallback
    */

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 1086ad1551f5bc3b2514d175b9ecc61baa472799..0233d68a04f55fe45e6da093578979b4c235c879 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -76,7 +76,7 @@ static Tex_font_char_metric dummy_static_char_metric;
 Tex_font_char_metric const *
 Tex_font_metric::find_ascii (int ascii, bool warn) const
 {
-  if (ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
+  if (ascii >= 0 && ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
     return & char_metrics_[ascii_to_metric_idx_ [ascii]];
   else if (warn)
     {

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 2f8184eed70bb6c00eaa8d47bae56a72f76878bd..b3b107fd1fb443628d156ef526d2663a80e0382e 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1607,6 +1607,9 @@ def conv (str):
                return "#'font-size = #%d" % (2*string.atoi (match.group (1))) 
                
        str =re.sub (r"#'font-relative-size\s*=\s*#([0-9-]+)", func, str)
+       str =re.sub (r"#'font-family\s*=\s*#'ancient",
+                    r"#'font-family = #'music", str)
+       
        return str
 
 conversions.append (((2,1,1), conv, """font-relative-size -> font-size"""))