[MPlayer-DOCS] r28895 - in trunk: DOCS/man/en/mplayer.1 libass/ass_cache.c libass/ass_font.c libass/ass_font.h libass/ass_fontconfig.c libass/ass_fontconfig.h libass/ass_mp.c libass/ass_render.c libass/ass_types.h

[eugeni]

Author: eugeni
Date: Sun Mar  8 17:13:21 2009
New Revision: 28895

Log:
Treat -font/-subfont as Fontconfig pattern in libass.

Patch by Adrian Stutz (adrian sttz ch).

Modified:
   trunk/DOCS/man/en/mplayer.1

Changes in other areas also in this revision:
Modified:
   trunk/libass/ass_cache.c
   trunk/libass/ass_font.c
   trunk/libass/ass_font.h
   trunk/libass/ass_fontconfig.c
   trunk/libass/ass_fontconfig.h
   trunk/libass/ass_mp.c
   trunk/libass/ass_render.c
   trunk/libass/ass_types.h

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Sun Mar  8 16:56:20 2009	(r28894)
+++ trunk/DOCS/man/en/mplayer.1	Sun Mar  8 17:13:21 2009	(r28895)
@@ -2253,14 +2253,14 @@ Use this if commas in subtitles are show
 instead of at the end.
 .
 .TP
-.B \-font <path to font.desc file>
+.B \-font <path to font.desc file, path to font (FreeType), font pattern (Fontconfig)>
 Search for the OSD/\:SUB fonts in an alternative directory (default for normal
 fonts: ~/\:.mplayer/\:font/\:font.desc, default for FreeType fonts:
 ~/.mplayer/\:subfont.ttf).
 .br
 .I NOTE:
 With FreeType, this option determines the path to the text font file.
-With fontconfig, this option determines the fontconfig font name.
+With Fontconfig, this option determines the Fontconfig font pattern.
 .sp 1
 .I EXAMPLE:
 .PD 0
@@ -2270,6 +2270,8 @@ With fontconfig, this option determines 
 \-font ~/\:.mplayer/\:arialuni.ttf
 .br
 \-font 'Bitstream Vera Sans'
+.br
+\-font 'Bitstream Vera Sans:style=Bold'
 .RE
 .PD 1
 .
@@ -2508,8 +2510,8 @@ Currently useless.
 Same as \-audiofile, but for subtitle streams (OggDS?).
 .
 .TP
-.B \-subfont <filename> (FreeType only)
-Sets the subtitle font.
+.B \-subfont <path to font (FreeType), font pattern (Fontconfig)> (FreeType only)
+Sets the subtitle font (see \-font).
 If no \-subfont is given, \-font is used.
 .
 .TP