(define-fonts, font-command,

[lilypond.git] / buildscripts / mf-to-table.py

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index d24d38ee1d0fe8f4a8fece3a06ab2eda89721496..365dedb02afd1112a7815f5092e7f7f21df3ef1d 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -52,7 +52,7 @@ def tfm_checksum (fn):
        shift = 24
        cs = 0
        for b in cs_bytes:
-               cs = cs  + (ord (b) << shift)
+               cs = cs  + (long (ord (b)) << shift)
                shift = shift - 8
 
        return cs
@@ -91,7 +91,12 @@ def parse_logfile (fn):
                        #urg
                        if 0: #testing
                                tags.append ('Regular')
+
+                       
+                       encoding = re.sub (' ','-', tags[5])
+                       tags = tags[:-1]
                        name = tags[1:]
+                       global_info['DesignSize'] = string.atof (tags[4])
                        global_info['FontName'] = string.join (name,'-')
                        global_info['FullName'] = string.join (name,' ')
                        global_info['FamilyName'] = string.join (name[1:-1],
@@ -100,10 +105,11 @@ def parse_logfile (fn):
                                global_info['Weight'] = tags[4]
                        else: #testing
                                global_info['Weight'] = tags[-1]
+                               
                        global_info['FontBBox'] = '0 0 1000 1000'
                        global_info['Ascender'] = '0'
                        global_info['Descender'] = '0'
-                       global_info['EncodingScheme'] = 'FontSpecific'
+                       global_info['EncodingScheme'] = encoding
        
        return (global_info, charmetrics, deps)
 
@@ -143,12 +149,12 @@ def write_tex_defs (file, global_info, charmetrics):
                file.write (r'''\gdef\%s%s{\char%d}%%%s''' % (nm, m['tex'], m['code'],'\n'))
        file.write ('\\endinput\n')
 
-def write_ps_encoding (file, global_info, charmetrics):
+def write_ps_encoding (name, file, global_info, charmetrics):
        encs = ['.notdef'] * 256
        for m in charmetrics:
                encs[m['code']] = m['tex']
-               
-       file.write ('/FetaEncoding [\n')
+
+       file.write ('/%s [\n' % name)
        for m in range(0,256):
                file.write ('  /%s %% %d\n' % (encs[m], m))
        file.write ('] def\n')
@@ -160,8 +166,8 @@ def write_fontlist (file, global_info, charmetrics):
        file.write (r"""
 %% LilyPond file to list all font symbols and the corresponding names
 %% Automatically generated by mf-to-table.py
-\score{\notes{\fatText\time %d/4
-""" % per_line)
+\score{ \lyrics \new Lyrics { \time %d/8
+""" % (2*per_line+1))
 
        count = 0
        for m in charmetrics:
@@ -177,29 +183,26 @@ def write_fontlist (file, global_info, charmetrics):
 ## prevent TeX from interpreting "--" as long dash:
                tex_string=re.sub('--','-{}-', tex_string)
 
-               file.write ('  s^\\markup { \\musicglyph #"%s" "%s" }\n' % (scm_string, tex_string))
+               file.write ('  \\markup { \\raise #0.75 \\vcenter \\musicglyph #"%s" " %s" } 4 \n' % (scm_string, tex_string))
 
                if (count % 3) ==0:
-                       file.write ('  \\break\n')
+                       file.write ('\skip 8  \\break\n')
        file.write (r"""
 }
   \paper{
-    interscoreline=1
-    \translator{
-      \ScoreContext
-      \remove "Bar_number_engraver"
-      TextScript \override #'extra-X-extent = #'(-1 . 1)
-    }
-    \translator{
-      \StaffContext
-      \remove "Clef_engraver"
-      \remove "Key_engraver"
-      \remove "Time_signature_engraver"
-      \remove "Staff_symbol_engraver"
+    interscoreline = 1.0
+    indent = 0.0 \cm
+    \context {
+      \LyricsContext
+      \override SeparationItem #'padding = #2
       minimumVerticalExtent = ##f
     }
-  }
-}
+    \context {
+       \ScoreContext
+       \remove "Bar_number_engraver"
+       }
+       }
+       }
 """)
 
 def write_deps (file, deps, targets):
@@ -277,11 +280,22 @@ for filenm in files:
        afm = open (afmfile_nm, 'w')
 
        write_afm_header (afm)
-       afm.write ("Comment TfmCheckSum %u\n" % cs)
+       afm.write ("Comment TfmCheckSum %d\n" % cs)
+       afm.write ("Comment DesignSize %.2f\n" % g['DesignSize'])
+
+       del g['DesignSize']
+       
        write_afm_metric (afm, g, m)
        
        write_tex_defs (open (texfile_nm, 'w'), g, m)
-       write_ps_encoding (open (enc_nm, 'w'), g, m)
+       enc_name = 'FetaEncoding'
+       if re.search ('parmesan', filenm) :
+               enc_name = 'ParmesanEncoding'
+       elif re.search ('feta-brace', filenm) :
+               enc_name = 'FetaBraceEncoding'
+
+               
+       write_ps_encoding (enc_name, open (enc_nm, 'w'), g, m)
 
        write_deps (open (depfile_nm, 'wb'), deps, [base + '.dvi', base + '.pfa', base + '.pfb',  texfile_nm, afmfile_nm])
        if lyfile_nm != '':