From: Jan Nieuwenhuizen Date: Wed, 17 Dec 1997 08:14:26 +0000 (+0100) Subject: patch::: 0.1.37.jcn1: toch kleiner X-Git-Tag: release/0.1.38~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8f62fe3cedc68a14bc3104036f821a4800d5a8ca;p=lilypond.git patch::: 0.1.37.jcn1: toch kleiner --- diff --git a/VERSION b/VERSION index 07f66a40d7..13c7b2006a 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 TOPLEVEL_PATCH_LEVEL = 37 -TOPLEVEL_MY_PATCH_LEVEL = jcn1 +TOPLEVEL_MY_PATCH_LEVEL = jcn2 # 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 0e66f80edd..747be0a7ac 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Sat Dec 13 19:36:32 1997 +% Automatically generated on Sat Dec 13 20:07:15 1997 % Do not edit % input from out/feta16.log % name=\symboltables { @@ -56,7 +56,7 @@ "trill" "\\trill" -0.00\pt 8.00\pt -0.00\pt 9.00\pt "pedalheel" "\\pedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt "pedaltoe" "\\pedaltoe" -2.00\pt 2.00\pt -0.00\pt 6.00\pt - "flageolet" "\\flageolet" -0.00\pt 2.40\pt -0.00\pt 2.40\pt + "flageolet" "\\flageolet" 2.13\pt 2.13\pt 2.13\pt 2.13\pt } "flags" = \table { "u3" "\\eighthflag" -0.20\pt 4.94\pt -12.26\pt 0.20\pt diff --git a/init/feta20.ly b/init/feta20.ly index 4f4614f6cb..84dc1d2f2f 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Sat Dec 13 19:36:55 1997 +% Automatically generated on Sat Dec 13 20:07:39 1997 % Do not edit % input from out/feta20.log % name=\symboltables { @@ -56,7 +56,7 @@ "trill" "\\trill" -0.00\pt 10.00\pt -0.00\pt 11.25\pt "pedalheel" "\\pedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt "pedaltoe" "\\pedaltoe" -2.50\pt 2.50\pt -0.00\pt 7.50\pt - "flageolet" "\\flageolet" -0.00\pt 3.00\pt -0.00\pt 3.00\pt + "flageolet" "\\flageolet" 2.67\pt 2.67\pt 2.67\pt 2.67\pt } "flags" = \table { "u3" "\\eighthflag" -0.25\pt 6.17\pt -15.33\pt 0.25\pt diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf index 9906d3ed3b..efa2f9ac48 100644 --- a/mf/feta-nummer4.mf +++ b/mf/feta-nummer4.mf @@ -1,7 +1,8 @@ % feta-nummer4.mf % part of LilyPond's pretty-but-neat music font -size:=4; +% size:=4; +size:=16*4/15; input feta-nummer-generic.mf; diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf index 10c91913b8..0a9fb3ffa3 100644 --- a/mf/feta-nummer5.mf +++ b/mf/feta-nummer5.mf @@ -1,7 +1,8 @@ % feta-nummer5.mf % part of LilyPond's pretty-but-neat music font -size:=5; +% size:=5; +size:=20*4/15; input feta-nummer-generic.mf; diff --git a/mf/feta-nummer6.mf b/mf/feta-nummer6.mf index a67855d776..e69de29bb2 100644 --- a/mf/feta-nummer6.mf +++ b/mf/feta-nummer6.mf @@ -1,9 +0,0 @@ -% feta-nummer6.mf -% part of LilyPond's pretty-but-neat music font - -size:=6; - -input feta-nummer-generic.mf; - -end. - diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index c600381d7a..4f1ab3cf63 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -502,17 +502,17 @@ fet_endchar; fet_beginchar("Flageolet", "flageolet", "flageolet") save height,width,thickness; - height#=6/5interline#/2; + height#=4/15staffsize#/2; width#=height#; thickness#=blot_diameter#; define_pixels(height,width,thickness); - set_char_box(0,width#,0,height#); + set_char_box(-width#,width#,-height#,height#); pickup pencircle scaled thickness; - x1=width/2; top y1=height; - lft x2=0; y2 = height/2; - x3=x1; bot y3=0; - rt x4=width; y4=y2; + x1=0; top y1=height; + lft x2=-width; y2=0; + x3=x1; y3=-y1; + x4=-x2; y4=y2; penlabels(1,2,3,4); draw z1..z2..z3..z4..cycle; fet_endchar; diff --git a/tex/feta16.tex b/tex/feta16.tex index 1fc157833a..7ef33a9b58 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Sat Dec 13 19:36:32 1997 +% Automatically generated on Sat Dec 13 20:07:15 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index efc164ab57..fcdb256a0d 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Sat Dec 13 19:36:55 1997 +% Automatically generated on Sat Dec 13 20:07:39 1997 % Do not edit % input from out/feta20.log % name diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index ef2c5d3965..2a6385abf4 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -7,7 +7,7 @@ \font\fetanummer=feta-nummer8 \font\dynfont=feta-din10 scaled \magstep1 \font\bracefont=feta-braces16 - \font\fingerfont=feta-nummer5 + \font\fingerfont=feta-nummer4 } \def\fettwentydefs{ \font\fontentja=feta20 @@ -15,7 +15,7 @@ \font\fetanummer=feta-nummer10 \font\dynfont=feta-din10 scaled \magstep2 \font\bracefont=feta-braces20 - \font\fingerfont=feta-nummer6 + \font\fingerfont=feta-nummer5 } \def\fetdef#1#2{\def#1{%