waveinfo 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 019a1fe05e310596c1bd2f79a635229f3eb37fb0
+  data.tar.gz: 468bb5008ef0bfe68f3e6143f186d60f50b24923
+SHA512:
+  metadata.gz: a94283ffa068adc219f2258a243d98fe5460dbf0fae0e2524a09006cb8ae107d7264b7cae9e30cecb92fae4aaabade5055e63d0f067679a6081bf208b212978f
+  data.tar.gz: 0dfc1cf21d32d9201f1ae72e915593f1518267cb80dcc9e531890773b05d601b31e0cc3d7ab753ac625bfae725f16357f65e5a32dd1ede78f5a8598807024a26

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2009-2014 Nicholas J Humfrey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -3,6 +3,7 @@ waveinfo
 
 waveinfo is a pure-ruby gem to get the information from the headers of Wave (.wav) files.
 
+
 Installing
 ----------
 
@@ -43,7 +44,15 @@ Resources
 ---------
 
 * GitHub Project: http://github.com/njh/ruby-waveinfo
-* Documentation: http://rdoc.info/github/njh/ruby-waveinfo/master/frames
+* Documentation: http://rdoc.info/gems/waveinfo
+
+
+License
+-------
+
+The waveinfo ruby gem is licensed under the terms of the MIT license.
+See the file LICENSE for details.
+
 
 Contact
 -------
@@ -51,5 +60,4 @@ Contact
 * Author:    Nicholas J Humfrey
 * Email:     njh@aelius.com
 * Home Page: http://www.aelius.com/njh/
-* License:   Distributes under the same terms as Ruby
 

data/lib/waveinfo.rb

@@ -62,6 +62,8 @@ class WaveInfo
         "MPEG-1 Audio"
       when 0x55 then
         "MPEG Audio Layer 3"
+      when 0xFFFE
+        "Extensible wave format"
       else
         sprintf("Unknown (0x%2.2x)",@audio_format_id)
     end
@@ -116,7 +118,7 @@ class WaveInfo
   def read_headers
     # Read in the chunk header
     chunk_id = read_fourchar
-    raise FileFormatError.new("Chunk id is not 'RIFF'") if chunk_id != 'RIFF'
+    raise FileFormatError.new("Chunk id is not 'RIFF' or 'RF64'") if chunk_id != 'RIFF' && chunk_id != 'RF64'
     chunk_size = read_longint
     chunk_format = read_fourchar
     raise FileFormatError.new("Chunk format is not 'WAVE'") if chunk_format != 'WAVE'
@@ -180,7 +182,7 @@ class WaveInfo
   end
   
   # Exception raised if there is a problem parsing the Wave file
-  class FileFormatError < Exception
+  class FileFormatError < StandardError
   end
   
 end

data/lib/waveinfo/version.rb

@@ -1,3 +1,3 @@
 class WaveInfo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/waveinfo_spec.rb

@@ -13,47 +13,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 1
+      expect(@wav.audio_format_id).to eq(1)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'PCM'
+      expect(@wav.audio_format).to eq('PCM')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 11025
+      expect(@wav.sample_rate).to eq(11025)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 22050
+      expect(@wav.byte_rate).to eq(22050)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 2
+      expect(@wav.block_align).to eq(2)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 16
+      expect(@wav.bits_per_sample).to eq(16)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 8820
+      expect(@wav.size).to eq(8820)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 4410
+      expect(@wav.samples).to eq(4410)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -64,47 +64,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 49
+      expect(@wav.audio_format_id).to eq(49)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'GSM'
+      expect(@wav.audio_format).to eq('GSM')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 8000
+      expect(@wav.sample_rate).to eq(8000)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 1625
+      expect(@wav.byte_rate).to eq(1625)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 65
+      expect(@wav.block_align).to eq(65)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 0
+      expect(@wav.bits_per_sample).to eq(0)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 650
+      expect(@wav.size).to eq(650)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 3200
+      expect(@wav.samples).to eq(3200)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -115,47 +115,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 1
+      expect(@wav.audio_format_id).to eq(1)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'PCM'
+      expect(@wav.audio_format).to eq('PCM')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 2
+      expect(@wav.channels).to eq(2)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 44100
+      expect(@wav.sample_rate).to eq(44100)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 176400
+      expect(@wav.byte_rate).to eq(176400)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 4
+      expect(@wav.block_align).to eq(4)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 16
+      expect(@wav.bits_per_sample).to eq(16)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 100000
+      expect(@wav.size).to eq(100000)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 25000
+      expect(@wav.samples).to eq(25000)
     end
 
     it "should get the audio duration right" do
-      (@wav.duration * 1000).to_i.should == 566
+      expect((@wav.duration * 1000).to_i).to eq(566)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -166,47 +166,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 2
+      expect(@wav.audio_format_id).to eq(2)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'Microsoft ADPCM'
+      expect(@wav.audio_format).to eq('Microsoft ADPCM')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 11025
+      expect(@wav.sample_rate).to eq(11025)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 5784
+      expect(@wav.byte_rate).to eq(5784)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 128
+      expect(@wav.block_align).to eq(128)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 4
+      expect(@wav.bits_per_sample).to eq(4)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 2432
+      expect(@wav.size).to eq(2432)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 4410
+      expect(@wav.samples).to eq(4410)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -217,47 +217,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 1
+      expect(@wav.audio_format_id).to eq(1)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'PCM'
+      expect(@wav.audio_format).to eq('PCM')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 11025
+      expect(@wav.sample_rate).to eq(11025)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 11025
+      expect(@wav.byte_rate).to eq(11025)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 1
+      expect(@wav.block_align).to eq(1)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 8
+      expect(@wav.bits_per_sample).to eq(8)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 4410
+      expect(@wav.size).to eq(4410)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 4410
+      expect(@wav.samples).to eq(4410)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -268,47 +268,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 6
+      expect(@wav.audio_format_id).to eq(6)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'a-law'
+      expect(@wav.audio_format).to eq('a-law')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 11025
+      expect(@wav.sample_rate).to eq(11025)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 11025
+      expect(@wav.byte_rate).to eq(11025)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 1
+      expect(@wav.block_align).to eq(1)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 8
+      expect(@wav.bits_per_sample).to eq(8)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 4410
+      expect(@wav.size).to eq(4410)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 4410
+      expect(@wav.samples).to eq(4410)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -319,47 +319,47 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 7
+      expect(@wav.audio_format_id).to eq(7)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'u-law'
+      expect(@wav.audio_format).to eq('u-law')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 11025
+      expect(@wav.sample_rate).to eq(11025)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 11025
+      expect(@wav.byte_rate).to eq(11025)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 1
+      expect(@wav.block_align).to eq(1)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 8
+      expect(@wav.bits_per_sample).to eq(8)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 4410
+      expect(@wav.size).to eq(4410)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 4410
+      expect(@wav.samples).to eq(4410)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
 
@@ -370,69 +370,120 @@ describe WaveInfo do
     end
 
     it "should get the audio format id right" do
-      @wav.audio_format_id.should == 17
+      expect(@wav.audio_format_id).to eq(17)
     end
 
     it "should get the audio format name right" do
-      @wav.audio_format.should == 'IMA ADPCM'
+      expect(@wav.audio_format).to eq('IMA ADPCM')
     end
 
     it "should get the number of channels right" do
-      @wav.channels.should == 1
+      expect(@wav.channels).to eq(1)
     end
 
     it "should get the sample rate right" do
-      @wav.sample_rate.should == 11025
+      expect(@wav.sample_rate).to eq(11025)
     end
 
     it "should get the byte rate right" do
-      @wav.byte_rate.should == 5589
+      expect(@wav.byte_rate).to eq(5589)
     end
     
     it "should get the block align value right" do
-      @wav.block_align.should == 256
+      expect(@wav.block_align).to eq(256)
     end
     
     it "should get the bits per sample right" do
-      @wav.bits_per_sample.should == 4
+      expect(@wav.bits_per_sample).to eq(4)
     end
     
     it "should get the audio length in bytes right" do
-      @wav.size.should == 2304
+      expect(@wav.size).to eq(2304)
     end
     
     it "should get the number of samples right" do
-      @wav.samples.should == 4410
+      expect(@wav.samples).to eq(4410)
     end
 
     it "should get the audio duration right" do
-      @wav.duration.should == 0.4
+      expect(@wav.duration).to eq(0.4)
     end
     
     it "should know the name of the file read from" do
-      @wav.filename.should == File.basename(@filepath)
+      expect(@wav.filename).to eq(File.basename(@filepath))
     end
   end
-  
+
+  describe "parsing a Stereo 96kHz 24bit RF64" do
+    before :each do
+      @filepath = sample_path('empty_96k_stereo_24bit_rf64')
+      @wav = WaveInfo.new( @filepath )
+    end
+
+    it "should get the audio format id right" do
+      expect(@wav.audio_format_id).to eq(65534)
+    end
+
+    it "should get the audio format name right" do
+      expect(@wav.audio_format).to eq('Extensible wave format')
+    end
+
+    it "should get the number of channels right" do
+      expect(@wav.channels).to eq(2)
+    end
+
+    it "should get the sample rate right" do
+      expect(@wav.sample_rate).to eq(96000)
+    end
+
+    it "should get the byte rate right" do
+      expect(@wav.byte_rate).to eq(576000)
+    end
+
+    it "should get the block align value right" do
+      expect(@wav.block_align).to eq(6)
+    end
+
+    it "should get the bits per sample right" do
+      expect(@wav.bits_per_sample).to eq(24)
+    end
+
+    it "should get the audio length in bytes right" do
+      expect(@wav.size).to eq(4294967295)
+    end
+
+    it "should get the number of samples right" do
+      expect(@wav.samples).to eq(715827882)
+    end
+
+    it "should get the audio duration right" do
+      expect(@wav.duration).to eq(7456.5404375)
+    end
+
+    it "should know the name of the file read from" do
+      expect(@wav.filename).to eq(File.basename(@filepath))
+    end
+  end
+
   describe "parsing an invalid WAVE file" do
     it "should throw an exception if the first chunk id isn't 'RIFF'" do
       data = StringIO.new("INVALID")
-      lambda { WaveInfo.new( data ) }.should raise_error(WaveInfo::FileFormatError)
+      expect { WaveInfo.new( data ) }.to raise_error(WaveInfo::FileFormatError)
     end
 
     it "should throw an exception if the chunk format isn't 'WAVE'" do
       data = StringIO.new("RIFF\0\0\0\0INVALID")
-      lambda { WaveInfo.new( data ) }.should raise_error(WaveInfo::FileFormatError)
+      expect { WaveInfo.new( data ) }.to raise_error(WaveInfo::FileFormatError)
     end
 
     it "should not throw an exception if WAVE file is valid but has no sub-chunks" do
       data = StringIO.new("RIFF\4\0\0\0WAVE")
-      lambda { WaveInfo.new( data ) }.should_not raise_error
+      expect { WaveInfo.new( data ) }.not_to raise_error
     end
     
     it "should set the audio format name to Unknown for an unknown audio codec" do
       data = StringIO.new("RIFF\x14\0\0\0WAVEfmt \x0a\0\0\0\xff\x00\x02\0\0\0\0\0\0\0\0\0\0\0\0\0")
-      WaveInfo.new( data ).audio_format.should == 'Unknown (0xff)'
+      expect(WaveInfo.new( data ).audio_format).to eq('Unknown (0xff)')
     end
   end
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: waveinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Nicholas J Humfrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
 description: waveinfo is a pure-ruby gem to get the information from the headers of
@@ -83,37 +74,35 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
 - README.md
-- COPYING
-- GPL
-- lib/waveinfo/version.rb
+- bin/waveinfo
 - lib/waveinfo.rb
+- lib/waveinfo/version.rb
 - spec/waveinfo_spec.rb
-- bin/waveinfo
 homepage: http://github.com/njh/ruby-waveinfo
 licenses:
-- Ruby
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: waveinfo
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pure-ruby gem to get the information from the headers of Wave (.wav) files.
 test_files:
 - spec/waveinfo_spec.rb

data/COPYING

@@ -1,56 +0,0 @@
-ruby-mpris is copyrighted free software by Nicholas J Humfrey <njh@aelius.com>.
-You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.

data/GPL

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.