Merge commit '36e88033beb5a6ba4acf1d44e4ac33ce44af2724' into staging-yaml

18 files changed, 111 insertions, 1 deletions

diff --git a/album/alternia.yaml b/album/alternia.yaml
index 692b8373..ede6c454 100644
--- a/album/alternia.yaml
+++ b/album/alternia.yaml
@@ -18,6 +18,10 @@ Art Tags:
 - Karkat
 - Terezi
 - Alternia
+Additional Files:
+- Title: Album Booklet
+  Files:
+  - Alternia_Commentary.pdf
 Commentary: |-
     <i>Toby Fox:</i>
     Hey, just a brief (LOL JK) message from the guy who made this album - Toby "Radiation" Fox, if for some reason you haven't seen that name anywhere yet.
diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index 9f85e909..21e2f9f1 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -35,6 +35,10 @@ Wallpaper Artists:
 - Hanni Brosh
 - Niklink (edits for wiki)
 Default Track Cover Art Date: October 25, 2017
+Additional Files:
+- Title: Album Booklet
+  Files:
+  - AlterniaBound_Commentary.pdf
 ---
 Group: Main album
 ---
diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index 65402c9a..a8857612 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -21,6 +21,10 @@ Commentary: |-
 Banner Artists:
 - Shelby Cragg
 Banner Dimensions: 1100x203
+Additional Files:
+- Title: Album Credits
+  Files:
+  - TrackCredits.txt
 ---
 Track: Reverie
 Artists:
diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index 4bd421ee..5523db6a 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -30,6 +30,13 @@ Banner Dimensions: 1100x180
 Wallpaper Artists:
 - Shelby Cragg
 - Niklink (edits for wiki)
+Additional Files:
+- Title: Album Credits
+  Files:
+  - CREDITS_A.txt
+- Title: Lyrics & Trivia
+  Files:
+  - LYRICS_ETC_A.txt
 ---
 Group: Side 1
 ---
diff --git a/album/coloUrs-and-mayhem-universe-b.yaml b/album/coloUrs-and-mayhem-universe-b.yaml
index e9a54e53..6d367b71 100644
--- a/album/coloUrs-and-mayhem-universe-b.yaml
+++ b/album/coloUrs-and-mayhem-universe-b.yaml
@@ -26,6 +26,13 @@ Banner Dimensions: 1100x180
 Wallpaper Artists:
 - Shelby Cragg
 - Niklink (edits for wiki)
+Additional Files:
+- Title: Album Credits
+  Files:
+  - CREDITS_B.txt
+- Title: Lyrics & Trivia
+  Files:
+  - LYRICS_ETC_B.txt
 ---
 Group: Side 1
 ---
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index c65cad33..6f05af4a 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -49,6 +49,13 @@ Commentary: |-
     (<a href="https://www.youtube.com/watch?v=jusfjbsO_qY">Unofficial promo written by Robert J! Lake</a>)
     <i>Marcy Nabors:</i>
     (<a href="https://www.youtube.com/watch?v=HJWqqikd6S0">Release listening / Q&A stream</a>)
+Additional Files:
+- Title: Album Booklet
+  Files:
+  - Booklet.pdf
+- Title: Renewed Return Choral Parts
+  Files:
+  - Renewed Return Choral Parts.pdf
 ---
 Track: Creata
 Artists:
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index 41001024..0946d4e5 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -10,6 +10,22 @@ Default Track Cover Artists:
 Color: '#51a2fd'
 Groups:
 - Official
+Additional Files:
+- Title: SBURB Wallpaper
+  Files:
+  - sburbwp_1280x1024.jpg
+  - sburbwp_1440x900.jpg
+  - sburbwp_1920x1080.jpg
+- Title: Alternate Covers
+  Files:
+  - Homestuck_Vol4_alt1.jpg
+  - Homestuck_Vol4_alt2.jpg
+  - Homestuck_Vol4_alt3.jpg
+  - Homestuck_Vol4_alt4.jpg
+  - Homestuck_Vol4_alt5.jpg
+  - Homestuck_Vol4_alt6.jpg
+  - Homestuck_Vol4_alt7.jpg
+  - Homestuck_Vol4_alt8.jpg
 ---
 Track: Revelawesome
 Artists:
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 15b23f86..0aa3594e 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -17,6 +17,10 @@ Art Tags:
 - Jade
 - Squiddles
 - Skaia
+Additional Files:
+- Title: Album Booklet
+  Files:
+  - Homestuck_Vol5.pdf
 Commentary: |-
     <i>Quasar Nebula:</i>
     track art on these tracks has been uploaded from the <a href="https://sollay-b.tumblr.com/post/188094230423/hello-a-couple-of-years-ago-allyssinian">Homestuck Vol. 5 Anthology</a>! the official release of Vol. 5 didn't come with track art; this collaborative project organized artists to submit their own original art for the album. the art was originally shared in a huge colection on tumblr on 4/13/17 and has now been collected here for viewing convenience and discoverability!
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index be0d4fd4..cf306944 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -22,6 +22,10 @@ Banner Dimensions: 1100x158
 Wallpaper Artists:
 - Homestuck
 Wallpaper Style: 'opacity: 0.8;'
+Additional Files:
+- Title: Album Credits
+  Files:
+  - Vol 7.txt
 ---
 Group: Main album
 ---
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index 80aa32ad..644a13e2 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -25,6 +25,10 @@ Wallpaper Style: |-
     opacity: 0.6;
     background-repeat: repeat;
     background-size: auto;
+Additional Files:
+- Title: Album Credits
+  Files:
+  - Credits.txt
 ---
 Group: Main album
 ---
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 6970be56..1a8590e7 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -29,6 +29,10 @@ Wallpaper Style: |-
     opacity: 0.65;
     background-repeat: repeat;
     background-size: auto;
+Additional Files:
+- Title: Album Credits
+  Files:
+  - VOL_9_CREDITS.txt
 ---
 Group: Main album
 ---
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index 22a44f10..2253a80a 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -38,6 +38,10 @@ Wallpaper Style: |-
     background-repeat: repeat;
     background-size: auto;
     filter: hue-rotate(210deg);
+Additional Files:
+- Title: Album Booklet
+  Files:
+  - Commentary Book.pdf
 ---
 Group: Main album
 ---
diff --git a/album/sburb.yaml b/album/sburb.yaml
index 4602ded0..86f13f01 100644
--- a/album/sburb.yaml
+++ b/album/sburb.yaml
@@ -42,6 +42,24 @@ Commentary: |-
     Originally written for Homestuck in 2011, Sburb is the first major composition I ever wrote. The pieces were written when I was seventeen, over my junior and senior years of high school and performed and recorded the following summer. The album released about a month before I set off to college and the whole experience was phenomenal.
     While I have long lost track with MSPA, I still am good friends with my fellow musicians from the Homestuck Music team including Erik "Jit" Steele, who performed on these recordings.
     Looking back on it now, I love how obvious my early inspirations are but I do love the work I was able to create during one of the most tumultuous times in my life. Thanks for listening.
+Additional Files:
+- Title: Commentary PDF
+  Files:
+  - Composers Notes.pdf
+- Title: Sheet Music
+  Files:
+  - The Prelude.pdf
+  - Genesis.pdf
+  - Eden.pdf
+  - Exodus.pdf
+  - Requiem.pdf
+  - The Meek.pdf
+  - Chronicles.pdf
+  - Rapture.pdf
+  - Creation.pdf
+  - Revelations 1.pdf
+  - Revelations 2.pdf
+  - Revelations 3.pdf
 ---
 Track: The Prelude
 Duration: '1:43'
diff --git a/album/squiddles.yaml b/album/squiddles.yaml
index 853bd7c9..a4f7bda5 100644
--- a/album/squiddles.yaml
+++ b/album/squiddles.yaml
@@ -17,6 +17,13 @@ Banner Dimensions: 1100x205
 Wallpaper Artists:
 - Cindy Dominguez
 Wallpaper Style: 'opacity: 0.6;'
+Additional Files:
+- Title: Album Booklet
+  Files:
+  - Squiddles_booklet.pdf
+- Title: Squiddles! Full Opening
+  Files:
+  - squiddlevid.swf
 ---
 Group: Main album
 ---
diff --git a/album/strife.yaml b/album/strife.yaml
index 19188fe9..e541a446 100644
--- a/album/strife.yaml
+++ b/album/strife.yaml
@@ -16,6 +16,11 @@ Groups:
 Art Tags:
 - Dave's bro
 - Jack Noir
+Additional Files:
+- Title: Heir Conditioning Tabs
+  Files:
+  - Heir Conditioning Guitar Tab.pdf
+  - Heir Conditioning Bass Tab.pdf
 ---
 Group: Main album
 ---
@@ -112,4 +117,4 @@ Has Cover Art: false
 Duration: '1:32'
 URLs:
 - https://tenseimusic.bandcamp.com/track/make-a-wish
-- https://youtu.be/P0nogEQf3BI
\ No newline at end of file
+- https://youtu.be/P0nogEQf3BI
diff --git a/album/the-wanderers.yaml b/album/the-wanderers.yaml
index 496eabd1..b49bec61 100644
--- a/album/the-wanderers.yaml
+++ b/album/the-wanderers.yaml
@@ -32,6 +32,10 @@ Wallpaper Style: |-
     background-position: top left;
     background-color: #83bace;
     opacity: 0.75;
+Additional Files:
+- Title: Album Credits
+  Files:
+  - Tracks and Art.txt
 ---
 Group: Main album
 ---
diff --git a/static-pages.yaml b/static-pages.yaml
index 5208947b..0c3742b0 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -79,6 +79,8 @@ Content: |-
     - (nebula writes about all the site changes here)
     - [[album:unreleased-tracks]] has been completely reorganized, with many tracks having been moved to new organizational albums [[album:more-homestuck-fandom]] and [[album:references-beyond-homestuck]], all collected under new [[group:additional-tracks]] group
     - "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
+    - "Tracks that reference..." lists are now grouped by Beyond and Additional Tracks as well, instead of grouping everything that's not an official Homestuck track under Fandom
+    - re-release tracks (such as [[track:black-vol-1-4]] from [[album:homestuck-vol-1-4]]) are no longer displayed in "Tracks that referenec" lists, and aren't counted in the [[listing:tracks/by-times-referenced|Tracks - by Times Referenced]] listing
     - 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
diff --git a/wiki-info.yaml b/wiki-info.yaml
index 6b8e4602..eeaa63c7 100644
--- a/wiki-info.yaml
+++ b/wiki-info.yaml
@@ -10,6 +10,11 @@ Enable Listings: true
 Enable News: true
 Enable Art Tag UI: true
 Enable Group UI: true
+Divide Track Lists By Groups:
+- group:official
+- group:fandom
+- group:beyond
+- group:additional-tracks
 Footer Content: >-
     [[static:about|HSMusic is an unofficial fan project.]] Its creation and development
     was made possible through the [[static:donate|support]] and [[static:feedback|feedback]]