From 0086553eb06ed5ecd4332c89ded79cac1473d692 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 8 May 2005 19:12:25 +0000 Subject: [PATCH] * 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 --- ChangeLog | 2 ++ lily/pfb.cc | 4 ++-- scm/framework-ps.scm | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff627d0ed5..62d5a164af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-05-08 Han-Wen Nienhuys + * 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. diff --git a/lily/pfb.cc b/lily/pfb.cc index bbb546405d..6b13f90f52 100644 --- a/lily/pfb.cc +++ b/lily/pfb.cc @@ -108,7 +108,7 @@ LY_DEFINE (ly_ttf_to_pfa, "ly:ttf->pfa", -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 @@ LY_DEFINE (ly_otf_to_pfa, "ly:otf->cff", 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; diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 917dc57101..361455307d 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -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)) -- 2.39.5