From: fred <fred>
Date: Wed, 27 Mar 2002 02:07:28 +0000 (+0000)
Subject: lilypond-1.5.47
X-Git-Tag: release/1.5.59~226
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ac18aa8d7f8fae7c56a780a90aceba12aadcf447;p=lilypond.git

lilypond-1.5.47
---

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 820dc6e691..ee15b10d46 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -122,6 +122,16 @@ def write_tex_defs (file, global_info, charmetrics):
 	for m in charmetrics:
 		file.write (r'''\def\%s%s{\char%d}%s''' % (nm, m['tex'], m['code'],'\n'))
 
+def write_ps_encoding (file, global_info, charmetrics):
+	encs = ['.notdef'] * 256
+	for m in charmetrics:
+		encs[m['code']] = m['tex']
+		
+	file.write ('/FetaEncoding [\n')
+	for m in range(0,256):
+		file.write ('  /%s %% %d\n' % (encs[m], m))
+	file.write ('] def\n')
+	
 def write_fontlist (file, global_info, charmetrics):
 	nm = global_info['FontFamily']
 	file.write (r"""
@@ -177,9 +187,10 @@ Options:
 
 (options, files) = getopt.getopt(
     sys.argv[1:], 'a:d:hl:o:p:t:', 
-    ['afm=', 'outdir=', 'dep=',  'tex=', 'ly=', 'debug', 'help', 'package='])
+    ['enc=', 'afm=', 'outdir=', 'dep=',  'tex=', 'ly=', 'debug', 'help', 'package='])
 
 
+enc_nm = ''
 texfile_nm = ''
 depfile_nm = ''
 afmfile_nm = ''
@@ -195,6 +206,8 @@ for opt in options:
 		outdir_prefix = a
 	elif o == '--tex' or o == '-t':
 		texfile_nm = a
+	elif o == '--enc':
+		enc_nm = a
 	elif o == '--ly' or o == '-':
 		lyfile_nm = a
 	elif o== '--help' or o == '-h':
@@ -220,6 +233,8 @@ for filenm in files:
 	
 	write_afm_metric (afm, g,m)
 	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])
 	if lyfile_nm != '':
 		write_fontlist(open (lyfile_nm, 'w'), g, m)
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 5a667fe1f8..0a576e5467 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -27,12 +27,13 @@ $(outdir)/cmr10.afm:
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log) $(PARMESAN_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex) $(PARMESAN_FILES:.mf=.tex))
 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(PARMESAN_FILES:.mf=.afm) $(AF_FILES:.af=.afm) $(addsuffix .afm, $(CM_AFM_FILES)))
+ENC_FILES=$(TEXTABLES:.tex=.enc)
 TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
 
 
 # Make tfm files first, log files last, 
 # so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES)
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(datadir)/fonts/source
@@ -54,6 +55,7 @@ INSTALLATION_OUT_FILES3=$(TFM_FILES)
 #MAKE_PFA_FILES=1
 
 PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
+
 ifdef MAKE_PFA_FILES
 ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map
 INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
@@ -74,8 +76,8 @@ $(outdir)/lilypond.map:
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
-	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
+$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 local-clean:
 	rm -f mfplain.mem mfplain.log 
diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index c6905779a6..412adf2a13 100644
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pendaal.mf
@@ -59,7 +59,7 @@ def draw_asterisk_bulb (expr w, h, i) =
 	endgroup;
 	enddef;
 
-fet_beginchar("Pedal asterisk", "*", "pedal-asterisk")
+fet_beginchar("Pedal asterisk", "*", "pedalasterisk")
 	set_char_box(0, 7/9pedalh#, 0, pedalh#);
 	z0 = (1/2w, h - 1/2w);
 	for i = 0 upto 7:
@@ -73,7 +73,7 @@ fet_endchar;
 
 % code := 44;  % - = 45
 
-fet_beginchar("Pedal dash", "-", "pedal-dash")
+fet_beginchar("Pedal dash", "-", "pedaldash")
 	set_char_box(0, 3penw#, 0, pedalbh#);
 	pickup pencircle scaled penh;
 
@@ -85,7 +85,7 @@ fet_beginchar("Pedal dash", "-", "pedal-dash")
 	penstroke z1e{dir 40}..tension 1.2 ..z2e{dir 40};
 fet_endchar;
 
-fet_beginchar("Pedal dot", ".", "pedal-dot")
+fet_beginchar("Pedal dot", ".", "pedaldot")
 	set_char_box(0, penw#, 0, penw#);
 	pickup pencircle scaled penw;
 	draw (1/2penw,1/2penw);
@@ -232,19 +232,19 @@ def draw_pedal_e =
 
 % code := 79;  % P = 80
 
-fet_beginchar("Pedal P", "P", "pedal-P")
+fet_beginchar("Pedal P", "P", "pedalP")
 	set_char_box(0, 5/6pedalh#, 0, pedalh#);
 	draw_pedal_P;
 fet_endchar;
 
 % code := 99;  % d = 100
 
-fet_beginchar("Pedal d", "d", "pedal-d")
+fet_beginchar("Pedal d", "d", "pedald")
 	set_char_box(0, 2/3pedalh#, 0, 7/8pedalh#);
 	draw_pedal_d;
 fet_endchar;
 
-fet_beginchar("Pedal e", "e", "pedal-e")
+fet_beginchar("Pedal e", "e", "pedale")
 	set_char_box(0, 2/5pedalh#, 0, pedalbh#);
 	draw_pedal_e;
 fet_endchar;
@@ -254,7 +254,7 @@ fet_endchar;
 % The pre 1.3.59 user-scm kerning sucks, but I'm not struck by
 % the looks of this either.
 %
-fet_beginchar("Pedal Ped", "Ped", "pedal-Ped")
+fet_beginchar("Pedal Ped", "Ped", "pedalPed")
 	P_width# = 5/6pedalh#;
 	e_width# = 2/5pedalh#;
 	d_width# = 2/3pedalh#;
diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 5999f7120b..98ade6dbf9 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -802,7 +802,7 @@ fet_beginchar("Arpeggio","arpeggio","arpeggio");
 % Extendable Trill symbol.
 % Not yet used
 % Rename me to Trill, rename Trill to Tr?
-fet_beginchar("Trill-element","trill-element","trill-element");
+fet_beginchar("Trill-element","trill-element","trillelement");
 	save height, overshoot;
 	height# = staff_space#;
 	width# = 0.8height#;