From 53a25e489914c25ebcc7065c2e0cfdf1f4a0c048 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:03:21 +0000 Subject: [PATCH] lilypond-0.1.32 --- NEWS | 20 ++++++++++++++++++++ TODO | 4 ++-- init/table16.ly | 34 +--------------------------------- init/table20.ly | 20 ++------------------ lily/stem.cc | 10 ++++------ lily/symtable.cc | 5 ++++- mf/TODO | 1 + mf/feta-beams16.mf | 2 +- mf/feta-beams20.mf | 2 +- 9 files changed, 36 insertions(+), 62 deletions(-) diff --git a/NEWS b/NEWS index e3b20155dc..035407973c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,21 @@ +pl 32 + - change type checks (ughugh) to derivation checks (ugh) + - this fixes clef bug. + - bf: order of breakables: meter comes after bar. + - bf: do error iso coredump on unknown symbol-table + - bf: release.py, copy patch too. + - bf: add makefile dep for disting MF logs. + - bf: don't read font-en-tja*.ly, but feta*.ly + +pl 31.jcn2 + - first version of (non-ugh) c-klef + - bf: mi2mu: notes of zero duration as comments + - feta: ugh c clef + + +******** +nov 17 + pl 31 - bf: replaced Score_column assert by a warning (thanks Scott) - bf: mi2mu version output (thanks Scott) @@ -10,6 +28,7 @@ pl 31 ******** nov 11 + pl 30 - feta: G clef. - scripts now do relative coords (fixes lyrics + barnumber bug) @@ -17,6 +36,7 @@ pl 30 - bf: bass clef ******** +nov 6 pl 29 - feta: bass clef, bf: dynamics, bf: 64th flag diff --git a/TODO b/TODO index f99d401dcb..b38448220b 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ grep for TODO and ugh/ugr 0.2: * add a screenshot to the website. + * fix stdin input + * LILYSOURCEDIR * documentation @@ -23,8 +25,6 @@ grep for TODO and ugh/ugr * bf: abbrevs over whole note - * mi2mu: fix a1*0/4 output - STUFF * give Items/Spanners access to unbroken originals diff --git a/init/table16.ly b/init/table16.ly index f95cb2fdcc..506c9f78b8 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -10,21 +10,6 @@ table_sixteen= \texid "\input lilyponddefs \musixsixteendefs" % index TeXstring, xmin xmax ymin ymax - - %{ - "back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "-front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "heel" "\heel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "toe" "\\toe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "bheel" "\bheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "btoe" "\btoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "fheel" "\fheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "ftoe" "\ftoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "-back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "turn" "\\turn" -2.0\pt 7.0\pt 0.0\pt 4.0\pt - %} - "style" = \table { "roman" "\settext{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt @@ -51,27 +36,11 @@ table_sixteen= "1" "\rightalign{%}" } - "clefs" = \table { - "violin" "\violinclef" 0.0\pt 12.8\pt -10.0\pt 18.0\pt - "bass" "\bassclef" -1.0\pt 12.8\pt 0.0\pt 16.0\pt - "alto" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "tenor" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "violin_change" "\cviolinclef" 0.0\pt 11.2\pt -12.0\pt 12.0\pt - "bass_change" "\cbassclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "alto_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "tenor_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - } - "slur" = \table { "whole" "\slurchar%{%}" "half" "\hslurchar%{%}" } - "streepjes" = \table { - "toplines" "\\topledgerlines{%}{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - "botlines" "\\botledgerlines{%}{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - } - "bars" = \table { "empty" "\emptybar" "" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt @@ -94,7 +63,6 @@ table_sixteen= "param" = \table { "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt - "linestaf" "\linestafsym{%}{%}" "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8pt @@ -107,6 +75,6 @@ table_sixteen= "slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt "horizontal" "\rulesym{%}{%}" } - \include "font-en-tja16.ly" + \include "feta16.ly" } diff --git a/init/table20.ly b/init/table20.ly index 305b2c3572..abe4eadecb 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -16,6 +16,7 @@ table_twenty = "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt "dynamic" "\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt } + "dynamics" = \table { "mf" "\dynmf" @@ -38,17 +39,6 @@ table_twenty = } - "clefs" = \table { - "violin" "\violinclef" 0.0\pt 16.0\pt -12.5\pt 22.5\pt - "bass" "\bassclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "alto" "\altoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "tenor" "\altoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "violin_change" "\cviolinclef" 0.0\pt 16.0\pt -12.5\pt 22.5\pt - "bass_change" "\cbassclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "alto_change" "\caltoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "tenor_change" "\caltoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - } - "slur" = \table { "whole" "\slurchar%{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt @@ -56,11 +46,6 @@ table_twenty = } - "streepjes" = \table { - "toplines" "\\topledgerlines{%}{%}" -3.0\pt 9.0\pt 0.0\pt 0.0\pt - "botlines" "\botledgerlines{%}{%}" -3.0\pt 9.0\pt 0.0\pt 0.0\pt - } - "bars" = \table { "empty" "\emptybar" "" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt @@ -82,7 +67,6 @@ table_twenty = "param" = \table { "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt - "linestaf" "\linestafsym{%}{%}" "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8\pt @@ -96,6 +80,6 @@ table_twenty = } % ugh what's our outdir called? - \include "font-en-tja20.ly" + \include "feta20.ly" } diff --git a/lily/stem.cc b/lily/stem.cc index f72d3068ef..814eb6af83 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -28,7 +28,7 @@ Stem::Stem () { /* TODO: staff-size - */ + */ abbrev_flag_i_ = 0; beam_l_ = 0; beams_left_i_ = 0; @@ -190,10 +190,7 @@ Stem::set_default_extents () if (!stem_length_f ()) set_default_stemlen (); - /* set_stemend ((dir_< 0) ? - head_positions()[BIGGER]-stem_length_f (): - head_positions()[SMALLER] + stem_length_f ()); - */ + if (dir_ == UP) stem_xdir_ = RIGHT; if (invisible_b ()) @@ -289,6 +286,7 @@ Stem::abbrev_mol () const Molecule beams; Atom a (paper ()->lookup_l ()->beam (slope, w)); a.translate (Offset(- w / 2, stem_end_f () - (w / 2 * slope))); + // ugh if (!beams_i) a.translate_axis (dy + beamdy - dir_ * dy, Y_AXIS); @@ -305,7 +303,7 @@ Stem::abbrev_mol () const return beams; } -const Real ANGLE = 20* (2.0*M_PI/360.0); +const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! Molecule* Stem::brew_molecule_p () const diff --git a/lily/symtable.cc b/lily/symtable.cc index 16c48dfb5f..d247fa6494 100644 --- a/lily/symtable.cc +++ b/lily/symtable.cc @@ -53,7 +53,10 @@ Symtables::operator()(String s) { if (!elt_b (s)) { - warning ("Symtables `" + s + _("\' unknown")); + error ("Symtable `" + s + _("\' unknown")); + /* + We can't return, because we'll dump core anyway. + */ return 0; } else diff --git a/mf/TODO b/mf/TODO index 8269df3241..c94d227b86 100644 --- a/mf/TODO +++ b/mf/TODO @@ -1,5 +1,6 @@ - design macro for penstroke with rounded endings + - design decent macro for bulbed endings - y-refpoint for rests should be the 4th staffline (gclef: b') - versioning - lo-res fixes. diff --git a/mf/feta-beams16.mf b/mf/feta-beams16.mf index 75d3675ba7..62eff27315 100644 --- a/mf/feta-beams16.mf +++ b/mf/feta-beams16.mf @@ -8,6 +8,6 @@ font_size 16; mode_setup; staffsize#:=16pt#; -input wat-zie-ik; +input feta-watzieik; end. diff --git a/mf/feta-beams20.mf b/mf/feta-beams20.mf index d403140179..0340e3e057 100644 --- a/mf/feta-beams20.mf +++ b/mf/feta-beams20.mf @@ -10,5 +10,5 @@ mode_setup; staffsize#:=20pt#; -input wat-zie-ik; +input feta-watzieik; end. -- 2.39.5