* scm/font.scm (add-century-schoolbook-fonts):

(make-century-schoolbook-tree): New function.

* input/test/title-markup.ly: Use Century Schoolbook font.

diff --git a/ChangeLog b/ChangeLog
index a21f2925d79361c547c3f665e050ffe248bb4bc0..e8e2517c803f1a44e3c93b7a95af986e26accc1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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   <hanwen@xs4all.nl>
 
        * 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 3088008dd1bf6b84e3cdb020c99675de74997eb2..8382a9b2c6d21d872a0555aa9c72aa57335cccb1 100644 (file)
--- 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 b7efede0ee72b4415ed552557bb83ee48bc39bc6..45f10bccb5d31acf2f07faff938be45c26be46f4 100644 (file)
--- 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 6afd21f0cd9b9d5902aad16ae3f126ac732bb287..cb772c2ff477dd3e76cc4dd45670a7f1e2cebc34 100644 (file)
--- 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
   ))