X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FSConscript;h=1a5f281d93fc78c96d0035191809f31acf54bd38;hb=543171165412bc915d8ea1f308d070c74924b2f1;hp=6073e8c660236377767b00d863ce7dbe57c8f341;hpb=3aa9376f5dfe97b216e1ed98821c389063318344;p=lilypond.git

diff --git a/mf/SConscript b/mf/SConscript
index 6073e8c660..1a5f281d93 100644
--- a/mf/SConscript
+++ b/mf/SConscript
@@ -1,64 +1,108 @@
 # -*-python-*-
 
 import os
+import re
 import string
 
 Import ('env', 'base_glob', 'install')
 feta = reduce (lambda x, y: x + y,
 	       map (lambda x: base_glob (x),
 		    ('feta[0-9]*.mf',
-		     'feta-braces-[a-z].mf',
-		     'feta-din*[0-9].mf',
-		     'feta-nummer*[0-9].mf',
+		     'feta-alphabet*[0-9].mf',
+		     'feta-braces-[a-z]*.mf',
 		     'parmesan[0-9]*.mf',)))
+feta = base_glob ('feta[0-9][0-9]*.mf')
+feta_alphabet = base_glob ('feta-alphabet[0-9][0-9]*.mf')
+feta_braces = base_glob ('feta-braces-[a-z].mf')
+parmesan = base_glob ('parmesan[0-9][0-9]*.mf')
 
-# .pfa rules want an encoding file; ecb10.enc
-#sauter = ['ecb10']
-sauter = []
-fonts = feta + sauter
-env['feta'] = string.join (feta)
-env['sauter'] = ''
+fonts = feta + feta_alphabet + feta_braces + parmesan
+
+feta_sizes = map (lambda x: re.sub ('feta([0-9]+)', '\\1', x), feta)
+otfs = map (lambda x: 'emmentaler-' + x, feta_sizes) + ['aybabtu']
 
 t = map (env.TFM, fonts)
-a = map (env.AFM, feta)
+g = map (env.GTABLE, fonts)
 p = map (env.PFA, fonts)
+e = map (lambda x: x + '.enc', fonts)
+s = map (lambda x: x + '.svg', fonts)
+o = map (env.OTF, otfs)
+
+# Emmentaler
+a = '''cat ${SOURCE} \
+$$(echo ${SOURCE} | grep -v brace | sed s/feta/parmesan/) \
+$$(echo ${SOURCE} | grep -v brace | sed s/feta/feta-alphabet/) \
+> ${TARGET}'''
+otf_table = Builder (action = a, suffix = '.otf-table',
+		     # barf
+		     src_suffix = '.lisp')
+env.Append (BUILDERS = {'OTF_TABLE': otf_table})
+f = map (env.OTF_TABLE, feta)
+g = map (env.OTF_TABLE, feta_braces)
+
+map (lambda x: env.Depends ('feta' + x + '.otf-table',
+			    ['parmesan' + x + '.lisp',
+			    'feta-alphabet' + x + '.lisp']), feta_sizes)
+
+map (lambda x: env.Depends ('emmentaler-' + x + '.otf',
+			    'feta' + x + '.otf-table'),
+     feta_sizes)
+
+map (lambda x: env.Depends ('emmentaler-' + x + '.otf',
+			    ['feta' + x + '.pfa',
+			     'parmesan' + x + '.pfa',
+			     'feta-alphabet' + x + '.pfa']), feta_sizes)
+
+for i in feta_sizes:
+	env.Command ('emmentaler-%(i)s.pe' % locals (),
+		     '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+		     '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
 
 map (lambda x: env.Depends (x + '.pfa', x + '.enc'), feta)
 
-mf_essential = ['feta16', 'feta20', 'parmesan16', ]
-pfa_essential = map (env.PFA, mf_essential)
-env.Alias ('mf-essential', pfa_essential)
 
-env.Command ('cmr.enc', 'cmr.enc.in', 'cp $SOURCE $TARGET')
-env.Alias ('mf', 'cmr.enc')
+# Aybabtu
+
+feta_braces_pfa = map (lambda x: x + '.pfa', feta_braces)
 
-env.Command ('lilypond.map', p,
-	     ['for i in $feta; do echo $$i $$(fgrep FontName ${TARGET.dir}/$$i.afm | sed -e "s/FontName *//") "<"$$i.pfa; done > $TARGET',
-	      'for i in $sauter; do echo "$$i $$i <$$i.pfa"; done >> $TARGET'])
-env.Alias ('mf', 'lilypond.map')
+env.AT_COPY ('aybabtu.pe.in')
+env.Command ('aybabtu.fontname', '', 'echo -n aybabtu > $TARGET')
+env.Command ('aybabtu.subfonts',
+	     map (lambda x: x + '.mf', feta_braces),
+	     'echo ${SOURCES.filebase} > $TARGET')
 
-env.Command ('fonts.scale', p,
-	     'cd ${TARGET.dir} && echo *.pfa *.pfb | $PYTHON $srcdir/buildscripts/make-font-dir.py  > $TARGET.file')
-env.Alias ('mf', 'fonts.scale')
+env.Command ('aybabtu.otf-table',
+	     map (lambda x: x + '.otf-table', feta_braces),
+	     'cd ${TARGET.dir} && cat ${SOURCES.file} > ${TARGET.file}')
 
-env.Command ('Fontmap', p,
-	     ["echo '%!' > $TARGET",
-	      "echo '% Override default GS Fontmap' >> $TARGET",
-	      "echo '% To let gs load fonts from builddir, do:' >> $TARGET",
-	      "echo '% export GS_LIB=$$(pwd)/mf/out:' >> $TARGET",
-	      "echo '% See Fontmap.GS for the syntax of real Fontmap files.' >> $TARGET",
-	      "echo '(Fontmap.GS) .runlibfile' >> $TARGET",
-	      "echo '(Fontmap.lily) .runlibfile' >> $TARGET"])
+env.Command ('aybabtu.otf-gtable',
+	     map (lambda x: x + '.otf-gtable', feta_braces),
+	     'echo "(design_size . 20)" > $TARGET')
 
-env.Command ('Fontmap.lily', p + ['Fontmap'],
-	     ['echo "%!" > $TARGET',
-	      '''for i in $feta; do echo "/$$(fgrep FontName ${TARGET.dir}/$$i.afm | sed -e 's/FontName *//') ($$i.pfa);"; done >> $TARGET''',
-	      '''for i in $sauter; do echo "$$i ($$i.pfa);"; done >> $TARGET'''])
-env.Alias ('mf', 'Fontmap.lily')
+env.Depends ('aybabtu.otf',
+	     feta_braces_pfa
+	     + ['aybabtu.subfonts',
+		'aybabtu.fontname',
+		'aybabtu.otf-table',
+		'aybabtu.otf-gtable'])
 
-# build essential stuff first, that's friendlier
-env.Alias ('mf', pfa_essential + p)
+## FIXME: building only a few fonts does not seem to work anymore.
+## what is essential these days, aybabtu/emmentaler are needed always?
+mf_essential = ['feta16', 'feta20', 'parmesan16', ]
+pfa_essential = map (env.PFA, mf_essential) + ['emmentaler-20.otf']
+env.Alias ('mf-essential', pfa_essential)
+env.Alias ('mf-essential', 'fonts.cache-1')
+
+env['fonts'] = string.join (fonts)
+env['feta_sizes'] = string.join (feta_sizes)
+
+env.Alias ('mf', pfa_essential + p + map (lambda x: x[0], o))
+env.Alias ('mf', s)
+env.Alias ('mf', 'fonts.cache-1')
 
 install (t, env['sharedir_package_version'] + '/fonts/tfm')
-install (a, env['sharedir_package_version'] + '/afm')
 install (p, env['sharedir_package_version'] + '/fonts/type1')
+install (o, env['sharedir_package_version'] + '/fonts/otf')
+install (e, env['sharedir_package_version'] + '/ps')
+install (s, env['sharedir_package_version'] + '/fonts/svg')
+