From: fred <fred>
Date: Sun, 24 Mar 2002 20:04:51 +0000 (+0000)
Subject: lilypond-0.1.41
X-Git-Tag: release/1.5.59~3487
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=34356081a3041e29345e6796c8e1dedff91368a9;p=lilypond.git

lilypond-0.1.41
---

diff --git a/init/feta13.ly b/init/feta13.ly
new file mode 100644
index 0000000000..2cec6814a7
--- /dev/null
+++ b/init/feta13.ly
@@ -0,0 +1,79 @@
+% Creator: mf-to-table.py version 0.5
+% Automatically generated on
+% Do not edit
+% input from out/feta13.log
+% name=\symboltables {
+    "rests"	 = \table {
+        "0"	"\\wholerest"	-0.00\pt	4.88\pt	-2.03\pt	0.00\pt	
+        "1"	"\\halfrest"	-0.00\pt	4.88\pt	-0.00\pt	2.03\pt	
+        "0o"	"\\outsidewholerest"	-2.03\pt	6.91\pt	-2.03\pt	0.33\pt	
+        "1o"	"\\outsidehalfrest"	-2.03\pt	6.91\pt	-0.33\pt	2.03\pt	
+        "2"	"\\quartrest"	-0.00\pt	3.51\pt	2.44\pt	11.70\pt	
+        "3"	"\\eighthrest"	-0.00\pt	4.33\pt	3.25\pt	9.24\pt	
+        "4"	"\\sixteenthrest"	-0.00\pt	5.04\pt	-0.00\pt	9.24\pt	
+        "5"	"\\thirtysecondrest"	-0.00\pt	5.69\pt	-0.00\pt	12.49\pt	
+        "6"	"\\sixtyfourthrest"	-0.00\pt	6.10\pt	-0.00\pt	15.74\pt	
+        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	6.79\pt	-0.00\pt	18.99\pt	
+        }
+    "accidentals"	 = \table {
+        "1"	"\\sharp"	-0.00\pt	3.58\pt	-4.88\pt	4.88\pt	
+        "0"	"\\natural"	-0.00\pt	2.17\pt	-4.88\pt	4.88\pt	
+        "-1"	"\\flat"	-0.39\pt	2.60\pt	-1.63\pt	6.50\pt	
+        "-2"	"\\flatflat"	-0.39\pt	4.71\pt	-1.63\pt	6.50\pt	
+        "2"	"\\sharpsharp"	-0.00\pt	3.25\pt	-1.63\pt	1.63\pt	
+        }
+    "dots"	 = \table {
+        "dot"	"\\dot"	-0.00\pt	1.46\pt	-0.73\pt	0.73\pt	
+        "repeatcolon"	"\\repeatcolon"	-0.00\pt	1.46\pt	-1.63\pt	1.63\pt	
+        }
+    "balls"	 = \table {
+        "-1"	"\\brevisball"	-0.00\pt	6.50\pt	-1.79\pt	1.79\pt	
+        "-1l"	"\\brevisledger"	-1.63\pt	8.13\pt	-0.33\pt	0.33\pt	
+        "-2"	"\\longaball"	-0.00\pt	6.50\pt	-1.79\pt	1.79\pt	
+        "-2l"	"\\longaledger"	-1.63\pt	8.13\pt	-0.33\pt	0.33\pt	
+        "0"	"\\wholeball"	-0.00\pt	6.44\pt	-1.79\pt	1.79\pt	
+        "0l"	"\\wholeledger"	-1.61\pt	8.04\pt	-0.33\pt	0.33\pt	
+        "1"	"\\halfball"	-0.00\pt	4.48\pt	-1.79\pt	1.79\pt	
+        "1l"	"\\halfledger"	-1.12\pt	5.60\pt	-0.33\pt	0.33\pt	
+        "2"	"\\quartball"	-0.00\pt	4.29\pt	-1.79\pt	1.79\pt	
+        "2l"	"\\quartledger"	-1.07\pt	5.37\pt	-0.33\pt	0.33\pt	
+        }
+    "scripts"	 = \table {
+        "ufermata"	"\\ufermata"	-4.31\pt	4.31\pt	-0.24\pt	4.71\pt	
+        "dfermata"	"\\dfermata"	-4.31\pt	4.31\pt	-4.71\pt	0.24\pt	
+        "sforzato"	"\\sforzatoaccent"	-2.92\pt	2.92\pt	-1.63\pt	1.63\pt	
+        "staccato"	"\\staccato"	-0.49\pt	0.49\pt	-0.49\pt	0.49\pt	
+        "ustaccatissimo"	"\\ustaccatissimo"	-0.65\pt	0.65\pt	-0.20\pt	3.25\pt	
+        "dstaccatissimo"	"\\dstaccatissimo"	-0.65\pt	0.65\pt	-3.25\pt	0.20\pt	
+        "tenuto"	"\\tenuto"	-2.92\pt	2.92\pt	-0.20\pt	0.20\pt	
+        "umarcato"	"\\umarcato"	-1.63\pt	1.63\pt	-0.00\pt	3.58\pt	
+        "dmarcato"	"\\dmarcato"	-1.63\pt	1.63\pt	-3.58\pt	0.00\pt	
+        "open"	"\\ouvert"	-1.30\pt	1.30\pt	-1.63\pt	1.63\pt	
+        "stopped"	"\\plusstop"	-1.79\pt	1.79\pt	-1.79\pt	1.79\pt	
+        "upbow"	"\\upbow"	-2.11\pt	2.11\pt	-0.00\pt	6.76\pt	
+        "downbow"	"\\downbow"	-2.44\pt	2.44\pt	-0.00\pt	4.33\pt	
+        "turn"	"\\turn"	-3.55\pt	3.55\pt	-1.72\pt	1.72\pt	
+        "trill"	"\\trill"	-3.25\pt	3.25\pt	-0.00\pt	7.31\pt	
+        "pedalheel"	"\\pedalheel"	-1.63\pt	1.63\pt	-1.63\pt	2.17\pt	
+        "pedaltoe"	"\\pedaltoe"	-1.63\pt	1.63\pt	-0.00\pt	4.88\pt	
+        "flageolet"	"\\flageolet"	-1.73\pt	1.73\pt	-1.73\pt	1.73\pt	
+        }
+    "flags"	 = \table {
+        "u3"	"\\eighthflag"	-0.16\pt	4.01\pt	-9.96\pt	0.16\pt	
+        "u4"	"\\sixteenthflag"	-0.16\pt	4.01\pt	-11.59\pt	0.16\pt	
+        "u5"	"\\thirtysecondflag"	-0.16\pt	4.01\pt	-14.02\pt	0.16\pt	
+        "u6"	"\\sixtyfourthflag"	-0.16\pt	4.01\pt	-17.27\pt	0.16\pt	
+        "d3"	"\\deighthflag"	-0.16\pt	4.44\pt	-0.16\pt	9.47\pt	
+        "d4"	"\\dsixteenthflag"	-0.16\pt	4.44\pt	-0.16\pt	9.96\pt	
+        "d5"	"\\dthirtysecondflag"	-0.16\pt	4.44\pt	-0.16\pt	12.72\pt	
+        "d6"	"\\dsixtyfourthflag"	-0.16\pt	4.44\pt	-0.16\pt	14.35\pt	
+        }
+    "clefs"	 = \table {
+        "alto"	"\\altoclef"	-3.25\pt	12.10\pt	-6.50\pt	6.50\pt	
+        "alto_change"	"\\caltoclef"	-2.60\pt	9.68\pt	-5.20\pt	5.20\pt	
+        "bass"	"\\bassclef"	-1.63\pt	11.70\pt	-8.13\pt	3.25\pt	
+        "bass_change"	"\\cbassclef"	-1.30\pt	9.36\pt	-6.50\pt	2.60\pt	
+        "violin"	"\\violinclef"	-2.83\pt	12.15\pt	-9.75\pt	16.25\pt	
+        "violin_change"	"\\cviolinclef"	-2.46\pt	9.52\pt	-7.80\pt	13.00\pt	
+        }
+    %  } % $name
diff --git a/init/lily-init.ly b/init/lily-init.ly
index b47910ac69..8b19863c64 100644
--- a/init/lily-init.ly
+++ b/init/lily-init.ly
@@ -14,7 +14,6 @@ Gourlay = 1.0
 Wordwrap = 0.0
 
 \include "paper16.ly"
-\include "paper20.ly"
 
 default_paper = \paper{
 	\paper_sixteen
diff --git a/init/paper11.ly b/init/paper11.ly
new file mode 100644
index 0000000000..9eb5614a9f
--- /dev/null
+++ b/init/paper11.ly
@@ -0,0 +1,37 @@
+% paper20.ly
+
+\include "table11.ly"
+
+paper_eleven = \paper {
+	linewidth = 15.0 \cm;
+	rulethickness = 0.25\pt;
+	barsize = 11.0 \pt;
+	interline = 2.75\pt;
+	notewidth = 7.15\pt; % ugh see table20 for sizes
+	wholewidth = 10.44\pt;
+	unitspace = 22.\pt;
+%	basicspace = 4.\pt;
+%	geometric = 1.414;
+	geometric = 0.;
+	basicspace = 9.\pt;
+
+	arithmetic_basicspace = 2.;
+        arithmetic_multiplier = 7.\pt;
+	
+	%
+	% three beams span two interlines, including stafflines:
+	% 2 interbeam + beam_thickness = 2 interline - staffline_thickness
+	% ( beam_thickness = 0.48 interline for now...)
+	% interbeam = interline - (beam_thickness + staffline_thickness) / 2
+	% interbeam = 3.6;
+	% ugh: interline *in fact* is rule_thickness + "interline"?
+	interbeam = 3.9;
+
+	gourlay_energybound = 100000.;
+	gourlay_maxmeasures = 12.;
+	
+	castingalgorithm = \Gourlay;
+	\symboltables { \table_eleven }
+\include "engraver.ly"
+}
+
diff --git a/init/table11.ly b/init/table11.ly
new file mode 100644
index 0000000000..ba026be641
--- /dev/null
+++ b/init/table11.ly
@@ -0,0 +1,74 @@
+% table26.ly
+%
+% spacing info for LilyPond. Do not edit this.
+% It has a lot of hard-wired stringconstants
+%
+
+table_eleven  = \symboltables {
+
+   \texid 	"\input lilyponddefs \musixelevendefs"
+
+    % index TeXstring, 	xmin xmax ymin ymax
+
+     "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	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 {
+
+	"mf" "\dynmf"
+	"fff" "\dynfff"
+	"ff" "\dynff"
+	"f" "\dynf"
+
+	"mp" "\dynmp"
+	"p" "\dynp"
+	"pp" "\dynpp"
+	"ppp" "\dynppp"
+	"fp" "\dynfp"
+	"sf" "\dynsf"
+	"sfz" "\dynsfz"
+
+	}
+     "align" = \table {
+		"-1"	"\leftalign{%}"
+		"0"	"\centeralign{%}"
+		"1"	"\rightalign{%}"
+ 	}
+
+
+
+
+    "bars" = \table {
+	"empty"	"\emptybar"
+	""	""			0.0\pt	0.0\pt	0.0\pt	16.0\pt
+	"|"	"\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
+	"||"	"\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
+	"|."	"\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
+	".|"	"\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
+	":|"	"\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
+	"|:"	"\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|:"	"\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
+    }
+
+    "meters" = \table {
+	"C"	"\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	"C2"	"\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+    }
+
+    % dims ignored for this table
+    "param" = \table {
+	 "brace"    "\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
+	 "meter"	"\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	 "stem"	"\stem{%}{%}"
+	 "fill"	"\hbox{}"
+	 "rule" "\rulesym{%}{%}"
+     }
+
+    % ugh what's our outdir called?
+    \include "feta11.ly"
+}
+
diff --git a/init/table13.ly b/init/table13.ly
new file mode 100644
index 0000000000..1969e3974c
--- /dev/null
+++ b/init/table13.ly
@@ -0,0 +1,74 @@
+% table26.ly
+%
+% spacing info for LilyPond. Do not edit this.
+% It has a lot of hard-wired stringconstants
+%
+
+table_thirteen  = \symboltables {
+
+   \texid 	"\input lilyponddefs \musixthirteendefs"
+
+    % index TeXstring, 	xmin xmax ymin ymax
+
+     "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	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 {
+
+	"mf" "\dynmf"
+	"fff" "\dynfff"
+	"ff" "\dynff"
+	"f" "\dynf"
+
+	"mp" "\dynmp"
+	"p" "\dynp"
+	"pp" "\dynpp"
+	"ppp" "\dynppp"
+	"fp" "\dynfp"
+	"sf" "\dynsf"
+	"sfz" "\dynsfz"
+
+	}
+     "align" = \table {
+		"-1"	"\leftalign{%}"
+		"0"	"\centeralign{%}"
+		"1"	"\rightalign{%}"
+ 	}
+
+
+
+
+    "bars" = \table {
+	"empty"	"\emptybar"
+	""	""			0.0\pt	0.0\pt	0.0\pt	16.0\pt
+	"|"	"\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
+	"||"	"\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
+	"|."	"\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
+	".|"	"\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
+	":|"	"\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
+	"|:"	"\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|:"	"\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
+    }
+
+    "meters" = \table {
+	"C"	"\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	"C2"	"\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+    }
+
+    % dims ignored for this table
+    "param" = \table {
+	 "brace"    "\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
+	 "meter"	"\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	 "stem"	"\stem{%}{%}"
+	 "fill"	"\hbox{}"
+	 "rule" "\rulesym{%}{%}"
+     }
+
+    % ugh what's our outdir called?
+    \include "feta13.ly"
+}
+
diff --git a/mf/feta-nummer3.mf b/mf/feta-nummer3.mf
new file mode 100644
index 0000000000..d9c79640cb
--- /dev/null
+++ b/mf/feta-nummer3.mf
@@ -0,0 +1,10 @@
+% feta-nummer4.mf
+% part of LilyPond's pretty-but-neat music font
+
+% size:=4;
+size:=16*3/15;
+
+input feta-nummer-generic.mf;
+
+end.
+
diff --git a/mf/feta-nummer6.mf b/mf/feta-nummer6.mf
new file mode 100644
index 0000000000..3daff78c4e
--- /dev/null
+++ b/mf/feta-nummer6.mf
@@ -0,0 +1,10 @@
+% feta-nummer5.mf
+% part of LilyPond's pretty-but-neat music font
+
+% size:=5;
+size:=20*6/15;
+
+input feta-nummer-generic.mf;
+
+end.
+
diff --git a/mf/feta13.mf b/mf/feta13.mf
new file mode 100644
index 0000000000..161d9d9fb6
--- /dev/null
+++ b/mf/feta13.mf
@@ -0,0 +1,16 @@
+% feta16.mf
+% part of LilyPond's pretty-but-neat music font
+
+
+input feta-autometric;
+fet_beginfont("feta", 13);
+staffsize#:=13pt#;
+test:=0;
+
+
+input feta-generic;
+
+fet_endfont("feta");
+
+end.
+
diff --git a/mf/mf.dep b/mf/mf.dep
new file mode 100644
index 0000000000..590fb527e3
--- /dev/null
+++ b/mf/mf.dep
@@ -0,0 +1,99 @@
+
+# Automatically generated by mf-deps.py 0.2
+
+out/feta-beams16.log: feta-beams16.mf feta-watzieik.mf feta-params.mf
+out/feta-beams16.dvi: feta-beams16.mf feta-watzieik.mf feta-params.mf
+out/feta-beams16.2602gf: feta-beams16.mf feta-watzieik.mf feta-params.mf
+out/feta-beams16.tfm: feta-beams16.mf feta-watzieik.mf feta-params.mf
+out/feta-beams20.log: feta-beams20.mf feta-watzieik.mf feta-params.mf
+out/feta-beams20.dvi: feta-beams20.mf feta-watzieik.mf feta-params.mf
+out/feta-beams20.2602gf: feta-beams20.mf feta-watzieik.mf feta-params.mf
+out/feta-beams20.tfm: feta-beams20.mf feta-watzieik.mf feta-params.mf
+out/feta-beams26.log: feta-beams26.mf feta-watzieik.mf feta-params.mf
+out/feta-beams26.dvi: feta-beams26.mf feta-watzieik.mf feta-params.mf
+out/feta-beams26.2602gf: feta-beams26.mf feta-watzieik.mf feta-params.mf
+out/feta-beams26.tfm: feta-beams26.mf feta-watzieik.mf feta-params.mf
+out/feta-black16.log: feta-black16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-black16.dvi: feta-black16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-black16.2602gf: feta-black16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-black16.tfm: feta-black16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-braces16.log: feta-braces16.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces16.dvi: feta-braces16.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces16.2602gf: feta-braces16.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces16.tfm: feta-braces16.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces20.log: feta-braces20.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces20.dvi: feta-braces20.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces20.2602gf: feta-braces20.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-braces20.tfm: feta-braces20.mf feta-beugel.mf feta-macros.mf feta-params.mf
+out/feta-din10.log: feta-din10.mf feta-autometric.mf feta-ital-f.mf feta-ital-p.mf feta-ital-m.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf
+out/feta-din10.dvi: feta-din10.mf feta-autometric.mf feta-ital-f.mf feta-ital-p.mf feta-ital-m.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf
+out/feta-din10.2602gf: feta-din10.mf feta-autometric.mf feta-ital-f.mf feta-ital-p.mf feta-ital-m.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf
+out/feta-din10.tfm: feta-din10.mf feta-autometric.mf feta-ital-f.mf feta-ital-p.mf feta-ital-m.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf
+out/feta-nummer10.log: feta-nummer10.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer10.dvi: feta-nummer10.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer10.2602gf: feta-nummer10.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer10.tfm: feta-nummer10.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer12.log: feta-nummer12.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer12.dvi: feta-nummer12.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer12.2602gf: feta-nummer12.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer12.tfm: feta-nummer12.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer3.log: feta-nummer3.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer3.dvi: feta-nummer3.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer3.2602gf: feta-nummer3.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer3.tfm: feta-nummer3.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer4.log: feta-nummer4.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer4.dvi: feta-nummer4.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer4.2602gf: feta-nummer4.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer4.tfm: feta-nummer4.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer5.log: feta-nummer5.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer5.dvi: feta-nummer5.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer5.2602gf: feta-nummer5.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer5.tfm: feta-nummer5.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer6.log: feta-nummer6.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer6.dvi: feta-nummer6.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer6.2602gf: feta-nummer6.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer6.tfm: feta-nummer6.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer7.log: feta-nummer7.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer7.dvi: feta-nummer7.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer7.2602gf: feta-nummer7.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer7.tfm: feta-nummer7.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer8.log: feta-nummer8.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer8.dvi: feta-nummer8.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer8.2602gf: feta-nummer8.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-nummer8.tfm: feta-nummer8.mf feta-nummer-generic.mf feta-autometric.mf feta-macros.mf feta-params.mf feta-nummer.mf
+out/feta-test16.log: feta-test16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test16.dvi: feta-test16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test16.2602gf: feta-test16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test16.tfm: feta-test16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test20.log: feta-test20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test20.dvi: feta-test20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test20.2602gf: feta-test20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta-test20.tfm: feta-test20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta11.log: feta11.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta11.dvi: feta11.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta11.2602gf: feta11.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta11.tfm: feta11.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta13.log: feta13.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta13.dvi: feta13.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta13.2602gf: feta13.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta13.tfm: feta13.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta16.log: feta16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta16.dvi: feta16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta16.2602gf: feta16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta16.tfm: feta16.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta19.log: feta19.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta19.dvi: feta19.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta19.2602gf: feta19.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta19.tfm: feta19.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta20.log: feta20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta20.dvi: feta20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta20.2602gf: feta20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta20.tfm: feta20.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta23.log: feta23.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta23.dvi: feta23.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta23.2602gf: feta23.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta23.tfm: feta23.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta26.log: feta26.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta26.dvi: feta26.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta26.2602gf: feta26.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
+out/feta26.tfm: feta26.mf feta-autometric.mf feta-generic.mf feta-macros.mf feta-params.mf feta-eindelijk.mf feta-toevallig.mf feta-puntje.mf feta-bolletjes.mf feta-schrift.mf feta-banier.mf feta-klef.mf
diff --git a/tex/feta13.tex b/tex/feta13.tex
new file mode 100644
index 0000000000..72412742d6
--- /dev/null
+++ b/tex/feta13.tex
@@ -0,0 +1,78 @@
+% Creator: mf-to-table.py version 0.5
+% Automatically generated on
+% Do not edit
+% input from out/feta13.log
+% name
+% rests
+\fetdef\wholerest{0}
+\fetdef\halfrest{1}
+\fetdef\outsidewholerest{2}
+\fetdef\outsidehalfrest{3}
+\fetdef\quartrest{4}
+\fetdef\eighthrest{5}
+\fetdef\sixteenthrest{6}
+\fetdef\thirtysecondrest{7}
+\fetdef\sixtyfourthrest{8}
+\fetdef\hundredtwentyeighthrest{9}
+
+% accidentals
+\fetdef\sharp{10}
+\fetdef\natural{11}
+\fetdef\flat{12}
+\fetdef\flatflat{13}
+\fetdef\sharpsharp{14}
+
+% dots
+\fetdef\dot{15}
+\fetdef\repeatcolon{16}
+
+% balls
+\fetdef\brevisball{17}
+\fetdef\brevisledger{18}
+\fetdef\longaball{19}
+\fetdef\longaledger{20}
+\fetdef\wholeball{21}
+\fetdef\wholeledger{22}
+\fetdef\halfball{23}
+\fetdef\halfledger{24}
+\fetdef\quartball{25}
+\fetdef\quartledger{26}
+
+% scripts
+\fetdef\ufermata{27}
+\fetdef\dfermata{28}
+\fetdef\sforzatoaccent{29}
+\fetdef\staccato{30}
+\fetdef\ustaccatissimo{31}
+\fetdef\dstaccatissimo{32}
+\fetdef\tenuto{33}
+\fetdef\umarcato{34}
+\fetdef\dmarcato{35}
+\fetdef\ouvert{36}
+\fetdef\plusstop{37}
+\fetdef\upbow{38}
+\fetdef\downbow{39}
+\fetdef\turn{40}
+\fetdef\trill{41}
+\fetdef\pedalheel{42}
+\fetdef\pedaltoe{43}
+\fetdef\flageolet{44}
+
+% flags
+\fetdef\eighthflag{45}
+\fetdef\sixteenthflag{46}
+\fetdef\thirtysecondflag{47}
+\fetdef\sixtyfourthflag{48}
+\fetdef\deighthflag{49}
+\fetdef\dsixteenthflag{50}
+\fetdef\dthirtysecondflag{51}
+\fetdef\dsixtyfourthflag{52}
+
+% clefs
+\fetdef\altoclef{53}
+\fetdef\caltoclef{54}
+\fetdef\bassclef{55}
+\fetdef\cbassclef{56}
+\fetdef\violinclef{57}
+\fetdef\cviolinclef{58}
+
diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index ab31cb344f..0552dd37ae 100644
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,40 +1,61 @@
 % fetdefs.tex
-% encapsulating tex backend for auto-generated font-en-tja definitions
+% encapsulating tex backend for auto-generated feta definitions
 
 \def\fetsixteendefs{
-        \font\fontentja=feta16
+        \font\feta=feta16
         \font\vetfont=feta-beams16
         \font\fetanummer=feta-nummer8
         \font\dynfont=feta-din10 scaled \magstep1
         \font\bracefont=feta-braces16
         \font\fingerfont=feta-nummer4
-        \interlinedist=4pt
 }
 \def\fettwentydefs{
-        \interlinedist=5pt
-        \font\fontentja=feta20
+        \font\feta=feta20
         \font\vetfont=feta-beams20
         \font\fetanummer=feta-nummer10
         \font\dynfont=feta-din10 scaled \magstep2
         \font\bracefont=feta-braces20
         \font\fingerfont=feta-nummer5
 }
+\def\fettwentysixdefs{
+        \font\feta=feta26
+        \font\vetfont=feta-beams26
+        \font\fetanummer=feta-nummer12
+        \font\dynfont=feta-din10 scaled \magstep3
+        \font\bracefont=feta-braces16
+        \font\fingerfont=feta-nummer7
+}
+\def\fetthirteendefs{
+      \font\feta=feta13
+        \font\vetfont=feta-beams26
+        \font\fetanummer=feta-nummer5
+        \font\dynfont=feta-din10 scaled \magstep0
+        \font\bracefont=feta-braces16
+        \font\fingerfont=feta-nummer3
+}
+\def\fetelevendefs{
+        \font\feta=feta11
+        \font\vetfont=feta-beams26
+        \font\fetanummer=feta-nummer5
+        \font\dynfont=feta-din10 %scaled \magstep-1
+        \font\bracefont=feta-braces16
+        \font\fingerfont=feta-nummer3
+}
+
 
 \def\sixteenfonts{\fetsixteendefs\cmrsixteen}
 \def\twentyfonts{\fettwentydefs\cmrtwenty}
-
+\def\twentysixfonts{\fettwentysixdefs\cmrtwenty}
+\def\elevenfonts{\fetelevendefs\cmreleven}
+\def\thirteenfonts{\fetthirteendefs\cmrthirteen}
 \def\fetdef#1#2{\def#1{%
         \hbox{\fetchar{#2}}}}
 
-\def\fetchar#1{\fontentja\char#1}
+\def\fetchar#1{\feta\char#1}
 
 %\input feta16
 \input feta20
 
-\def\beamslope#1#2{{\count0=#2\advance\count0 by#1
-        \advance\count0by128
-        {\vetfont\char\count0}}}
-
 % stacked numbers; overrules def in lilyponddefs
 % widest num should be .40 balkheight
 % oeps: \meter 12/8;
@@ -47,62 +68,19 @@
 
 \def\pianobrace#1{{\bracefont\char #1}}
 
-\newcount\embedcount\embedcount=0
-\newwrite\checkexists
-\newwrite\embedfile
-\def\inputifexists#1{%
-        \openin\checkexists #1
-        \ifeof\checkexists
-                 \closein\checkexists
-        \else
-                \closein\checkexists
-                \input #1
-        \fi
-}
-\def\embedcountid{feta-embed}
-\inputifexists{\embedcountid.aux}
-%
-% let's not overwrite -- and be sure to create new
-\def\storeembedcount{%
-        \immediate\openout\embedfile=\embedcountid.aux
-        \immediate\write\embedfile{\embedcount=\the\embedcount}
-        \immediate\closeout\embedfile
-}
-
-
-
+\def\embeddedtex#1{}
+\def\embeddedps#1{}
+\def\embeddedmf#1#2{}
+\def\embedclose{}
 
 \input lily-ps-defs
-\def\embeddedtex#1{#1}
-
-\def\embeddedmf#1{
-        \edef\embedid{feta-sleur-\number\embedcount}
-        \immediate\openout\embedfile=\embedid.mf
-        \global\advance\embedcount by 1
-
-% should write ``automatically generated.''
-%        \immediate\write\embedfile{\def\
-%       
-%      }
 
-        \immediate\write\embedfile{#1}
-
-        \immediate\closeout\embedfile
-        \font\expandafter\embedid\expandafter=\embedid
-        \embedid\char0
-}
-
-\def\notex{\def\embeddedtex##1{}}
-\def\nopostscript{\def\embeddedps##1{}}
-\def\nometafont{\def\embeddedmf##1{}}
-
-% dat heb je handig gedaan, lieverd!
-\nometafont
-%\nopostscript
-\notex
+% uncomment to use runtime MF
+%
+% \input lily-mf-defs
 
 \def\EndLilyPondOutput{
-        \storeembedcount
+        \embedclose
         \csname bye\endcsname
 }