2003 -> 2004

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

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 30c07a151499077ffc74f7d3a84693f7205b1fdb..d24d38ee1d0fe8f4a8fece3a06ab2eda89721496 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 # 
-# (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 import os
 import sys
@@ -72,13 +72,15 @@ def parse_logfile (fn):
                elif tags[0] == 'char':
                        m = {
                                'description':  tags[1],
-                               'name': group + '-' + tags[7],
-                               'tex': tags[8],
+                               'name': group + '-' + tags[9],
+                               'tex': tags[10],
                                'code': string.atoi (tags[2]),
                                'breapth':string.atof (tags[3]),
                                'width': string.atof (tags[4]),
                                'depth':string.atof (tags[5]),
-                               'height':string.atof (tags[6])
+                               'height':string.atof (tags[6]),
+                               'wx': string.atof (tags[7]),
+                               'wy':string.atof (tags[8]),
                                }
                        charmetrics.append (m)
                elif tags[0] == 'font':
@@ -86,11 +88,18 @@ def parse_logfile (fn):
                        font_family = (tags[3])
                        # To omit 'GNU' (foundry) from font name proper:
                        # name = tags[2:]
+                       #urg
+                       if 0: #testing
+                               tags.append ('Regular')
                        name = tags[1:]
                        global_info['FontName'] = string.join (name,'-')
                        global_info['FullName'] = string.join (name,' ')
                        global_info['FamilyName'] = string.join (name[1:-1],
-                       global_info['Weight'] = tags[4]
+                                                                '-')
+                       if 1:
+                               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'
@@ -103,15 +112,15 @@ def write_afm_char_metric(file, charmetric):
 
        f = 1000;
        tup = (charmetric['code'],
-              (charmetric['width'] + charmetric['breapth'])*f,
                charmetric['name'],
                -charmetric['breapth'] *f,
                -charmetric['depth']*f,
                charmetric['width']*f,
-               charmetric['height']*f)
+               charmetric['height']*f,
+              charmetric['wx'] * f,
+              charmetric['wy'] * f)
        
-       
-       file.write ('C %d ; WX %d ; N  %s ;  B %d %d %d %d ;\n'% tup)
+       file.write ('C %d ; N %s ; B %d %d %d %d ; W %d %d ;\n'% tup)
 
 def write_afm_header (file):
        file.write ("StartFontMetrics 2.0\n")
@@ -131,7 +140,7 @@ def write_tex_defs (file, global_info, charmetrics):
        ##nm = global_info['FontFamily']
        nm = font_family
        for m in charmetrics:
-               file.write (r'''\def\%s%s{\char%d}%%%s''' % (nm, m['tex'], m['code'],'\n'))
+               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):
@@ -147,14 +156,31 @@ def write_ps_encoding (file, global_info, charmetrics):
 def write_fontlist (file, global_info, charmetrics):
        ##nm = global_info['FontFamily']
        nm = font_family
+       per_line = 3
        file.write (r"""
-% Lilypond file to list all font symbols and the corresponding names
-% Automatically generated by mf-to-table.py
-\score{\notes{\fatText
-""")
+%% 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)
+
+       count = 0
        for m in charmetrics:
-               escapedname=re.sub('_','\\\\\\\\_', m['name'])
-               file.write ('s^#\'(lines (music \"%s\") \"%s\")\n' % (m['name'], escapedname))
+
+               count += 1
+               
+## \musicglyph and \markup require "_" to be escaped differently:
+               
+
+               scm_string = re.sub('_', r'_', m['name'])
+               tex_string = re.sub ('_', r'\\_' , m['name'])
+               
+## 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))
+
+               if (count % 3) ==0:
+                       file.write ('  \\break\n')
        file.write (r"""
 }
   \paper{
@@ -177,7 +203,10 @@ def write_fontlist (file, global_info, charmetrics):
 """)
 
 def write_deps (file, deps, targets):
+       
+       
        for t in targets:
+               t = re.sub ( '^\\./', '', t)
                file.write ('%s '% t)
        file.write (": ")
        for d in deps:
@@ -185,16 +214,19 @@ def write_deps (file, deps, targets):
        file.write ('\n')
 
 def help():
-    sys.stdout.write(r"""Usage: mf-to-table [options] LOGFILEs
-Generate feta metrics table from preparated feta log\n
+    sys.stdout.write(r"""Usage: mf-to-table [OPTIONS] LOGFILEs
+Generate feta metrics table from preparated feta log.
+
 Options:
-  -a, --afm=FILE         .afm file
+  -a, --afm=FILE         specify .afm file
   -d, --dep=FILE         print dependency info to FILE
   -h, --help             print this help
   -l, --ly=FILE          name output table
   -o, --outdir=DIR       prefix for dependency info
   -p, --package=DIR      specify package
-  -t, --tex=FILE         name output tex chardefs"""
+  -t, --tex=FILE         name output tex chardefs
+
+  """
 )
     sys.exit (0)
 
@@ -250,8 +282,8 @@ for filenm in files:
        
        write_tex_defs (open (texfile_nm, 'w'), g, m)
        write_ps_encoding (open (enc_nm, 'w'), g, m)
-       
-       write_deps (open (depfile_nm, 'wb'), deps, [base + '.dvi', texfile_nm, afmfile_nm])
+
+       write_deps (open (depfile_nm, 'wb'), deps, [base + '.dvi', base + '.pfa', base + '.pfb',  texfile_nm, afmfile_nm])
        if lyfile_nm != '':
                write_fontlist(open (lyfile_nm, 'w'), g, m)