* mf/merge.pe.in: Set font names, version, license GPL.

* make/substitute.make: Add FONTFORGE.

* config.make.in (FONTFORGE): Add.

* configure.in (gui_b): Use PATH_PROG for fontforge.

diff --git a/ChangeLog b/ChangeLog
index 211a4f414da22f787b4365e6c721d5fb27153bb4..072557acf66a40c2a4d4c36e703ff8f68097fd49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-12  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * mf/merge.pe.in: Set font names, version, license GPL.
+
+       * make/substitute.make: Add FONTFORGE.
+
+       * config.make.in (FONTFORGE): Add.
+
+       * configure.in (gui_b): Use PATH_PROG for fontforge.
+
 2004-12-11  Graham Percival  <gperlist@shaw.ca>
 
        * scm/define-markup-commands.scm: add baseline-skip to info

diff --git a/config.make.in b/config.make.in
index ade4f410e208732b941485ca4e7f195c3873aca6..b51dd82a398b5719a54084587aac4a102e9c2b8b 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -84,6 +84,7 @@ BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+FONTFORGE = @FONTFORGE@
 GROFF = @GROFF@
 GUILE = @GUILE@
 GUILE_CONFIG = @GUILE_CONFIG@

diff --git a/configure.in b/configure.in
index 80fc82950679c9fbe9de98e75a19ed6ed7b6a088..68b3aca31de6f7036570692b3a2d7a6049476bf3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.27)
 
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(FONTFORGE, fontforge, REQUIRED, 20041208)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
 
 
 AC_CHECK_HEADERS([assert.h sys/stat.h])

diff --git a/make/substitute.make b/make/substitute.make
index 21f626ea3a8ca66e4130bfc2ac026b55e39a7b2e..e45f57c72e51a7deec4101ed0068207a1f4d40fb 100644 (file)
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -7,25 +7,25 @@ include $(stepdir)/substitute-rules.make
 ATVARIABLES = \
   BASH\
   DATE\
-  sharedstatedir\
+  FONTFORGE\
   GUILE\
+  PACKAGE\
+  PATHSEP\
+  PERL\
+  PYTHON\
+  SHELL\
+  TOPLEVEL_VERSION\
   bindir\
-  date\
   datadir\
+  date\
   lilypond_datadir\
   lilypond_libdir\
   local_lilypond_datadir\
   local_lilypond_libdir\
   localedir\
-  PACKAGE\
   package\
-  PATHSEP\
-  PERL\
   prefix\
   program_prefix\
   program_suffix\
-  PYTHON\
-  SHELL\
-  TOPLEVEL_VERSION\
+  sharedstatedir\
   step-bindir\
-

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index fdd7f503fba8705dd4e33b7ded9b914b11da7bf3..12962a42c912ba3d5894198371220b9efe6b368a 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,8 +6,7 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex merge.pe
-
+EXTRA_DIST_FILES += README feta.tex
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
@@ -44,14 +43,11 @@ foe:
        echo $(TEXMF)
        kpsewhich exbase.mf
 
-
 $(outdir)/feta20.otf-table:
        cat $(outdir)/feta20.lisp $(outdir)/parmesan20.lisp > $@
 
-$(outdir)/feta20.otf: merge.pe $(outdir)/feta20.otf-table
-# FIXME: srcdir build. 
-       (cd $(outdir) ; fontforge -script ../merge.pe ) 
-
+$(outdir)/bigcheese20.otf: $(outdir)/merge.pe $(outdir)/feta20.otf-table
+       (cd $(outdir) && fontforge -script merge.pe)
 
 ## use separate package sauter-fonts-mftraced.
 SAUTER_FONTS = 

diff --git a/mf/bigcheese.pe.in b/mf/bigcheese.pe.in
new file mode 100644 (file)
index 0000000..b66e6a8
--- /dev/null
+++ b/mf/bigcheese.pe.in
@@ -0,0 +1,16 @@
+#!@FONTFORGE@
+
+New();
+
+# Separate Feta versioning?
+SetFontNames("bigcheese20", "LilyPond", "LilyPondBigCheese", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
+
+MergeFonts("feta20.pfa");
+MergeFonts("parmesan20.pfa");
+MergeFonts("feta-nummer10.pfa");
+MergeFonts("feta-din14.pfa");
+MergeKern("feta-din14.tfm");
+LoadTableFromFile("LILC", "feta20.otf-table")
+Generate("bigcheese20.otf");
+Generate("bigcheese20.t42");
+

diff --git a/mf/merge.pe b/mf/merge.pe
deleted file mode 100644 (file)
index 46020ff..0000000
--- a/mf/merge.pe
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env fontforge
-New();
-
-// TODO: set version
-// TODO: GPL?
-SetFontNames("bigcheese20", "", "", "", "This font is in the public domain.", "");
-
-MergeFonts("feta20.pfa");
-MergeFonts("parmesan20.pfa");
-MergeFonts("feta-nummer10.pfa");
-MergeFonts("feta-din14.pfa");
-MergeKern("feta-din14.tfm");
-LoadTableFromFile("LILC", "feta20.otf-table")
-Generate("bigcheese20.otf");
-Generate("bigcheese20.t42");
-

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index d427b2c9b784cf2b90400c0a96aa111911a7e803..331ad20caa28d30f7d3e08282b903e6376a4b278 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -287,6 +287,10 @@ lilypond -fgnome input/simple-song.ly
 (define (placebox x y expr)
   (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 ...