Updated reqs, collections bugfix, removed wip modules list, readme merge

Author: flipcoder

MANIFEST.in

@@ -1,2 +1,3 @@
 recursive-include textbeat/def *
 recursive-include textbeat/presets *
+recursive-include textbeat/plugins *

README.md

@@ -92,7 +92,9 @@ I'm currently looking into export options and recording via a headless host.
 # Tutorial
 
 If you're familiar with trackers, you may pick this up quite easily.
-Music flows vertically, with separate columns that are separated by whitespace or
+
+First start by creating a .txbt (textbeat) file, inside the file music 
+flows vertically, with separate columns that are separated by whitespace or
 manually setting a column width.
 
 Each column represents a track, which defaults to separate midi channel numbers.
@@ -127,6 +129,17 @@ Musicians can think of grid as fractions of quarter note,
 The grid is the beat/quarter-note subdivision.
 
 Both Tempo and Grid can be decimal numbers as well.
+For example, if you made some chords and you only want 
+one chord to be played per bar (eg 4 beats) 
+you could set `%t120x0.25`.
+
+You can listen to what you've made by running:
+
+```
+textbeat <your file>
+```
+
+Consult the output of `textbeat -h` for further information.
 
 ## Note Numbers
 
@@ -353,7 +366,7 @@ If you wish to control volume/gain directly, use @v
 
 Unlike accents, volume changes persist.
 
-Interpolation is not yet impl
+Interpolation is not yet implemented
 
 ## Vibrato, Pitch, and Mod Wheel
 
@@ -526,7 +539,6 @@ Here are the marker/repeat commands:
 - :name| goes back to last marker 'name'
 - :N| goes back to last marker N number of times
 - :name*N| goes back to last marker 'name' N number of times
-- || return/pop to last position after marker jump
 - ||| return/pop to last position after marker jump by-label
 - |||| end the song here
 ``` 
@@ -755,4 +767,3 @@ without doing a C++ rewrite.
 # Can I Help?
 
 Yes!  Contact [flipcoder](https://github.com/flipcoder).
-

requirements.txt

@@ -7,3 +7,4 @@ pyyaml
 docopt
 future
 shutilwhich
+mido

textbeat/__main__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 """textbeat
-Copyright (c) 2018-2020 Grady O'Connell
+Copyright (c) 2018-2021 Grady O'Connell
 Open-source under MIT License
 
 Examples:
@@ -268,14 +268,14 @@ def main():
 
     if player.shell:
         log(FG.BLUE + 'textbeat')# v'+str(VERSION))
-        log('Copyright (c) 2018 Grady O\'Connell')
+        log('Copyright (c) 2021 Grady O\'Connell')
         log('https://github.com/flipcoder/textbeat')
         active = support.SUPPORT_ALL & support.SUPPORT
         inactive = support.SUPPORT_ALL - support.SUPPORT
-        if active:
-            log(FG.GREEN + 'Active Modules: ' + STYLE.RESET_ALL +  ', '.join(active) + STYLE.RESET_ALL)
-        if inactive:
-            log(FG.RED + 'Inactive Modules: ' +  STYLE.RESET_ALL + ', '.join(inactive))
+        # if active:
+        #     log(FG.GREEN + 'Active Modules: ' + STYLE.RESET_ALL +  ', '.join(active) + STYLE.RESET_ALL)
+        # if inactive:
+        #     log(FG.RED + 'Inactive Modules: ' +  STYLE.RESET_ALL + ', '.join(inactive))
         if player.portname:
             log(FG.GREEN + 'Device: ' + STYLE.RESET_ALL + '%s' % (player.portname if player.portname else 'Unknown',))
         log(FG.RED + 'Other Devices: ' + STYLE.RESET_ALL + '%s' % (', '.join(portnames)))

textbeat/defs.py

@@ -160,7 +160,7 @@ class Diff:
 def merge(a, b, overwrite=False, skip=None, diff=None, pth=None):
     for k,v in iteritems(b):
         contains = k in a
-        if contains and isinstance(a[k], dict) and isinstance(b[k], collections.Mapping):
+        if contains and isinstance(a[k], dict):# and isinstance(b[k], collections.Mapping):
             loc = (pth+[k]) if pth else None
             if callable(skip):
                 if not skip(loc,v):