From 2455c13ea98716c0ca86b8ebb7bba1d8f7004957 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 5 Apr 2000 11:58:51 +0200
Subject: [PATCH] patch::: 1.3.42.jcn2
1.3.42.jcn2
===========
* mf/feta-accordion.mf: Fixed strange turning paths.
* mf/feta-beugel.mf: Fixed infinity errors.
* Use a more discriptive name for windows setup.zip.
* mf/GNUmakefile: Have logs as last target, so that normally, they're
not made twice.
* stepmake/stepmake/metafont-rules.make: Don't remove the .log files.
The logs are a target, removing them retriggers make.
* stepmake/stepmake/metapost-rules.make: Remove the correct log and tfm
files, ie the ones that clutter the source directory, not the target logs.
---
CHANGES | 19 +++++++++
VERSION | 2 +-
buildscripts/make-cygwin-cross.sh | 5 ++-
mf/GNUmakefile | 5 ++-
mf/feta-accordion.mf | 57 +++++++++++++++++++--------
mf/feta-beugel.mf | 4 +-
mf/feta-generic.mf | 4 +-
stepmake/stepmake/metafont-rules.make | 15 ++++---
stepmake/stepmake/metapost-rules.make | 4 +-
9 files changed, 84 insertions(+), 31 deletions(-)
diff --git a/CHANGES b/CHANGES
index d0def5bedf..5d3e8fa2ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,22 @@
+1.3.42.jcn2
+===========
+
+* mf/feta-accordion.mf: Fixed strange turning paths.
+
+* mf/feta-beugel.mf: Fixed infinity errors.
+
+* Use a more discriptive name for windows setup.zip.
+
+* mf/GNUmakefile: Have logs as last target, so that normally, they're
+not made twice.
+
+* stepmake/stepmake/metafont-rules.make: Don't remove the .log files.
+The logs are a target, removing them retriggers make.
+
+* stepmake/stepmake/metapost-rules.make: Remove the correct log and tfm
+files, ie the ones that clutter the source directory, not the target logs.
+
+
1.3.42.jcn1
===========
diff --git a/VERSION b/VERSION
index 8422b559e5..2f9e5ccf9e 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=42
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff --git a/buildscripts/make-cygwin-cross.sh b/buildscripts/make-cygwin-cross.sh
index 1c21c94fe5..6d9bd3b1ff 100644
--- a/buildscripts/make-cygwin-cross.sh
+++ b/buildscripts/make-cygwin-cross.sh
@@ -596,6 +596,7 @@ mkdir \\Cygnus\\var\\lib
bash -c '
dll=\`type -p cygwin1.dll\`;
wdll=\`./cygpath -w \$dll\`;
+ wdll=\${wdll:-\\Cygnus\\bin};
echo cygwin1.dll \$wdll > newdll; echo \$wdll \$wdll.orig\$\$ > olddll'
if not errorlevel 0 goto nobash
rem # mv -f \$old_dll \$old_dll.orig\$\$
@@ -658,8 +659,8 @@ for i in bash-2 guile-1 rpm-3 lilypond-$lilypond_version; do
dist_rpms="$dist_rpms $rpm"
done
-rm -f $www/setup.zip
-cd $www && zip setup.zip lily-w32 $distbase/* $dist_rpms
+rm -f $www/setup*.zip
+cd $www && zip setup-lilypond-$lilypond_version.zip lily-w32 $distbase/* $dist_rpms
# make small zip dist available
#
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index f0c0a7642b..4549535290 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -18,7 +18,9 @@ AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(AF_FILES:.af=.afm))
TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
-ALL_GEN_FILES= $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES) $(PFA_FILES)
+# 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) $(PFA_FILES) $(LOG_FILES)
#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
INSTALLATION_DIR=$(datadir)/mf/
@@ -52,3 +54,4 @@ $(outdir)/%.afm $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
localclean:
rm -f mfplain.mem mfplain.log mpout.log
rm -f *.tfm *.log
+
diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index 7694cc3a18..e08c90bf00 100644
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -1,11 +1,6 @@
% -*- Fundamental -*-
accreg_dot_size# := .5staff_space#;
-
-% FIXME
-% 'strange turning path' in accSB and others:
-% mf '\mode=laserjet; input feta11'
-% mf '\mode=laserjet; input feta13'
accreg_linethickness# := 1.3stafflinethickness#;
% This dimention is the same on all registersymbols.
@@ -69,7 +64,8 @@ fet_beginchar("accBayanbase", "accBayanbase", "accBayanbase")
% set_char_box(accreg_lh#, accreg_lh#, 3accreg_lh#, 0);
set_char_box(accreg_lh#, accreg_lh#, 0, 3accreg_lh#);
pickup pencircle scaled accreg_linethickness;
- draw (0, 0)--(2w, 0)--(2w, 3accreg_lh)--(0, 3accreg_lh)--(0, 0);
+ %draw (0, 0)--(2w, 0)--(2w, 3accreg_lh)--(0, 3accreg_lh)--(0, 0);
+ draw (0, 0)--(2w, 0)--(2w, 3accreg_lh)--(0, 3accreg_lh)--cycle;
draw (0, accreg_lh)--(2w, accreg_lh);
draw (0, 2accreg_lh)--(2w, 2accreg_lh);
currentpicture := currentpicture shifted (-w, 0);% -3lh);
@@ -84,6 +80,7 @@ def def_B(expr w, h) =
penpos12(thick, 0);
penpos13(thin, 90);
penpos14(thin, 90);
+
penpos15(thick, 180);
penpos16(thin, -90);
penpos17(thin, -90);
@@ -135,8 +132,16 @@ def def_some_vars =
save hs, mb, mt, thin, thick, height, width, cOne, cTwo;
width = .8staffsize;
height = 2.4staff_space;
- thin = 0.05staff_space;
- thick = 0.2staff_space;
+ % URG. smaller sizes should be wider and fatter
+ %thin = 0.05staff_space;
+ %thick = 0.2staff_space;
+ save bx,hx; 4hx+bx=1.15; 10hx+bx=1;
+ fatten:=designsize*hx+bx*1.2;
+ thick:= 0.2staff_space*fatten;
+ % urg: mustn't ever go thinner than blot!
+ thin#:= blot_diameter#;
+ define_pixels (thin);
+
hs = 0.4staff_space;
mb = .53;
mt = .47;
@@ -144,14 +149,17 @@ def def_some_vars =
cTwo = 0.60;
enddef;
-%%% strange turning path.
+def print_penpos (suffix $)=
+ message str $ &": ("&decimal x.$.l&", "&decimal y.$.l&"); ("&decimal x.$.r&", "&decimal y.$.r&");";
+enddef;
+
fet_beginchar("accSB", "accSB", "accSB")
set_char_box(.4staffsize#, .4staffsize#, 0, 2.4staff_space#);
def_some_vars;
def_B(.35width, .7height);
- % FIXME -- strange turning path:
- penstroke z10e--z11e{right}..z12e{up}..z13e{left}--z14e;
+ penstroke z10e--z11e{right}..z12e..z13e{left}--z14e;
+ penlabels(10, 11, 12, 13, 14);
penstroke z13e{right}..z15e{up}..z16e{left}--z17e;
penstroke z18e--z19e;
@@ -160,7 +168,7 @@ fet_beginchar("accSB", "accSB", "accSB")
currentpicture := currentpicture shifted(.40width, 0);
def_S(.35width, .7height);
-% penlabels(1, 2, 3, 4, 5, 6, 7, 8, 9);
+ penlabels(1, 2, 3, 4, 5, 6, 7, 8, 9);
filldraw z1r--z8r--z8l--subpath(t, 1) of bue--cycle;
filldraw subpath(t, 1) of bueoverst--z7l--z9r--z9l--cycle;
penstroke z1e{down}..z2e{right}..z3e
@@ -174,17 +182,16 @@ fet_beginchar("accSB", "accSB", "accSB")
currentpicture := currentpicture shifted (0, 2.4staff_space);
fet_endchar;
-%%% strange turning path.
fet_beginchar("accBB", "accBB", "accBB")
set_char_box(.4staffsize#, .4staffsize#, 0, 2.4staff_space#);
def_some_vars;
def_B(.35width, .7height);
- % FIXME -- strange turning path:
penstroke z10e--z11e{right}..z12e{up}..z13e{left}--z14e;
penstroke z13e{right}..z15e{up}..z16e{left}--z17e;
penstroke z18e--z19e;
+ penlabels(1, 2, 3, 4, 5, 6, 7, 8, 9);
pickup pencircle scaled .5thick;
drawdot(.37width, .10thick);
currentpicture := currentpicture shifted (.40width, 0);
@@ -195,6 +202,7 @@ fet_beginchar("accBB", "accBB", "accBB")
currentpicture := currentpicture shifted(-.40width, -.85height);
draw (-.5width, 0)--(.5width, 0)--(.5width, -height)
--(-.5width, -height)--(-.5width, 0);
+ penlabels(10, 11, 12, 13, 14, 15, 16, 17, 18, 19 );
currentpicture := currentpicture shifted (0, 2.4staff_space);
fet_endchar;
@@ -235,8 +243,22 @@ fet_beginchar("accOldEES", "accOldEES", "accOldEES")
save thin, thick, sw, ch, cw, mb, mt;
ch = .6h;
cw = .8w;
- thin = .05cw;
- thick = .17w;
+ % URG. smaller sizes should be wider and fatter
+ %thin = .05cw;
+ %thick = .17w;
+ save bx,hx; 4hx+bx=1.15; 10hx+bx=1;
+ fatten:=designsize*hx+bx*1.2;
+ thick:= .17w*fatten;
+
+ % urg: mustn't ever go thinner than blot!
+ %thin = 0.05staff_space;
+ %blot#:=.4pt#;
+ thin#:= blot_diameter#;
+ define_pixels (thin);
+
+
+ hs = 0.4staff_space;
+
mb = .53; mt = .47;
sw = .8thick;
z1 = (0, ch-.5thin); penpos1 (thin, -90);
@@ -248,12 +270,13 @@ fet_beginchar("accOldEES", "accOldEES", "accOldEES")
z7 = (1.2cw, 0); penpos7(thin, 90);
z8 = (1.3cw, .2mb*ch); penpos8(thin, 180);
penlabels(1, 2, 3, 4, 5, 6, 7, 8);
+
+ %%AAARG
pickup pencircle scaled 0.001pt;
filldraw (0, 0)--(0, thin)--(sw, thin)--(sw, ch-thin)
--(sw+thick, ch-thin)--(sw+thick, thin)
--(2sw+thick, thin)--(2sw+thick, 0)--cycle;
- % FIXME -- strange turning path:
penstroke z1e--z2e{right}..z3e..z4e{left}--z5e;
penstroke z4e{right}..z6e{down}..z7e{right}..z8e{up};
diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index c51128173a..0deab25aab 100644
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -40,5 +40,7 @@ enddef;
for h := 2 staffsize# step 1 pt# until (7 * staffsize#):
- draw_brace(h, staff_space# );
+ % note: define_pixels (x) multiplies x by hppp,
+ % we must never get bigger than infinity
+ draw_brace (min (h, infinity/hppp - 1), staff_space#);
endfor
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 9d082d27a4..94c8c67611 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -35,12 +35,12 @@ if test = 0:
input feta-klef;
input feta-timesig;
else:
- input feta-bolletjes;
+% input feta-bolletjes;
% input feta-banier;
% input feta-eindelijk;
% input feta-klef;
% input feta-toevallig;
-% input feta-schrift;
+ input feta-schrift;
% input feta-haak;
% input feta-timesig;
fi
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index a582c885bc..54b858c2f5 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,24 +1,27 @@
+# Don't remove $(outdir)/.log's. Logs are a target!
+
$(outdir)/%.dvi: %.mf
$(METAFONT) "\nonstopmode; input $<;"
gftodvi $(basename $<)
- mv $(basename $<).dvi $(outdir)
+ mv $(basename $<).dvi $(outdir)
rm $(basename $<).*gf
$(outdir)/%.log: %.mf
$(METAFONT) $<
mv $(@F) $@
- rm $(basename $< ).*gf
+ rm $(basename $(@F)).*gf
-$(outdir)/%.tfm: %.mf
+$(outdir)/%.tfm $(outdir)%.log: %.mf
$(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
- mv $(@F) $(outdir)
- rm $(basename $<).*gf $(basename $<).*log
+# Let's keep this log output, it saves another mf run.
+ mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
+ rm $(basename $(@F)).*gf
$(outdir)/%.$(XPM_RESOLUTION)gf: %.mf
$(METAFONT) "\\mode=$(XPM_MODE); \\input $<"
mv $(@F) out
- rm -f $(basename $<).log $(basename $<).tfm
+ rm -f $(basename $(@F)).tfm $(basename $(@F)).*log
$(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
gftopk $< $@
diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make
index 7f820ab4e5..fa6e37233a 100644
--- a/stepmake/stepmake/metapost-rules.make
+++ b/stepmake/stepmake/metapost-rules.make
@@ -1,4 +1,6 @@
+# Don't remove $(outdir)/.log's. Logs are a target!
+
$(outdir)/%.0: %.mf mfplain.mem
-$(METAPOST) "&mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<"
@@ -9,5 +11,5 @@ mfplain.mem: $(MFPLAIN_MP)
$(outdir)/%.pfa: $(outdir)/%.0
$(PYTHON) $(depth)/buildscripts/ps-to-pfa.py --output $(basename $<).pfa $<
rm -f $(basename $(@F)).[0-9]*
- rm -f $(basename $<).log
+ rm -f $(basename $(@F)).tfm $(basename $(@F)).log
--
2.39.5