On Monday, 18 January 1999, Mats Bengtsson writes:
> I'm typesetting a score of an unknown orchestral ouverture by
> Gade, and I have to send a nice readable copy to the
> conductor in a couple of weeks. Before that, I'd very
> much appreciate if we could solve the following problems
> in Lilypond.
Goodbye hacking-without-fixing-any-bugs dreams.
> - SkipBars=0 doesn't work. My score contains lots of
I know. Inspired by your grand hacking at multi-bar-rests,
i took a shot to centre them too, and broke SkipBars=0 in
the process. When i couldn't get it fixed whithin an hour,
i moved on to the much more fun interstaff stuff.
> In short, I want the multibar rests to work as they
> used to do before pl 20 but preferably with a nice
> centered rest symbol.
When i looked again this afternoon, it turned-out to be a rather
silly mistake. It'll be fixed in pl23 (or see patch below).
> - Instrument names in the margin. Example:
> input/test/hara-kiri.ly. The text should of course
> be to the left of the staff lines.
>
> - There is a bug in pl 22. Try /input/test/slurs.ly and
> you will find '#.#' instead of real numbers at some
> places in the empedded ps code.
fixed.
> - (Annoying but not a bug:) Slurs that are broken at line
> breaks often extend too far into the margin, both to the
> left and to the right. How do you adjust it?
Do you have an example? I made a fix in pl21, and although
slur placement is still not perfect, its a lot better than
before, see input/test/broken.ly.
> Another problem that is hard to solve quickly is that the
> score takes 2 1/2 hour to process at the moment. 250 bars of
Ouch.
Did you try setting gourlay_maxmeasures to a reasonable minimum?
\paper {
gourlay_maxmeasures = 4.;
..
> 16 voices on 14 staff lines. I should probably invest some more
> memory on my PC. The process uses about 60MB and I only have
> 32 MB physical memory available.
hmm, i'm very sorry to say that lily really likes to have >=50Mb
for these kinds of things...
did you strip the lilypond binary (and kill X etc?).
> Hopefully, I can make the score publicly available when it's
> finished.
I'd very much like to see such a big piece of real music. Why
do you say 'Hopefully'?
Jan.
Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.xs4all.nl/~jantien/lilypond
Generated by [EMAIL PROTECTED] using package-diff 0.62,
>From = lilypond-1.1.22, To = lilypond-1.1.22.jcn2
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.22.jcn2.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.1.22
1.1.22.jcn2
++state
diff -urN ../lilypond-1.1.22/NEWS ./NEWS
--- ../lilypond-1.1.22/NEWS Sat Jan 16 17:57:12 1999
+++ ./NEWS Mon Jan 18 17:13:42 1999
@@ -1,3 +1,12 @@
+pl 22.jcn2
+ - updated mi2mu
+ - bf: multi-measure-rest (input/test/m.ly)
+ - half fix for staff-margin-engraver
+
+pl 22.jcn1
+ - bf's: cross-staff slur
+ - bf: gnossienne-4
+
pl 22
- fixed "already have a Beam" error
diff -urN ../lilypond-1.1.22/TODO ./TODO
--- ../lilypond-1.1.22/TODO Sat Jan 16 17:57:12 1999
+++ ./TODO Mon Jan 18 15:24:14 1999
@@ -62,7 +62,11 @@
* ly2dvi barfs on linewidth = -1.
- * fix midi output.
+ * fix midi output:
+ - default duration? duration must be not entered
+ explicitely on first note.
+
+ * turn slope-damping on/off
* c4 \! \> c4
diff -urN ../lilypond-1.1.22/VERSION ./VERSION
--- ../lilypond-1.1.22/VERSION Sat Jan 16 17:57:12 1999
+++ ./VERSION Mon Jan 18 14:20:44 1999
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=1
PATCH_LEVEL=22
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn2
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -urN ../lilypond-1.1.22/aclocal.m4 ./aclocal.m4
--- ../lilypond-1.1.22/aclocal.m4 Sat Jan 16 17:57:12 1999
+++ ./aclocal.m4 Sun Jan 17 17:32:14 1999
@@ -267,7 +267,7 @@
AC_SUBST(CONFIGSUFFIX)
AC_CANONICAL_HOST
- AC_CHECK_PROGS(MAKE, make gmake, error)
+ AC_CHECK_PROGS(MAKE, gmake make, error)
AC_CHECK_PROGS(FIND, find, error)
dnl system supplied INSTALL is unsafe; use our own install.
@@ -287,7 +287,7 @@
if test "$?" = 1
then
AC_STEPMAKE_WARN(Please install *GNU* make)
- fi
+ fi
fi
AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
diff -urN ../lilypond-1.1.22/input/bugs/beam-translator.ly
./input/bugs/beam-translator.ly
--- ../lilypond-1.1.22/input/bugs/beam-translator.ly Thu Jan 1 01:00:00 1970
+++ ./input/bugs/beam-translator.ly Sun Jan 17 14:43:53 1999
@@ -0,0 +1,25 @@
+\score{
+ \type GrandStaff <
+ \type Staff=one \notes\relative c'{
+ s1
+ }
+ \type Staff=two \notes\relative c'{
+ \clef bass;
+ s2
+ \translator Staff=one \stemup [c8 c c c ]
+ % the translator switch below, intended for the next beam,
+ % affects (and breaks) the beam above
+ \translator Staff=two
+ }
+ >
+ \paper{
+ % no slur damping
+ slur_slope_damping = 10.0;
+ \translator{
+ \GrandStaffContext
+ minVerticalAlign = 3.0*\staffheight;
+ maxVerticalAlign = 3.0*\staffheight;
+ }
+ linewidth=-1.;
+ }
+}
diff -urN ../lilypond-1.1.22/input/test/multi-rest.ly ./input/test/multi-rest.ly
--- ../lilypond-1.1.22/input/test/multi-rest.ly Mon Dec 14 17:19:29 1998
+++ ./input/test/multi-rest.ly Mon Jan 18 17:15:59 1999
@@ -1,6 +1,6 @@
\version "1.0.14";
-voice_one = \notes\transpose c' { \stemup
+voice_one = \notes\transpose c''{ \stemup
R1 * 2 | f'4-. r r2 | R1 * 3 |
f'4-. r r2 | R1 * 3 |
es'4-. r r2 | r1 |
@@ -11,7 +11,7 @@
}
voice_two = \notes
- { \transpose c, { \stemdown
+ { \transpose c' { \stemdown
R1 * 2 | f'4-. r r2 | R1 * 3 |
f'4-. r r2 | R1 * 3 |
es'4-. r r2 | r1 |
diff -urN ../lilypond-1.1.22/input/test/slur-interstaff.ly
./input/test/slur-interstaff.ly
--- ../lilypond-1.1.22/input/test/slur-interstaff.ly Sat Jan 16 17:57:12 1999
+++ ./input/test/slur-interstaff.ly Sun Jan 17 13:36:52 1999
@@ -13,8 +13,10 @@
\translator Staff=two
\stemup c4( \translator Staff=one c \break c )c
r2
- r1
- r1
+% \stemdown c4( \translator Staff=two c c \translator Staff=one )c
+ \stemdown d4( \translator Staff=two c c \translator Staff=one )d
+ \translator Staff=two
+ \stemup c4( \translator Staff=one c c \translator Staff=two )c
r1
}
\type Staff=two \notes\relative c'{
diff -urN ../lilypond-1.1.22/lily/bow.cc ./lily/bow.cc
--- ../lilypond-1.1.22/lily/bow.cc Tue Jan 12 18:38:16 1999
+++ ./lily/bow.cc Sat Jan 16 18:44:57 1999
@@ -88,6 +88,7 @@
Real y = c[i][Y_AXIS];
iv.unite (Interval (y,y));
}
+ iv -= interstaff_f_;
return iv;
}
diff -urN ../lilypond-1.1.22/lily/clef-engraver.cc ./lily/clef-engraver.cc
--- ../lilypond-1.1.22/lily/clef-engraver.cc Mon Jan 4 21:07:36 1999
+++ ./lily/clef-engraver.cc Sun Jan 17 13:55:53 1999
@@ -150,7 +150,8 @@
{
if (Note_head * h = dynamic_cast<Note_head*>(it_l))
{
- h->position_i_ += c0_position_i_;
+ // h->position_i_ += c0_position_i_;
+ h->position_i_ = h->steps_i_ + c0_position_i_;
}
else if (Local_key_item *i = dynamic_cast<Local_key_item*> (it_l))
{
diff -urN ../lilypond-1.1.22/lily/encompass-info.cc ./lily/encompass-info.cc
--- ../lilypond-1.1.22/lily/encompass-info.cc Sat Jan 16 17:57:12 1999
+++ ./lily/encompass-info.cc Mon Jan 18 16:15:44 1999
@@ -14,6 +14,7 @@
#include "encompass-info.hh"
#include "slur.hh"
#include "staff-sym.hh"
+#include "note-head.hh"
#include "debug.hh"
Encompass_info::Encompass_info ()
@@ -23,6 +24,8 @@
Encompass_info::Encompass_info (Note_column const* note, Direction dir)
{
+ interstaff_f_ = 0;
+
Paper_def* paper = note->paper ();
Real interline = paper->interline_f ();
// UGH
@@ -57,25 +60,31 @@
if (stem_l->dir_ != dir)
o_.y () += 1.0 * internote * dir;
- Slur* slur_l_ = stem_l->slur_l_;
- if (slur_l_->encompass_arr_.size ()
- && stem_l->staff_sym_l_ != slur_l_->encompass_arr_[0]->stem_l_->staff_sym_l_)
+ Slur* slur_l = stem_l->slur_l_;
+ if (slur_l->encompass_arr_.size ()
+ && stem_l->staff_sym_l_ != slur_l->encompass_arr_[0]->stem_l_->staff_sym_l_)
{
+#if 0 // this is nonsense..., don't issue warning
if (stem_l->staff_sym_l_->dim_cache_[Y_AXIS].valid_b ())
{
interstaff_f_ = stem_l->staff_sym_l_->absolute_coordinate (Y_AXIS)
- - slur_l_->encompass_arr_[0]->stem_l_->staff_sym_l_->absolute_coordinate
(Y_AXIS);
+ - slur_l->encompass_arr_[0]->stem_l_->staff_sym_l_->absolute_coordinate
+(Y_AXIS);
}
else
+#endif
{
- warning (_ ("invalid dimension cache: guessing staff position"));
- if (slur_l_->vertical_align_drul_[MIN] !=
- slur_l_->vertical_align_drul_[MAX])
+ // warning (_ ("invalid dimension cache: guessing staff position"));
+ if (slur_l->vertical_align_drul_[MIN] !=
+ slur_l->vertical_align_drul_[MAX])
warning (_ ("minVerticalAlign != maxVerticalAlign: interstaff slurs may be
broken"));
- interstaff_f_ = slur_l_->vertical_align_drul_[MIN];
- // urg, guess staff order:
- // if our stem ends higher, our staff is probably lower...
- if (stem_l->chord_start_f () >
slur_l_->encompass_arr_[0]->stem_l_->chord_start_f ())
+ interstaff_f_ = slur_l->vertical_align_drul_[MIN];
+ /* urg, guess staff order */
+ int d = note->head_l_arr_.top ()->steps_i_
+ - slur_l->encompass_arr_[0]->head_l_arr_[0]->steps_i_;
+ if (abs (d > 3))
+ interstaff_f_ *= sign (d);
+ else if (stem_l->chord_start_f () >
+ slur_l->encompass_arr_[0]->stem_l_->chord_start_f ())
interstaff_f_ *= -1;
}
o_.y () += interstaff_f_;
diff -urN ../lilypond-1.1.22/lily/heads-engraver.cc ./lily/heads-engraver.cc
--- ../lilypond-1.1.22/lily/heads-engraver.cc Mon Nov 16 23:53:57 1998
+++ ./lily/heads-engraver.cc Sun Jan 17 13:55:10 1999
@@ -46,7 +46,8 @@
dot_p_arr_.push (d);
}
- note_p->position_i_ = note_req_l->pitch_.steps ();
+ note_p->steps_i_ = note_req_l->pitch_.steps ();
+ // note_p->position_i_ = note_req_l->pitch_.steps ();
Score_element_info itinf (note_p,note_req_l);
diff -urN ../lilypond-1.1.22/lily/include/note-head.hh ./lily/include/note-head.hh
--- ../lilypond-1.1.22/lily/include/note-head.hh Mon Jan 4 21:07:36 1999
+++ ./lily/include/note-head.hh Sun Jan 17 13:54:02 1999
@@ -18,8 +18,11 @@
class Note_head : public Rhythmic_head {
public:
-
+ /// position of top line (5 linestaff: 8)
int position_i_;
+
+ /// pitch in steps
+ int steps_i_;
/// -1 = lowest, 0 = inside, 1 = top
int extremal_i_;
@@ -28,9 +31,6 @@
int staff_size_i_;
Direction x_dir_;
- /**
- position of top line (5 linestaff: 8)
- */
Note_head ();
static int compare (Note_head * const &a, Note_head *const &b) ;
diff -urN ../lilypond-1.1.22/lily/multi-measure-rest-engraver.cc
./lily/multi-measure-rest-engraver.cc
--- ../lilypond-1.1.22/lily/multi-measure-rest-engraver.cc Mon Jan 11 14:45:51
1999
+++ ./lily/multi-measure-rest-engraver.cc Mon Jan 18 15:01:28 1999
@@ -68,7 +68,6 @@
{
Time_description const *time = get_staff_info().time_C_;
mmrest_p_ = new Multi_measure_rest;
- // rest_item_creation_mom_ = time->when_mom ();
announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_));
start_measure_i_ = time->bars_i_;
}
@@ -78,13 +77,13 @@
Multi_measure_rest_engraver::do_pre_move_processing ()
{
Moment now (now_moment ());
- //urg lily dumps core if i want to let her print all (SkipBars=0) rests...
-#if 0
if (mmrest_p_ && (now >= rest_start_mom_) && (mmrest_p_->column_arr_.size () >= 2))
{
typeset_element (mmrest_p_);
+ /*
+ must keep mmrest_p_ around to set measures_i_
+ */
}
-#endif
if (lastrest_p_)
{
typeset_element (lastrest_p_);
@@ -98,21 +97,15 @@
Time_description const *time = get_staff_info().time_C_;
Moment now (now_moment ());
- /*
- when our time's up, calculate the number of bars rest and
- make way for new request
- however, linger around a bit to catch this last column when
- its announced
- */
- if (mmrest_p_ && (now >= rest_stop_mom_)) //&& (!time->whole_in_measure_))
+ if (mmrest_p_)
{
lastrest_p_ = mmrest_p_;
lastrest_p_->measures_i_ = time->bars_i_ - start_measure_i_;
- //urg lily dumps core if i want to let her print all (SkipBars=0) rests...
-#if 0
- if (lastrest_p_->column_arr_.size () >= 2)
- lastrest_p_ = 0;
-#endif
+ mmrest_p_ = 0;
+ }
+
+ if (now >= rest_stop_mom_)
+ {
multi_measure_req_l_ = 0;
mmrest_p_ = 0;
}
diff -urN ../lilypond-1.1.22/lily/note-head.cc ./lily/note-head.cc
--- ../lilypond-1.1.22/lily/note-head.cc Mon Jan 4 21:07:36 1999
+++ ./lily/note-head.cc Sun Jan 17 13:57:47 1999
@@ -20,6 +20,7 @@
{
x_dir_ = CENTER;
staff_size_i_= 8; // UGH
+ steps_i_ = 0;
position_i_ = 0;
extremal_i_ = 0;
}
diff -urN ../lilypond-1.1.22/lily/staff-margin-engraver.cc
./lily/staff-margin-engraver.cc
--- ../lilypond-1.1.22/lily/staff-margin-engraver.cc Mon Jan 4 21:07:37 1999
+++ ./lily/staff-margin-engraver.cc Mon Jan 18 14:31:20 1999
@@ -62,8 +62,7 @@
Text_def *td_p =new Text_def;
td_p->align_dir_ = LEFT;
td_p->text_str_ = string;
- // huh?
- script_p_->dir_ = RIGHT;
+ script_p_->dir_ = LEFT;
script_p_->specs_p_ = td_p;
script_p_->breakable_b_ = true;
diff -urN ../lilypond-1.1.22/lily/stem-info.cc ./lily/stem-info.cc
--- ../lilypond-1.1.22/lily/stem-info.cc Tue Jan 12 18:38:16 1999
+++ ./lily/stem-info.cc Mon Jan 18 16:15:23 1999
@@ -108,14 +108,16 @@
if (beam_l_->sinfo_.size ()
&& stem_l_->staff_sym_l_ != beam_l_->sinfo_[0].stem_l_->staff_sym_l_)
{
+#if 0 // this is nonsense..., don't issue warning
if (stem_l_->staff_sym_l_->dim_cache_[Y_AXIS].valid_b ())
{
interstaff_f_ = stem_l_->staff_sym_l_->absolute_coordinate (Y_AXIS)
- beam_l_->sinfo_[0].stem_l_->staff_sym_l_->absolute_coordinate (Y_AXIS) /
internote_f;
}
else
+#endif
{
- warning (_ ("invalid dimension cache: guessing staff position"));
+ // warning (_ ("invalid dimension cache: guessing staff position"));
if (beam_l_->vertical_align_drul_[MIN] !=
beam_l_->vertical_align_drul_[MAX])
warning (_ ("minVerticalAlign != maxVerticalAlign: interstaff slurs may be
broken"));
diff -urN ../lilypond-1.1.22/mi2mu/mudela-item.cc ./mi2mu/mudela-item.cc
--- ../lilypond-1.1.22/mi2mu/mudela-item.cc Mon Jan 4 21:07:37 1999
+++ ./mi2mu/mudela-item.cc Mon Jan 18 15:35:46 1999
@@ -202,10 +202,12 @@
//ugh
if (dur.plet_b ())
- str += String ("\\[")
+ str += String ("\\times ")
+ String_convert::i2dec_str (dur.plet_.iso_i_, 0, 0)
+ "/"
- + String_convert::i2dec_str (dur.plet_.type_i_, 0, 0);
+ + String_convert::i2dec_str (dur.plet_.type_i_, 0, 0)
+ + " { ";
+
str += name_str;
@@ -214,7 +216,7 @@
str += Duration_convert::dur2_str (tmp);
if (dur.plet_b ())
- str += String (" \\]");
+ str += String (" }");
/*
note of zero duration is nonsense,
diff -urN ../lilypond-1.1.22/mi2mu/mudela-stream.cc ./mi2mu/mudela-stream.cc
--- ../lilypond-1.1.22/mi2mu/mudela-stream.cc Tue Sep 15 19:22:43 1998
+++ ./mi2mu/mudela-stream.cc Mon Jan 18 15:26:56 1999
@@ -92,7 +92,7 @@
*os_p_ << filename_str_g;
*os_p_ << "\n\n";
// ugh
- *os_p_ << "\\version \"1.0.2\";\n";
+ *os_p_ << "\\version \"1.0.14\";\n";
}
void
diff -urN ../lilypond-1.1.22/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
./mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
--- ../lilypond-1.1.22/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly Sat Jan 16
17:57:12 1999
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly Sun Jan 17 14:44:25 1999
@@ -68,7 +68,8 @@
[)d c'-5( f,-3 e-2] [d-1 b'-5 f-3 d-2] |
[)c b'-5( e,-3 d-2] [c-1 a'-5 e-3 c-2]
[)b-1 a'-5( d,-3 c-2] [b-1 g'-5 d-3 b-2] |
- [)a g'-5 c,-4 b] [a-"poco a poco dim." fis'-5 c-2 a-1]
+% [)a g'-5 c,-4 b] [a-"poco a poco dim." fis'-5 c-2 a-1]
+ [)a g'-5 c,-4 b] [a fis'-5 c-2 a-1]
[b-2 f' d-4 c] [b f' d-4 b-2] |
[g e' c-3 b] [a e'-5 c-3 a-1]
[fis-2 d' b-3 a] [g-1 d'-5 b-4 g-2] |
diff -urN ../lilypond-1.1.22/mutopia/gnossienne-4.ly ./mutopia/gnossienne-4.ly
--- ../lilypond-1.1.22/mutopia/gnossienne-4.ly Sat Jan 16 17:57:12 1999
+++ ./mutopia/gnossienne-4.ly Mon Jan 18 17:06:53 1999
@@ -24,45 +24,46 @@
\bar ".|";
}
-upper = \type Voice=one \notes \relative c''{
+upper = \type Staff=treble \notes\relative c''{
\clef violin;
\stemup
+ \type Voice=one
r2 r r
- r2 r r
- r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
+ r2 r r
+ r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
% grace hack
- [es8 { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } )c*15/16] r4 r2 r
+ < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
r2 r r
- r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
- [es8 { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } )c*15/16] r4 r2 r
+ r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
+ < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis]
- )d4 \tiny fis8*1/16 ~ \normalsize gis4*31/32 ~ gis8 r r4 r2
+ )d4 \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ gis8 r r4 r2
r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis]
- )d4 \tiny fis8*1/16 ~ \normalsize gis4*31/32 ~ gis8 r r4 r2
- \tiny a8*1/16 ~ \normalsize f4*31/32 ~ f8 r r2 r
- r2 r4 [a8( b][c d c b] \tiny b8*1/16 ~ \normalsize [e8*15/16
- { \type Voice=urgnobeam \tiny a,8*1/16 ~ \normalsize } )g8*15/16] r4 r2 r
+ )d4 \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ gis8 r r4 r2
+ \tiny a8*1/2 ~ \normalsize f4*3/4 ~ f8 r r2 r
+ r2 r4 [a8( b][c d c b] \tiny b8*1/2 ~ \normalsize
+ < { [e8*1/2 )g,8] } \type Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r
r2 r4 [a8( b][c d c b] [a b c d][c b a b][c d c b]
- \tiny b8*1/16 ~ \normalsize [e8*15/16
- { \type Voice=urgnobeam \tiny a,8*1/16 ~ \normalsize } )g8*15/16] r4 r2 r
- a2( \tiny e'8*1/16 ~ \normalsize f4*31/32 ~ )f8 r r2
+ \tiny b8*1/2 ~ \normalsize
+ < { [e8*1/2 )g,8] } \type Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r
+ a2( \tiny e'8*1/2 ~ \normalsize f4*3/4 ~ )f8 r r2
r2 r r
- fis,4( \tiny dis8*1/16 \normalsize <)cis4*31/32 ais> r2 r
- \tiny b'8*1/16 ~ \normalsize [a8*15/16
- { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } a8*15/16] r4 r2 r
- r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
- [es8 { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } )c*15/16] r4 r2 r
- d,4( \tiny fis8*1/16 ~ \normalsize gis4*31/32 ~ )gis8 r r4 r2
+ fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r
+ \tiny b'8*1/2 ~ \normalsize
+ < { [a8*1/2 a8] } \type Voice=x { \stemup s8*1/4 \tiny b8*1/2 ~ } > r4 r2 r
+ r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
+ < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
+ d,4( \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ )gis8 r r4 r2
f4 ~ f8 r r2 r
[f'8( g a b][a g f g][a b a g]
- \tiny f8*1/16 ~ \normalsize [g8*15/16
- { \type Voice=urgnobeam \tiny d8*1/16 ~ \normalsize } )e8*15/16] r4 r2 r
+ \tiny f8*1/2 ~ \normalsize
+ < { [g8*1/2 )e8] } \type Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r
[f8( g a b][a g f g][a b a g]
- \tiny f8*1/16 ~ \normalsize [g8*15/16
- { \type Voice=urgnobeam \tiny d8*1/16 ~ \normalsize } )e8*15/16] r4 r2 r
- a,2( \tiny e'8*1/16 ~ \normalsize f4*31/32 ~ )f8 r r2
+ \tiny f8*1/2 ~ \normalsize
+ < { [g8*1/2 )e8] } \type Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r
+ a,2( \tiny e'8*1/2 ~ \normalsize f4*3/4 ~ )f8 r r2
r2 r r
- fis,4( \tiny dis8*1/16 \normalsize <)cis4*31/32 ais> r2 r
+ fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r
<e1 g b e> ~ <e g b e>
}
@@ -135,7 +136,7 @@
textheight = 295.\mm;
% no slur damping
- slur_slope_damping = 10.0;
+ slur_slope_damping = 100.0;
%hmm
% \translator { \BarNumberingScoreContext }
@@ -147,7 +148,8 @@
minVerticalAlign = 3.0*\staffheight;
maxVerticalAlign = 3.0*\staffheight;
% don't display bars?
- barAlways = 0.;
+ % hmm, this switches something else...
+ % barAlways = 0.;
}
\translator{
\StaffContext
diff -urN ../lilypond-1.1.22/stepmake/VERSION ./stepmake/VERSION
--- ../lilypond-1.1.22/stepmake/VERSION Sat Jan 16 17:57:12 1999
+++ ./stepmake/VERSION Sun Jan 17 17:26:06 1999
@@ -1,7 +1,7 @@
PACKAGE_NAME=StepMake
MAJOR_VERSION=0
MINOR_VERSION=1
-PATCH_LEVEL=66
+PATCH_LEVEL=67
MY_PATCH_LEVEL=
# use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.1.22/stepmake/aclocal.m4 ./stepmake/aclocal.m4
--- ../lilypond-1.1.22/stepmake/aclocal.m4 Sat Jan 16 17:57:12 1999
+++ ./stepmake/aclocal.m4 Sun Jan 17 17:32:01 1999
@@ -265,7 +265,7 @@
AC_SUBST(CONFIGSUFFIX)
AC_CANONICAL_HOST
- AC_CHECK_PROGS(MAKE, make gmake, error)
+ AC_CHECK_PROGS(MAKE, gmake make, error)
AC_CHECK_PROGS(FIND, find, error)
dnl system supplied INSTALL is unsafe; use our own install.
@@ -285,7 +285,7 @@
if test "$?" = 1
then
AC_STEPMAKE_WARN(Please install *GNU* make)
- fi
+ fi
fi
AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
