* lily/ly-module.cc (LY_DEFINE): bugfix.

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index e22e5a5acd686a1f28c9980e5de4a95151f9f775..264f4be59ada840a0117b25344636938126f3032 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -7,6 +7,7 @@
 
 ;;; Library functions
 
+
 (if (defined? 'set-debug-cell-accesses!)
     (set-debug-cell-accesses! #f))
 
@@ -20,7 +21,6 @@
             (srfi srfi-1)  ; lists
             (srfi srfi-13)) ; strings
 
-(define-public safe-module (make-safe-module))
 
 (define-public (myd k v) (display k) (display ": ") (display v) (display ", "))
 
@@ -96,20 +96,24 @@
 
 (define-public default-script-alist '())
 
-(define-public safe-mode? #f)
 
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
   (let* ((score (ly:music-scorify music))
-        (book (ly:score-bookify score)))
+        (head  (ly:parser-lookup parser '$globalheader))
+        (book (ly:score-bookify score head)))
     (ly:parser-print-book parser book)))
 
 (define-public (print-score-as-book parser score)
-  (let ((book (ly:score-bookify score)))
+  (let*
+      ((head  (ly:parser-lookup parser '$globalheader))
+       (book (ly:score-bookify score head)))
+    
     (ly:parser-print-book parser book)))
 
 (define-public (print-score parser score)
-  (let ((book (ly:score-bookify score)))
+  (let* ((head  (ly:parser-lookup parser '$globalheader))
+       (book (ly:score-bookify score head)))
     (ly:parser-print-score parser book)))
                
 (define-public default-toplevel-music-handler print-music-as-book)
@@ -117,9 +121,6 @@
 (define-public default-toplevel-score-handler print-score-as-book)
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Unassorted utility functions.
-
 
 ;;;;;;;;;;;;;;;;
 ; alist
@@ -379,14 +380,12 @@ L1 is copied, L2 not.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  output
-(use-modules
-            ;(scm output-sketch)
-            ;(scm output-sodipodi)
-            ;(scm output-pdftex)
-
+(use-modules (scm framework-tex)
+            (scm framework-ps)
             )
 
 
+
 (define output-tex-module
   (make-module 1021 (list (resolve-interface '(scm output-tex)))))
 (define output-ps-module
@@ -396,6 +395,7 @@ L1 is copied, L2 not.
 (define-public (ps-output-expression expr port)
   (display (eval expr output-ps-module) port))
 
+
 (define output-alist
   `(
     ("tex" . ("TeX output. The default output form." ,tex-output-expression))
@@ -419,6 +419,8 @@ L1 is copied, L2 not.
        (caddr d)
        (scm-error "Could not find dumper for format ~s" format))))
 
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; other files.
 
@@ -445,19 +447,23 @@ L1 is copied, L2 not.
        "translation-functions.scm"
        "script.scm"
        "midi.scm"
-
        "beam.scm"
        "clef.scm"
        "slur.scm"
        "font.scm"
        "encoding.scm"
        
+       "fret-diagrams.scm"
        "define-markup-commands.scm"
        "define-grob-properties.scm"
        "define-grobs.scm"
        "define-grob-interfaces.scm"
        "page-layout.scm"
+       
        "paper.scm"
+
+       ; last:
+       "safe-lily.scm"
        ))