From af7aee3b3d80ab9fd152cef112df8b3ea11b1acc Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:30:51 +0000 Subject: [PATCH] lilypond-1.3.102 --- mf/feta-din4.mf | 2 +- mf/feta-din5.mf | 2 +- mf/feta-din6.mf | 9 ++++ mf/feta-nummer4.mf | 2 +- mf/feta-nummer5.mf | 2 +- mf/feta-nummer6.mf | 9 ++++ ps/lily.ps | 94 ++++++++++++++---------------------- scm/element-descriptions.scm | 5 +- tex/lily-ps-defs.tex | 4 +- 9 files changed, 64 insertions(+), 65 deletions(-) create mode 100644 mf/feta-din6.mf create mode 100644 mf/feta-nummer6.mf diff --git a/mf/feta-din4.mf b/mf/feta-din4.mf index a8e25a1da6..46eeacfeff 100644 --- a/mf/feta-din4.mf +++ b/mf/feta-din4.mf @@ -1,7 +1,7 @@ % feta-din4.mf % part of LilyPond's pretty-but-neat music font -design_size:=3.82; % 6.5/1.2/1.2 din5 = 6.5/1.2 : din7 = 6.5pt +design_size:=3.82; % 5.5/1.2/1.2 din6 = 5.5pt input feta-din.mf; diff --git a/mf/feta-din5.mf b/mf/feta-din5.mf index 7b6e1fcadd..1584dc1ebe 100644 --- a/mf/feta-din5.mf +++ b/mf/feta-din5.mf @@ -1,7 +1,7 @@ % feta-din5.mf % part of LilyPond's pretty-but-neat music font -design_size:=4.58; % 6.5/1.2 : din7 = 6.5pt +design_size:=4.58; % 5.5/1.2 : din6 = 5.5pt input feta-din.mf; diff --git a/mf/feta-din6.mf b/mf/feta-din6.mf new file mode 100644 index 0000000000..efaf13d5d9 --- /dev/null +++ b/mf/feta-din6.mf @@ -0,0 +1,9 @@ +% feta-din6.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=5.5; % feta11 = 11pt + +input feta-din.mf; + +end. + diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf index bb9a0768be..ebe2cfcdec 100644 --- a/mf/feta-nummer4.mf +++ b/mf/feta-nummer4.mf @@ -1,7 +1,7 @@ % feta-nummer4.mf % part of LilyPond's pretty-but-neat music font -design_size:=3.82; % 6.5/1.2/1.2 nummer5 = 6.5/1.2 : nummer7 = 6.5pt +design_size:=3.82; % 5.5/1.2/1.2 nummer6 = 5.5pt input feta-nummer.mf; diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf index 596be271b3..ad480d1529 100644 --- a/mf/feta-nummer5.mf +++ b/mf/feta-nummer5.mf @@ -1,7 +1,7 @@ % feta-nummer5.mf % part of LilyPond's pretty-but-neat music font -design_size:=4.58; % 6.5/1.2 : nummer7 = 6.5pt +design_size:=4.58; % 5.5/1.2 : nummer6 = 5.5pt input feta-nummer.mf; diff --git a/mf/feta-nummer6.mf b/mf/feta-nummer6.mf new file mode 100644 index 0000000000..4038deb23d --- /dev/null +++ b/mf/feta-nummer6.mf @@ -0,0 +1,9 @@ +% feta-nummer6.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=5.5; % feta11 = 11pt + +input feta-nummer.mf; + +end. + diff --git a/ps/lily.ps b/ps/lily.ps index 65b0c0a04f..b4a324105e 100644 --- a/ps/lily.ps +++ b/ps/lily.ps @@ -1,11 +1,10 @@ %!PS-Adobe-1.0: lily.ps -% -% 2 setlanguagelevel % hmm. auto_resize_dicts doesn't help either. -% round cappings -1 setlinecap -% -% scm/lily.scm should allow blank lines, now % +% + +% round cappings +1 setlinecap + /draw_beam % width slope thick { 2 div /beam_thick exch def @@ -18,14 +17,14 @@ 0 beam_thick lineto closepath fill } bind def -% + /draw_decrescendo % width height cons thick { setlinewidth /cresc_cont exch def /cresc_ht exch def /cresc_wd exch def -% + cresc_wd cresc_cont moveto 0 cresc_ht lineto stroke @@ -33,14 +32,14 @@ 0 cresc_ht neg lineto stroke } bind def -% + /draw_crescendo % width height cons thick { setlinewidth /cresc_cont exch def /cresc_ht exch def /cresc_wd exch def -% + 0 cresc_cont moveto cresc_wd cresc_ht lineto stroke @@ -48,16 +47,14 @@ cresc_wd cresc_ht neg lineto stroke } bind def -% + /lily_distance { 1 copy mul exch 1 copy mul add sqrt } bind def -% + /draw_tuplet % height gap dx dy thick dir { -% urg: the only Level-2 PS, check effect in print -% true setstrokeadjust /dir exch def setlinewidth 1 setlinecap @@ -67,8 +64,8 @@ /tuplet_gapx exch def /tuplet_h exch def tuplet_dy tuplet_dx div tuplet_gapx mul /tuplet_gapy exch def -% -% + + 0 0 moveto 0 tuplet_h dir mul lineto tuplet_dx tuplet_gapx sub 2 div @@ -79,7 +76,7 @@ tuplet_dx tuplet_dy lineto stroke } bind def -% + /draw_volta % h w thick vert_start vert_end { /vert_end exch def @@ -87,8 +84,6 @@ setlinewidth /volta_w exch def /volta_h exch def -% urg: the only Level-2 PS, check effect in print -% true setstrokeadjust 1 setlinecap 1 setlinejoin vert_start 0 eq { @@ -102,7 +97,7 @@ } if stroke } bind def -% + % this is for drawing slurs. /draw_bezier_sandwich % thickness controls { @@ -116,7 +111,7 @@ grestore stroke } bind def -% + /draw_dashed_line % dash thickness dx dy { 1 setlinecap @@ -127,22 +122,7 @@ lineto stroke } bind def -% -/xdraw_dashed_line % dash thickness dx dy -{ - 1 setlinecap - 1 setlinejoin - setdash - dup - setlinewidth - 2 div - dup - 0 moveto - neg add - lineto - stroke -} bind def -% + /draw_dashed_slur % dash thickness controls { 1 setlinecap @@ -154,21 +134,21 @@ 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 + /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 @@ -177,7 +157,7 @@ bracket_thick arch_height add half_height arch_thick sub arch_width add arch_angle arch_height -0.15 mul bracket_traject %5b - 1 half_height + bracket_thick 0.5 mul half_height 0 arch_height 0.5 mul bracket_traject %5c 0 half_height @@ -196,7 +176,7 @@ %1 0 0 } bind def -% + /draw_half_bracket { moveto lineto @@ -208,10 +188,11 @@ fill grestore } bind def -% + /draw_bracket % arch_angle arch_width arch_height bracket_width bracket_height arch_thick bracket_thick { % urg + /bracket_thick exch def /arch_thick exch def /bracket_height exch def @@ -219,10 +200,9 @@ /arch_height exch def /arch_width exch def /arch_angle exch def -% + bracket_height 2 div bracket_thick add /half_height exch def -% urg: the only Level-2 PS, check effect in print -% true setstrokeadjust + bracket_thick 0.5 mul setlinewidth 1 setlinecap 1 setlinejoin half_bracket @@ -231,9 +211,7 @@ draw_half_bracket stroke 1 -1 scale -% ugh, ugh: - 0.05 0 translate draw_half_bracket stroke } bind def -% + diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index 0a92527b7f..9bd688f806 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -454,12 +454,12 @@ (collapse-height . 1.0) (thickness . 1.6) (arch-height . 1.5) - (arch-angle . 50.0) + (arch-angle . 25.0) (arch-thick . 0.25) (glyph . bar-line) (arch-width . 1.5) (bracket-thick . 0.25) - (bracket-width . 2.0) + (bracket-width . 0.4) (font-family . braces) (font-point-size . 20) (Y-extent-callback . #f) @@ -513,6 +513,7 @@ (thick . 1.0) (after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking) (molecule-callback . ,Tuplet_spanner::brew_molecule) + (font-family . roman) (font-shape . italic) (font-relative-size . -1) (meta . ,(element-description "TupletBracket" text-interface diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex index 45a0db23e1..bfd4a8e40d 100644 --- a/tex/lily-ps-defs.tex +++ b/tex/lily-ps-defs.tex @@ -13,7 +13,9 @@ % by executing a 0 0 moveto \def\embeddedps##1{% \special{ps: @beginspecial @setspecial - \mudelapaperoutputscale\lilySpace\mudelapaperoutputscale\lilySpace scale ##1 @endspecial}% + \mudelapaperoutputscale\lilySpace + \mudelapaperoutputscale\lilySpace scale + ##1 @endspecial}% } } -- 2.39.5