X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=68a822d93aa9a5b6686e8f2414b6949933798c86;hb=d4343c4c9e7590c9f4bf9bc01a3f3dc3aa3e22cc;hp=074fa58e4c9bbca5251013bf85b532f2aed1e7a3;hpb=14f577bacbfa4eb1f349de40e8f53b866634a0ec;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 074fa58e4c..68a822d93a 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -2,29 +2,57 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
+(for-each (lambda (x)
+	    (ly:add-option (car x) (cadr x) (caddr x)))
+	  
+	  '((point-and-click #t "use point & click")
+	    (midi-debug #f "generate human readable MIDI")
+	    (internal-type-checking #f "check every property assignment for types")
+	    (parse-protect #t    "continue when finding errors in inline
+scheme are caught in the parser. If off, halt 
+on errors, and print a stack trace.")
+	    (old-relative #f
+			  "relative for simultaneous music works
+similar to chord syntax")
+
+	    ;; at 101.178, a staff space is exactly 7 pixels. 
+	    (resolution 101.178 "resolution for generating bitmaps")
+	    (preview-include-book-title #t "include book-titles in preview images.")
+	    (gs-font-load #f
+			  "load fonts via Ghostscript.")
+	    (delete-intermediate-files #f
+				       "delete unusable PostScript files")
+	    (verbose #f "value for the --verbose flag")
+	    (ttf-verbosity 0
+			   "how much verbosity for TTF font embedding?")
+	    (debug-gc #f
+		      "dump GC protection info")))
+
+
 (if (defined? 'set-debug-cell-accesses!)
     (set-debug-cell-accesses! #f))
 
-;(set-debug-cell-accesses! 5000)
+;(set-debug-cell-accesses! 1000)
 
 (use-modules (ice-9 regex)
 	     (ice-9 safe)
+             (ice-9 optargs)
 	     (oop goops)
-	     (srfi srfi-1)  ; lists
-	     (srfi srfi-13)) ; strings
-
+	     (srfi srfi-1)
+	     (srfi srfi-13)
+	     (srfi srfi-14))
 
-; my display
 
+;; my display
 (define-public (myd k v) (display k) (display ": ") (display v) (display ", "))
 
 (define-public (print . args)
   (apply format (cons (current-output-port) args)))
-  
+
 
 ;;; General settings
 ;;; debugging evaluator is slower.  This should
@@ -36,16 +64,9 @@
       (debug-enable 'backtrace)
       (read-enable 'positions)))
 
-(define-public (line-column-location file line col)
-  "Print an input location, including column number ."
-  (string-append (number->string line) ":"
-		 (number->string col) " " file))
-
-(define-public (line-location  file line col)
-  "Print an input location, without column number ."
-  (string-append (number->string line) " " file))
 
-(define-public point-and-click #f)
+(define-public tex-backend?
+  (member (ly:output-backend) '("texstr" "tex")))
 
 (define-public parser #f)
 
@@ -54,7 +75,7 @@
    (map (lambda (x) (if (symbol? x)
 			(symbol->string x)
 			(number->string x)))
-		(ly:version))
+	(ly:version))
    "."))
 
 
@@ -69,10 +90,54 @@
     (define-public _ ly:gettext))
 
 (define-public (ly:load x)
-  (let* ((fn (%search-load-path x)))
+  (let* ((file-name (%search-load-path x)))
+    (if (ly:get-option 'verbose)
+	(ly:progress "[~A" file-name))
+    (primitive-load file-name)
     (if (ly:get-option 'verbose)
-	(format (current-error-port) "[~A]" fn))
-    (primitive-load fn)))
+	(ly:progress "]"))))
+
+(define-public TEX_STRING_HASHLIMIT 10000000)
+
+;; Cygwin
+;; #(CYGWIN_NT-5.1 Hostname 1.5.12(0.116/4/2) 2004-11-10 08:34 i686)
+;;
+;; Debian
+;; #(Linux hostname 2.4.27-1-686 #1 Fri Sep 3 06:28:00 UTC 2004 i686)
+;;
+;; Mingw
+;; #(Windows XP HOSTNAME build 2600 5.01 Service Pack 1 i686)
+;;
+
+;; ugh, code dup.
+(define-public PLATFORM
+  (string->symbol
+   (string-downcase
+    (car (string-tokenize (vector-ref (uname) 0) char-set:letter)))))
+
+(case PLATFORM
+  ((windows)
+   (define native-getcwd getcwd)
+   (define (slashify x)
+     (if (string-index x #\\)
+	 x
+	 (string-regexp-substitute
+	  "//*" "/"
+	  (string-regexp-substitute "\\\\" "/" x))))
+   ;; FIXME: this prints a warning.
+  (define-public (ly-getcwd)
+     (slashify (native-getcwd))))
+  (else (define-public ly-getcwd getcwd)))
+
+(define-public (is-absolute? file-name)
+  (let ((file-name-length (string-length file-name)))
+    (if (= file-name-length 0)
+	#f
+	(or (eq? (string-ref file-name 0) #\/)
+	    (and (eq? PLATFORM 'windows)
+		 (> file-name-length 2)
+		 (eq? (string-ref file-name 1) #\:)
+		 (eq? (string-ref file-name 2) #\/))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -84,24 +149,24 @@ predicates. Print a message at LOCATION if any predicate failed."
       (if (not (pred? arg))
 
 	  (begin
-	    (ly:input-message location
-			      (format #f
-				      (_ "wrong type for argument ~a. Expecting ~a, found ~s")
-				      count (type-name pred?) arg))
+	    (ly:input-message
+	     location
+	     (format
+	      #f (_ "wrong type for argument ~a.  Expecting ~a, found ~s")
+	      count (type-name pred?) arg))
 	    #f)
 	  #t))
 
     (if (null? signature)
 	#t
 	(and (helper (car signature) (car arguments) count)
-	     (recursion-helper (cdr signature) (cdr arguments) (1+ count)))
-	))
+	     (recursion-helper (cdr signature) (cdr arguments) (1+ count)))))
   (recursion-helper signature arguments 1))
-	 
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  output
 
-   
+
 ;;(define-public (output-framework) (write "hello\n"))
 
 (define output-tex-module
@@ -112,155 +177,137 @@ predicates. Print a message at LOCATION if any predicate failed."
 (define-public (ps-output-expression expr port)
   (display (eval expr output-ps-module) port))
 
-;; TODO: generate this list by registering the stencil expressions
-;;       stencil expressions should have docstrings.
-(define-public (ly:all-stencil-expressions)
-  "Return list of stencil expressions."
-  '(beam
-    bezier-sandwich
-    blank
-    bracket
-    char
-    dashed-line
-    dashed-slur
-    dot
-    draw-line
-    ez-ball
-    filledbox
-    horizontal-line
-    polygon
-    repeat-slash
-    round-filled-box
-    text
-    white-dot
-    white-text
-    zigzag-line
-    ))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Safe definitions utility
+(define safe-objects (list))
+
+(define-macro (define-safe-public arglist . body)
+  "Define a variable, export it, and mark it as safe, ie usable in LilyPond safe mode.
+The syntax is the same as `define*-public'."
+  (define (get-symbol arg)
+    (if (pair? arg)
+        (get-symbol (car arg))
+        arg))
+  (let ((safe-symbol (get-symbol arglist)))
+    `(begin
+       (define*-public ,arglist
+         ,@body)
+       (set! safe-objects (cons (cons ',safe-symbol ,safe-symbol)
+                                safe-objects))
+       ,safe-symbol)))
 
-;; TODO:
-;;  - generate this list by registering the output-backend-commands
-;;    output-backend-commands should have docstrings.
-;;  - remove hard copies in output-ps output-tex
-(define-public (ly:all-output-backend-commands)
-  "Return list of output backend commands."
-  '(
-    comment
-    grob-cause
-    no-origin
-    placebox
-    unknown
-    ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; other files.
 
 (for-each ly:load
-     ;; load-from-path
-     '("lily-library.scm"
-       "define-music-types.scm"
-       "output-lib.scm"
-       "c++.scm"
-       "chord-ignatzek-names.scm"
-       "chord-entry.scm"
-       "chord-generic-names.scm"
-       "stencil.scm"
-       "new-markup.scm"
-       "bass-figure.scm"
-       "music-functions.scm"
-       "part-combiner.scm"
-       "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"
-       "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"
-       "titling.scm"
-       
-       "paper.scm"
-
-       ; last:
-       "safe-lily.scm"
-       ))
+	  ;; load-from-path
+	  '("lily-library.scm"
+	    "file-cache.scm"
+	    "define-music-types.scm"
+	    "output-lib.scm"
+	    "c++.scm"
+	    "chord-ignatzek-names.scm"
+	    "chord-entry.scm"
+	    "chord-generic-names.scm"
+	    "stencil.scm"
+	    "markup.scm"
+	    "bass-figure.scm"
+	    "music-functions.scm"
+	    "part-combiner.scm"
+	    "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"
+	    "font.scm"
+	    "encoding.scm"
+	    
+	    "fret-diagrams.scm"
+	    "define-markup-commands.scm"
+	    "define-grob-properties.scm"
+	    "define-grobs.scm"
+	    "define-grob-interfaces.scm"
+	    "define-stencil-commands.scm"
+	    "page-layout.scm"
+	    "titling.scm"
+	    
+	    "paper.scm"
+	    "backend-library.scm"
+	    "x11-color.scm"
+
+	    ;; must be after everything has been defined
+	    "safe-lily.scm"))
 
 
 (set! type-p-name-alist
-  `(
-   (,boolean-or-symbol? . "boolean or symbol")
-   (,boolean? . "boolean")
-   (,char? . "char")
-   (,grob-list? . "list of grobs")
-   (,hash-table? . "hash table")
-   (,input-port? . "input port")
-   (,integer? . "integer")
-   (,list? . "list")
-   (,ly:context? . "context")
-   (,ly:dimension? . "dimension, in staff space")
-   (,ly:dir? . "direction")
-   (,ly:duration? . "duration")
-   (,ly:grob? . "layout object")
-   (,ly:input-location? . "input location")
-   (,ly:moment? . "moment")
-   (,ly:music? . "music")
-   (,ly:pitch? . "pitch")
-   (,ly:translator? . "translator")
-   (,ly:font-metric? . "font metric")
-   (,markup-list? . "list of markups")
-   (,markup? . "markup")
-   (,ly:music-list? . "list of music")
-   (,number-or-grob? . "number or grob")
-   (,number-or-string? . "number or string")
-   (,number-pair? . "pair of numbers")
-   (,number? . "number")
-   (,output-port? . "output port")   
-   (,pair? . "pair")
-   (,procedure? . "procedure") 
-   (,scheme? . "any type")
-   (,string? . "string")
-   (,symbol? . "symbol")
-   (,vector? . "vector")
-   ))
+      `(
+	(,boolean-or-symbol? . "boolean or symbol")
+	(,boolean? . "boolean")
+	(,char? . "char")
+	(,grob-list? . "list of grobs")
+	(,hash-table? . "hash table")
+	(,input-port? . "input port")
+	(,integer? . "integer")
+	(,list? . "list")
+	(,ly:context? . "context")
+	(,ly:dimension? . "dimension, in staff space")
+	(,ly:dir? . "direction")
+	(,ly:duration? . "duration")
+	(,ly:grob? . "layout object")
+	(,ly:input-location? . "input location")
+	(,ly:moment? . "moment")
+	(,ly:music? . "music")
+	(,ly:pitch? . "pitch")
+	(,ly:translator? . "translator")
+	(,ly:font-metric? . "font metric")
+	(,markup-list? . "list of markups")
+	(,markup? . "markup")
+	(,ly:music-list? . "list of music")
+	(,number-or-grob? . "number or grob")
+	(,number-or-string? . "number or string")
+	(,number-pair? . "pair of numbers")
+	(,number? . "number")
+	(,output-port? . "output port")   
+	(,pair? . "pair")
+	(,procedure? . "procedure") 
+	(,scheme? . "any type")
+	(,string? . "string")
+	(,symbol? . "symbol")
+	(,vector? . "vector")))
 
 
 ;; debug mem leaks
 
 (define gc-protect-stat-count 0)
 (define-public (dump-gc-protects)
-  (set! gc-protect-stat-count (1+ gc-protect-stat-count) )
-  (let*
-      ((protects (sort
-	   (hash-table->alist (ly:protects))
-	   (lambda (a b)
-	     (< (object-address (car a))
-		(object-address (car b))))))
-       (out-file-name (string-append
-	       "gcstat-" (number->string gc-protect-stat-count)
-	       ".scm"))
-       (outfile    (open-file  out-file-name  "w")))
-
-    (display "Dumping gc protected objs to ...\n")
+  (set! gc-protect-stat-count (1+ gc-protect-stat-count))
+  (let* ((protects (sort
+		    (hash-table->alist (ly:protects))
+		    (lambda (a b)
+		      (< (object-address (car a))
+			 (object-address (car b))))))
+
+	 (out-file-name (string-append
+			 "gcstat-" (number->string gc-protect-stat-count)
+			 ".scm"))
+	 (outfile    (open-file  out-file-name  "w")))
+
+    (display (format "Dumping gc protected objs to ~a...\n" out-file-name))
     (display
      (filter
       (lambda (x) (not (symbol? x))) 
       (map (lambda (y)
-	     (let
-		 ((x (car y))
-		  (c (cdr y)))
+	     (let ((x (car y))
+		   (c (cdr y)))
 
 	       (string-append
 		(string-join
@@ -268,85 +315,108 @@ predicates. Print a message at LOCATION if any predicate failed."
 		 " ")
 		"\n")))
 	   protects))
-     outfile)))
-
+     outfile)
+
+    (if (defined? 'gc-live-object-stats)
+	(let*
+	    ((dummy (gc))
+	     (dummy2 (gc))
+	     (stats (gc-live-object-stats))
+	     )
+
+	  (for-each
+	   (lambda (x)
+	     (format outfile "~a: ~a\n" (car x) (cdr x)))
+	   (sort (gc-live-object-stats)
+		 (lambda (x y)
+		   (string<? (car x) (car y)))))
+	   ))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
-
-(define-public (ly:system command)
-  (let*
-      ((status 0)
+    ))
 
-       (silenced
-	(string-append command (if (ly:get-option 'verbose)
-				 ""
-				 " > /dev/null 2>&1 "))))
-    
-    (if (ly:get-option 'verbose)
-	(format  (current-error-port) (_ "Invoking `~a'...\n") command))
-    
-    (set! status (system silenced))
-    (if (> status 0)
-	(begin
-	  (format (current-error-port)
-		  (_ "Error invoking `~a'. Return value ~a") silenced status)
-	  (newline (current-error-port))))))
-
-(define-public (sanitize-command-option str)
-  (string-append
-   "\""
-   (regexp-substitute/global #f "[^- 0-9,.a-zA-Z'\"\\]" str 'pre 'post)
-  "\""))
-
-(define-public (postscript->pdf papersizename name)
-  (let* ((cmd (string-append "ps2pdf "
-			     (string-append
-			      " -sPAPERSIZE="
-			      (sanitize-command-option papersizename)
-			      " "
-			     name)))
-	 (pdf-name (string-append (basename name ".ps") ".pdf" )))
-
-    (if (access? pdf-name W_OK)
-	(delete-file pdf-name))
-
-    (format (current-error-port) (_ "Converting to `~a'...") pdf-name)
-    (ly:system cmd)))
-
-(define-public (postscript->png resolution name)
-  (let
-      ((cmd (string-append
-	   "ps2png --resolution="
-	   (if (number? resolution)
-	       (number->string resolution)
-	       "90 ")
-	   (if (ly:get-option 'verbose)
-	       "--verbose "
-	       " ")
-	   name)))
-    (ly:system cmd)))
+(define-public (tweak-grob-property grob sym val)
+  (set! (ly:grob-property grob sym) val))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
-  (let* ((failed '())
-	 (handler (lambda (key arg) (set! failed (cons arg failed)))))
-    (for-each
-     (lambda (f)
-       (catch 'ly-file-failed (lambda () (ly:parse-file f)) handler)
-;       (dump-gc-protects)
-       )
-     files)
 
+  (if (null? files)
+      (no-files-handler))
+
+  (let ((failed (lilypond-all files)))
     (if (pair? failed)
 	(begin
-	  (newline (current-error-port))
-	  (display (_ "error: failed files: ") (current-error-port))
-	  (display (string-join failed) (current-error-port))
-	  (newline (current-error-port))
-	  (newline (current-error-port))
+	  (ly:error (_ "failed files: ~S") (string-join failed))
 	  (exit 1))
-	(exit 0))))
+	(begin
+	  ;; HACK: be sure to exit with single newline
+	  (ly:message "")
+	  (exit 0)))))
 
+(define (no-files-handler)
+  (ly:usage)
+  (exit 2))
 
-(define-public (tweak-grob-property grob sym val)
-    (set! (ly:grob-property grob sym) val))
+(define-public (lilypond-all files)
+  (let* ((failed '())
+	 (handler (lambda (key failed-file)
+		    (set! failed (append (list failed-file) failed)))))
+    ;;(handler (lambda (key . arg) (set! failed (append arg failed)))))
+    (for-each (lambda (x) (lilypond-file handler x)) files)
+    failed))
+
+(define (lilypond-file handler file-name)
+  (catch 'ly-file-failed
+	 (lambda () (ly:parse-file file-name))
+	 (lambda (x . args) (handler x file-name)))
+
+  (if (ly:get-option 'debug-gc)
+      (dump-gc-protects)))
+
+(use-modules (scm editor))
+
+(define-public (running-from-gui?)
+  (let ((have-tty? (isatty? (current-input-port))))
+    ;; If no TTY and not using safe, assume running from GUI.
+    (cond
+     ((eq? PLATFORM 'windows)
+      ;; This only works for i586-mingw32msvc-gcc -mwindows
+      (not (string-match "standard input"
+			 (format #f "~S" (current-input-port)))))
+     ((eq? PLATFORM 'darwin) #f)
+     (else
+      (not have-tty?)))))
+
+(define-public (gui-main files)
+  (if (null? files)
+      (gui-no-files-handler))
+  (let* ((base (basename (car files) ".ly"))
+	 (log-name (string-append base ".log")))
+    (if (not (running-from-gui?))
+	(ly:message (_ "Redirecting output to ~a...") log-name))
+    (ly:stderr-redirect log-name "w")
+    (ly:message "# -*-compilation-*-")
+    (let ((failed (lilypond-all files)))
+      (if (pair? failed)
+	  (begin
+	    ;; ugh
+	    (ly:stderr-redirect "foo" "r")
+	    (system (get-editor-command log-name 0 0 0))
+	    (ly:error (_ "failed files: ~S") (string-join failed))
+	    ;; not reached?
+	    (exit 1))
+	  (exit 0)))))
+
+(define (gui-no-files-handler)
+  (let* ((ly (string-append (ly:effective-prefix) "/ly/"))
+	 ;; FIXME: soft-code, localize
+	 (welcome-ly (string-append ly "Welcome_to_LilyPond.ly"))
+	 (cmd (get-editor-command welcome-ly 0 0 0)))
+    (ly:message (_ "Invoking `~a'...") cmd)
+    (system cmd)
+    (exit 1)))
+
+(or (not (running-from-gui?))
+    (ly:get-option 'safe)
+    (define lilypond-main gui-main))