source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <cstdlib>
#include <cstdio>
#include <cstring>
+using namespace std;
+#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)
sprintf (outp, "%02x", *p++);
outp += 2;
if (! (i % 32))
- {
- *outp++ = '\n';
- }
+ *outp++ = '\n';
}
olen = outp - out;
}
-
}
out[olen] = 0;
SCM_ASSERT_TYPE (scm_is_string (pfb_file_name), pfb_file_name,
SCM_ARG1, __FUNCTION__, "string");
- String file_name = ly_scm2string (pfb_file_name);
- int len;
- char *str = gulp_file (file_name, &len);
- char *pfa = pfb2pfa ((Byte *)str, len);
-
- SCM pfa_scm = scm_makfrom0str (pfa);
- free (pfa);
- delete str;
- return pfa_scm;
-}
+ string file_name = ly_scm2string (pfb_file_name);
-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 "
- " a string.")
-{
- SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
- SCM_ARG1, __FUNCTION__, "string");
-
- String file_name = ly_scm2string (ttf_file_name);
if (be_verbose_global)
progress_indication ("[" + file_name);
+ vector<char> pfb_string = gulp_file (file_name, 0);
+ char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
- 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 pfa_scm = scm_makfrom0str (pfa);
+ free (pfa);
if (be_verbose_global)
progress_indication ("]");
-
- return asscm;
-}
-
+ return pfa_scm;
+}
LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
1, 0, 0, (SCM otf_file_name),
SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_file_name,
SCM_ARG1, __FUNCTION__, "string");
- String file_name = ly_scm2string (otf_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 ");
+ string table = get_otf_table (face, "CFF ");
- SCM asscm = scm_from_locale_stringn ((char*) table.get_bytes (),
+ SCM asscm = scm_from_locale_stringn ((char *) table.data (),
table.length ());
if (be_verbose_global)
progress_indication ("]");
-
+
return asscm;
-}
+}
+