* scm/output-ascii-script.scm (as-font-alist-alist):

(as-properties-to-font-name):
(as-make-style-sheet): Remove.

* scm/font.scm (as-make-font-list): New function.
(as-font-sheet-alist): New variable.

* ly/paper-as9-init.ly:
* ly/paper-as5-init.ly: Update.

* ly/paper-as5.ly:
* ly/paper-as9.ly: New file.

diff --git a/ChangeLog b/ChangeLog
index 54c6a7716f6df26dea5761c9eaf2c24a920619db..85aa755f46552bab64eb0e5821c8dd4bc1c8b552 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2003-06-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-ascii-script.scm (as-font-alist-alist):
+       (as-properties-to-font-name):
+       (as-make-style-sheet): Remove.
+
+       * scm/font.scm (as-make-font-list): New function.
+       (as-font-sheet-alist): New variable.
+
+       * ly/paper-as9-init.ly: 
+       * ly/paper-as5-init.ly: Update.
+
+       * ly/paper-as5.ly:
+       * ly/paper-as9.ly: New file.
+
+2003-05-29  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * mf/GNUmakefile (AFM_FILES): Add AF_FILES.
+
 2003-05-28  Graham Percival  <gperlist@shaw.ca>
        * input/sondag-morgen/*: removed due to copyright concerns.
        * input/[a,b]*.ly: added a newline at the end of the texinfo

diff --git a/ly/paper-as5-init.ly b/ly/paper-as5-init.ly
index 5b074438dd933880364ec69b032a61e54177236b..28967de073fedb4830eeec7f6c27bf4d67ba6910 100644 (file)
--- a/ly/paper-as5-init.ly
+++ b/ly/paper-as5-init.ly
@@ -5,7 +5,7 @@
 paperAsFive = \paper {
        staffheight = 5.\char
 
-       \stylesheet #(as-make-font-list 'as5)
+       #(define fonts (as-make-font-list 'as5))
        
        \translator { \StaffContext barSize = #5 }
 

diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly
new file mode 100644 (file)
index 0000000..fec97d1
--- /dev/null
+++ b/ly/paper-as5.ly
@@ -0,0 +1,3 @@
+\version "1.7.18"
+
+\include "paper-as5-init.ly"

diff --git a/ly/paper-as9-init.ly b/ly/paper-as9-init.ly
index 1daa4b2e95f30ddd37784610d1e235fb8dd734d5..9e57e1a9a02ff9b315c8c24b59b3e4a913e1a530 100644 (file)
--- a/ly/paper-as9-init.ly
+++ b/ly/paper-as9-init.ly
@@ -7,10 +7,9 @@ paperAsNine = \paper {
 
        %\translator { \StaffContext barSize = \staffheight }
 
-       \stylesheet #(as-make-style-sheet 'as9)
+       #(define fonts (as-make-font-list 'as9))
 
        \include "params-as-init.ly"
-       
 }
 
 \paper { \paperAsNine }

diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly
new file mode 100644 (file)
index 0000000..c14b0da
--- /dev/null
+++ b/ly/paper-as9.ly
@@ -0,0 +1,3 @@
+\version "1.7.18"
+
+\include "paper-as9-init.ly"

diff --git a/ly/params-as-init.ly b/ly/params-as-init.ly
index 835f813b2f244aa42300c36c63bebdc576be827b..b0f158bdc2f319cdc1c901668c451929c81d3c95 100644 (file)
--- a/ly/params-as-init.ly
+++ b/ly/params-as-init.ly
@@ -2,14 +2,14 @@
 % params-as-init.ly
 % generic paper parameters
 
-outputscale = \staffheight / 4.0
+outputscale = #(/ staffheight 4.0)
 
 linewidth = 60.0 \char
 textheight = 60.0 \char
 indent = 8.0\char
 
-staffspace = (\staffheight - 1.0 ) / 4.0
-stafflinethickness = \staffspace / 2.0
+staffspace = #(/ (- staffheight 1) 4.0)
+stafflinethickness = #(/ staffspace 2.0)
 
 \translator { \NoteNamesContext }
 \translator { \ScoreContext }

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index ce0405733e8b4ce62a5668a94261da6d1ad2c116..a9ad06adcc49247515596592d995727d06d369a6 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -22,7 +22,8 @@ XPM_FONTS = feta20 feta-din10 feta-nummer10 feta-braces20 parmesan20
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex)
-AFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.afm)
+AFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.afm) \
+       $(AF_FILES:%.af=$(outdir)/%.afm)
 ENC_FILES = $(TEXTABLES:.tex=.enc)
 TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
 

diff --git a/scm/font.scm b/scm/font.scm
index d3b36485958e45d692ada1d72fa36bfd6f8d143d..0d1cd0f5faf629db2cc1a6d353c0589ef958c70b 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -387,3 +387,24 @@ and warn if the selected font is not unique.
 
 
 )
+
+;;; ascii-script font init
+(define as-font-sheet-alist
+  '((as5 . (((* * * braces *) . ("as-braces9"))
+           ((* * * number *) . "as-number1")
+           ((0 * * music *) . ("as5"))
+           ((0 * * roman *) . "as-dummy")))
+    (as9 . (((* * * braces *) . ("as-braces9"))
+           ((0 medium upright number 10) . "as-number4")
+           ((* * * number 5) . "as-number1")
+           ((0 * * music *) . ("as9"))
+           ((0 * * roman *) . "as-dummy")))))
+
+(define-public (as-make-font-list sym)
+  (set! font-list-alist
+       (append font-list-alist as-font-sheet-alist))
+  (make-font-list sym))
+
+
+
+

diff --git a/scm/output-ascii-script.scm b/scm/output-ascii-script.scm
index c98c383a35456a784c21921fc58c523ac0ab4bcb..34b8333a988ec7d3e4e446ad72bd772e6bbf1047 100644 (file)
--- a/scm/output-ascii-script.scm
+++ b/scm/output-ascii-script.scm
@@ -40,56 +40,6 @@
                (font-load-command (car x) (cdr x)))
              (map cdr font-name-alist))))
 
-(define as-font-alist-alist
-  '(
-    (as5 .
-        (
-         (feta16 . as5)
-         (feta20 . as5)
-         (feta-nummer6 . as-number1)
-         (feta-nummer8 . as-number1)
-         (feta-braces16 . as-braces9)
-         (cmr7 . as-dummy)
-         (cmr8 . as-dummy)
-         (cmr10 . as-dummy)
-         ))
-    (as9 .
-        (
-         (feta16 . as9)
-         (feta20 . as9)
-         (feta-nummer4 . as-number1)
-         (feta-nummer8 . as-number4)
-         (feta-braces16 . as-braces9)
-         (cmr7 . as-dummy)
-         (cmr8 . as-dummy)
-         (cmr10 . as-dummy)
-         (cmr12 . as-dummy)
-         ))
-    ))
-
-(define (as-properties-to-font-name size fonts properties-alist-list)
-  (let* ((feta-name (properties-to-font-name fonts properties-alist-list))
-        (as-font-alist (cdr (assoc size as-font-alist-alist)))
-        (font (assoc (string->symbol feta-name) as-font-alist)))
-    (if font (symbol->string (cdr font))
-       (let ((e (current-error-port)))
-         (newline e)
-         (display "can't find font: " e)
-         (write feta-name e)
-         ;;(symbol->string size)
-         "as-dummy"
-         ))))
-
-;; FIXME: making a full style-sheet is a pain, so we parasite on
-;; paper16 and translate the result.
-;;
-(define (as-make-style-sheet size)
-  (let ((sheet (make-style-sheet 'paper16)))
-    (assoc-set! sheet 'properties-to-font
-               (lambda (x y) (as-properties-to-font-name size x y)))
-    sheet))
-
-
 (define (dot x y radius) "") ;; TODO
 
 (define (beam width slope thick)
@@ -167,7 +117,11 @@
   (filledbox breapth width depth height))
 
 (define (draw-line thick x1 y1 x2 y2)
-  (filledbox 0 (- x2 x1) 0 (- y2 y1)))
+  (let ((dx (- x2 x1))
+       (dy (- y2 y1)))
+    (string-append
+     (func ("rmove-to" x1 y1))
+     (filledbox 0 dx 0 dy))))
             
 (define (font-load-command name-mag command)
   ;; (display "name-mag: ")