* scm/font.scm (paper20-font-vector): cmcsc klugdge.

* scm/output-ps.scm (output-stencil): New function.

diff --git a/ChangeLog b/ChangeLog
index 8e6fab09e515d5059dcb577030ca724b43b461cb..d7a05dee435f71fd480919be970890d133362011 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/font.scm (paper20-font-vector): cmcsc klugdge.
+
        * scm/output-ps.scm (output-stencil): New function.
 
        * scripts/lilypond-book.py (do_file): Bugfix: change search order

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 9c14eb385f70e6965875e9cf4301570ea22b692e..6c34795996f9089ac9fd3039b5becd38d38e9c59 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -31,8 +31,10 @@ FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
 
-SAUTER_FONTS = cmbxti6 cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
-        cmcsc7 cmcsc8 cmcsc12 cmbx14 cmbx17 \
+SAUTER_FONTS = cmr10 \
+       cmbxti6 cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
+        cmcsc7 cmcsc8 cmcsc10 cmcsc12 \
+       cmcsc12 cmbx14 cmbx17 \
        cmtt5 cmtt6 cmtt7 cmtt17 \
         cmti5 cmti6 \
        cmss5 cmss6 cmss7 cmss8

diff --git a/scm/font.scm b/scm/font.scm
index 7118c072056539aa6eb52f332722c685e998a1ce..f62aaaa0aadd268b003ef26922b20ee2af0b82d8 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -81,8 +81,9 @@ or
      (10.0 . #((10.0 . "cmb10")
               )))
     (#(medium caps roman) .
-     (10.0 . #((10.0 . "cmcsc10"))))
-
+     ;; FIXME? ps-header output
+     (20.0 . #((10.0 . "cmcsc10")
+              (12.0 . "cmcsc12"))))
     (#(* * dynamic) .
      (14.0 .  #((6.0 . "feta-din6")
                (8.0 . "feta-din8")

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 111542abeaaf2327062e6493c257af6f03b27a81..07db7a7d130fbe45a8e28db878d18b089acd4b76 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -288,7 +288,14 @@
    "\n" (ly:number->string height)
    " start-system\n"
    "{\n"
-   "set-ps-scale-to-lily-scale"))
+   "set-ps-scale-to-lily-scale\n"
+
+   ;; URG
+   (if (pair? header-stencils)
+       (let ((s (output-stencils header-stencils)))
+        (set! header-stencils '())
+        s)
+       "")))
 
 (define (stem breapth width depth height) 
   (string-append
@@ -347,29 +354,11 @@
 (define (output-scopes paper scopes fields basename)
 
   ;; FIXME: customise/generate these
-  (let ((nmp '((("feta20"  . 0.569055118110236) "feta20" . 1.0)
-              (("cmbx10"  . 0.569055118110236) "cmbx10" . 1.0)
-              (("cmr10"   . 0.569055118110236) "cmr10" . 1.0)
-              (("cmr10"   . 0.638742773474948) "cmr10" . 1.0)
-              (("cmcsc12" . 0.376382788798365) "cmcsc12" . 1.0)
-              (("cmcsc12" . 0.752765577596731) "cmcsc12" . 1.0)
-              (("cmcsc12" . 0.948425196850394) "cmcsc12" . 1.0)
-
-              (("cmr10" . 0.7169645218575) "cmr10" . 1.0)
-              (("cmr10" . 0.638742773474948) "cmr10" . 1.0)
-
-              (("cmcsc10" . 0.451659346558038) "cmcsc10" . 1.0)
-              (("cmcsc10" . 0.638742773474948) "cmcsc10" . 1.0)
-              (("cmbx8"   . 0.564574183197548) "cmbx8" . 1.0)))
-              
-       (props '(((font-family . roman)
+  (let ((props '(((font-family . roman)
                  (word-space . 1)
                  (baseline-skip . 2)
                  (font-shape . upright)
-                 ;;(font-size . -2)
-                 (font-size . 0)
-                 ))))
-
+                 (font-size . 0)))))
   
     (define (output-scope scope)
       (apply
@@ -387,16 +376,13 @@
             ((string? val) (ps-string-def "lilypond" sym val))
 
             ;; output markups ourselves
-            ((markup? val) (string-append
-                            (write-me "expr:"
-                                      ;; siamo bionde :-)
-                                      ;;(expression->string
-                                      (output-stencil
-                                       (ly:stencil-get-expr
-                                        (interpret-markup paper props val))
-                                       '(0 . 0)
-                                       ))
-                            "\n"))
+            ((markup? val) (set! header-stencils
+                                 (append header-stencils
+                                    (list
+                                     (ly:stencil-get-expr
+                                      (interpret-markup paper props val)))))
+             
+             "")
             ((number? val) (ps-number-def
                             "lilypond" sym (if (integer? val)
                                                (number->string val)
@@ -406,9 +392,6 @@
        scope)))
 
     (string-append
-     ;; urg
-     " 0 0 moveto\n"
-     (define-fonts nmp)
      (apply string-append (map output-scope scopes)))))
 
 (define (add-offsets a b)
@@ -418,6 +401,11 @@
 (define (input? foe)
   #f)
 
+(define header-stencils '())
+
+(define (output-stencils lst)
+  (apply string-append (map (lambda (x) (output-stencil x '(0 . 0))) lst)))
+
 ;; TODO:
 ;; de-urg me
 ;; implement ly:input stuff
@@ -425,17 +413,15 @@
 ;; stencil->string?
 (define (output-stencil expr o)
   (let ((s ""))
-    (format (current-output-port) "output-stencil: ~S\n" expr)
     (while
      (pair? expr)
      (let ((head (car expr)))
-       (format (current-output-port) "head: ~S\n" head)
        (cond ((input? head)
              (set! s (string-append
                       s (define-origin (ly:input-file-string head))))
              (set! expr (cadr expr)))
             ((eq? head 'no-origin)
-             (set! s (string-append s expression->string head))
+             (set! s (string-append s (expression->string head)))
              (set! expr (cadr expr)))
             ((eq? head 'translate-stencil)
              (set! o (add-offsets o (cadr expr)))
@@ -450,5 +436,4 @@
                       (placebox (car o) (cdr o)
                                 (expression->string expr))))
              (set! expr #f)))))
-;;   (set! expr (cadr expr)))
   s))