* Another grand 2003 update.

[lilypond.git] / scm / sodipodi.scm

diff --git a/scm/sodipodi.scm b/scm/sodipodi.scm
index ff99968291c30fd07a954a1435bf9b2668646e53..3d5297fd4b079b829b1d30fb05b6c07d1e54126b 100644 (file)
--- a/scm/sodipodi.scm
+++ b/scm/sodipodi.scm
@@ -2,11 +2,14 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2002 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c)  2002--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; NOTE:
 ;;;;
-;;;; * Get mftrace 1.0.12 or newer
+;;;; * Get mftrace 1.0.12 or newer to create the .pfa fonts:
+;;;;
+;;;;       make -C mf clean
+;;;;       make -C mf pfa
 ;;;;
 ;;;; * Get sodipodi-0.28 or newer
 ;;;;
@@ -17,7 +20,6 @@
 
 (debug-enable 'backtrace)
 
-
 (define-module (scm sodipodi))
 (define this-module (current-module))
 
@@ -25,9 +27,6 @@
  (guile)
  (lily))
 
-
-
-
 ;;; Lily output interface --- cleanup and docme
 
 ;;; Bare minimum interface for \score { \notes c } }
@@ -51,8 +50,6 @@
 ;;;    comment
 ;;;    stop-last-system
 
-
-
 ;; Module entry
 ;;(define-public (sodipodi-output-expression expr port)
 ;;  (display (eval expr this-module) port))
@@ -60,7 +57,6 @@
 (define-public (sodipodi-output-expression expr port)
   (display (dispatch expr) port))
 
-
 (define (dispatch expr)
   (let ((keyword (car expr)))
     (cond
@@ -284,26 +280,26 @@
   (roundfilledbox breapth width depth height line-thickness))
 
 (define font-cruft
-  "fill:black;stroke:none;font-style:normal;font-weight:normal;text-anchor:start;writing-mode:lr;")
+  "fill:black;stroke:none;text-anchor:start;writing-mode:lr;font-weight:normal;")
 
 ;; FIXME
 (define font-alist
   `(  
     ("cmr8" . ,(string-append
                  font-cruft
-                 "font-family:cmr;font-size:8;"))
+                 "font-family:cmr;font-style:normal;font-size:8;"))
     ("feta13" . ,(string-append
                  font-cruft
-                 "font-family:LilyPond-Feta;font-size:13;"))
+                 "font-family:LilyPond-Feta;font-style:-Feta;font-size:13;"))
     ("feta-nummer10" . ,(string-append
                         font-cruft
-                        "font-family:LilyPond-Feta-nummer;font-size:10;"))
+                        "font-family:LilyPond-feta-nummer;font-style:-feta-nummer;font-size:10;"))
     ("feta20" . ,(string-append
                  font-cruft
-                 "font-family:LilyPond-Feta;font-size:20;"))
+                 "font-family:LilyPond-feta;font-style:-feta;font-size:20;"))
     ("parmesan20" . ,(string-append
                      font-cruft
-                     "font-family:LilyPond-Parmesan;font-size:20;"))))
+                     "font-family:LilyPond-Parmesan;font-style:-Parmesan;font-size:20;"))))
 
 (define (get-font name-mag-pair)
   ;; name-mag-pair: (quote ("feta20" . 0.569055118110236))"feta20"(quote ("feta20" . 0.569055118110236))