From 34a9bd581e3665910f83c54505c683120089f391 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 22 Jan 2005 00:24:31 +0000 Subject: [PATCH] scale brace fonts to design sizes. change name to aybabtu completely --- ChangeLog | 10 +++++ Documentation/topdocs/NEWS.texi | 3 ++ buildscripts/gen-emmentaler-scripts.py | 2 +- lily/accidental.cc | 2 + mf/aybabtu.pe.in | 58 ++++++++++++++++++++++++-- mf/feta-beugel.mf | 4 +- scm/framework-ps.scm | 8 ++-- 7 files changed, 77 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad762f4030..29bac34780 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-01-22 Han-Wen Nienhuys + + * mf/aybabtu.pe.in: scale brace fonts to design sizes. + change name to aybabtu completely + +2005-01-21 Han-Wen Nienhuys + + * buildscripts/gen-emmentaler-scripts.py (outdir): add + design_size to fontname + 2005-01-19 Werner Lemberg * 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 875fd624b8..04dac3947b 100644 --- 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 7e80512d2a..8510dd8fbf 100644 --- 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 31259da703..2377a6a940 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -5,6 +5,7 @@ (c) 2001--2004 Han-Wen Nienhuys */ + #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 983b31b3e9..a8b67e40d8 100644 --- 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 6836383bc7..f3fd05afbd 100644 --- 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 df6e14cabb..d2657fb4fd 100644 --- 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) -- 2.39.2