Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11581 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 27 insertions, 0 deletions

diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index b108393eee..009bd8ab58 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -919,6 +919,8 @@ alte Schriftunterstützung nicht mehr benutzt werden.
 \-font ~/\:.mplayer/\:arial\-14/\:font.desc
 .br
 \-font ~/\:.mplayer/\:arialuni.ttf
+.br
+\-font 'Bitstream Vera Sans'
 .RE
 .PD 1
 .
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index d0bef28b6a..541c105a70 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1164,6 +1164,8 @@ fonts: ~/\:.mplayer/\:font/\:font.desc, default for FreeType fonts:
 With FreeType, this option determines path to the text font file.
 .br
 The \-subfont-* options are available only with FreeType support compiled in.
+.br
+With Fontconfig, this option determines the fontconfig font name.
 
 .I EXAMPLE:
 .PD 0
@@ -1171,6 +1173,8 @@ The \-subfont-* options are available only with FreeType support compiled in.
 \-font ~/\:.mplayer/\:arial-14/\:font.desc
 .br
 \-font ~/\:.mplayer/\:arialuni.ttf
+.br
+\-font 'Bitstream Vera Sans'
 .RE
 .PD 1
 .
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 9cf5ff3eca..d57176e395 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -781,6 +781,27 @@ library. Version 2.0.9 or greater is mandatory! Then you have two methods:
   RAW plugin too, see URL below)
   <!-- FIXME: where's that URL? -->
   </para></listitem>
+<listitem><para>
+  using a TrueType (TTF) font, by the means of the <systemitem class="library">
+  freetype</systemitem> library. Version 2.0.9 or greater is mandatory! Then
+  you have two methods:
+  <itemizedlist>
+    <listitem><para>
+      use the <option>-font /path/to/arial.ttf</option> option to specify a
+      TrueType font file on every occasion
+      </para></listitem>
+    <listitem><para>
+      create a symlink:<screen>ln -s /path/to/arial.ttf ~/.mplayer/subfont.ttf</screen>
+      </para></listitem>
+      </itemizedlist>
+  <para>
+    if compiled with <systemitem class="library">fontconfig</systemitem>
+    support, the above methods won't work, instead the <option>-font</option>
+    expects a fontconfig font name and defaults to the sans-serif font. To get
+    a list of fonts known to fontconfig, use <command>fc-list</command>.
+    Example: <option>-font 'Bitstream Vera Sans'</option>
+    </para>
+  </para></listitem>
 </itemizedlist>
 
 <para>