From abe3810ebe36453c724548cd9011a17e0b2a5f49 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 9 Apr 2004 09:04:20 +0000 Subject: [PATCH] * scm/font.scm (add-century-schoolbook-fonts): (make-century-schoolbook-tree): New function. * input/test/title-markup.ly: Use Century Schoolbook font. --- ChangeLog | 7 +++++++ input/test/title-markup.ly | 19 +++++++++++++------ scm/encoding.scm | 7 +++---- scm/font.scm | 17 +++++++++-------- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index a21f2925d7..e8e2517c80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-09 Jan Nieuwenhuizen + + * scm/font.scm (add-century-schoolbook-fonts): + (make-century-schoolbook-tree): New function. + + * input/test/title-markup.ly: Use Century Schoolbook font. + 2004-04-09 Han-Wen Nienhuys * lily/font-metric.cc (LY_DEFINE): new function, return fontName. diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly index 3088008dd1..8382a9b2c6 100644 --- a/input/test/title-markup.ly +++ b/input/test/title-markup.ly @@ -6,18 +6,25 @@ lilypond-bin -fps input/title/title-markup.ly -for utopia font, +PostScript fonts: WIP. - cp /usr/share/fonts/afms/adobe/putb8a.afm -> mf/out/ - cp /usr/share/fonts/afms/adobe/put8a.afm -> mf/out/ - cp /usr/share/fonts/default/ghostscript/put.pfa mf/out/put8a.pfa - cp /usr/share/fonts/default/ghostscript/putb.pfa mf/out/putb8a.pfa + * Nonstandardised install directory / how to locate a ps font? + * Nonstandardised filenames? + +For century schoolbook font: + + Debian: + cp -pv /usr/share/fonts/type1/gsfonts/c*.{afm,pfb} mf/out + + Red Hat (untested): + cp -pv /usr/share/fonts/afms/adobe/c*.afm mf/out/ + cp -pv /usr/share/fonts/default/ghostscript/c*.pfb mf/out %} \paper{ #(define page-breaking ly:optimal-page-breaks) - fonts = #(make-utopia-tree 1.0) + fonts = #(make-century-schoolbook-tree 1.0) inputencoding = #"latin1" } diff --git a/scm/encoding.scm b/scm/encoding.scm index b7efede0ee..45f10bccb5 100644 --- a/scm/encoding.scm +++ b/scm/encoding.scm @@ -84,11 +84,10 @@ vector of symbols." ("TeX-text-without-f-ligatures" . "0ef0afca.enc") ("Extended-TeX-Font-Encoding---Latin" . "tex256.enc") ("AdobeStandardEncoding" . "8a.enc") - ("T1" . "tex256.enc") - - ;; FIXME: find full Adobe; for testing -- almost Adobe: - ("adobe" . "ad.enc") + ;; aliases + ("T1" . "tex256.enc") + ("adobe" . "8a.enc") ("latin1" . "cork.enc") ;; LilyPond. diff --git a/scm/font.scm b/scm/font.scm index 6afd21f0cd..cb772c2ff4 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -261,37 +261,38 @@ ))) ))) -; (display (make-font-tree 1.0)) +;; (display (make-font-tree 1.0)) -(define-public (add-utopia-fonts node factor) +;; Century Schoolbook fonts filenames on Debian/Sid +(define-public (add-century-schoolbook-fonts node factor) (add-font node '((font-family . roman) (font-shape . upright) (font-series . medium) (font-encoding . text)) - `(10.0 . #(,(delay (ly:font-load "putr8a"))))) + `(10.0 . #(,(delay (ly:font-load "c059013l"))))) (add-font node '((font-family . roman) (font-shape . italic) (font-series . medium) (font-encoding . text)) - `(10.0 . #(,(delay (ly:font-load "putri8a"))))) + `(10.0 . #(,(delay (ly:font-load "c059033l"))))) (add-font node '((font-family . roman) (font-shape . upright) (font-series . bold) (font-encoding . text)) - `(10.0 . #(,(delay (ly:font-load "putb8a"))))) + `(10.0 . #(,(delay (ly:font-load "c059016l"))))) (add-font node '((font-family . roman) (font-shape . italic) (font-series . bold) (font-encoding . text)) - `(10.0 . #(,(delay (ly:font-load "putbi8a"))))) + `(10.0 . #(,(delay (ly:font-load "c059036l"))))) ) @@ -306,13 +307,13 @@ )) -(define-public (make-utopia-tree factor) +(define-public (make-century-schoolbook-tree factor) (let ((n (make-font-tree-node 'font-encoding 'music))) (add-music-fonts n factor) - (add-utopia-fonts n factor) + (add-century-schoolbook-fonts n factor) n )) -- 2.39.5