CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/08 19:12:25
Modified files:
. : ChangeLog
lily : pfb.cc
scm : framework-ps.scm
Log message:
* lily/pfb.cc (LY_DEFINE): add cast.
* scm/framework-ps.scm (write-preamble): embed CFFs if file name
matches .otf
(write-preamble): warn about unknown fonts.
* lily/pfb.cc (Module): new function ly:otf->cff
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3564&tr2=1.3565&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pfb.cc.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3564 lilypond/ChangeLog:1.3565
--- lilypond/ChangeLog:1.3564 Sun May 8 14:15:31 2005
+++ lilypond/ChangeLog Sun May 8 19:12:23 2005
@@ -1,5 +1,7 @@
2005-05-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/pfb.cc (LY_DEFINE): add cast.
+
* scm/framework-ps.scm (write-preamble): embed CFFs if file name
matches .otf
(write-preamble): warn about unknown fonts.
Index: lilypond/lily/pfb.cc
diff -u lilypond/lily/pfb.cc:1.10 lilypond/lily/pfb.cc:1.11
--- lilypond/lily/pfb.cc:1.10 Sun May 8 13:17:15 2005
+++ lilypond/lily/pfb.cc Sun May 8 19:12:25 2005
@@ -108,7 +108,7 @@
-LY_DEFINE (ly_otf_to_pfa, "ly:otf->cff",
+LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
1, 0, 0, (SCM otf_file_name),
"Convert the contents of a OTF file to CFF file, returning it as "
" a string.")
@@ -121,7 +121,7 @@
FT_Face face = open_ft_face (file_name);
String table = get_otf_table (face, "CFF ");
- SCM asscm = scm_from_locale_stringn (table.get_bytes (),
+ SCM asscm = scm_from_locale_stringn ((char*) table.get_bytes (),
table.length ());
return asscm;
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.100 lilypond/scm/framework-ps.scm:1.101
--- lilypond/scm/framework-ps.scm:1.100 Sun May 8 14:26:58 2005
+++ lilypond/scm/framework-ps.scm Sun May 8 19:12:25 2005
@@ -265,7 +265,6 @@
(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
""))
)))
-
(define (load-fonts paper)
(let* ((fonts (ly:paper-fonts paper))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
