CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/05/17 14:36:20
Modified files:
scm : editor.scm backend-library.scm
lily : main.cc
. : ChangeLog
Log message:
* scm/editor.scm (get-editor): Add platform defaults.
* scm/backend-library.scm (postscript->pdf): Typo.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/editor.scm.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.252&tr2=1.253&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3625&tr2=1.3626&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3625 lilypond/ChangeLog:1.3626
--- lilypond/ChangeLog:1.3625 Tue May 17 12:00:18 2005
+++ lilypond/ChangeLog Tue May 17 14:36:20 2005
@@ -1,3 +1,9 @@
+2005-05-17 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * scm/editor.scm (get-editor): Add platform defaults.
+
+ * scm/backend-library.scm (postscript->pdf): Typo.
+
2005-05-17 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/lily.scm (running-from-gui?): Darwin never runs from GUI.
@@ -6,7 +12,7 @@
2005-05-16 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
- * lily/main.cc (setup_paths)[ARGV0_RELOCATION]:
+ * lily/main.cc (setup_paths)[ARGV0_RELOCATION]: Remove GS_*.
2005-05-16 Mats Bengtsson <[EMAIL PROTECTED]>
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.252 lilypond/lily/main.cc:1.253
--- lilypond/lily/main.cc:1.252 Mon May 16 23:25:37 2005
+++ lilypond/lily/main.cc Tue May 17 14:36:20 2005
@@ -190,8 +190,6 @@
#if ARGV0_RELOCATION
env_var_info (out, "FONTCONFIG_FILE");
env_var_info (out, "FONTCONFIG_PATH");
- env_var_info (out, "GS_FONTPATH");
- env_var_info (out, "GS_LIB");
env_var_info (out, "GUILE_LOAD_PATH");
env_var_info (out, "PANGO_RC_FILE");
env_var_info (out, "PATH");
@@ -297,8 +295,10 @@
String argv0_prefix = dir_name (bindir);
if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
{
+#if 0
warning (_f ("argv0 relocation: argv0=%s, prefix=%s", argv0,
prefix_directory));
+#endif
String datadir = argv0_prefix + "/share";
String libdir = argv0_prefix + "/lib";
String sysconfdir = argv0_prefix + "/etc";
@@ -308,14 +308,6 @@
prepend_env_path ("GUILE_LOAD_PATH", datadir
+ to_string ("/guile/%d.%d",
SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
-#ifdef __MINGW32__
- /* FIXME: this is broken and must go, but updating the environment
- takes a relogin/reboot. Can gs be wrapped? */
- prepend_env_path ("GS_FONTPATH", "c:/windows/fonts");
-#endif
- prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts");
- prepend_env_path ("GS_LIB", datadir + "/gs/Resource");
- prepend_env_path ("GS_LIB", datadir + "/gs/lib");
sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pango.modules",
false);
prepend_env_path ("PATH", bindir);
}
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.26
lilypond/scm/backend-library.scm:1.27
--- lilypond/scm/backend-library.scm:1.26 Mon May 16 23:25:37 2005
+++ lilypond/scm/backend-library.scm Tue May 17 14:36:19 2005
@@ -53,7 +53,7 @@
;; The wrapper on windows cannot handle `=' signs,
;; gs has a workaround with #.
(if (eq? PLATFORM 'windows)
- (set! cmd (string-regex-substitute "=" "#" cmd)))
+ (set! cmd (string-regexp-substitute "=" "#" cmd)))
(if (access? pdf-name W_OK)
(delete-file pdf-name))
Index: lilypond/scm/editor.scm
diff -u lilypond/scm/editor.scm:1.6 lilypond/scm/editor.scm:1.7
--- lilypond/scm/editor.scm:1.6 Mon May 16 23:25:37 2005
+++ lilypond/scm/editor.scm Tue May 17 14:36:19 2005
@@ -21,7 +21,13 @@
(or (getenv "LYEDITOR")
(getenv "XEDITOR")
(getenv "EDITOR")
- "emacs"))
+
+ ;; FIXME: how are default/preferred editors specified on
+ ;; different platforms?
+ (case PLATFORM
+ ((windows) "lilypad")
+ (else
+ "emacs"))))
(define (get-command-template alist editor)
(define (get-command-template-helper)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
