CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/31 13:37:37
Modified files:
. : ChangeLog
lily : pfb.cc
scm : font.scm framework-ps.scm
Log message:
(LY_DEFINE): show file name when loading PFB.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3688&tr2=1.3689&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pfb.cc.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/font.scm.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.109&tr2=1.110&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3688 lilypond/ChangeLog:1.3689
--- lilypond/ChangeLog:1.3688 Tue May 31 12:39:16 2005
+++ lilypond/ChangeLog Tue May 31 13:37:36 2005
@@ -1,5 +1,7 @@
2005-05-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/pfb.cc (LY_DEFINE): show file name when loading PFB.
+
* input/regression/alignment-order.ly: add Staff example.
2005-05-31 John Mandereau <[EMAIL PROTECTED]>
Index: lilypond/lily/pfb.cc
diff -u lilypond/lily/pfb.cc:1.13 lilypond/lily/pfb.cc:1.14
--- lilypond/lily/pfb.cc:1.13 Thu May 26 12:57:16 2005
+++ lilypond/lily/pfb.cc Tue May 31 13:37:37 2005
@@ -81,12 +81,19 @@
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;
}
Index: lilypond/scm/font.scm
diff -u lilypond/scm/font.scm:1.115 lilypond/scm/font.scm:1.116
--- lilypond/scm/font.scm:1.115 Wed Mar 9 10:27:19 2005
+++ lilypond/scm/font.scm Tue May 31 13:37:37 2005
@@ -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)
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.109 lilypond/scm/framework-ps.scm:1.110
--- lilypond/scm/framework-ps.scm:1.109 Mon May 30 10:46:43 2005
+++ lilypond/scm/framework-ps.scm Tue May 31 13:37:37 2005
@@ -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
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
