Update test.

diff --git a/ChangeLog b/ChangeLog
index dc56e532090212b60e470f01f11b43b88da9cb4a..7d45f729bfc8f936d17c37ea18163f93b17b3909 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/pangofc-afm-decoder.cc: Update test.
+
 2004-11-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/lily-library.scm (char->unicode-index): New function.

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 8633c952706930a1bf8b4e48d873921b8673d362..01f6f3d2e67be75de65e4fec57519251717b5f09 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -21,7 +21,7 @@ SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
-GGVERSION=2.7.94
+GGVERSION=2.7.96
 GWRAPVERSION=1.9.3
 
 download=$HOME/usr/src/releases

diff --git a/lily/pangofc-afm-decoder.cc b/lily/pangofc-afm-decoder.cc
index 71f2f3066786865386055eadb4dad176cd1d8f28..0695000af5d7cca1ac3e5fc0187df4d916d0925a 100644 (file)
--- a/lily/pangofc-afm-decoder.cc
+++ b/lily/pangofc-afm-decoder.cc
@@ -44,6 +44,12 @@
 #define dprintf(args...)
 #endif
 
+#ifndef PANGO_FC_AFM_DECODER_TEST
+#define PUA_OFFSET 0xe00
+#else
+#define PUA_OFFSET 0
+#endif
+
 struct _PangoFcAfmDecoderPrivate
 {
   GString encoding[256];
@@ -135,7 +141,7 @@ pango_fc_afm_get_glyph (PangoFcDecoder *decoder, PangoFcFont *fcfont,
      Use direct privat usage area (PUA) mapping as shortcut for
      actual AFM reading.  The Feta charsets are encoded without any
      gaps, and mappend onto PUA.  */
-  return wc - 0xe000;
+  return wc - PUA_OFFSET;
 #endif  
 }
 
@@ -257,7 +263,7 @@ main (int argc, char **argv)
 
   int text_item = gnome_canvas_text_get_type ();
   GnomeCanvasGroup *root = gnome_canvas_root (canvas);
-  char const *g_clef_utf8 = "\302\220";
+  char const *g_clef_utf8 = "p";
 
   gnome_canvas_text (45.0, 122.5, "LilyPond-feta-nummer 16", "3");
   gnome_canvas_text (45.0, 142.5, "LilyPond-feta-nummer, r 16", "4");

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index 21c03564ec6d6320bef0b57798137379552c0020..5ca0f8da173556fb0f9f90e9fbb45b73e8504cc1 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -19,6 +19,7 @@
  (gnome gw canvas))
 
 
+;;; This is in 2.7.96 -- JUNKME.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Wrappers from guile-gnome TLA
 ;;; guile-gnome-devel@gnu.org--2004
@@ -45,24 +46,6 @@
          (else
           (gruntime-error "Event not of the proper type: ~A" event))))))
 
-; (if (not (defined? 'gdk-event-motion:x-root))
-;     (define (gdk-event-motion:x-root event)
-;       (let ((vector (gdk-event->vector event)))
-;      (case (gdk-event:type event)
-;        ((motion-notify)
-;         (vector-ref vector 9))
-;        (else
-;         (gruntime-error "Event not of the proper type: ~A" event))))))
-
-; (if (not (defined? 'gdk-event-motion:y-root))
-;     (define (gdk-event-motion:y-root event)
-;       (let ((vector (gdk-event->vector event)))
-;      (case (gdk-event:type event)
-;        ((motion-notify)
-;         (vector-ref vector 10))
-;        (else
-;         (gruntime-error "Event not of the proper type: ~A" event))))))
-
 (if (not (defined? 'gdk-event-button:modifiers))
     (define (gdk-event-button:modifiers event)
       (let ((vector (gdk-event->vector event)))

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index a2c1e3aa6b3bc69639f5dc045e46015bc6397c99..9a03791402941849bf5a1ea031adb66c62caf29a 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -21,9 +21,9 @@
 
 ;;; You need:
 ;;;
-;;;   * Rotty's g-wrap >= 1.9.1 (or TLA)
-;;;   * guile-gnome-platform >= 2.5.992 (or TLA)
-;;;   * pango >= 1.5.2 (or CVS)
+;;;   * Rotty's g-wrap >= 1.9.3 (or TLA)
+;;;   * guile-gnome-platform >= 2.7.95 (or TLA)
+;;;   * pango >= 1.6.0
 ;;;
 ;;; See also: guile-gtk-general@gnu.org
 
@@ -84,14 +84,8 @@ lilypond -fgnome input/simple-song.ly
  (ice-9 regex)
  (srfi srfi-13)
  (lily)
- (gnome gtk))
-
-
-;; The name of the module will change to `canvas' rsn
-(if (resolve-module '(gnome gw canvas))
-    (use-modules (gnome gw canvas))
-    (use-modules (gnome gw libgnomecanvas)))
-
+ (gnome gtk)
+ (gnome gw canvas))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Wrappers from guile-gnome TLA