From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 31 May 2005 13:37:37 +0000 (+0000)
Subject: (LY_DEFINE): show file name when loading PFB.
X-Git-Tag: release/2.5.27~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c15993b92cdf28df5cb12677ca2c79fc8c7449b;p=lilypond.git

(LY_DEFINE): show file name when loading PFB.
---

diff --git a/ChangeLog b/ChangeLog
index b14a8e22ff..0c0b4a556b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-05-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/pfb.cc (LY_DEFINE): show file name when loading PFB. 
+
 	* input/regression/alignment-order.ly: add Staff example.
 
 2005-05-31  John Mandereau   <john.mandereau@free.fr>
diff --git a/lily/pfb.cc b/lily/pfb.cc
index 88f368aa0c..449953b94c 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -81,12 +81,19 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa",
 
   String file_name = ly_scm2string (pfb_file_name);
   int len;
+
+  if (be_verbose_global)
+    progress_indication ("[" + file_name);
+
   char *str = gulp_file (file_name, &len);
   char *pfa = pfb2pfa ((Byte *)str, len);
 
   SCM pfa_scm = scm_makfrom0str (pfa);
   free (pfa);
   delete str;
+  if (be_verbose_global)
+    progress_indication ("]");
+  
   return pfa_scm;
 }
 
diff --git a/scm/font.scm b/scm/font.scm
index 90cfcceeef..d1ffe9a913 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -353,7 +353,7 @@
   (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
     (add-music-fonts n factor)
     (add-pango-fonts n 'roman "Century Schoolbook L" factor)
-    (add-pango-fonts n 'sans "Luxi Sans" factor)
+    (add-pango-fonts n 'sans "Sans" factor)
     n))
 
 (define-public (magstep x)
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 7a6584ba0b..c341d6f4a7 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -261,6 +261,7 @@
 	   (bare-file-name (ly:find-file file-name))
 	   )
 
+      (display (list font name file-name bare-file-name "\n"))
       (cons
        (munge-lily-font-name name)
        (cond