* make/substitute.make: Add FONTFORGE.
* config.make.in (FONTFORGE): Add.
* configure.in (gui_b): Use PATH_PROG for fontforge.
+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
BISON = @BISON@
FIND = @FIND@
FLEX = @FLEX@
+FONTFORGE = @FONTFORGE@
GROFF = @GROFF@
GUILE = @GUILE@
GUILE_CONFIG = @GUILE_CONFIG@
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])
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\
-
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)\
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 =
--- /dev/null
+#!@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");
+
+++ /dev/null
-#!/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");
-
(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 ...