* scm/font.scm (paper20-font-vector): add more design sizes for

number.

* scm/font.scm (paper20-font-vector): bugfix: use din12, not 10
for 12pt design size.

diff --git a/ChangeLog b/ChangeLog
index f9dbe2cd376d9ce64b3c8f1c25042cc1ec2f97e8..e786ed705106ee3ec1e5ef93fca572ba9619e644 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-09  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/font.scm (paper20-font-vector): add more design sizes for
+       number.
+
+       * mf/GNUmakefile (depth): remove feta-din{11,13,19}, remove
+       feta-nummber{5,7,11,13}.
+
+       * scm/font.scm (paper20-font-vector): bugfix: use din12, not 10
+       for 12pt design size. 
+
 2004-03-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/system.cc (get_line):

diff --git a/mf/feta-din11.mf b/mf/feta-din11.mf
deleted file mode 100644 (file)
index 5fb32da..0000000
--- a/mf/feta-din11.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-din11.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=11.25; % feta23 = 22.5pt
-
-input feta-din;
-
-end.
-

diff --git a/mf/feta-din13.mf b/mf/feta-din13.mf
deleted file mode 100644 (file)
index 762539a..0000000
--- a/mf/feta-din13.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-din13.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=13; % feta26 = 26pt
-
-input feta-din;
-
-end.
-

diff --git a/mf/feta-din19.mf b/mf/feta-din19.mf
deleted file mode 100644 (file)
index 8346420..0000000
--- a/mf/feta-din19.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-din19.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=19; % feta26 = 26pt
-
-input feta-din;
-
-end.
-

diff --git a/mf/feta-nummer11.mf b/mf/feta-nummer11.mf
deleted file mode 100644 (file)
index 9bebc84..0000000
--- a/mf/feta-nummer11.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-nummer11.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=11.25; % feta23 = 22.5pt
-
-input feta-nummer;
-
-end.
-

diff --git a/mf/feta-nummer13.mf b/mf/feta-nummer13.mf
deleted file mode 100644 (file)
index e87025b..0000000
--- a/mf/feta-nummer13.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-nummer13.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=13; % feta26 = 26pt
-
-input feta-nummer;
-
-end.
-

diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf
deleted file mode 100644 (file)
index ad480d1..0000000
--- a/mf/feta-nummer5.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-nummer5.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=4.58; % 5.5/1.2 :  nummer6 = 5.5pt
-
-input feta-nummer.mf;
-
-end.
-

diff --git a/mf/feta-nummer7.mf b/mf/feta-nummer7.mf
deleted file mode 100644 (file)
index 6a4bbac..0000000
--- a/mf/feta-nummer7.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-% feta-nummer7.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=6.5; % feta13 = 13pt
-
-input feta-nummer.mf;
-
-end.
-

diff --git a/scm/font.scm b/scm/font.scm
index df716c43668dc3723cb5d89a8b97a76ebd06a878..b74d878dfd0cc712aa5009f03b4b0e526628e269 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -27,7 +27,19 @@ or
   
 (define-public paper20-font-vector
   '((#(medium upright number) .
-     (10 . #((10.0  . "feta-nummer10"))))
+     (10 . #(
+            (4.0  . "feta-nummer4")
+            (6.0  . "feta-nummer6")
+            (8.0  . "feta-nummer8")
+            (10.0  . "feta-nummer10")
+            (12.0  . "feta-nummer12")
+            (16.0  . "feta-nummer16")
+            
+
+            )
+
+
+        ))
     (#(medium upright roman) .
      (10.0 . #((6.0 . "cmr6")
               (8.0 . "cmr8") 
@@ -80,7 +92,7 @@ or
      (14.0 .  #((6.0 . "feta-din6")
                (8.0 . "feta-din8")
                (10.0 . "feta-din10")
-               (12.0 . "feta-din10")
+               (12.0 . "feta-din12")
                (14.0 . "feta-din14")
                (17.0 . "feta-din17")
                )))