Skip to content

Commit 2c5ebca

Browse files
authored
Merge pull request #290 from cuthbertLab/v0.21
music21j v0.21
2 parents 4b934b0 + 0fc83e6 commit 2c5ebca

File tree

14 files changed

+1090
-1035
lines changed

14 files changed

+1090
-1035
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ testHTML directory as `sfElsewhereCDN.html`.
124124

125125
## Version
126126

127-
0.20.2 (beta)
127+
0.21.0 (beta)
128128

129129
## License
130130

@@ -192,6 +192,9 @@ $ npm run dev
192192
```
193193

194194
This starts Vite’s development server with fast rebuilds and live reload.
195+
(Note that the testHTML files currently reference the hardcoded
196+
releases/music21.debug.js file -- they are set up as a playground
197+
rather than for testing purposes right now; making both possible is a TODO)
195198

196199
## Testing
197200

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "music21j",
3-
"version": "0.20.2",
3+
"version": "0.21.0",
44
"description": "A toolkit for computer-aided musicology, JavaScript version",
55

66
"_main_etc": "these are the legacy urls; exports:. is the modern standard",

releases/music21.debug.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

releases/music21.debug.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

releases/music21.es.js

Lines changed: 1050 additions & 1010 deletions
Large diffs are not rendered by default.

releases/music21.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

releases/src/main.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
*
44
* See https://www.trecento.com/music21docs/ for more details.
55
*
6-
* Copyright (c) 2013-25, Michael Scott Asato Cuthbert
6+
* Copyright (c) 2013-2026, Michael Scott Asato Cuthbert
77
* Released under a BSD-3-clause license
88
*
99
*/
1010
/**
1111
*
12-
* Based on music21, Copyright (c) 2006-25, Michael Scott Asato Cuthbert
12+
* Based on music21, Copyright (c) 2006-2026, Michael Scott Asato Cuthbert
1313
* The plan is to implement all core music21 features as Javascript and to expose
1414
* more sophisticated features via server-side connections to remote servers running the
1515
* python music21 (music21p).
@@ -75,6 +75,6 @@ import * as vfShow from './vfShow';
7575
import * as voiceLeading from './voiceLeading';
7676
import * as webmidi from './webmidi';
7777
import { debug } from './debug';
78-
export declare const VERSION = "0.20.1";
78+
export declare const VERSION = "0.21.0";
7979
export { MIDI, Vex, exceptions21, base, prebase, common, debug, articulations, audioRecording, audioSearch, bar, beam, chord, chordTables, clef, converter, defaults, derivation, duration, dynamics, editorial, expressions, figuredBass, fromPython, harmony, instrument, interval, key, keyboard, layout, metadata, meter, miditools, musicxml, note, parseLoader, pitch, renderOptions, roman, scale, sites, stream, style, svgs, tempo, tie, tinyNotation, vfShims, vfShow, voiceLeading, webmidi, };
8080
//# sourceMappingURL=main.d.ts.map

releases/src/pitch.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

releases/src/stream.d.ts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,10 @@ export declare class Stream<ElementType extends base.Music21Object = base.Music2
383383
mergeAttributes(other: Stream): this;
384384
/**
385385
* makeNotation does not do anything yet, but it is a placeholder
386-
* so it can start to be called. NOTE: Currently assumes that
387-
* it is being called on FLAT Stream!
386+
* so it can start to be called.
387+
*
388+
* setStemDirectionForUnspecified is fine w/ Scores
389+
* makeAccidentals has an override for Scores (but not Opus...)
388390
*
389391
* TODO: move call to makeBeams from renderVexflow to here once
390392
* it works on recursive streams.
@@ -397,7 +399,7 @@ export declare class Stream<ElementType extends base.Music21Object = base.Music2
397399
* Return a new Stream or modify this stream
398400
* to have beams.
399401
*
400-
* Called from renderVexflow()
402+
* Called from makeNotation
401403
*/
402404
makeBeams({ inPlace, setStemDirections, failOnNoTimeSignature, }?: makeNotation.MakeBeamsOptions): this;
403405
/**
@@ -549,9 +551,13 @@ export declare class Stream<ElementType extends base.Music21Object = base.Music2
549551
*
550552
* Will be moved to vfShow eventually when converter objects are enabled...maybe.
551553
*
554+
* inPlace is true for backwards compatibility.
555+
*
552556
* Takes in the div surrounding an SVG object (or a canvas)
553557
*/
554-
renderVexflow(where?: HTMLDivElement | HTMLCanvasElement): vfShow.Renderer;
558+
renderVexflow(where?: HTMLDivElement | HTMLCanvasElement, { inPlace }?: {
559+
inPlace?: boolean;
560+
}): vfShow.Renderer;
555561
/**
556562
* Estimate the stream height for the Stream.
557563
*
@@ -877,6 +883,10 @@ export declare class Score extends Stream {
877883
constructor();
878884
get clef(): clef.Clef;
879885
set clef(newClef: clef.Clef);
886+
/**
887+
* Override main stream makeAccidentals to call on each part.
888+
*/
889+
makeAccidentals({ pitchPast, pitchPastMeasure, useKeySignature, alteredPitches, cautionaryPitchClass, cautionaryAll, inPlace, overrideStatus, cautionaryNotImmediateRepeat, tiePitchSet, }?: MakeAccidentalsParams): this;
880890
/**
881891
* Override main stream makeBeams to call on each part.
882892
*/

0 commit comments

Comments
 (0)