From 86bd8a39eefd5dc6bdd067fffc82f1106a943641 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Wed, 12 Feb 2025 10:50:38 -0500
Subject: [PATCH] Fix font subsetting for webring

---
 site_test/archive.html              |  2 ++
 site_test/css/main.scss             |  2 --
 src/generator/css/character_sets.rs |  2 +-
 src/generator/css/font_subset.rs    | 10 +++++++++-
 src/generator/templates.rs          |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/site_test/archive.html b/site_test/archive.html
index 20e4a99..1bab47e 100644
--- a/site_test/archive.html
+++ b/site_test/archive.html
@@ -6,6 +6,8 @@
 
 {% block content -%}
 
+<h1>Archive</h1>
+
 {% for year in years %}
     <div class="archive-list">
         {% for entry in posts_by_year[year] %}
diff --git a/site_test/css/main.scss b/site_test/css/main.scss
index 8b0a87a..0ae6f74 100644
--- a/site_test/css/main.scss
+++ b/site_test/css/main.scss
@@ -359,8 +359,6 @@ footer {
     );
     background: var(--webring-gradient);
     background-clip: text;
-    font-variant: small-caps;
-    font-weight: bold;
     position: relative;
     &::after {
         content: "";
diff --git a/src/generator/css/character_sets.rs b/src/generator/css/character_sets.rs
index eeec3cc..10ed258 100644
--- a/src/generator/css/character_sets.rs
+++ b/src/generator/css/character_sets.rs
@@ -206,7 +206,7 @@ impl std::fmt::Debug for CharacterSets {
 }
 
 bitflags! {
-    #[derive(Clone, Copy, PartialEq)]
+    #[derive(Clone, Copy, PartialEq, Debug)]
     pub struct FontKey: u8 {
         const BOLD = 1;
         const ITALIC = 1 << 1;
diff --git a/src/generator/css/font_subset.rs b/src/generator/css/font_subset.rs
index f6f1ccd..d80b712 100644
--- a/src/generator/css/font_subset.rs
+++ b/src/generator/css/font_subset.rs
@@ -4,6 +4,7 @@ use compute_graph::{
     rule::Rule,
     synchronicity::Asynchronous,
 };
+use log::debug;
 use pyftsubset::subset;
 
 use super::character_sets::{CharacterSets, FontKey};
@@ -18,7 +19,11 @@ pub fn make_graph(
         sets: character_sets,
         key,
     });
-    builder.add_rule(SubsetFont { font, characters })
+    builder.add_rule(SubsetFont {
+        key,
+        font,
+        characters,
+    })
 }
 
 #[derive(InputVisitable)]
@@ -36,12 +41,15 @@ impl Rule for GetCharacterSet {
 
 #[derive(InputVisitable)]
 struct SubsetFont {
+    #[skip_visit]
+    key: FontKey,
     font: Input<Vec<u8>>,
     characters: Input<ahash::HashSet<char>>,
 }
 impl Rule for SubsetFont {
     type Output = Vec<u8>;
     fn evaluate(&mut self) -> Self::Output {
+        debug!("Subsetting font {:?}", self.key);
         let unicodes = self
             .characters()
             .iter()
diff --git a/src/generator/templates.rs b/src/generator/templates.rs
index 6891bdf..a1c9faf 100644
--- a/src/generator/templates.rs
+++ b/src/generator/templates.rs
@@ -208,7 +208,7 @@ impl Rule for RenderTemplate {
             }
             Err(e) => {
                 error!("Error rendering template {:?}: {:?}", self.name, e);
-                return String::new();
+                String::new()
             }
         }
     }