From: janneke <janneke>
Date: Mon, 2 Jun 2003 17:09:05 +0000 (+0000)
Subject: * scm/output-ascii-script.scm (as-font-alist-alist):
X-Git-Tag: release/1.7.25~197
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e416754715a0d68f1709632c984da9d73a1e7f39;p=lilypond.git
* 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 54c6a7716f..85aa755f46 100644
--- 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 5b074438dd..28967de073 100644
--- 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
index 0000000000..fec97d1004
--- /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 1daa4b2e95..9e57e1a9a0 100644
--- 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
index 0000000000..c14b0da90f
--- /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 835f813b2f..b0f158bdc2 100644
--- 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 ce0405733e..a9ad06adcc 100644
--- 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 d3b3648595..0d1cd0f5fa 100644
--- 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 c98c383a35..34b8333a98 100644
--- 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: ")