CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/07/21 10:53:12
Modified files:
scm : lily.scm
lily : main.cc
. : ChangeLog
Log message:
really checkin
* lily/main.cc (main): Remove invalid handle kludge.
* scm/lily.scm (running-from-gui?): WINDOWS: check -dgui.
(lambda): add gui define.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.370&tr2=1.371&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.265&tr2=1.266&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3904&tr2=1.3905&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3904 lilypond/ChangeLog:1.3905
--- lilypond/ChangeLog:1.3904 Thu Jul 21 01:11:50 2005
+++ lilypond/ChangeLog Thu Jul 21 10:53:12 2005
@@ -1,3 +1,10 @@
+2005-07-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * lily/main.cc (main): Remove invalid handle kludge.
+
+ * scm/lily.scm (running-from-gui?): WINDOWS: check -dgui.
+ (lambda): add gui define.
+
2005-07-21 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/output-def-scheme.cc (LY_DEFINE): take default argument.
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.265 lilypond/lily/main.cc:1.266
--- lilypond/lily/main.cc:1.265 Wed Jul 13 20:30:47 2005
+++ lilypond/lily/main.cc Thu Jul 21 10:53:12 2005
@@ -726,25 +726,9 @@
}
}
-#ifdef __MINGW32__
-# include "windows.h"
-# ifndef INVALID_HANDLE
-# define INVALID_HANDLE ((void*) -1)
-# endif
-#endif
-
int
main (int argc, char **argv)
{
-#ifdef __MINGW32__
- /* Possible gs.exe fix for DOS-based Windowses. */
- if (GetStdHandle (STD_OUTPUT_HANDLE) == INVALID_HANDLE)
- {
- freopen ("nul$", "w", stdout);
- freopen ("nul$", "w", stderr);
- }
-#endif
-
setup_localisation ();
setup_paths (argv[0]);
parse_argv (argc, argv);
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.370 lilypond/scm/lily.scm:1.371
--- lilypond/scm/lily.scm:1.370 Wed Jul 13 18:22:35 2005
+++ lilypond/scm/lily.scm Thu Jul 21 10:53:11 2005
@@ -6,33 +6,37 @@
;;;; Han-Wen Nienhuys <[EMAIL PROTECTED]>
-(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")
+ (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
+ (old-relative #f
+ "relative for simultaneous music works
similar to chord syntax")
- (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.")
- (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))
@@ -116,6 +120,12 @@
(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)
@@ -320,25 +330,20 @@
outfile)
(if (defined? 'gc-live-object-stats)
- (let*
- ((stats #f))
-
+ (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)))))
- ))
-
- ))
+ (string<? (car x) (car y)))))))))
(define-public (tweak-grob-property grob sym val)
(set! (ly:grob-property grob sym) val))
@@ -387,9 +392,14 @@
;; 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?)))))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
