cairo: with_xft deprecated, with_cairo synomym

2 files changed, 19 insertions, 14 deletions

diff --git a/doc/compiling.org b/doc/compiling.org
index b4159df..dabcec6 100644
--- a/doc/compiling.org
+++ b/doc/compiling.org
@@ -57,20 +57,27 @@ them to =stack= directly:
    - =with_threaded= Uses GHC's threaded runtime. Use this option if xmobar
      enters a high-CPU regime right after starting.
 
-   - =with_utf8= UTF-8 support. Requires the [[http://hackage.haskell.org/package/utf8-string/][utf8-string]] package.
+   - =with_xft= Antialiased font support.  Deprecated: use =with_cairo= instead.
 
-   - =with_xft= Antialiased fonts. Requires the [[http://hackage.haskell.org/package/X11-xft/][X11-xft]] package. This
-     option automatically enables UTF-8. To use XFT fonts you need to use
-     the =xft:= prefix in the =font= configuration option. For instance:
+   - =with_cairo= Antialiased fonts via Cairo/Pango. Requires the [[http://hackage.haskell.org/package/X11-xft/][X11-xft]]
+     package. This option automatically enables UTF-8. To use XFT fonts you
+     can use their fontconfig name, e.g
 
      #+begin_src haskell
-       font = "xft:Times New Roman-10:italic"
+       font = "Iosevka Medium 10"
+       font = "DejaVu Sans Mono italic 9"
      #+end_src
 
      Or to have fallback fonts, just separate them by commas:
 
      #+begin_src haskell
-       font = "xft:Open Sans:size=9,WenQuanYi Zen Hei:size=9"
+       font = "Open Sans,WenQuanYi Zen Hei 9"
+     #+end_src
+
+     For backwards compatibility, font names with `xft:` are also supported.
+
+     #+begin_src haskell
+       font = "xft:DejaVu Sans Mono-10"
      #+end_src
 
    - =with_mpd= Enables support for the [[http://mpd.wikia.com/][MPD]] daemon. Requires the [[http://hackage.haskell.org/package/libmpd/][libmpd]]
diff --git a/doc/quick-start.org b/doc/quick-start.org
index a206a45..55d3331 100644
--- a/doc/quick-start.org
+++ b/doc/quick-start.org
@@ -59,12 +59,10 @@ configuration language, see [[../etc/xmobar.config][etc/xmobar.config]], and you
    Here are all the global configuration options that you can set within
    the =Config= block in your configuration.
 
-   - =font= Name of the font to be used. Use the =xft:= prefix for XFT
-     fonts.
+   - =font= Name of the font to be used.
 
    - =additionalFonts= Haskell-style list of fonts to be used with the
-     =fn=-template. Use the =xft:= prefix for XFT fonts. See also
-     =textOffsets= below. For example:
+     =fn=-template. See also =textOffsets= below. For example:
 
      #+begin_src haskell
        additionalFonts = [iconFont, altIconFont]
@@ -237,10 +235,10 @@ configuration language, see [[../etc/xmobar.config][etc/xmobar.config]], and you
       contain markups to change the characters' color.
 
     - =<fc=#FF0000>string</fc>= will print =string= with =#FF0000= color
-      (red). =<fc=#FF0000,#000000>string</fc>= will print =string= in red
-      with a black background (=#000000=). Background absolute offsets can
-      be specified for XFT fonts. =<fc=#FF0000,#000000:0>string</fc>= will
-      have a background matching the bar's height.
+      (red). =<fc=#FF0000,#000000>string</fc>= will print =string= in red with a
+      black background (=#000000=). Background absolute offsets can be specified
+      for fonts. =<fc=#FF0000,#000000:0>string</fc>= will have a background
+      matching the bar's height.
 
     - =<fn=1>string</fn>= will print =string= with the first font from
       =additionalFonts=. The index =0= corresponds to the standard font.