From: fred Date: Tue, 26 Mar 2002 22:43:27 +0000 (+0000) Subject: lilypond-1.3.6 X-Git-Tag: release/1.5.59~1988 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=db69743ff5439187f02b1891d0b851603346cadb;p=lilypond.git lilypond-1.3.6 --- diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 3807c62d00..5a6d60917b 100644 --- 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 4c00608404..11bca6d414 100644 --- 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 294a1d2858..bbba952ad2 100644 --- 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 39401cb208..fbe2f826b0 100644 --- 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 afe7d20316..5c11973c2e 100644 --- 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 a76260f9dd..ea6499510e 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -75,7 +75,6 @@ print_mudela_versions (ostream &os) %union { - Array* realarr; Array *pitch_arr; Link_array *reqvec; Array *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 hyphen_req %type string %type score_block score_body -%type real_array %type script_abbreviation %type 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; - $$->push ($1); - } - | /* empty */ { - $$ = new Array; - } - | real_array ',' real { - $$->push($3); - } - ; - /* MIDI */ diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 4e4ef89a6b..d1e68dcb33 100644 --- 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 7daa574c62..827d52a582 100644 --- 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