From 272e57235cd60a2e65ac8258d96a02eb3939b687 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 25 Mar 2011 10:41:05 +0000
Subject: git update until 25 Mar 2011

xserver
fontconfig
glproto
libXau
libXft
libXmu
libfontenc
libxcb
mesa
mkfontscale
pixman
randrproto
xkeyboard-config
xtrans
xwininfo

updated following packages:

xproto-7.0.21
xineramaproto-1.2.1
libXt-1.1.1
libxkbfile-1.0.7
libXpm-3.5.9
libXfont-1.4.3
libXaw-1.0.9
bdftopcf-1.0.3
encodings-1.0.4
fixesproto-5.0
font-adobe-100dpi-1.0.3
font-adobe-75dpi-1.0.3
font-adobe-utopia-100dpi-1.0.4
font-adobe-utopia-75dpi-1.0.4
font-adobe-utopia-type1-1.0.4
font-alias-1.0.3
font-arabic-misc-1.0.3
font-bh-100dpi-1.0.3
font-bh-75dpi-1.0.3
font-bh-lucidatypewriter-100dpi-1.0.3
font-bh-lucidatypewriter-75dpi-1.0.3
font-bh-ttf-1.0.3
font-bh-type1-1.0.3
font-bitstream-100dpi-1.0.3
font-bitstream-75dpi-1.0.3
font-bitstream-speedo-1.0.2
font-bitstream-type1-1.0.3
font-cronyx-cyrillic-1.0.3
font-cursor-misc-1.0.3
font-daewoo-misc-1.0.3
font-dec-misc-1.0.3
font-ibm-type1-1.0.3
font-isas-misc-1.0.3
font-jis-misc-1.0.3
font-micro-misc-1.0.3
font-misc-cyrillic-1.0.3
font-misc-ethiopic-1.0.3
font-misc-meltho-1.0.3
font-misc-misc-1.1.2
font-mutt-misc-1.0.3
font-schumacher-misc-1.1.2
font-screen-cyrillic-1.0.4
font-sony-misc-1.0.3
font-sun-misc-1.0.3
font-util-1.2.0
font-winitzki-cyrillic-1.0.3
font-xfree86-type1-1.0.4
---
 fontconfig/doc/fclangset.fncs | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'fontconfig/doc/fclangset.fncs')

diff --git a/fontconfig/doc/fclangset.fncs b/fontconfig/doc/fclangset.fncs
index f9d578e65..0a44b38c2 100644
--- a/fontconfig/doc/fclangset.fncs
+++ b/fontconfig/doc/fclangset.fncs
@@ -58,6 +58,36 @@ two or three letter language from ISO 639 and Tt is a territory from ISO
 3166.
 @@
 
+@RET@		FcBool
+@FUNC@		FcLangSetDel
+@TYPE1@		FcLangSet *			@ARG1@		ls
+@TYPE2@		const FcChar8 *			@ARG2@		lang
+@PURPOSE@	delete a language from a langset
+@DESC@
+<parameter>lang</parameter> is removed from <parameter>ls</parameter>.
+<parameter>lang</parameter> should be of the form Ll-Tt where Ll is a
+two or three letter language from ISO 639 and Tt is a territory from ISO
+3166.
+@@
+
+@RET@		FcLangSet *
+@FUNC@		FcLangSetUnion
+@TYPE1@		const FcLangSet *		@ARG1@		ls_a
+@TYPE2@		const FcLangSet *		@ARG2@		ls_b
+@PURPOSE@	Add langsets
+@DESC@
+Returns a set including only those languages found in either <parameter>ls_a</parameter> or <parameter>ls_b</parameter>.
+@@
+
+@RET@		FcLangSet *
+@FUNC@		FcLangSetSubtract
+@TYPE1@		const FcLangSet *		@ARG1@		ls_a
+@TYPE2@		const FcLangSet *		@ARG2@		ls_b
+@PURPOSE@	Subtract langsets
+@DESC@
+Returns a set including only those languages found in <parameter>ls_a</parameter> but not in <parameter>ls_b</parameter>.
+@@
+
 @RET@		FcLangResult
 @FUNC@		FcLangSetCompare
 @TYPE1@		const FcLangSet *		@ARG1@		ls_a
@@ -68,7 +98,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO
 <parameter>ls_a</parameter> and <parameter>ls_b</parameter>. If they share
 any language and territory pair, this function returns FcLangEqual. If they
 share a language but differ in which territory that language is for, this
-function returns FcLangDiffentTerritory. If they share no languages in
+function returns FcLangDifferentTerritory. If they share no languages in
 common, this function returns FcLangDifferentLang.
 @@
 
@@ -119,7 +149,7 @@ value may not be equal.
 <parameter>ls</parameter> has a matching language and territory pair,
 this function returns FcLangEqual. If <parameter>ls</parameter> has
 a matching language but differs in which territory that language is for, this
-function returns FcLangDiffentTerritory. If <parameter>ls</parameter> 
+function returns FcLangDifferentTerritory. If <parameter>ls</parameter> 
 has no matching language, this function returns FcLangDifferentLang.
 @@
 
-- 
cgit v1.2.3