Merge pull request #1430 from cuthbertLab/clarify-entities

Clarify entities
cuthbertLab · Sep 19, 2022 · cf0f74f · cf0f74f
2 parents a4a640d + f753dcf
commit cf0f74f
Show file tree

Hide file tree

Showing 219 changed files with 219 additions and 413 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 music21 -- A Toolkit for Computational Musicology
 
-Copyright © 2006-2022, Michael Scott Asato Cuthbert and cuthbertLab
+Copyright © 2006-2022, Michael Scott Asato Cuthbert
 
 For more information, visit:
 https://web.mit.edu/music21
@@ -16,8 +16,7 @@ https://web.mit.edu/music21/doc/usersGuide/usersGuide_01_installing.html
 Music21 runs on Python 3.8+.  Use version 4 on Python 2 or Py3.4, version 5
 on Py3.5, version 6 on Py3.6, version 7 on Py3.7.
 
-Released under the BSD (3-clause) license. Music21 may also be used
-under the LGPL license.  See LICENSE.
+Released under the BSD (3-clause) license. See LICENSE.
 Externally provided software (including the MIT licensed Lilypond/MusicXML test Suite) and
 music encoding in the corpus may have different licenses and/or copyrights. 
 A no-corpus version of music21 is available also on GitHub.

diff --git a/dist/dist.py b/dist/dist.py
@@ -6,7 +6,7 @@
 # Authors:      Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2010-2022 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2010-2022 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''
@@ -58,9 +58,9 @@
     Don't forget the "v" in the release tag.
     Sanity check that the correct commit was tagged: git log
 
-17. Push tags: git push upstream --tags
+17. Push tags: git push --tags  (or git push upstream --tags if not on main branch)
 
-18. Create a new release on GitHub and upload the TWO files created here and docs.
+18. Create a new release on GitHub and upload the TWO non-wheel files created here and docs.
     Drag in this order: .tar.gz, documentation, no-corpus.tar.gz
 
     Finish this before doing the next step, even though it looks like it could be done in parallel.

diff --git a/documentation/docbuild/documenters.py b/documentation/docbuild/documenters.py
@@ -7,7 +7,7 @@
 #               Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2013-17 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013-17 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # -----------------------------------------------------------------------------
 

diff --git a/documentation/docbuild/extensions.py b/documentation/docbuild/extensions.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Josiah Wolf Oberholtzer
 #
-# Copyright:    Copyright © 2013 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # -----------------------------------------------------------------------------
 

diff --git a/documentation/docbuild/iterators.py b/documentation/docbuild/iterators.py
@@ -6,7 +6,7 @@
 # Authors:      Josiah Wolf Oberholtzer
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2013, 17 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013, 17 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import abc  # for @abc.abstractmethod decorator: requires a function to be defined in subclasses

diff --git a/documentation/docbuild/make.py b/documentation/docbuild/make.py
@@ -7,7 +7,7 @@
 #               Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2013-17 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013-17 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/documentation/docbuild/upload.py b/documentation/docbuild/upload.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Christopher Ariza
 #
-# Copyright:    Copyright © 2009-2010, 2013 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2009-2010, 2013 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 # pylint: disable=line-too-long

diff --git a/documentation/docbuild/writers.py b/documentation/docbuild/writers.py
@@ -7,7 +7,7 @@
 #               Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2013-22 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013-22 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import logging

diff --git a/documentation/source/about/about.rst b/documentation/source/about/about.rst
@@ -48,7 +48,7 @@ Acknowledgements
 Funding
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The music21 project was made possible by generous research funding
+`music21` was made possible by generous research funding
 from the **Seaver Institute** and
 the **National Endowment for the Humanities**/Digging into Data research fund.
 
@@ -174,7 +174,7 @@ Licensing and Copyright
 The `music21` Toolkit
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Music21 is Copyright © 2006-2021, Michael Scott Cuthbert and cuthbertLab.
+Music21 is Copyright © 2006-2022, Michael Scott Asato Cuthbert.
 Music21 code (excluding content encoded in the corpus) is
 free and open-source software, licensed under the BSD License.
 

diff --git a/documentation/source/conf.py b/documentation/source/conf.py
@@ -48,7 +48,7 @@
 project = 'music21'
 # pylint: disable=redefined-builtin
 # noinspection PyShadowingBuiltins
-copyright = '2006-2022, Michael Scott Asato Cuthbert and cuthbertLab'
+copyright = '2006-2022, Michael Scott Asato Cuthbert'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -241,7 +241,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'music21', 'music21 Documentation',
-     ['Michael Scott Asato Cuthbert and cuthbertLab'], 1)
+     ['Michael Scott Asato Cuthbert'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -255,7 +255,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'music21', 'music21 Documentation',
-     'Michael Scott Asato Cuthbert and cuthbertLab', 'music21', 'One line description of project.',
+     'Michael Scott Asato Cuthbert', 'music21', 'One line description of project.',
      'Miscellaneous'),
 ]
 

diff --git a/documentation/testDocumentation.py b/documentation/testDocumentation.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2010-2012 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2010-2012 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/installer.py b/installer.py
@@ -6,7 +6,7 @@
 # Authors:       Christopher Ariza
 #                Michael Scott Asato Cuthbert
 #
-# Copyright:     (c) 2009-2016 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:     Copyright © 2009-2016 Michael Scott Asato Cuthbert
 # License:       BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/music21/__init__.py b/music21/__init__.py
@@ -1,13 +1,9 @@
 # -*- coding: utf-8 -*-
 '''
-The music21 Framework is Copyright © 2006-2022 Michael Scott Asato Cuthbert
-and the music21 Project
-
-(Michael Scott Asato Cuthbert, principal investigator; cuthbert@mit.edu)
+The music21 Framework is Copyright © 2006-2022 Michael Scott Asato Cuthbert.
 
 Some Rights Reserved
-Released under the BSD (3-clause) license.  For historical reasons, music21
-can also be used under an LGPL license.
+Released under the BSD (3-clause) license.  See license.txt.
 
 See license.txt file for the full license which represents your legal
 obligations in using, modifying, or distributing music21.

diff --git a/music21/abcFormat/__init__.py b/music21/abcFormat/__init__.py
@@ -7,7 +7,7 @@
 #               Michael Scott Asato Cuthbert
 #               Dylan J. Nagler
 #
-# Copyright:    Copyright © 2010, 2013 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2010, 2013 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/alpha/analysis/aligner.py b/music21/alpha/analysis/aligner.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Emily Zhang
 #
-# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 from collections import Counter

diff --git a/music21/alpha/analysis/fixer.py b/music21/alpha/analysis/fixer.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Emily Zhang
 #
-# Copyright:    Copyright © 2016 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2016 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import unittest

diff --git a/music21/alpha/analysis/hasher.py b/music21/alpha/analysis/hasher.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Emily Zhang
 #
-# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/music21/alpha/analysis/ornamentRecognizer.py b/music21/alpha/analysis/ornamentRecognizer.py
@@ -5,8 +5,8 @@
 #
 # Authors:      Janelle Sands
 #
-# Copyright:    Copyright © 2016 Michael Scott Asato Cuthbert and the music21 Project
-# License:      LGPL or BSD, see license.txt
+# Copyright:    Copyright © 2016 Michael Scott Asato Cuthbert
+# License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import unittest
 from copy import deepcopy

diff --git a/music21/alpha/analysis/search.py b/music21/alpha/analysis/search.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Christopher Ariza
 #
-# Copyright:    Copyright © 2011 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2011 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/music21/alpha/analysis/testFiles.py b/music21/alpha/analysis/testFiles.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Emily Zhang
 #
-# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import os

diff --git a/music21/analysis/correlate.py b/music21/analysis/correlate.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Christopher Ariza
 #
-# Copyright:    Copyright © 2009-2010 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2009-2010 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/discrete.py b/music21/analysis/discrete.py
@@ -7,7 +7,7 @@
 #               Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2010-2022 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2010-2022 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/elements.py b/music21/analysis/elements.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2017-22 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2017-22 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import collections

diff --git a/music21/analysis/enharmonics.py b/music21/analysis/enharmonics.py
@@ -6,7 +6,7 @@
 # Authors:      Mark Gotham
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2017 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2017 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/music21/analysis/floatingKey.py b/music21/analysis/floatingKey.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2015 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/harmonicFunction.py b/music21/analysis/harmonicFunction.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Mark Gotham
 #
-# Copyright:    Copyright © 2022 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2022 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import typing as t

diff --git a/music21/analysis/metrical.py b/music21/analysis/metrical.py
@@ -6,7 +6,7 @@
 # Authors:      Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2009-2012 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2009-2012 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/neoRiemannian.py b/music21/analysis/neoRiemannian.py
@@ -7,7 +7,7 @@
 #               Michael Scott Asato Cuthbert
 #               Mark Gotham
 #
-# Copyright:    Copyright © 2017-19 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2017-19 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/patel.py b/music21/analysis/patel.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2011 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2011 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import unittest

diff --git a/music21/analysis/pitchAnalysis.py b/music21/analysis/pitchAnalysis.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2017 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2017 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import collections

diff --git a/music21/analysis/reduceChords.py b/music21/analysis/reduceChords.py
@@ -6,7 +6,7 @@
 # Authors:      Josiah Wolf Oberholtzer
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2013 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # -----------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/reduceChordsOld.py b/music21/analysis/reduceChordsOld.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2013-14 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2013-14 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/reduction.py b/music21/analysis/reduction.py
@@ -6,7 +6,7 @@
 # Authors:      Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2011-2013 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2011-2013 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/analysis/segmentByRests.py b/music21/analysis/segmentByRests.py
@@ -6,7 +6,7 @@
 # Authors:      Mark Gotham
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2018 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2018 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/music21/analysis/transposition.py b/music21/analysis/transposition.py
@@ -5,7 +5,7 @@
 #
 # Authors:      Mark Gotham
 #
-# Copyright:    Copyright © 2017 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2017 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 import typing as t

diff --git a/music21/analysis/windowed.py b/music21/analysis/windowed.py
@@ -6,7 +6,7 @@
 # Authors:      Jared Sadoian
 # Authors:      Christopher Ariza
 #
-# Copyright:    Copyright © 2010 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2010 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 '''

diff --git a/music21/articulations.py b/music21/articulations.py
@@ -6,7 +6,7 @@
 # Authors:      Michael Scott Asato Cuthbert
 #               Christopher Ariza
 #
-# Copyright:    Copyright © 2009-2013 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2009-2013 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # ------------------------------------------------------------------------------
 

diff --git a/music21/audioSearch/__init__.py b/music21/audioSearch/__init__.py
@@ -7,7 +7,7 @@
 # Authors:      Jordi Bartolome
 #               Michael Scott Asato Cuthbert
 #
-# Copyright:    Copyright © 2011-2020 Michael Scott Asato Cuthbert and the music21 Project
+# Copyright:    Copyright © 2011-2020 Michael Scott Asato Cuthbert
 # License:      BSD, see license.txt
 # -----------------------------------------------------------------------------
 '''