[EMAIL PROTECTED] writes:
> Well, I am nearing a big performance of a composition of mine on the
> 25th. It has been notated in lilypond, of course. I am about to hand
[..]
> appears to my eye, on my score.
If you want to use .38 with working barnumbers, you probably want this
patch as well:
Generated by [EMAIL PROTECTED] using package-diff 0.62,
>From = lilypond-1.1.38, To = lilypond-1.1.38.uu1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.38.uu1.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.38
1.1.38.uu1
++state
diff -urN ../lilypond-1.1.38/NEWS ./NEWS
--- ../lilypond-1.1.38/NEWS Tue Apr 6 10:26:06 1999
+++ ./NEWS Tue Apr 6 16:34:50 1999
@@ -1,3 +1,9 @@
+pl 38.uu1
+ - bf: clef_8
+ - bf: barnumbers.
+
+********
+pl 38 (april 6)
pl 37.script2
- bf: AFM for BlueSky AFM files.
- \penalty = 4278 -> \penalty 4278
diff -urN ../lilypond-1.1.38/TODO ./TODO
--- ../lilypond-1.1.38/TODO Tue Apr 6 11:12:03 1999
+++ ./TODO Tue Apr 6 11:50:32 1999
@@ -80,6 +80,7 @@
present, they're not properly distinguished) but no distinct way to
specify the third. Should there be?
. * spacing of mmrests.
+. * mem leak: redo p-score object deletion.
.* Cleanups needed
. * Beam
diff -urN ../lilypond-1.1.38/VERSION ./VERSION
--- ../lilypond-1.1.38/VERSION Tue Apr 6 10:56:55 1999
+++ ./VERSION Tue Apr 6 16:13:38 1999
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=1
PATCH_LEVEL=38
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -urN ../lilypond-1.1.38/lily/bar-script-engraver.cc ./lily/bar-script-engraver.cc
--- ../lilypond-1.1.38/lily/bar-script-engraver.cc Mon Mar 22 13:26:32 1999
+++ ./lily/bar-script-engraver.cc Tue Apr 6 16:50:03 1999
@@ -13,6 +13,7 @@
#include "g-staff-side.hh"
#include "g-text-item.hh"
#include "lily-guile.hh"
+#include "p-col.hh"
Bar_script_engraver::Bar_script_engraver ()
{
@@ -46,7 +47,12 @@
= &i->dim_cache_[axis_];
staff_side_p_->add_support (i);
- i->add_dependency (staff_side_p_); // UGH.
+
+ /*
+ How do we make sure that staff_side_p_ has a dependency from
+ someone else? We can't use i for that,
+ */
+ get_staff_info ().command_pcol_l ()->add_dependency (staff_side_p_);
}
}
diff -urN ../lilypond-1.1.38/lily/bar.cc ./lily/bar.cc
--- ../lilypond-1.1.38/lily/bar.cc Thu Mar 25 15:39:33 1999
+++ ./lily/bar.cc Tue Apr 6 16:29:05 1999
@@ -24,7 +24,12 @@
Bar::do_print () const
{
#ifndef NPRINT
- // DOUT << type_str_; "{[" confuse indenter.
+ String s = type_str_;
+ if (s == "{")
+ s = "brace";
+ if (s == "[")
+ s = "bracket";
+ DOUT << "type = " << s;
#endif
}
diff -urN ../lilypond-1.1.38/lily/clef-item.cc ./lily/clef-item.cc
--- ../lilypond-1.1.38/lily/clef-item.cc Tue Apr 6 10:25:13 1999
+++ ./lily/clef-item.cc Tue Apr 6 16:13:13 1999
@@ -63,8 +63,11 @@
Real r = do_height ()[d] + g->extent (Y_AXIS)[-d];
g->dim_cache_[Y_AXIS].set_offset (r);
- g->set_elt_property (visibility_lambda_scm_sym,
- get_elt_property (visibility_lambda_scm_sym));
+
+ SCM my_vis = get_elt_property (visibility_lambda_scm_sym);
+ if (my_vis != SCM_BOOL_F)
+ g->set_elt_property (visibility_lambda_scm_sym, SCM_CDR (my_vis));
+
}
}
diff -urN ../lilypond-1.1.38/lily/include/staff-info.hh ./lily/include/staff-info.hh
--- ../lilypond-1.1.38/lily/include/staff-info.hh Mon Mar 15 11:56:03 1999
+++ ./lily/include/staff-info.hh Tue Apr 6 16:52:16 1999
@@ -17,14 +17,14 @@
JUNKME.
*/
struct Staff_info {
- Time_description const *time_C_;
- Rhythmic_grouping const *rhythmic_C_;
- Score_column *musical_l_;
- Score_column *command_l_;
+ Time_description const *time_C_;
+ Rhythmic_grouping const *rhythmic_C_;
+ Score_column *musical_l_;
+ Score_column *command_l_;
- Paper_column * command_pcol_l();
- Paper_column * musical_pcol_l();
- Staff_info();
+ Paper_column * command_pcol_l();
+ Paper_column * musical_pcol_l();
+ Staff_info();
};
#endif // STAFF_INFO_HH
diff -urN ../lilypond-1.1.38/lily/p-score.cc ./lily/p-score.cc
--- ../lilypond-1.1.38/lily/p-score.cc Tue Apr 6 10:22:41 1999
+++ ./lily/p-score.cc Tue Apr 6 16:58:11 1999
@@ -41,10 +41,10 @@
Paper_score::~Paper_score ()
{
- /* for (int i=0; i < span_p_arr_.size (); i++)
+ for (int i=0; i < span_p_arr_.size (); i++)
delete span_p_arr_[i];
for (int i=0; i < elem_p_arr_.size (); i++)
- delete elem_p_arr_[i];*/
+ delete elem_p_arr_[i];
}
void
@@ -160,6 +160,9 @@
else if (dynamic_cast<Spanner*>(e))
type_stats["Spanner"] ++;
type_stats["Total"] ++;
+ /*
+ */
+
// delete e; //TODO!
}
--
Han-Wen Nienhuys, [EMAIL PROTECTED] ** GNU LilyPond - The Music Typesetter
http://www.cs.uu.nl/people/hanwen/lilypond/index.html
