* scm/output-tex.scm (output-tex-string): tighten safe security.

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index f163d26c71028b466f2c33e5a5b5edbb051f1924..58c3a603e0248bdf5e9e476bac47de9ee43e8e57 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -20,7 +20,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 ", "))
 
@@ -28,27 +27,25 @@
 ;;; debugging evaluator is slower.  This should
 ;;; have a more sensible default.
 
-
 (if (ly:get-option 'verbose)
     (begin
       (debug-enable 'debug)
       (debug-enable 'backtrace)
-      (read-enable 'positions) ))
-
+      (read-enable 'positions)))
 
 (define-public (line-column-location line col file)
   "Print an input location, including column number ."
   (string-append (number->string line) ":"
-                (number->string col) " " file)
-  )
+                (number->string col) " " file))
 
 (define-public (line-location line col file)
   "Print an input location, without column number ."
-  (string-append (number->string line) " " file)
-  )
+  (string-append (number->string line) " " file))
 
 (define-public point-and-click #f)
 
+(define-public parser #f)
+
 (define-public (lilypond-version)
   (string-join
    (map (lambda (x) (if (symbol? x)
@@ -95,9 +92,28 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; lily specific variables.
+
 (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)))
+    (ly:parser-print-book parser book)))
+
+(define-public (print-score-as-book parser score)
+  (let ((book (ly:score-bookify score)))
+    (ly:parser-print-book parser book)))
+
+(define-public (print-score parser score)
+  (let ((book (ly:score-bookify score)))
+    (ly:parser-print-score parser book)))
+               
+(define-public default-toplevel-music-handler print-music-as-book)
+(define-public default-toplevel-book-handler ly:parser-print-book)
+(define-public default-toplevel-score-handler print-score-as-book)
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Unassorted utility functions.
@@ -378,6 +394,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))
@@ -401,6 +418,8 @@ L1 is copied, L2 not.
        (caddr d)
        (scm-error "Could not find dumper for format ~s" format))))
 
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; other files.
 
@@ -420,12 +439,13 @@ L1 is copied, L2 not.
        "define-music-properties.scm"
        "auto-beam.scm"
        "chord-name.scm"
+
+       "ly-from-scheme.scm"
        
        "define-context-properties.scm"
        "translation-functions.scm"
        "script.scm"
        "midi.scm"
-
        "beam.scm"
        "clef.scm"
        "slur.scm"
@@ -438,6 +458,9 @@ L1 is copied, L2 not.
        "define-grob-interfaces.scm"
        "page-layout.scm"
        "paper.scm"
+
+       ; last:
+       "safe-lily.scm"
        ))