X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fbuild%2Fgen-emmentaler-scripts.py;h=9f645b59295b8d797fc790af527d050a5f86da72;hb=063a1b9e21d8309c4940696e1a341592be40f74a;hp=275fccaf89339ffcae47eb60c0253d8d91316e24;hpb=17463ba49a755dca5682ba18af450c198d94e050;p=lilypond.git

diff --git a/scripts/build/gen-emmentaler-scripts.py b/scripts/build/gen-emmentaler-scripts.py
index 275fccaf89..9f645b5929 100644
--- a/scripts/build/gen-emmentaler-scripts.py
+++ b/scripts/build/gen-emmentaler-scripts.py
@@ -1,7 +1,7 @@
 #!@PYTHON@
 import sys
 import getopt
-import re 
+import re
 import os
 
 (options, files) = \
@@ -22,7 +22,7 @@ for opt in options:
 
 # Ugh
 for design_size in [11,13,14,16,18,20,23,26]:
-    name = 'Emmentaler' 
+    name = 'Emmentaler'
     filename = name.lower ()
     script = '''#!@FONTFORGE@
 
@@ -41,7 +41,10 @@ notice += "resulting document to be covered by the GNU General Public License.";
 SetFontNames("%(name)s-%(design_size)d", "%(name)s-%(design_size)d", "%(name)s-%(design_size)d", "", notice, "@TOPLEVEL_VERSION@");
 
 MergeFonts("feta%(design_size)d.pfb");
+MergeFonts("feta-noteheads%(design_size)d.pfb");
+MergeFonts("feta-flags%(design_size)d.pfb");
 MergeFonts("parmesan%(design_size)d.pfb");
+MergeFonts("parmesan-noteheads%(design_size)d.pfb");
 
 # load nummer/din after setting PUA.
 i = 0;
@@ -74,6 +77,7 @@ LoadTableFromFile("LILY", "feta%(design_size)d.otf-gtable");
 
 Generate("%(filename)s-%(design_size)d.otf");
 Generate("%(filename)s-%(design_size)d.svg");
+Generate("%(filename)s-%(design_size)d.woff");
 ''' % vars()
 
     basename = '%s-%d' % (filename, design_size)
@@ -81,23 +85,26 @@ Generate("%(filename)s-%(design_size)d.svg");
     open (path, 'w').write (script)
 
     subfonts = ['feta%(design_size)d',
-          'parmesan%(design_size)d',
-          'feta-alphabet%(design_size)d']
+                'feta-noteheads%(design_size)d',
+                'feta-flags%(design_size)d',
+                'parmesan%(design_size)d',
+                'parmesan-noteheads%(design_size)d',
+                'feta-alphabet%(design_size)d']
 
     ns = []
     for s in subfonts:
         ns.append ('%s' % (s % vars()))
-        
+
     subfonts_str = ' '.join (ns)
-    
+
     open (os.path.join (outdir, '%(filename)s-%(design_size)d.subfonts' % vars()), 'w').write (subfonts_str)
 
     path = os.path.join (outdir, '%s-%d.dep' % (filename, design_size))
 
-    deps = r'''%(filename)s-%(design_size)d.otf: $(outdir)/feta%(design_size)d.pfa \
- $(outdir)/parmesan%(design_size)d.pfa  \
- $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-table \
- $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-gtable
+    deps = r'''%(filename)s-%(design_size)d.otf: $(outdir)/feta%(design_size)d.pfb \
+ $(outdir)/parmesan%(design_size)d.pfb  \
+ $(outdir)/feta-alphabet%(design_size)d.pfb feta%(design_size)d.otf-table \
+ feta%(design_size)d.otf-gtable
 ''' % vars()
     open (path, 'w').write (deps)