The grand \paper -> \layout, \bookpaper -> \paper renaming.

[lilypond.git] / scm / output-sodipodi.scm

diff --git a/scm/output-sodipodi.scm b/scm/output-sodipodi.scm
index 954372a18ccf86882f2de8ec6663fa68edacb9a5..6f6ee224b1c012b5bb90a4c4c77c1b73d985cf99 100644 (file)
--- a/scm/output-sodipodi.scm
+++ b/scm/output-sodipodi.scm
@@ -44,7 +44,6 @@
 ;;;    define-fonts
 ;;;    no-origin
 ;;;    start-system
-;;;    end-output
 ;;;    header
 ;;;    comment
 ;;;    stop-last-system
@@ -244,12 +243,9 @@
 (define (comment s)
   (string-append "<!-- " s " -->\n"))
 
-(define (define-fonts paper font-list)
+(define (define-fonts layout font-list)
   (comment (format #f "Fonts used: ~S" font-list)))
 
-(define (end-output)
-  "</g></svg>")
-
 (define (filledbox breapth width depth height)
   (round-filled-box breapth width depth height line-thickness))
 
@@ -292,7 +288,7 @@
 (define (header-end)
   (comment "header-end"))
 
-(define (header creator time-stamp paper page-count- classic?)
+(define (header creator time-stamp layout page-count- classic?)
   (string-append
    xml-header
    (comment creator)
@@ -301,12 +297,12 @@
   
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name
-(define (output-scopes paper scopes fields basename)
+(define (output-scopes layout scopes fields basename)
   (format (current-error-port) "TODO: FIX ps/tex/interface\n"))
 
 ;; FIXME: duplictates output-scopes, duplicated in other backends
 ;; FIXME: silly interface name
-(define (output-paper-def pd)
+(define (output-layout-def pd)
   (format (current-error-port) "TODO: FIX ps/tex/interface\n"))
 
 (define (lily-def key val)
@@ -373,13 +369,14 @@
 ;;   (tagify "text" (dispatch expr) (cons 'style (get-font font)))))
    (tagify "text" expr (cons 'style (get-font font)))))
 
-(define (utext font s)
+(define (text font s)
   (tagify "tspan"
-         (apply string-appendb
+         (apply string-append
                 (map (lambda (x) (ascii->upm-string (char->integer x)))
-                     (string->list s)))))
+                     (string->list s)))
+         (cons 'style (get-font font))))
 
-(define (text font s)
+(define (ntext font s)
   ;;  (fontify font
   ;; to unicode or not?
   (tagify "tspan" (dispatch `(fontify ,font ,s))))