-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.
-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
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)
PATHSEP = @PATHSEP@
PERL = @PERL@
PYTHON = @PYTHON@
+SHELL = @SHELL@
STRIPROFF = @STRIPROFF@
TAR= @TAR@
TBL = @TBL@
--- /dev/null
+/*
+ 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
+}
outdir=out
endif
+# user package
stepdir = $(stepmake)/stepmake
+# for stepmake packageg
+# stepdir = $(depth)/stepmake
STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES)
LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
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 |
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] |
a4 g2 fis4 |
g1 |
- \repeat 2 {
+ \repeat "semi" 2 {
r1. |
r4 [g'8 f] e4 [f8 g] c,4 [d8 e] |
a,1. |
fis2 g fis! |
}
- \repeat 2 {
+ \repeat "semi" 2 {
g1 |
r1 | r1 |
[g'8 g g g] g4 [d16 e f d] |
c B c G | d1^"3 4 3" |
G1 |
- \repeat 2 {
+ \repeat "semi" 2 {
g1. | c |
f | d^"\\textsharp" |
g | c |
d1.^"3 4 3" |
}
- \repeat 2 {
+ \repeat "semi" 2 {
G1 |
g2 fis | g G |
g1^"3 4 3" | c |
+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)
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:
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)
PATHSEP = @PATHSEP@
PERL = @PERL@
PYTHON = @PYTHON@
+SHELL = @SHELL@
STRIPROFF = @STRIPROFF@
TAR= @TAR@
TBL = @TBL@
ifeq (0,${MAKELEVEL})
MAKE:=$(MAKE) --no-builtin-rules
endif
+.SUFFIXES:
+
ifndef config
configuration=config
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)))
-
--- /dev/null
+# stepmake/prolog-rules.make
+
+.SUFFIXES: .pl .s
+
--- /dev/null
+
+# prolog files:
+PL_FILES := $(wildcard *.pl)
+
+SOURCE_FILES += $(PL_FILES)
+
+TAGS_FILES += $(PL_FILES)
+
projects / lilypond.git / commitdiff