lilypond-1.3.6

diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index 3807c62d00bd4a0036d57434cabd1eb0e8b97f36..5a6d60917bf5e3173c64f46915812c86d7f9203d 100644 (file)
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -54,7 +54,7 @@ list is alphabetically ordered.
     testing
 @item @email{pinard@@iro.umontreal.ca, Franc@,ois Pinard}, 
     parts of Documentation/Vocab*, started internationalization stuff
-@item @email{portnoy@ai.mit.edu,Stephen Peters} pdfTeX support
+@item @email{portnoy@@ai.mit.edu,Stephen Peters}, pdfTeX support
 @item @email{glenprideaux@@iname.com, Glen Prideaux},
     minor bug fix to script used to generate doc++ documentation
 @item @email{Roy.Rankin@@alcatel.com.au, Roy R. Rankin},

diff --git a/input/denneboom.ly b/input/denneboom.ly
index 4c0060840479fcb1304a9085b83a68c245c04de6..11bca6d414707aa12b4deaab5aeb57e84ba59f16 100644 (file)
--- a/input/denneboom.ly
+++ b/input/denneboom.ly
@@ -83,17 +83,22 @@ verse_two_staff = \context Lyrics = two
 denneboom_shape = \paper{ 
        \paper_twenty
        indent = 20. \mm;
-       \shape   70. \mm, 20. \mm,
-                65. \mm, 30. \mm,
-                57.5 \mm, 45. \mm,
-                50. \mm, 60. \mm,
-                42.5 \mm, 75. \mm,
-                35. \mm, 90. \mm,
-                27.5 \mm, 105. \mm,
-                20. \mm, 120. \mm,
-                10. \mm, 140. \mm,
-                65. \mm, 30. \mm
-                ;
+
+       % UGH -- THIS IS HAIRY 
+       #'margin-shape = #(map
+               (lambda (x) (cons-map mm-to-pt x)) 
+               '((70.0 .  20.)
+                (65.0 .  30.0)
+                (57.5  .  45.0)
+                (50.0 .  60.0) 
+                (42.5  .  75.)  
+                (35.0 .  90.)
+                (27.5  .  105.)
+                (20.0 .  120.0)
+                (10.0 .  140.0) 
+                (65.0 .  30.0))
+       )
+
        gourlay_maxmeasures = 30.;
        arithmetic_basicspace = 3.8;
        arithmetic_multiplier = 8.\pt;

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 294a1d2858f2bc0e1c1cdb5d98e1cb4c5d411cbe..bbba952ad21ebed9ae66f8689aa6c4f030074946 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -105,7 +105,11 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom)
   /*
     first guess: end beam at end of beat
   */
-  Moment end_mom = timer_l_->one_beat_;
+  SCM one (get_property ("beatLength", 0));
+
+  Moment end_mom;
+  if (SMOB_IS_TYPE_B(Moment, one))
+    end_mom = *SMOB_TO_TYPE (Moment, one);
 
   /*
     second guess: property generic time exception

diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index 39401cb2080de0b519a6d4a94d1cc518abe6c311..fbe2f826b06e77e110728fe5c081c9756bd22052 100644 (file)
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -19,9 +19,6 @@
   
  */
 class Time_signature: public Item {
-
-  
-
 protected:
   virtual Molecule*do_brew_molecule_p() const;
 public:

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index afe7d20316cd3a0056ca2049fdafa272eb7f79f3..5c11973c2e8a8446725d8d5d4be4d26c7834f87d 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -30,9 +30,6 @@ protected:
   virtual void do_post_move_processing();
 
 public:
-  /// how long is one beat?
-  Moment one_beat_;
-
   /// JUNKME
   int bars_i () const;
 

diff --git a/lily/parser.yy b/lily/parser.yy
index a76260f9ddb51a7ca60d7e1a0e50bb4c5b6b2089..ea6499510e3999919ad00bb22f26d9f700b11a23 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -75,7 +75,6 @@ print_mudela_versions (ostream &os)
 
 
 %union {
-    Array<Real>* realarr;
     Array<Musical_pitch> *pitch_arr;
     Link_array<Request> *reqvec;
     Array<int> *intvec;
@@ -174,7 +173,6 @@ yylex (YYSTYPE *s,  void * v_l)
 %token SCM_T
 %token SCORE
 %token SCRIPT
-%token SHAPE
 %token SKIP
 %token SPANREQUEST
 %token TEMPO
@@ -254,7 +252,6 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <request> hyphen_req
 %type <scm>    string
 %type <score>  score_block score_body
-%type <realarr>        real_array
 
 %type <scm>    script_abbreviation
 %type <trans>  translator_spec_block translator_spec_body
@@ -567,21 +564,6 @@ paper_def_body:
        | paper_def_body translator_spec_block {
                $$->assign_translator ($2);
        }
-       | paper_def_body SHAPE real_array  semicolon {
-               /*
-                       URG URG.
-               */
-               if ($3->size () % 2)
-                       warning (_ ("Need even number of args for shape array"));
-
-               for (int i=0; i < $3->size ();  i+=2)
-               {
-                       Real l = $3->elem (i);
-                       $$->shape_int_a_.push (Interval (l,
-                                                        l + $3->elem (i+1)));
-               }
-               delete $3;
-       }
        | paper_def_body error {
 
        }
@@ -632,20 +614,6 @@ real:
        }
        ;
                
-
-real_array:
-       real {
-               $$ = new Array<Real>;
-               $$->push ($1);
-       }
-       |  /* empty */ {
-               $$ = new Array<Real>;
-       }
-       | real_array ',' real {
-               $$->push($3);
-       }
-       ;
-
 /*
        MIDI
 */

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 4e4ef89a6b9375ad4048ee50a4b90521f3599e5f..d1e68dcb336bffee8e69d811cdd94eca5691bd56 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -72,12 +72,9 @@ Timing_translator::do_process_requests()
              daddy_trans_l_->set_property("measurePosition",
                                           (new Moment)->smobify_self ());
 
-
            }
        }
     }
-
-
 }
 
 
@@ -100,9 +97,7 @@ Timing_translator::do_pre_move_processing()
 
   // urg: multi bar rests: should always process whole of first bar?
   SCM tim = get_property ("timing", 0);
-  bool timb = gh_boolean_p (tim) && gh_scm2bool ( tim);
-
-
+  bool timb = gh_boolean_p (tim) && gh_scm2bool (tim);
   if (timb && allbars)
     {
       Moment barleft = (measure_length () - measure_position ());
@@ -124,9 +119,10 @@ Timing_translator::do_creation_processing()
   daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1));
   daddy_trans_l_->set_property("measurePosition",
                               (new Moment)->smobify_self());
+  daddy_trans_l_->set_property ("oneBeat",
+                               (new Moment (1,4))->smobify_self ());
   daddy_trans_l_->set_property("measureLength",
                               (new Moment (1))->smobify_self());
-  
 }
 
 Moment
@@ -143,23 +139,28 @@ Timing_translator::measure_length () const
 void
 Timing_translator::get_time_signature (int *n, int *d) const
 {
-  *n = measure_length () / one_beat_;
-  *d = one_beat_.den_i ();
+  Moment one_beat (1,4);
+  SCM one = get_property ("beatLength",0);
+  if (SMOB_IS_TYPE_B (Moment, one))
+    one_beat = *SMOB_TO_TYPE (Moment, one);
+  *n = measure_length () / one_beat;
+  *d = one_beat.den_i ();
 }
 
 
 void
 Timing_translator::set_time_signature (int l, int o)
 {
-  one_beat_ = Moment (1)/Moment (o);
-  Moment len = Moment (l) * one_beat_;
+  Moment one_beat = Moment (1)/Moment (o);
+  Moment len = Moment (l) * one_beat;
   daddy_trans_l_->set_property ("measureLength",
                                (new Moment (len))->smobify_self ());
+  daddy_trans_l_->set_property ("beatength",
+                               (new Moment (one_beat))->smobify_self ());
 }
 
 Timing_translator::Timing_translator()
 {
-  one_beat_ = Moment( 1,4);
 }
 
 
@@ -238,8 +239,6 @@ Timing_translator::do_post_move_processing()
   tr->set_property ("currentBarNumber", gh_int2scm (b));
 }
 
-
-
 int 
 Timing_translator::bars_i () const
 {

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 7daa574c6261c3430b250a3c23c4ed137deb9e06..827d52a5829dc65b17a74b917ac0c4278646ba27 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -370,7 +370,7 @@ if 1:
 
 if 1:
        def conv(str):
-               str =  re.sub ('dynamicDir', 'dynamicDirection', str)
+               str =  re.sub ('dynamicDir\\b', 'dynamicDirection', str)
                        
                return str