lilypond-0.0.67

diff --git a/Documentation/faq.pod b/Documentation/faq.pod
index 2935fe4a02af9b6e04f0378f20eb8df324f78e62..873b66b85053a0832671b2c1ab03022bc4eb0037 100644 (file)
--- a/Documentation/faq.pod
+++ b/Documentation/faq.pod
@@ -16,6 +16,17 @@ clean" after installing it
 
 If the problem persists, then please mail me.
 
+Q: Some of your neat scripts fail, what directories do you use:
+
+A:
+       
+       ~/something
+         lilypond      # the directory as unpacked from the tarball
+         releases      # directory for .tar.gz releases
+         patches       # directory for patches between different releases
+
+~/something/lilypond/bin is in the PATH, and contains symlinks to the
+compiled executables.
 
 =head2 Language: mudela
 
@@ -196,7 +207,7 @@ LD_LIBRARY_PATH to a directory containing F<libflower.so>
 
 Q: I want a DOS/NT/W95 port.
 
-A.0: Reconsider.  Try Linux/GNU.  It's fun!
+A.0: Reconsider.  Try Linux.  It's fun!
 
 A.1: Currently (patchlevel 27), GNU LilyPond (and flowerLib) compiles, links
 and runs on windhoos-nt, using the cygnus gnu port (release b17.1). 

diff --git a/Documentation/mudela.pod b/Documentation/mudela.pod
index 29c37bcc117e241442fa1644328518baf6045737..cc82896924e7e7c57508eeb5f5c7f9222e58501b 100644 (file)
--- a/Documentation/mudela.pod
+++ b/Documentation/mudela.pod
@@ -53,7 +53,7 @@ A perl-script which tries to convert to newer versions
 
 =head2 Words
 
-Keywords are preceded by a backslash "\". They contain alphabetic
+Keywords are preceded by a backslash: '\'. They contain alphabetic
 characters only. 
 
 Identifiers in their normal form consist start with a alpha character,
@@ -74,6 +74,16 @@ Mudela uses the brace (C<{> and C<}>) for hierarchical structures. To
 aid the eye in reading, for chords the < and the > are used as
 nesting braces.
 
+=head2 Constants
+
+Please note that -.5 is no Real.
+
+       "I am a string"
+       -1.2e3          % a real
+       12              % an int
+
+
+       
 =head2 Identifiers
 
 =head2 Hierarchical structures
@@ -238,7 +248,7 @@ error for this reason.
 
        [c8 e8(] [)g8 <c'8] e'8>
                                % NO nesting!
-       [c8 c8 c8]2/3           % a triplet
+       [2/3 c8 c8 c8]1/1       % a triplet
 
 
 =head2 Slurs and Ties

diff --git a/init/table_sixteen.ini b/init/table_sixteen.ini
index abcdeab3efe495133fee7906069897139ad232bd..58f2ef25a7010cb07ceb62a629cad50067a52251 100644 (file)
--- a/init/table_sixteen.ini
+++ b/init/table_sixteen.ini
@@ -3,6 +3,7 @@
 % It has a lot of hard-wired stringconstants
 %
 
+
 table_sixteen= 
 \symboltables {
 
@@ -26,9 +27,7 @@ table_sixteen=
            "upbow" "\upbow"                    -1\pt 6\pt      0\pt 5\pt
            "downbow" "\downbow"                0\pt 5\pt       0\pt 7.5\pt
            "back" "\backorfront"               0\pt 6\pt       0\pt 3\pt
-           "-front" "\backorfront"             -3\pt 5\pt      0\pt 3\pt
-% oeps, segfault
-%          "heel" "\heel"                      0\pt 6\pt       -.5\pt 2\pt
+           "-front" "\backorfront"             0\pt 6\pt       0\pt 3\pt
            "heel" "\heel"                      0\pt 6\pt       -1\pt 5\pt
            "toe" "\toe"                        0\pt 6\pt       -1\pt 5\pt
            "bheel" "\bheel"                    0\pt 6\pt       -1\pt 5\pt

diff --git a/lily/beam.cc b/lily/beam.cc
index 9fcd49f705344d72828136542b1e0999a6378200..3d16d96518d54b2d0416a069e46324c4880d6d01 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -13,7 +13,6 @@
 */
 
 #include "varray.hh"
-
 #include "proto.hh"
 #include "dimen.hh"
 #include "beam.hh"
@@ -52,11 +51,6 @@ Stem_info::Stem_info(Stem const *s)
 
 
 /* *************** */
-void
-Beam::do_break_at(PCol*l, PCol*r)
-{
-    assert (l->line_l_ == r->line_l_);
-}
 
 
 

diff --git a/lily/bow.cc b/lily/bow.cc
index 2de418ebdf8b2f3672d7e43749a9116befa283c6..e24f79d067c16ccd46d52bd6816b2d084a03c87e 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -8,6 +8,7 @@
 
 #include "bow.hh"
 #include "paper-def.hh"
+#include "molecule.hh"
 #include "lookup.hh"
 
 Bow::Bow()

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 98317f85e2fa3b1f7540ad28c1f1a2370cc94a2e..4ca1196b091090d27deeccf8d6d7cad9422bb0d3 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -6,6 +6,7 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include "molecule.hh"
 #include "dimen.hh"
 #include "crescendo.hh"
 #include "lookup.hh"

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index d9c7a0a9b0ebd5de824c9ab2544a244aea7c6e47..d1e28ee4f683b36674f128a5fa15b7ba59812a68 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -24,7 +24,7 @@ public:
    
 
     /* *************** */
-    NAME_MEMBERS(Beam);
+    NAME_MEMBERS();
     Beam();
     void add(Stem*);
     
@@ -35,7 +35,6 @@ public:
 protected:
     virtual Interval do_width()const;    
     virtual Offset center() const;
-    virtual void do_break_at(PCol *,  PCol *);
     virtual void set_default_dir();
     virtual void do_pre_processing();
     virtual void do_post_processing();

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 98cf4334f20bd200270cb092b28e654c344e2f15..5731317866b33e30843c8ffb8f4ba440114b4cff 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -21,12 +21,11 @@ public:
     void add(Note_column*);
 protected:
     virtual void set_default_dir();
-    virtual void do_break_at( PCol*, PCol*) ; 
     virtual void do_post_processing();
     virtual void do_substitute_dependency(Score_elem*, Score_elem*);
     virtual void do_pre_processing();
     SPANNER_CLONE(Slur)
-    NAME_MEMBERS(Slur);
+    NAME_MEMBERS();
 };
 
 #endif // SLUR_HH

diff --git a/lily/include/spanner-elem-group.hh b/lily/include/spanner-elem-group.hh
index a23819ac6d8d64bf6239ebd42e2cacd78e537b77..0d91319b63e8397e2e88fc65d7e1e7e73c2930cc 100644 (file)
--- a/lily/include/spanner-elem-group.hh
+++ b/lily/include/spanner-elem-group.hh
@@ -16,10 +16,9 @@
 class Spanner_elem_group : public Spanner, public Element_group {
     
 protected:
-    void do_break_at(PCol*,PCol*);
     virtual Interval do_width()const;
     virtual void do_print() const;
     SPANNER_CLONE(Spanner_elem_group)
-    NAME_MEMBERS(Spanner_elem_group);
+    NAME_MEMBERS();
 };
 #endif // SPANNER_ELEM_GROUP_HH

diff --git a/lily/parser.y b/lily/parser.y
index 539148422c187db7f6763b3bba4b635485bc8343..532380bc10b63d74210cc3959ed3bd0b306edb24 100644 (file)
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -1,7 +1,7 @@
 %{ // -*-Fundamental-*-
 #include <iostream.h>
 
-#define MUDELA_VERSION "0.0.57"
+#define MUDELA_VERSION "0.0.58"
 
 #include "script-def.hh"
 #include "symtable.hh"
@@ -174,7 +174,8 @@ yylex(YYSTYPE *s,  void * v_l)
 
 
 %type <box>    box
-%type <c>      open_request_parens close_request_parens close_plet_parens
+%type <c>      open_request_parens close_request_parens
+%type <c>      open_plet_parens close_plet_parens
 %type <chord>  music_chord music_chord_body  init_music_chord
 %type <el>     voice_elt full_element lyrics_elt command_elt
 %type <i>      int
@@ -718,10 +719,6 @@ post_requests:
                $2->set_spot( THIS->here_input());
                THIS->post_reqs.push($2);
        }
-       | post_requests close_plet_parens INT '/' INT { 
-               THIS->post_reqs.push( THIS->get_parens_request($2) ); 
-               THIS->post_reqs.push( get_plet_request( $2, $3, $5 ) ); 
-       }
        ;
 
 post_request:
@@ -737,6 +734,7 @@ pure_post_request:
                $$->set_spot( THIS->here_input());
        }
        ;
+
 pure_post_request_choice:
        close_request_parens    { 
                $$ = THIS->get_parens_request($1); 
@@ -753,7 +751,7 @@ pure_post_request_choice:
 */
 steno_melodic_req:
        NOTENAME_ID     {
-               $$ = $1->clone()->melodic();
+               $$ = $1->clone()->musical()->melodic();
                $$->octave_i_ += THIS->default_octave_i_;
        }
        | steno_melodic_req POST_QUOTES         {  
@@ -801,8 +799,9 @@ dynamic_req:
        ;
 
 close_plet_parens:
-       ']' {
+       ']' INT '/' INT {
                $$ = ']';
+               THIS->default_duration_.set_plet($2,$4);
        }
        ;
 
@@ -816,6 +815,8 @@ close_request_parens:
        | ']'   { 
                $$ = ']';
        }
+       | close_plet_parens {
+       }
        | E_SMALLER {
                $$ = '<';
        }
@@ -824,6 +825,13 @@ close_request_parens:
        }
        ;
   
+open_plet_parens:
+       '[' INT '/' INT {
+               $$ = '[';
+               THIS->default_duration_.set_plet($2,$4);
+       }
+       ;
+
 open_request_parens:
        E_EXCLAMATION   {
                $$ = '!';
@@ -834,6 +842,8 @@ open_request_parens:
        | '['   {
                $$='[';
        }
+       | open_plet_parens {
+       }
        ;
 
 
@@ -844,7 +854,8 @@ script_definition:
 
 script_body:
        STRING int int int int          {
-               $$ = new Script_def(*$1,$2, $3,$4,$5);
+               $$ = new Script_def;
+               $$->set_from_input(*$1,$2, $3,$4,$5);
                delete $1;
        }       
        ;
@@ -1014,7 +1025,7 @@ pitch_list:                       {
                $$ = new Array<Melodic_req*>;
        }
        | pitch_list NOTENAME_ID        {
-               $$->push($2->clone()->melodic());
+               $$->push($2->clone()->musical()->melodic());
        }
        ;
 

diff --git a/lily/slur.cc b/lily/slur.cc
index 57f6ab649f43a9cc2203a591fe0de6e59d112afc..3250dc26c9012bf7434f032cfa903518578ad697 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -53,18 +53,6 @@ Slur::do_pre_processing()
     left_col_l_ = encompass_arr_[0]->pcol_l_;    
 }
 
-void
-Slur::do_break_at(PCol*l, PCol*r) 
-{
-    assert(l->line_l_ == r->line_l_);
-
-    Array<Note_column*> old_encompass_arr = encompass_arr_;
-    encompass_arr_.set_size(0);
-    for (int i =0; i < old_encompass_arr.size(); i++) {
-       if (old_encompass_arr[i]->pcol_l_->line_l_==l->line_l_)
-           encompass_arr_.push(old_encompass_arr[i]);
-    }
-}
 
 void
 Slur::do_substitute_dependency(Score_elem*o, Score_elem*n)

diff --git a/lily/spanner-elem-group.cc b/lily/spanner-elem-group.cc
index 1baf0a61b1d87b7be70c4d88b32c2179964257e3..26b5f9fd33c59f5b4c774ec3472ed8e03d3cddde 100644 (file)
--- a/lily/spanner-elem-group.cc
+++ b/lily/spanner-elem-group.cc
@@ -9,18 +9,6 @@
 #include "p-col.hh"
 #include "spanner-elem-group.hh"
 
-void
-Spanner_elem_group::do_break_at(PCol*c1, PCol*c2 )
-{
-    Line_of_score * line_C = c1->line_l_;
-    Array<Score_elem*>  old_elems=elem_l_arr_;
-    elem_l_arr_.set_size(0);
-    for (int i=0; i < old_elems.size(); i++) {
-       if (old_elems[i]->line_l() == line_C) {
-           add_element(old_elems[i]);
-       }
-    }
-}
 
 IMPLEMENT_STATIC_NAME(Spanner_elem_group);
 

diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 562b6c3d277b4adbd8a44fd238a3431e0d02a2d9..3491b2f20d0949987bed0530bf007ccd92f591e2 100644 (file)
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -6,6 +6,7 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include "interval.hh"
 #include "paper-def.hh"
 #include "dimen.hh"
 #include "staff-side.hh"

diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc
index ea17b178f62c49da223f8ea9171747f99bde65a5..8624878496e3adf96219882f7f74cc5a4b7185b5 100644 (file)
--- a/lily/staff-sym.cc
+++ b/lily/staff-sym.cc
@@ -8,6 +8,7 @@
 #include "staff-sym.hh"
 #include "lookup.hh"
 #include "paper-def.hh"
+#include "molecule.hh"
 #include "debug.hh"
 
 

diff --git a/lily/template3.cc b/lily/template3.cc
index 50208175e56ada7fd86c8fca7dba5cd193d3612b..42a48125f0231e4639f72a4fffcc7226ea570c24 100644 (file)
--- a/lily/template3.cc
+++ b/lily/template3.cc
@@ -1,3 +1,12 @@
+/*
+  template3.cc -- instantiate Atom
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include "symbol.hh"
 #include "request.hh"
 #include "input-score.hh"
 #include "input-staff.hh"

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 994215d0f3bdcc1aedbd707503a8203a5860a39d..9eb34ddb3c2175984110dddbeeea001b7a58fb9d 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -7,7 +7,7 @@ Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: A preprocessor to make TeX typeset music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
-Icon: lelie_icon.gif
+Icon: lelie_icon.xpm
 Buildroot: /tmp/lilypond_build
 
 %description
@@ -39,7 +39,6 @@ make prefix="$RPM_BUILD_ROOT/usr" install
 /usr/lib/texmf/texmf/tex/lilypond/
 /usr/lib/texmf/texmf/fonts/source/lilypond/
 /usr/share/lilypond/
-
 %post
-echo please run texhash to update TeX directory listings
+echo please run texhash to update TeX directory listings 1>&2