From 4623b0fe8e18dfba55cf56007436f6f67c6f1966 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 16 Nov 2004 23:30:32 +0000 Subject: [PATCH] Update test. --- ChangeLog | 4 ++++ buildscripts/guile-gnome.sh | 2 +- lily/pangofc-afm-decoder.cc | 10 ++++++++-- scm/framework-gnome.scm | 19 +------------------ scm/output-gnome.scm | 16 +++++----------- 5 files changed, 19 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc56e53209..7d45f729bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-17 Jan Nieuwenhuizen + + * lily/pangofc-afm-decoder.cc: Update test. + 2004-11-16 Jan Nieuwenhuizen * scm/lily-library.scm (char->unicode-index): New function. diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh index 8633c95270..01f6f3d2e6 100644 --- 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 71f2f30667..0695000af5 100644 --- 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 21c03564ec..5ca0f8da17 100644 --- 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 a2c1e3aa6b..9a03791402 100644 --- 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 -- 2.39.5