From 4b5ea14ee1fc11c20b4e228627f73c90b02a6369 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 19 Nov 2025 16:04:34 -0800
Subject: [PATCH] Support new font-awesome class names

In version 6, Font Awesome changed so that the class names look like
`fa-solid fa-cat` instead of `fas fa-cat`. This updates so that it
handles this new style.
---
 crates/mdbook-html/src/html/tree.rs                    | 10 +++++-----
 tests/testsuite/rendering.rs                           |  1 -
 tests/testsuite/rendering/fontawesome/expected/fa.html |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/mdbook-html/src/html/tree.rs b/crates/mdbook-html/src/html/tree.rs
index 0c7c2e4d..5cb97ce3 100644
--- a/crates/mdbook-html/src/html/tree.rs
+++ b/crates/mdbook-html/src/html/tree.rs
@@ -1030,14 +1030,14 @@ where
             let i_el = node.value().as_element().unwrap();
             let classes = i_el.attr("class").unwrap_or_default();
             for class in classes.split(" ") {
-                if let Some(class) = class.strip_prefix("fa-") {
-                    icon = class.to_owned();
-                } else if class == "fa" {
+                if matches!(class, "fa" | "fa-regular") {
                     type_ = fa::Type::Regular;
-                } else if class == "fas" {
+                } else if matches!(class, "fas" | "fa-solid") {
                     type_ = fa::Type::Solid;
-                } else if class == "fab" {
+                } else if matches!(class, "fab" | "fa-brands") {
                     type_ = fa::Type::Brands;
+                } else if let Some(class) = class.strip_prefix("fa-") {
+                    icon = class.to_owned();
                 } else {
                     new_classes += " ";
                     new_classes += class;
diff --git a/tests/testsuite/rendering.rs b/tests/testsuite/rendering.rs
index 63bcc70f..421aa5d4 100644
--- a/tests/testsuite/rendering.rs
+++ b/tests/testsuite/rendering.rs
@@ -53,7 +53,6 @@ fn fontawesome() {
  INFO Book building has started
  INFO Running the html backend
  WARN failed to find Font Awesome icon for icon `does-not-exist` with type `regular` in `fa.md`: Invalid Font Awesome icon name: visit https://fontawesome.com/icons?d=gallery&m=free to see valid names
- WARN failed to find Font Awesome icon for icon `cat` with type `regular` in `fa.md`: Invalid Font Awesome icon name: visit https://fontawesome.com/icons?d=gallery&m=free to see valid names
  INFO HTML book written to `[ROOT]/book`
 
 "#]]);
diff --git a/tests/testsuite/rendering/fontawesome/expected/fa.html b/tests/testsuite/rendering/fontawesome/expected/fa.html
index 565f7f89..6dfc9de1 100644
--- a/tests/testsuite/rendering/fontawesome/expected/fa.html
+++ b/tests/testsuite/rendering/fontawesome/expected/fa.html
@@ -4,4 +4,4 @@
 <p><span class="fa-svg"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path d="M448 48V384C385 407 366 416 329 416C266 416 242 384 179 384C159 384 143 388 128 392V328C143 324 159 320 179 320C242 320 266 352 329 352C349 352 364 349 384 343V135C364 141 349 144 329 144C266 144 242 112 179 112C128 112 104 133 64 141V448C64 466 50 480 32 480S0 466 0 448V64C0 46 14 32 32 32S64 46 64 64V77C104 69 128 48 179 48C242 48 266 80 329 80C366 80 385 71 448 48Z"/></svg></span></p>
 <p><i class="fas fa-heart">Text prevents translation.</i></p>
 <p><i class="fa fa-does-not-exist"></i></p>
-<p><i class="fa-solid fa-cat"></i></p>
\ No newline at end of file
+<p><span class="fa-svg"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path d="M288 192h17.1c22.1 38.3 63.5 64 110.9 64c11 0 21.8-1.4 32-4v4 32V480c0 17.7-14.3 32-32 32s-32-14.3-32-32V339.2L248 448h56c17.7 0 32 14.3 32 32s-14.3 32-32 32H160c-53 0-96-43-96-96V192.5c0-16.1-12-29.8-28-31.8l-7.9-1C10.5 157.6-1.9 141.6 .2 124s18.2-30 35.7-27.8l7.9 1c48 6 84.1 46.8 84.1 95.3v85.3c34.4-51.7 93.2-85.8 160-85.8zm160 26.5v0c-10 3.5-20.8 5.5-32 5.5c-28.4 0-54-12.4-71.6-32h0c-3.7-4.1-7-8.5-9.9-13.2C325.3 164 320 146.6 320 128v0V32 12 10.7C320 4.8 324.7 .1 330.6 0h.2c3.3 0 6.4 1.6 8.4 4.2l0 .1L352 21.3l27.2 36.3L384 64h64l4.8-6.4L480 21.3 492.8 4.3l0-.1c2-2.6 5.1-4.2 8.4-4.2h.2C507.3 .1 512 4.8 512 10.7V12 32v96c0 17.3-4.6 33.6-12.6 47.6c-11.3 19.8-29.6 35.2-51.4 42.9zM400 128c0-8.8-7.2-16-16-16s-16 7.2-16 16s7.2 16 16 16s16-7.2 16-16zm48 16c8.8 0 16-7.2 16-16s-7.2-16-16-16s-16 7.2-16 16s7.2 16 16 16z"/></svg></span></p>
\ No newline at end of file