resolve merge

[lilypond.git] / scripts / build / gen-emmentaler-scripts.py

diff --git a/scripts/build/gen-emmentaler-scripts.py b/scripts/build/gen-emmentaler-scripts.py
index 3da88408690ae385014094feec293c49a94b8dde..46fb8163dd7e74d0d5e9c785c1999e89da47b726 100644 (file)
--- 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@
 
@@ -38,9 +38,10 @@ notice += "this font, and embed this font or unaltered portions of this ";
 notice += "font into the document, this font does not by itself cause the ";
 notice += "resulting document to be covered by the GNU General Public License.";;
 
-SetFontNames("%(name)s-%(design_size)d", "%(name)s", "%(name)s %(design_size)d", "%(design_size)d", notice, "@TOPLEVEL_VERSION@");
+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("parmesan%(design_size)d.pfb");
 
 # load nummer/din after setting PUA.
@@ -74,6 +75,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)
@@ -87,9 +89,9 @@ Generate("%(filename)s-%(design_size)d.svg");
     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))