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/fonts.dtd | |
| 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/fonts.dtd')
| -rw-r--r-- | fontconfig/fonts.dtd | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd index 4a309a9d2..def8c216f 100644 --- a/fontconfig/fonts.dtd +++ b/fontconfig/fonts.dtd @@ -201,13 +201,14 @@ <!ATTLIST double xml:space (default|preserve) 'preserve'> <!ELEMENT string (#PCDATA)> <!ATTLIST string xml:space (default|preserve) 'preserve'> -<!ELEMENT matrix (double,double,double,double)> +<!ELEMENT matrix ((%expr;), (%expr;), (%expr;), (%expr;))> <!ELEMENT bool (#PCDATA)> <!ELEMENT charset (int|range)*> <!ELEMENT range (int,int)> <!ELEMENT langset (string)*> <!ELEMENT name (#PCDATA)> -<!ATTLIST name xml:space (default|preserve) 'preserve'> +<!ATTLIST name xml:space (default|preserve) 'preserve' + target (default|font|pattern) 'default'> <!ELEMENT const (#PCDATA)> <!ATTLIST const xml:space (default|preserve) 'preserve'> <!ELEMENT or (%expr;)*> |