From 5bfb12daed41b928c82a771855227e2d3461130b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 7 Apr 2002 22:18:35 +0000 Subject: [PATCH] '' --- input/regression/dynamics-glyphs.ly | 11 + input/regression/dynamics-glyphs.tex | 365 --------------------------- mf/feta-din-code.mf | 15 +- mf/feta-nummer-code.mf | 2 +- 4 files changed, 24 insertions(+), 369 deletions(-) create mode 100644 input/regression/dynamics-glyphs.ly delete mode 100644 input/regression/dynamics-glyphs.tex diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly new file mode 100644 index 0000000000..07d9a26f26 --- /dev/null +++ b/input/regression/dynamics-glyphs.ly @@ -0,0 +1,11 @@ + +\score { + +\notes\relative c'' { c4-\ff + c \f + c \mf + c \mp \> \! + c \pp \< \! + c \sfp +} +} diff --git a/input/regression/dynamics-glyphs.tex b/input/regression/dynamics-glyphs.tex deleted file mode 100644 index 09ea6de4ef..0000000000 --- a/input/regression/dynamics-glyphs.tex +++ /dev/null @@ -1,365 +0,0 @@ -% Generated automatically by: lelie, at Sun Apr 7 23:41:57 20022912 -\def\lilypondtagline{Lily was here, 1.5.50.mb1 } -\def\LilyPondVersion{1.5.50.mb1} -\def\lilypondpaperunit{mm} -% Outputting Score, defined at: -% /home/hanwen/usr/src/lilypond/input/regression/dynamics-glyphs.ly:10:1 -\def\lilypondpaperlinethickness{0.175730} -\def\lilypondpapervsize{296.900000} -\def\lilypondpaperscmsetting{(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse -} -\def\lilypondpaperunit{mm} -\def\lilypondpaperlineheight{14} -\def\lilypondpaperstaffheight{7.029196} -\def\lilypondpaperindent{13.571429} -\def\lilypondpaperstaffspace{1.757299} -\def\lilypondpaperpaperfile{a4-init.ly} -\def\lilypondpaperlinewidth{190.000000} -\def\lilypondpaperledgerlinethickness{0.351460} -\let\lilypondpaperpssetting\undefined -\def\lilypondpaperinterscoreline{4.000000} -\def\lilypondpaperpapersizename{a4} -\def\lilypondpaperhsize{210.000000} -\def\lilypondpaperoutputscale{1.757299} -\def\lilypondpaperpapersize{a4} -\def\lilypondpaperblotdiameter{0.014058} -\let\lilypondpapertexsetting\undefined -\def\scaletounit{ 2.83464566929134 mul }\special{\string! %!PS-Adobe-1.0: music-drawing-routines.ps % -% % -% Functions for direct and embedded PostScript % - % -/blot-diameter { lilypondpaperblotdiameter } bind def % - % -% fucking redhat xdvi patch. % -/skeel { scale } bind def % - % - % -/set_tex_dimen { % - cvr def % -} bind def % - % -/euclidean_length % -{ % - 1 copy mul exch 1 copy mul add sqrt % -} bind def % - % -/skeel { scale } bind def % -% FIXME. translate to middle of box. % -% Nice rectangle with rounded corners % -/draw_box % breapth width depth height % -{ % - currentdict /testing known { % - %% real thin lines for testing % - /blot 0.005 def % - }{ % - /blot blot-diameter def % - } ifelse % - % - 0 setlinecap % - blot setlinewidth % - 1 setlinejoin % - % - blot 2 div sub /h exch def % - blot 2 div sub /d exch def % - blot 2 div sub /w exch def % - blot 2 div sub /b exch def % - % - b neg d neg moveto % - b w add 0 rlineto % - 0 d h add rlineto % - b w add neg 0 rlineto % - 0 d h add neg rlineto % - % - currentdict /testing known { % - %% outline only, for testing: % - stroke % - }{ % - closepath gsave stroke grestore fill % - } ifelse % -} bind def % - % -/draw_round_box % breapth width depth height blot % -{ % - /blot exch def % - % - 0 setlinecap % - blot setlinewidth % - 1 setlinejoin % - % - blot 2 div sub /h exch def % - blot 2 div sub /d exch def % - blot 2 div sub /w exch def % - blot 2 div sub /b exch def % - % - b neg d neg moveto % - b w add 0 rlineto % - 0 d h add rlineto % - b w add neg 0 rlineto % - 0 d h add neg rlineto % - % - currentdict /testing known { % - %% outline only, for testing: % - stroke % - }{ % - closepath gsave stroke grestore fill % - } ifelse % -} bind def % - % -% Nice beam with rounded corners % -/draw_beam % slope width thick % -{ % - currentdict /testing known { % - %% real thin lines for testing % - /blot 0.005 def % - }{ % - /blot blot-diameter def % - } ifelse % - blot setlinewidth % - % - 0 setlinecap % - 1 setlinejoin % - % - blot sub /t exch def % - blot sub /w exch def % - w mul /h exch def % - % - blot 2 div t 2 div neg moveto % - w h rlineto % - 0 t rlineto % - w neg h neg rlineto % - 0 t neg rlineto % - % - currentdict /testing known { % - %% outline only, for testing: % - stroke % - }{ % - closepath gsave stroke grestore fill % - } ifelse % -} bind def % - % -/draw_repeat_slash % width slope thick % -{ % - 1 setlinecap % - 1 setlinejoin % - % - /beamthick exch def % - /slope exch def % - /width exch def % - beamthick beamthick slope div euclidean_length % - /xwid exch def % - 0 0 moveto % - xwid 0 rlineto % - width slope width mul rlineto % - xwid neg 0 rlineto % - % width neg width angle sin mul neg rlineto % - closepath fill % -} bind def % - % - % -/draw_ez_ball % ch letter_col ball_col font % -{ % - % font % - findfont 0.7 scalefont setfont % - 0.1 setlinewidth % - 0 0 moveto % - 0 setgray % - 0.5 0 0.5 0 360 arc closepath fill stroke % - % ball_col % - 1 eq { % - 0.01 setlinewidth % - 1 setgray % - 0.5 0 0.4 0 360 arc closepath % - fill stroke % - } if % - % letter_col % - setgray % - % 0.25 is empiric centering. Change to taste % - 0.25 -0.25 moveto % - % ch % - show % -} bind def % - % -% Simple, but does it work everywhere? % -% Han-Wen reports that one printer (brand?) at cs.uu.nl chokes on this, % -% reverted for now -- jcn % -% % -% The filled circles are drawn by setting the linewidth % -% to 2*radius and drawing a point. % -/simple_draw_ez_ball % ch letter_col ball_col font % -{ % - % font % - findfont 0.85 scalefont setfont % - /origin { 0.45 0 } def % - 0 setgray % - 1.1 setlinewidth % - origin moveto % - origin lineto stroke % - % ball_col % - setgray % - 0.9 setlinewidth % - origin moveto % - origin lineto stroke % - % letter_col % - setgray % - % 0.25 is empiric centering. Change to taste % - origin moveto % - -0.28 -0.30 rmoveto % - % ch % - show % -} bind def % - % -% this is for drawing slurs. % -/draw_bezier_sandwich % thickness controls % -{ % - setlinewidth % - moveto % - curveto % - lineto % - curveto % - gsave % - fill % - grestore % - stroke % -} bind def % - % -/draw_dot % x1 y2 R % -{ % -% 0 360 arc fill stroke % - 0 360 arc closepath fill stroke % -} bind def % - % -/draw_dashed_line % dash thickness dx dy % -{ % - 1 setlinecap % - 1 setlinejoin % - setdash % - setlinewidth % - 0 0 moveto % - lineto % - stroke % -} bind def % - % -/draw_dashed_slur % dash thickness controls % -{ % - 1 setlinecap % - 1 setlinejoin % - setdash % - setlinewidth % - 8 -2 roll % - moveto % - curveto % - stroke % -} bind def % - % - % - % -/bracket_traject % -{ % - /traject_ds exch def % - /traject_alpha exch def % - traject_ds traject_alpha sin mul add % - exch % - traject_ds traject_alpha cos mul add % - exch % -} bind def % - % - % - % -/half_bracket % -{ % -%6 % - 0 0 % -%5a % - bracket_thick arch_height add half_height arch_thick sub arch_width add % - arch_angle arch_height -0.15 mul bracket_traject % -%5b % - bracket_thick 0.5 mul half_height % - 0 arch_height 0.5 mul bracket_traject % -%5c % - 0 half_height % -%4a % - bracket_thick half_height arch_thick sub % - 0 arch_height 0.4 mul bracket_traject % -%4b % - bracket_thick arch_height add half_height arch_thick sub arch_width add % - arch_angle arch_height -0.25 mul bracket_traject % -%4c % - bracket_thick arch_height add half_height arch_thick sub arch_width add % -%3 % - bracket_thick half_height arch_thick sub % -%2 % - bracket_thick 0 % -%1 % - 0 0 % -} bind def % - % -/draw_half_bracket { % - moveto % - lineto % - lineto % - curveto % - curveto % - lineto % - gsave % - fill % - grestore % -} bind def % - % -/draw_bracket % arch_angle arch_width arch_height bracket_height arch_thick bracket_thick % -{ % - % urg % - % - /bracket_thick exch def % - /arch_thick exch def % - /bracket_height exch def % - /arch_height exch def % - /arch_width exch def % - /arch_angle exch def % - % - bracket_height 2 div bracket_thick add /half_height exch def % - bracket_thick 0.5 mul setlinewidth % - 1 setlinecap % - 1 setlinejoin % - half_bracket % - 20 copy % - 1 -1 scale % - draw_half_bracket % - stroke % - 1 -1 scale % - draw_half_bracket % - stroke % -} bind def % - % -}\input lilyponddefs \outputscale=\lilypondpaperoutputscale \lilypondpaperunit\turnOnPostScript\font\magfontAOYTomMMBo=feta20 scaled 1000 -\font\magfontOHZTomMMBo=feta-din14 scaled 1000 -\vbox to 12.1900 \outputscale {\hbox{% -\placebox{ -8.0000 \outputscale }{ 7.7229 \outputscale }{\kern 0.0000 \outputscale \vrule width 100.3976 \outputscale depth 0.0500 \outputscale height 0.0500 \outputscale }% -\placebox{ -7.0000 \outputscale }{ 7.7229 \outputscale }{\kern 0.0000 \outputscale \vrule width 100.3976 \outputscale depth 0.0500 \outputscale height 0.0500 \outputscale }% -\placebox{ -6.0000 \outputscale }{ 7.7229 \outputscale }{\kern 0.0000 \outputscale \vrule width 100.3976 \outputscale depth 0.0500 \outputscale height 0.0500 \outputscale }% -\placebox{ -5.0000 \outputscale }{ 7.7229 \outputscale }{\kern 0.0000 \outputscale \vrule width 100.3976 \outputscale depth 0.0500 \outputscale height 0.0500 \outputscale }% -\placebox{ -4.0000 \outputscale }{ 7.7229 \outputscale }{\kern 0.0000 \outputscale \vrule width 100.3976 \outputscale depth 0.0500 \outputscale height 0.0500 \outputscale }% -\placebox{ -6.0000 \outputscale }{ 12.9229 \outputscale }{\magfontAOYTomMMBo\char113 }% -\placebox{ -7.0000 \outputscale }{ 8.7229 \outputscale }{\magfontAOYTomMMBo\char107 }% -\placebox{ -6.0000 \outputscale }{ 94.2127 \outputscale }{\kern -0.0650 \outputscale \vrule width 0.1300 \outputscale depth 3.0000 \outputscale height 0.2250 \outputscale }% -\placebox{ -5.5000 \outputscale }{ 94.1477 \outputscale }{\magfontAOYTomMMBo\char32 }% -\placebox{-11.6067 \outputscale }{ 92.3005 \outputscale }{\magfontOHZTomMMBo\hbox{sfp}}% -\placebox{ -6.0000 \outputscale }{ 72.2307 \outputscale }{\kern 0.0000 \outputscale \vrule width 0.1600 \outputscale depth 2.0000 \outputscale height 2.0000 \outputscale }% -\placebox{ -6.0000 \outputscale }{ 80.2399 \outputscale }{\kern -0.0650 \outputscale \vrule width 0.1300 \outputscale depth 3.0000 \outputscale height 0.2250 \outputscale }% -\placebox{ -5.5000 \outputscale }{ 80.1749 \outputscale }{\magfontAOYTomMMBo\char32 }% -\placebox{-10.7667 \outputscale }{ 78.7166 \outputscale }{\magfontOHZTomMMBo\hbox{pp}}% -\placebox{ -6.0000 \outputscale }{ 59.2643 \outputscale }{\kern -0.0650 \outputscale \vrule width 0.1300 \outputscale depth 3.0000 \outputscale height 0.2250 \outputscale }% -\placebox{ -5.5000 \outputscale }{ 59.1993 \outputscale }{\magfontAOYTomMMBo\char32 }% -\placebox{-10.7667 \outputscale }{ 57.7118 \outputscale }{\magfontOHZTomMMBo\hbox{mp}}% -\placebox{ -6.0000 \outputscale }{ 45.2916 \outputscale }{\kern -0.0650 \outputscale \vrule width 0.1300 \outputscale depth 3.0000 \outputscale height 0.2250 \outputscale }% -\placebox{ -5.5000 \outputscale }{ 45.2266 \outputscale }{\magfontAOYTomMMBo\char32 }% -\placebox{-11.6067 \outputscale }{ 43.7390 \outputscale }{\magfontOHZTomMMBo\hbox{mf}}% -\placebox{ -6.0000 \outputscale }{ 31.3188 \outputscale }{\kern -0.0650 \outputscale \vrule width 0.1300 \outputscale depth 3.0000 \outputscale height 0.2250 \outputscale }% -\placebox{ -5.5000 \outputscale }{ 31.2538 \outputscale }{\magfontAOYTomMMBo\char32 }% -\placebox{-11.6067 \outputscale }{ 30.5246 \outputscale }{\magfontOHZTomMMBo\hbox{f}}% -\placebox{ -6.0000 \outputscale }{ 17.3460 \outputscale }{\kern -0.0650 \outputscale \vrule width 0.1300 \outputscale depth 3.0000 \outputscale height 0.2250 \outputscale }% -\placebox{ -5.5000 \outputscale }{ 17.2810 \outputscale }{\magfontAOYTomMMBo\char32 }% -\placebox{-11.6067 \outputscale }{ 15.8227 \outputscale }{\magfontOHZTomMMBo\hbox{ff}}% -\placebox{ -7.0000 \outputscale }{ 8.7229 \outputscale }{\magfontAOYTomMMBo\char107 }% -\placebox{ -6.0000 \outputscale }{ 12.9229 \outputscale }{\magfontAOYTomMMBo\char113 }% -}\vss} -\EndLilyPondOutput \ No newline at end of file diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf index 3408bb9267..bb0125a8a0 100644 --- a/mf/feta-din-code.mf +++ b/mf/feta-din-code.mf @@ -501,6 +501,18 @@ fet_beginchar("dynamic m", "m", "dynm"); fet_endchar; +ligtable "m" : "p" kern 0.25 ex#, "f" kern -0.1 ex#; +ligtable "f" : "f" kern -0.13 ex#; + + + + + + + + + + %% notes from old dyn code. % "f" obviously has a _lot_ bigger slant than "p" (see Wanske p.239) @@ -518,6 +530,3 @@ fet_endchar; % Chester, Breitkopf suggest smaller sizes of these other chars, % using the x-height as reference point. - -ligtable "m" : "p" kern 0.25 ex#, "f" kern; -ligtable "f" : "f" kern -0.13 ex#; diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf index 19cde090d7..5bd364002f 100644 --- a/mf/feta-nummer-code.mf +++ b/mf/feta-nummer-code.mf @@ -54,7 +54,7 @@ def number_flare_path(expr pos,alpha,beta,line,flare, penpos2(flare, alpha ); penpos3(flare, alpha + beta); - penlabels(1,2,3,4, 5); + penlabels(1, 2, 3, 4, 5); pickup pencircle; save p; -- 2.39.5