(placebox): Hackery to get bigcheese symbols

within canvas boundaries.

diff --git a/ChangeLog b/ChangeLog
index 072557acf66a40c2a4d4c36e703ff8f68097fd49..f5ef8cace14b39aebf25da1eb023a70c4715d4db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/output-gnome.scm (placebox): Hackery to get bigcheese symbols
+       within canvas boundaries.
+
        * mf/merge.pe.in: Set font names, version, license GPL.
 
        * make/substitute.make: Add FONTFORGE.

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 12962a42c912ba3d5894198371220b9efe6b368a..43ff56a4ac81c1745fa6542a2fdc6dc75c6c106b 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -46,8 +46,8 @@ foe:
 $(outdir)/feta20.otf-table:
        cat $(outdir)/feta20.lisp $(outdir)/parmesan20.lisp > $@
 
-$(outdir)/bigcheese20.otf: $(outdir)/merge.pe $(outdir)/feta20.otf-table
-       (cd $(outdir) && fontforge -script merge.pe)
+$(outdir)/bigcheese20.otf: $(outdir)/bigcheese.pe $(outdir)/feta20.otf-table
+       (cd $(outdir) && fontforge -script bigcheese.pe)
 
 ## use separate package sauter-fonts-mftraced.
 SAUTER_FONTS = 

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 331ad20caa28d30f7d3e08282b903e6376a4b278..aef6b645d6040d77f1b20129b3c9ef149ae814e4 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -285,12 +285,19 @@ lilypond -fgnome input/simple-song.ly
   (filledbox (- x1) (- x2 x1) (* .5 thickness) (* .5 thickness)))
 
 (define (placebox x y expr)
+
+  (debugf "x,y: ~S,~S\n" x y)
+  ;; FIXME: dimensions with bigcheese are broken
+  ;;;       help hello-world of bigcheese a bit to figure out what's
+  ;;;       wrong
+  (set! x (+ 10 (/ x 50)))
+  (if (< y -800)
+      (set! y (+ y 700)))
+  (if (< y -250)
+      (set! y (+ y 250)))
+  
   (debugf "item: ~S\n" expr)
   (debugf "x,y: ~S,~S\n" x y)
-  ;; symbols enter visual
-  (set! x 10)
-  ;;(set! y -10)
-  ;;(set! y (/ y 10))
   (let ((item expr))
     ;;(if item
     ;; FIXME ugly hack to skip #unspecified ...
@@ -330,6 +337,7 @@ lilypond -fgnome input/simple-song.ly
 (define (named-glyph font name)
   (debugf "glyph:~S\n" name)
   (debugf "index:~S\n" (ly:font-get-glyph-index font name))
+  (debugf "font:~S\n" (font-family font))
   (text font (integer->char (ly:font-get-glyph-index font name))))
 
 (define (polygon coords blotdiameter)
@@ -365,7 +373,12 @@ lilypond -fgnome input/simple-song.ly
 
 (define (text font s)
   (define (pango-font-name font)
-    (font-family font))
+    (let ((family (font-family font)))
+      ;; Hmm, family is bigcheese20?
+      (if (string=? family "bigcheese20")
+         (begin (debugf "BIGCHEESE\n")
+         "LilyPond")
+         family)))
   
   (define (pango-font-size font)
     (let* ((designsize (ly:font-design-size font))