diff --git a/README.md b/README.md index 52f63e6e22..0f9375a5dd 100644 --- 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 index d9582e6c4c..90c3928335 100644 --- 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 index 94efdf63d1..51c4cc6574 100644 --- 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 index 3ba1b6db0a..ae4fc7c21f 100644 --- 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 index 78024a8078..2ed59d4529 100644 --- 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 index 1a5b71fadd..32dad93bc4 100644 --- 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 index df17232106..2a87ca1cde 100644 --- 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 index 026fdc3542..52fa4feecc 100644 --- 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 index 99d9dde329..d93f692c41 100644 --- 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 index 1df1c79dec..c37b7f6876 100644 --- 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 index c11d8ab3d0..e281fb001e 100644 --- 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 index 9f1af09fc1..964b5431ab 100644 --- 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 index 08597b8f82..8e2624cee5 100644 --- 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 index 43b129a587..cf47c87f80 100644 --- 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 index 5a51c3002f..888b8999aa 100644 --- 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 index 5f39329f33..ad39a4997c 100644 --- 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 index e2d276b8c7..3181f526e0 100644 --- 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 index 697041874d..8050869480 100644 --- 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 index 284df73721..a8e6940227 100644 --- 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 index 8aee720801..e7bdf66482 100644 --- 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 index 1fe763c183..1da74c7ec2 100644 --- 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 index 17ac9b03e8..5e955fce0a 100644 --- 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 index 5d68374cbc..7b01afde41 100644 --- 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 index 33eba52656..d81b100f3d 100644 --- 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 index 6de8edfdf2..7581ffe742 100644 --- 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 index 3eb7a9d89b..6093de783d 100644 --- 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 index 362195f743..872f8d9faa 100644 --- 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 index 6ffcd719be..f7e2f0e019 100644 --- 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 index 2ed7dade3f..fa767228aa 100644 --- 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 index e2ad9245b3..ca4983cee7 100644 --- 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 index 2b5323a1f0..b37783f733 100644 --- 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 index e0ca45e37f..73b42d5404 100644 --- 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 index d90d51b62d..c75f5bf52e 100644 --- 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 index f2335c0853..a2c3d4c93f 100644 --- 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 index 866e9c79d1..2e621699b2 100644 --- 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 index 13c78230d1..a8f426e8fa 100644 --- 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 index 0d2394f60e..646507f2b2 100644 --- 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 index fb7ac3f883..fffd033f3e 100644 --- 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 # ----------------------------------------------------------------------------- ''' diff --git a/music21/audioSearch/recording.py b/music21/audioSearch/recording.py index 2282910c38..87c36577ca 100644 --- a/music21/audioSearch/recording.py +++ b/music21/audioSearch/recording.py @@ -6,7 +6,7 @@ # Authors: Jordi Bartolome # 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 # ------------------------------------------------------------------------------ ''' diff --git a/music21/audioSearch/scoreFollower.py b/music21/audioSearch/scoreFollower.py index bb41b7b4a9..6f885ee53b 100644 --- a/music21/audioSearch/scoreFollower.py +++ b/music21/audioSearch/scoreFollower.py @@ -7,7 +7,7 @@ # Authors: Jordi Bartolome # 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 math diff --git a/music21/audioSearch/transcriber.py b/music21/audioSearch/transcriber.py index 69e31035e2..e1a38c2e97 100644 --- a/music21/audioSearch/transcriber.py +++ b/music21/audioSearch/transcriber.py @@ -7,7 +7,7 @@ # Authors: Jordi Bartolome # 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 # ------------------------------------------------------------------------------ diff --git a/music21/bar.py b/music21/bar.py index 8e32a97c81..76e49142c6 100644 --- a/music21/bar.py +++ b/music21/bar.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2012, 2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2012, 2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/base.py b/music21/base.py index 197c01be49..bdb43a8ca0 100644 --- a/music21/base.py +++ b/music21/base.py @@ -6,8 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2006-2022 Michael Scott Asato Cuthbert and the music21 -# Project +# Copyright: Copyright © 2006-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/braille/basic.py b/music21/braille/basic.py index 35877dc32f..13bc12ddb4 100644 --- a/music21/braille/basic.py +++ b/music21/braille/basic.py @@ -6,7 +6,7 @@ # Bo-cheng (Sponge) Jhan (Clef routines) # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/braille/examples.py b/music21/braille/examples.py index 7dbad30a26..170dba302b 100644 --- a/music21/braille/examples.py +++ b/music21/braille/examples.py @@ -4,7 +4,7 @@ # Purpose: Transcribing popular music into braille music using music21. # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/braille/lookup.py b/music21/braille/lookup.py index 83724a45d8..804bdd0330 100644 --- a/music21/braille/lookup.py +++ b/music21/braille/lookup.py @@ -6,7 +6,7 @@ # Bo-cheng Jhan # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ---------------------------------------------------------------------------------- ''' diff --git a/music21/braille/noteGrouping.py b/music21/braille/noteGrouping.py index c165a64d6c..68b204a1ca 100644 --- a/music21/braille/noteGrouping.py +++ b/music21/braille/noteGrouping.py @@ -5,7 +5,7 @@ # Authors: Jose Cabal-Ugaz # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012, 2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012, 2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import unittest diff --git a/music21/braille/objects.py b/music21/braille/objects.py index 84cae6012e..a0e1e66ac5 100644 --- a/music21/braille/objects.py +++ b/music21/braille/objects.py @@ -4,7 +4,7 @@ # Purpose: music21 classes for indicating Braille formatting, etc. # Authors: Michael Scott Asato Cuthbert # -# 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/braille/runAllBrailleTests.py b/music21/braille/runAllBrailleTests.py index 16c7de4222..92360e940e 100644 --- a/music21/braille/runAllBrailleTests.py +++ b/music21/braille/runAllBrailleTests.py @@ -5,7 +5,7 @@ # to debug braille output with a minimum of screen reader output # Author: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/braille/segment.py b/music21/braille/segment.py index 6f1bfa4bfe..2fad312867 100644 --- a/music21/braille/segment.py +++ b/music21/braille/segment.py @@ -5,7 +5,7 @@ # Authors: Jose Cabal-Ugaz # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/braille/test.py b/music21/braille/test.py index 9194976ae9..c75dbc2fe4 100644 --- a/music21/braille/test.py +++ b/music21/braille/test.py @@ -4,7 +4,7 @@ # Purpose: Examples from "Introduction to Braille Music Transcription" # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2012, 2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012, 2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import re diff --git a/music21/braille/text.py b/music21/braille/text.py index be01b8852d..1858bf18eb 100644 --- a/music21/braille/text.py +++ b/music21/braille/text.py @@ -5,7 +5,7 @@ # Authors: Jose Cabal-Ugaz # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011, 2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011, 2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import unittest diff --git a/music21/braille/translate.py b/music21/braille/translate.py index 22544c91f5..3aa5fe4e19 100644 --- a/music21/braille/translate.py +++ b/music21/braille/translate.py @@ -4,7 +4,7 @@ # Purpose: music21 class which allows transcription of music21 data to braille # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/capella/__init__.py b/music21/capella/__init__.py index defd3f283a..5496b363af 100644 --- a/music21/capella/__init__.py +++ b/music21/capella/__init__.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ __all__ = ['fromCapellaXML'] diff --git a/music21/capella/fromCapellaXML.py b/music21/capella/fromCapellaXML.py index 3dd068f50f..c430d9be15 100644 --- a/music21/capella/fromCapellaXML.py +++ b/music21/capella/fromCapellaXML.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/chord/__init__.py b/music21/chord/__init__.py index de07b5eb80..6519cc05c8 100644 --- a/music21/chord/__init__.py +++ b/music21/chord/__init__.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/chord/tables.py b/music21/chord/tables.py index 35af166266..9d78fd5dba 100644 --- a/music21/chord/tables.py +++ b/music21/chord/tables.py @@ -7,7 +7,7 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2001-11 Christopher Ariza -# Copyright: Copyright © 2011-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/clef.py b/music21/clef.py index e3fa743385..f3ce65f486 100644 --- a/music21/clef.py +++ b/music21/clef.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# 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 # # Changes: 04 March 2014 by Michael Bodenbach diff --git a/music21/common/__init__.py b/music21/common/__init__.py index ab0c1aa876..995f3f6f03 100644 --- a/music21/common/__init__.py +++ b/music21/common/__init__.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/common/classTools.py b/music21/common/classTools.py index 452f6777ec..10b3a6149f 100644 --- a/music21/common/classTools.py +++ b/music21/common/classTools.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import contextlib diff --git a/music21/common/decorators.py b/music21/common/decorators.py index fee23a4b68..becc4c5f40 100644 --- a/music21/common/decorators.py +++ b/music21/common/decorators.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import warnings diff --git a/music21/common/enums.py b/music21/common/enums.py index 1cfbf0b71b..5f4c3a8ded 100644 --- a/music21/common/enums.py +++ b/music21/common/enums.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2021-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2021-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ from enum import Enum, EnumMeta diff --git a/music21/common/fileTools.py b/music21/common/fileTools.py index 946a10048b..2e5b1179a6 100644 --- a/music21/common/fileTools.py +++ b/music21/common/fileTools.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/common/formats.py b/music21/common/formats.py index 0505aff3f8..10b39ca920 100644 --- a/music21/common/formats.py +++ b/music21/common/formats.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/common/misc.py b/music21/common/misc.py index c38bda768a..2fb60e68df 100644 --- a/music21/common/misc.py +++ b/music21/common/misc.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/common/numberTools.py b/music21/common/numberTools.py index 4b37ef1bb9..849b1a3913 100644 --- a/music21/common/numberTools.py +++ b/music21/common/numberTools.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ from functools import lru_cache diff --git a/music21/common/objects.py b/music21/common/objects.py index 10a5c04929..5ad7fb3671 100644 --- a/music21/common/objects.py +++ b/music21/common/objects.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ __all__ = [ diff --git a/music21/common/parallel.py b/music21/common/parallel.py index 6fb1c0a0c9..2b26b9b499 100644 --- a/music21/common/parallel.py +++ b/music21/common/parallel.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2015-16 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2015-16 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ __all__ = [ diff --git a/music21/common/pathTools.py b/music21/common/pathTools.py index 90ea10ab2a..487691ab92 100644 --- a/music21/common/pathTools.py +++ b/music21/common/pathTools.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ __all__ = [ diff --git a/music21/common/stringTools.py b/music21/common/stringTools.py index 57f4301f89..4546f250ad 100644 --- a/music21/common/stringTools.py +++ b/music21/common/stringTools.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/common/types.py b/music21/common/types.py index 8f591e1e6f..c9dcb32931 100644 --- a/music21/common/types.py +++ b/music21/common/types.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2021-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2021-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ from fractions import Fraction diff --git a/music21/common/weakrefTools.py b/music21/common/weakrefTools.py index b4087d5a58..49bf97b0a7 100644 --- a/music21/common/weakrefTools.py +++ b/music21/common/weakrefTools.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/configure.py b/music21/configure.py index 383a81844a..d3d9f50f15 100644 --- a/music21/configure.py +++ b/music21/configure.py @@ -5,7 +5,7 @@ # # Authors: Christopher Ariza # -# Copyright: Copyright © 2011-2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2019 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import os diff --git a/music21/converter/__init__.py b/music21/converter/__init__.py index c716458af8..9162171bc5 100644 --- a/music21/converter/__init__.py +++ b/music21/converter/__init__.py @@ -7,7 +7,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/converter/qmConverter.py b/music21/converter/qmConverter.py index 84dcb8879f..19d63ff3f7 100644 --- a/music21/converter/qmConverter.py +++ b/music21/converter/qmConverter.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/converter/subConverters.py b/music21/converter/subConverters.py index 56668e14e4..61f38f758d 100644 --- a/music21/converter/subConverters.py +++ b/music21/converter/subConverters.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/corpus/__init__.py b/music21/corpus/__init__.py index 584b057ec1..4d9b58876b 100644 --- a/music21/corpus/__init__.py +++ b/music21/corpus/__init__.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009, 2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009, 2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/corpus/_metadataCache/core.p.gz b/music21/corpus/_metadataCache/core.p.gz index 786469c55f..bede32c922 100644 Binary files a/music21/corpus/_metadataCache/core.p.gz and b/music21/corpus/_metadataCache/core.p.gz differ diff --git a/music21/corpus/chorales.py b/music21/corpus/chorales.py index a73d2a5b94..3f300aea4b 100644 --- a/music21/corpus/chorales.py +++ b/music21/corpus/chorales.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Evan Lynch # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/corpus/essenFolksong/license.txt b/music21/corpus/essenFolksong/license.txt index 3d750e32a1..08752d6d3c 100644 --- a/music21/corpus/essenFolksong/license.txt +++ b/music21/corpus/essenFolksong/license.txt @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # Name: corpus/essenFolksong/license.txt -# Purpose: The music21 Project assumes no copyright or change in licensing +# Purpose: The music21 creators assume no copyright or change in licensing # for content distributed in the corpus. # #------------------------------------------------------------------------------- diff --git a/music21/corpus/license.txt b/music21/corpus/license.txt index 1c5438e198..da2b46c450 100644 --- a/music21/corpus/license.txt +++ b/music21/corpus/license.txt @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # Name: corpus/license.txt -# Purpose: The music21 Project assumes no copyright or change in licensing +# Purpose: The music21 creators assume no copyright or change in licensing # for content distributed in the corpus. # #------------------------------------------------------------------------------- @@ -25,6 +25,6 @@ The encodings may be under copyright but have been licensed for use, though ther restrictions on commercial use. These works, along with any works linked to in the virtual corpus, may or may not be free in your jurisdiction. If you believe this message to be in error regarding one -or more works please contact Michael Scott Cuthbert at the address provided on the contact page. +or more works please contact Michael Scott Asato Cuthbert at the address provided on the contact page. diff --git a/music21/corpus/manager.py b/music21/corpus/manager.py index 626e3fe145..20185df643 100644 --- a/music21/corpus/manager.py +++ b/music21/corpus/manager.py @@ -7,7 +7,7 @@ # Josiah Wolf Oberholtzer # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009, 2013, 2015-17 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009, 2013, 2015-17 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/corpus/testCorpus.py b/music21/corpus/testCorpus.py index 2e00029fce..6223fa4b42 100644 --- a/music21/corpus/testCorpus.py +++ b/music21/corpus/testCorpus.py @@ -5,7 +5,7 @@ # # Authors: Chris Ariza # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import re diff --git a/music21/corpus/trecento/PMFC_24_5-Gloria Ciconia 5 Spiritus et alme.xml b/music21/corpus/trecento/PMFC_24_5-Gloria_Spiritus_et_alme.xml similarity index 100% rename from music21/corpus/trecento/PMFC_24_5-Gloria Ciconia 5 Spiritus et alme.xml rename to music21/corpus/trecento/PMFC_24_5-Gloria_Spiritus_et_alme.xml diff --git a/music21/corpus/trecento/PMFC_24_6-Gloria Ciconia 6 Spiritus et alme.xml b/music21/corpus/trecento/PMFC_24_6-Gloria_Spiritus_et_alme.xml similarity index 100% rename from music21/corpus/trecento/PMFC_24_6-Gloria Ciconia 6 Spiritus et alme.xml rename to music21/corpus/trecento/PMFC_24_6-Gloria_Spiritus_et_alme.xml diff --git a/music21/corpus/trecento/PMFC_24_7-Gloria Suscipe, trinitas.xml b/music21/corpus/trecento/PMFC_24_7-Gloria_Suscipe_trinitas.xml similarity index 100% rename from music21/corpus/trecento/PMFC_24_7-Gloria Suscipe, trinitas.xml rename to music21/corpus/trecento/PMFC_24_7-Gloria_Suscipe_trinitas.xml diff --git a/music21/corpus/virtual.py b/music21/corpus/virtual.py index 0c41281a58..1ca47c920d 100644 --- a/music21/corpus/virtual.py +++ b/music21/corpus/virtual.py @@ -5,7 +5,7 @@ # # Authors: Christopher Ariza # -# 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/music21/corpus/work.py b/music21/corpus/work.py index 7e9199f117..091391d049 100644 --- a/music21/corpus/work.py +++ b/music21/corpus/work.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/defaults.py b/music21/defaults.py index 24f5585c79..0a65cbfcec 100644 --- a/music21/defaults.py +++ b/music21/defaults.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# 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/duration.py b/music21/duration.py index 825b33f637..6b5f1eef40 100644 --- a/music21/duration.py +++ b/music21/duration.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/dynamics.py b/music21/dynamics.py index f1c5f95525..f76296f0ff 100644 --- a/music21/dynamics.py +++ b/music21/dynamics.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/exceptions21.py b/music21/exceptions21.py index d001695d8c..259cb4f194 100644 --- a/music21/exceptions21.py +++ b/music21/exceptions21.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/expressions.py b/music21/expressions.py index 1f3eb95ea8..1bf9e96119 100644 --- a/music21/expressions.py +++ b/music21/expressions.py @@ -7,7 +7,7 @@ # Christopher Ariza # Neena Parikh # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/features/__init__.py b/music21/features/__init__.py index cc862ed4bb..166b015a40 100644 --- a/music21/features/__init__.py +++ b/music21/features/__init__.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 # ------------------------------------------------------------------------------ __all__ = ['base', 'outputFormats', 'jSymbolic', 'native'] diff --git a/music21/features/base.py b/music21/features/base.py index 75101636cd..ffc935fe60 100644 --- a/music21/features/base.py +++ b/music21/features/base.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ from __future__ import annotations diff --git a/music21/features/jSymbolic.py b/music21/features/jSymbolic.py index 1832df9fde..ce0f671b63 100644 --- a/music21/features/jSymbolic.py +++ b/music21/features/jSymbolic.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/features/native.py b/music21/features/native.py index 660af2ed7a..3f2343f4b5 100644 --- a/music21/features/native.py +++ b/music21/features/native.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/figuredBass/checker.py b/music21/figuredBass/checker.py index cf833dcc70..d880004e68 100644 --- a/music21/figuredBass/checker.py +++ b/music21/figuredBass/checker.py @@ -4,7 +4,7 @@ # Purpose: checks figured basses for following voice-leading rules # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/figuredBass/examples.py b/music21/figuredBass/examples.py index 78e0ed7275..386b100c64 100644 --- a/music21/figuredBass/examples.py +++ b/music21/figuredBass/examples.py @@ -4,7 +4,7 @@ # Purpose: Figured bass test cases # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2010-2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010-2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/figuredBass/notation.py b/music21/figuredBass/notation.py index 64ef1b1f03..0aa332f026 100644 --- a/music21/figuredBass/notation.py +++ b/music21/figuredBass/notation.py @@ -4,7 +4,7 @@ # Purpose: representations of figured bass notation # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/figuredBass/possibility.py b/music21/figuredBass/possibility.py index 3e674d6aad..0cf4217add 100644 --- a/music21/figuredBass/possibility.py +++ b/music21/figuredBass/possibility.py @@ -4,7 +4,7 @@ # Purpose: rule checking functions for a "possibility" represented as a tuple. # Authors: Jose Cabal-Ugaz # -# 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/figuredBass/realizer.py b/music21/figuredBass/realizer.py index aa936f8d77..078670087b 100644 --- a/music21/figuredBass/realizer.py +++ b/music21/figuredBass/realizer.py @@ -5,7 +5,7 @@ # and figures in a given key. # Authors: Jose Cabal-Ugaz # -# 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/figuredBass/realizerScale.py b/music21/figuredBass/realizerScale.py index 115f7561c9..37177484e3 100644 --- a/music21/figuredBass/realizerScale.py +++ b/music21/figuredBass/realizerScale.py @@ -4,7 +4,7 @@ # Purpose: a figured bass scale # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2010-2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010-2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/figuredBass/resolution.py b/music21/figuredBass/resolution.py index 77e8a5edc6..cf4a9f9d0d 100644 --- a/music21/figuredBass/resolution.py +++ b/music21/figuredBass/resolution.py @@ -4,7 +4,7 @@ # Purpose: Defines standard resolutions for possibility instances # Authors: Jose Cabal-Ugaz # -# 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/figuredBass/rules.py b/music21/figuredBass/rules.py index 75b4b78849..0be97e58e1 100644 --- a/music21/figuredBass/rules.py +++ b/music21/figuredBass/rules.py @@ -4,7 +4,7 @@ # Purpose: Define rules used in realization # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2010 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import typing as t diff --git a/music21/figuredBass/segment.py b/music21/figuredBass/segment.py index 5db12fe255..b1da5d2bab 100644 --- a/music21/figuredBass/segment.py +++ b/music21/figuredBass/segment.py @@ -4,7 +4,7 @@ # Purpose: figured bass note and notational realization. # Authors: Jose Cabal-Ugaz # -# Copyright: Copyright © 2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import collections diff --git a/music21/graph/__init__.py b/music21/graph/__init__.py index 1c311d4001..df54927a16 100644 --- a/music21/graph/__init__.py +++ b/music21/graph/__init__.py @@ -8,7 +8,6 @@ # Evan Lynch # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/graph/axis.py b/music21/graph/axis.py index c21be59943..a34c23866e 100644 --- a/music21/graph/axis.py +++ b/music21/graph/axis.py @@ -8,7 +8,6 @@ # Evan Lynch # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/graph/findPlot.py b/music21/graph/findPlot.py index 34fcb49d88..bb4d1a1871 100644 --- a/music21/graph/findPlot.py +++ b/music21/graph/findPlot.py @@ -7,7 +7,6 @@ # Christopher Ariza # # Copyright: Copyright © 2017-22 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/graph/plot.py b/music21/graph/plot.py index 6111ca971a..f28fb15943 100644 --- a/music21/graph/plot.py +++ b/music21/graph/plot.py @@ -8,7 +8,6 @@ # Evan Lynch # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert, -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/graph/primitives.py b/music21/graph/primitives.py index 2ecf3685bf..bffc0b3d8f 100644 --- a/music21/graph/primitives.py +++ b/music21/graph/primitives.py @@ -8,7 +8,6 @@ # Evan Lynch # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert, -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/graph/utilities.py b/music21/graph/utilities.py index 975944e8ba..d257606122 100644 --- a/music21/graph/utilities.py +++ b/music21/graph/utilities.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert, -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/harmony.py b/music21/harmony.py index bee8476f0c..03055a064a 100644 --- a/music21/harmony.py +++ b/music21/harmony.py @@ -8,7 +8,7 @@ # Jacob Tyler Walls # Christopher Ariza # -# Copyright: Copyright © 2011-2022, Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2022, Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/humdrum/__init__.py b/music21/humdrum/__init__.py index 0d70833ce9..c69bf5146f 100644 --- a/music21/humdrum/__init__.py +++ b/music21/humdrum/__init__.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ # pylint: disable=line-too-long diff --git a/music21/humdrum/harmparser.py b/music21/humdrum/harmparser.py index e1da313732..9c540e36f4 100644 --- a/music21/humdrum/harmparser.py +++ b/music21/humdrum/harmparser.py @@ -5,7 +5,7 @@ # # Authors: Nestor Napoles Lopez # -# Copyright: Copyright © 2009-2012, 2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2012, 2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/humdrum/instruments.py b/music21/humdrum/instruments.py index 8315c877fd..7c13f5f804 100644 --- a/music21/humdrum/instruments.py +++ b/music21/humdrum/instruments.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/humdrum/spineParser.py b/music21/humdrum/spineParser.py index 8943d3950f..30f5817472 100644 --- a/music21/humdrum/spineParser.py +++ b/music21/humdrum/spineParser.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-2012, 2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2012, 2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/instrument.py b/music21/instrument.py index 36944e32e2..bde03153b9 100644 --- a/music21/instrument.py +++ b/music21/instrument.py @@ -10,7 +10,7 @@ # Ben Houge # Mark Gotham # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/interval.py b/music21/interval.py index cb43b00847..52dee2bfd9 100644 --- a/music21/interval.py +++ b/music21/interval.py @@ -8,7 +8,7 @@ # Amy Hailes # Christopher Ariza # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/ipython21/__init__.py b/music21/ipython21/__init__.py index f4835ab428..3c7d62af3f 100644 --- a/music21/ipython21/__init__.py +++ b/music21/ipython21/__init__.py @@ -5,7 +5,7 @@ # # Authors: 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 # ------------------------------------------------------------------------------ ''' diff --git a/music21/key.py b/music21/key.py index 0b90486c05..00f4a0fe87 100644 --- a/music21/key.py +++ b/music21/key.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/languageExcerpts/instrumentLookup.py b/music21/languageExcerpts/instrumentLookup.py index cda6645722..e2709af865 100644 --- a/music21/languageExcerpts/instrumentLookup.py +++ b/music21/languageExcerpts/instrumentLookup.py @@ -5,7 +5,7 @@ # Authors: Jose Cabal-Ugaz # Mark Gotham # -# Copyright: Copyright © 2012, 20 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/languageExcerpts/naturalLanguageObjects.py b/music21/languageExcerpts/naturalLanguageObjects.py index fcb66e5911..4bd9cc25ac 100644 --- a/music21/languageExcerpts/naturalLanguageObjects.py +++ b/music21/languageExcerpts/naturalLanguageObjects.py @@ -5,7 +5,7 @@ # Authors: David Perez # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2014, 2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2014-2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/layout.py b/music21/layout.py index b2babbed93..9e74db7476 100644 --- a/music21/layout.py +++ b/music21/layout.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # 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/music21/license.txt b/music21/license.txt index cdb796e32c..8122076c83 100644 --- a/music21/license.txt +++ b/music21/license.txt @@ -6,22 +6,23 @@ # distributed with this package, particularly the corpus files # which have their own copyrights and licenses. # -# Copyright: music21 is "Copyright © 2006-2021 Michael Scott Cuthbert and -# cuthbertLab" and is freely licensed under the -# BSD 3-Clause License (beginning with music21 v.2.0) or -# (for all versions) the GNU Lesser -# General Public License v3 or subsequent versions, +# Copyright: music21 is "Copyright © 2006-2022 Michael Scott Asato Cuthbert" +# and is open-source licensed under the +# BSD 3-Clause License (beginning with music21 v2.0) # reprinted below. # #------------------------------------------------------------------------------- -Music21 (v2.0+) may be distributed according to the terms of either the -BSD license or the GNU Lesser General Public License, described below: +Music21 (v2.0+) is distributed according to the terms of the +BSD license (BSD-3-Clause) described below. For historical reasons, music21 before v2 can +also be distributed and used under the LGPL license. Between v1 and 2, all +contributors were contacted and agreed to relicense their contributions under +the BSD license still under effect. --- BSD License -Copyright (c) 2006-2021, Michael Scott Cuthbert and cuthbertLab +Copyright (c) 2006-2022, Michael Scott Asato Cuthbert All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,186 +32,17 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the names music21, Michael Scott Cuthbert, cuthbertLab nor the + * Neither the names music21, Michael Scott Asato Cuthbert, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL Cuthbert OR cuthbertLab BE LIABLE FOR ANY +DISCLAIMED. IN NO EVENT SHALL Cuthbert BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ----- - -GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser 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 -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/music21/lily/lilyObjects.py b/music21/lily/lilyObjects.py index 4ae03a5f65..44f4275080 100644 --- a/music21/lily/lilyObjects.py +++ b/music21/lily/lilyObjects.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2007-2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2007-2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ # pylint: disable=too-many-function-args diff --git a/music21/lily/translate.py b/music21/lily/translate.py index e1d1b63797..82c53113ee 100644 --- a/music21/lily/translate.py +++ b/music21/lily/translate.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2007-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2007-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/mei/__init__.py b/music21/mei/__init__.py index 846a5ae0ca..417a66049e 100644 --- a/music21/mei/__init__.py +++ b/music21/mei/__init__.py @@ -5,7 +5,7 @@ # # Authors: Christopher Antila # -# Copyright: Copyright © 2014 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2014 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/mei/base.py b/music21/mei/base.py index 659c21d14c..8b16fa2e7d 100644 --- a/music21/mei/base.py +++ b/music21/mei/base.py @@ -5,7 +5,7 @@ # # Authors: Christopher Antila # -# Copyright: Copyright © 2014 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2014 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/mei/test_base.py b/music21/mei/test_base.py index ec1f78710e..1974847563 100644 --- a/music21/mei/test_base.py +++ b/music21/mei/test_base.py @@ -5,7 +5,7 @@ # # Authors: Christopher Antila # -# Copyright: Copyright © 2014 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2014 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/metadata/bundles.py b/music21/metadata/bundles.py index 7b136c2299..eff9082476 100644 --- a/music21/metadata/bundles.py +++ b/music21/metadata/bundles.py @@ -8,7 +8,7 @@ # Josiah Oberholtzer # # Copyright: Copyright © 2010, 2012-14, '17, '19-20 -# Michael Scott Asato Cuthbert and the music21 Project +# Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- from __future__ import annotations diff --git a/music21/meter/__init__.py b/music21/meter/__init__.py index 99c446296e..9034d9deda 100644 --- a/music21/meter/__init__.py +++ b/music21/meter/__init__.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- from music21.exceptions21 import TimeSignatureException, MeterException diff --git a/music21/meter/base.py b/music21/meter/base.py index 9f6edb4661..18aa50cd04 100644 --- a/music21/meter/base.py +++ b/music21/meter/base.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/meter/core.py b/music21/meter/core.py index 0a165e06ad..fd3693f387 100644 --- a/music21/meter/core.py +++ b/music21/meter/core.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/meter/tests.py b/music21/meter/tests.py index 4953d58a0f..06ccdb5ece 100644 --- a/music21/meter/tests.py +++ b/music21/meter/tests.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- import copy diff --git a/music21/meter/tools.py b/music21/meter/tools.py index ee1997c8af..98988ae207 100644 --- a/music21/meter/tools.py +++ b/music21/meter/tools.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- import collections diff --git a/music21/midi/__init__.py b/music21/midi/__init__.py index 58848a2d15..9bd5e0d5f5 100644 --- a/music21/midi/__init__.py +++ b/music21/midi/__init__.py @@ -7,7 +7,7 @@ # Michael Scott Asato Cuthbert # (Will Ware -- see docs) # -# Copyright: Copyright © 2011-2013, 2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2013, 2019 Michael Scott Asato Cuthbert # Some parts of this module are in the Public Domain, see details. # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/midi/percussion.py b/music21/midi/percussion.py index a5c7be7d4f..d4a1ccbca2 100644 --- a/music21/midi/percussion.py +++ b/music21/midi/percussion.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Ben Houge # -# Copyright: Copyright © 2012, 2017 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012, 2017 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import unittest diff --git a/music21/midi/realtime.py b/music21/midi/realtime.py index 0ad3b7ba7c..b549b8163f 100644 --- a/music21/midi/realtime.py +++ b/music21/midi/realtime.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # (from an idea by Joe "Codeswell") # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/midi/translate.py b/music21/midi/translate.py index 2f087a7462..b502c0257e 100644 --- a/music21/midi/translate.py +++ b/music21/midi/translate.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 # ------------------------------------------------------------------------------ ''' diff --git a/music21/musedata/__init__.py b/music21/musedata/__init__.py index 79b6aed844..9b72b215a0 100644 --- a/music21/musedata/__init__.py +++ b/music21/musedata/__init__.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2010, 2014 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010, 2014 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/musedata/base12_26.py b/music21/musedata/base12_26.py index 509edbd4cd..e8d199ff0a 100644 --- a/music21/musedata/base12_26.py +++ b/music21/musedata/base12_26.py @@ -5,7 +5,7 @@ # # Authors: Mark Gotham # -# 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/musedata/base40.py b/music21/musedata/base40.py index cae3a32fa9..5720f6658a 100644 --- a/music21/musedata/base40.py +++ b/music21/musedata/base40.py @@ -5,7 +5,7 @@ # # Authors: Jose Cabal-Ugaz # -# 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/musedata/translate.py b/music21/musedata/translate.py index 6babb53fec..77c9245de3 100644 --- a/music21/musedata/translate.py +++ b/music21/musedata/translate.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # 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/music21/musicxml/__init__.py b/music21/musicxml/__init__.py index 26ec1fc6fb..030b2da111 100644 --- a/music21/musicxml/__init__.py +++ b/music21/musicxml/__init__.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2010-2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010-2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ __all__ = [ diff --git a/music21/musicxml/archiveTools.py b/music21/musicxml/archiveTools.py index 65b16a4f4f..0d9e171969 100644 --- a/music21/musicxml/archiveTools.py +++ b/music21/musicxml/archiveTools.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009, 2017, 2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009, 2017, 2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/musicxml/helpers.py b/music21/musicxml/helpers.py index 0f3ce45333..c6d4df6aba 100644 --- a/music21/musicxml/helpers.py +++ b/music21/musicxml/helpers.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Jacob Tyler Walls # -# Copyright: Copyright © 2013-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2013-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/musicxml/m21ToXml.py b/music21/musicxml/m21ToXml.py index 10d2b5c59f..92164007ea 100644 --- a/music21/musicxml/m21ToXml.py +++ b/music21/musicxml/m21ToXml.py @@ -7,7 +7,7 @@ # Christopher Ariza # Jacob Tyler Walls # -# Copyright: Copyright © 2010-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/musicxml/partStaffExporter.py b/music21/musicxml/partStaffExporter.py index 7fc34b0fe0..ec5bae21d4 100644 --- a/music21/musicxml/partStaffExporter.py +++ b/music21/musicxml/partStaffExporter.py @@ -6,7 +6,7 @@ # Authors: Jacob Tyler Walls # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2020-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2020-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/musicxml/xmlObjects.py b/music21/musicxml/xmlObjects.py index a27bc9328c..b2184e01a8 100644 --- a/music21/musicxml/xmlObjects.py +++ b/music21/musicxml/xmlObjects.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import re diff --git a/music21/musicxml/xmlSoundParser.py b/music21/musicxml/xmlSoundParser.py index c28992c385..8294c5a432 100644 --- a/music21/musicxml/xmlSoundParser.py +++ b/music21/musicxml/xmlSoundParser.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2016-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2016-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/musicxml/xmlToM21.py b/music21/musicxml/xmlToM21.py index 496a29e030..b3c08e3d97 100644 --- a/music21/musicxml/xmlToM21.py +++ b/music21/musicxml/xmlToM21.py @@ -7,7 +7,7 @@ # Christopher Ariza # Jacob Tyler Walls # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/note.py b/music21/note.py index 8ed3973d50..72716279f2 100644 --- a/music21/note.py +++ b/music21/note.py @@ -7,7 +7,6 @@ # Christopher Ariza # # Copyright: Copyright © 2006-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/noteworthy/__init__.py b/music21/noteworthy/__init__.py index 2c9d59d7c7..3176ce737a 100644 --- a/music21/noteworthy/__init__.py +++ b/music21/noteworthy/__init__.py @@ -6,7 +6,7 @@ # Authors: Jordi Bartolome # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2006-2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2006-2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ __all__ = ['translate', 'binaryTranslate'] diff --git a/music21/noteworthy/binaryTranslate.py b/music21/noteworthy/binaryTranslate.py index b26401006b..d886c26b33 100644 --- a/music21/noteworthy/binaryTranslate.py +++ b/music21/noteworthy/binaryTranslate.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2006-2013 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2006-2013 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/noteworthy/translate.py b/music21/noteworthy/translate.py index a64b17e3e3..26ed25c1a8 100644 --- a/music21/noteworthy/translate.py +++ b/music21/noteworthy/translate.py @@ -6,7 +6,7 @@ # Authors: Jordi Bartolome # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/omr/__init__.py b/music21/omr/__init__.py index 60e19dabea..e3bfa2f877 100644 --- a/music21/omr/__init__.py +++ b/music21/omr/__init__.py @@ -6,7 +6,7 @@ # Authors: Maura Church # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2014 Maura Church, Michael Scott Asato Cuthbert, and the music21 Project +# Copyright: Copyright © 2014 Maura Church, Michael Scott Asato Cuthbert, # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/omr/correctors.py b/music21/omr/correctors.py index 111fd834f6..d000c32e65 100644 --- a/music21/omr/correctors.py +++ b/music21/omr/correctors.py @@ -6,7 +6,7 @@ # Authors: Maura Church # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2014 Maura Church, Michael Scott Asato Cuthbert, and the music21 Project +# Copyright: Copyright © 2014 Maura Church, Michael Scott Asato Cuthbert, # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/omr/evaluators.py b/music21/omr/evaluators.py index f2ca783ff9..87db33162b 100644 --- a/music21/omr/evaluators.py +++ b/music21/omr/evaluators.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2014 Maura Church, Michael Scott Asato Cuthbert, -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/percussion.py b/music21/percussion.py index 465c4df68f..5af149b9a2 100644 --- a/music21/percussion.py +++ b/music21/percussion.py @@ -7,7 +7,7 @@ # Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2006-2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2006-2019 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/pitch.py b/music21/pitch.py index 1f3f07aabd..70adb77fa5 100644 --- a/music21/pitch.py +++ b/music21/pitch.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2008-2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2019 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/prebase.py b/music21/prebase.py index 3b1e9943f2..ea8c10f5ca 100644 --- a/music21/prebase.py +++ b/music21/prebase.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2019 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/repeat.py b/music21/repeat.py index d10b28163e..a83d746941 100644 --- a/music21/repeat.py +++ b/music21/repeat.py @@ -7,7 +7,7 @@ # Daniel Manesh # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-2012, 16, 19 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2012, 16, 19 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/romanText/__init__.py b/music21/romanText/__init__.py index 7bed7e6d05..555a927d24 100644 --- a/music21/romanText/__init__.py +++ b/music21/romanText/__init__.py @@ -7,7 +7,7 @@ # Michael Scott Asato Cuthbert # Mark Gotham # -# Copyright: Copyright © 2011-2012, 2019-20 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2012, 2019-20 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/romanText/clercqTemperley.py b/music21/romanText/clercqTemperley.py index 6d03ef9cde..1bc547f865 100644 --- a/music21/romanText/clercqTemperley.py +++ b/music21/romanText/clercqTemperley.py @@ -7,7 +7,7 @@ # Authors: Beth Hadley # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-12, 2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-12, 2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/romanText/rtObjects.py b/music21/romanText/rtObjects.py index 626e17e4d1..e1559f97c0 100644 --- a/music21/romanText/rtObjects.py +++ b/music21/romanText/rtObjects.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-2012, 2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2012, 2019 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/romanText/testFiles.py b/music21/romanText/testFiles.py index 0c58bb7b56..a117526e3d 100644 --- a/music21/romanText/testFiles.py +++ b/music21/romanText/testFiles.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/romanText/translate.py b/music21/romanText/translate.py index 9a1d3a9cad..939767353d 100644 --- a/music21/romanText/translate.py +++ b/music21/romanText/translate.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2011-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/romanText/tsvConverter.py b/music21/romanText/tsvConverter.py index 0419dc6424..318b359858 100644 --- a/music21/romanText/tsvConverter.py +++ b/music21/romanText/tsvConverter.py @@ -5,7 +5,7 @@ # # Authors: Mark Gotham # -# Copyright: Copyright © 2019 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2019 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/romanText/writeRoman.py b/music21/romanText/writeRoman.py index a42bd25fd3..0d378be45c 100644 --- a/music21/romanText/writeRoman.py +++ b/music21/romanText/writeRoman.py @@ -5,7 +5,7 @@ # # Authors: Mark Gotham # -# Copyright: Copyright © 2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/scale/__init__.py b/music21/scale/__init__.py index 02a452dced..b4229534a4 100644 --- a/music21/scale/__init__.py +++ b/music21/scale/__init__.py @@ -7,7 +7,7 @@ # Michael Scott Asato Cuthbert # Jose Cabal-Ugaz # -# Copyright: Copyright © 2009-2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/scale/intervalNetwork.py b/music21/scale/intervalNetwork.py index 00c4e4bbe0..4d9b0a5c97 100644 --- a/music21/scale/intervalNetwork.py +++ b/music21/scale/intervalNetwork.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 # ------------------------------------------------------------------------------ ''' diff --git a/music21/scale/scala/__init__.py b/music21/scale/scala/__init__.py index 9a47a66f3d..63fceab5bf 100644 --- a/music21/scale/scala/__init__.py +++ b/music21/scale/scala/__init__.py @@ -5,7 +5,7 @@ # # Authors: Christopher Ariza # -# Copyright: Copyright © 2010, 16 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2010, 16 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/scale/scala/scl/license.txt b/music21/scale/scala/scl/license.txt index 6ef36471c9..2e3d422e3e 100644 --- a/music21/scale/scala/scl/license.txt +++ b/music21/scale/scala/scl/license.txt @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # Name: scala/scl/license.txt -# Purpose: The music21 Project assumes no copyright or change in licensing +# Purpose: The muisc21 authors assume no copyright or change in licensing # for content distributed in the scala/scl collection. # #------------------------------------------------------------------------------- diff --git a/music21/scale/test_intervalNetwork.py b/music21/scale/test_intervalNetwork.py index 2ebeaabcde..fd892e227f 100644 --- a/music21/scale/test_intervalNetwork.py +++ b/music21/scale/test_intervalNetwork.py @@ -5,7 +5,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 # ------------------------------------------------------------------------------ diff --git a/music21/scale/test_scale_main.py b/music21/scale/test_scale_main.py index 24c3c6c0c1..f68ca4f788 100644 --- a/music21/scale/test_scale_main.py +++ b/music21/scale/test_scale_main.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 # ------------------------------------------------------------------------------ from pprint import pformat diff --git a/music21/search/__init__.py b/music21/search/__init__.py index 4444dee4f4..aba2e626fc 100644 --- a/music21/search/__init__.py +++ b/music21/search/__init__.py @@ -5,7 +5,7 @@ # # Authors: 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/search/base.py b/music21/search/base.py index b23967b836..5afbd2cfa5 100644 --- a/music21/search/base.py +++ b/music21/search/base.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-2013, 2017 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2013, 2017 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/search/lyrics.py b/music21/search/lyrics.py index 874fd14e64..0f246df96c 100644 --- a/music21/search/lyrics.py +++ b/music21/search/lyrics.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/search/segment.py b/music21/search/segment.py index b5db4022f2..e6f2d77ad0 100644 --- a/music21/search/segment.py +++ b/music21/search/segment.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2011-2018 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2011-2018 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/search/serial.py b/music21/search/serial.py index d383295885..9042d7bd21 100644 --- a/music21/search/serial.py +++ b/music21/search/serial.py @@ -6,7 +6,7 @@ # Authors: Carl Lian # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-2012, 2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2012, 2016 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------- from collections import Counter diff --git a/music21/serial.py b/music21/serial.py index 9ad8cc0961..c110e2627e 100644 --- a/music21/serial.py +++ b/music21/serial.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# 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/sieve.py b/music21/sieve.py index 3bbc941cbd..9c6f04d2ec 100644 --- a/music21/sieve.py +++ b/music21/sieve.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # # Copyright: Copyright © 2003, 2010 Christopher Ariza -# Copyright © 2010-2012, 19 Michael Scott Asato Cuthbert and the music21 Project +# Copyright © 2010-2012, 19 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/sites.py b/music21/sites.py index bc36f80f62..37eae97ac9 100644 --- a/music21/sites.py +++ b/music21/sites.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2007-2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2007-2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/spanner.py b/music21/spanner.py index 496858ce0f..ecb7824bb2 100644 --- a/music21/spanner.py +++ b/music21/spanner.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # 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/music21/stream/__init__.py b/music21/stream/__init__.py index 403f7baccb..5e4848bca4 100644 --- a/music21/stream/__init__.py +++ b/music21/stream/__init__.py @@ -8,7 +8,7 @@ # Josiah Wolf Oberholtzer # Evan Lynch # -# Copyright: Copyright © 2008-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- from music21.exceptions21 import StreamException, ImmutableStreamException diff --git a/music21/stream/base.py b/music21/stream/base.py index f1a36234b4..42ba499d1b 100644 --- a/music21/stream/base.py +++ b/music21/stream/base.py @@ -8,7 +8,7 @@ # Josiah Wolf Oberholtzer # Evan Lynch # -# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/stream/core.py b/music21/stream/core.py index cd2e1bae3d..2526eaf416 100644 --- a/music21/stream/core.py +++ b/music21/stream/core.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/stream/enums.py b/music21/stream/enums.py index 9ce1792759..65b3a1be87 100644 --- a/music21/stream/enums.py +++ b/music21/stream/enums.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- import enum diff --git a/music21/stream/filters.py b/music21/stream/filters.py index 0a7de0f7c7..375f320264 100644 --- a/music21/stream/filters.py +++ b/music21/stream/filters.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2008-2017 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2017 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/stream/iterator.py b/music21/stream/iterator.py index fd18431bc5..8e98ff0da9 100644 --- a/music21/stream/iterator.py +++ b/music21/stream/iterator.py @@ -7,7 +7,6 @@ # Christopher Ariza # # Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- ''' diff --git a/music21/stream/makeNotation.py b/music21/stream/makeNotation.py index 6f4297f69d..990dee77d8 100644 --- a/music21/stream/makeNotation.py +++ b/music21/stream/makeNotation.py @@ -9,7 +9,6 @@ # Evan Lynch # # Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert -# and the music21 Project # License: BSD, see license.txt # ----------------------------------------------------------------------------- diff --git a/music21/stream/tests.py b/music21/stream/tests.py index 033d5ccdc8..3785d966eb 100644 --- a/music21/stream/tests.py +++ b/music21/stream/tests.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/tablature.py b/music21/tablature.py index 0de66c33bb..fd30769714 100644 --- a/music21/tablature.py +++ b/music21/tablature.py @@ -5,7 +5,7 @@ # # Authors: Luke Poeppel # -# Copyright: Copyright © 2006-2016 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2006-2016 Michael Scott Asato Cuthbert # Licence: BSD, see licence.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/tempo.py b/music21/tempo.py index e8c1052f75..f202dd2c2d 100644 --- a/music21/tempo.py +++ b/music21/tempo.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-22 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-22 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/test/commonTest.py b/music21/test/commonTest.py index 5658ea1433..9ae5ce096c 100644 --- a/music21/test/commonTest.py +++ b/music21/test/commonTest.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-15 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-15 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/test/coverageM21.py b/music21/test/coverageM21.py index 64e6735ce7..ec6b42e609 100644 --- a/music21/test/coverageM21.py +++ b/music21/test/coverageM21.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2014-15 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2014-15 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import sys diff --git a/music21/test/multiprocessTest.py b/music21/test/multiprocessTest.py index 5559a5c1fa..dcf25596ba 100644 --- a/music21/test/multiprocessTest.py +++ b/music21/test/multiprocessTest.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012-15 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012-15 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/test/testDefault.py b/music21/test/testDefault.py index 02141d9307..4bb47a1e6c 100644 --- a/music21/test/testDefault.py +++ b/music21/test/testDefault.py @@ -6,7 +6,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# 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/test/testExternal.py b/music21/test/testExternal.py index fca2db1d1a..ef86e586d9 100644 --- a/music21/test/testExternal.py +++ b/music21/test/testExternal.py @@ -7,7 +7,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/test/testLint.py b/music21/test/testLint.py index b2a47c2179..9053689d4c 100644 --- a/music21/test/testLint.py +++ b/music21/test/testLint.py @@ -7,7 +7,6 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert, -# and the music21 Project # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/test/testPerformance.py b/music21/test/testPerformance.py index 5e1a1d40df..7cbac07136 100644 --- a/music21/test/testPerformance.py +++ b/music21/test/testPerformance.py @@ -5,7 +5,7 @@ # # Authors: Christopher Ariza # -# Copyright: Copyright © 2009-2011 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2011 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/test/testSerialization.py b/music21/test/testSerialization.py index 7d364cf4e3..17ee4b171e 100644 --- a/music21/test/testSerialization.py +++ b/music21/test/testSerialization.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2012-13 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012-13 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/test/testSingleCoreAll.py b/music21/test/testSingleCoreAll.py index a00e490512..ccade06a02 100644 --- a/music21/test/testSingleCoreAll.py +++ b/music21/test/testSingleCoreAll.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/test/test_base.py b/music21/test/test_base.py index dc501516f5..4ec8fc9bea 100644 --- a/music21/test/test_base.py +++ b/music21/test/test_base.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/test/test_pitch.py b/music21/test/test_pitch.py index cee98d6a3d..463e2d2179 100644 --- a/music21/test/test_pitch.py +++ b/music21/test/test_pitch.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2008-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ import copy diff --git a/music21/test/timeGraphImportStar.py b/music21/test/timeGraphImportStar.py index 755852d8ff..dafcda6d94 100644 --- a/music21/test/timeGraphImportStar.py +++ b/music21/test/timeGraphImportStar.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ # pragma: no cover diff --git a/music21/test/timeGraphs.py b/music21/test/timeGraphs.py index 64280078cb..777ec7cfbe 100644 --- a/music21/test/timeGraphs.py +++ b/music21/test/timeGraphs.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2020 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ # pragma: no cover diff --git a/music21/test/toggleDebug.py b/music21/test/toggleDebug.py index effd0c8620..2a04303ada 100644 --- a/music21/test/toggleDebug.py +++ b/music21/test/toggleDebug.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/music21/text.py b/music21/text.py index b9f2def043..e0371dad93 100644 --- a/music21/text.py +++ b/music21/text.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Authors: Christopher Ariza # -# Copyright: Copyright © 2009-2012, 2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2012, 2015 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/tie.py b/music21/tie.py index 1a32741910..324f3df252 100644 --- a/music21/tie.py +++ b/music21/tie.py @@ -6,8 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # Christopher Ariza # -# Copyright: Copyright © 2009-2010, 2012, 2015 Michael Scott Asato Cuthbert -# and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/tinyNotation.py b/music21/tinyNotation.py index 28fcefd31a..27ffcb7467 100644 --- a/music21/tinyNotation.py +++ b/music21/tinyNotation.py @@ -5,7 +5,7 @@ # # Authors: Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2009-2012, 2015 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------- ''' diff --git a/music21/variant.py b/music21/variant.py index d60defca2b..0b4799dd05 100644 --- a/music21/variant.py +++ b/music21/variant.py @@ -7,7 +7,7 @@ # Evan Lynch # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ # currently the tinyNotation demos use alignment to show variation, making this necessary. diff --git a/music21/vexflow/__init__.py b/music21/vexflow/__init__.py index d255a98d75..90fb81ff30 100644 --- a/music21/vexflow/__init__.py +++ b/music21/vexflow/__init__.py @@ -6,7 +6,7 @@ # Authors: Christopher Reyes # Michael Scott Asato Cuthbert # -# Copyright: Copyright © 2012-14 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012-14 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ diff --git a/music21/vexflow/toMusic21j.py b/music21/vexflow/toMusic21j.py index 4f274b3ef7..e3a05af76d 100644 --- a/music21/vexflow/toMusic21j.py +++ b/music21/vexflow/toMusic21j.py @@ -6,7 +6,7 @@ # Authors: Michael Scott Asato Cuthbert # based on an earlier version by Christopher Reyes # -# Copyright: Copyright © 2012-14 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2012-14 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/voiceLeading.py b/music21/voiceLeading.py index 098339d02b..2f8ef6ec95 100644 --- a/music21/voiceLeading.py +++ b/music21/voiceLeading.py @@ -8,7 +8,7 @@ # Jackie Rogoff # Beth Hadley # -# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: Copyright © 2009-2022 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/music21/volpiano.py b/music21/volpiano.py index 72474599dc..f3d45b0bff 100644 --- a/music21/volpiano.py +++ b/music21/volpiano.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 # ------------------------------------------------------------------------------ ''' diff --git a/music21/volume.py b/music21/volume.py index f1e66d7974..1f65398f53 100644 --- a/music21/volume.py +++ b/music21/volume.py @@ -8,7 +8,7 @@ # Michael Scott Asato Cuthbert # # Copyright: Copyright © 2011-2012, 2015, 2017 -# Michael Scott Asato Cuthbert and the music21 Project +# Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ ''' diff --git a/setup.py b/setup.py index 7339b2602b..b5cf2b4753 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ # Authors: Christopher Ariza # Michael Scott Asato Cuthbert # -# Copyright: (c) 2009-2021 Michael Scott Asato Cuthbert and the music21 Project +# Copyright: (c) 2009-2021 Michael Scott Asato Cuthbert # License: BSD, see license.txt # ------------------------------------------------------------------------------ @@ -25,9 +25,7 @@ DESCRIPTION = 'A Toolkit for Computer-Aided Musical Analysis.' DESCRIPTION_LONG = """A Toolkit for Computer-Aided Musical Analysis. - Developed by cuthbertLab, - Michael Scott Asato Cuthbert (Associate Professor, MIT), - Principal Investigator. + Developed by Michael Scott Asato Cuthbert. The development of music21 is supported by the generosity of the Seaver Institute and the NEH.""" @@ -69,7 +67,7 @@ python_requires='>=3.8', description=DESCRIPTION, long_description=DESCRIPTION_LONG, - author='Michael Scott Asato Cuthbert, the music21 project, others', + author='Michael Scott Asato Cuthbert', author_email='cuthbert@mit.edu', license='BSD', url='https://github.com/cuthbertLab/music21',