Merge commit '6dd654d63cfd1e2c1f2c7d2cb3e7243870cbc71d' into staging-yaml

10 files changed, 9 insertions, 38 deletions

diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index 80fb08e2..ee766e7d 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -223,6 +223,7 @@ Referenced Tracks:
 - Peanut Butter Jelly Time
 - Badgers
 - Running in the 90's
+- HEYYEYAAEYAAAEYAEYAA
 - Marisa Stole the Precious Thing
 - Never Gonna Give You Up
 - Caramelldansen
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 55ee3627..e5129091 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -4,7 +4,6 @@ Has Track Art: false
 Has Track Numbers: false
 Groups:
 - Additional Tracks
-- Fandom
 Color: '#6c75f5'
 ---
 Track: 暗闇の中の光
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index 3c3a224c..401e19dd 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -60,6 +60,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/the-successor
 ---
 Track: Love Song
+Originally Released As: Gay Love Song for Four Cellos
 Duration: '3:54'
 URLs:
 - https://psycholonials.bandcamp.com/track/love-song
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index 47b144dc..84dfa6a8 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -291,7 +291,7 @@ URLs:
 ---
 Track: Love Song
 Directory: love-song-ost
-Originally Released As: track:love-song
+Originally Released As: Gay Love Song for Four Cellos
 Duration: '3:54'
 URLs:
 - https://psycholonials.bandcamp.com/track/love-song-2
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 303ca2df..8109597b 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -4,7 +4,6 @@ Has Track Art: false
 Has Track Numbers: false
 Groups:
 - Additional Tracks
-- Beyond
 Color: '#f5fc8e'
 ---
 Group: Miscellany by Homestuck musicians
@@ -97,13 +96,6 @@ Lyrics: |-
     Now it's coming to a sort of break in the music while you're talking to the boss.
     <i>[[An Apple Disaster!!]]</i>
 ---
-Track: MERRY CD
-Artists:
-- Toby Fox
-Duration: '2:26'
-URLs:
-- https://www.youtube.com/watch?v=0zW4mYzgP1g
----
 Track: Nightmare Knight
 Artists:
 - Toby Fox
@@ -2075,12 +2067,6 @@ URLs:
 Referenced Tracks:
 - Sweet Victory
 ---
-Track: Wilhelm Scream
-Artists:
-- Sheb Wooley
-URLs:
-- https://www.youtube.com/watch?v=xn6hhrX34Pw
----
 Track: WOAH!
 Artists:
 - Chris Patstone
diff --git a/album/the-baby-is-you.yaml b/album/the-baby-is-you.yaml
index 0cd8d658..f2dabada 100644
--- a/album/the-baby-is-you.yaml
+++ b/album/the-baby-is-you.yaml
@@ -258,6 +258,7 @@ Duration: '1:27'
 URLs:
 - https://youtu.be/ustNt1bH9JQ
 Referenced Tracks:
+- Can You Feel the Love Tonight
 - Versus
 Sampled Tracks:
 - Can You Feel the Love Tonight
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 623d6c68..ec77d826 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -6,7 +6,6 @@ Has Track Numbers: false
 Color: '#fc5f65'
 Groups:
 - Additional Tracks
-- Official
 ---
 Color: '#fc5f65'
 Group: Tracks featured in Homestuck
diff --git a/artists.yaml b/artists.yaml
index 4279cc0a..87d612fa 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1658,8 +1658,6 @@ URLs:
 ---
 Artist: Kat Jamolin
 ---
-Artist: Kat Macielinski
----
 Artist: Katamari Damacy
 ---
 Artist: Kate Griffith
@@ -1968,8 +1966,6 @@ URLs:
 ---
 Artist: Lorilyn "Neoscottie" Seyler
 ---
-Artist: Lost in History
----
 Artist: Lou Chastain
 URLs:
 - https://vendelaberglin.tumblr.com/
@@ -3374,10 +3370,6 @@ Artist: Sylvarn
 URLs:
 - https://sylvarn.com
 ---
-Artist: TGP Music Team
-URLs:
-- https://genesis-project.bandcamp.com/album/the-genesis-project-volume-1
----
 Artist: Takahiro Yamada
 ---
 Artist: Takako Hirasawa
@@ -4191,11 +4183,6 @@ Artist: grayscaleOddysey
 ---
 Artist: greenTetrahedron
 ---
-Artist: h0nk
-URLs:
-- https://h0nk.tumblr.com/
-- https://www.youtube.com/c/h0nk
----
 Artist: Hajime Wakai
 ---
 Artist: hank hill & cyclops
@@ -4264,8 +4251,6 @@ URLs:
 - https://conlangcritic.bandcamp.com/
 - https://www.youtube.com/channel/UCJOh5FKisc0hUlEeWFBlD-w
 ---
-Artist: kanayamaryamistrans
----
 Artist: kayak
 ---
 Artist: kendle bentley b!
@@ -4567,8 +4552,6 @@ URLs:
 - https://twitter.com/serpfeld
 - https://serpaz.carrd.co/
 ---
-Artist: Sheb Wooley
----
 Artist: shedonkadonk
 URLs:
 - https://twitter.com/shedonkadonk
diff --git a/homepage.yaml b/homepage.yaml
index f792e2a3..b99ea82b 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -14,9 +14,7 @@ Count: 5
 Row: Fandom
 Type: albums
 Group: Fandom
-Count: 6
-Albums:
-- Unreleased Tracks
+Count: 7
 Actions:
 - '[[group-gallery:fandom|Explore Fandom!]]'
 ---
diff --git a/static-pages.yaml b/static-pages.yaml
index 0881844b..0429a37c 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -81,6 +81,7 @@ Content: |-
     - "new" [[listing:albums/by-date-added|Albums - by Date Added]] listing, which has actually existed since [[news-entry:the-my-ex-wife-is-a-real-bitch-update|May 2021]], but was previously somehow at <a href="https://notabug.org/hsmusic/hsmusic-wiki/issues/53">a typo'd path</a> and wasn't accessible from the listing index
     - slight tweaks to the appearance of album grids (as in group and tag galleries), most notably aligning tiles to the top of each row so that artwork always shows up in an even line
     - improvements to the way track artist strings are word wrapped, preventing pages from getting wider than they're supposed to be when a track has many artists (such as [[track:left-hand-remix]])
+        - also fixed word wrapping on content pages with extremely long single words (like [[track:iiywaswiwtbotsa4aatwuotdtmihcimfh]]) when the screen is thinner than that word
     - internal support for albums which don't have cover art at all, as seen in new albums from [[group:additional-tracks]] and some releases from the community
     - new internal features which generalize hard-coded behavior for the Unreleased Tracks, letting new albums make use of some or all desired features:
         - internal support for albums which don't have release dates (these get sorted to the end on artist pages and are excluded from chronology links)
@@ -167,7 +168,7 @@ Content: |-
     - fixed [[track:robert-jailbreak]] not attributing [[track:audio-commentary-featuring-robert-j-lake-nick-smalley-luke-gfd-benjamins-and-erik-jit-scheele]] (and added lyrics) (thanks, Celeste & Niklink!)
     - fixed [[artist:carla-bravo]] and [[artist:kate-holden]] having some artist credits under a different name
     - divided previous artist "Lost in History" into two more specific labels, [[artist:unknown-artist]] and [[artist:traditional]] (thanks, Gibus Wearing Brony!)
-        - refined artist credits for some previously "Lost in History" tracks, including [[track:deck-the-halls]], [[track:tempus-adest-floridum]] in [[track:good-king-wenceslas]], [[track:the-star-spangled-banner]], and [[track:wilhelm-scream]]
+        - refined artist credits for some previously "Lost in History" tracks, including [[track:deck-the-halls]], [[track:tempus-adest-floridum]] in [[track:good-king-wenceslas]], and [[track:the-star-spangled-banner]]
     - added specific artist credits to most video game tracks under [[album:unreleased-tracks]] (in addition to existing franchise artists), plus a few from other outside media! (thanks a bunch, FF!)
         - new artists: [[artist:aki-hata]], [[artist:allister-brimble]], [[artist:anne-bryant]], [[artist:asuka-ito]], [[artist:benjamin-wynn]], [[artist:bjorn-thors]], [[artist:daisuke-amaya]], [[artist:de-la-soul]], [[artist:delia-derbyshire]], [[artist:estelle-swaray]], [[artist:ford-klinder]], [[artist:go-ichinose]], [[artist:hideki-naganuma]], [[artist:hiroaki-tominaga]], [[artist:hirokazu-tanaka]], [[artist:hiroki-hashimoto]], [[artist:hiroki-kikuta]], [[artist:hitomi-sato]], [[artist:hoyt-curtin]], [[artist:jeremy-zuckerman]], [[artist:joseph-barbera]], [[artist:jun-funahashi]], [[artist:junichi-masuda]], [[artist:kate-higgins]], [[artist:keiichi-suzuki]], [[artist:kenichi-matsubara]], [[artist:koji-kondo]], [[artist:lin-manuel-miranda]], [[artist:ludwig-ickert]], [[artist:magnus-palsson]], [[artist:manaka-kataoka]], [[artist:mani-svavarsson]], [[artist:masahiro-andoh]], [[artist:masakazu-sugimori]], [[artist:masayuki-nagao]], [[artist:max-coveri]], [[artist:max-steiner]], [[artist:megumi-inoue]], [[artist:messiah]], [[artist:mitsuo-terada]], [[artist:mitsuto-suzuki]], [[artist:naoto-kubo]], [[artist:naoto-tanaka]], [[artist:nick-balaban]], [[artist:nobuo-uematsu]], [[artist:nump]], [[artist:paul-williams]], [[artist:quad-city-djs]], [[artist:rebecca-sugar]], [[artist:revergo]], [[artist:rob-tunstall]], [[artist:ron-grainer]], [[artist:saki-kabata]], [[artist:sean-burnes]], [[artist:shiho-fujii]], [[artist:shinji-ushiroda]], [[artist:shota-kageyama]], [[artist:snorri-engilbertsson]], [[artist:stefan-karl]], [[artist:stephen-burns]], [[artist:takahiro-yamada]], [[artist:takako-hirasawa]], [[artist:the-refreshments]], [[artist:the-super-mario-players]], [[artist:tommy-tallarico]], [[artist:tomohito-nishiura]], [[artist:toshio-masuda]], [[artist:william-hanna]], [[artist:yasuaki-iwata]], [[artist:yasuharu-takanashi]], [[artist:yasunori-mitsuda]], [[artist:yoshihito-yano]], [[artist:yugo-kanno]], [[artist:yuka-tsujiyoko]], [[artist:yumi-takahashi]], and [[artist:zun]]
     - lyrics fixes for [[track:black]], [[track:friendship-aneurysm]], [[track:indigo-heir]], and [[track: temporal-shenanigans]]
@@ -179,12 +180,14 @@ Content: |-
     - fixed [[track:five-four-stress]] not being listed in reference list for [[track:stress]]
     - fixed [[Black Rose / Green Sun]] not being listed in reference list for [[Black Hole / White Door]]
     - fixed [[Amen, Brother]] not being listed in reference list for [[Airtime]] (thanks, Gibus Wearing Brony!)
+    - fixed [[track:heyyeyaaeyaaaeyaeyaa]] not being listed in reference list for [[track:oh-2017]] (thanks, Ninklink!)
     - fixed [[track:aggrieve-remix]] referencing [[track:aggrieve]] instead of [[track:aggrieve-violin-refrain]]
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - fixed [[track:lilith-in-starlight]] referencing [[track:mother]] by [[artist:erik-scheele]] instead of [[track:mother-malcolm-brown]] by [[artist:malcolm-brown]]
     - fixed [[track:typheus]] not being listed in reference list for [[track:heir-of-grief]]
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
     - fixed [[track:story-of-tonight]] being named "Tomorrow There'll Be More Of Us" (thanks, Celeste!)
+    - fixed [[track:gay-love-song-for-four-cellos]] not being marked as the original release for [[track:love-song]]
     - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
         - fixed artist commentary not showing up for [[track:frogsong]] and [[track:schrodingers-harbinger]]
         - fixed Instagram link not showing up for artist [[artist:dsnake]]