smml 0.0.2.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcdb4cdf683202fd9ce136fe9bb0bd3b9dee193c
-  data.tar.gz: 9a25de640dc26ec8f16939926de7cebaaeccdcf4
+  metadata.gz: e8aa416af4560085821e2b1a7ed3e57434639602
+  data.tar.gz: cb0b869acdc8c4b173cbab84b99487e41bd3cf92
 SHA512:
-  metadata.gz: eefd12ba06b4d3b1070d8d81523b1d7d3dbb52926c05c6708d7045110927a8b1b8b280d411d60dc6ac914a91296470f769564ff0ce5c29a1d261edca7dc2cb08
-  data.tar.gz: 7c034b35c71bf8965d5cb9dae4296206e8f1fe7f9ee3b2d91638c0cedf6acfe0ba74a90e83396d51708f3daa62cc32aaad086504082bf8a6988adbb4b7b8d999
+  metadata.gz: 82b264a3f12b49a27049d9eee0f43ce72a0d510ba61a95ee4fc00185c8e4279a37c876594358e6e47cc57c96d779f6ad18de0d9de5c7083c4262cc99dcb3b705
+  data.tar.gz: 496db22b2ff32c0ade3dc275cc93362b1ff6e4f35f28e04e910a8d4d8d716320266b5fa3038fe297d7baefc6262eff6f5013ad6625d777874c0f0c783cf592ba

data/bin/smml

@@ -0,0 +1,69 @@
+#!/usr/bin/ruby
+# -*- encoding: utf-8 -*-
+require 'kconv'
+require 'optparse'
+
+# gem
+begin
+  require'./lib/smml/msm'
+rescue LoadError
+  require'smml'
+  p Smml::VERSION
+end
+
+infile=false
+outfile=false
+expfile=false
+vfuzzy=2
+autopan=true
+velocity=0x40
+$debuglevel=1
+data=""
+pspl="///"
+cmark=";;"
+bpm=120
+tbase=480 # division
+octaveMode=:near
+
+opt = OptionParser.new
+opt.on('-i file',"input file") {|v| infile=v }
+opt.on('-o file',"output file") {|v| outfile=v }
+opt.on('-e file',"write down macro etc. expanded data") {|v| expfile=v }
+opt.on('-d d',"input data string") {|v|
+  data=v
+  STDERR.puts data if $DEBUG
+}
+opt.on('-D',"debug") {|v| $DEBUG=v }
+opt.on('-s',"show syntax") {|v|
+  hint
+  exit
+}
+opt.on('-t b',"bpm") {|v| bpm=v.to_f }
+opt.on('-T w',"programChange test like instrument name '...'") {|v| $test=v }
+opt.on('-c d',"cycle data for test mode") {|v| $testdata=v }
+opt.on('-C d',"comment mark") {|v| cmark=v; puts "comment mark is '#{cmark}'" }
+opt.on('-p pspl',"page split chars") {|v| pspl=v }
+opt.on('-F i',"fuzzy shift mode") {|v| $fuzzy=v.to_i }
+opt.on('-v i',"velocity fuzzy value [default 2]") {|v| vfuzzy=v.to_i }
+opt.on('-V',"dont use all fuzzy or auto feature") {|v|
+  vfuzzy=0
+  autopan=false
+}
+opt.on('-O',"octave legacy mode") {|v| octaveMode=:far }
+opt.on('-I',"ignore roland check sum") {|v| $ignoreChecksum=v }
+opt.on('-M i',"debug level") {|v| $debuglevel=v.to_i }
+opt.on('-m i',"mode of test/ 1:GM 2:XG 3:GS") {|v| $testmode=v.to_i }
+opt.on('-n',"test only (dont write outfile)") {|v| $testonly=true }
+opt.parse!(ARGV)
+
+mtr=MmlTracks.new(tbase,pspl,expfile,cmark)
+mtr.infile=infile
+mtr.outfile=outfile
+mtr.data=data
+mtr.velocity=velocity
+mtr.bpm=bpm
+mtr.octave=octaveMode
+mtr.vfuzzy=vfuzzy
+mtr.autopan=autopan
+mtr.make($test,$fuzzy)
+mtr.save if not $testonly

data/bin/ssmml

@@ -0,0 +1,25 @@
+#!/usr/bin/ruby
+# -*- encoding: utf-8 -*-
+require 'kconv'
+require 'optparse'
+
+# gem
+begin
+  require'./lib/smml/msm'
+rescue LoadError
+  require'smml'
+  p Smml::VERSION
+end
+
+infile="infile.mml"
+outfile="mml.mid"
+data=""
+
+opt = OptionParser.new
+opt.on('-i file',"input file") {|v| infile=v }
+opt.on('-o file',"output file") {|v| outfile=v }
+opt.on('-d d',"input data string") {|v| data=v }
+opt.parse!(ARGV)
+
+mtr=MmlTracks.new
+mtr.compile(infile,outfile,data)

data/lib/smml/msm.rb

@@ -647,7 +647,8 @@ class MarkTrack
 end
 module MidiHex
   # 設定のため最初に呼ばなければならない
-  def self.prepare bpm,tbase=480,vel=0x40,oct=:near,vfuzzy=2
+  def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2
+    @ready=true
     @autopan=true
     @startBpm=bpm
     @midiname=false
@@ -1213,6 +1214,14 @@ module MidiHex
     puts "no percussion name like '#{p}' in list" if $DEBUG && r.size==0
     r.size>0 ? r[0][0] : @snare
   end
+  def self.percussionList
+    self.prepare if not @ready
+    @percussionList.map{|i,v|"#{i} #{v}"}
+  end
+  def self.programList
+    self.prepare if not @ready
+    @programList.map{|i,v|"#{i} #{v}"}
+  end
   def self.bend pos,depth,ch=false
     ch=@ch if ! ch
     depth=(depth*@bendCent).to_i
@@ -2210,6 +2219,18 @@ class MmlTracks
     @vfuzzy=2
     @autopan=true
   end
+  def pmap
+    puts @mx.programList
+  end
+  def dmap
+    puts @mx.percussionList
+  end
+  def psearch k
+    puts @mx.programList.select{|i|i=~/#{k}/i}
+  end
+  def dsearch k
+    puts @mx.percussionList.select{|i|i=~/#{k}/i}
+  end
   def init test,fz
     @mx.prepare(@bpm,@tbase,@velocity,@octave,@vfuzzy)
     @mx.setfile(@infile)

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 module Smml
-  VERSION = "0.0.2.3"
+  VERSION = "0.1.0"
 end

data/smml.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/tabasano/wavseq"
   spec.license       = "MIT"
 
-  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md"]+["sample/midi-preModifier.txt","sample/midi-test.mml"]
+  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+Dir.glob("bin/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md"]+["sample/midi-preModifier.txt","sample/midi-test.mml"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.extra_rdoc_files =%w[README_smml.md LICENSE.txt]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.0.2.3
+  version: 0.1.0
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,7 +41,9 @@ dependencies:
 description: compile a Music Macro Language file to a Standard MIDI file.
 email:
 - pianotoieba+smml@gmail.com
-executables: []
+executables:
+- smml
+- ssmml
 extensions: []
 extra_rdoc_files:
 - README_smml.md
@@ -52,6 +54,8 @@ files:
 - lib/smml/midi-programChange-list.txt
 - lib/smml/msm.rb
 - lib/smml/version.rb
+- bin/smml
+- bin/ssmml
 - Gemfile
 - Rakefile
 - LICENSE.txt