Allow editing charset and lang in target="scan"

Merge commit 'fa269cf812ee304534b0e4c44662202496008db0'

Fixes:
Bug 31969 - Can't modify charset in target="scan"
Bug 23758 - Can't modify lang in target="scan"

diff --combined src/Makefile.am
index e300fe9491b180717ff012fa188dfee9c6a3009c,96500b43e9b331b3c7abe06094184850a8f65114..090f9b1abd72695ab6eb423c643e13c6943c8752
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -84,12 -84,13 +84,12 @@@ noinst_HEADERS=fcint.h fcftint.h fcdepr
  ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h
  
  BUILT_SOURCES = $(ALIAS_FILES) \
 -      ../fc-arch/fcarch.h \
        ../fc-case/fccase.h \
        ../fc-glyphname/fcglyphname.h \
        ../fc-lang/fclang.h
  
 -../fc-arch/fcarch.h:
 -      cd ../fc-arch && $(MAKE) $(AM_MAKEFLAGS) fcarch.h
 +noinst_PROGRAMS = fcarch
 +
  ../fc-case/fccase.h:
        cd ../fc-case && $(MAKE) $(AM_MAKEFLAGS) fccase.h
  ../fc-glyphname/fcglyphname.h:
@@@ -98,7 -99,6 +98,7 @@@
        cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h
  
  libfontconfig_la_SOURCES = \
 +      fcarch.h \
        fcatomic.c \
        fcblanks.c \
        fccache.c \
@@@ -140,7 -140,7 +140,7 @@@ PUBLIC_FILES = 
        $(top_srcdir)/fontconfig/fontconfig.h \
        $(top_srcdir)/src/fcdeprecate.h \
        $(top_srcdir)/fontconfig/fcprivate.h
-       
+ 
  PUBLIC_FT_FILES = \
        $(top_srcdir)/fontconfig/fcfreetype.h
  
@@@ -160,7 -160,7 +160,7 @@@ fontconfig.def: $(PUBLIC_FILES) $(PUBLI
        echo Generating $@
        (echo EXPORTS; \
        (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
-       grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/      /' | \
+       grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/      /' | \
        sort; \
        echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
        echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@

diff --combined src/fcint.h
index a8599138f85d625355606861a1578bbf912d762f,3da6ec406e5b508e313099f043e32a330edb3c21..e662c37e22905efc8ba8be81a5c8bfaf45aa2cdb
--- 1/src/fcint.h
--- 2/src/fcint.h
+++ b/src/fcint.h
@@@ -107,10 -107,6 +107,10 @@@
  
  #define FC_MEM_NUM        30
  
 +#define _FC_ASSERT_STATIC1(_line, _cond) typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1]
 +#define _FC_ASSERT_STATIC0(_line, _cond) _FC_ASSERT_STATIC1 (_line, (_cond))
 +#define FC_ASSERT_STATIC(_cond) _FC_ASSERT_STATIC0 (__LINE__, (_cond))
 +
  #define FC_MIN(a,b) ((a) < (b) ? (a) : (b))
  #define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
  #define FC_ABS(a)   ((a) < 0 ? -(a) : (a))
@@@ -220,7 -216,7 +220,7 @@@ struct _FcPattern 
                                 fs->fonts[i])
                                                
  typedef enum _FcOp {
-     FcOpInteger, FcOpDouble, FcOpString, FcOpMatrix, FcOpBool, FcOpCharSet,
+     FcOpInteger, FcOpDouble, FcOpString, FcOpMatrix, FcOpRange, FcOpBool, FcOpCharSet, FcOpLangSet,
      FcOpNil,
      FcOpField, FcOpConst,
      FcOpAssign, FcOpAssignReplace,
@@@ -243,6 -239,7 +243,7 @@@ typedef struct _FcExpr 
        FcMatrix    *mval;
        FcBool      bval;
        FcCharSet   *cval;
+       FcLangSet   *lval;
        FcObject    object;
        FcChar8     *constant;
        struct {
@@@ -511,6 -508,13 +512,13 @@@ typedef struct _FcFileTime 
  
  typedef struct _FcCharMap FcCharMap;
  
+ typedef struct _FcRange           FcRange;
+ 
+ struct _FcRange {
+     FcChar32 begin;
+     FcChar32 end;
+ };
+ 
  /* fcblanks.c */
  
  /* fccache.c */