patch::: 1.5.22.jcn3

1.5.22.jcn3

diff --git a/CHANGES b/CHANGES
index f4d8da4de9755036f7c3dcbe50046793af037e47..78f455fb947edd4571446902938c761593479586 100644 (file)
--- 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 4c910c216ce2bf2f9de4b9e041a4b52519514c92..cc6ea27a71ec817cb95496b6c00fe2c522ce0749 100644 (file)
--- 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 42d28ecdd5a5596ecdf6cbb2bd8532737fcb096b..526214b48c46ee6f4361707e9663d196f555392d 100644 (file)
--- 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 9b2ae77de20f143f242253fc1c3b85f0d75095b3..6f4667cf14e1e89b8f1ca8f86b638cc3ca58de11 100644 (file)
--- 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 c5417abeabe99a810a3f7f7e0105af51e5fc9f29..6a7660dbb7cf7a2474dae326f98818a9c9acc473 100644 (file)
--- 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"))