commit 57137a13fb8d5eb6f9666d299541ecd0f4eae477
Author: Ivan Tham <pickfire_AT_riseup.net>
Date: Thu Nov 5 22:46:48 2015 +0800
Merge xft with fallback fonts into xft
diff --git a/dwm.suckless.org/patches/xft-with-fallback-fonts.md b/dwm.suckless.org/patches/xft-with-fallback-fonts.md
deleted file mode 100644
index b6d1fed..0000000
--- a/dwm.suckless.org/patches/xft-with-fallback-fonts.md
+++ /dev/null
_AT_@ -1,36 +0,0 @@
-Xft With Fallback-Font Support
-==============================
-
-Description
------------
-
-Adds Xft and fallback-font support to dwm. This patch was built on top of the
-[Xft patch written by Quentin](
http://lists.suckless.org/dev/1311/18279.html).
-With fallback font support, multiple fonts can now be specified in config.h
-which are used to render characters not present in the first font. If none of
-the user-specified fonts contains a given character, this patch attempts to
-automatically fallback to whatever suitable font it can find on the host
-system.
-
-With this patch, the "font" variable in config.h is superseded by the "fonts"
-variable which is a priority-ordered list of fonts that should be used to
-render text. Here's an example "fonts" definition:
-
- static const char *fonts[] = {
- "Sans:size=10.5",
- "VL Gothic:size=10.5",
- "WenQuanYi Micro Hei:size=10.5",
- };
-
-At least one font must be specified, and a maximum of `DRW_FONT_CACHE_SIZE`
-fonts can be used.
-
-Download
---------
-
-* [dwm-6.1-xft-with-fallback-font.diff](dwm-6.1-xft-with-fallback-font.diff) (20k) (2015-02-28)
-
-Author
-------
-
-* [Eric Pruitt](
https://github.com/ericpruitt/)
diff --git a/dwm.suckless.org/patches/xft.md b/dwm.suckless.org/patches/xft.md
index a863e29..2469b8d 100644
--- a/dwm.suckless.org/patches/xft.md
+++ b/dwm.suckless.org/patches/xft.md
_AT_@ -4,17 +4,41 @@ xft
Description
-----------
-This patch implements Xft. This allows users to utilize the UTF8 character set. This is enabled by default when you are using the latest dwm-git.
+The `xft` patch patch implements Xft. This allows users to utilize the UTF8
+character set. Look at the patch below which is more advance.
+
+The `xft-with-fallback-font` patch adds Xft and fallback-font support to dwm.
+This patch was built on top of the [Xft patch written by
+Quentin](
http://lists.suckless.org/dev/1311/18279.html). With fallback font
+support, multiple fonts can now be specified in config.h which are used to
+render characters not present in the first font. If none of the user-specified
+fonts contains a given character, this patch attempts to automatically fallback
+to whatever suitable font it can find on the host system.
+**NOTE: This is enabled by default when you are using the latest dwm-git.**
+
+With this patch, the "font" variable in config.h is superseded by the "fonts"
+variable which is a priority-ordered list of fonts that should be used to
+render text. Here's an example "fonts" definition:
+
+ static const char *fonts[] = {
+ "Sans:size=10.5",
+ "VL Gothic:size=10.5",
+ "WenQuanYi Micro Hei:size=10.5",
+ };
+
+At least one font must be specified, and a maximum of `DRW_FONT_CACHE_SIZE`
+fonts can be used.
+
Download
--------
-
* [dwm-6.0-xft.diff](dwm-6.0-xft.diff) (6.6k) (16 May 2012)
* memory leak fixed and improved implementation.
* include config.def.h and config.mk changes.
+* [dwm-6.1-xft-with-fallback-font.diff](dwm-6.1-xft-with-fallback-font.diff) (20k) (2015-02-28)
Author
------
-
* Lee Fallat (lf94)<ircsurfer33_AT_gmail.com>
+* [Eric Pruitt](
https://github.com/ericpruitt/)
Received on Thu Nov 05 2015 - 16:15:13 CET