]> git.donarmstrong.com Git - lilypond.git/commitdiff
backend is now a symbol.
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Sat, 3 Feb 2007 17:54:31 +0000 (18:54 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sat, 3 Feb 2007 17:54:31 +0000 (18:54 +0100)
lily/paper-outputter-scheme.cc
scm/framework-ps.scm
scm/framework-socket.scm
scm/framework-svg.scm
scm/framework-tex.scm

index 672eab7ce72c07838c780ede3ad5030d9ffac913..2149f0ec2cb87ba88dbcfac5662fe6c84733411e 100644 (file)
@@ -18,10 +18,9 @@ LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
           "@code{output-}@var{format}, writing to  @var{port}.")
 {
   LY_ASSERT_TYPE (ly_is_port, port, 1);
-  LY_ASSERT_TYPE (scm_is_string, format, 2);
-
-  string f = ly_scm2string (format);
+  LY_ASSERT_TYPE (ly_is_symbol, format, 2);
 
+  string f = ly_symbol2string (format);
   string output_name = "<unknown>";
 
   SCM port_name = scm_port_filename (port);
index 28579ebc96f93c0175d793fa39d8dd2547741cfb..f2eb8fa11345b103a2003fae48bda3a02704030a 100644 (file)
                     ;; content-mangling is always bad.
                     ;; MINGW hack: need to have "b"inary for embedding CFFs
                     (open-file filename "wb")
-                    "ps"))
+                    'ps))
         (paper (ly:paper-book-paper book))
         (systems (ly:paper-book-systems book))
         (page-stencils (map page-stencil (ly:paper-book-pages book)))
                     ;; content-mangling is always bad.
                     ;; MINGW hack: need to have "b"inary for embedding CFFs
                     (open-file (format "~a.eps" filename) "wb")
-                    "ps"))
+                    'ps))
 
         (port (ly:outputter-port outputter))
         (rounded-bbox (to-bp-box bbox))
index 8068e34cce6f3998f699e7f167b9bb07c52fdc04..45cbfb96397f40ac2636d5ddbf087b8855ff7b4f 100644 (file)
@@ -19,7 +19,7 @@
                     channel))
        (outputter (ly:make-paper-outputter
                   ctor-arg
-                  "socket"))
+                  'socket))
        (systems (ly:paper-book-systems book)))
 
     (if (pair? systems)
index 6abb3438b8f11b072c0dcc83a8e6890a45bf7fcf..8f5f34d7c079c8057fe8521d206297f78badc734 100644 (file)
      (string-append
       (ec 'g)
       (if page-set? (ec 'pageSet) "")
-      (ec 'svg)))))
+      (ec 'svg)))
+    
+    (ly:outputter-close outputter)
+    ))
 
 (define (dump-page outputter page page-number page-count landscape? page-set?)
   (define (dump str) (display str (ly:outputter-port outputter)))
index 83c64820e566d0b1cc48d1514d121d81a410ecc3..a60f9877b11477f9173818605efb2548fbab9444 100644 (file)
 
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.tex" basename))
-        (outputter  (ly:make-paper-outputter (open-file filename "wb") "tex"))
+        (outputter  (ly:make-paper-outputter (open-file filename "wb") 'tex))
         (paper (ly:paper-book-paper book))
         (page-stencils (map page-stencil (ly:paper-book-pages book)))
         (last-page (car (last-pair pages)))
                basename book scopes fields)
   (let* ((filename (format "~a.tex" basename))
         (outputter  (ly:make-paper-outputter
-                     (open-file filename "w") "tex"))
+                     (open-file filename "w") 'tex))
         (paper (ly:paper-book-paper book))
         (lines (ly:paper-book-systems book))
         (last-line (car (last-pair lines))))
                basename book scopes fields)
   (let* ((filename (format "~a.tex" basename))
         (outputter  (ly:make-paper-outputter (open-file filename "wb")
-                                             "tex"))
+                                             'tex))
         (paper (ly:paper-book-paper book))
         (lines (ly:paper-book-systems book))
         (first-notes-index (list-index