diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
| commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
| tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /fontconfig/doc/fontconfig-user.sgml | |
| parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
| parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
| download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'fontconfig/doc/fontconfig-user.sgml')
| -rw-r--r-- | fontconfig/doc/fontconfig-user.sgml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml index f7632ea67..c842371ec 100644 --- a/fontconfig/doc/fontconfig-user.sgml +++ b/fontconfig/doc/fontconfig-user.sgml @@ -434,8 +434,9 @@ zero for purely fractional values (e.g. use 0.5 instead of .5 and -0.5 instead of -.5). </para></refsect2> <refsect2><title><literal><matrix></literal></title><para> -This element holds the four <literal><double></literal> elements of an affine -transformation. +This element holds four numerical expressions of an affine transformation. +At their simplest these will be four <literal><double></literal> elements +but they can also be more involved expressions. </para></refsect2> <refsect2><title><literal><range></literal></title><para> This element holds the two <literal><int></literal> elements of a range @@ -451,7 +452,12 @@ a RFC-3066-style languages or more. </para></refsect2> <refsect2><title><literal><name></literal></title><para> Holds a property name. Evaluates to the first value from the property of -the font, not the pattern. +the pattern. If the 'target' attribute is not present, it will default to +'default', in which case the property is returned from the font pattern +during a target="font" match, and to the pattern during a target="pattern" +match. The attribute can also take the values 'font' or 'pattern' to +explicitly choose which pattern to use. It is an error to use a target +of 'font' in a match that has target="pattern". </para></refsect2> <refsect2><title><literal><const></literal></title><para> Holds the name of a constant; these are always integers and serve as |