/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include "open-type-font.hh"
+#include "freetype.hh"
#include <cstdio>
using namespace std;
-#include <freetype/tttables.h>
+#include FT_TRUETYPE_TABLES_H
#include "dimensions.hh"
-#include "freetype.hh"
#include "international.hh"
#include "modified-font-metric.hh"
#include "warn.hh"
}
string
-Open_type_font::get_otf_table (string tag) const
+Open_type_font::get_otf_table (const string &tag) const
{
return ::get_otf_table (face_, tag);
}
string contents ((char const *)buffer, length);
contents = "(quote (" + contents + "))";
+#if GUILEV2
+ tab = scm_eval_string (scm_from_utf8_string (contents.c_str ()));
+#else
tab = scm_c_eval_string (contents.c_str ());
+#endif
free (buffer);
}
return tab;
UGH fix naming
*/
string
-get_otf_table (FT_Face face, string tag)
+get_otf_table (FT_Face face, const string &tag)
{
FT_ULong len;
FT_Byte *tab = load_table (tag.c_str (), face, &len);
}
FT_Face
-open_ft_face (string str, FT_Long idx)
+open_ft_face (const string &str, FT_Long idx)
{
FT_Face face;
FT_Error error_code = FT_New_Face (freetype2_library, str.c_str (), idx, &face);
}
SCM
-Open_type_font::make_otf (string str)
+Open_type_font::make_otf (const string &str)
{
FT_Face face = open_ft_face (str, 0 /* index */);
Open_type_font *otf = new Open_type_font (face);
}
Offset
-Open_type_font::attachment_point (string glyph_name) const
+Open_type_font::attachment_point (const string &glyph_name) const
{
SCM sym = ly_symbol2scm (glyph_name.c_str ());
SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
Offset o;
- if (entry == SCM_BOOL_F)
+ if (scm_is_false (entry))
return o;
SCM char_alist = entry;
{
SCM box = scm_hashq_ref (lily_index_to_bbox_table_,
scm_from_unsigned_integer (signed_idx), SCM_BOOL_F);
- Box *box_ptr = Box::unsmob (box);
+ Box *box_ptr = unsmob<Box> (box);
if (box_ptr)
return *box_ptr;
}
SCM sym = ly_symbol2scm (name);
SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
- if (alist != SCM_BOOL_F)
+ if (scm_is_true (alist))
{
SCM bbox = scm_cdr (scm_assq (ly_symbol2scm ("bbox"), alist));
warning (_f ("FT_Get_Glyph_Name () error: %s",
freetype_error_string (code).c_str ()));
- *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
+ *tail = scm_cons (scm_from_ascii_string (name), SCM_EOL);
tail = SCM_CDRLOC (*tail);
}