Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / framework-socket.scm

diff --git a/scm/framework-socket.scm b/scm/framework-socket.scm
index a2a000e1e22fc988e056e0c68ecf2082d6dfe955..ab612e59aa4e52c3c3d617f464e8bb183688dcbe 100644 (file)
--- a/scm/framework-socket.scm
+++ b/scm/framework-socket.scm
@@ -1,9 +1,12 @@
+;;;; framework-socket.scm
+
 (define-module (scm framework-socket)
   #:export (output-framework)
   )
 
 (use-modules (ice-9 regex)
             (ice-9 string-fun)
+            (scm paper-system)
             (ice-9 format)
             (guile)
             (srfi srfi-1)
@@ -13,19 +16,18 @@
 
 (define-public (output-framework channel book scopes fields )
   (let*
-      (
-       (ctor-arg (if (string? channel)
+      ((ctor-arg (if (string? channel)
                     (open-output-file (format "~a.socket" channel))
                     channel))
        (outputter (ly:make-paper-outputter
                   ctor-arg
-                  "socket")))
-
-    (for-each
-     (lambda (page)
-       (ly:outputter-dump-stencil outputter page))
-     (ly:paper-book-pages book))))
+                  'socket))
+       (systems (ly:paper-book-systems book)))
 
+    (if (pair? systems)
+       (ly:outputter-dump-stencil outputter
+                                  (paper-system-stencil (car systems))))
+    ))
 
 (define-public output-classic-framework output-framework)
 
@@ -33,5 +35,3 @@
 (define-public (convert-to-ps . args) #t)
 (define-public (convert-to-pdf . args) #t)
 (define-public (convert-to-png . args) #t)
-(define-public (convert-to-dvi . args) #t)
-(define-public (convert-to-tex . args) #t)