From fde906091a8e2a1306dd5544fb9cb758fa9f3194 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 4 Apr 2004 19:13:58 +0000 Subject: [PATCH] set design to 10 (constant). --- mf/feta-beugel.mf | 17 +++++++++++------ scm/font.scm | 23 ++++++++++++++--------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf index 0f32d9d40e..93b0cdcc34 100644 --- a/mf/feta-beugel.mf +++ b/mf/feta-beugel.mf @@ -19,11 +19,10 @@ def abc_encode_int (expr i) = fi enddef ; -% we set the designsize arbitrarily at 10 - -design_size := 10; - -fet_beginfont("feta-braces-" &char(97 + font_count), design_size); +% we must let the design increase for each +% font to make sure that mftrace doesn't jack up the resolution too highly +% for the longer braces. +fet_beginfont("feta-braces-" &char(97 + font_count), (font_count + 1)* 15); mode_setup; @@ -92,7 +91,13 @@ for i := 0 step 1 until font_count: % message "l: "&decimal l; % note: define_pixels (x) multiplies x by hppp, % must never get bigger than infinity - y := min (y + increment, infinity/hppp - 1); + y := y + increment; + + if y > infinity/hppp: + message "Resolution/magnification is too high."; + foobar ; + + fi % x should be about one staff space, taking brace to have % default height of 3 staffs, this yields height / 3 / 4 = 12 diff --git a/scm/font.scm b/scm/font.scm index 1f1023514e..27b7ada9ef 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -135,6 +135,11 @@ +; +; Each size family is a vector of fonts, loaded with a delay. +; The vector should be sorted according to ascending design size. +; + (define-public (make-font-tree factor) (let* ((n (make-font-tree-node 'font-encoding 'music)) @@ -190,15 +195,15 @@ (braces 10 #(,(delay (ly:make-virtual-font - (ly:font-load "feta-braces00") - (ly:font-load "feta-braces10") - (ly:font-load "feta-braces20") - (ly:font-load "feta-braces30") - (ly:font-load "feta-braces40") - (ly:font-load "feta-braces50") - (ly:font-load "feta-braces60") - (ly:font-load "feta-braces70") - (ly:font-load "feta-braces80")) + (ly:font-load "feta-braces-a") + (ly:font-load "feta-braces-b") + (ly:font-load "feta-braces-c") + (ly:font-load "feta-braces-d") + (ly:font-load "feta-braces-e") + (ly:font-load "feta-braces-f") + (ly:font-load "feta-braces-g") + (ly:font-load "feta-braces-h") + (ly:font-load "feta-braces-i")) ))))) (for-each -- 2.39.2