patch::: 1.1.31.jcn3: jcn3

pl 31.jcn3
	- sm 71, require yodl-1.31.11
	- fix: slur macros
	- bf: info in rpm, if available

---
Generated by janneke@gnu.org using package-diff 0.62,
>From = lilypond-1.1.31.jcn2, To = lilypond-1.1.31.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.31.jcn3.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.31.jcn2
1.1.31.jcn3
++state

diff --git a/NEWS b/NEWS
index bf617659232a56895fe8348402711cdc1046b986..fef2553bd72a76b64aed3548298cda0b42409db7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
---- ../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

diff --git a/VERSION b/VERSION
index 39d4ce84cfe743006b9b2b5ad722abdc1296f4ef..2607b0b2618a5a4d69a4efd763a2af758844035b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 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.

diff --git a/aclocal.m4 b/aclocal.m4
index cf4a69b433876b95869057abf25f026f1e46f8e6..38ec73410cf43580a7303454fb5cde2669d3d321 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,3 @@
-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
 
@@ -444,6 +442,7 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
 ])
 
 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)
 ])

diff --git a/lily/slur.cc b/lily/slur.cc
index 552c3837386baf459fa44c2de0897a65cbd769f9..2c58847771b74a885fe3eb29342d61c725d767b0 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -91,6 +91,21 @@ Note_column_compare (Note_column *const&n1 , Note_column* const&n2)
   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 ()
 {
@@ -122,16 +137,9 @@ 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 
@@ -150,7 +158,7 @@ Slur::do_post_processing ()
       /*
         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_]);
@@ -179,7 +187,7 @@ Slur::do_post_processing ()
   // 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);
@@ -196,8 +204,8 @@ Slur::do_post_processing ()
   /*
     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_]

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 6f97f56cbe0f9ddb44b46491fc852ccde3a05127..e72232e446b6ae0045081f8fd347685084f8c3eb 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -34,13 +34,25 @@ tar -C htmldocs -xzf out/htmldoc.tar.gz
 
 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
@@ -55,6 +67,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 /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
@@ -64,7 +77,3 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 /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

diff --git a/stepmake/NEWS b/stepmake/NEWS
index 23f770d131bfd440d1c495eec6c3cb495105d573..cfc9576c3ed980316f0454b7bd23a649e237b51b 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,7 @@
+pl 71
+       - bf: c-tags
+       - yodl: groff, ditroff
+
 pl 70
        - GUILE config fixes (AF)
 

diff --git a/stepmake/VERSION b/stepmake/VERSION
index 32def17b697b23e8518b5431271dbba417ceb3b1..833861a630de6ec449faf2ce41dc8cb852fd1ee4 100644 (file)
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 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:

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 6dceec035c5704e51ce4dd0b53c78d802b3a34c3..38ec73410cf43580a7303454fb5cde2669d3d321 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -442,6 +442,7 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
 ])
 
 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)
 ])

diff --git a/stepmake/stepmake/c-vars.make b/stepmake/stepmake/c-vars.make
index c35437ed47ad1d7bd2a28e6897c044ce627cc2fc..5965b2276ac00b5b18431ce3a83c264f206ff53e 100644 (file)
--- a/stepmake/stepmake/c-vars.make
+++ b/stepmake/stepmake/c-vars.make
@@ -9,7 +9,7 @@ SOURCE_FILES+=$(Y_FILES) $(C_FILES) $(L_FILES) $(H_FILES)
 
 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++
 # 
 

diff --git a/stepmake/stepmake/yodl-rules.make b/stepmake/stepmake/yodl-rules.make
index baabab596a28f621b89533830d535b1883347488..30b4468f8fd5bc7611a8ba1dcc1c876484e2d8ca 100644 (file)
--- a/stepmake/stepmake/yodl-rules.make
+++ b/stepmake/stepmake/yodl-rules.make
@@ -23,6 +23,6 @@ $(outdir)/%.texinfo: %.yo
 
 $(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