Skip to content

Commit

Permalink
Merge pull request #23 from johentsch/development
Browse files Browse the repository at this point in the history 
* Labels can be attached to MuseScore's Roman Numeral Analysis layer
  * parameter `label_type=1` in both `Score.attach_labels()` and `Parse.attach_labels()`
  * `Annotations.remove_initial_dots()` before inserting into the RNA layer
  * `Annotations.add_initial_dots()` before inserting into the absolute chord layer
* interpret all `#vii` in major contexts as `vii` when computing chord tones
* code cosmetics and bug fixes
  • Loading branch information
@johentsch
johentsch authored Feb 22, 2021
2 parents 7073186 + f335f08 commit 6100c59
Show file tree
Hide file tree
Showing 33 changed files with 1,751 additions and 823 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
Changelog
=========

Version 0.4.7
=============

* More correct computation of chord tones

Version 0.4.6
=============

* ms3 extract and Parse.store_lists() now have the option unfold to account for repeats
* minor bug fixes

Version 0.4.5
=============

Expand Down Expand Up @@ -29,7 +40,7 @@ Version 0.4.1
=============

* ms3 0.4.1 supports parsing (but not storing) compressed MuseScore files (.mscz)
* Install "ms3 convert" command to your system for batch conversion using your local MuseScore installation
* Installs "ms3 convert" command to your system for batch conversion using your local MuseScore installation
* "ms3 extract" command now supports creation of log files
* take ``labels_cfg`` into account when creating expanded chord tables

Expand Down
Binary file modified docs/build/doctrees/changelog.doctree
View file
Binary file not shown.
Binary file modified docs/build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/build/doctrees/manual.doctree
View file
Binary file not shown.
Binary file modified docs/build/doctrees/reference.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 0648d6100fc7480f468fde8d60c9f87b
config: 1aca4b73b6b71ffd44f83a33dbc4d0b7
tags: 645f666f9bcd5a90fca523b33c5a78b7
6 changes: 3 additions & 3 deletions docs/build/html/_modules/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &#8212; ms3 0.4.2 documentation</title>
<title>Overview: module code &#8212; ms3 0.4.6 documentation</title>
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noticia+Text:400,i,b,bi|Open+Sans:400,i,b,bi|Roboto+Mono:400,i,b,bi&amp;display=swap" type="text/css" />
Expand Down Expand Up @@ -49,7 +49,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="../index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="../index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
</ul>
Expand Down Expand Up @@ -129,7 +129,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="../index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="../index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
</ul>
Expand Down
177 changes: 88 additions & 89 deletions docs/build/html/_modules/ms3/annotations.html
View file

Large diffs are not rendered by default.

73 changes: 10 additions & 63 deletions docs/build/html/_modules/ms3/expand_dcml.html
View file

Large diffs are not rendered by default.

762 changes: 582 additions & 180 deletions docs/build/html/_modules/ms3/parse.html
View file

Large diffs are not rendered by default.

591 changes: 417 additions & 174 deletions docs/build/html/_modules/ms3/score.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/build/html/_static/documentation_options.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '0.4.2',
VERSION: '0.4.6',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
6 changes: 3 additions & 3 deletions docs/build/html/authors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Contributors &#8212; ms3 0.4.2 documentation</title>
<title>Contributors &#8212; ms3 0.4.6 documentation</title>
<link rel="stylesheet" href="_static/cloud.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noticia+Text:400,i,b,bi|Open+Sans:400,i,b,bi|Roboto+Mono:400,i,b,bi&amp;display=swap" type="text/css" />
Expand Down Expand Up @@ -57,7 +57,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="license.html" title="License"
accesskey="P">previous</a> &nbsp; &nbsp;</li>
<li><a href="index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Contributors</a></li>
</ul>
Expand Down Expand Up @@ -161,7 +161,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="license.html" title="License"
>previous</a> &nbsp; &nbsp;</li>
<li><a href="index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Contributors</a></li>
</ul>
Expand Down
26 changes: 23 additions & 3 deletions docs/build/html/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Changelog &#8212; ms3 0.4.2 documentation</title>
<title>Changelog &#8212; ms3 0.4.6 documentation</title>
<link rel="stylesheet" href="_static/cloud.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noticia+Text:400,i,b,bi|Open+Sans:400,i,b,bi|Roboto+Mono:400,i,b,bi&amp;display=swap" type="text/css" />
Expand Down Expand Up @@ -53,7 +53,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="authors.html" title="Contributors"
accesskey="P">previous</a> &nbsp; &nbsp;</li>
<li><a href="index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Changelog</a></li>
</ul>
Expand All @@ -68,6 +68,24 @@ <h3>Navigation</h3>

<div class="section" id="changelog">
<span id="changes"></span><h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline"></a></h1>
<div class="section" id="version-0-4-5">
<h2>Version 0.4.5<a class="headerlink" href="#version-0-4-5" title="Permalink to this headline"></a></h2>
<ul class="simple">
<li><p>added ‘ms3 compare’ command</p></li>
<li><p>support for parsing cap, capx, midi, musicxml, mxl, and xml files through temporary conversion</p></li>
<li><p>support for parsing MuseScore 2 files through temporary conversion</p></li>
</ul>
</div>
<div class="section" id="version-0-4-3">
<h2>Version 0.4.3<a class="headerlink" href="#version-0-4-3" title="Permalink to this headline"></a></h2>
<ul class="simple">
<li><p>added ‘ms3 check’ command</p></li>
<li><p>support of coloured labels</p></li>
<li><p>write coloured labels to score comparing attached and detached labels to each other</p></li>
<li><p>better interface for defining log file paths (more options, now conforming to the Parse.store_lists() interface)</p></li>
<li><p>fixed erroneous separation of alternative labels</p></li>
</ul>
</div>
<div class="section" id="version-0-4-2">
<h2>Version 0.4.2<a class="headerlink" href="#version-0-4-2" title="Permalink to this headline"></a></h2>
<ul class="simple">
Expand Down Expand Up @@ -166,6 +184,8 @@ <h3><a href="index.html">Table of Contents</a></h3>
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
<li class="toctree-l1"><a class="reference internal" href="authors.html">Authors</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Changelog</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#version-0-4-5">Version 0.4.5</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-4-3">Version 0.4.3</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-4-2">Version 0.4.2</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-4-1">Version 0.4.1</a></li>
<li class="toctree-l2"><a class="reference internal" href="#version-0-4-0">Version 0.4.0</a></li>
Expand Down Expand Up @@ -234,7 +254,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="authors.html" title="Contributors"
>previous</a> &nbsp; &nbsp;</li>
<li><a href="index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Changelog</a></li>
</ul>
Expand Down
70 changes: 49 additions & 21 deletions docs/build/html/genindex.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Index &#8212; ms3 0.4.2 documentation</title>
<title>Index &#8212; ms3 0.4.6 documentation</title>
<link rel="stylesheet" href="_static/cloud.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noticia+Text:400,i,b,bi|Open+Sans:400,i,b,bi|Roboto+Mono:400,i,b,bi&amp;display=swap" type="text/css" />
Expand Down Expand Up @@ -49,7 +49,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Index</a></li>
</ul>
Expand Down Expand Up @@ -94,10 +94,14 @@ <h2 id="A">A</h2>
<li><a href="reference.html#ms3.parse.Parse.add_detached_annotations">add_detached_annotations() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.add_dir">add_dir() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.add_files">add_files() (ms3.parse.Parse method)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.MSCX.add_labels">add_labels() (ms3.score.MSCX method)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.add_rel_dir">add_rel_dir() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.annotations.Annotations">Annotations (class in ms3.annotations)</a>
</li>
Expand All @@ -113,6 +117,8 @@ <h2 id="A">A</h2>
<h2 id="C">C</h2>
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.MSCX.change_label_color">change_label_color() (ms3.score.MSCX method)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.change_labels_cfg">change_labels_cfg() (ms3.parse.Parse method)</a>

<ul>
Expand All @@ -124,16 +130,26 @@ <h2 id="C">C</h2>
<li><a href="reference.html#ms3.expand_dcml.changes2list">changes2list() (in module ms3.expand_dcml)</a>
</li>
<li><a href="reference.html#ms3.expand_dcml.changes2tpc">changes2tpc() (in module ms3.expand_dcml)</a>
</li>
<li><a href="reference.html#ms3.score.Score.check_labels">check_labels() (ms3.score.Score method)</a>
</li>
<li><a href="reference.html#ms3.expand_dcml.chord2tpcs">chord2tpcs() (in module ms3.expand_dcml)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.MSCX.chords">chords() (ms3.score.MSCX property)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.parse.Parse.collect_lists">collect_lists() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.compare_labels">compare_labels() (ms3.parse.Parse method)</a>

<ul>
<li><a href="reference.html#ms3.score.Score.compare_labels">(ms3.score.Score method)</a>
</li>
</ul></li>
<li><a href="reference.html#ms3.expand_dcml.compute_chord_tones">compute_chord_tones() (in module ms3.expand_dcml)</a>
</li>
<li><a href="reference.html#ms3.score.Score.convertible_formats">convertible_formats (ms3.score.Score attribute)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.count_annotation_layers">count_annotation_layers() (ms3.parse.Parse method)</a>
</li>
Expand All @@ -149,7 +165,7 @@ <h2 id="C">C</h2>
<h2 id="D">D</h2>
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.Score.DCML_REGEX">DCML_REGEX (ms3.score.Score attribute)</a>
<li><a href="reference.html#ms3.score.MSCX.delete_empty_labels">delete_empty_labels() (ms3.score.MSCX method)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.delete_labels">delete_labels() (ms3.score.MSCX method)</a>
</li>
Expand Down Expand Up @@ -223,14 +239,16 @@ <h2 id="G">G</h2>
</li>
<li><a href="reference.html#ms3.score.Score.get_infer_regex">get_infer_regex() (ms3.score.Score method)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.annotations.Annotations.get_labels">get_labels() (ms3.annotations.Annotations method)</a>

<ul>
<li><a href="reference.html#ms3.parse.Parse.get_labels">(ms3.parse.Parse method)</a>
</li>
</ul></li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.parse.Parse.get_lists">get_lists() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.get_raw_labels">get_raw_labels() (ms3.score.MSCX method)</a>
</li>
</ul></td>
Expand All @@ -251,10 +269,12 @@ <h2 id="H">H</h2>
<h2 id="I">I</h2>
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.Score.infer_label_types">infer_label_types() (ms3.score.Score property)</a>
<li><a href="reference.html#ms3.parse.Parse.ids2idx">ids2idx() (ms3.parse.Parse method)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.Score.infer_label_types">infer_label_types() (ms3.score.Score property)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.infer_mc">infer_mc() (ms3.score.MSCX method)</a>
</li>
</ul></td>
Expand All @@ -269,14 +289,16 @@ <h2 id="L">L</h2>
</li>
<li><a href="reference.html#ms3.expand_dcml.labels2global_tonic">labels2global_tonic() (in module ms3.expand_dcml)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.parse.Parse.labels_cfg">labels_cfg (ms3.parse.Parse attribute)</a>

<ul>
<li><a href="reference.html#ms3.score.MSCX.labels_cfg">(ms3.score.MSCX attribute)</a>
</li>
<li><a href="reference.html#ms3.score.Score.labels_cfg">(ms3.score.Score attribute)</a>
</li>
</ul></li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.parse.Parse.last_scanned_dir">last_scanned_dir (ms3.parse.Parse attribute)</a>
</li>
<li><a href="reference.html#ms3.score.Score.load_annotations">load_annotations() (ms3.score.Score method)</a>
Expand All @@ -287,6 +309,8 @@ <h2 id="L">L</h2>
<h2 id="M">M</h2>
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.parse.Parse.match_files">match_files() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.measures">measures() (ms3.score.MSCX property)</a>
</li>
<li><a href="reference.html#ms3.expand_dcml.merge_changes">merge_changes() (in module ms3.expand_dcml)</a>
Expand All @@ -304,15 +328,17 @@ <h2 id="M">M</h2>
<li><a href="reference.html#module-ms3.parse">ms3.parse</a>
</li>
</ul></li>
<li><a href="reference.html#ms3.score.Score.ms">ms (ms3.score.Score attribute)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li>
ms3.annotations

<ul>
<li><a href="reference.html#module-ms3.annotations">module</a>
</li>
</ul></li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li>
ms3.expand_dcml

Expand Down Expand Up @@ -341,10 +367,12 @@ <h2 id="N">N</h2>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.Score.NASHVILLE_REGEX">NASHVILLE_REGEX (ms3.score.Score attribute)</a>
</li>
<li><a href="reference.html#ms3.score.Score.new_type">new_type() (ms3.score.Score method)</a>
<li><a href="reference.html#ms3.score.Score.native_formats">native_formats (ms3.score.Score attribute)</a>
</li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.Score.new_type">new_type() (ms3.score.Score method)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.notes">notes() (ms3.score.MSCX property)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.notes_and_rests">notes_and_rests() (ms3.score.MSCX property)</a>
Expand All @@ -355,6 +383,8 @@ <h2 id="N">N</h2>
<h2 id="P">P</h2>
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.score.MSCX.parent_score">parent_score (ms3.score.MSCX attribute)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse">Parse (class in ms3.parse)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.parse">parse() (ms3.parse.Parse method)</a>
Expand All @@ -363,14 +393,14 @@ <h2 id="P">P</h2>
</li>
<li><a href="reference.html#ms3.parse.Parse.parse_tsv">parse_tsv() (ms3.parse.Parse method)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.parsed">parsed() (ms3.parse.Parse property)</a>

<ul>
<li><a href="reference.html#ms3.score.MSCX.parsed">(ms3.score.MSCX property)</a>
<li><a href="reference.html#ms3.score.MSCX.parsed">parsed() (ms3.score.MSCX property)</a>
</li>
<li><a href="reference.html#ms3.parse.Parse.parsed_mscx">parsed_mscx() (ms3.parse.Parse property)</a>
</li>
</ul></li>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="reference.html#ms3.parse.Parse.parsed_tsv">parsed_tsv() (ms3.parse.Parse property)</a>
</li>
<li><a href="reference.html#ms3.score.MSCX.parser">parser (ms3.score.MSCX attribute)</a>

<ul>
Expand Down Expand Up @@ -424,8 +454,6 @@ <h2 id="S">S</h2>
<li><a href="reference.html#ms3.expand_dcml.series_is_minor">series_is_minor() (in module ms3.expand_dcml)</a>
</li>
<li><a href="reference.html#ms3.expand_dcml.SliceMaker">SliceMaker (class in ms3.expand_dcml)</a>
</li>
<li><a href="reference.html#ms3.expand_dcml.split_alternatives">split_alternatives() (in module ms3.expand_dcml)</a>
</li>
<li><a href="reference.html#ms3.expand_dcml.split_labels">split_labels() (in module ms3.expand_dcml)</a>
</li>
Expand Down Expand Up @@ -540,7 +568,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="index.html">ms3 0.4.2 documentation</a> &#187;</li>
<li><a href="index.html">ms3 0.4.6 documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Index</a></li>
</ul>
Expand Down
Loading

0 comments on commit 6100c59

Please sign in to comment.