lilypond-0.0.59

diff --git a/bin/convert-mudela b/bin/convert-mudela
index dbb0f729a46716641e3406169471bd6ecc084358..d728b1fed361997a9342186db720b18ded52536a 100644 (file)
--- a/bin/convert-mudela
+++ b/bin/convert-mudela
@@ -1,9 +1,20 @@
 #!/usr/bin/perl -w
 
+=head1 TODO
+
+    detect \lyrics and \melodic, and do substitution accordingly.
+    
+=cut    
+
+
+
 #
 # version of "supporting" engine, not mudela conversions.
 # 
 
+
+
+
 $convert_mudela_version = "0.1";
 
 use Getopt::Long;
@@ -46,6 +57,11 @@ sub convert_0_0_55_to_0_0_56
     s/\"\|\|\"/\"|.\"/g;
 }
 
+sub convert_0_0_56_to_0_0_57
+{
+    s/\(([ \]\[|\t-\.>]|\\[<!>a-z]+)*\)/\~ $1/g;
+}
+
 ###############################################################
 
 sub    last_conversion
@@ -80,8 +96,9 @@ my %minor_conversions = (50 => \&no_conv,
                         53 => \&convert_0_0_52_to_0_0_53,
                         54 => \&convert_0_0_53_to_0_0_54,
                         55 => \&convert_0_0_54_to_0_0_55,
-                        56 => \&convert_0_0_55_to_0_0_56
-                        );
+                        56 => \&convert_0_0_55_to_0_0_56,
+                        57 => \&convert_0_0_56_to_0_0_57
+                        );
  
 
 sub versions 

diff --git a/lily/tie-reg.cc b/lily/tie-reg.cc
new file mode 100644 (file)
index 0000000..fd2df29
--- /dev/null
+++ b/lily/tie-reg.cc
@@ -0,0 +1,97 @@
+/*
+  tie-reg.cc -- implement Tie_register
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include "tie-reg.hh"
+#include "tie.hh"
+#include "notehead.hh"
+#include "musical-request.hh"
+#include "voice-element.hh"
+
+Tie_register::Tie_register()
+{
+    end_tie_p_ = 0;
+    tie_p_ = 0;
+    req_l_ =0;
+    end_req_l_ =0;
+    end_mom_ = -1;
+}
+
+void
+Tie_register::post_move_processing()
+{
+     if (tie_p_ && get_staff_info().when() == end_mom_) {
+       end_tie_p_ = tie_p_;
+       end_req_l_ = req_l_;
+       tie_p_ =0;
+       req_l_ =0;
+       end_mom_ = -1;
+    }
+}
+
+bool
+Tie_register::acceptable_request_b(Request*r)
+{
+    return r->musical() && r->musical()->tie();
+}
+
+bool
+Tie_register::try_request(Request*r)
+{
+    if(!acceptable_request_b(r))
+       return false;
+    if (req_l_ ) {
+       return false;
+    }
+    req_l_ = r->musical()->tie();
+    end_mom_ = r->elt_l_->duration_ + get_staff_info().when();
+    return true;
+}
+
+void
+Tie_register::process_requests()
+{
+    if (req_l_ && ! tie_p_) {
+       tie_p_ = new Tie;
+    }
+}
+
+void
+Tie_register::acknowledge_element(Staff_elem_info i)
+{
+    if (i.elem_l_->name() == Notehead::static_name()) {
+       if (tie_p_)
+           tie_p_->set_head(-1, (Notehead*)i.elem_l_);
+       
+       if (end_tie_p_) {
+           end_tie_p_->set_head(1, (Notehead*)i.elem_l_);
+           announce_element(Staff_elem_info(end_tie_p_,end_req_l_));
+       }
+    }
+}
+
+void
+Tie_register::pre_move_processing()
+{
+    if (end_tie_p_) {
+       typeset_element(end_tie_p_);
+       end_tie_p_ =0;
+       end_req_l_ =0;
+    }
+ 
+}
+
+Tie_register::~Tie_register()
+{
+    if (tie_p_) {
+       req_l_->warning("unended Tie");
+       delete tie_p_;
+    }
+}
+
+IMPLEMENT_STATIC_NAME(Tie_register);
+ADD_THIS_REGISTER(Tie_register);

diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index 2c3dc12e901ccf8e5eb96a898fc85233dc6132b3..7c675336f25b8a37f570b82ba9ee8dbef1cfb572 100644 (file)
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -2,8 +2,8 @@
 
 Begin3
 Title: LilyPond
-Version: 0.0.58
-Entered-date: 05/02/97
+Version: 0.0.59
+Entered-date: 05/05/97
 Description: LilyPond is a program which converts a music-script (mudela) into
 TeX output, or MIDI to produce multi-staff scores. Features include multiple
 meters, clefs, keys, lyrics, versatile input-language, cadenzas
@@ -13,7 +13,7 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys)
        jan@digicash.com (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: pcnov095.win.tue.nl /pub/lilypond/  
-       300k lilypond-0.0.58.tar.gz
+       300k lilypond-0.0.59.tar.gz
 Alternate-site: 
 Original-site: 
 Platform: unix/win32, GNU C++

diff --git a/make/lilypond.spec b/make/lilypond.spec
index 9b43308086f27dd8933275a30378ab3f7d672aec..4fa3667bc0b38d293fdd7aff8cf30b940b656d05 100644 (file)
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 0.0.58
+Version: 0.0.59
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.58.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.59.tar.gz
 Summary: A preprocessor to make TeX typeset music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
@@ -25,7 +25,7 @@ make all
 strip bin/lilypond bin/mi2mu
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
-%doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/error.text Documentation/out/examples.text Documentation/out/faq.text Documentation/out/index.text Documentation/out/language.text Documentation/out/lilygut.text Documentation/out/lilypond.text Documentation/out/mi2mu.text Documentation/out/mudela.text input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/error.ly input/header.ly input/kortjakje.ly input/rhythm.ly input/scales.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/standchen.ly input/standchen.tex input/twinkle.ly input/wohltemperirt.ly Documentation/lelie_logo.gif
+%doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/error.text Documentation/out/examples.text Documentation/out/faq.text Documentation/out/index.text Documentation/out/language.text Documentation/out/lilygut.text Documentation/out/lilypond.text Documentation/out/mi2mu.text Documentation/out/mudela.text input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/error.ly input/header.ly input/kortjakje.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/slurs.ly input/standchen.ly input/standchen.tex input/toccata-fuga-E.ly input/twinkle.ly input/wohltemperirt.ly Documentation/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/lilypond
 /usr/lib/libflower.so