X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Flily.scm;h=9b93992e24ea720a6327139c620957e1339fe2f9;hb=1f4ae685939466899fdf85121a58801c867f9381;hp=06e41889fcab969527384dcf206f0f81c5601648;hpb=2c12af09be46d47b03987d2296f76eb173ebc009;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 06e41889fc..9b93992e24 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -6,35 +6,39 @@
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
-(for-each (lambda (x)
-	    (ly:add-option (car x) (cadr x) (caddr x)))
+(define (define-scheme-options)
+  (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
+	    '((point-and-click #t "use point & click")
+	      (paper-size "a4" "the default paper size")
+	      (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
+	      (profile-property-accesses #f "keep statistics of get_property() calls.")
+	      (old-relative #f
+			    "relative for simultaneous music works
 similar to chord syntax")
-
-	    ;; at 101.178, a staff space is exactly 7 pixels.
-	    ;; 115.63 = 8 pixels
-	    ;; 86  = 6 pixels
-	    (resolution 90 "resolution for generating bitmaps")
-	    (anti-alias-factor 1 "blow up resolution and scale to prevent jaggies in PNG")
-	    (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
+	      (object-keys #f
+			   "experimental mechanism for remembering tweaks")
+	      (resolution 101 "resolution for generating bitmaps")
+	      (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
+	      (preview-include-book-title #t "include book-titles in preview images.")
+	      (gs-font-load #f
+			    "load fonts via Ghostscript.")
+	      (gui #f "running from gui; redirect stderr to log file")
+	      (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")))
+	      (debug-gc #f
+			"dump GC protection info"))))
 
+;; FIXME: stray statement
+(define-scheme-options)
 
 (if (defined? 'set-debug-cell-accesses!)
     (set-debug-cell-accesses! #f))
@@ -67,7 +71,6 @@ similar to chord syntax")
       (debug-enable 'backtrace)
       (read-enable 'positions)))
 
-
 (define-public tex-backend?
   (member (ly:output-backend) '("texstr" "tex")))
 
@@ -118,6 +121,12 @@ similar to chord syntax")
    (string-downcase
     (car (string-tokenize (vector-ref (uname) 0) char-set:letter)))))
 
+(define-public DOS
+  (let ((platform (string-tokenize
+		   (vector-ref (uname) 0) char-set:letter+digit)))
+    (if (null? (cdr platform)) #f
+	(member (string-downcase (cadr platform)) '("95" "98" "me")))))
+
 (case PLATFORM
   ((windows)
    (define native-getcwd getcwd)
@@ -215,22 +224,22 @@ The syntax is the same as `define*-public'."
 	    "chord-generic-names.scm"
 	    "stencil.scm"
 	    "markup.scm"
-	    "bass-figure.scm"
 	    "music-functions.scm"
 	    "part-combiner.scm"
+	    "autochange.scm"
 	    "define-music-properties.scm"
 	    "auto-beam.scm"
 	    "chord-name.scm"
 
-	    "ly-from-scheme.scm"
+	    "parser-ly-from-scheme.scm"
 	    
 	    "define-context-properties.scm"
 	    "translation-functions.scm"
 	    "script.scm"
 	    "midi.scm"
-	    "beam.scm"
-	    "clef.scm"
-	    "slur.scm"
+	    "layout-beam.scm"
+	    "parser-clef.scm"
+	    "layout-slur.scm"
 	    "font.scm"
 	    "encoding.scm"
 	    
@@ -240,7 +249,7 @@ The syntax is the same as `define*-public'."
 	    "define-grobs.scm"
 	    "define-grob-interfaces.scm"
 	    "define-stencil-commands.scm"
-	    "page-layout.scm"
+	    "layout-page-layout.scm"
 	    "titling.scm"
 	    
 	    "paper.scm"
@@ -306,44 +315,49 @@ The syntax is the same as `define*-public'."
 
     (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)))
-
-	       (string-append
-		(string-join
-		 (map object->string (list (object-address x) c x))
-		 " ")
-		"\n")))
+     (map (lambda (y)
+	    (let ((x (car y))
+		  (c (cdr y)))
+	      
+	      (string-append
+	       (string-join
+		(map object->string (list (object-address x) c x))
+		" ")
+	       "\n")))
+
+	  (filter
+	   (lambda (x)
+	     (not (symbol? (car x))))
 	   protects))
      outfile)
 
+;    (display (ly:smob-protects))
+    (newline outfile)
     (if (defined? 'gc-live-object-stats)
-	(let*
-	    ((dummy (gc))
-	     (dummy2 (gc))
-	     (stats (gc-live-object-stats))
-	     )
-
+	(let* ((stats #f))
+	  (display "Live object statistics: GC'ing\n")
+	  (gc)
+	  (gc)
+	  
+	  (set! stats (gc-live-object-stats))
+	  (display "Dumping live object statistics.\n")
+	  
 	  (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 (tweak-grob-property grob sym val)
-  (set! (ly:grob-property grob sym) val))
+		   (string<? (car x) (car y)))))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
 
+  (define (no-files-handler)
+    (ly:usage)
+    (exit 2))
+  
+
   (if (null? files)
       (no-files-handler))
 
@@ -357,25 +371,24 @@ The syntax is the same as `define*-public'."
 	  (ly:message "")
 	  (exit 0)))))
 
-(define (no-files-handler)
-  (ly:usage)
-  (exit 2))
-
 (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)
+    (for-each
+     (lambda (x)
+       (lilypond-file handler x)
+       (ly:clear-anonymous-modules)
+       (if (ly:get-option 'debug-gc)
+	   (dump-gc-protects)))
+     
+     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)))
+	 (lambda (x . args) (handler x file-name))))
 
 (use-modules (scm editor))
 
@@ -384,9 +397,14 @@ The syntax is the same as `define*-public'."
     ;; If no TTY and not using safe, assume running from GUI.
     (cond
      ((eq? PLATFORM 'windows)
+      ;; Always write to .log file.
+      (if DOS #t
       ;; This only works for i586-mingw32msvc-gcc -mwindows
       (not (string-match "standard input"
-			 (format #f "~S" (current-input-port)))))
+			 (format #f "~S" (current-input-port))))))
+     ;; FIXME: using -dgui would be nice, but it does not work
+     ((eq? PLATFORM 'foo-windows)
+      (ly:get-option 'gui))
      ((eq? PLATFORM 'darwin) #f)
      (else
       (not have-tty?)))))