*** empty log message ***

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 186e92ade1be9e3c04afeb4b7808d4d3c13c90cb..945f26fb415298c18e52052ee3a36f186eac34c1 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -7,20 +7,16 @@
 
 ;;; Library functions
 
+
 (if (defined? 'set-debug-cell-accesses!)
     (set-debug-cell-accesses! #f))
 
-;; ugh, need this for encoding.scm test
-;; srfi-13 overrides string->list
-(define-public plain-string->list string->list)
-
 (use-modules (ice-9 regex)
             (ice-9 safe)
             (oop goops)
             (srfi srfi-1)  ; lists
             (srfi srfi-13)) ; strings
 
-
 (define-public (myd k v) (display k) (display ": ") (display v) (display ", "))
 
 ;;; General settings
@@ -99,18 +95,20 @@
 ;; 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)
@@ -118,18 +116,6 @@
 (define-public default-toplevel-score-handler print-score-as-book)
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Unassorted utility functions.
-
-
-;; modules
-(define-public (ly:modules-lookup modules sym)
-  "DOCME."
-  (let ((v (module-variable (car modules) sym)))
-    (if (and v (variable-bound? v) (variable-ref v))
-       (variable-ref v)
-       (if (module? (cdr modules)) (ly:modules-lookup (cdr modules) sym)))))
-
 
 ;;;;;;;;;;;;;;;;
 ; alist
@@ -378,10 +364,7 @@ L1 is copied, L2 not.
   (not (= l r)))
 
 (define-public (ly:load x)
-  (let* (
-        (fn (%search-load-path x))
-
-        )
+  (let* ((fn (%search-load-path x)))
     (if (ly:get-option 'verbose)
        (format (current-error-port) "[~A]" fn))
     (primitive-load fn)))
@@ -389,14 +372,17 @@ L1 is copied, L2 not.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  output
-(use-modules
-            ;(scm output-sketch)
-            ;(scm output-sodipodi)
-            ;(scm output-pdftex)
-
-            )
 
 
+;; only load modules necessary.
+(eval
+ (cons use-modules
+       (map (lambda (x)
+             (list 'scm (string->symbol (string-append "framework-" x))))
+           (ly:output-formats)))
+ (current-module))
+       
+   
 (define output-tex-module
   (make-module 1021 (list (resolve-interface '(scm output-tex)))))
 (define output-ps-module
@@ -470,6 +456,8 @@ L1 is copied, L2 not.
        "define-grobs.scm"
        "define-grob-interfaces.scm"
        "page-layout.scm"
+       "titling.scm"
+       
        "paper.scm"
 
        ; last: