resolve merge

[lilypond.git] / lily / pfb-scheme.cc

diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc
index 7fcdc73de5b5ac701eff4f8702fb31e8b1092227..89666192a30d4a4bdcd75aa1aa990a82a31ef4c1 100644 (file)
--- a/lily/pfb-scheme.cc
+++ b/lily/pfb-scheme.cc
@@ -8,14 +8,15 @@
 
 LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa",
           1, 0, 0, (SCM pfb_file_name),
-          "Convert the contents of a PFB file to PFA.")
+          "Convert the contents of a Type@tie{}1 font in PFB format"
+          " to PFA format.")
 {
   LY_ASSERT_TYPE (scm_is_string, pfb_file_name, 1);
 
   string file_name = ly_scm2string (pfb_file_name);
 
   if (be_verbose_global)
-    progress_indication ("[" + file_name);
+    progress_indication ("\n[" + file_name);
   
   vector<char> pfb_string = gulp_file (file_name, 0);
   char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
@@ -38,9 +39,9 @@ LY_DEFINE (ly_otf_2_cff, "ly:otf->cff",
 
   string file_name = ly_scm2string (otf_file_name);
   if (be_verbose_global)
-    progress_indication ("[" + file_name);
+    progress_indication ("\n[" + file_name);
 
-  FT_Face face = open_ft_face (file_name);
+  FT_Face face = open_ft_face (file_name, 0 /* index */);
   string table = get_otf_table (face, "CFF ");
 
   SCM asscm = scm_from_locale_stringn ((char *) table.data (),