make releases that are of type 'track' actual tracks

and modify the music-project layout to display those orphan tracks.

13 files changed, 79 insertions, 79 deletions

diff --git a/_includes/music-project-release-info.html b/_includes/music-project-release-info.html
new file mode 100644
index 0000000..f06625e
--- /dev/null
+++ b/_includes/music-project-release-info.html
@@ -0,0 +1,53 @@
+{%- assign release = include.release %}
+<div class="music-project-release-info"
+     id="{{ release.title | slugify }}">
+    <h4>{{ release.title }}
+        {% if release.r_tag %}
+            <span class="music-project-release-type">
+                ({{ release.type }})</span>
+        {% endif %}
+        {%- if release.bandcamp -%}
+            <a href="{{ release.bandcamp }}"
+               title="listen on bandcamp">
+                <img src="/assets/img/bandcamp-icon.png"
+                     alt="listen on bandcamp"
+                     width="24px" height="24px">
+            </a>
+        {%- endif -%}
+    </h4>
+
+    <p>released {{ release.date | date_to_string }}
+        / <em>{{ release.style }}</em>
+    </p>
+
+    {%- if release.r_tag -%}
+        <h5>tracklist</h5>
+        <div class="music-project-tracklist">
+            {%- assign release_tracks = site.music_titles |
+            where: "r_tag", release.r_tag | sort: "num" -%}
+            <ol>
+                {%- for track in release_tracks -%}
+                    <li value="{{ track.num }}">
+                        {%- if release.author == track.author -%}
+                            {{ track.title }}
+                        {%- else -%}
+                            {%- assign
+                            t_a_has_url = site.music_projects
+                            | find: "title", track.author -%}
+                            {%- if t_a_has_url -%}
+                                <a href="{{ t_a_has_url.url }}">
+                                    {{ track.author }}</a>
+                            {%- else -%}
+                                {{ track.author }}
+                            {% endif %}
+                            &mdash; {{ track.title }}
+                        {% endif %}
+                    </li>
+                {% endfor %}
+            </ol>
+        </div>
+    {%- endif -%}
+
+    {{ release.content | markdownify }}
+
+</div>
diff --git a/_layouts/music-project.html b/_layouts/music-project.html
index b07f4b8..7e3044f 100644
--- a/_layouts/music-project.html
+++ b/_layouts/music-project.html
@@ -3,7 +3,6 @@ layout: default
 ---
 
 <!-- TODO: add physical release links-->
-<!-- TODO: prettify release display -->
 <!-- TODO: add sound for albums that aren't available on bandcamp -->
 <!-- TODO: maybe add search by tag for music projects -->
 
@@ -38,70 +37,38 @@ layout: default
 
     </div>
 
-    {%- assign releases = site.music_releases | where: "author",
-    page.title | group_by_exp: "item", "item.date | date: '%Y'" -%}
-    {%- assign releases_size = releases | size %}
-    {%- if releases_size > 0 -%}
+    {%- assign releases = site.music_releases |
+    where: "author", page.title |
+    group_by_exp: "item", "item.date | date: '%Y'" -%}
+    {%- assign releases.size = releases | size %}
+    {% unless releases.size == 0 %}
         <div class="music-project-release-list">
             <h2>releases</h2>
 
-            {% for item in releases %}
+            {% for year_group in releases %}
                 <div class="music-project-release-by_year"
-                     id="{{ item.name }}">
+                     id="{{ year_group.name }}">
                     <h3 class="music-project-release-year"
-                        id="{{ item.name }}">{{ item.name }}</h3>
-                    {%- for release in item.items -%}
-                        <div class="music-project-release-info"
-                             id="{{ release.title | slugify }}">
-                            <h4>{{ release.title }}
-                                <span class="music-project-release-type">
-                                    ({{ release.type }})</span>
-                                {%- if release.bandcamp -%}
-                                    <a href="{{ release.bandcamp }}"
-                                       title="listen on bandcamp">
-                                        <img src="/assets/img/bandcamp-icon.png"
-                                             alt="listen on bandcamp"
-                                             width="24px" height="24px">
-                                    </a>
-                                {%- endif -%}
-                            </h4>
-
-                            <p>released {{ release.date | date_to_string }}
-                                / <em>{{ release.style }}</em>
-                            </p>
-
-                            {%- unless release.type == "track" -%}
-                                <h5>tracklist</h5>
-                                <div class="music-project-tracklist">
-                                    {%- assign release_tracks = site.music_titles |
-                                    where: "r_tag", release.r_tag | sort: "num" -%}
-                                    <ol>
-                                        {% for track in release_tracks %}
-                                            <li>
-                                                {% if release.author == track.author %}
-                                                    {{ track.title }}
-                                                {% else %}
-                                                    {% assign t_a_has_url = site.music_projects | find: "title", track.author %}
-                                                    {% if t_a_has_url %}
-                                                        <a href="{{ t_a_has_url.url }}">
-                                                            {{ track.author }}</a>
-                                                    {% else %}
-                                                        {{ track.author }}
-                                                    {% endif %}
-                                                    &mdash; {{ track.title }}
-                                                {% endif %}
-                                            </li>
-                                        {% endfor %}
-                                    </ol>
-                                </div>
-                            {%- endunless -%}
-
-                            {{ release.content }}
-
-                        </div>
+                        id="{{ year_group.name }}">{{ year_group.name }}</h3>
+                    {%- for release in year_group.items -%}
+                        {% include music-project-release-info.html release=release %}
                     {%- endfor -%}
                 </div>
             {%- endfor -%}
         </div>
-    {%- endif -%}
+    {% endunless %}
+
+    {%- assign misc_tracks = site.music_titles |
+    where_exp: "item", "item.author == page.title and item.r_tag == nil" |
+    sort: "date" -%}
+    {%- assign misc_tracks.size = misc_tracks | size %}
+    {% unless misc_tracks.size == 0 %}
+        <div class="music-project-release-list">
+            <h2>misc tracks</h2>
+
+            {% for track in misc_tracks %}
+                {% include music-project-release-info.html release=track %}
+            {%- endfor %}
+        </div>
+    {% endunless %}
 </div>
diff --git a/_music_releases/2018-12-30-aaoth-forwards.md b/_music_titles/aaoth-forwards.md
index a3916de..25097b7 100644
--- a/_music_releases/2018-12-30-aaoth-forwards.md
+++ b/_music_titles/aaoth-forwards.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: forwards (universe wide grief)
-type: track
 date: 30-12-2018
 style: electronic improvisation
 bandcamp: https://aaoth.bandcamp.com/track/forwards-universe-wide-grief
-r_tag: AAOTH-01
 ---
 
 little desolate improv during the new year's eve's evening, recorded through sunvox.
diff --git a/_music_releases/2019-02-28-aaoth-lookthrough.md b/_music_titles/aaoth-lookthrough.md
index 334f568..f18492c 100644
--- a/_music_releases/2019-02-28-aaoth-lookthrough.md
+++ b/_music_titles/aaoth-lookthrough.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: lookthrough
-type: track
 date: 28-02-2019
 style: eai abstract
 bandcamp: https://aaoth.bandcamp.com/track/lookthrough
-r_tag: AAOTH-03
 ---
 
 unthemed guitar improvisation.
diff --git a/_music_releases/2019-04-22-aaoth-madnight.md b/_music_titles/aaoth-madnight.md
index 48b82c3..3eef735 100644
--- a/_music_releases/2019-04-22-aaoth-madnight.md
+++ b/_music_titles/aaoth-madnight.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: madnight
-type: track
 date: 22-04-2019
 style: electronic lo-fi
 bandcamp: https://aaoth.bandcamp.com/track/madnight
-r_tag: AAOTH-05
 ---
 
 atmospheric electronic track made using [sunvox][1] on android.
diff --git a/_music_releases/2020-04-13-aaoth-massive-void.md b/_music_titles/aaoth-massive-void.md
index 766e65c..055735b 100644
--- a/_music_releases/2020-04-13-aaoth-massive-void.md
+++ b/_music_titles/aaoth-massive-void.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: massive void
-type: track
 date: 13-04-2020
 style: generative electronic
 bandcamp: https://aaoth.bandcamp.com/track/massive-void
-r_tag: AAOTH-09
 ---
 
 generative abstract track made with vcvrack.
diff --git a/_music_releases/2019-03-31-aaoth-mind-collapse.md b/_music_titles/aaoth-mind-collapse.md
index 7dd23b4..cbaa391 100644
--- a/_music_releases/2019-03-31-aaoth-mind-collapse.md
+++ b/_music_titles/aaoth-mind-collapse.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: mind collapse
-type: track
 date: 31-03-2019
 style: eai
 bandcamp: https://aaoth.bandcamp.com/track/mind-collapse
-r_tag: AAOTH-04
 ---
 
 recorded directly on recycled tape. only three samples in sunvox were used.
diff --git a/_music_releases/2019-04-23-aaoth-sgti.md b/_music_titles/aaoth-sgti.md
index a112e52..35c2f54 100644
--- a/_music_releases/2019-04-23-aaoth-sgti.md
+++ b/_music_titles/aaoth-sgti.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: sgti
-type: track
 date: 23-04-2019
 style: eai
 bandcamp: https://aaoth.bandcamp.com/track/sgti
-r_tag: AAOTH-06
 ---
 
 **s**unvox/**g**uv'nor/**t**ape/**i**mprov
diff --git a/_music_releases/2019-01-12-aaoth-that-cant-be.md b/_music_titles/aaoth-that-cant-be.md
index 47f14e7..e1b8361 100644
--- a/_music_releases/2019-01-12-aaoth-that-cant-be.md
+++ b/_music_titles/aaoth-that-cant-be.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: that can't be
-type: track
 date: 12-01-2019
 style: eai apocalyptic
 bandcamp: https://aaoth.bandcamp.com/track/that-cant-be
-r_tag: AAOTH-02
 ---
 
 apocalyptic guitar improvisation.
diff --git a/_music_releases/2019-05-20-aaoth-the-past.md b/_music_titles/aaoth-the-past.md
index fb9b280..28a4951 100644
--- a/_music_releases/2019-05-20-aaoth-the-past.md
+++ b/_music_titles/aaoth-the-past.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: the past
-type: track
 date: 20-05-2019
 style: eai lo-fi
 bandcamp: https://aaoth.bandcamp.com/track/the-past
-r_tag: AAOTH-08
 ---
 
 atmospheric lo-fi improvisation.
diff --git a/_music_releases/2019-05-10-aaoth-vortex-machines.md b/_music_titles/aaoth-vortex-machines.md
index c105464..0fcdabc 100644
--- a/_music_releases/2019-05-10-aaoth-vortex-machines.md
+++ b/_music_titles/aaoth-vortex-machines.md
@@ -1,11 +1,9 @@
 ---
 author: aaoth
 title: vortex machines
-type: track
 date: 10-05-2019
 style: electronic improvisation
 bandcamp: https://aaoth.bandcamp.com/track/vortex-machines
-r_tag: AAOTH-07
 ---
 
 apocalyptic electronic improvisation using sunvox.
diff --git a/_music_releases/2019-02-08-secauloruxsehi-complex-neon-chamber.md b/_music_titles/secauloruxsehi-complex-neon-chamber.md
index 2507f1b..453eddd 100644
--- a/_music_releases/2019-02-08-secauloruxsehi-complex-neon-chamber.md
+++ b/_music_titles/secauloruxsehi-complex-neon-chamber.md
@@ -1,11 +1,9 @@
 ---
 author: secauloruxse'i
 title: complex neon chamber
-type: track
 date: 08-02-2019
 style: idm no&nbsp;techno
 bandcamp: https://aaoth.bandcamp.com/track/complex-neon-chamber
-r_tag: SCLRS-04
 ---
 
 lyrics:
diff --git a/music.md b/music.md
index 42ea855..0185833 100644
--- a/music.md
+++ b/music.md
@@ -12,7 +12,7 @@ here's a list of projects in which i took part:
 {% assign haelsorisk_projects = site.music_projects | where: "other", nil %}
 
 <div class="haelsorisk-projects-list">
-{% include music-projects-list.html projects=haelsorisk_projects%}
+{% include music-projects-list.html projects=haelsorisk_projects %}
 </div>
 
 [1]:/haelsorisk