artist contribution formatting changes

these are mostly because the updated artist page will fall back to the
contrib description in Contributors if none is provided for their entry
in Artists; so if someone in Artists were also credited in Contributors
for, say, doing lyrics or a particular instrument, their artist page
would list e.g. "(lyrics)" next to their entry on the track, even though
they were also implicitly responsible for composition (by being in the
Artists list). now it's explicit - this artist will be credited now as
"(composition, lyrics)"!

8 files changed, 21 insertions, 26 deletions

diff --git a/album/gristmas-carols.txt b/album/gristmas-carols.txt
index 6d916e33..04e7e2d6 100644
--- a/album/gristmas-carols.txt
+++ b/album/gristmas-carols.txt
@@ -56,10 +56,10 @@ Commentary:
 Track: You're A Mean One, Mr. Slick
 Artist: WHATISLOSTINTHEMINES
 Contributors:
+- WHATISLOSTINTHEMINES (composition, lyrics)
 - Aris Martinian (lyrics)
 - SplitSuns (lyrics)
 - Ephemerald (lyrics)
-- WHATISLOSTINTHEMINES (lyrics)
 Duration: 2:42
 References:
 - You're A Mean One, Mr. Grinch
diff --git a/album/homestuck-vol-1-4.txt b/album/homestuck-vol-1-4.txt
index 6e8e3e32..849d8490 100644
--- a/album/homestuck-vol-1-4.txt
+++ b/album/homestuck-vol-1-4.txt
@@ -14,8 +14,7 @@ Group: From <i>Homestuck Vol. 1</i>
 Track: Showtime (Piano Refrain)
 Directory: showtime-piano-refrain-vol-1-4
 AKA: track:showtime-piano-refrain
-Artist: Kevin Regamey, Malcolm Brown
-Contributors: Kevin Regamey (arrangement)
+Artist: Kevin Regamey
 Duration: 2:20
 References: Showtime (Original Mix)
 URLs:
@@ -43,8 +42,8 @@ URLs:
 Track: Aggrieve (Violin Refrain)
 Directory: aggrieve-violin-refrain-vol-1-4
 AKA: track:aggrieve-violin-refrain
-Artist: Andrew Huo, Mark Hadley
-Contributors: Andrew Huo (arrangement), Gabe Nezovic (mastering)
+Artist: Andrew Huo
+Contributors: Gabe Nezovic (mastering)
 Duration: 1:34
 References: Aggrieve
 URLs:
@@ -54,8 +53,7 @@ URLs:
 Track: Sburban Countdown
 Directory: sburban-countdown-vol-1-4
 AKA: track:sburban-countdown
-Artist: Mark Hadley, Michael Guy Bowman
-Contributors: Mark Hadley (arrangement)
+Artist: Mark Hadley
 Duration: 0:38
 References: Sburban Jungle
 URLs:
@@ -74,8 +72,7 @@ URLs:
 Track: Showtime (Imp Strife Mix)
 Directory: showtime-imp-strife-mix-vol-1-4
 AKA: track:showtime-imp-strife-mix
-Artist: Buzinkai, Curt Blakeslee, Malcolm Brown
-Contributors: Buzinkai (arrangement), Curt Blakeslee (fanfare)
+Artist: Buzinkai, Curt Blakeslee (fanfare)
 Duration: 1:57
 References: Showtime (Original Mix)
 URLs:
diff --git a/album/homestuck-vol-1.txt b/album/homestuck-vol-1.txt
index b0b1738c..6da6b7ed 100644
--- a/album/homestuck-vol-1.txt
+++ b/album/homestuck-vol-1.txt
@@ -10,8 +10,7 @@ URLs:
 Group: Main album
 -------------------------------------------------------------------------------
 Track: Showtime (Piano Refrain)
-Artist: Kevin Regamey, Malcolm Brown
-Contributors: Kevin Regamey (arrangement)
+Artist: Kevin Regamey
 Duration: 2:20
 References: Showtime (Original Mix)
 URLs:
@@ -54,8 +53,8 @@ URLs:
 - https://youtu.be/DKmXadfEnog
 -------------------------------------------------------------------------------
 Track: Aggrieve (Violin Refrain)
-Artist: Andrew Huo, Mark Hadley
-Contributors: Andrew Huo (arrangement), Gabe Nezovic (mastering)
+Artist: Andrew Huo
+Contributors: Gabe Nezovic (mastering)
 Duration: 1:34
 References: Aggrieve
 URLs:
@@ -66,8 +65,7 @@ Commentary:
     Ahh, the glory days, when we had no idea we were going on a universe-destroying/creating adventure, or even a world-destroying one. This was when the music team's main scoop on the kids was that they were going to have theme instruments that somehow function as their weapons or special abilities as well, although I guess this has only mostly come to fruition with Dave's turntables. Well, I'm primarily a violinist, and Rose's instrument was to be violin/strings, so this was right up my alley. I love just randomly improvising on the violin, exploring different poetic areas, if you will, and coming up with things that sounded beautiful to me. At this time in particular, I was doing that a lot. Hadley's Aggrieve was created first in this case, and I had roughly dictated it, so I knew the notes. I fooled around with it a couple of times, playing with a haunting/sad-but-hopeful tone, and the arrangement that you hear was recorded literally the first time it was played - the first time those notes were played in that rhythm, tone and order was the same time it was recorded. That version, cut, is what you hear in the comic. I reverse-engineered the sheet music from my own recording to do a recording for the album. Unfortunately, I was, and I suppose am still today, new to the recording game, and so there are mistakes I cringe at in both the comic and album versions. Gabe Nezovic's mastering helps to cover most of it, but I still feel kind of guilty about it. Oh well.
 -------------------------------------------------------------------------------
 Track: Sburban Countdown
-Artist: Mark Hadley, Michael Guy Bowman
-Contributors: Mark Hadley (arrangement)
+Artist: Mark Hadley
 Duration: 0:38
 References: Sburban Jungle
 URLs:
@@ -88,8 +86,7 @@ Commentary:
     This was actually the first Homestuck-related thing I made, when Andrew asked us all to come up with some battle themes. Originally I titled it "Aggress" as a Problem Sleuth homage, but changed the name to "Aggrieve" once the attack command in John's first strife was revealed. Out of all my songs, this one holds a special place for me since it was the first one I did for Homestuck.
 -------------------------------------------------------------------------------
 Track: Showtime (Imp Strife Mix)
-Artist: Buzinkai, Curt Blakeslee, Malcolm Brown
-Contributors: Buzinkai (arrangement), Curt Blakeslee (fanfare)
+Artist: Buzinkai, Curt Blakeslee (fanfare)
 Duration: 1:57
 References: Showtime (Original Mix)
 URLs:
diff --git a/album/homestuck-vol-10.txt b/album/homestuck-vol-10.txt
index 33b135be..bf6ba3e1 100644
--- a/album/homestuck-vol-10.txt
+++ b/album/homestuck-vol-10.txt
@@ -416,8 +416,8 @@ URLs:
 - https://homestuck.bandcamp.com/track/solar-voyage-2
 - https://youtu.be/r78qOIX8ITI
 Contributors:
+- Marcy Nabors (composition, arrangement, vocals)
 - Michael Guy Bowman (arrangement)
-- Marcy Nabors (arrangement, vocals)
 - Clark Powell (arrangement)
 - Erik Scheele (arrangement, piano)
 - Tensei (guitar)
@@ -615,8 +615,8 @@ URLs:
 - https://homestuck.bandcamp.com/track/renewed-return-2
 - https://youtu.be/qqZO_D5CO28
 Contributors:
+- Marcy Nabors (composition, bass clarinet)
 - Catboss (flute)
-- Marcy Nabors (bass clarinet)
 - Kelly Sadwin (violin & viola)
 - Jamie Paige Stanley (percussion)
 - Kyle G. Jamolin (lyrics & choir direction)
diff --git a/album/homestuck-vol-9.txt b/album/homestuck-vol-9.txt
index 3bc5bdff..4bcd667a 100644
--- a/album/homestuck-vol-9.txt
+++ b/album/homestuck-vol-9.txt
@@ -300,8 +300,10 @@ Commentary:
     This picture started with an innocent suggestion from RJ who imagined Dirk riding a <a href="https://en.wikipedia.org/wiki/Super_Hang-On">super hang on motorcycle</a> to this song. I took the idea over to Jit who then helped me develop the picture to what it became, suggesting the <a href="https://www.youtube.com/watch?v=LUUbp-4kKMA">FF7 motorcycle chase</a> as inspiration and to turn the motorcycle in to Sawtooth.
 -------------------------------------------------------------------------------
 Track: Stress
-Artist: Toby Fox, Buzinkai
-Contributors: Toby Fox (arrangement)
+Artist: Buzinkai, Toby Fox
+Contributors:
+- Buzinkai (composition)
+- Toby Fox (arrangement)
 Track Art: P-RO
 Duration: 2:02
 Art Tags:
diff --git a/album/moons-of-theseus.txt b/album/moons-of-theseus.txt
index 9b96029a..b17e5362 100644
--- a/album/moons-of-theseus.txt
+++ b/album/moons-of-theseus.txt
@@ -235,10 +235,10 @@ Commentary:
 Track: Violet and Gold
 Artist: Veritas Unae
 Contributors:
+- Veritas Unae (composition, lyrics)
 - Ucklin (additional vocals)
 - WHATISLOSTINTHEMINES (guitar)
 - LizaWithAZed (lyrics)
-- Veritas Unae (lyrics)
 - Max Wright (additional help)
 Track Art: Jas, Skyplayer
 Duration: 7:20
diff --git a/album/the-wanderers.txt b/album/the-wanderers.txt
index 3aa270b3..707a634b 100644
--- a/album/the-wanderers.txt
+++ b/album/the-wanderers.txt
@@ -134,11 +134,10 @@ Commentary:
     Fast forward a year or two. Some discussion with internet friends had led me to find that old flash game again, and I heard my old favourite tune in all its glory (significantly less glorious than I remembered; nostalgia does that to you). Still, it showed me the main place I was going wrong, which was that I’d neglected harmony. All of the three or four lines of music that piece had were monophonic, making a really drab sound, while what I needed where chords. A stupid mistake? Sure, it was, but then, I wasn’t that good a musician when I first wrote the piece. I started over, applying all the experience I’d got both from writing music and simply listening to it with a critical ear to get my main contribution to the Wanderers album, and something I could be proud of.
 -------------------------------------------------------------------------------
 Track: Requiem for an Exile
-Artist: James Dever, Solatrus
-Contributors: Solatrus (production)
+Artist: Solatrus
 Track Art: Zilleniose
 Duration: 2:01
-References: Requiem:requiem
+References: track:requiem
 Art Tags:
 - WV
 - PM
diff --git a/album/tomb-of-the-ancestors.txt b/album/tomb-of-the-ancestors.txt
index 01178bdb..6f8526ad 100644
--- a/album/tomb-of-the-ancestors.txt
+++ b/album/tomb-of-the-ancestors.txt
@@ -150,7 +150,7 @@ Track: Spider8ite!!!!!!!!
 Track Art: Grue
 Duration: 4:13
 Contributors:
-- Kalibration (choir)
+- Kalibration (composition, choir)
 - Natalie Thomas (choir)
 - Robert J! Lake (choir)
 - Michael Guy Bowman (choir)