* lily/stencil-scheme.cc (LY_DEFINE): ly:stencil-in-color

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index bbb546405dae94aa18f04281ff0525ae411dd64a..88f368aa0cf54a1da68516bdd7183e6c1bd7309b 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -14,6 +14,8 @@
 #include "memory-stream.hh"
 #include "ttftool.h"
 #include "open-type-font.hh"
+#include "main.hh"
+#include "warn.hh"
 
 char *
 pfb2pfa (Byte const *pfb, int length)
@@ -97,18 +99,24 @@ LY_DEFINE (ly_ttf_to_pfa, "ly:ttf->pfa",
                   SCM_ARG1, __FUNCTION__, "string");
 
   String file_name = ly_scm2string (ttf_file_name);
-
+  if (be_verbose_global)
+    progress_indication ("[" + file_name);
+  
+  
   Memory_out_stream stream;
   create_type42 (file_name.to_str0 (), stream.get_file ());
   SCM asscm = scm_from_locale_stringn (stream.get_string (),
                                       stream.get_length ());
 
+  if (be_verbose_global)
+    progress_indication ("]");
+  
   return asscm;
 }
 
 
 
-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.")
@@ -117,12 +125,17 @@ LY_DEFINE (ly_otf_to_pfa, "ly:otf->cff",
                   SCM_ARG1, __FUNCTION__, "string");
 
   String file_name = ly_scm2string (otf_file_name);
+  if (be_verbose_global)
+    progress_indication ("[" + file_name);
 
   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 ());
 
+  if (be_verbose_global)
+    progress_indication ("]");
+  
   return asscm;
 }