From 59a1e937a999d581dfaa4ab5c5c6414337721a65 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 23 Oct 1998 08:06:22 +0200 Subject: [PATCH] patch::: 1.0.17.ms1 pl 17.ms1 - added \thumb (used very often in cello music) in mf/feta-schrift.mf. - added /input/test/thumb.ly (example) --- Generated by (address unknown) using package-diff 0.62, From = lilypond-1.0.17, To = lilypond-1.0.17.ms1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.0.17.ms1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.0.17 1.0.17.ms1 ++state --- NEWS | 12 +++++++++++- VERSION | 2 +- init/script.ly | 1 + input/test/thumb.ly | 22 ++++++++++++++++++++++ mf/feta-schrift.mf | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 input/test/thumb.ly diff --git a/NEWS b/NEWS index ede37bf592..dd00141caa 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,14 @@ -pl 17.mb2 +--- ../lilypond-1.0.17/NEWS Tue Oct 20 10:00:46 1998 +++ b/NEWS Fri Oct 23 08:06:22 1998 +@@ -1,3 +1,8 @@ +pl 17.ms1 + - added \thumb (used very often in cello music) in + mf/feta-schrift.mf. + - added /input/test/thumb.ly (example) + + pl 17 + - fixed RPM building. + pl 17.mb2 - Full support for cautionary accidentals. Try input/test/accid.fly Note that the font has changed. diff --git a/VERSION b/VERSION index 330a5ed09c..0532d0aad6 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=17 -MY_PATCH_LEVEL=mb2 +MY_PATCH_LEVEL=ms1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/init/script.ly b/init/script.ly index 2a7cd50bcc..7c96a45122 100644 --- a/init/script.ly +++ b/init/script.ly @@ -3,6 +3,7 @@ % indexstring follow_into_staff same_dir_as_stem above_below_staff symbol_can_beinverted priority } % +thumb = \script { "thumb" 0 0 1 0 0 } accent = \script { "sforzato" 0 -1 0 0 0 } marcato = \script { "marcato" 0 -1 0 1 0 } staccatissimo = \script { "staccatissimo" 0 -1 0 1 0 } diff --git a/input/test/thumb.ly b/input/test/thumb.ly new file mode 100644 index 0000000000..7b4a3a3807 --- /dev/null +++ b/input/test/thumb.ly @@ -0,0 +1,22 @@ +\header{ + title="CELLO-THUMBS"; + enteredby="Maarten Storm"; +} + + +% the thumb-script is used in cello music to indicate a note that should +% be played with your thumb. + +\version "1.0.7"; + +\score { \notes \relative c'' { + <[ a8_\thumb a'8-3(> <)b_\thumb b'-3> + <)d_\thumb d'-3]> + } + \paper{ + linewidth = 80.\mm; + castingalgorithm = \Wordwrap; + } +} + + diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 7257a45277..756c1e20ae 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -58,6 +58,37 @@ fet_beginchar("fermata down", "dfermata", "dfermata") y_mirror_char; fet_endchar; +% +% Thumbs are used in cello music. +% TODO : thumbs should look like the finger-font and should be placed in +% the same way in the score. +% + +fet_beginchar("Thumb", "thumb", "thumb") + save thin, height, width, thick; + height# = 5/4 width#; + height# = interline#; + thin = 1.2 stafflinethickness; + thick = 1.4 thin; + set_char_box(width#/2, width#/2, height#/2, height#/2); + + penpos1(thick, 0); + penpos2(thin, 90); + z1r = (w, 0); + z2r = (0, h); + penlabels(1,2); + penstroke z1e{up} .. {left}z2e; + addto currentpicture also currentpicture xscaled -1; + addto currentpicture also currentpicture yscaled -1; + + pickup pencircle scaled thin; + save x,y; + z3r = (0, -h); + z4 = (0, -2h); + penlabels(3,4); + draw z3r -- z4; +fet_endchar; + % % FIXME: rounded endings @@ -179,6 +210,7 @@ fet_beginchar("marcato down", "dmarcato", "dmarcato") xy_mirror_char; fet_endchar; + % % used in french horn music todo % -- 2.39.5