smf 0.15.12 → 0.15.15

data/MANUAL.rd

@@ -111,6 +111,7 @@ Enumerable
 
   nil �����Ǥ�̵�뤵��ޤ���
 
+: join
 : join!
   �ȥ�å���ҤȤĤˤ��ޤ���
   EOT �ϡ����ե��åȤ���äȤ��礭�ʤ�Τ����Ѥ���ޤ���

data/README

@@ -1,33 +1,33 @@
-SMF �⥸�塼��
+SMF モジュール
 ==============
 
-SMF �ϥ��֥������Ȼظ�������ץȸ��� Ruby �Τ���Ρ��֥����������MIDI��
-������ץ⥸�塼��Ǥ���
+SMF はオブジェクト指向スクリプト言語 Ruby のための、「スタンダードMIDI
+ファイル」モジュールです。
 
 
-���󥹥ȡ���
+インストール
 ------------
 
-������ץ� "install.rb" ��Ĥ����ޤ���
+スクリプト "install.rb" をつかいます。
 
   $ ruby install.rb config
   $ ruby install.rb setup
  ($ su)
   # ruby install.rb install
 
-���路���ϡ�"ruby install.rb --help" �Ȥ��Ƥ���������
+くわしくは、"ruby install.rb --help" としてください。
 
 
-����ʸ��
+参考文献
 --------
 
-MIDI ���ʶ��IJ��MIDI 1.0 ���ʡץ�åȡ��ߥ塼���å� 1989
+MIDI 規格協議会「MIDI 1.0 規格」リットーミュージック 1989
 
-�����Żһ��ȶ����MIDI 1.0 ���ʽ�ץ�åȡ��ߥ塼���å� 1998
+音楽電子事業協会「MIDI 1.0 規格書」リットーミュージック 1998
 
-JIS X 6054-1,2:1999 �Żҳڴ�ǥ������륤�󥿡��ե����� (MIDI)
+JIS X 6054-1,2:1999 電子楽器ディジタルインターフェイス (MIDI)
 
 
-������� (�դʤФ����褷)
+ふなばただよし
 mailto:tadf@funaba.org
 http://www.funaba.org/

data/README.en

@@ -1,12 +1,12 @@
 An "SMF" module
-==============
+===============
 
-SMF is a "Standard MIDI File" module for an object‐oriented
-scripting language Ruby.
+SMF is a "Standard MIDI File" module for an object-oriented scripting
+language Ruby.
 
 
 Install
-‐‐‐‐‐‐‐
+-------
 
 Use the script "install.rb".
 
@@ -15,19 +15,19 @@ Use the script "install.rb".
  ($ su)
   # ruby install.rb install
 
-For more information, type "ruby install.rb ‐‐help".
+For more information, type "ruby install.rb --help".
 
 
 References
-‐‐‐‐‐‐‐‐‐‐
+----------
 
-MIDI kikaku kyogi‐kai, MIDI 1.0 kikaku, rittor music 1989
+MIDI Kikaku Kyōgi-kai, MIDI 1.0 Kikaku, rittor music 1989
 
-ongaku denshi jigyo kyokai, MIDI 1.0 kikaku‐sho, rittor music 1998
+Ongaku Denshi Jigyō Kyōkai, MIDI 1.0 Kikaku-sho, Rittor Music 1998
 
-JIS X 6054‐1,2:1999 Musical Instrument Digital Interface (MIDI)
+JIS X 6054-1,2:1999 Musical Instrument Digital Interface (MIDI)
 
 
 Tadayoshi Funaba
 mailto:tadf@funaba.org
-http://www.funaba.org/en/
+http://www.funaba.org/

data/lib/smf.rb

@@ -1,5 +1,5 @@
-# smf.rb: Written by Tadayoshi Funaba 1998-2006,2008
-# $Id: smf.rb,v 1.39 2008-07-06 00:00:43+09 tadf Exp $
+# smf.rb: Written by Tadayoshi Funaba 1998-2006,2008,2012,2014
+# $Id: smf.rb,v 1.41 2014-04-27 08:44:26+09 tadf Exp $
 
 require 'smf/io'
 require 'forwardable'
@@ -31,6 +31,8 @@ module SMF
 
       def ntrks() @arr.count{|x| x} end
 
+      alias_method :nitems, :ntrks
+
     else
 
       def ntrks() @arr.nitems end
@@ -131,6 +133,8 @@ module SMF
 
       def nevts() @arr.count{|x| x} end
 
+      alias_method :nitems, :nevts
+
     else
 
       def nevts() @arr.nitems end
@@ -467,7 +471,7 @@ module SMF
 
       end
     end;
-  end
+  end # <<"x"
 
   [ 'LocalControl', # val:0/127
     'MonoMode',     # val:0/16
@@ -584,7 +588,7 @@ module SMF
 
       end
     end;
-  end
+  end # <<"x"
 
   Text01 = GeneralPurposeText
   Text02 = CopyrightNotice

data/lib/smf/toy/beatmap.rb

@@ -1,8 +1,8 @@
-# beatmap.rb: Written by Tadayoshi Funaba 2005,2006
-# $Id: beatmap.rb,v 1.3 2006-11-10 21:58:21+09 tadf Exp $
+# beatmap.rb: Written by Tadayoshi Funaba 2005,2006,2014
+# $Id: beatmap.rb,v 1.4 2014-04-27 08:46:58+09 tadf Exp $
 
 require 'smf/toy/searchsegment'
-require 'rational'
+require 'rational' unless defined?(Rational)
 
 module SMF
 

data/lib/smf/toy/gm.rb

@@ -1,5 +1,5 @@
-# gm.rb: Written by Tadayoshi Funaba 2005
-# $Id: gm.rb,v 1.2 2005-07-17 17:07:37+09 tadf Exp $
+# gm.rb: Written by Tadayoshi Funaba 2005,2012
+# $Id: gm.rb,v 1.3 2014-03-22 07:48:58+09 tadf Exp $
 
 module SMF
 
@@ -9,14 +9,14 @@ module SMF
     ['DataEntryMSB', 6],
     ['ChannelVolumeMSB', 7],
     ['PanMSB', 10],
-    ['ExpressioMSB', 11],
+    ['ExpressionMSB', 11],
     ['BankSelectLSB', 32 + 0],
     ['ModulationDepthLSB', 32 + 1],
     ['PortamentoTimeLSB', 32 + 5],
     ['DataEntryLSB', 32 + 6],
     ['ChannelVolumeLSB', 32 + 7],
     ['PanLSB', 32 + 10],
-    ['ExpressioLSB', 32 + 11],
+    ['ExpressionLSB', 32 + 11],
     ['Hold1', 64],
     ['PortamentoOnOff', 65],
     ['Sostenuto', 66],
@@ -44,7 +44,7 @@ module SMF
 
       end
     end;
-  end
+  end # <<"x"
 
   [ ['PitchBendSensitivity', 0, 0],
     ['ChannelFineTune', 1, 0],
@@ -69,7 +69,7 @@ module SMF
 
       end
     end;
-  end
+  end # <<"x"
 
   class MasterVolume < ExclusiveF0
 

data/lib/smf/toy/groove.rb

@@ -1,5 +1,5 @@
-# groove.rb: Written by Tadayoshi Funaba 2005,2006,2008
-# $Id: groove.rb,v 1.3 2008-02-16 16:56:21+09 tadf Exp $
+# groove.rb: Written by Tadayoshi Funaba 2005,2006,2008,2014
+# $Id: groove.rb,v 1.4 2014-03-22 07:48:58+09 tadf Exp $
 
 require 'gsl'
 
@@ -14,9 +14,9 @@ module SMF
 	x << @unit / (pat.size - 1) * i
 	y << p * div * 4
       end
-      @x = GSL::Vector.alloc(x)
-      @y = GSL::Vector.alloc(y)
-      @interp = GSL::Interp.alloc('linear', pat.size)
+      x2 = GSL::Vector.alloc(x)
+      y2 = GSL::Vector.alloc(y)
+      @spline = GSL::Spline.alloc('linear', x2, y2)
       self.amount = 0.5
     end
 
@@ -24,7 +24,7 @@ module SMF
 
     def groove(ev)
       q, r = ev.offset.divmod(@unit)
-      r2 = @interp.eval(@x, @y, r)
+      r2 = @spline.eval(r)
       r3 = r + (r2 - r) * @amount
       ev.offset = (q * @unit + r3).round
     end

data/lib/smf/toy/macro.rb

@@ -1,9 +1,9 @@
-# macro.rb: Written by Tadayoshi Funaba 1999-2006
-# $Id: macro.rb,v 1.5 2006-11-10 21:58:21+09 tadf Exp $
+# macro.rb: Written by Tadayoshi Funaba 1999-2006,2012,2014
+# $Id: macro.rb,v 1.7 2014-04-27 08:46:58+09 tadf Exp $
 
 require 'smf'
 require 'smf/toy/gm'
-require 'rational'
+require 'rational' unless defined?(Rational)
 
 module SMF
 
@@ -95,8 +95,8 @@ module SMF
 	      ke[sf] = [0] * 12
 	      d = if sf < 0 then -1 else +1 end
 	      b = if d == 1 then 5 else 11 end
-	      sf.to_i.abs.times do |i|
-		n = (b + 7 * i * d) % 12
+	      sf.to_i.abs.times do |j|
+		n = (b + 7 * j * d) % 12
 		ke[sf][n] += d
 	      end
 	    end

data/lib/smf/toy/macro/mml/parser.rb

@@ -1,25 +1,22 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "parser.ry".
+# This file is automatically generated by Racc 1.4.11
+# from Racc grammer file "".
 #
 
-require 'racc/parser'
-
+require 'racc/parser.rb'
 
 
 require 'smf'
 require 'smf/toy/macro'
-require 'rational'
+require 'rational' unless defined?(Rational)
 
 class SemanticError < StandardError; end
 
-
 module SMF
-
   class MMLParser < Racc::Parser
 
-module_eval <<'..end parser.ry modeval..id74aaf71953', 'parser.ry', 66
+module_eval(<<'...end parser.ry/module_eval...', 'parser.ry', 66)
 
   STEPTAB = { 'w'=>1.to_r/1, 'h'=>1.to_r/2,
 	      'q'=>1.to_r/4, 'i'=>1.to_r/8,
@@ -38,7 +35,7 @@ module_eval <<'..end parser.ry modeval..id74aaf71953', 'parser.ry', 66
 
   def next_token
     loop do
-      @str = @str.sub(/\A([\s\v]+)/, '')
+      @str = @str.sub(/\A(\s+)/, '')
       if $1
 	@co += $1.count("\n")
       end
@@ -116,355 +113,353 @@ module_eval <<'..end parser.ry modeval..id74aaf71953', 'parser.ry', 66
     end
   end
 
-..end parser.ry modeval..id74aaf71953
-
-##### racc 1.4.5 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 1, 20, :_reduce_1,
- 0, 21, :_reduce_2,
- 2, 21, :_reduce_3,
- 1, 22, :_reduce_4,
- 2, 22, :_reduce_5,
- 1, 23, :_reduce_6,
- 1, 23, :_reduce_none,
- 1, 23, :_reduce_none,
- 1, 23, :_reduce_none,
- 3, 23, :_reduce_10,
- 1, 25, :_reduce_11,
- 1, 26, :_reduce_12,
- 3, 27, :_reduce_13,
- 5, 27, :_reduce_14,
- 3, 24, :_reduce_15,
- 3, 24, :_reduce_16,
- 3, 24, :_reduce_17,
- 3, 24, :_reduce_18,
- 3, 24, :_reduce_19,
- 1, 24, :_reduce_20,
- 3, 28, :_reduce_21,
- 3, 28, :_reduce_22,
- 3, 28, :_reduce_23,
- 3, 28, :_reduce_24,
- 2, 28, :_reduce_25,
- 3, 28, :_reduce_26,
- 1, 28, :_reduce_27 ]
-
-racc_reduce_n = 28
-
-racc_shift_n = 48
+...end parser.ry/module_eval...
+##### State transition tables begin ###
 
 racc_action_table = [
-    19,    20,    21,    22,    37,    39,    40,    41,    18,    26,
-    26,    26,    10,    33,    13,    26,    26,    42,    25,    25,
-    25,    28,    28,    28,    25,    25,    26,    28,    28,    17,
-    26,    26,    26,    37,    39,    25,    26,    16,    28,    25,
-    25,    25,    28,    28,    28,    25,    19,    20,    28,    37,
-    39,    40,    41,     3,    14,    34,    15,     4,     6,   nil,
-    38,    10,    14,    13,    15,     4,     6,   nil,    10,    10,
-    13,    13,    37,    39,    40,    41,    19,    20,    21,    22,
-    10,   nil,    13,    19,    20,    37,    39 ]
+    20,    21,    18,    19,    37,    38,    35,    36,    23,    28,
+    28,    28,    14,    34,    15,    28,    28,    46,    29,    29,
+    29,    30,    30,    30,    29,    29,    28,    30,    30,    17,
+    28,    28,    28,    37,    38,    29,    28,    16,    30,    29,
+    29,    29,    30,    30,    30,    29,    37,    38,    30,    37,
+    38,    35,    36,    14,    10,    15,    11,    12,    13,     3,
+    41,    14,   nil,    15,    10,    32,    11,    12,    13,   nil,
+    14,    14,    15,    15,    37,    38,    35,    36,    20,    21,
+    18,    19,    20,    21,    20,    21 ]
 
 racc_action_check = [
-    23,    23,    23,    23,    35,    35,    35,    35,     7,    26,
-    38,    41,    10,    23,    10,    37,    40,    35,    26,    38,
-    41,    26,    38,    41,    37,    40,    17,    37,    40,     6,
-    19,    20,    25,    46,    46,    17,    39,     3,    17,    19,
-    20,    25,    19,    20,    25,    39,    32,    32,    39,    27,
-    27,    27,    27,     1,    24,    24,    24,    24,    24,   nil,
-    27,    24,     2,    24,     2,     2,     2,   nil,    21,     2,
-    21,     2,    44,    44,    44,    44,     8,     8,     8,     8,
-    22,   nil,    22,    31,    31,    47,    47 ]
+    24,    24,    24,    24,    40,    40,    40,    40,    13,    29,
+    36,    35,    18,    24,    18,    41,    38,    40,    29,    36,
+    35,    29,    36,    35,    41,    38,    37,    41,    38,     5,
+    23,    20,    21,    42,    42,    37,    28,     3,    37,    23,
+    20,    21,    23,    20,    21,    28,    43,    43,    28,    33,
+    33,    33,    33,    14,     2,    14,     2,     2,     2,     1,
+    33,     2,   nil,     2,    22,    22,    22,    22,    22,   nil,
+    19,    22,    19,    22,    47,    47,    47,    47,     6,     6,
+     6,     6,    26,    26,    25,    25 ]
 
 racc_action_pointer = [
-   nil,    53,    54,    37,   nil,   nil,    16,     1,    73,   nil,
-    -3,   nil,   nil,   nil,   nil,   nil,   nil,    20,   nil,    24,
-    25,    53,    65,    -3,    46,    26,     3,    46,   nil,   nil,
-   nil,    80,    43,   nil,   nil,     1,   nil,     9,     4,    30,
-    10,     5,   nil,   nil,    69,   nil,    30,    82 ]
+   nil,    59,    46,    37,   nil,    22,    75,   nil,   nil,   nil,
+   nil,   nil,   nil,    -5,    38,   nil,   nil,   nil,    -3,    55,
+    25,    26,    56,    24,    -3,    81,    79,   nil,    30,     3,
+   nil,   nil,   nil,    46,   nil,     5,     4,    20,    10,   nil,
+     1,     9,    30,    43,   nil,   nil,   nil,    71 ]
 
 racc_action_default = [
-    -2,   -28,    -1,   -28,   -12,    -3,   -28,    -4,    -6,    -7,
-   -28,    -8,    -9,   -20,    -2,   -11,    48,   -28,    -5,   -28,
-   -28,   -28,   -28,   -28,   -28,   -28,   -28,   -13,   -27,   -17,
-   -18,   -15,   -16,   -19,   -10,   -28,   -25,   -28,   -28,   -28,
-   -28,   -28,   -26,   -23,   -14,   -24,   -21,   -22 ]
+    -2,   -28,    -1,   -28,    -3,    -4,    -6,    -7,    -8,    -9,
+    -2,   -11,   -12,   -28,   -28,   -20,    48,    -5,   -28,   -28,
+   -28,   -28,   -28,   -28,   -28,   -15,   -16,   -17,   -28,   -28,
+   -27,   -18,   -10,   -13,   -19,   -28,   -28,   -28,   -28,   -25,
+   -28,   -28,   -21,   -22,   -23,   -24,   -26,   -14 ]
 
 racc_goto_table = [
-    27,     2,    29,    30,     1,    23,   nil,   nil,    35,    36,
-   nil,   nil,   nil,   nil,   nil,    24,    31,    32,   nil,   nil,
-    43,    44,    45,    46,    47 ]
+    27,    31,     2,    33,     1,   nil,    24,   nil,    39,    40,
+    25,    26,    22,   nil,   nil,    42,    43,    44,    45,   nil,
+   nil,    47 ]
 
 racc_goto_check = [
-     9,     2,     9,     9,     1,     5,   nil,   nil,     9,     9,
-   nil,   nil,   nil,   nil,   nil,     2,     5,     5,   nil,   nil,
-     9,     9,     9,     9,     9 ]
+     9,     9,     2,     9,     1,   nil,     5,   nil,     9,     9,
+     5,     5,     2,   nil,   nil,     9,     9,     9,     9,   nil,
+   nil,     9 ]
 
 racc_goto_pointer = [
-   nil,     4,     1,   nil,   nil,    -5,   nil,   nil,   nil,   -17 ]
+   nil,     4,     2,   nil,   nil,    -8,   nil,   nil,   nil,   -20 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     5,     7,     8,     9,    11,    12,   nil ]
+   nil,   nil,   nil,     4,     5,     6,     7,     8,     9,   nil ]
 
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :UMINUS => 2,
- "*" => 3,
- "/" => 4,
- "+" => 5,
- "-" => 6,
- "&" => 7,
- "{" => 8,
- "}" => 9,
- :NOTE => 10,
- :TEXT => 11,
- :VAR => 12,
- :AOP => 13,
- "," => 14,
- "(" => 15,
- ")" => 16,
- :STEP => 17,
- :NUM => 18 }
+racc_reduce_table = [
+  0, 0, :racc_error,
+  1, 20, :_reduce_1,
+  0, 21, :_reduce_2,
+  2, 21, :_reduce_3,
+  1, 22, :_reduce_4,
+  2, 22, :_reduce_5,
+  1, 23, :_reduce_6,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  3, 23, :_reduce_10,
+  1, 25, :_reduce_11,
+  1, 26, :_reduce_12,
+  3, 27, :_reduce_13,
+  5, 27, :_reduce_14,
+  3, 24, :_reduce_15,
+  3, 24, :_reduce_16,
+  3, 24, :_reduce_17,
+  3, 24, :_reduce_18,
+  3, 24, :_reduce_19,
+  1, 24, :_reduce_20,
+  3, 28, :_reduce_21,
+  3, 28, :_reduce_22,
+  3, 28, :_reduce_23,
+  3, 28, :_reduce_24,
+  2, 28, :_reduce_25,
+  3, 28, :_reduce_26,
+  1, 28, :_reduce_27 ]
 
-racc_use_result_var = true
+racc_reduce_n = 28
+
+racc_shift_n = 48
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :UMINUS => 2,
+  "*" => 3,
+  "/" => 4,
+  "+" => 5,
+  "-" => 6,
+  "&" => 7,
+  "{" => 8,
+  "}" => 9,
+  :NOTE => 10,
+  :TEXT => 11,
+  :VAR => 12,
+  :AOP => 13,
+  "," => 14,
+  "(" => 15,
+  ")" => 16,
+  :STEP => 17,
+  :NUM => 18 }
 
 racc_nt_base = 19
 
+racc_use_result_var = true
+
 Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
 
 Racc_token_to_s_table = [
-'$end',
-'error',
-'UMINUS',
-'"*"',
-'"/"',
-'"+"',
-'"-"',
-'"&"',
-'"{"',
-'"}"',
-'NOTE',
-'TEXT',
-'VAR',
-'AOP',
-'","',
-'"("',
-'")"',
-'STEP',
-'NUM',
-'$start',
-'prog',
-'list',
-'stmt',
-'expr',
-'step',
-'note',
-'text',
-'asgn',
-'num']
+  "$end",
+  "error",
+  "UMINUS",
+  "\"*\"",
+  "\"/\"",
+  "\"+\"",
+  "\"-\"",
+  "\"&\"",
+  "\"{\"",
+  "\"}\"",
+  "NOTE",
+  "TEXT",
+  "VAR",
+  "AOP",
+  "\",\"",
+  "\"(\"",
+  "\")\"",
+  "STEP",
+  "NUM",
+  "$start",
+  "prog",
+  "list",
+  "stmt",
+  "expr",
+  "step",
+  "note",
+  "text",
+  "asgn",
+  "num" ]
 
 Racc_debug_parser = false
 
-##### racc system variables end #####
+##### State transition tables end #####
 
- # reduce 0 omitted
+# reduce 0 omitted
 
-module_eval <<'.,.,', 'parser.ry', 13
-  def _reduce_1( val, _values, result )
- result = val[0]
-   result
+module_eval(<<'.,.,', 'parser.ry', 13)
+  def _reduce_1(val, _values, result)
+     result = val[0] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 15
-  def _reduce_2( val, _values, result )
- result = [:list, []]
-   result
+module_eval(<<'.,.,', 'parser.ry', 15)
+  def _reduce_2(val, _values, result)
+     result = [:list, []] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 16
-  def _reduce_3( val, _values, result )
- val[0][1] << val[1]; result = val[0]
-   result
+module_eval(<<'.,.,', 'parser.ry', 16)
+  def _reduce_3(val, _values, result)
+     val[0][1] << val[1]; result = val[0] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 19
-  def _reduce_4( val, _values, result )
- result = [:stmt, val[0]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 19)
+  def _reduce_4(val, _values, result)
+     result = [:stmt, val[0]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 20
-  def _reduce_5( val, _values, result )
- result = [:stmt, val[0], val[1]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 20)
+  def _reduce_5(val, _values, result)
+     result = [:stmt, val[0], val[1]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 23
-  def _reduce_6( val, _values, result )
- result = [:step, val[0]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 23)
+  def _reduce_6(val, _values, result)
+     result = [:step, val[0]] 
+    result
   end
 .,.,
 
- # reduce 7 omitted
+# reduce 7 omitted
 
- # reduce 8 omitted
+# reduce 8 omitted
 
- # reduce 9 omitted
+# reduce 9 omitted
 
-module_eval <<'.,.,', 'parser.ry', 25
-  def _reduce_10( val, _values, result )
- result = val[1]
-   result
+module_eval(<<'.,.,', 'parser.ry', 25)
+  def _reduce_10(val, _values, result)
+     result = val[1] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 28
-  def _reduce_11( val, _values, result )
- result = [:note, val[0]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 28)
+  def _reduce_11(val, _values, result)
+     result = [:note, val[0]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 29
-  def _reduce_12( val, _values, result )
- result = [:text, val[0]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 29)
+  def _reduce_12(val, _values, result)
+     result = [:text, val[0]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 32
-  def _reduce_13( val, _values, result )
- result = [:asgn, val[0], val[1], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 32)
+  def _reduce_13(val, _values, result)
+     result = [:asgn, val[0], val[1], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 34
-  def _reduce_14( val, _values, result )
- result = [:asgn, val[0], val[1], val[2], val[4]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 34)
+  def _reduce_14(val, _values, result)
+     result = [:asgn, val[0], val[1], val[2], val[4]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 37
-  def _reduce_15( val, _values, result )
- result = [:add, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 37)
+  def _reduce_15(val, _values, result)
+     result = [:add, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 38
-  def _reduce_16( val, _values, result )
- result = [:sub, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 38)
+  def _reduce_16(val, _values, result)
+     result = [:sub, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 39
-  def _reduce_17( val, _values, result )
- result = [:mul, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 39)
+  def _reduce_17(val, _values, result)
+     result = [:mul, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 40
-  def _reduce_18( val, _values, result )
- result = [:div, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 40)
+  def _reduce_18(val, _values, result)
+     result = [:div, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 41
-  def _reduce_19( val, _values, result )
- result = val[1]
-   result
+module_eval(<<'.,.,', 'parser.ry', 41)
+  def _reduce_19(val, _values, result)
+     result = val[1] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 42
-  def _reduce_20( val, _values, result )
- result = [:imm, val[0]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 42)
+  def _reduce_20(val, _values, result)
+     result = [:imm, val[0]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 45
-  def _reduce_21( val, _values, result )
- result = [:add, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 45)
+  def _reduce_21(val, _values, result)
+     result = [:add, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 46
-  def _reduce_22( val, _values, result )
- result = [:sub, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 46)
+  def _reduce_22(val, _values, result)
+     result = [:sub, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 47
-  def _reduce_23( val, _values, result )
- result = [:mul, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 47)
+  def _reduce_23(val, _values, result)
+     result = [:mul, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 48
-  def _reduce_24( val, _values, result )
- result = [:div, val[0], val[2]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 48)
+  def _reduce_24(val, _values, result)
+     result = [:div, val[0], val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 49
-  def _reduce_25( val, _values, result )
- result = [:negate, val[1]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 49)
+  def _reduce_25(val, _values, result)
+     result = [:negate, val[1]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 50
-  def _reduce_26( val, _values, result )
- result = val[1]
-   result
+module_eval(<<'.,.,', 'parser.ry', 50)
+  def _reduce_26(val, _values, result)
+     result = val[1] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.ry', 51
-  def _reduce_27( val, _values, result )
- result = [:imm, val[0]]
-   result
+module_eval(<<'.,.,', 'parser.ry', 51)
+  def _reduce_27(val, _values, result)
+     result = [:imm, val[0]] 
+    result
   end
 .,.,
 
- def _reduce_none( val, _values, result )
-  result
- end
+def _reduce_none(val, _values, result)
+  val[0]
+end
 
   end   # class MMLParser
-
-end   # module SMF
+  end   # module SMF
 
 
 module SMF