* 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

diff --git a/ChangeLog b/ChangeLog
index ff627d0ed5587f403a0efb22a05146d417948a71..62d5a164afe1ec260e691f4eb3c16ef505aebb1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-05-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 bbb546405dae94aa18f04281ff0525ae411dd64a..6b13f90f525e44709b3a7f81ae113a1c6c815ffc 100644 (file)
--- 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 917dc5710129a8b65cafd0af568e86e21ece127b..361455307d85f7dc1bb239cf14504508e1102237 100644 (file)
--- 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))