From d757009b480d6f8daa6996b8eb84d1e734ff90f9 Mon Sep 17 00:00:00 2001
From: Elena Torro <elenatorro@gmail.com>
Date: Mon, 31 Mar 2025 17:08:31 +0200
Subject: [PATCH] :bug: Fix Google Fonts load by parsing italic variant ids
 correctly

---
 frontend/src/app/main/fonts.clj             | 10 ++--
 frontend/src/app/render_wasm/api/fonts.cljs | 57 +++++++++++----------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/frontend/src/app/main/fonts.clj b/frontend/src/app/main/fonts.clj
index aba8df555..80f4ca0a0 100644
--- a/frontend/src/app/main/fonts.clj
+++ b/frontend/src/app/main/fonts.clj
@@ -22,10 +22,12 @@
     {:id "italic" :name "italic" :weight "400" :style "italic" :ttf-url (get files "italic")}
 
     :else
-    (when-let [[a b c] (re-find #"^(\d+)(.*)$" variant)]
-      (if (str/empty? c)
-        {:id a :name b :weight b :style "normal" :ttf-url (get files a)}
-        {:id a :name (str b " (" c ")") :weight b :style c :ttf-url (get files c)}))))
+    (when-let [[id weight style] (re-find #"^(\d+)(.*)$" variant)]
+      {:id id
+       :name variant
+       :weight weight
+       :style (if (str/empty? style) "normal" style)
+       :ttf-url (get files id)})))
 
 (defn- parse-gfont
   [font]
diff --git a/frontend/src/app/render_wasm/api/fonts.cljs b/frontend/src/app/render_wasm/api/fonts.cljs
index 82dcfef15..3797a0bce 100644
--- a/frontend/src/app/render_wasm/api/fonts.cljs
+++ b/frontend/src/app/render_wasm/api/fonts.cljs
@@ -10,7 +10,7 @@
    [app.common.data.macros :as dm]
    [app.common.uuid :as uuid]
    [app.config :as cf]
-   [app.main.fonts :as f]
+   [app.main.fonts :as fonts]
    [app.main.store :as st]
    [app.render-wasm.helpers :as h]
    [app.render-wasm.wasm :as wasm]
@@ -27,7 +27,7 @@
 
 (defn- google-font-id->uuid
   [font-id]
-  (let [font (get @f/fontsdb font-id)]
+  (let [font (fonts/get-font-data font-id)]
     (:uuid font)))
 
 (defn- custom-font-id->uuid
@@ -39,17 +39,15 @@
     (google-font-id->uuid font-id)
     (custom-font-id->uuid font-id)))
 
-(defn ^:private font-id->ttf-id [font-id font-style font-weight]
-  (if (str/starts-with? font-id "gfont-")
-    font-id
-    (let [font-uuid (custom-font-id->uuid font-id)
-          matching-font (d/seek (fn [[_ font]]
-                                  (and (= (:font-id font) font-uuid)
-                                       (= (:font-style font) font-style)
-                                       (= (:font-weight font) font-weight)))
-                                (seq @fonts))]
-      (when matching-font
-        (:ttf-file-id (second matching-font))))))
+(defn ^:private font-id->ttf-id [font-id font-variant-id]
+  (if (str/starts-with? font-id "gfont-")    font-id
+      (let [font-uuid (custom-font-id->uuid font-id)
+            matching-font (d/seek (fn [[_ font]]
+                                    (and (= (:font-id font) font-uuid)
+                                         (= (:font-variant-id font) font-variant-id)))
+                                  (seq @fonts))]
+        (when matching-font
+          (:ttf-file-id (second matching-font))))))
 
 ;; IMPORTANT: It should be noted that only TTF fonts can be stored.
 (defn- store-font-buffer
@@ -80,13 +78,13 @@
 
 (defn- google-font-ttf-url
   [font-id font-variant-id]
-  (let [font (get @f/fontsdb font-id)
-        variant (d/seek (fn [variant]
-                          (= (:id variant) font-variant-id))
-                        (:variants font))
-        file (-> (:ttf-url variant)
-                 (str/replace "http://fonts.gstatic.com/s/" (u/join cf/public-uri "/internal/gfonts/font/")))]
-    file))
+  (let [font (fonts/get-font-data font-id)
+        variant (fonts/get-variant font font-variant-id)]
+    (if-let [ttf-url (:ttf-url variant)]
+      (str/replace ttf-url "http://fonts.gstatic.com/s/" (u/join cf/public-uri "/internal/gfonts/font/"))
+      (do
+        (println "Variant TTF URL not found for" font-id font-variant-id)
+        nil))))
 
 (defn- font-id->ttf-url
   [font-id font-variant-id]
@@ -137,16 +135,19 @@
   (keep (fn [font]
           (let [font-id (dm/get-prop font :font-id)
                 font-variant-id (dm/get-prop font :font-variant-id)
-                variant-parts (str/split font-variant-id #"\-")
-                variant-parts (if (= (count variant-parts) 1)
-                                (conj variant-parts "400")
-                                variant-parts)
-                style (first variant-parts)
-                weight (serialize-font-weight (last variant-parts))
-                asset-id (font-id->ttf-id font-id style weight)
                 wasm-id (font-id->uuid font-id)
+
+                weight (serialize-font-weight
+                        (if-let [weight-match (re-find #"\d+" font-variant-id)]
+                          (js/parseInt weight-match)
+                          400))
+
+                style (serialize-font-style (cond
+                                              (str/includes? font-variant-id "italic") "italic"
+                                              :else "normal"))
+                asset-id (font-id->ttf-id font-id font-variant-id)
                 font-data {:wasm-id wasm-id
                            :font-variant-id font-variant-id
-                           :style (serialize-font-style style)
+                           :style style
                            :weight weight}]
             (store-font-id font-data asset-id))) fonts))