smf 0.15.12 → 0.15.15

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

@@ -1,5 +1,5 @@
-# parser.ry: Written by Tadayoshi Funaba 1999-2005,2008
-# $Id: parser.ry,v 1.3 2008-02-16 16:56:21+09 tadf Exp $
+# parser.ry: Written by Tadayoshi Funaba 1999-2005,2008,2014
+# $Id: parser.ry,v 1.5 2014-04-27 08:46:58+09 tadf Exp $
 
 class SMF::MMLParser
 
@@ -58,7 +58,7 @@ end
 
 require 'smf'
 require 'smf/toy/macro'
-require 'rational'
+require 'rational' unless defined?(Rational)
 
 class SemanticError < StandardError; end
 
@@ -81,7 +81,7 @@ class SemanticError < StandardError; end
 
   def next_token
     loop do
-      @str = @str.sub(/\A([\s\v]+)/, '')
+      @str = @str.sub(/\A(\s+)/, '')
       if $1
 	@co += $1.count("\n")
       end

data/lib/smf/toy/macro/stt.rb

@@ -1,28 +1,37 @@
-# stt.rb: Written by Tadayoshi Funaba 2005
-# $Id: stt.rb,v 1.2 2005-07-17 17:08:20+09 tadf Exp $
-
-$KCODE = 'e'
+# coding: utf-8
+# stt.rb: Written by Tadayoshi Funaba 2005,2014
+# $Id: stt.rb,v 1.3 2014-04-27 08:46:58+09 tadf Exp $
+
+unless defined?(Encoding)
+  $KCODE = 'u'
+  require 'jcode'
+else
+#  Encoding.default_external = 'utf-8'
+end
 
 require 'smf/toy/macro/mml'
 require 'kconv'
-require 'jcode'
 
 module SMF
 
   class STT < MML
 
-    NOTETAB = { '��'=>'a', '��'  =>'b', '��'=>'c', '��'=>'d',
-		'��'=>'e', '�ե�'=>'f', '��'=>'g', '��'=>'r' }
+    NOTETAB = { 'ラ'=>'a', 'シ'  =>'b', 'ド'=>'c', 'レ'=>'d',
+		'ミ'=>'e', 'ファ'=>'f', 'ソ'=>'g', 'ッ'=>'r' }
 
     def << (s)
-      s2 = s.toeuc.
-	gsub(/(��|��|��|��|��|�ե�|��|��)([$%#�����]+)?([,'����]+)?(��+)?/) do
+      s2 = s.toutf8.
+	gsub(/(ラ|シ|ド|レ|ミ|ファ|ソ|ッ)([$%#♭％＃]+)?([,'，’]+)?(ー+)?/) do
 	n, s, o, x = $1, $2, $3, $4
 	no = NOTETAB[n]
-	no += s.tr('�����', '$%#') if s
-	no += o.tr('����', ",'") if o
+	no += s.tr('♭％＃', '$%#') if s
+	no += o.tr('，’', ",'") if o
 	le = 1
-	le += x.jsize if x
+	if ''.respond_to?(:jsize)
+	  le += x.jsize if x
+	else
+	  le += x.size if x
+	end
 	format('{le*=%d %s}', le, no)
       end
       super(s2)

data/lib/smf/toy/shuffle.rb

@@ -1,5 +1,5 @@
-# shuffle.rb: Written by Tadayoshi Funaba 2005,2006,2008
-# $Id: shuffle.rb,v 1.4 2008-02-16 16:56:21+09 tadf Exp $
+# shuffle.rb: Written by Tadayoshi Funaba 2005,2006,2008,2014
+# $Id: shuffle.rb,v 1.5 2014-03-22 07:48:58+09 tadf Exp $
 
 require 'gsl'
 
@@ -7,30 +7,22 @@ module SMF
 
   class Shuffle
 
-    def initialize(div, unit=1.0/8)
-      @unit = unit * div * 4
+    def initialize(div, beat=1.0/8)
+      @unit = beat * div * 4
       self.amount = 0.5
     end
 
     def amount=(v)
-=begin
-      shift = @unit / 2 * v
-      @x = GSL::Vector.alloc(0, @unit / 2,         @unit)
-      @y = GSL::Vector.alloc(0, @unit / 2 + shift, @unit)
-      @interp = Interp.alloc('linear', 3)
-=end
-#=begin
       qunit = @unit / 4
-      shift = @unit / 4 * v
-      @x = GSL::Vector.alloc(0, qunit, qunit*2, qunit*3, @unit)
-      @y = GSL::Vector.alloc(0, qunit, qunit*2 + shift, qunit*3 + shift/2, @unit)
-      @interp = GSL::Interp.alloc('linear', 5)
-#=end
+      shift = @unit / 2 * v
+      x = GSL::Vector.alloc(0, qunit, qunit*2, qunit*3, @unit)
+      y = GSL::Vector.alloc(0, qunit + shift*0.25, qunit*2 + shift, qunit*3 + shift*0.5, @unit)
+      @spline = GSL::Spline.alloc('linear', x, y)
     end
 
     def shuffle(ev)
       q, r = ev.offset.divmod(@unit)
-      r2 = @interp.eval(@x, @y, r)
+      r2 = @spline.eval(r)
       ev.offset = (q * @unit + r2).round
     end
 

data/lib/smf/toy/tempomap.rb

@@ -1,8 +1,8 @@
-# tempomap.rb: Written by Tadayoshi Funaba 2005,2006
-# $Id: tempomap.rb,v 1.2 2006-06-20 22:24:14+09 tadf Exp $
+# tempomap.rb: Written by Tadayoshi Funaba 2005,2006,2014
+# $Id: tempomap.rb,v 1.3 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/velcomp.rb

@@ -1,5 +1,5 @@
-# velcomp.rb: Written by Tadayoshi Funaba 2005,2006,2008
-# $Id: velcomp.rb,v 1.3 2008-02-16 16:56:21+09 tadf Exp $
+# velcomp.rb: Written by Tadayoshi Funaba 2005,2006,2008,2014
+# $Id: velcomp.rb,v 1.4 2014-03-22 07:48:58+09 tadf Exp $
 
 require 'gsl'
 
@@ -15,23 +15,23 @@ module SMF
 
     def init
       max = @thresh + (127 - @thresh) * @ratio
-      @x = GSL::Vector.alloc(0, @thresh, 127)
-      @y = GSL::Vector.alloc(0, @thresh, max)
-      @interp = GSL::Interp.alloc('linear', 3)
+      x = GSL::Vector.alloc(0, @thresh, 127)
+      y = GSL::Vector.alloc(0, @thresh, max)
+      @spline = GSL::Spline.alloc('linear', x, y)
     end
 
     private :init
 
     def gain=(v) @gain = v end
-    def thresh=(v) @thresh = v; @interp = nil end
-    def ratio=(v) @ratio = v; @interp = nil end
+    def thresh=(v) @thresh = v; @spline = nil end
+    def ratio=(v) @ratio = v; @spline = nil end
 
     def velcomp(ev)
-      init unless @interp
+      init unless @spline
       v = ev.vel + @gain
       v = 127 if v > 127
       v = 1   if v < 1
-      v2 = @interp.eval(@x, @y, v)
+      v2 = @spline.eval(v)
       v2 = 127 if v > 127
       v2 = 1   if v < 1
       ev.vel = v2.round

data/lib/smf/toy/virtual.rb

@@ -1,5 +1,5 @@
-# virtual.rb: Written by Tadayoshi Funaba 2005,2006
-# $Id: virtual.rb,v 1.3 2006-11-10 21:58:21+09 tadf Exp $
+# virtual.rb: Written by Tadayoshi Funaba 2005,2006,2014
+# $Id: virtual.rb,v 1.4 2014-04-27 08:46:58+09 tadf Exp $
 
 module SMF
 
@@ -26,8 +26,9 @@ module SMF
 	  xs.push(ev)
 	when NoteOff
 	  on = nil
-	  i = 0
+	  idx = 0
 	  xs.each_with_index do |x, i|
+	    idx = i
 	    if x.ch == ev.ch && x.note == ev.note
 	      on = x
 	      break
@@ -36,7 +37,7 @@ module SMF
 	  if on
 	    v << VirtualNote.new(on.offset, on.ch, on.note,
 				 on.vel, ev.vel, ev.offset - on.offset)
-	    xs.delete_at(i)
+	    xs.delete_at(idx)
 	  end
 	else
 	  v << ev

data/sample/stt-samp.rb

@@ -1,7 +1,8 @@
 #! /usr/bin/env ruby
+# coding: utf-8
 
 # stt-samp.rb: Written by Tadayoshi Funaba 2005
-# $Id: stt-samp.rb,v 1.1 2005-07-17 17:16:18+09 tadf Exp $
+# $Id: stt-samp.rb,v 1.2 2014-04-27 08:49:03+09 tadf Exp $
 
 require 'smf/toy/macro/stt'
 include SMF
@@ -10,9 +11,9 @@ sq = Sequence.new
 mm = STT.new(sq)
 mm << 'gm=1 r ch=0 pr=0'
 12.times do
-  mm << "{q �ɡ� h �ɡ� q r}&"
-  mm << "{q ��� h ��� q r}&"
-  mm << "{q ��   h ��   q r}"
+  mm << "{q ド＃ h ド＃ q r}&"
+  mm << "{q レ＃ h レ＃ q r}&"
+  mm << "{q ラ   h ラ   q r}"
   mm << "oc += 1/12"
 end
 mm.generate

metadata

@@ -1,36 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smf
-version: !ruby/object:Gem::Version 
-  version: 0.15.12
+version: !ruby/object:Gem::Version
+  version: 0.15.15
 platform: ruby
-authors: 
+authors:
 - Tadayoshi Funaba
-autorequire: smf
+autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-11-12 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: 
 email: tadf@funaba.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- LICENSE
 - MANUAL
 - MANUAL.en
 - MANUAL.en.html
@@ -98,31 +98,29 @@ files:
 - sample/velcomp.rb
 - sample/virtual-samp.rb
 - sample/xml2smf.rb
-has_rdoc: false
-homepage: http://www.funaba.org/en/ruby.html
+homepage: http://www.funaba.org/code
+licenses:
+- BSD 2-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: tadf
-rubygems_version: 1.3.1
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 2
-summary: SMF is a "Standard MIDI File" module for an object-oriented scripting language Ruby.
+specification_version: 4
+summary: SMF is a "Standard MIDI File" module for an object-oriented scripting language
+  Ruby.
 test_files: []
-