X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb-scheme.cc;h=f8a6c1278f38ab7a530ef0d36533c1739401f889;hb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;hp=6713c1b08f70bd235022e1114e46350c8a3d8004;hpb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;p=lilypond.git diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc index 6713c1b08f..f8a6c1278f 100644 --- a/lily/pfb-scheme.cc +++ b/lily/pfb-scheme.cc @@ -7,47 +7,44 @@ #include "warn.hh" 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.") + 1, 0, 0, (SCM pfb_file_name), + "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); - + debug_output ("[" + file_name); // start message on a new line + vector pfb_string = gulp_file (file_name, 0); char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ()); - + SCM pfa_scm = scm_from_locale_string (pfa); free (pfa); - if (be_verbose_global) - progress_indication ("]"); + debug_output ("]", false); return pfa_scm; } LY_DEFINE (ly_otf_2_cff, "ly:otf->cff", - 1, 0, 0, (SCM otf_file_name), - "Convert the contents of an OTF file to a CFF file," - " returning it as a string.") + 1, 0, 0, (SCM otf_file_name), + "Convert the contents of an OTF file to a CFF file," + " returning it as a string.") { LY_ASSERT_TYPE (scm_is_string, otf_file_name, 1); string file_name = ly_scm2string (otf_file_name); - if (be_verbose_global) - progress_indication ("[" + file_name); + debug_output ("[" + file_name); // start message on a new line 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 (), - table.length ()); + table.length ()); - if (be_verbose_global) - progress_indication ("]"); + debug_output ("]", false); return asscm; }