From: Jan Nieuwenhuizen Date: Fri, 27 Nov 1998 15:55:49 +0000 (+0100) Subject: patch::: 1.1.9.jcn1: ptje X-Git-Tag: release/1.1.10~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc9082a408724f100eb54ec80fbb0c8d0decb898;p=lilypond.git patch::: 1.1.9.jcn1: ptje pl 9.jcn1 - bf (urg): no |: at start of piece - bf?: text defs without width - alignment absolute dynamics - mutopia/opus-130.ly (excerpt, triggered by GUIDO) - bf: crescendo symbol --- diff --git a/NEWS b/NEWS index 379b1dd0fb..f62055d1ac 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +pl 9.jcn1 + - bf (urg): no |: at start of piece + - bf?: text defs without width + - alignment absolute dynamics + - mutopia/opus-130.ly (excerpt, triggered by GUIDO) + - bf: crescendo symbol + pl 9 - fixed \relative diff --git a/VERSION b/VERSION index 9dfb847483..60a009dfcf 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=9 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index fbfd95459d..d541958844 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -62,14 +62,15 @@ Dynamic_engraver::do_process_requests() } Text_def * td_p = new Text_def; - td_p->align_dir_ = CENTER; String loud = absd->loudness_str (); td_p->text_str_ = paper ()->lookup_l (0)->dynamic (loud).str_; // ugh td_p->style_str_ = "dynamic"; - - + td_p->align_dir_ = RIGHT; + Real nw_f = paper ()->note_width () * 0.8; dynamic_p_ = new Text_item (td_p); + dynamic_p_->translate (Offset (nw_f, 0)); + announce_element (Score_element_info (dynamic_p_, dreq_l)); } else if (Span_dynamic_req *span_l = dynamic_cast (dreq_l)) diff --git a/lily/lookup.cc b/lily/lookup.cc index 12265840d6..c6ce6f6297 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -441,7 +441,7 @@ Lookup::hairpin (Real width, bool decresc, bool continued) const Atom a; Real height = paper_l_->staffheight_f () / 6; - String hairpin = String (decresc ? "de" : "") + "crescendo\n"; + String hairpin = String (decresc ? "de" : "") + "crescendo"; a.lambda_ = gh_list (ly_symbol (hairpin), gh_double2scm (width), gh_double2scm (height), diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc index 3558b8d05a..2502e60f3e 100644 --- a/lily/repeat-engraver.cc +++ b/lily/repeat-engraver.cc @@ -86,15 +86,16 @@ Repeat_engraver::do_removal_processing () void Repeat_engraver::do_process_requests () { + Moment now = now_moment (); for (int i = bar_p_arr_.size (); i < repeated_music_arr_.size (); i++) { Bar* bar_p = new Bar; bar_p-> type_str_ = "|:"; bar_p_arr_.push (bar_p); - announce_element (Score_element_info (bar_p, repeated_music_arr_[i])); + if (now > Moment (0)) + announce_element (Score_element_info (bar_p, repeated_music_arr_[i])); } #if 0 //urg, try pre-ceating and announcing - Moment now = now_moment (); for (int i = 0; i < bar_p_arr_.size (); i++) { if (!bar_p_arr_[i] && (now >= stop_mom_arr_[i])) @@ -123,15 +124,18 @@ Repeat_engraver::do_process_requests () void Repeat_engraver::do_pre_move_processing () { + Moment now = now_moment (); for (int i = bar_p_arr_.size (); i--; ) { if (bar_p_arr_[i]) { - typeset_element (bar_p_arr_[i]); + if (now > Moment (0)) + typeset_element (bar_p_arr_[i]); + else + delete bar_p_arr_[i]; bar_p_arr_[i] = 0; } } - Moment now = now_moment (); for (int i = volta_p_arr_.size (); i--; ) { if (now >= alternative_stop_mom_arr_[i]) diff --git a/lily/text-item.cc b/lily/text-item.cc index b625254867..1cc4105f69 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -67,9 +67,8 @@ Text_item::brew_molecule_p () const { Atom a (tdef_p_->get_atom (paper (), dir_)); - - if (fat_b_) - a.dim_[X_AXIS] = tdef_p_->width (paper ()); + if (!fat_b_) + a.dim_[X_AXIS] = Interval (0,0); Molecule* mol_p = new Molecule (a); if (dir_<0) // should do something better anyway. diff --git a/mutopia/opus-130.ly b/mutopia/opus-130.ly new file mode 100644 index 0000000000..0f74f1e355 --- /dev/null +++ b/mutopia/opus-130.ly @@ -0,0 +1,71 @@ +\header{ +filename = "opus-130.ly"; +title = "Quartett"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +opus = "130"; +enteredby = "JCN"; +copyright = "public domain"; +} + +% \version "1.0.10"; + +global = \notes { + \key g; + \time 3/8; + \skip 4.*8; +% 1.1.9 broken +% \bar ":|"; +} + +tempi = \notes { + \property Voice.textstyle = "large" + s8^"Allegro assai" +} + +dynamics = \notes { + \type Voice=i + s8\p\< \!s8.\> \!s16 | s4.\p | s8\< s8. \!s16 | s4.\p | + s8\p\< \!s8.\> \!s16 | s4.\p | s8\< s8. \!s16 | s4.\p | +} + +violinei = \notes\relative c''{ + \type Voice=i + [d8(b)d16] r | g,4. | [a16(b c8)e16] r | g,8~fis4 | + [d''8(b)d16] r | g,4. | [a16(b c8)fis,16] r | fis8~g4 | +} + +violineii = \notes\relative c'{ + \type Voice=i + [b8(d)b] | [e(g,)e'] | [e(c)a'] | [a(c)a] | + % copy from violinei: 5-8 + [d8(b)d16] r | g,4. | [a16( b c8)fis,16] r | fis8~g4 | +} + +viola = \notes\relative c'{ + \type Voice=i + \clef "alto"; + [g8(b)g] | [b(e,)b'] | [c,(a')c,] | [c'(d,)c'] | [b(d)b] | + [e(g,)e'] | [e(e,<)a' c,]> | <[a(c,> )b,] | +} + +cello = \notes\relative c'{ + \type Voice=i + \clef "bass"; + g4 r8 | e'4 r8 | c4 r8 | d4 r8 | [g,,8 b g] | [b(e,)b'] | + [c,(a')d,] | [d'(d,)g] | +} + +\score{ + \type StaffGroup < + \type Staff = i < \tempi \global \dynamics \violinei > + \type Staff = ii < \global \dynamics \violineii > + \type Staff = iii < \global \dynamics \viola > + \type Staff = iv < \global \dynamics \cello > + > + \paper{ + \translator { \OrchestralScoreContext } + } + \midi{ \tempo 4 = 160; } +} +