From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 6 Mar 2005 23:55:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.14~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=23a66af3a11b45dc8dda847c56010f79a95b8741;p=lilypond.git

*** empty log message ***
---

diff --git a/kpath-guile/kpath.c b/kpath-guile/kpath.c
index 1f323477d3..5b78340dcc 100644
--- a/kpath-guile/kpath.c
+++ b/kpath-guile/kpath.c
@@ -171,9 +171,11 @@ initialize_kpathsea ()
   (*dl_kpse_set_program_name) ("lilypond", "lilypond");
   (*dl_kpse_maketex_option) ("tfm", TRUE);
   
-  SCM find = scm_c_define_gsubr ("ly:kpathsea-find-file", 1, 0, 0, ly_kpathsea_find_file);
+  SCM find = scm_c_define_gsubr ("ly:kpathsea-find-file", 1, 0, 0,
+				 ly_kpathsea_find_file);
   scm_c_export ("ly:kpathsea-find-file", NULL);
-  SCM expand = scm_c_define_gsubr ("ly:kpathsea-expand-variable", 1, 0, 0, ly_kpathsea_find_file);
+  SCM expand = scm_c_define_gsubr ("ly:kpathsea-expand-variable", 1, 0, 0,
+				   ly_kpathsea_expand_variable);
   scm_c_export ("ly:kpathsea-expand-variable", NULL);
 }
 
diff --git a/scm/font.scm b/scm/font.scm
index a5fdf4ea85..d0ffe65655 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -138,20 +138,29 @@
 					; The vector should be sorted according to ascending design size.
 					;
 (define feta-alphabet-size-vector
-  (list->vector
-   (map (lambda (tup)
-	  (cons (ly:pt (cdr tup))
-		(format "feta-alphabet~a ~a"
-			(car tup)
-			(ly:pt (cdr tup)))))
-	'((11 . 11.22)
-	  (13 . 12.60)
-	  (14 .  14.14)
-	  (16 . 15.87)
-	  (18 . 17.82)
-	  (20 . 20)
-	  (23 . 22.45)
-	  (26 . 25.20)))))
+  (if (defined? 'ly:kpathsea-find-file)
+      `#(,(delay  (ly:font-load "feta-alphabet11"))
+	 ,(delay  (ly:font-load "feta-alphabet13"))
+	 ,(delay  (ly:font-load "feta-alphabet14"))
+	 ,(delay  (ly:font-load "feta-alphabet16"))
+	 ,(delay  (ly:font-load "feta-alphabet18"))
+	 ,(delay  (ly:font-load "feta-alphabet20"))
+	 ,(delay  (ly:font-load "feta-alphabet23"))
+	 ,(delay  (ly:font-load "feta-alphabet26")))
+      (list->vector
+       (map (lambda (tup)
+	      (cons (ly:pt (cdr tup))
+		    (format "feta-alphabet~a ~a"
+			    (car tup)
+			    (ly:pt (cdr tup)))))
+	    '((11 . 11.22)
+	      (13 . 12.60)
+	      (14 .  14.14)
+	      (16 . 15.87)
+	      (18 . 17.82)
+	      (20 . 20)
+	      (23 . 22.45)
+	      (26 . 25.20))))))
 
 (define-public (add-music-fonts node factor)
   (for-each