From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 22 Jan 2006 16:55:56 +0000 (+0000)
Subject: * mf/GNUmakefile: idem.
X-Git-Tag: release/2.7.29~44
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2841be4d2573eda1cdb855195e83b44c13c3412b;p=lilypond.git

* mf/GNUmakefile: idem.

* buildscripts/mf-to-table.py (help): excise fetaXXlist.ly support.
---

diff --git a/ChangeLog b/ChangeLog
index 69b602e9ea..d8d686364f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* mf/GNUmakefile: idem.
+
+	* buildscripts/mf-to-table.py (help): excise fetaXXlist.ly support.
+
 	* stepmake/bin/install.py (dest): Only chmod/chown just created directories
 
 	* Documentation/user/notation-appendices.itely (The Feta font):
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 7035870483..f675e98900 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -189,53 +189,6 @@ def write_ps_encoding (name, file, global_info, charmetrics):
 	file.write ('] def\n')
 
 
-def write_fontlist (file, global_info, charmetrics):
-	## nm = global_info['FontFamily']
-	nm = font_family
-	per_line = 2
-	file.write (
-r"""%% LilyPond file to list all font symbols and the corresponding names
-%% Automatically generated by mf-to-table.py
-
-\score {
-  \lyrics { \time %d/8
-""" % (2 * per_line + 1))
-
-	count = 0
-	for m in charmetrics:
-		count += 1
-
-		## \musicglyph and \markup require "_" to be escaped
-		## differently
-		scm_string = re.sub ('_', r'_', m['name'])
-
-		file.write ('''    \\markup { \\raise #0.75 \\vcenter
-	      \\musicglyph #"%s"
-	      \\typewriter " %s" } 4
-	      \\noBreak
-	      ''' % (scm_string, scm_string))
-
-		if (count % per_line) == 0:
-			file.write ('    \\skip 8 \\break\n')
-	file.write (r"""  }
-
-  \layout {
-    interscoreline = 1.0
-    indent = 0.0 \cm
-    \context {
-      \Lyrics
-      \override SeparationItem #'padding = #2
-      minimumVerticalExtent = ##f
-    }
-    \context {
-      \Score
-      \remove "Bar_number_engraver"
-    }
-  }
-}
-""")
-
-
 def write_deps (file, deps, targets):
 	for t in targets:
 		t = re.sub ( '^\\./', '', t)
@@ -265,10 +218,10 @@ Options:
 
 (options, files) = \
   getopt.getopt (sys.argv[1:],
-		 'a:d:hl:o:p:t:',
+		 'a:d:ho:p:t:',
 		 ['enc=',  'outdir=', 'dep=', 'lisp=',
 		  'global-lisp=',
-		  'tex=', 'ly=', 'debug', 'help', 'package='])
+		  'tex=', 'debug', 'help', 'package='])
 
 global_lisp_nm = ''
 char_lisp_nm = ''
@@ -293,8 +246,6 @@ for opt in options:
 		global_lisp_nm = a
 	elif o == '--enc':
 		enc_nm = a
-	elif o == '--ly' or o == '-l':
-		lyfile_nm = a
 	elif o== '--help' or o == '-h':
 		help()
 	elif o == '--debug':
@@ -325,5 +276,3 @@ for filenm in files:
 		write_deps (open (depfile_nm, 'wb'), deps,
 			    [base + '.log', base + '.dvi', base + '.pfa',
 			     base + '.pfb', texfile_nm])
-	if lyfile_nm:
-		write_fontlist (open (lyfile_nm, 'w'), g, m)
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b9c3bac5d2..ae1bce5601 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -234,7 +234,7 @@ get-pfa: get-rpm-fonts
 ##
 ## todo: this also depends on .tfm, FIXME.
 $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
-	$(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily)