Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify entities #1430

Merged
merged 1 commit into from
Sep 19, 2022
Merged

Clarify entities #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions dist/dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion documentation/docbuild/documenters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion documentation/docbuild/extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion documentation/docbuild/iterators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion documentation/docbuild/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion documentation/docbuild/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion documentation/docbuild/writers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions documentation/source/about/about.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions documentation/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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'),
]

Expand Down
2 changes: 1 addition & 1 deletion documentation/testDocumentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
8 changes: 2 additions & 6 deletions music21/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion music21/abcFormat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/alpha/analysis/aligner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/alpha/analysis/fixer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/alpha/analysis/hasher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions music21/alpha/analysis/ornamentRecognizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/alpha/analysis/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion music21/alpha/analysis/testFiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/correlate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/discrete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/elements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/enharmonics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/floatingKey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/harmonicFunction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/metrical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/neoRiemannian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/patel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/pitchAnalysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/reduceChords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/reduceChordsOld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/reduction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/segmentByRests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/transposition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion music21/analysis/windowed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------
'''
Expand Down
2 changes: 1 addition & 1 deletion music21/articulations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion music21/audioSearch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------------------------------------------
'''
Expand Down
Loading