Make FcCharSetMerge() public

That's needed for apps to be abled to do pruning themselves without
the performance penalty of recreating new charsets all the time.

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

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 529456f7ef4a9c6ecc254dc93b025d8792f97098..606580db92bbbfb48cc66a35178f0c658e4c8e54 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -439,6 +439,9 @@ FcCharSetUnion (const FcCharSet *a, const FcCharSet *b);
 FcPublic FcCharSet*
 FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b);
 
+FcPublic FcCharSet *
+FcCharSetMerge (FcCharSet *a, const FcCharSet *b);
+
 FcPublic FcBool
 FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4);
 

diff --git a/src/fcint.h b/src/fcint.h
index c8ff22838fbeb88303787234f508a9e47601cbac..0b41d593ce97bd66bf88459ca164a1e4c6e3ac15 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -653,9 +653,6 @@ FcNameUnparseValueList (FcStrBuf    *buf,
 FcPrivate FcCharLeaf *
 FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4);
 
-FcPrivate FcCharSet *
-FcCharSetMerge (FcCharSet *a, const FcCharSet *b);
-
 FcPrivate FcBool
 FcCharSetSerializeAlloc(FcSerialize *serialize, const FcCharSet *cs);