* scm/framework-gnome.scm (gnome-main): Remove invocation of

ly:pango-add-afm-decoder.

* lily/lily-guile.cc ("ly:pango-add-afm-decoder"): Build fix: Remove.

diff --git a/ChangeLog b/ChangeLog
index 58de9d7ab91282f52be4019962f16686dc3dc3dd..98978de9964382a169cb716f7ef0e0623242da0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/framework-gnome.scm (gnome-main): Remove invocation of
+       ly:pango-add-afm-decoder.
+
+       * lily/lily-guile.cc ("ly:pango-add-afm-decoder"): Build fix: Remove.
+
 2004-12-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/output-ps.scm (new-text): don't access t glyph for getting

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 3456c2c88b68ccf6cf50103e3f47badcc8040807..2d7455019da2cb4150624332710ac15612cf33f9 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -832,23 +832,6 @@ LY_DEFINE (ly_protects, "ly:protects",
   return scm_protects;
 }
 
-
-#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
-
-#include "pangofc-afm-decoder.hh"
-
-LY_DEFINE (ly_pango_add_afm_decoder, "ly:pango-add-afm-decoder",
-          1, 0, 0, (SCM font_family),
-          "Add pango afm decoder for FONT-FAMILY.")
-{
-  SCM_ASSERT_TYPE (scm_is_string (font_family), font_family, SCM_ARG1,
-                  __FUNCTION__, "font_family");
-  pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0));
-  return SCM_UNSPECIFIED;
-}
-
-#endif
-
 LY_DEFINE (ly_gettext, "ly:gettext",
           1, 0, 0, (SCM string),
           "Gettext wrapper.")

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index 57c1813d3dbcbf74f71ea62890dbf53bee7cb5d9..c7a47a5beee49b56d6b77d2adf4bdfbf5e6a8707 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -138,23 +138,6 @@
     ;; possibly a goops 1.6.4 problem
     (initialize go)
 
-    (map ly:pango-add-afm-decoder
-        '("lilypond-feta"
-          "lilypond-feta-braces-a"
-          "lilypond-feta-braces-b"
-          "lilypond-feta-braces-c"
-          "lilypond-feta-braces-d"
-          "lilypond-feta-braces-d"
-          "lilypond-feta-braces-e"
-          "lilypond-feta-braces-f"
-          "lilypond-feta-braces-g"
-          "lilypond-feta-braces-h"
-          "lilypond-feta-braces-i"
-          "lilypond-parmesan"
-          ;;"lilypond"
-          ;;"bigcheese20"
-          ))
-
     (dump-page go 0)
 
     (gtk-main)))