* buildscripts/substitute-encoding.py (Module): remove file.

* mf/GNUmakefile: more PFA strippage.

diff --git a/ChangeLog b/ChangeLog
index 01c1c9b699b42bdbce8e0f389ffd9af88eccee86..8fa10c463552775475a53ff4a578a7917ce1d9fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-02-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * buildscripts/substitute-encoding.py (Module): remove file.
+
+       * mf/GNUmakefile: more PFA strippage.
+
        * mf/aybabtu.pe.in (i): remove PFAaybabtu generation
 
        * buildscripts/gen-emmentaler-scripts.py (i): remove PFAemmentaler

diff --git a/buildscripts/substitute-encoding.py b/buildscripts/substitute-encoding.py
deleted file mode 100644 (file)
index 6cb7f20..0000000
--- a/buildscripts/substitute-encoding.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!@PYTHON@
-#
-# mess up the coding table of PFAemmentaler to work around
-# GS bug,
-#
-# http://bugs.ghostscript.com/show_bug.cgi?id=688017
-
-import getopt
-import os
-import re
-import string
-import sys
-
-outdir = 'out'
-(options, files) = getopt.getopt (sys.argv[1:], 'o', ['outdir='])
-for opt in options:
-       o = opt[0]
-       a = opt[1]
-       if o == '--outdir' or o == '-o':
-               outdir = a
-
-filename = files[0]
-def get_glyph_names (enc_name):
-       enc_str = open (enc_name).read ()
-       glyphs = []
-       def note_glyph (match):
-               nm = match.group (1)
-               glyphs.append (nm)
-
-
-       m = re.sub ("(/[a-z.A-Z0-9_]+) %", note_glyph, enc_str )
-
-       glyphs = filter (lambda x: None == re.match (r'/\.notdef', x),
-                        glyphs)
-       return glyphs
-
-if re.search ('mmental', filename):
-       glyph_names = (get_glyph_names ('%(outdir)s/feta20.enc' % vars ())
-                      + get_glyph_names ('%(outdir)s/feta-alphabet20.enc' % vars ())
-                      + get_glyph_names ('%(outdir)s/parmesan20.enc' % vars ()))
-
-       str = open (filename).read ()
-       os.rename (filename, filename + "~")
-
-       glyph_names = glyph_names[:256]
-       
-       put_glyphs = ''
-       i = 0
-       for g in glyph_names:
-               put_glyphs += 'dup %d %s put \n' % (i,g)
-               i += 1
-               
-       str = re.sub ('( 0 1 255 { 1 index exch /.notdef put} for)',
-                     '\\1 \n %s'  % put_glyphs,
-                     str)
-       str = re.sub ('StandardEncoding def',
-                     '256 array\n0 1 255 { 1 index exch /.notdef put} for\n%sreadonly def' % put_glyphs,
-                     str)
-
-       open (filename, 'w').write (str)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 4a32c6b0ed6aaddeb25a6039463b45e82926afb9..a05467c24f3f3531f69393aab4af37425bc70e9a 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -59,20 +59,16 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 #
 # 2. are not included with teTeX
 #
-define MAKE_OTF
-       (cd $(outdir) && $(FONTFORGE) -script $(1))
-       $(PYTHON) $(buildscript-dir)/substitute-encoding.py --outdir=$(outdir) $(2)
-endef
 
 define EMMENTALER_RULE \
-$(outdir)/$(PFA_PREFIX)emmentaler-$(1).pfa $(outdir)/emmentaler-$(1).otf $(outdir)/emmentaler-$(1).svg: $(outdir)/emmentaler-$(1).pe $(outdir)/feta$(1).pfa  $(outdir)/feta-alphabet$(1).pfa  $(outdir)/parmesan$(1).pfa \
-       $(call MAKE_OTF,emmentaler-$(1).pe, $(outdir)/PFAemmentaler-$(1).pfa)
+$(outdir)/emmentaler-$(1).otf $(outdir)/emmentaler-$(1).svg: $(outdir)/emmentaler-$(1).pe $(outdir)/feta$(1).pfa  $(outdir)/feta-alphabet$(1).pfa  $(outdir)/parmesan$(1).pfa \
+       cd $(outdir) && $(FONTFORGE) -script emmentaler-$(1).pe
 endef
 
 $(foreach size, $(STAFF_SIZES), $(eval $(call EMMENTALER_RULE,$(size))))
 
-$(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa)
-       $(call MAKE_OTF,aybabtu.pe, $(outdir)/PFAaybabtu.pfa)
+$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa)
+       cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
        -rm -f $(outdir)/*.scale.{pfa,afm}
 
 $(outdir)/%.pfa: $(outdir)/%.log