---- ../lilypond-1.1.31/NEWS Wed Feb 17 10:39:09 1999
+--- ../lilypond-1.1.31.jcn2/NEWS Wed Feb 17 17:03:12 1999
+++ b/NEWS Sun Feb 21 14:29:39 1999
+@@ -1,3 +1,8 @@
+pl 31.jcn3
+ - sm 71, require yodl-1.31.11
+ - fix: slur macros
+ - bf: info in rpm, if available
+
+ pl 31.jcn2
+ - fix: rat != float
+ --- ../lilypond-1.1.31/NEWS Wed Feb 17 10:39:09 1999
++ b/NEWS Fri Feb 19 03:00:33 1999
@@ -1,3 +1,11 @@
pl 31.mb1
MAJOR_VERSION=1
MINOR_VERSION=1
PATCH_LEVEL=31
-MY_PATCH_LEVEL=mb1
+MY_PATCH_LEVEL=jcn3
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
])
AC_DEFUN(AC_STEPMAKE_MAN, [
+ AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff)
AC_CHECK_PROGS(TROFF, troff, -echo no troff)
AC_CHECK_PROGS(TBL, tbl, cat)
])
return Item::left_right_compare (n1, n2);
}
+static bool
+broken_edge_b (Slur*s, Drul_array<Note_column*>& extrema, Direction dir)
+{
+ return extrema[dir] != s->spanned_drul_[dir];
+}
+
+static bool
+normal_edge_b (Slur*s, Drul_array<Note_column*>& extrema, Direction dir)
+{
+ return !broken_edge_b (s, extrema, dir)
+ && extrema[dir]->stem_l_
+ && !extrema[dir]->stem_l_->transparent_b_
+ && extrema[dir]->head_l_arr_.size ();
+}
+
void
Slur::do_post_processing ()
{
Direction d=LEFT;
-#define BROKEN_SLUR_b(dir) \
- (extrema[dir] != spanned_drul_[d])
-#define NORMAL_SLUR_b(dir) \
- (extrema[dir]->stem_l_ \
- && !extrema[dir]->stem_l_->transparent_b_ \
- && extrema[dir]->head_l_arr_.size ())
-
do
{
- if (BROKEN_SLUR_b (d))
+ if (broken_edge_b (this, extrema, d))
{
// ugh -- check if needed
dx_f_drul_[d] = -d
/*
normal slur
*/
- else if (NORMAL_SLUR_b (d))
+ else if (normal_edge_b (this, extrema, d))
{
Real notewidth_f = extrema[d]->extent (X_AXIS).length ();
dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_-> extent (Y_AXIS)[dir_]);
// now that both are set, do dependent
do
{
- if (BROKEN_SLUR_b (d))
+ if (broken_edge_b (this, extrema, d))
{
Direction u = d;
flip(&u);
/*
Slur should follow line of music
*/
- if (!BROKEN_SLUR_b (LEFT) && !BROKEN_SLUR_b (RIGHT)
- && NORMAL_SLUR_b (LEFT) && NORMAL_SLUR_b (RIGHT)
+ if (normal_edge_b (this, extrema, LEFT)
+ && normal_edge_b (this, extrema, RIGHT)
&& (extrema[LEFT]->stem_l_ != extrema[RIGHT]->stem_l_))
{
Real note_dy = extrema[RIGHT]->stem_l_->head_positions ()[dir_]
strip lily/out/lilypond mi2mu/out/mi2mu
make prefix="$RPM_BUILD_ROOT/usr" install
+gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
-%files
+%post
+
+touch /tmp/.lilypond-install
+rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
+/sbin/install-info /usr/info/lilypond.info.gz /usr/info/dir || true
+
+%preun
+if [ $1 = 0 ]; then
+ /sbin/install-info --delete /usr/info/lilypond.info.gz /usr/info/dir || true
+fi
+
+%files
%doc htmldocs/
# hairy to hook it in (possibly non-existing) emacs
/usr/bin/ly2dvi
/usr/bin/lilypond
/usr/bin/mi2mu
+/usr/info/*
/usr/man/man1/mi2mu.1
/usr/man/man1/lilypond.1
/usr/man/man1/mudela-book.1
/usr/share/locale/*/LC_MESSAGES/lilypond.mo
/etc/profile.d/lilypond.*
-%post
-
-touch /tmp/.lilypond-install
-rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
+pl 71
+ - bf: c-tags
+ - yodl: groff, ditroff
+
pl 70
- GUILE config fixes (AF)
PACKAGE_NAME=StepMake
MAJOR_VERSION=0
MINOR_VERSION=1
-PATCH_LEVEL=70
+PATCH_LEVEL=71
MY_PATCH_LEVEL=
# use the above to send patches, always empty for released version:
])
AC_DEFUN(AC_STEPMAKE_MAN, [
+ AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff)
AC_CHECK_PROGS(TROFF, troff, -echo no troff)
AC_CHECK_PROGS(TBL, tbl, cat)
])
O_FILES+=$(addprefix $(outdir)/, $(Y_FILES:.y=.o) $(C_FILES:.c=.o) $(L_FILES:.l=.o))
-TAGS_FILES += C_FILES H_FILES
+TAGS_FILES += $(C_FILES) $(H_FILES)
# C/C++
#
$(outdir)/%.txt: %.yo
# $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
- $(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< | $(STRIPROFF) > $@
+ $(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< > $@
rm -f $(basename $<).ms