From 946c135a338e2daadfed8da3026f0ed9d29bf9ad Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 24 Dec 1997 16:36:50 +0100 Subject: [PATCH] release: 0.1.38 --- AUTHORS.text | 2 +- Documentation/INSTALL.pod | 8 ++++---- INSTALL.text | 26 +++++++++++++------------- NEWS | 10 ++++++---- TODO | 8 +++++++- VERSION | 4 ++-- init/feta16.ly | 4 ++-- init/feta20.ly | 4 ++-- init/table16.ly | 4 +--- input/beams.ly | 4 +--- input/font.ly | 10 ++++++---- lily/VERSION | 2 +- lily/beam.cc | 2 +- lily/dynamic-grav.cc | 14 +++++++------- lily/include/midi-def.hh | 5 ++--- lily/include/staff-side.hh | 4 +--- lily/lookup.cc | 1 + lily/midi-def.cc | 35 +++++++++++++++-------------------- lily/staff-side.cc | 4 ++-- make/lelievijver.lsm | 8 ++++---- make/lilypond.lsm | 8 ++++---- make/lilypond.spec | 6 +++--- mf/TODO | 1 - mf/feta-klef.mf | 5 +++-- mf/feta-nummer.mf | 2 +- mf/feta-nummer10.mf | 2 +- mf/feta-nummer6.mf | 0 mf/feta-schrift.mf | 17 +++++++++++------ tex/feta16.tex | 2 +- tex/feta20.tex | 2 +- 30 files changed, 104 insertions(+), 100 deletions(-) delete mode 100644 mf/feta-nummer6.mf diff --git a/AUTHORS.text b/AUTHORS.text index d3ff5f02c8..7dd8753de2 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -61,6 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS -25/Nov/97 LilyPond 0.1.37 1 +25/Nov/97 LilyPond 0.1.38 1 diff --git a/Documentation/INSTALL.pod b/Documentation/INSTALL.pod index 674ef65a4d..b9580ea831 100644 --- a/Documentation/INSTALL.pod +++ b/Documentation/INSTALL.pod @@ -328,10 +328,10 @@ simply type: bash configure make -Note: If you rely on broken DOS/Windows tools such as pkzip/WinZIP - to unpack the distribution, make sure the B source tree - is unpacked correctly, in particular the empty out directories - (F, F et. al.) +B If you rely on broken DOS/Windows tools such as pkzip/WinZIP +to unpack the distribution, make sure the B source tree +is unpacked correctly, in particular the empty out directories +(F, F et. al.) =head1 AUTHORS diff --git a/INSTALL.text b/INSTALL.text index 4fa1c20dfd..012ed4cf70 100644 --- a/INSTALL.text +++ b/INSTALL.text @@ -61,7 +61,7 @@ RRRRUUUUNNNNNNNNIIIINNNNGGGG -2/Dec/97 LilyPond 0.1.37 1 +24/Dec/97 LilyPond 0.1.38 1 @@ -127,7 +127,7 @@ CCCCOOOONNNNFFFFIIIIGGGGUUUURRRRIIIINNNNGGGG a -2/Dec/97 LilyPond 0.1.37 2 +24/Dec/97 LilyPond 0.1.38 2 @@ -193,7 +193,7 @@ INSTALL(1) LilyPond documentation INSTALL(1) -2/Dec/97 LilyPond 0.1.37 3 +24/Dec/97 LilyPond 0.1.38 3 @@ -259,7 +259,7 @@ IIIINNNNSSSSTTTTAAAALLLLLLLLIIIINNNNGGGG -2/Dec/97 LilyPond 0.1.37 4 +24/Dec/97 LilyPond 0.1.38 4 @@ -325,7 +325,7 @@ RRRREEEEDDDDHHHHAAAATTTT LLLLIIIINNNNUUUUXXXX -2/Dec/97 LilyPond 0.1.37 5 +24/Dec/97 LilyPond 0.1.38 5 @@ -349,13 +349,10 @@ WWWWIIIINNNNDDDDOOOOWWWWSSSS NNNNTTTT////99995 bash configure make - Note: If you rely on broken DOS/Windows tools such as - pkzip/WinZIP - to unpack the distribution, make sure the eeeennnnttttiiiirrrreeee - source tree - is unpacked correctly, in particular the empty out - directories - (_f_l_o_w_e_r_/_o_u_t, _l_i_b_/_o_u_t et. al.) + NNNNooootttteeee If you rely on broken DOS/Windows tools such as + pkzip/WinZIP to unpack the distribution, make sure the + eeeennnnttttiiiirrrreeee source tree is unpacked correctly, in particular + the empty out directories (_f_l_o_w_e_r_/_o_u_t, _l_i_b_/_o_u_t et. al.) AAAAUUUUTTTTHHHHOOOORRRRSSSS Han-Wen Nienhuys @@ -391,6 +388,9 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS -2/Dec/97 LilyPond 0.1.37 6 + + + +24/Dec/97 LilyPond 0.1.38 6 diff --git a/NEWS b/NEWS index 86c0b6b660..650f5ba4db 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +pl 38 + - bf: \> \! \ff (crescendo overlap) + - misc feta-fixes, flageolet sign. + - midi tempo fixes. pl 37.jcn3 - max beam slope "compile time parameterised" and set to 0.6 (oh, how we need runtime generated beams!) @@ -8,11 +12,9 @@ pl 37.jcn3 pl 37.jcn2 - feta: fixed sizes small numerals + flageolet -pl 37.jcn1 - - feta: numerals - - feta: flageolet - - feta: thinner accent +******* +dec 12 pl 37 - --postscript - don't crash non-fitting grouping (thx, John) diff --git a/TODO b/TODO index 4a10ab8b8c..02e8452ce5 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ Features you cannot find in the doco as working, should be mentioned here. - + This is an assorted collection of stuff that will be done, might be done, or is an idea that I want to think about @@ -7,8 +7,14 @@ Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr 0.2: + * -M bug + * unended beam: [c4 + * continued hairpins + + * height of dyns. + * output naming: - default to basename[-serialnumber].{midi,tex} diff --git a/VERSION b/VERSION index b49f45ea53..1cd375d593 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 = jcn3 +TOPLEVEL_PATCH_LEVEL = 38 +TOPLEVEL_MY_PATCH_LEVEL = # 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 f47e804a36..4555b7c646 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 11:21:35 1997 +% Automatically generated on Wed Dec 24 16:38:34 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" 2.13\pt 2.13\pt 2.13\pt 2.13\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 ea735f4cb7..7df6b77078 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 11:21:40 1997 +% Automatically generated on Wed Dec 24 16:38:42 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" 2.67\pt 2.67\pt 2.67\pt 2.67\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/init/table16.ly b/init/table16.ly index 644f0c0ac3..5940ed8b2f 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -17,7 +17,6 @@ table_sixteen= "finger" "\setfinger{%}" 0.0\pt 0.0\pt 0.0\pt 4.0\pt } "dynamics" = \table { - "mf" "\dynmf" "fff" "\dynfff" "ff" "\dynff" @@ -29,7 +28,6 @@ table_sixteen= "fp" "\dynfp" "sf" "\dynsf" "sfz" "\dynsfz" - } "align" = \table { "-1" "\leftalign{%}" @@ -68,7 +66,7 @@ table_sixteen= "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8pt - "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt + "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -2.0\pt 2.0\pt "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt } diff --git a/input/beams.ly b/input/beams.ly index 3dae027c33..6e897a8475 100644 --- a/input/beams.ly +++ b/input/beams.ly @@ -1,15 +1,13 @@ \header{ filename = "beams.ly"; -title = ""; -description = ""; composer = "heu"; enteredby = "jcn"; copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "0.1.7" +\version "0.1.7"; \score{ \melodic \multi 3 < diff --git a/input/font.ly b/input/font.ly index 24803fea49..1ba29f30b2 100644 --- a/input/font.ly +++ b/input/font.ly @@ -26,8 +26,8 @@ TestedFeatures = "This file tests the Feta music-font" a\fp a4.\sf a4.\sfz | % a\fz a\rf [c8 c] [a' a'] [c a'] [a' c] | - [c d e f] [as' ges' f' e'] - [cis' dis' c' des'] [cisis' disis' ceses' deses'] | + [c \< d e f] [as' ges' f' e'] + [cis' dis' c' des'] [cisis' disis' \! ceses' deses'] | \clef "bass"; r1 r2 r4 r8 r16 r32 r64 r128 r128 | \multi 2 < { \stemup r2 r2} {\stemdown c c }> @@ -43,7 +43,7 @@ TestedFeatures = "This file tests the Feta music-font" \textstyle "finger"; c4^"1" d^"2" e^"3" f^"4" g^"5" - % Music for the Martians? + % Music to the Martians! < bes4^"6" e_"7" c_"8" > a^"0"_"9" @@ -69,7 +69,9 @@ TestedFeatures = "This file tests the Feta music-font" [:16 e1 g] %} \meter 1/2; a2 | - \meter 3/2; a1. | + \meter 3/2; < a1. + { s4 \ppp \< s4 \! s4 \fff s4 \> s4 \! s4\ppp} > + | \meter 2/4; a2 | \meter 5/4; a1.. | \meter 6/8; a2. | diff --git a/lily/VERSION b/lily/VERSION index fe8619c0cc..45c0a9da44 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 37 +PATCH_LEVEL = 38 MY_PATCH_LEVEL = diff --git a/lily/beam.cc b/lily/beam.cc index e714950ec6..bde4ae2711 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -420,7 +420,7 @@ Beam::set_stemlens () if (y < MINIMUM_STEMLEN) dy = dy >? (MINIMUM_STEMLEN - y); } - } while (abs (dy) > EPSILON) + } while (abs (dy) > EPSILON); } void diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc index b451af045e..69859a59c3 100644 --- a/lily/dynamic-grav.cc +++ b/lily/dynamic-grav.cc @@ -103,13 +103,6 @@ void Dynamic_engraver::do_pre_move_processing() { Staff_symbol* s_l = get_staff_info().staff_sym_l_; - if (dynamic_p_) - { - - dynamic_p_->add_support (s_l); - typeset_element (dynamic_p_); - dynamic_p_ = 0; - } if (to_end_cresc_p_) { if (dynamic_p_) @@ -120,6 +113,13 @@ Dynamic_engraver::do_pre_move_processing() typeset_element (to_end_cresc_p_); to_end_cresc_p_ = 0; } + if (dynamic_p_) + { + + dynamic_p_->add_support (s_l); + typeset_element (dynamic_p_); + dynamic_p_ = 0; + } } diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh index 964d87f15d..dbdcead0ff 100644 --- a/lily/include/midi-def.hh +++ b/lily/include/midi-def.hh @@ -24,11 +24,10 @@ public: VIRTUAL_COPY_CONS(Midi_def, Music_output_def); DECLARE_MY_RUNTIME_TYPEINFO; - /// duration of whole note - Real whole_seconds_f_; + /// duration of whole note measured in seconds. + Moment whole_in_seconds_mom_; Midi_def(); - Midi_def (Midi_def const& midi_c_r); ~Midi_def(); Real duration_to_seconds_f (Moment); diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh index 131b265186..ffc1e37d9f 100644 --- a/lily/include/staff-side.hh +++ b/lily/include/staff-side.hh @@ -19,12 +19,10 @@ */ class Staff_side : virtual Score_elem { Link_array support_l_arr_; - int staff_size_i_; + Interval support_height() const; - Staff_symbol* staff_sym_l_; Real get_position_f() const; - void read_staff_sym(); public: /** diff --git a/lily/lookup.cc b/lily/lookup.cc index 8fa2679722..319b038bad 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -191,6 +191,7 @@ Lookup::hairpin (Real &wid, bool decresc) const } ret.dim_.x() = Interval (0,wid); + // ret.translate_axis (-ret.dim_[Y_AXIS][DOWN], Y_AXIS); return ret; } diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 7fc60a1d64..1415298439 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -28,13 +28,6 @@ Midi_def::Midi_def() set_tempo (Moment (1, 4), 60); } -Midi_def::Midi_def (Midi_def const& s) - : Music_output_def (s) -{ - whole_seconds_f_ = s.whole_seconds_f_; - outfile_str_ = s.outfile_str_; -} - Midi_def::~Midi_def() { } @@ -43,17 +36,25 @@ Real Midi_def::duration_to_seconds_f (Moment mom) { if (!mom) - return 0; + return 0; - return Moment (whole_seconds_f_) * mom; + return Moment (whole_in_seconds_mom_) * mom; } - int -Midi_def::get_tempo_i (Moment moment) +Midi_def::get_tempo_i (Moment one_beat_mom) +{ + Moment wholes_per_min = Moment(60) /Moment(whole_in_seconds_mom_); + int beats_per_min = wholes_per_min / one_beat_mom; + return int (beats_per_min); +} + +void +Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i) { - return Moment (whole_seconds_f_) * Moment (60) * moment; + Moment beats_per_second = Moment (beats_per_minute_i) / Moment (60); + whole_in_seconds_mom_ = 1/(beats_per_second * one_beat_mom); } void @@ -61,17 +62,11 @@ Midi_def::print() const { #ifndef NPRINT DOUT << "Midi {"; - DOUT << "4/min: " << Real (60) / (whole_seconds_f_ * 4); + DOUT << "4/min: " << Real (60) / (whole_in_seconds_mom_ * 4); DOUT << "out: " << outfile_str_; DOUT << "}\n"; #endif } -void -Midi_def::set_tempo (Moment moment, int count_per_minute_i) -{ - whole_seconds_f_ = Moment (count_per_minute_i) / Moment (60) / moment; -} - -IMPLEMENT_IS_TYPE_B1( Midi_def, Music_output_def); +IMPLEMENT_IS_TYPE_B1(Midi_def, Music_output_def); diff --git a/lily/staff-side.cc b/lily/staff-side.cc index 4099f2eece..980990cf65 100644 --- a/lily/staff-side.cc +++ b/lily/staff-side.cc @@ -16,7 +16,7 @@ Staff_side::Staff_side() { - y_=0; + y_=0; sym_int_ = Interval (0,0); dir_ = CENTER; inside_staff_b_ = false; @@ -59,7 +59,7 @@ Staff_side::get_position_f() const if (!dir_) { warning (_("Staff_side::get_position_i(): " - "somebody forgot to set my vertical direction, returning -20")); + "somebody forgot to set my vertical direction, returning -20")); return -20; } diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 73b14ff867..524589af89 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.37 -Inschrijf datum: 12DEC97 +Versie: 0.1.38 +Inschrijf datum: 24DEC97 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: @@ -16,8 +16,8 @@ Auteur: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 395k lilypond-0.1.37.tar.gz + 395k lilypond-0.1.38.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.37.tar.gz + 395k lilypond-0.1.38.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index c57843175c..cc3aa4563b 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.37 -Entered-date: 12DEC97 +Version: 0.1.38 +Entered-date: 24DEC97 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music @@ -14,8 +14,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 460k lilypond-0.1.37.tar.gz + 460k lilypond-0.1.38.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 460k lilypond-0.1.37.tar.gz + 460k lilypond-0.1.38.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index e738cfb37f..57db1d4144 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.37 +Version: 0.1.38 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.37.tar.gz +Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.38.tar.gz Summary: A program for typesetting music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys @@ -33,7 +33,7 @@ make -C Documentation gifs make prefix="$RPM_BUILD_ROOT/usr" install %files %doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/faq.text Documentation/out/gnu-music.text Documentation/out/index.text Documentation/out/internals.text Documentation/out/language.text Documentation/out/lilypond.text Documentation/out/links.text Documentation/out/literature.text Documentation/out/mi2mu.text Documentation/out/mudela-book.text Documentation/out/mutopia.text Documentation/out/other-packages.text BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/font.ly input/font20.ly input/gallina.ly input/gallina.tex input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/sleur.ly input/slurs.ly input/standchen-16.ly input/standchen-16.tex input/standchen-20.ly input/standchen-20.tex input/standchen.ly input/toccata-fuga-E.ly input/twinkle-pop.ly input/twinkle.ly input/wtk1-fugue1.ly input/wtk1-fugue2.ly input/wtk1-prelude1.ly Documentation/mudela-course.doc Documentation/mudela-man.doc +%doc input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/font.ly input/font20.ly input/gallina.ly input/gallina.tex input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/sleur.ly input/slurs.ly input/standchen-16.ly input/standchen-16.tex input/standchen-20.ly input/standchen-20.tex input/standchen.ly input/stem.ly input/toccata-fuga-E.ly input/twinkle-pop.ly input/twinkle.ly input/wtk1-fugue1.ly input/wtk1-fugue2.ly input/wtk1-prelude1.ly Documentation/mudela-course.doc Documentation/mudela-man.doc %doc Documentation/out/lelie_logo.gif /usr/bin/convert-mudela /usr/bin/mudela-book diff --git a/mf/TODO b/mf/TODO index 73738e3a3a..ffeed55f44 100644 --- a/mf/TODO +++ b/mf/TODO @@ -6,7 +6,6 @@ - lo-res fixes. - work out sizes of character fonts. - more symbols - * some scripts: flageolet * piano pedals, * trills * maxima notehead diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 11ef0c228d..3d78d804f4 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -269,7 +269,7 @@ def draw_gclef (expr exact_center, reduction)= penpos7(thickness, 135); penpos8(1.5 thinnib, - 70 + angle downstroke_dir); - penpos9(1.5 thickness, -80); + penpos9(1.4 thickness, -80); % ugh penpos10(whatever, downstroke_angle + 10); penpos11(thinnib, downstroke_angle + 90); penpos12(thinnib, -90); @@ -278,10 +278,11 @@ def draw_gclef (expr exact_center, reduction)= filldraw z2l{right} .. z3l.. z4l{left} .. z5l{up} .. z7l{up} %.. z8l + .. tension 1.2 .. z9l & z9l .. {downstroke_dir}z10l --- z11l -- z11r --- z10r{- downstroke_dir} .. tension .8 - .. z9r & z9r + .. z9r & z9r{dir (downstroke_angle+ 40)} % ugh %.. z8r .. z7r{down} .. z5r{down} .. z4r{right} .. z3r .. z2r{left} .. diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf index 673cfd6fde..c35ee4c2f2 100644 --- a/mf/feta-nummer.mf +++ b/mf/feta-nummer.mf @@ -143,7 +143,6 @@ fet_beginchar("Numeral 2", "2", "two") z3=(w,thick)+(1/2sqrt(2)*hair)*dir(-135); penpos2(thick,90+alpha); x2-x1=x3-x2; y2=11/16thick/widen; - penlabels(1,2,3); fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(gamma)}z3r ..z3l{dir(180+gamma)}..{dir(180+alpha)}z2l ..{dir(180+beta)}z1l..cycle; @@ -152,6 +151,7 @@ fet_beginchar("Numeral 2", "2", "two") z4r=(w-thin/2,.72h); penpos5(thin,90); z5r=(1/2hair+flare,h); + penlabels(1,2,3,4); penlabels(5,6); save t; t=tense; fill z1l{dir(beta)}..tension t..z4r{up} diff --git a/mf/feta-nummer10.mf b/mf/feta-nummer10.mf index b868088ba4..f3f25459d8 100644 --- a/mf/feta-nummer10.mf +++ b/mf/feta-nummer10.mf @@ -3,7 +3,7 @@ size:=10; -input feta-nummer-generic.mf +input feta-nummer-generic; end. diff --git a/mf/feta-nummer6.mf b/mf/feta-nummer6.mf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 4f1ab3cf63..cec0283fcd 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -502,17 +502,22 @@ fet_endchar; fet_beginchar("Flageolet", "flageolet", "flageolet") save height,width,thickness; - height#=4/15staffsize#/2; + height#=4/15 staffsize#; width#=height#; thickness#=blot_diameter#; define_pixels(height,width,thickness); - set_char_box(-width#,width#,-height#,height#); + set_char_box(width#/2,width#/2,height#/2,height#/2); pickup pencircle scaled thickness; - x1=0; top y1=height; - lft x2=-width; y2=0; - x3=x1; y3=-y1; - x4=-x2; y4=y2; + x1= .5 [x2, x4]; + x1 = 0; + top y1=height/2; + rt x4 - lft x2 =width; + y2 = 0; + y4=y2; + x3=x1; + bot y3=-height/2; + penlabels(1,2,3,4); draw z1..z2..z3..z4..cycle; fet_endchar; diff --git a/tex/feta16.tex b/tex/feta16.tex index de568a52ed..0b1ca72ee4 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 11:21:35 1997 +% Automatically generated on Wed Dec 24 16:38:34 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index 2e5abeb193..1c841fa9b1 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 11:21:40 1997 +% Automatically generated on Wed Dec 24 16:38:42 1997 % Do not edit % input from out/feta20.log % name -- 2.39.2