Clarifies that multi-measure rests can be used for a single bar.

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 0967358f1f8b6d6c95ba4a5184656ad7fc8bd4b2..56fc6beebaabfa486cccdcfab81ef88dc8d83c52 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -10,9 +10,12 @@
 #include <cstdio>
 #include <cstring>
 
+#include "program-option.hh"
 #include "source-file.hh"
 #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)
@@ -78,29 +81,45 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa",
 
   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;
 }
 
-LY_DEFINE (ly_ttf_to_pfa, "ly:ttf->pfa",
-          1, 0, 0, (SCM ttf_file_name),
-          "Convert the contents of a TTF file to Type42 PFA, returning it as "
+
+
+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.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
+  SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_file_name,
                   SCM_ARG1, __FUNCTION__, "string");
 
-  String file_name = ly_scm2string (ttf_file_name);
+  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 ");
 
-  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 ());
+  SCM asscm = scm_from_locale_stringn ((char*) table.get_bytes (),
+                                      table.length ());
 
+  if (be_verbose_global)
+    progress_indication ("]");
+  
   return asscm;
-}
+}         
+