From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 5 Dec 1997 07:15:16 +0000 (+0100)
Subject: patch::: 0.1.34: vroeg
X-Git-Tag: release/0.1.35~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=350984e94c62108b40176348dffd130c43705008;p=lilypond.git

patch::: 0.1.34: vroeg

pl 34.jcn1
	- mf: nicening of dyn, klef, rest
	- fingerfont
	- bf: 12/8
---

diff --git a/NEWS b/NEWS
index 691d48f46a..6e6df564d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 34.jcn1
+	- mf: nicening of dyn, klef, rest
+	- fingerfont
+	- bf: 12/8
 
 pl 34
 	- bf: mf: numbers and alto clef
diff --git a/VERSION b/VERSION
index 3f97ee8ecd..8b2e671a47 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 34
-TOPLEVEL_MY_PATCH_LEVEL = 
+TOPLEVEL_MY_PATCH_LEVEL = jcn1
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 
diff --git a/init/feta16.ly b/init/feta16.ly
index 100d902c7f..083ff06cca 100644
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Dec  3 11:10:44 1997
+% on Thu Dec  4 23:42:11 1997
 % Do not edit
 % input from out/feta16.log
 % name=\symboltables {
diff --git a/init/feta20.ly b/init/feta20.ly
index 368f46df86..4accbaf1c6 100644
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Dec  3 11:10:47 1997
+% on Thu Dec  4 23:42:34 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {
diff --git a/init/table16.ly b/init/table16.ly
index 506c9f78b8..91b8bda16c 100644
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -14,6 +14,7 @@ table_sixteen=
 		"roman"	"\settext{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
 		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
 		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
+		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	4.0\pt
      }
      "dynamics" = \table {
 
diff --git a/init/table20.ly b/init/table20.ly
index abe4eadecb..b4f6a19f28 100644
--- a/init/table20.ly
+++ b/init/table20.ly
@@ -13,8 +13,9 @@ table_twenty =
 
      "style" = \table {
 		"roman"	"\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
-		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
-		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
+		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
      }
 
      "dynamics" = \table {
diff --git a/input/font.ly b/input/font.ly
index 09aa2f1e21..d92a906734 100644
--- a/input/font.ly
+++ b/input/font.ly
@@ -40,6 +40,13 @@ TestedFeatures =	 "This file tests the Feta music-font"
 
 		\octave c'';
 		\meter 4/4;
+		\textstyle "finger";
+		c4^"1" d^"2" e^"3" f^"4" g^"5"
+		< bes4^"1" e_"2" c_"4" >
+		a'^"0"
+		% ugh, \flageolet is like open, but maybe a perfect circle
+		a^\open
+		\textstyle "roman";
 %{		% default abbreviations
 		c4 c4: c4:32 c4: c4 c2.
 		'a1
diff --git a/mf/feta-din10.mf b/mf/feta-din10.mf
index b92534f3e2..af28aa0f13 100644
--- a/mf/feta-din10.mf
+++ b/mf/feta-din10.mf
@@ -136,11 +136,13 @@ input ital-p;
 
 slant:=.28;      % tilt ratio $(\Delta x/\Delta y)$
 %stem#:=38/36pt#;    % lowercase stem breadth
-stem#:=28/36pt#;    % lowercase stem breadth
+%stem#:=28/36pt#;    % lowercase stem breadth
+stem#:=32/36pt#;    % lowercase stem breadth
 % ess#:=35/36pt#;      % breadth in middle of lowercase s
 ess#:=28/36pt#;      % breadth in middle of lowercase s
 %hair#:=20/36pt#;    % lowercase hairline breadth
-hair#:=16/36pt#;    % lowercase hairline breadth
+% hair#:=16/36pt#;    % lowercase hairline breadth
+hair#:=14/36pt#;    % lowercase hairline breadth
 %vair#:=13/36pt#;    % vertical diameter of hairlines
 vair#:=9/36pt#;    % vertical diameter of hairlines
 % flare#:=42/36pt#;    % diameter of bulbs or breadth of terminals
@@ -155,7 +157,8 @@ curve#:=43/36pt#;    % lowercase curve breadth
 % Chester, Breitkopf suggest smaller sizes of these other chars,
 % using the x-height as reference point.
 % x_height#:=160/36pt#;    % height of lowercase without ascenders
-x_height#:=145/36pt#;    % height of lowercase without ascenders
+% x_height#:=145/36pt#;    % height of lowercase without ascenders
+x_height#:=135/36pt#;    % height of lowercase without ascenders
 
 font_setup;
 
diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 51d35462aa..d39637198b 100644
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -23,12 +23,16 @@ enddef;
 %
 save stem, ball_crook_stem, ball_crook_balldiam, flare;
 
-define_pixels(stem,flare);
 % stem#:=1/8*interline#;
 stem# = 1/5interline#;
+% flare# = 2/3interline#;
+flare# = 2/3interline# - 1/8stafflinethickness#;
+
+define_pixels(stem,flare);
+
 ball_crook_stem = stem;
 ball_crook_balldiam =flare;
-flare# = 2/3interline#;
+
 
 save block_rest_y, block_rest_x;
 
@@ -122,7 +126,7 @@ def rest_crook(expr a, w) =
 enddef;
 
 fet_beginchar("8th rest","3","eighthrest");
-	set_char_box(0, 4/3interline#,-interline#, 8/3interline#+2stafflinethickness#);
+	set_char_box(0, 4/3interline#,-interline#, 8/3interline#+3/2stafflinethickness#);
 	save x,y, ht;
 	ht = h + d;
 	x1=w-stem/6; y1=ht-flare/4;
@@ -138,7 +142,8 @@ fet_beginchar("16th rest","4","sixteenthrest");
 	save alpha,cw,h,w;
 	alpha=74;
 	cw#=7/6interline#;
-	h#=5/3interline#+interline#+2stafflinethickness#;
+%	h#=5/3interline#+interline#+2stafflinethickness#;
+	h#=5/3interline#+interline#+3/2stafflinethickness#;
 	w#=cw#+(h#-3/2interline#)/tand(alpha);
 	set_char_box(0,w#,0,h#);
 	define_pixels(cw);
@@ -158,7 +163,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
 	save alpha,cw,h,w;
 	alpha=76;
 	cw#=7/6interline#;
-	h#=5/3interline#+2interline#+2stafflinethickness#;
+	h#=5/3interline#+2interline#+3/2stafflinethickness#;
 	w#=cw#+(h#-3/2interline#)/tand(alpha);
 	set_char_box(0,w#,0,h#);
 	define_pixels(cw);
@@ -180,7 +185,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
 	save alpha,cw,h,w;
 	alpha=78;
 	cw#=7/6interline#;
-	h#=5/3interline#+3interline#+2stafflinethickness#;
+	h#=5/3interline#+3interline#+3/2stafflinethickness#;
 	w#=cw#+(h#-3/2interline#)/tand(alpha);
 	set_char_box(0,w#,0,h#);
 	define_pixels(cw);
@@ -199,13 +204,15 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
 	z5-z1=whatever*dir alpha;
 	y5=y1-3interline;
 	rest_crook (z5,cw);
+	% ugh
+	currentpicture:=currentpicture shifted (0,-interline);
 	fet_endchar;
 
 fet_beginchar("128th rest","7","hundredtwentyeighthrest"); 
 	save alpha,cw,h,w;
 	alpha=78;
 	cw#=7/6interline#;
-	h#=5/3interline#+4interline#+2stafflinethickness#;
+	h#=5/3interline#+4interline#+3/2stafflinethickness#;
 	w#=cw#+(h#-3/2interline#)/tand(alpha);
 	set_char_box(0,w#,0,h#);
 	define_pixels(cw);
@@ -227,6 +234,8 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
 	z6-z1=whatever*dir alpha;
 	y6=y1-4interline;
 	rest_crook (z6,cw);
+	% ugh
+	currentpicture:=currentpicture shifted (0,-interline);
 	fet_endchar;
 
 endgroup;
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 2175bc1b3a..385f6dffb3 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -33,7 +33,7 @@ def draw_c_clef (expr reduction) =
 	xoff=3/4norm+7/2hair;
 	penpos1(hair,-90);
 	z1l=(xoff+norm+hair,h);
-	penpos2(norm-hair,180);
+	penpos2(norm-3/2hair,180);
 	z2l=(w,h/2);
 	penpos3(hair,90);
 	z3=(((w-xoff)/2)+xoff,2hair);
@@ -60,8 +60,8 @@ def draw_c_clef (expr reduction) =
 	penlabels (1,2,3,4,5,6);
 
 	% ugh, should be bulb, not flare?
-	draw_flare(z1l,180,90,hair,norm-1/4hair);
-	draw_flare(z7r,180,-90,hair,norm-1/4hair);
+	draw_flare(z1l,180,90,hair,norm-1/2hair);
+	draw_flare(z7r,180,-90,hair,norm-1/2hair);
 	enddef;
 
 fet_beginchar ("C clef", "alto", "altoclef")
diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf
new file mode 100644
index 0000000000..e3c4e7fafd
--- /dev/null
+++ b/mf/feta-nummer4.mf
@@ -0,0 +1,26 @@
+% feta-nummer4.mf
+% part of LilyPond's pretty-but-neat music font
+
+input autometric;
+
+fet_beginfont("feta-nummer", 4);
+
+mode_setup;
+
+test:=0;
+input feta-macros;
+
+% copied from 8; will it work?
+height#:=designsize;
+thick#:=7/30height#;
+thin#:=thick#/4;
+hair#:=thin#/2;
+kuulleke#:=hair#;
+%kuulleke#:=0;
+
+input feta-nummer;
+
+fet_endfont("feta-nummer");
+
+end.
+
diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf
new file mode 100644
index 0000000000..f366ba4030
--- /dev/null
+++ b/mf/feta-nummer5.mf
@@ -0,0 +1,26 @@
+% feta-nummer5.mf
+% part of LilyPond's pretty-but-neat music font
+
+input autometric;
+
+fet_beginfont("feta-nummer", 5);
+
+mode_setup;
+
+test:=0;
+input feta-macros;
+
+% copied from 4; will it work?
+height#:=designsize;
+thick#:=7/30height#;
+thin#:=thick#/4;
+hair#:=thin#/2;
+kuulleke#:=hair#;
+%kuulleke#:=0;
+
+input feta-nummer;
+
+fet_endfont("feta-nummer");
+
+end.
+
diff --git a/tex/dyndefs.tex b/tex/dyndefs.tex
index c35f413a3c..3c9b7f1438 100644
--- a/tex/dyndefs.tex
+++ b/tex/dyndefs.tex
@@ -6,7 +6,7 @@
 \def\dynnf{\dynfont\char1}
 \def\dynnf{\dynfont\char1}
 \def\dynp{\dynfont\char2}
-\def\dynm{\raise.1ex\hbox{\dynfont\char3}}
+\def\dynm{\raise.08ex\hbox{\dynfont\char3}}
 \def\dynr{\raise.1ex\hbox{\dynfont\char4}}
 \def\dyns{\raise.1ex\hbox{\dynfont\char5}}
 \def\dynz{\raise.1ex\hbox{\dynfont\char6}}
@@ -17,8 +17,8 @@
 \def\dynf{{\dynaf}}
 \def\dynpp{{\kdynp\dynp}}
 \def\dynppp{{\kdynp\kdynp\dynp}}
-\def\dynmp{{\dynm\kern -.2ex\dynp}}
-\def\dynmf{{\dynfont\raise.08ex\hbox{\dynm}\kern-.4ex\dynnf}}
+\def\dynmp{{\raise.1ex\hbox{\dynm}\kern -.25ex\dynp}}
+\def\dynmf{{\dynfont\raise.08ex\hbox{\dynm}\kern-.45ex\dynnf}}
 \def\dynff{{\kdynf\dynnf}}
 \def\dynfff{{\kdynf\kdynf\dynnf}}
 
diff --git a/tex/feta16.tex b/tex/feta16.tex
index bef96e539f..d47d5aa631 100644
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Dec  3 11:10:44 1997
+% on Thu Dec  4 23:42:11 1997
 % Do not edit
 % input from out/feta16.log
 % name
diff --git a/tex/feta20.tex b/tex/feta20.tex
index 75c430f60a..8ccf31e844 100644
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Dec  3 11:10:47 1997
+% on Thu Dec  4 23:42:34 1997
 % Do not edit
 % input from out/feta20.log
 % name
diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 95dc812ee3..96ee2494cf 100644
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -6,16 +6,16 @@
         \font\vetfont=feta-beams16
         \font\fetanummer=feta-nummer8
         \font\dynfont=feta-din10 scaled \magstep1
+        \font\fingerfont=feta-nummer4
 }
 \def\fettwentydefs{
         \font\fontentja=feta20
         \font\vetfont=feta-beams20
         \font\fetanummer=feta-nummer10
         \font\dynfont=feta-din10 scaled \magstep2
+        \font\fingerfont=feta-nummer5
 }
 \def\fetdef#1#2{\def#1{%
-        % what the fuck is this?
-        %\lower.3884\staffrulethickness
         \hbox{\fetchar{#2}}}}
 
 \def\fetchar#1{\fontentja\char#1}
@@ -28,13 +28,13 @@
         {\vetfont\char\count0}}}
 
 % stacked numbers; overrules def in lilyponddefs
-% widest num should be .4 balkheight
+% widest num should be .40 balkheight
 % oeps: \meter 12/8;
 \def\generalmeter#1#2{%
         \vbox to 0pt{\vss%
-        \hbox to0.45\balkheight{\hfill\fetanummer #1\hfill}%
+        \hbox to0.45\balkheight{\hss\fetanummer #1\hss}%
         \nointerlineskip%
-        \hbox to0.45\balkheight{\hfill\fetanummer #2\hfill}%
+        \hbox to0.45\balkheight{\hss\fetanummer #2\hss}%
         \vss}}
 
 \newcount\embedcount\embedcount=0
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 292022e096..49a0f3e3c4 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -195,6 +195,7 @@
 \def\settext#1{\normaltextfont #1}
 \def\setitalic#1{\italicfont #1}
 \def\setdynamic#1{\dynfont #1}
+\def\setfinger#1{\fingerfont #1}
 
 % the interline symbol. Redefine to remove it.
 \def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}}