CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/17 12:00:20
Modified files:
. : ChangeLog
lily : font-config.cc
scm : lily.scm
Log message:
* scm/lily.scm (running-from-gui?): Darwin never runs from GUI.
* lily/font-config.cc (init_fontconfig): add warning about cache.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3624&tr2=1.3625&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-config.cc.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.339&tr2=1.340&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3624 lilypond/ChangeLog:1.3625
--- lilypond/ChangeLog:1.3624 Mon May 16 23:25:37 2005
+++ lilypond/ChangeLog Tue May 17 12:00:18 2005
@@ -1,3 +1,9 @@
+2005-05-17 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/lily.scm (running-from-gui?): Darwin never runs from GUI.
+
+ * lily/font-config.cc (init_fontconfig): add warning about cache.
+
2005-05-16 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* lily/main.cc (setup_paths)[ARGV0_RELOCATION]:
Index: lilypond/lily/font-config.cc
diff -u lilypond/lily/font-config.cc:1.19 lilypond/lily/font-config.cc:1.20
--- lilypond/lily/font-config.cc:1.19 Tue May 3 19:07:42 2005
+++ lilypond/lily/font-config.cc Tue May 17 12:00:19 2005
@@ -26,6 +26,13 @@
error (_ ("initializing FontConfig"));
FcConfig *fcc = FcConfigGetCurrent ();
+
+ FcChar8 *cache = FcConfigGetCache (fcc);
+ if (!FcDirCacheValid (cache))
+ {
+ warning (_ ("FontConfig cache out of date. Rebuilding may take some
time."));
+ }
+
Array<String> dirs;
struct stat statbuf;
String builddir = prefix_directory + "/mf/out/";
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.339 lilypond/scm/lily.scm:1.340
--- lilypond/scm/lily.scm:1.339 Sun May 15 23:44:06 2005
+++ lilypond/scm/lily.scm Tue May 17 12:00:20 2005
@@ -375,10 +375,15 @@
(define (running-from-gui?)
(let ((have-tty? (isatty? (current-input-port))))
+
;; If no TTY and not using safe, assume running from GUI.
;; For mingw, the test must be inverted.
- (if (eq? PLATFORM 'windows)
- have-tty? (not have-tty?))))
+
+ (cond
+ ((eq? PLATFORM 'windows) have-tty?)
+ ((eq? PLATFORM 'Darwin) #f)
+ (else
+ (not have-tty?)))))
(define-public (gui-main files)
(if (null? files) (gui-no-files-handler))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
