From a3e3bf39b9014d62ab80f9b86ed11e92d93fba5a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:05:20 +0000 Subject: [PATCH] lilypond-0.1.44 --- bin/convert-mudela.pl | 7 +++++++ init/lily-init.ly | 2 +- input/beams.ly | 2 +- input/cadenza.ly | 2 +- input/collisions.ly | 2 +- input/font-body.ly | 2 +- input/font.ly | 2 +- input/font16.ly | 2 +- input/gourlay.ly | 2 +- input/keys.ly | 2 +- input/kortjakje.ly | 2 +- input/pedal.ly | 2 +- input/rhythm.ly | 2 +- input/scales.ly | 2 +- input/scripts.ly | 2 +- input/sleur.ly | 2 +- input/slurs.ly | 2 +- input/spacing.ly | 2 +- input/stem.ly | 2 +- input/toccata-fuga-E.ly | 2 +- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/lexer.l | 21 ++++++++++++++------- mi2mu/mudela-item.cc | 4 ++-- mi2mu/mudela-staff.cc | 2 ++ mi2mu/mudela-stream.cc | 2 +- 26 files changed, 47 insertions(+), 31 deletions(-) diff --git a/bin/convert-mudela.pl b/bin/convert-mudela.pl index e10af3b077..06578f3157 100644 --- a/bin/convert-mudela.pl +++ b/bin/convert-mudela.pl @@ -159,6 +159,12 @@ sub convert_0_1_7_to_0_1_8 s/\\plet *([1-9][0-9]*) *\/ *([2-9][0-9]*) *;/\\[$1\/$2/; } +sub convert_0_1_8_to_0_1_9 +{ +# sticky plet shorthand... +# print "introduced plet and finger shorthands...\n"; +} + ############################################################### sub last_conversion @@ -207,6 +213,7 @@ my %minor_conversions = ("0.0.50" => \&no_conv, "0.1.6" => \&convert_0_1_5_to_0_1_6 ,"0.1.7" => \&convert_0_1_6_to_0_1_7 ,"0.1.8" => \&convert_0_1_7_to_0_1_8 + ,"0.1.9" => \&convert_0_1_8_to_0_1_9 ); diff --git a/init/lily-init.ly b/init/lily-init.ly index 97c252cbd9..c609918c57 100644 --- a/init/lily-init.ly +++ b/init/lily-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "0.1.8"; +\version "0.1.9"; breve = \duration { -1 0 } longa = \duration { -2 0 } diff --git a/input/beams.ly b/input/beams.ly index e821fb164b..953bd7c02a 100644 --- a/input/beams.ly +++ b/input/beams.ly @@ -7,7 +7,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "0.1.8"; +\version "0.1.9"; \score{ \melodic { \multi 3 < diff --git a/input/cadenza.ly b/input/cadenza.ly index a4e49199f6..e05e2b6ad8 100644 --- a/input/cadenza.ly +++ b/input/cadenza.ly @@ -13,7 +13,7 @@ Tested Features: cadenza mode Ugh.. Wish we had grace notes.... It adds another dimension to this piece of music. %} -\version "0.1.8"; +\version "0.1.9"; cad = \melodic { diff --git a/input/collisions.ly b/input/collisions.ly index ac8d5db146..475f2e238b 100644 --- a/input/collisions.ly +++ b/input/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "0.1.8"; +\version "0.1.9"; diff --git a/input/font-body.ly b/input/font-body.ly index a7dd41d964..cd6938ef44 100644 --- a/input/font-body.ly +++ b/input/font-body.ly @@ -1,4 +1,4 @@ -\version "0.1.8"; +\version "0.1.9"; FontBody= \melodic{ \octave c'; \bar "|:"; diff --git a/input/font.ly b/input/font.ly index c683dc7362..0e92c3145d 100644 --- a/input/font.ly +++ b/input/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "0.1.8"; +\version "0.1.9"; \include "font-body.ly" \score{ diff --git a/input/font16.ly b/input/font16.ly index d836e27edb..9ba966fdf2 100644 --- a/input/font16.ly +++ b/input/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "0.1.8"; +\version "0.1.9"; \include "font-body.ly" \score{ diff --git a/input/gourlay.ly b/input/gourlay.ly index 26542f3b70..4d66ace0dd 100644 --- a/input/gourlay.ly +++ b/input/gourlay.ly @@ -4,7 +4,7 @@ copyright = "PD"; TestedFeatures = "This file tests some nasty Gourlay spacings"; } -\version "0.1.8"; +\version "0.1.9"; %{ diff --git a/input/keys.ly b/input/keys.ly index 67ee8f5a91..fc17241fbd 100644 --- a/input/keys.ly +++ b/input/keys.ly @@ -1,4 +1,4 @@ -\version "0.1.8"; +\version "0.1.9"; blah = \melodic{ diff --git a/input/kortjakje.ly b/input/kortjakje.ly index 25ed787784..f011d7bf27 100644 --- a/input/kortjakje.ly +++ b/input/kortjakje.ly @@ -11,7 +11,7 @@ copyright = "public domain"; Tested Features: example file with comments %} -\version "0.1.8"; +\version "0.1.9"; % the % is a comment. diff --git a/input/pedal.ly b/input/pedal.ly index d2a9c01c2a..d82a03e710 100644 --- a/input/pedal.ly +++ b/input/pedal.ly @@ -24,7 +24,7 @@ % \lbheel \lbheel \lfheel \lftoe % \rbheel \rbtoe \rfheel \rftoe -\version "0.1.8"; +\version "0.1.9"; \score{ \melodic { diff --git a/input/rhythm.ly b/input/rhythm.ly index 11569bf0f1..5b5289306a 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "0.1.8"; +\version "0.1.9"; ritme = \melodic{ %\octave ; \partial 8; diff --git a/input/scales.ly b/input/scales.ly index 3e715106f9..793e220585 100644 --- a/input/scales.ly +++ b/input/scales.ly @@ -12,7 +12,7 @@ copyright = "public domain"; % scales with accents. % -\version "0.1.8"; +\version "0.1.9"; blah = \melodic { \meter 6/8; \octave 'c ; diff --git a/input/scripts.ly b/input/scripts.ly index 7198bc1b83..7e9bc76163 100644 --- a/input/scripts.ly +++ b/input/scripts.ly @@ -1,5 +1,5 @@ -\version "0.1.8"; +\version "0.1.9"; blah = \melodic { diff --git a/input/sleur.ly b/input/sleur.ly index d6e30d3b2f..1226a9b7c0 100644 --- a/input/sleur.ly +++ b/input/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "0.1.8"; +\version "0.1.9"; shortlong = \melodic{ c4()c( c c | diff --git a/input/slurs.ly b/input/slurs.ly index ef66c1e9e8..3d45dea955 100644 --- a/input/slurs.ly +++ b/input/slurs.ly @@ -1,5 +1,5 @@ -\version "0.1.8"; +\version "0.1.9"; \score{ \melodic{\octave c'; diff --git a/input/spacing.ly b/input/spacing.ly index f92428fbcf..9da213e905 100644 --- a/input/spacing.ly +++ b/input/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "0.1.8"; +\version "0.1.9"; multipart = \melodic{ \multi 3 < diff --git a/input/stem.ly b/input/stem.ly index ee58946ea1..7bf1a4f42f 100644 --- a/input/stem.ly +++ b/input/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "0.1.8"; +\version "0.1.9"; beamintervals = \melodic{ \meter 7/4; diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly index 124d0e3855..1c5c9c42c3 100644 --- a/input/toccata-fuga-E.ly +++ b/input/toccata-fuga-E.ly @@ -20,7 +20,7 @@ copyright = "public domain"; %} -\version "0.1.8"; +\version "0.1.9"; toccata_commands = \melodic{ \meter 4/4; diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 4d11d3a6e2..0984052f53 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -12,7 +12,7 @@ copyright = "public domain"; Tested Features lyrics and chords %} -\version "0.1.8"; +\version "0.1.9"; melodie = \melodic { \clef"violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 050bfda518..2575f80979 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -15,7 +15,7 @@ copyright = "public domain"; Tested Features: lyrics, interleaving lyrics and staffs %} -\version "0.1.8"; +\version "0.1.9"; melody = \melodic{ \clef violin; diff --git a/lily/lexer.l b/lily/lexer.l index ab97828bc1..c7df7be95e 100644 --- a/lily/lexer.l +++ b/lily/lexer.l @@ -73,7 +73,9 @@ NATIONAL [\001-\006\021-\027\031\036\200-\377] TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL} WORD {A}{AN}* ALPHAWORD {A}+ -INT -?{N}+ +DIGIT {N} +UNSIGNED {N}+ +INT -?{UNSIGNED} REAL ({INT}\.{N}*)|(-?\.{N}+) KEYWORD \\{WORD} WHITE [ \n\t\f] @@ -188,9 +190,14 @@ TELP \\\] return scan_escaped_word (YYText ()+1); } - {INT} { + {DIGIT} { yylval.i = String_convert::dec2_i (String (YYText ())); - return INT; + return DIGIT; + } + + {UNSIGNED} { + yylval.i = String_convert::dec2_i (String (YYText ())); + return UNSIGNED; } \" { @@ -223,9 +230,9 @@ TELP \\\] \" { start_quote (); } - {INT} { + {UNSIGNED} { yylval.i = String_convert::dec2_i (String (YYText ())); - return INT; + return UNSIGNED; } {NOTECOMMAND} { return scan_escaped_word (YYText ()+1); @@ -272,9 +279,9 @@ TELP \\\] return REAL; } -{INT} { +{UNSIGNED} { yylval.i = String_convert::dec2_i (String (YYText ())); - return INT; + return UNSIGNED; } [{}] { diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc index a7feee56dd..136e03a7d6 100644 --- a/mi2mu/mudela-item.cc +++ b/mi2mu/mudela-item.cc @@ -192,10 +192,10 @@ Mudela_note::str () = mudela_column_l_->mudela_score_l_->mudela_key_l_->notename_str (pitch_i_); if (simple_plet_b_s) - return name_str + Duration_convert::dur2_str (dur) + " "; + return name_str + Duration_convert::dur2_str (dur) + " "; - //ugh String str; + //ugh if (dur.plet_b ()) str += String ("\\[") + String_convert::i2dec_str (dur.plet_.iso_i_, 0, 0) diff --git a/mi2mu/mudela-staff.cc b/mi2mu/mudela-staff.cc index 86972df41b..8507335f9d 100644 --- a/mi2mu/mudela-staff.cc +++ b/mi2mu/mudela-staff.cc @@ -100,6 +100,8 @@ Mudela_staff::output (Mudela_stream& mudela_stream_r) mudela_stream_r << _("% midi copyright:") << copyright_str_ << "\n"; mudela_stream_r << _("% instrument:") << instrument_str_ << "\n"; + // don't use last duration mode + mudela_stream_r << "\\duration 4;\n"; if (mudela_voice_p_list_.size() == 1) mudela_voice_p_list_.top()->output (mudela_stream_r); else diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc index 02e4858a44..d54b9cea57 100644 --- a/mi2mu/mudela-stream.cc +++ b/mi2mu/mudela-stream.cc @@ -81,7 +81,7 @@ Mudela_stream::header() *os_p_ << filename_str_g; *os_p_ << "\n\n"; // ugh - *os_p_ << "\\version \"0.1.8\";\n"; + *os_p_ << "\\version \"0.1.9\";\n"; } void -- 2.39.5