From: janneke <janneke>
Date: Thu, 4 Mar 2004 19:07:22 +0000 (+0000)
Subject: updeet
X-Git-Tag: release/2.1.36~190
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a3d09cb1b3e108ca549dde59621bb9236229378;p=lilypond.git

updeet
---

diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index d90500913c..3676ffdbab 100644
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -33,16 +33,6 @@ sizeTest = \markup {
 spaceTest = \markup { "two space chars" }
 \header {
     texidoc = "Make titles using markup (WIP)."
-
-
-    % FIXME
-    fonts = #'((font-family . roman)
- 		  (word-space . 1)
- 		  (baseline-skip . 2)
- 		  (font-series . medium)
- 		  (font-style . roman)
- 		  (font-shape . upright)
- 		  (font-size . 2))
     
     %dedication = "För my dør Lily"
     dedication = "For my öòóôõø so dear Lily"
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 6bb582d441..6be76dbece 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -9,11 +9,15 @@
 ;;;;       input/test/title-markup.ly
 ;;;; 
 ;;;; TODO:
+;;;;   * move makeTitle (input/test/title-markup.ly) out of user space, but
+;;;;   * allow customisation of makeTitle markup.
+;;;;   * makePieceTitle markup
+;;;;   * page layout?
 ;;;;   * special characters, encoding.
+;;;;     + implement encoding switch (switches?  input/output??),
+;;;;     + move encoding definitions to ENCODING.ps files, or
+;;;;     + find out which program's PS(?) encoding code we can use?
 ;;;;   * text setting, kerning.
-;;;;   * font properties
-;;;;   * customisation of title markup, piece title markup?
-;;;;   * page layout
 ;;;;   * document output-interface
 
 (debug-enable 'backtrace)
@@ -352,42 +356,28 @@
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name
 (define (output-scopes paper scopes fields basename)
-
-  ;; FIXME: customise/generate these
-  (let*
-      ((props
-	(list
-	 (append
-	  `((linewidth . ,(ly:paper-get-number paper 'linewidth))
-	    (font-family . roman))
-	  (ly:paper-lookup paper 'font-defaults))))
+  (let* ((props (list (append
+		       `((linewidth . ,(ly:paper-get-number paper 'linewidth))
+			 (font-family . roman))
+		       (ly:paper-lookup paper 'font-defaults))))
        (prefix "lilypond")
        (stencils '()))
 
+    ;; FIXME: duplicates output-paper's scope-entry->string, mostly
     (define (scope-entry->string key var)
       (let ((val (variable-ref var)))
-	
 	(if (memq key fields)
 	    (header-to-file basename key val))
-	
 	(cond
-	 ((eq? key 'font)
-	  BARF
-	  (format (current-error-port) "PROPS:~S\n" val)
-	  (set! props (cons val props))
-	  "")
-	 
 	 ;; define strings, for /make-lilypond-title to pick up
 	 ((string? val) (ps-string-def prefix key val))
-	 
-	 ;; generate stencil from markup
+	 ((number? val) (ps-number-def prefix key val))
 	 ((markup? val) (set! stencils
 			      (append
 			       stencils
 			       (list
 				(interpret-markup paper props val))))
 	  "")
-	 ((number? val) (ps-number-def prefix key val))
 	 (else ""))))
     
     (define (output-scope scope)