* Documentation/user/refman.itely (Automatic note splitting):

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

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index cf3d4b08c2873ea45bfd33e656840ce51f9f7a89..3ad0c86bc2794788a51046ede08a0121fef560ed 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -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':
@@ -110,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")
@@ -167,13 +169,15 @@ def write_fontlist (file, global_info, charmetrics):
                count += 1
                
 ## \musicglyph and \markup require "_" to be escaped differently:
-               musicglyphname=re.sub('_','\\\\_', m['name'])
-               markupname=re.sub('_','\\\\_', musicglyphname)
+               
 
+               scm_string = re.sub('_', r'_', m['name'])
+               tex_string = re.sub ('_', r'\\_' , m['name'])
+               
 ## prevent TeX from interpreting "--" as long dash:
-               markupname=re.sub('--','-{}-', markupname)
+               tex_string=re.sub('--','-{}-', tex_string)
 
-               file.write ('  s^\\markup { \\musicglyph #"%s" "%s" }\n' % (musicglyphname, markupname))
+               file.write ('  s^\\markup { \\musicglyph #"%s" "%s" }\n' % (scm_string, tex_string))
 
                if (count % 3) ==0:
                        file.write ('  \\break\n')