From c0e0702a6c2ac0eb949b5ec65362c40217b28aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Ochotnick=C3=BD?= <stanislav@ochotnicky.com>
Date: Wed, 21 Dec 2022 17:06:25 +0100
Subject: [PATCH] Update Font Awesome 5 to 6

This makes it less likely that new users will get confused and
accidentally use fallback fonts.
---
 README.md                           | 4 ++--
 doc/yambar-modules.5.scd            | 4 ++--
 doc/yambar.5.scd                    | 4 ++--
 examples/configurations/laptop.conf | 4 ++--
 particles/string.c                  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c7b0505..759f667 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,9 @@ bar:
   right:
     - clock:
         content:
-          - string: {text: , font: "Font Awesome 5 Free:style=solid:size=12"}
+          - string: {text: , font: "Font Awesome 6 Free:style=solid:size=12"}
           - string: {text: "{date}", right-margin: 5}
-          - string: {text: , font: "Font Awesome 5 Free:style=solid:size=12"}
+          - string: {text: , font: "Font Awesome 6 Free:style=solid:size=12"}
           - string: {text: "{time}"}
 ```
 
diff --git a/doc/yambar-modules.5.scd b/doc/yambar-modules.5.scd
index 177418f..e8c388c 100644
--- a/doc/yambar-modules.5.scd
+++ b/doc/yambar-modules.5.scd
@@ -38,7 +38,7 @@ For example, to render _backlight_ as " 20%", you could use:
 ```
 content:
   - string:
-      font: Font Awesome 5 Free:style=solid:pixelsize=14
+      font: Font Awesome 6 Free:style=solid:pixelsize=14
       text: 
   - string:
       font: Adobe Helvetica:pixelsize=12
@@ -91,7 +91,7 @@ In these cases, you can define an anchor point, either at top-level,
 or in a module's _anchors_ attribute:
 
 ```
-awesome: &awesome Font Awesome 5 Free:style=solid:pixelsize=14
+awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=14
 
 ```
 
diff --git a/doc/yambar.5.scd b/doc/yambar.5.scd
index d7bf0b8..3cc9557 100644
--- a/doc/yambar.5.scd
+++ b/doc/yambar.5.scd
@@ -14,8 +14,8 @@ types that are frequently used:
 
 - *font*: this is a comma separated list of fonts in _fontconfig_
   format. Example of valid values:
-	- Font Awesome 5 Brands
-	- Font Awesome 5 Free:style=solid
+	- Font Awesome 6 Brands
+	- Font Awesome 6 Free:style=solid
 	- Dina:pixelsize=10:slant=italic
 	- Dina:pixelsize=10:weight=bold
 - *color*: an rgba hexstring; _RRGGBBAA_. Examples:
diff --git a/examples/configurations/laptop.conf b/examples/configurations/laptop.conf
index 96383ca..de04ed7 100644
--- a/examples/configurations/laptop.conf
+++ b/examples/configurations/laptop.conf
@@ -5,8 +5,8 @@
 # the sway-xkb module with the xkb module.
 
 # fonts we'll be re-using here and there
-awesome: &awesome Font Awesome 5 Free:style=solid:pixelsize=14
-awesome_brands: &awesome_brands Font Awesome 5 Brands:pixelsize=16
+awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=14
+awesome_brands: &awesome_brands Font Awesome 6 Brands:pixelsize=16
 
 std_underline: &std_underline {underline: { size: 2, color: ff0000ff}}
 
diff --git a/particles/string.c b/particles/string.c
index e679600..e11ec45 100644
--- a/particles/string.c
+++ b/particles/string.c
@@ -94,7 +94,7 @@ expose(const struct exposable *exposable, pixman_image_t *pix, int x, int y, int
      *
      * Finally, if the font's descent is negative, ignore it (except
      * for the height calculation). This is unfortunately not based on
-     * any real facts, but works very well with e.g. the "Awesome 5"
+     * any real facts, but works very well with e.g. the "Awesome 6"
      * font family.
      */
     const double baseline = (double)y +