scale brace fonts to design sizes.

change name to aybabtu completely

diff --git a/ChangeLog b/ChangeLog
index ad762f4030bd9a90b516ade91e03875a47ee3bb0..29bac3478071aeec3e6943d20afb0bcf81f762af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * mf/aybabtu.pe.in: scale brace fonts to design sizes.
+       change name to aybabtu completely
+
+2005-01-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * buildscripts/gen-emmentaler-scripts.py (outdir): add
+       design_size to fontname
+
 2005-01-19  Werner Lemberg  <wl@gnu.org>
 
        * mf/feta-accordion.mf, mf/feta-klef.mf, mf/feta-pendaal.mf,

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 875fd624b8fb3559682fa98df70ffb25b5e48978..04dac3947b8813fde790cee721bc3efd58f0dfbc 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -8,6 +8,9 @@
 
 @itemize @bullet
 
+@item
+Locations of errors in the input are now calculated more precisely.
+
 @item
 LilyPond now uses Pango and FontConfig for selecting and rendering
 internationalized text in non-@TeX{} backends. A font may be selected

diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py
index 7e80512d2a5dad4b1da0c81c7ecde03f76f36fad..8510dd8fbfbf6bb625909fe5a19832a6e7d5295f 100644 (file)
--- a/buildscripts/gen-emmentaler-scripts.py
+++ b/buildscripts/gen-emmentaler-scripts.py
@@ -29,7 +29,7 @@ New();
 
 # Separate Feta versioning?
 #         *  using 20 as Weight works for gnome-font-select widget: gfs
-SetFontNames("%(name)s", "%(name)s", "%(name)s %(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@");
+SetFontNames("%(name)s-%(design_size)d", "%(name)s", "%(name)s %(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@");
 
 MergeFonts("feta%(design_size)d.pfa");
 MergeFonts("parmesan%(design_size)d.pfa");

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 31259da703fdb8f111db59c2572e4724cd3b4241..2377a6a940976a6f569dd7c4b97e744f25040480 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -5,6 +5,7 @@
   
   (c) 2001--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "font-interface.hh"
 #include "item.hh"
 #include "stencil.hh"
@@ -13,6 +14,7 @@
 #include "pitch.hh"
 
 /*
+  
   TODO: insert support for smaller cautionaries, tie-break-reminders.
   Either here or in new-accidental-engraver.
 

diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in
index 983b31b3e9a2da75da4caf25fd005f4bfd617fa6..a8b67e40d826583dcca4827cb078dcf71fd13383 100644 (file)
--- a/mf/aybabtu.pe.in
+++ b/mf/aybabtu.pe.in
@@ -1,10 +1,62 @@
 #!@FONTFORGE@
-
 # all your brace are belong to us
 
-New();
+Open("feta-braces-b.pfa");
+SelectAll();
+Scale(200, 0, 0);
+Generate("feta-braces-b.scale.pfa");
+
+Open("feta-braces-c.pfa");
+SelectAll();
+Scale(300, 0, 0);
+Generate("feta-braces-c.scale.pfa");
+
+Open("feta-braces-d.pfa");
+SelectAll();
+Scale(400, 0, 0);
+Generate("feta-braces-d.scale.pfa");
+
+Open("feta-braces-e.pfa");
+SelectAll();
+Scale(500, 0, 0);
+Generate("feta-braces-e.scale.pfa");
+
+Open("feta-braces-f.pfa");
+SelectAll();
+Scale(600, 0, 0);
+Generate("feta-braces-f.scale.pfa");
+
+Open("feta-braces-g.pfa");
+SelectAll();
+Scale(700, 0, 0);
+Generate("feta-braces-g.scale.pfa");
+
+Open("feta-braces-h.pfa");
+SelectAll();
+Scale(800, 0, 0);
+Generate("feta-braces-h.scale.pfa");
+
+Open("feta-braces-i.pfa");
+SelectAll();
+Scale(900, 0, 0);
+Generate("feta-braces-i.scale.pfa");
+
+
+New()
+
+MergeFonts("feta-braces-a.pfa");
+MergeFonts("feta-braces-b.scale.pfa");
+MergeFonts("feta-braces-c.scale.pfa");
+MergeFonts("feta-braces-d.scale.pfa");
+MergeFonts("feta-braces-e.scale.pfa");
+MergeFonts("feta-braces-f.scale.pfa");
+MergeFonts("feta-braces-g.scale.pfa");
+MergeFonts("feta-braces-h.scale.pfa");
+MergeFonts("feta-braces-i.scale.pfa");
+
+
 
-SetFontNames("aybabtu", "LilyPondBraces", "LilyPond Braces", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
+SetFontNames("aybabtu", "aybabtu", "aybabtu", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
 
 MergeFonts("feta-braces-a.pfa");
 MergeFonts("feta-braces-b.pfa");

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 6836383bc79041362951bbe58c4d5d4293dd98e6..f3fd05afbdef2201c88459421456d9afe79d5e42 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -79,13 +79,11 @@ y := 10pt#;
 
 for i := 0 step 1 until font_count:
 
-  %% We can't store more than 64 (65?) height dimensions in a TFM
-  %% file, so we make small files.
   save number;
 
   number := braces_per_font * i;
 
-  for j := 0 step 1 until 63:
+  for j := 0 step 1 until (braces_per_font -1):
     % message "l: "&decimal l;
     % note: define_pixels (x) multiplies x by hppp,
     % must never get bigger than infinity

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index df6e14cabb988833b6f9562a60941e9906b2096f..d2657fb4fdafb5887a346914f60a9b80a87f205e 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -200,14 +200,14 @@
                 (supplies-or-needs paper load-fonts?)
                 "%%EndComments\n"))
 
-(define (procset name)
+(define (procset file-name)
   (string-append
    (format
     "%%BeginResource: procset (~a) 1 0
 ~a
 %%EndResource
 "
-    name (ly:gulp-file name))))
+    file-name (ly:gulp-file file-name))))
 
 (define (setup paper)
   (string-append
@@ -259,7 +259,9 @@
    (procset "music-drawing-routines.ps")
    (procset "lilyponddefs.ps")
    (if load-fonts?
-       (load-fonts paper))
+       (load-fonts paper)
+       "")
+   
    (setup paper)))
 
 (define-public (output-framework basename book scopes fields)