release: 0.0.65

[lilypond.git] / mi2mu / midi-event.cc

diff --git a/mi2mu/midi-event.cc b/mi2mu/midi-event.cc
index c909e07c7b1bf9de10ad9dff3080bcbb973cc242..e98149d597d96989dd2d424f0f368906549f6341 100644 (file)
--- a/mi2mu/midi-event.cc
+++ b/mi2mu/midi-event.cc
@@ -39,8 +39,6 @@ Midi_key::mudela_str( bool command_mode_bo )
                str += String( (char)( ( key_i_ + 2 ) % 7 + 'A'  ) );
        else // heu, -2: should be - 1 1/2: A -> fis
                str += String( (char)( ( key_i_ + 2 - 2 ) % 7 + 'a'  ) );
-//     if ( !command_mode_bo )
-//         str =  String( '\\' ) + str;
        str = String( "%" ) + str + "\n"; // "\key\F" not supported yet...
        return str;
 }
@@ -80,7 +78,13 @@ Midi_key::notename_str( int pitch_i )
 }
 
 // statics Midi_note
-bool const Midi_note::simple_plet_b_s = false;
+/*
+ this switch can be used to write simple plets like 
+     c4*2/3 
+ as  
+     \plet 2/3; c4 \plet 1/1;
+ */
+bool const Midi_note::simple_plet_b_s = true;
 
 Midi_note::Midi_note( String name_str, Duration dur )
 {
@@ -93,17 +97,20 @@ String
 Midi_note::mudela_str( bool command_mode_bo )
 {
 //     assert( !command_mode_bo );
+       if ( !dur_.type_i_ )
+               return "";
+
        if ( simple_plet_b_s )
                return name_str_ + Duration_convert::dur2_str( dur_ );
 
        //ugh
        String str;
        if ( dur_.plet_b() )
-               str += String( "\\plet{ " )
+               str += String( "\\plet " )
                        + String_convert::i2dec_str( dur_.plet_.iso_i_, 0, 0 )
                        + "/"
                        + String_convert::i2dec_str( dur_.plet_.type_i_, 0, 0 )
-                       + " } ";
+                       + "; ";
 
        str += name_str_;
 
@@ -112,7 +119,7 @@ Midi_note::mudela_str( bool command_mode_bo )
        str += Duration_convert::dur2_str( dur );
 
        if ( dur_.plet_b() )
-               str += String( " \\plet{ 1/1 }" );
+               str += String( " \\plet 1/1;" );
                
        return str;
 }
@@ -174,7 +181,7 @@ Midi_time::Midi_time( int num_i, int den_i, int clocks_4_i, int count_32_i )
 {
        sync_f_ = 1.0;
        if ( count_32_i != 8 )
-               warning( String( "#32 in quarter: " ) + String( count_32_i ), 0 );
+               warning( String( "#32 in quarter: " ) + String( count_32_i ));
        num_i_ = num_i;
        den_i_ = den_i;
        clocks_1_i_ = clocks_4_i * 4; 
@@ -207,11 +214,9 @@ Midi_time::num_i()
 String
 Midi_time::mudela_str( bool command_mode_bo )
 {
-       String str = "\\meter{ "
+       String str = "\\meter "
                + String( num_i_ ) + "/" + String( 1 << den_i_ ) 
-               + " }";
-//     if ( !command_mode_bo )
-//         str =  String( '\\' ) + str;
+               + ";";
        return str;
 }