(LY_DEFINE):

new function ly:otf-font-table-data.

diff --git a/ChangeLog b/ChangeLog
index 916b06837c011ed6c7373d1c340c4891b4b7bd0c..3d4dac1046444bb672ba2ba778887ea0fb89320d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/open-type-font-scheme.cc (LY_DEFINE):
+       new function ly:otf-font-table-data.
+
 2005-05-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * mf/GNUmakefile ($(outdir)/lilypond.map): remove rule.

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index eea62045271fad1f80eac8eba23bb789d402c7b7..918a2cc5cb6cc5f969437d0c72f8d7dfa0da88ca 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -32,6 +32,7 @@ public:
   SCM get_global_table () const;
   SCM get_char_table () const;
 
+  String get_otf_table (String tag) const;
   static SCM make_otf (String);
   virtual String font_name () const;
   virtual ~Open_type_font ();

diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index 4430d144382f7620cbcccaf8239a849b07a43b92..147320521004d006052c76e1a9ebd50c4a61291e 100644 (file)
--- a/lily/open-type-font-scheme.cc
+++ b/lily/open-type-font-scheme.cc
@@ -34,3 +34,28 @@ LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0,
   SCM sym = scm_string_to_symbol (glyph);
   return scm_hashq_ref (otf->get_char_table (), sym, SCM_EOL);
 }
+
+
+LY_DEFINE(ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
+         (SCM font, SCM tag),
+         "Extract a table @var{tag} from @var{font}.")
+{
+  Modified_font_metric *fm
+    = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
+  
+  Open_type_font *otf = fm ? dynamic_cast<Open_type_font *> (fm->original_font ())
+    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+
+
+  SCM_ASSERT_TYPE (otf, font, SCM_ARG1,  __FUNCTION__, "Open type font");
+  SCM_ASSERT_TYPE (scm_is_string (tag), tag, SCM_ARG1,  __FUNCTION__, "Open type font");
+
+  char ctag [5] = "    ";
+
+  String tag_string = ly_scm2string (tag);
+  strncpy (ctag, tag_string.to_str0 (), tag_string.length());
+
+  String tab = otf->get_otf_table (String (ctag));
+
+  return scm_from_locale_stringn ((char const*) tab.to_bytes (), tab.length ());
+}

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index ddde7dcfab44001951a356fcbc1381277501cc54..df0a23e7d5335b9fb087c21dab58b3f627810fb9 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -37,6 +37,15 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
   return 0;
 }
 
+String
+Open_type_font::get_otf_table (String tag) const
+{
+  FT_ULong len;
+  FT_Byte *tab = load_table (tag.to_str0 (), face_,  &len);
+  
+  return String (tab, len);
+}
+
 SCM
 load_scheme_table (char const *tag_str, FT_Face face)
 {