From: Jan Nieuwenhuizen Date: Wed, 14 Nov 2001 18:16:13 +0000 (+0100) Subject: patch::: 1.5.22.jcn3 X-Git-Tag: release/1.5.23~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aaed96e04bf720f3039afb0a963ddc6ce9240da3;p=lilypond.git patch::: 1.5.22.jcn3 1.5.22.jcn3 --- diff --git a/CHANGES b/CHANGES index f4d8da4de9..78f455fb94 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -1.5.22.jcn2 +1.5.22.jcn3 =========== +* Bugfix: prepend DATADIR to %loadpath too. + * Resurrected experimental sketch output, now with dispatch. * Documented Linux-2.4.0, Guile-1.4 --with-threads bug. diff --git a/VERSION b/VERSION index 4c910c216c..cc6ea27a71 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=22 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 42d28ecdd5..526214b48c 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -261,6 +261,11 @@ prepend_load_path (String p ) void init_lily_guile (String p ) { + // very very ugh: LILYPONDPREFIX (a hack), if set, overrules DATADIR. + // DATADIR (the default) should work too! + prepend_load_path (DIR_DATADIR); + prepend_load_path (DIR_DATADIR "/scm"); + prepend_load_path (p); // todo: junk this. We should make real modules iso. just loading files. diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 9b2ae77de2..6f4667cf14 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -15,7 +15,7 @@ TEST_FILES = $(wildcard *test*.mf) FET_FILES = $(filter-out $(TEST_FILES),$(wildcard feta[0-9]*.mf)) FONT_FILES = $(filter-out $(TEST_FILES),$(wildcard feta*[0-9].mf)) -XPM_FONTS = feta20 feta-nummer10 feta-braces20 +XPM_FONTS = feta20 feta-nummer10 #CM_AFM_FILES = cmr10 $(outdir)/cmr10.afm: diff --git a/scm/sketch.scm b/scm/sketch.scm index c5417abeab..6a7660dbb7 100644 --- a/scm/sketch.scm +++ b/scm/sketch.scm @@ -160,7 +160,9 @@ "Fs(20)\n" ;; chars > 128 don't work yet (format #f "txt('\\~o',(" (modulo i 128)) - ;; "char(" ,(number->string i) ",(" +;; (format #f "txt('\\~o',(" i) +;; "txt('" (ascii->string i) "',(" +;; "char(" ,(number->string i) ",(" (sketch-numbers->string (map mul-scale (list x y))) "))\n"))