From b6f63802cb34d04419292c8dd43ef749e8960040 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 31 Oct 2000 19:45:37 +0100 Subject: [PATCH] patch::: 1.3.101.jcn2 1.3.101.jcn2 ============ * Fixed bracket, and made some other PostScript code fixes. --- CHANGES | 5 ++ VERSION | 2 +- mf/feta-din16.mf | 9 ---- 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 | 93 ++++++++++++++---------------------- scm/element-descriptions.scm | 1 + scm/font.scm | 8 ++-- tex/lily-ps-defs.tex | 4 +- 13 files changed, 70 insertions(+), 78 deletions(-) create mode 100644 mf/feta-din6.mf create mode 100644 mf/feta-nummer6.mf diff --git a/CHANGES b/CHANGES index 4abb3b88fb..80da47ac0e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3.101.jcn2 +============ + +* Fixed bracket, and made some other PostScript code fixes. + 1.3.101.jcn1 ============ diff --git a/VERSION b/VERSION index 86e18c9b98..dd7241d34b 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=101 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/mf/feta-din16.mf b/mf/feta-din16.mf index 451de0882d..e69de29bb2 100644 --- a/mf/feta-din16.mf +++ b/mf/feta-din16.mf @@ -1,9 +0,0 @@ -% feta-din16.mf -% part of LilyPond's pretty-but-neat music font - -design_size:=16; - -input feta-din; - -end. - 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..138873f5c1 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,7 +188,7 @@ fill grestore } bind def -% + /draw_bracket % arch_angle arch_width arch_height bracket_width bracket_height arch_thick bracket_thick { % urg @@ -219,10 +199,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 +210,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..6cd6ea594e 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -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/scm/font.scm b/scm/font.scm index cde631b71d..5e91e34a43 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -86,11 +86,9 @@ ((0 medium upright braces feta-braces 20) . "feta-braces20") ((2 medium upright braces feta-braces 26) . "feta-braces26") ((1 medium upright braces feta-braces 23) . "feta-braces23") - ((3 bold italic dynamic feta 16) . "feta-din16") - ((2 bold italic dynamic feta 16) . "feta-din16") - ((3 bold italic dynamic feta 10) . "feta-din13") - ((2 bold italic dynamic feta 10) . "feta-din13") - ((1 bold italic dynamic feta 10) . "feta-din12") + ((3 bold italic dynamic feta 13) . "feta-din13") + ((2 bold italic dynamic feta 13) . "feta-din13") + ((1 bold italic dynamic feta 11) . "feta-din11") ((0 bold italic dynamic feta 10) . "feta-din10") ((-1 bold italic dynamic feta 8) . "feta-din8") ((-2 bold italic dynamic feta 7) . "feta-din7") 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.2