From: fred <fred>
Date: Tue, 26 Mar 2002 21:49:38 +0000 (+0000)
Subject: lilypond-1.1.43
X-Git-Tag: release/1.5.59~2449
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d282be5dcd614ea269e3776a378c419bc024911f;p=lilypond.git

lilypond-1.1.43
---

diff --git a/NEWS b/NEWS
index 25c174bfc7..7d1133c0fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,42 @@
-pl 41.hwn2
+
+
+pl 41.hwn3
+       - reinstated \property inheritance
+       - \property SkipBars -> skipBars
+       - \property midi_instrument -> midiInstrument
+       - \property fontsize -> fontSize (mudela 1.0.18).
+       - bf: add a space after lyrics.
+       - junked flower DLL classes
+       - rewrote repeat music and iterators (mudela 1.0.17)
+         * Folded_repeat_iterator
+         * Unfolded_repeat_iterator
+         * New_repeated_music
+         * syntax change: \repeat FOLDSTRING NUMBER Music [ALTERNATIVE Music_se
+quence]
+       - data struct simplification: junked Dynamic_req,
+Absolute_dynamic_req, Span_dynamic_req, Slur_req, Beam_req. Use
+Span_reqs and Text_script_reqs with type fields instead. 
+
+
+
+pl 42.tca1
+ 	- updated mudela-book documentation
+ 	- misc mudela-book.py
+ 	- accordion: smaller dots + little script renaming
+
+
+pl 42.jcn1
+	- bf: hp-u(rg)x: user build; sm 73
+ 	- bf: hp-u(rg)x: sm74
+
+pl 41.mb1
+	- convert-mudela: convert textstyle -> textStyle
+	- refman.yo: properties moved to correct contexts.
+	- mudela-book.py: Added singleline, multiline options. 
+	  Fixed default line width bug.
+
+***************
+pl 41.hwn2 (may 10, 1999)
 	- bf: Score bar line thickness.
 	- more paper writing
 	- website tweaks.
diff --git a/aclocal.m4 b/aclocal.m4
index 0a8f9d46b4..e1ea2a59d8 100644
--- 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
 
@@ -275,6 +273,15 @@ dnl	export INSTALL="\$\(depth\)/bin/install-sh"
 dnl    fi
 
     AC_CHECK_PROGS(TAR, tar, error)
+
+    if test "x`uname`" = "xHP-UX"; then
+	AC_STEPMAKE_WARN(avoiding buggy /bin/sh)
+	AC_CHECK_PROGS(SHELL, bash, /bin/ksh)
+    else
+	SHELL=/bin/sh
+	AC_SUBST(SHELL)
+    fi
+
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
     AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
diff --git a/config.make.in b/config.make.in
index 841d5e28d1..e4f53705ca 100644
--- a/config.make.in
+++ b/config.make.in
@@ -56,6 +56,7 @@ MSGFMT = @MSGFMT@
 PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
+SHELL = @SHELL@
 STRIPROFF = @STRIPROFF@
 TAR= @TAR@
 TBL = @TBL@
diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
new file mode 100644
index 0000000000..0550a46f06
--- /dev/null
+++ b/lily/unfolded-repeat-iterator.cc
@@ -0,0 +1,144 @@
+/*   
+  unfolded-repeat-iterator.cc --  implement Unfolded_repeat_iterator
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+
+#include "new-repeated-music.hh"
+#include "music-list.hh"
+#include "unfolded-repeat-iterator.hh"
+#include "debug.hh"
+#include "translator-group.hh"
+
+Unfolded_repeat_iterator::~Unfolded_repeat_iterator ()
+{
+  delete current_iter_p_;
+}
+
+Unfolded_repeat_iterator::Unfolded_repeat_iterator ()
+{
+  done_count_ =0;
+  current_iter_p_ =0;
+  do_main_b_ = false;
+}
+
+/**
+
+If we are in the body of the repeat always go to the current alternative.
+
+If we are not in the body, then we are in an alternative.  If we are
+fully unfolding, advance the current alternative and go back to main.
+If we are semi-unfolding, advance the current alternative, and go to
+the  alternative just set.
+   
+ */
+void
+Unfolded_repeat_iterator::next_element () 
+{
+  New_repeated_music const* mus =dynamic_cast<New_repeated_music const*> (music_l_);
+  delete current_iter_p_;
+  current_iter_p_ =0;
+
+
+  if (do_main_b_)
+    {
+      done_mom_ += mus->repeat_body_p_->length_mom ();
+      if (alternative_cons_l_)
+	{
+	  current_iter_p_ = get_iterator_p (alternative_cons_l_->car_);
+	  do_main_b_ = false;
+	}
+    }
+  else
+    {
+      if (alternative_cons_l_)
+	{
+	  done_mom_ += alternative_cons_l_->car_->length_mom ();
+	  alternative_cons_l_ = alternative_cons_l_->next_;
+	  done_count_ ++;	  
+	}
+
+      if (done_count_ < mus->repeats_i_ && alternative_cons_l_)
+	{
+	  if (mus->semi_fold_b_)
+	    current_iter_p_ = get_iterator_p (alternative_cons_l_->car_);
+	  else
+	    {
+	      current_iter_p_ = get_iterator_p (mus->repeat_body_p_);
+	      do_main_b_ = true;
+	    }
+	}
+    }
+}
+
+bool
+Unfolded_repeat_iterator::ok () const
+{
+  return current_iter_p_ ;
+}
+
+Moment
+Unfolded_repeat_iterator::next_moment () const
+{
+  return done_mom_ + current_iter_p_->next_moment ();
+}
+
+void
+Unfolded_repeat_iterator::construct_children ()
+{
+  New_repeated_music const* mus =dynamic_cast<New_repeated_music const*> (music_l_);
+  alternative_cons_l_ = (mus->alternatives_p_)
+    ? mus->alternatives_p_->music_p_list_p_->head_
+    : 0;
+
+  if (mus->repeat_body_p_)
+    {
+      current_iter_p_  = get_iterator_p (mus->repeat_body_p_);
+      do_main_b_ = true;
+    }
+  else if (alternative_cons_l_)
+    {
+      current_iter_p_ = get_iterator_p (alternative_cons_l_->car_);
+      do_main_b_ = false;
+    }
+}
+
+void
+Unfolded_repeat_iterator::do_process_and_next (Moment m) 
+{
+  if (!m)
+    {
+      bool success = report_to_l ()->try_music (music_l_);
+      if (!success)
+	music_l_->warning ( _("No one to print a volta bracket"));
+    }
+  while (1)
+    {
+      while (!current_iter_p_->ok ())
+	{
+	  next_element();
+
+	  if (!current_iter_p_)
+	    return;
+	}
+      
+      if (m - done_mom_ >= current_iter_p_->next_moment ())
+	current_iter_p_->process_and_next (m - done_mom_);
+      else
+	return;
+    }
+}
+  
+void
+Unfolded_repeat_iterator::do_print () const
+{
+#ifndef NPRINT
+  DOUT << "count " << done_count_ << "done time " << done_mom_ << '\n';
+  DOUT << "current: ";
+  current_iter_p_->print();
+#endif
+}
diff --git a/make/stepmake.make b/make/stepmake.make
index 07d293704e..47b5cd6a90 100644
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -23,7 +23,10 @@ else
 outdir=out
 endif
 
+# user package
 stepdir = $(stepmake)/stepmake
+# for stepmake packageg
+# stepdir = $(depth)/stepmake
 
 STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
 LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index e1821b98a4..8dcbb5fb15 100644
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -97,7 +97,7 @@ vi1=\context Staff = vi1 <
   r8 [d16 a ][ b8 b16 c] a2 |
   b1 | 
   
-  \repeat 2 {
+  \repeat "semi" 2 {
   r4 d d d d d |
   e1. |
   r4 c c c c c |
@@ -115,7 +115,7 @@ vi1=\context Staff = vi1 <
   a [d,8 c] b4 [c8 d] a2 |
   }
 
-  \repeat 2 {
+  \repeat "semi" 2 {
   b1 |
   [d8 d d d] d4 [a16 b c a] |
   [b8 g ][ g g16 a] [b8 g ][ g g16 a] | 
@@ -167,7 +167,7 @@ vi2=\context Staff = vi2 <
   a4 g2 fis4 |
   g1 |
 
-  \repeat 2 {
+  \repeat "semi" 2 {
   r1. |
   r4 [g'8 f] e4 [f8 g] c,4 [d8 e] |
   a,1. |
@@ -185,7 +185,7 @@ vi2=\context Staff = vi2 <
   fis2 g fis! |
   }
 
-  \repeat 2 {
+  \repeat "semi" 2 {
   g1 |
   r1 | r1 |
   [g'8 g g g] g4 [d16 e f d] |
@@ -225,7 +225,7 @@ bc=\context Staff = bc <
   c B c G | d1^"3 4 3" |
   G1 |
 
-  \repeat 2 {
+  \repeat "semi" 2 {
   g1. | c |
   f | d^"\\textsharp" |
   g | c |
@@ -236,7 +236,7 @@ bc=\context Staff = bc <
   d1.^"3 4 3" |
   }
 
-  \repeat 2 {
+  \repeat "semi"  2 {
   G1 |
   g2 fis | g G |
   g1^"3 4 3" | c |
diff --git a/stepmake/NEWS b/stepmake/NEWS
index 480f8a8cd2..d25b32274e 100644
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,11 @@
+pl 74
+	- avoid buggy /bin/sh on hp-ux
+	- bf: make/stepmake.make
+	- simple prolog support
+
+pl 73
+	- bf: invoke sed only once
+
 pl 72
 	- bf: mfplain dependency
 	- inimf, inimf checking (sigh)
diff --git a/stepmake/VERSION b/stepmake/VERSION
index df407f27e3..a9f9a07036 100644
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=72
+PATCH_LEVEL=74
 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 c9e042c0e5..e1ea2a59d8 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -273,6 +273,15 @@ dnl	export INSTALL="\$\(depth\)/bin/install-sh"
 dnl    fi
 
     AC_CHECK_PROGS(TAR, tar, error)
+
+    if test "x`uname`" = "xHP-UX"; then
+	AC_STEPMAKE_WARN(avoiding buggy /bin/sh)
+	AC_CHECK_PROGS(SHELL, bash, /bin/ksh)
+    else
+	SHELL=/bin/sh
+	AC_SUBST(SHELL)
+    fi
+
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
     AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
diff --git a/stepmake/config.make.in b/stepmake/config.make.in
index f3fcccab6e..5eb062aaf0 100644
--- a/stepmake/config.make.in
+++ b/stepmake/config.make.in
@@ -55,6 +55,7 @@ MSGFMT = @MSGFMT@
 PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
+SHELL = @SHELL@
 STRIPROFF = @STRIPROFF@
 TAR= @TAR@
 TBL = @TBL@
diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make
index 9b114e1b20..3c7dade6d7 100644
--- a/stepmake/make/stepmake.make
+++ b/stepmake/make/stepmake.make
@@ -6,6 +6,8 @@ include $(depth)/make/toplevel-version.make
 ifeq (0,${MAKELEVEL})
   MAKE:=$(MAKE) --no-builtin-rules
 endif
+.SUFFIXES:
+
 
 ifndef config
   configuration=config
@@ -21,19 +23,31 @@ else
 outdir=out
 endif
 
+# user package
+# stepdir = $(stepmake)/stepmake
+# for stepmake packageg
 stepdir = $(depth)/stepmake
 
-LOCALSTEPMAKE_TEMPLATES:=generic $(LOCALSTEPMAKE_TEMPLATES)
 STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
+LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
+
+
+all:
+
+-include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAKE_TEMPLATES)))
+
+-include $(addprefix $(stepdir)/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLATES)))
 
-default:
 
+include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
+
+# ugh. need to do this because of PATH :=$(topdir)/..:$(PATH) 
 include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) 
-include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) 
+
+
 include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) 
 include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) 
 include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) 
 include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES))) 
 
 
-
diff --git a/stepmake/stepmake/prolog-rules.make b/stepmake/stepmake/prolog-rules.make
new file mode 100644
index 0000000000..4ac1b8c193
--- /dev/null
+++ b/stepmake/stepmake/prolog-rules.make
@@ -0,0 +1,4 @@
+# stepmake/prolog-rules.make
+
+.SUFFIXES: .pl .s
+
diff --git a/stepmake/stepmake/prolog-targets.make b/stepmake/stepmake/prolog-targets.make
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/stepmake/stepmake/prolog-targets.make
@@ -0,0 +1 @@
+
diff --git a/stepmake/stepmake/prolog-vars.make b/stepmake/stepmake/prolog-vars.make
new file mode 100644
index 0000000000..ad4793061c
--- /dev/null
+++ b/stepmake/stepmake/prolog-vars.make
@@ -0,0 +1,8 @@
+
+# prolog files:
+PL_FILES := $(wildcard *.pl)
+
+SOURCE_FILES += $(PL_FILES)
+
+TAGS_FILES += $(PL_FILES)
+