* The grand 2005-2006 replace.

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

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index c738e3bb3be4bd51615df184d29afdfb0603956d..7035870483a84a4f491f60ea43340727f4dd21ac 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1997--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 import os
 import sys
@@ -208,14 +208,12 @@ r"""%% LilyPond file to list all font symbols and the corresponding names
                ## \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 ('''    \\markup { \\raise #0.75 \\vcenter
              \\musicglyph #"%s"
-             \\typewriter " %s" } 4\n''' % (scm_string, tex_string))
+             \\typewriter " %s" } 4
+             \\noBreak
+             ''' % (scm_string, scm_string))
 
                if (count % per_line) == 0:
                        file.write ('    \\skip 8 \\break\n')
@@ -325,7 +323,7 @@ for filenm in files:
        write_global_lisp_table (open (global_lisp_nm, 'w'), g)  
        if depfile_nm:
                write_deps (open (depfile_nm, 'wb'), deps,
-                           [base + '.dvi', base + '.pfa', base + '.pfb',
-                            texfile_nm])
+                           [base + '.log', base + '.dvi', base + '.pfa',
+                            base + '.pfb', texfile_nm])
        if lyfile_nm:
                write_fontlist (open (lyfile_nm, 'w'), g, m)