Make FcCharSetMerge() public

[fontconfig.git] / doc / fccharset.fncs

diff --git a/doc/fccharset.fncs b/doc/fccharset.fncs
index f4c7d3215fe82fa8ef0c4e0964f061ee04b7c003..93e1f5c1e5fcfac1f3e0e14bd8d466930185a61b 100644 (file)
--- a/doc/fccharset.fncs
+++ b/doc/fccharset.fncs
@@ -98,6 +98,19 @@ Returns a set including only those chars found in either <parameter>a</parameter
 Returns a set including only those chars found in <parameter>a</parameter> but not <parameter>b</parameter>. 
 @@
 
+@RET@          FcCharSet *
+@FUNC@         FcCharSetMerge
+@TYPE1@                const FcCharSet *       @ARG1@          a
+@TYPE2@                const FcCharSet *       @ARG2@          b
+@PURPOSE@      Merge charsets
+@DESC@
+If <parameter>a</parameter> is NULL, returns a copy of <parameter>b</parameter>.
+If <parameter>a</parameter> is an FcCharSet object owned by fontconfig that
+cannot be modified, it returns the union of <parameter>a</parameter> and
+<parameter>b</parameter> in a newly-created FcCharSet object.
+Otherwise, adds all chars in <parameter>b</parameter> to <parameter>a</parameter> and returns <parameter>a</parameter>.  In other words, this is an in-place versionof FcCharSetUnion.
+@@
+
 @RET@          FcBool 
 @FUNC@         FcCharSetHasChar
 @TYPE1@                const FcCharSet *       @ARG1@          fcs