Merge pull request #1257 from cuthbertLab/pre-release7.3

Pre release7.3
cuthbertLab · Mar 27, 2022 · 2877706 · 2877706
2 parents 3fe9d65 + 297162b
commit 2877706
Show file tree

Hide file tree

Showing 20 changed files with 1,653 additions and 1,651 deletions.
diff --git a/dist/dist.py b/dist/dist.py
@@ -26,7 +26,7 @@
      but should be done before making a release).
 6. IMPORTANT: run python documentation/testDocumentation.py and afterwards fix errors [*]
 
-[*] you will need pytest and nbval installed (along with ipython and jupyter), you cannot check
+[*] you will need pytest, docutils, nbval installed (along with ipython and jupyter), you cannot check
 to see if fixed tests work while it is running.
 This takes a while and runs single core, so allocate time.  Start working on
 the announcement while it's running.

diff --git a/documentation/docbuild/make.py b/documentation/docbuild/make.py
@@ -92,7 +92,7 @@ def runSphinx(self):
             import sphinx
         except ImportError:
             message = 'Sphinx is required to build documentation; '
-            message += 'download from http://sphinx-doc.org'
+            message += 'run pip install Sphinx'
             raise ImportError(message)
 
         target = self.command

diff --git a/documentation/source/about/about.rst b/documentation/source/about/about.rst
@@ -109,7 +109,7 @@ to this project.  Their contributions and generosity are greatly appreciated.
 * `Ewa Dahlig-Turek`_ has kindly given permission to distribute the
    Essen folksong database with music21.
 
-* `Margaret Greentree`_ kindly gave permission for distribution of her edited
+* `Margaret Greentree` kindly gave permission for distribution of her edited
    collection of the Bach chorales in MusicXML format as part of the music21 corpus.
    Her website contains all these chorales in additional formats.
    Any discoveries we make regarding these chorales are done in her memory.
@@ -118,7 +118,7 @@ to this project.  Their contributions and generosity are greatly appreciated.
 
 * Walter B. Hewlett and Craig Sapp of Stanford's CCARH for support.
 
-* `Justin London`_ compiled and maintained the list of Second-Viennese
+* `Justin London` compiled and maintained the list of Second-Viennese
    row forms now available in serial.py.
 
 * `McGill University`_ ELVIS project for including the MEI parser. Special thanks to Julie
@@ -139,13 +139,11 @@ to this project.  Their contributions and generosity are greatly appreciated.
 
 .. _Donald Byrd: https://homes.luddy.indiana.edu/donbyrd/CMNExtremes.htm
 .. _Laura E. Conrad: http://www.serpentpublications.org/drupal7/
-.. _Margaret Greentree: http://www.jsbchorales.net
 .. _MuseScore: https://musescore.com/
-.. _Justin London: https://people.carleton.edu/~jlondon/2ndviennese.htm
 .. _Bryen Travis: http://www.bachcentral.com/
 .. _Ewa Dahlig-Turek: http://www.esac-data.org
-.. _Seymour Shlien: tps://ifdo.ca/~seymour/runabc/esac/esacdatabase.html
-.. _Manuel Op de Coul: http://www.huygens-fokker.org/scala
+.. _Seymour Shlien: https://ifdo.ca/~seymour/runabc/esac/esacdatabase.html
+.. _Manuel Op de Coul: https://www.huygens-fokker.org/scala
 .. _John Chambers: http://trillian.mit.edu/~jc/music/book
 .. _Jack Campin: http://www.campin.me.uk/
 .. _McGill University: https://hcommons.org/deposits/item/hc:12359/

diff --git a/documentation/source/about/applications.rst b/documentation/source/about/applications.rst
@@ -4,52 +4,52 @@
 Applications and Extensions of `music21`
 =============================================
 
-`Music21` has been used in numerous research tasks already, and will continue 
-to offer researchers many tools with which to explore new domains. 
+`Music21` has been used in numerous research tasks already, and will continue
+to offer researchers many tools with which to explore new domains.
 
 
 Papers, Presentations, and Publications
 ---------------------------------------------------
 
 The following papers and publications make extensive use of `music21`. Start here:
 
-Cuthbert, Michael Scott Cuthbert and Christopher Ariza. 2010. "`music21`: A 
-Toolkit for Computer-Aided Musicology and Symbolic Music Data." In 
-*Proceedings of the International Society for Music Information Retrieval*. 
+Cuthbert, Michael Scott Cuthbert and Christopher Ariza. 2010. "`music21`: A
+Toolkit for Computer-Aided Musicology and Symbolic Music Data." In
+*Proceedings of the International Society for Music Information Retrieval*.
 https://www.academia.edu/243058/music21_A_Toolkit_for_Computer-Aided_Musicology_and_Symbolic_Music_Data
 
 
 Then continue with:
 
-Church, Maura and Michael Scott Cuthbert. 2014. "Improving Rhythmic 
-Transcriptions via Probability Models Applied Post-OMR." In *Proceedings of the 
+Church, Maura and Michael Scott Cuthbert. 2014. "Improving Rhythmic
+Transcriptions via Probability Models Applied Post-OMR." In *Proceedings of the
 International Society for Music Information Retrieval*.
 https://www.academia.edu/7709124/Improving_Rhythmic_Transcriptions_via_Probability_Models_Applied_Post-OMR
 
-Cuthbert, Michael Scott, Beth Hadley, Lars Johnson, and Christopher Reyes. 2012. 
-"Interoperable Digital Musicology Research via `music21` Web Applications." 
-From *Joint CLARIN-D/DARIAH Workshop at Digital Humanities Conference Hamburg*. 
+Cuthbert, Michael Scott, Beth Hadley, Lars Johnson, and Christopher Reyes. 2012.
+"Interoperable Digital Musicology Research via `music21` Web Applications."
+From *Joint CLARIN-D/DARIAH Workshop at Digital Humanities Conference Hamburg*.
 https://www.academia.edu/1787946/Interoperable_Digital_Musicology_Research_via_music21_Web_Applications
 
-Cuthbert, Michael Scott, Chris Ariza, Jose Cabal-Ugaz, Beth Hadley, and Neena Parikh. 2011. 
-"Hidden Beyond MIDI’s Reach:Feature Extraction and Machine Learning with Rich Symbolic Formats 
-in `music21`" In *Proceedings of the Neural Information Processing Systems Conference*. 
+Cuthbert, Michael Scott, Chris Ariza, Jose Cabal-Ugaz, Beth Hadley, and Neena Parikh. 2011.
+"Hidden Beyond MIDI’s Reach:Feature Extraction and Machine Learning with Rich Symbolic Formats
+in `music21`" In *Proceedings of the Neural Information Processing Systems Conference*.
 https://www.academia.edu/1256513/Hidden_Beyond_MIDI_s_Reach_Feature_Extraction_and_Machine_Learning_with_Rich_Symbolic_Formats_in_music21
 
-Cuthbert, Michael Scott, Chris Ariza, and Lisa D. Friedland. 2011. "Feature Extraction and 
-Machine Learning on Symbolic Music using the `music21` Toolkit" In 
-*Proceedings of the International Symposium on Music Information Retrieval* 
+Cuthbert, Michael Scott, Chris Ariza, and Lisa D. Friedland. 2011. "Feature Extraction and
+Machine Learning on Symbolic Music using the `music21` Toolkit" In
+*Proceedings of the International Symposium on Music Information Retrieval*
 https://www.academia.edu/1256514/Feature_Extraction_and_Machine_Learning_on_Symbolic_Music_using_the_music21_Toolkit
 
-Jordi Barthomé Guillen and Michael Scott Cuthbert. 2011. "Score Following from 
-Inaccurate Score and Audio Data using OMR and `music21`." In *Proceedings of the Neural 
-Information Processing Systems Conference (Music and Machine Learning, Workshop 4*. 
+Jordi Barthomé Guillen and Michael Scott Cuthbert. 2011. "Score Following from
+Inaccurate Score and Audio Data using OMR and `music21`." In *Proceedings of the Neural
+Information Processing Systems Conference (Music and Machine Learning, Workshop 4*.
 https://www.academia.edu/1256512/Score_Following_from_Inaccurate_Score_and_Audio_Data_using_OMR_and_music21
 
 Ariza, C. and Michael Scott Cuthbert. 2011. "The `music21` Stream: A New Object
 Model for Representing, Filtering, and Transforming Symbolic Musical
-Structures." In *Proceedings of the International Computer Music Conference*. 
-San Francisco: International Computer Music Association, pp. 61-68. 
+Structures." In *Proceedings of the International Computer Music Conference*.
+San Francisco: International Computer Music Association, pp. 61-68.
 Available online at http://www.flexatone.org/static/docs/music21Stream.pdf
 
 Ariza, C. and Michael Scott Cuthbert. 2011. "Analytical and Compositional
@@ -58,19 +58,19 @@ International Computer Music Conference*. San Francisco: International Computer
 Music Association, pp. 701-708. Available online at
 http://www.flexatone.org/static/docs/scaleNetwork.pdf
 
-Ariza, C. and Michael Scott Cuthbert. 2010. "Modeling Beats, Accents, Beams, and 
-Time Signatures Hierarchically with `music21` Meter Objects." In *Proceedings of the 
-International Computer Music Conference*. San Francisco: International Computer Music 
+Ariza, C. and Michael Scott Cuthbert. 2010. "Modeling Beats, Accents, Beams, and
+Time Signatures Hierarchically with `music21` Meter Objects." In *Proceedings of the
+International Computer Music Conference*. San Francisco: International Computer Music
 Association. 216-223. Available online at
-http://mit.edu/music21/papers/2010MeterObjects.pdf
+https://web.mit.edu/music21/papers/Ariza_Cuthbert_Stream_ICMC_2011.pdf
 
 
 
 Future Goals and Potential Applications
 ---------------------------------------------------
 
-There are numerous applications for music21 that we anticipate, yet simply have not had 
-time to implement. Consider taking on one of these projects, or write us with new and 
+There are numerous applications for music21 that we anticipate, yet simply have not had
+time to implement. Consider taking on one of these projects, or write us with new and
 interesting suggestions. To contact the authors, visit :ref:`about`.
 
 - Piano-key-visualization
@@ -79,20 +79,20 @@ interesting suggestions. To contact the authors, visit :ref:`about`.
 
 - Automatic clarinet fingering generation via ClarFinger font (link: www.trecento.com/fonts/)
 
-- Automatic string fingerings. 
+- Automatic string fingerings.
 
-- Indian Raga encoding: including ascending, descending, and typical presentations, 
+- Indian Raga encoding: including ascending, descending, and typical presentations,
   microtonal inflections, common associations, historical context.
 
 - Multiple-simultaneous-tempi to a single tempo conversion (via tuplets).
 
 - Palestrina counterpoint generation (via algorithms of Mary Farbood and others.).
 
-- Beneventan chant similarity indices (thanks to the work of Thomas Forrest Kelly and the 
+- Beneventan chant similarity indices (thanks to the work of Thomas Forrest Kelly and the
   Exultet encodings made available in `**kern` by Elsa De Luca).
 
-- Identify potential clefs for fragmentary Renaissance and Medieval pieces that are 
-  missing their clefs. (Use their staff-lines and minimizing number of melodic and 
+- Identify potential clefs for fragmentary Renaissance and Medieval pieces that are
+  missing their clefs. (Use their staff-lines and minimizing number of melodic and
   harmonic tritones).