84: restores original positions of harmony labels

DCMLab · Nov 20, 2023 · e98da49 · e98da49
1 parent 9a7260c
commit e98da49
Show file tree

Hide file tree

Showing 12 changed files with 742 additions and 514 deletions.
diff --git a/MS3/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.mscx b/MS3/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.mscx
diff --git a/chords/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.chords.resource.json b/chords/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.chords.resource.json
@@ -174,17 +174,17 @@
         "type": "string"
       },
       {
-        "name": "crescendo_hairpin",
+        "name": "decrescendo_hairpin",
         "type": "string"
       },
       {
-        "name": "decrescendo_hairpin",
+        "name": "crescendo_hairpin",
         "type": "string"
       }
     ],
     "facet": "chords",
-    "identifier": "pNzCrFro1AoEsQ",
-    "filepath": "chords/pNzCrFro1AoEsQ.schema.yaml",
+    "identifier": "rSpe7F0vklKopg",
+    "filepath": "chords/rSpe7F0vklKopg.schema.yaml",
     "used_in": "WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia"
   },
   "creator": {
@@ -197,8 +197,6 @@
       "name": "Johannes Hentschel",
       "@id": "https://orcid.org/0000-0002-1986-9545"
     },
-    "softwareVersion": "2.4.0"
-  },
-  "git_revision": "3d8712d81d6731cdecf2a28ec5b190df56d61e05",
-  "git_tag": "v2.1"
+    "softwareVersion": "0.0.post1.dev1+gee402e3"
+  }
 }
diff --git a/chords/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.chords.tsv b/chords/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.chords.tsv
diff --git a/harmonies/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.harmonies.resource.errors b/harmonies/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.harmonies.resource.errors
diff --git a/harmonies/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.harmonies.resource.json b/harmonies/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.harmonies.resource.json
@@ -22,8 +22,6 @@
       "name": "Johannes Hentschel",
       "@id": "https://orcid.org/0000-0002-1986-9545"
     },
-    "softwareVersion": "2.4.0"
-  },
-  "git_revision": "3d8712d81d6731cdecf2a28ec5b190df56d61e05",
-  "git_tag": "v2.1"
+    "softwareVersion": "0.0.post1.dev1+gee402e3"
+  }
 }
diff --git a/harmonies/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.harmonies.tsv b/harmonies/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.harmonies.tsv
@@ -282,12 +282,12 @@ mc	mn	quarterbeats	quarterbeats_all_endings	duration_qb	mc_onset	mn_onset	timesi
 83	82	245	245	1.0	3/8	3/8	6/8	2	1	V7(b9)/bV		a	i		V7(b9)/bV	V		7	b9	bV			Mm7	1	1	-5, -1, -4, -7	-10	-5	-5
 83	82	246	246	0.5	5/8	5/8	6/8	2	1	V6		a	i		V6	V		6					M	1	1	5, 2, 1		1	5
 84	83	493/2	493/2	1.5	0	0	6/8	2	1	ii%7/bV		a	i		ii%7/bV	ii	%	7		bV			%7	1	1	-4, -7, -10, -6		-4	-4
-84	83	248	248	0.5	3/8	3/8	6/8	2	1	V64(#6b5)/V		a	i		V64(#6b5)/V	V		64	#6b5	V			M	1	1	-4, 2, 6	12	2	-4
-84	83	249	249		5/8	5/8	6/8	2	1	V43(b5)/V		a	i		V43(b5)/V	V		43	b5	V			Mm7	1	1	-4, 0, 2, 6		2	-4
-85	84	497/2	497/2	1.0	-1/4	-1/4	6/8	2	1	V7		a	i		V7	V		7					Mm7	1	1	1, 5, 2, -1		1	1
+84	83	248	248	1.0	3/8	3/8	6/8	2	1	V64(#6b5)/V		a	i		V64(#6b5)/V	V		64	#6b5	V			M	1	1	-4, 2, 6	12	2	-4
+84	83	249	249	0.5	5/8	5/8	6/8	2	1	V43(b5)/V		a	i		V43(b5)/V	V		43	b5	V			Mm7	1	1	-4, 0, 2, 6		2	-4
 85	84	499/2	499/2	0.5	0	0	6/8	2	1	V7(#4)		a	i		V7(#4)	V		7	#4				Mm7	1	1	1, 5, 7, -1		1	1
-85	84	250	250	0.75	1/8	1/8	6/8	2	1	V		a	i		V	V							M	1	1	1, 5, 2		1	1
-85	84	1003/4	1003/4	2.25	5/16	5/16	6/8	2	1	V(b9)		a	i		V(b9)	V			b9				M	1	1	1, 5, 2	-11	1	1
+85	84	250	250	1.5	1/8	1/8	6/8	2	1	V7		a	i		V7	V		7					Mm7	1	1	1, 5, 2, -1		1	1
+85	84	503/2	503/2	0.75	1/2	1/2	6/8	2	1	V		a	i		V	V							M	1	1	1, 5, 2		1	1
+85	84	1009/4	1009/4	0.75	11/16	11/16	6/8	2	1	V(b9)		a	i		V(b9)	V			b9				M	1	1	1, 5, 2	-11	1	1
 86	85	253	253	2.0	1/8	1/8	6/8	2	1	V6		a	i		V6	V		6					M	1	1	5, 2, 1		1	5
 86	85	255	255	0.5	5/8	5/8	6/8	2	1	v6		a	i		v6	v		6					m	1	1	-2, 2, 1		1	-2
 87	86	511/2	511/2	2.5	0	0	6/8	2	1	V64(6b5)/VII		a	i		V64(6b5)/VII	V		64	6b5	VII			M	1	1	-7, 2, -1, 3		-1	-7

diff --git a/measures/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.measures.resource.json b/measures/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.measures.resource.json
@@ -22,8 +22,6 @@
       "name": "Johannes Hentschel",
       "@id": "https://orcid.org/0000-0002-1986-9545"
     },
-    "softwareVersion": "2.4.0"
-  },
-  "git_revision": "3d8712d81d6731cdecf2a28ec5b190df56d61e05",
-  "git_tag": "v2.1"
+    "softwareVersion": "0.0.post1.dev1+gee402e3"
+  }
 }
diff --git a/metadata.tsv b/metadata.tsv
@@ -1,4 +1,4 @@
 piece	TimeSig	KeySig	last_mc	last_mn	length_qb	last_mc_unfolded	last_mn_unfolded	length_qb_unfolded	all_notes_qb	n_onsets	n_onset_positions	guitar_chord_count	form_label_count	label_count	annotated_key	harmony_version	annotators	composed_start	composed_end	composer	workTitle	movementNumber	movementTitle	workNumber	poet	lyricist	arranger	copyright	creationDate	mscVersion	platform	source	translator	title_text	subtitle_text	musescore	ms3_version	subdirectory	rel_path	has_drumset	ambitus	P86 (composer)	originalFormat	staff_1_ambitus	staff_1_instrument	staff_2_ambitus	staff_2_instrument
-WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia	1: 6/8	1: 0, 44: 3, 72: 0	112	111	333.5	112	111	333.5	1224.5	1676	896	0	0	360	a	2.1.0	Adrian Nagel	1854	1859	Richard Wagner	Tristan und Isolde		Erster Aufzug	WWV 90					2019-11-01	3.02	Linux			"<font size=""17.2958""/><font face=""Plantin MT Std""/>Tristan und Isolde"	"<font size=""10.9621""/><font face=""Plantin MT Std""/>Erster Aufzug"	3.6.2	2.4.0	MS3	MS3/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.mscx	False	29-93 (F1-A6)	Q1511	xml	41-93 (F2-A6)	Piano (2)	29-77 (F1-F5)	Piano (2)
+WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia	1: 6/8	1: 0, 44: 3, 72: 0	112	111	333.5	112	111	333.5	1224.5	1676	896	0	0	360	a	2.1.0	Adrian Nagel	1854	1859	Richard Wagner	Tristan und Isolde		Erster Aufzug	WWV 90					2019-11-01	3.02	Linux			"<font size=""17.2958""/><font face=""Plantin MT Std""/>Tristan und Isolde"	"<font size=""10.9621""/><font face=""Plantin MT Std""/>Erster Aufzug"	3.6.2	0.0.post1.dev1+gee402e3	MS3	MS3/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.mscx	False	29-93 (F1-A6)	Q1511	xml	41-93 (F2-A6)	Piano (2)	29-77 (F1-F5)	Piano (2)
 WWV096-Meistersinger_01_Vorspiel-Prelude_SchottKleinmichel	1: 4/4	1: 0, 97: 4, 109: 3, 118: 0, 122: -3, 151: 0	222	222	888.0	222	222	888.0	3727.25	5380	2415	0	0	1075	C	2.1.0	Adrian Nagel	1845	1867	Richard Wagner	Die Meistersinger von Nürnberg		Vorspiel	WWV 96					2019-09-15	3.02	Linux			"<font size=""19.8115""/><font face=""Plantin MT Std""/>Die Meistersinger von Nürnberg
 Vorspiel"		3.6.2	2.4.0	MS3	MS3/WWV096-Meistersinger_01_Vorspiel-Prelude_SchottKleinmichel.mscx	False	26-96 (D1-C7)	Q1511	xml	57-96 (A3-C7)	Piano (2)	26-81 (D1-A5)	Piano (2)
diff --git a/notes/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.notes.resource.json b/notes/WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia.notes.resource.json
@@ -11,7 +11,161 @@
       "delimiter": "\t"
     }
   },
-  "schema": "https://raw.githubusercontent.com/DCMLab/frictionless_schemas/main/notes/OBTh-WN_llExNw.schema.yaml",
+  "schema": {
+    "fields": [
+      {
+        "name": "mc",
+        "title": "Measure Count",
+        "description": "Running count of encoded <Measure> tags which do not necessarily express a full measure (e.g. in case of an anacrusis).",
+        "type": "integer",
+        "constraints": {
+          "required": true
+        }
+      },
+      {
+        "name": "mn",
+        "title": "Measure Number",
+        "description": "Measure number as printed in the score, computed from mc, dont_count and numbering_offset.",
+        "type": "string"
+      },
+      {
+        "name": "quarterbeats",
+        "title": "Offset from Beginning",
+        "description": "Distance of an event from the piece's beginning. By default, only second endings are taken into account to reflect the proportions of a simply playthrough without repeats.",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "quarterbeats_all_endings",
+        "title": "Offset from Beginning (Including Endings)",
+        "description": "Distance from the piece's beginning, taking all endings into account for addressability purposes.",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "duration_qb",
+        "title": "Duration in \u2669",
+        "description": "A float corresponding to duration * 4",
+        "type": "number"
+      },
+      {
+        "name": "mc_onset",
+        "title": "Offset within Encoded Measure",
+        "description": "Distance of an event from the beginning of the <Measure> tag.",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "mn_onset",
+        "title": "Offset within Logical Measure",
+        "description": "Distance from the beginning of the logical measure. Relevant, for example, to compute the metric position of an event.",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "timesig",
+        "title": "Time Signature",
+        "description": "Given as string, e.g. \"4/4\".",
+        "type": "string"
+      },
+      {
+        "name": "staff",
+        "title": "Staff",
+        "description": "Number of the staff where an event occurs, 1 designating the top staff.",
+        "type": "integer"
+      },
+      {
+        "name": "voice",
+        "title": "Notational Layer",
+        "description": "A number between 1-4 where 1 is MuseScore's default layer (blue), 2 the second layer in green with downward stems, etc.",
+        "type": "integer"
+      },
+      {
+        "name": "duration",
+        "title": "Duration",
+        "description": "As fraction of a whole note.",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "gracenote",
+        "title": "Grace Note",
+        "description": "Name given to a type of grace note in the MuseScore encoding, e.g. \"grace16\"",
+        "type": "string"
+      },
+      {
+        "name": "tremolo",
+        "type": "string"
+      },
+      {
+        "name": "nominal_duration",
+        "title": "Nominal Duration",
+        "description": "The duration corresponding to a note/rest value without applying any dots or n-tuplets, as fraction of a whole note. Multiplied with \"scalar\" to yield the actual duration of the note/rest.",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "scalar",
+        "title": "Scalar",
+        "description": "Decimal value reflecting all dots and n-tuplets modifying the duration of a note/rest. Yields the actual duration when multiplied with \"nominal_duration\".",
+        "type": "string",
+        "constraints": {
+          "pattern": "\\d+(?:\\/\\d+)?"
+        }
+      },
+      {
+        "name": "tied",
+        "title": "Tied Note",
+        "description": "1 if a note is tied to the following one, -1 if it is being tied to by the previous one, 0 if both.",
+        "type": "integer"
+      },
+      {
+        "name": "tpc",
+        "title": "Tonal Pitch Class",
+        "description": "Specified on the line of fifths such that 0 = C, 1 = G, -1 = F, etc.",
+        "type": "integer"
+      },
+      {
+        "name": "midi",
+        "title": "MIDI pitch",
+        "description": "Value between 0 and 127 where 60 = C4, 61 = C#4/Db4, etc.",
+        "type": "integer"
+      },
+      {
+        "name": "name",
+        "title": "Name",
+        "type": "string"
+      },
+      {
+        "name": "octave",
+        "title": "Octave",
+        "description": "Octave number where 4 is the middle octave (' in Helmholtz notation).",
+        "type": "integer"
+      },
+      {
+        "name": "chord_id",
+        "title": "Chord ID",
+        "description": "Row in the chords table.",
+        "type": "integer"
+      }
+    ],
+    "facet": "notes",
+    "identifier": "OBTh-WN_llExNw",
+    "filepath": "notes/OBTh-WN_llExNw.schema.yaml",
+    "used_in": "WWV090_Tristan_01_Vorspiel-Prelude_Ricordi1888Floridia"
+  },
   "creator": {
     "@context": "https://schema.org/",
     "@type": "SoftwareApplication",
@@ -22,8 +176,6 @@
       "name": "Johannes Hentschel",
       "@id": "https://orcid.org/0000-0002-1986-9545"
     },
-    "softwareVersion": "2.4.0"
-  },
-  "git_revision": "3d8712d81d6731cdecf2a28ec5b190df56d61e05",
-  "git_tag": "v2.1"
+    "softwareVersion": "0.0.post1.dev1+gee402e3"
+  }
 }