Commit c647f6f1 authored by Keith Packard's avatar Keith Packard

Build fclang.h before building library This required compiling the charset

    funcs into fc-lang, which was done by refactoring code in fccharset.c
    and fcfreetype.c a bit
Updated ethiopic orthographies
Remove imake support
Install empty local.conf file if none is present
parent 3d72cadd
XCOMM $XFree86$
#ifdef UseInstalled
/* building outside the tree, use private defines */
#include "../local.def"
#endif
INCLUDES=$(FREETYPE2INCLUDES) -I..
LOCAL_LIBRARIES=FontconfigClientLibs
DEPLIBS=FontconfigClientDepLibs
SRCS=fc-cache.c
OBJS=fc-cache.o
ComplexProgramTarget(fc-cache)
LinkBuildBinary(ProgramTargetName(fc-cache))
install::
if [ x$${DESTDIR} = x ]; then \
$(FCCACHE) -v -f;\
fi
XCOMM $XFree86: xc/lib/fontconfig/fc-lang/Imakefile,v 1.14 2002/08/08 00:10:49 keithp Exp $
#ifdef UseInstalled
/* building outside the tree, use private defines */
#include "../local.def"
#endif
INCLUDES=$(FREETYPE2INCLUDES) -I.. -I../src
LOCAL_LIBRARIES=FontconfigClientLibs
DEPLIBS=FontconfigClientDepLibs
SRCS=fc-lang.c
OBJS=fc-lang.o
TARG=fclang.h
TMPL=fclang.tmpl.h
#
# Basic ISO 639-1 two letter language names, 639-2 are three-letter
# language codes
#
ORTH=aa.orth ab.orth af.orth am.orth ar.orth ast.orth ava.orth ay.orth\
az.orth bam.orth ba.orth be.orth bg.orth bho.orth bh.orth bin.orth\
bi.orth bn.orth bo.orth br.orth bs.orth bua.orth ca.orth ce.orth\
chm.orth ch.orth chr.orth co.orth cs.orth cu.orth cv.orth cy.orth\
da.orth de.orth dz.orth el.orth en.orth eo.orth es.orth et.orth eu.orth\
fa.orth fi.orth fj.orth fo.orth fr.orth ful.orth fur.orth fy.orth\
ga.orth gd.orth gez.orth gl.orth gn.orth gu.orth gv.orth ha.orth\
haw.orth he.orth hi.orth ho.orth hr.orth hu.orth hy.orth ia.orth\
ibo.orth id.orth ie.orth ik.orth io.orth is.orth it.orth iu.orth ja.orth\
kaa.orth ka.orth ki.orth kk.orth kl.orth km.orth kn.orth kok.orth\
ko.orth ks.orth kum.orth ku.orth kv.orth kw.orth ky.orth la.orth lb.orth\
lez.orth lo.orth lt.orth lv.orth mg.orth mh.orth mi.orth mk.orth ml.orth\
mn.orth mo.orth mr.orth mt.orth my.orth nb.orth ne.orth nl.orth nn.orth\
no.orth ny.orth oc.orth om.orth or.orth os.orth pl.orth pt.orth rm.orth\
ro.orth ru.orth sah.orth sa.orth sco.orth sel.orth se.orth sh.orth\
si.orth sk.orth sl.orth sma.orth smj.orth smn.orth sm.orth sms.orth\
so.orth sq.orth sr.orth sv.orth sw.orth syr.orth ta.orth te.orth tg.orth\
th.orth ti.orth tk.orth tl.orth tn.orth to.orth tr.orth ts.orth tt.orth\
tw.orth tyv.orth ug.orth uk.orth ur.orth uz.orth ven.orth vi.orth\
vo.orth vot.orth wa.orth wen.orth wo.orth xh.orth yap.orth yi.orth\
yo.orth zh_cn.orth zh_hk.orth zh_mo.orth zh_sg.orth zh_tw.orth zu.orth
all:: $(TARG)
clean::
$(RM) $(TARG)
$(TARG): fc-lang $(ORTH) $(TMPL)
chmod +w $(TARG)
./fc-lang $(ORTH) < $(TMPL) > $(TARG)
ComplexProgramTarget(fc-lang)
LinkBuildBinary(ProgramTargetName(fc-lang))
#
# $XFree86: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $
# $XFree86: xc/lib/fontconfig/fc-lang/am.orth,v 1.1 2002/08/08 00:10:50 keithp Exp $
#
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
#
......@@ -26,3 +26,11 @@
# The same as Ethiopic
#
include gez.orth
1238-123f # xe-xWa
1268-126e # ve-vo
1278-127f # ce-cWa
1298-129f # Ne-NWa
12a8 # ea
12e0-12e8 # Ze-ZWa
1300-1307 # je-jWa
1328-132f # Ce-CWa
......@@ -23,19 +23,30 @@
*/
#include "fcint.h"
#include "fccharset.c"
#include "fcstr.c"
/*
* fc-lang
*
* Read a set of language orthographies and build C declarations for
* charsets which can then be used to identify which languages are
* supported by a given font. Note that it would be nice if
* this could be done while compiling the library, but this
* code uses a number of routines from the library. It's
* expediant to just ship the pre-built version along with the
* source orthographies.
* supported by a given font. Note that this uses some utilities
* from the fontconfig library, so the necessary file is simply
* included in this compilation. A couple of extra utility
* functions are also needed in slightly modified form
*/
void
FcMemAlloc (int kind, int size)
{
}
void
FcMemFree (int kind, int size)
{
}
static void
fatal (char *file, int lineno, char *msg)
{
......
This source diff could not be displayed because it is too large. You can view the blob instead.
#
# $XFree86: xc/lib/fontconfig/fc-lang/gez.orth,v 1.1 2002/07/12 07:52:15 keithp Exp $
# $XFree86: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $
#
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
#
......@@ -26,31 +26,34 @@
# Taken from Unicode coverage (1200-137f)
#
# Sylables
1200-1206
1208-1246
1248
124a-124d
1250-1256
1258
125a-125d
1260-1286
1288
128a-128d
1290-12ae
12b0
12b2-12b5
12b8-12be
12c0
12c2-12c5
12c8-12ce
12d0-12d6
12d8-12ee
12f0-130e
1310
1312-1315
1318-131e
1320-1346
1348-135a
1200-1206 # he-ho
1208-1216 # le-Ho, skip HWa
1218-1226 # me-`so, skip `sWa
1228-1230 # re-sWa
1238-1246 # re-qo
1248 # qWe
124a-124d # qWi-qW
1260-1267 # be-bWa
1270-1277 # te-to
1280-1286 # `he-`ho
1288 # hWe
128a-128d # hWi-hW
1290-1297 # ne-nWa
12a0-12a7 # a-o, skip ea
12a8-12ae # ke-ko
12b0 # kWe
12b2-12b5 # kWi-kW
12c8-12ce # we-wo
12d0-12d6 # `e-`o
12d8-12df # ze-zWa
12e8-12ee # ye-yo
12f0-12f7 # de-dWa
1308-130e # ge-go
1310 # gWe
1312-1315 # gWi-gW
1320-1328 # Te-TWa
1330-1346 # Pe-`So
1348-1356 # fe-po, skip pWa, rYa, mYa, fYa
#1361-1368 # punctuation
#1369-1371 # digits
#1372-137c # numbers
......
#
# $XFree86: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $
#
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of Keith Packard not be used in
# advertising or publicity pertaining to distribution of the software without
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Eritrean Tigrinya (TI-ER) Ethiopic Convention
#
# Taken from Unicode coverage (1200-137f)
#
# Sylables
1200-1206 # he-ho
1208-1216 # le-Ho, skip HWa
1218-121f # me-mWa
1228-1230 # re-sWa
1238-1246 # re-qo
1248 # qWe
124a-124d # qWi-qW
1250-1257 # Qe-Qo
1258 # QWe
125a-125d # QWi-QW
1260-126e # be-vo
1270-127f # te-cWa
1290-12a7 # ne-o
12a8-12ae # ke-ko
12b0 # kWe
12b2-12b5 # kWi-kW
12c8-12ce # Ke-Ko
12c0 # KWe
12c2-12c5 # KWi-KW
12c8-12ce # we-wo
12d0-12d6 # `e-`o
12d8-12ee # ze-yo
12f0-12f7 # de-dWa
1300-130e # je-go
1310 # gWe
1312-1315 # gWi-gW
1320-133f # Te-SWa
1348-1356 # fe-po, skip pWa, rYa, mYa, fYa
#
# $XFree86: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $
# $XFree86: xc/lib/fontconfig/fc-lang/ti.orth,v 1.1 2002/08/08 00:10:51 keithp Exp $
#
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
#
......@@ -21,8 +21,13 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Tigrigna (TI)
# Ethiopian Tigrinya (TI-ET) Ethiopic Convention
#
# The same as Ethiopic
#
include gez.orth
include ti_er.orth
1220-1226 # `se-`so
1280-1286 # `he-`ho
1288 # hWe
128a-128d # hWi-hW
1340-1346 # `Se-`So
#
# $XFree86: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $
#
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of Keith Packard not be used in
# advertising or publicity pertaining to distribution of the software without
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Tigre (TIG) Ethiopic Convention
#
# Taken from Unicode coverage (1200-137f)
#
# Sylables
1200-1206 # he-ho
1208-1216 # le-Ho, skip HWa
1218-121f # me-mWa
1228-1230 # re-sWa
1238-1246 # re-qo
1248 # qWe
124a-124d # qWi-qW
1260-126e # be-vo
1270-127f # te-cWa
1290-1297 # ne-nWa
12a0-12a6 # a-o
12a8-12ae # ke-ko
12b0 # kWe
12b2-12b5 # kWi-kW
12c8-12ce # we-wo
12d0-12d6 # `e-`o
12d8-12df # ze-zWa
12e8-12ee # ye-yo
12f0-12f7 # de-dWa
1300-130e # je-go
1310 # gWe
1312-1315 # gWi-gW
1320-133f # Te-SWa
1348-1356 # fe-po, skip pWa, rYa, mYa, fYa
XCOMM $XFree86$
#ifdef UseInstalled
/* building outside the tree, use private defines */
#include "../local.def"
#endif
INCLUDES=$(FREETYPE2INCLUDES) -I..
LOCAL_LIBRARIES=FontconfigClientLibs
DEPLIBS=FontconfigClientDepLibs
SRCS=fc-list.c
OBJS=fc-list.o
ComplexProgramTarget(fc-list)
LinkBuildBinary(ProgramTargetName(fc-list))
#define IncSubdir fontconfig
HEADERS=fcfreetype.h fcprivate.h fontconfig.h
BuildIncludes($(HEADERS),IncSubdir,..)
#if BuildLibraries
InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS))
#endif
#ifdef UseInstalled
/* building outside the tree, use private defines */
#include "../local.def"
#endif
#define LibHeaders NO
FONTCONFIGSRC=.
FC_DEFAULT_FONTS=$(FONTDIR)/Type1
#define DoNormalLib NormalLibFontconfig
#define DoSharedLib SharedLibFontconfig
#define DoExtraLib SharedLibFontconfig
#define DoDebugLib DebugLibFontconfig
#define DoProfileLib ProfileLibFontconfig
#define HasSharedData YES
#define LibName fontconfig
SOFONTCONFIGREV=1.0
#define SoRev SOFONTCONFIGREV
#include <Threads.tmpl>
INCLUDES=$(FREETYPE2INCLUDES) -I..
DEFINES=-DFC_DEFAULT_FONTS='"$(FC_DEFAULT_FONTS)"' -DHAVE_EXPAT
EXPATLIB=-lexpat
REQUIREDLIBS=$(LDPRELIBS) $(FREETYPE2LIB) $(EXPATLIB)
SRCS=fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c fclist.c \
fcmatch.c fcmatrix.c fcname.c fcpat.c fcstr.c fcxml.c
OBJS=fcatomic.o fcblanks.o fccache.o fccfg.o fccharset.o fcdbg.o \
fcdefault.o fcdir.o fcfreetype.o fcfs.o fcinit.o fclang.o fclist.o \
fcmatch.o fcmatrix.o fcname.o fcpat.o fcstr.o fcxml.o
#include <Library.tmpl>
#if DoSharedLib && SharedDataSeparation
SpecialCObjectRule(sharedlib,NullParameter,$(SHLIBDEF))
#endif
MANSUFFIX = $(LIBMANSUFFIX)
InstallManPage(fontconfig,$(LIBMANDIR))
DependTarget()
This diff is collapsed.
This diff is collapsed.
......@@ -435,15 +435,9 @@ FcNameUnparseCharSet (FcStrBuf *buf, const FcCharSet *c);
FcCharSet *
FcNameParseCharSet (FcChar8 *string);
FcChar32
FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map);
FcChar32
FcFreeTypePrivateToUcs4 (FcChar32 private, const FcCharMap *map);
FcCharLeaf *
FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4);
const FcCharMap *
FcFreeTypeGetPrivateMap (FT_Encoding encoding);
/* fcdbg.c */
void
FcValueListPrint (const FcValueList *l);
......@@ -479,6 +473,15 @@ FcFreeTypeIsExclusiveLang (const FcChar8 *lang);
FcBool
FcFreeTypeHasLang (FcPattern *pattern, const FcChar8 *lang);
FcChar32
FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map);
FcChar32
FcFreeTypePrivateToUcs4 (FcChar32 private, const FcCharMap *map);
const FcCharMap *
FcFreeTypeGetPrivateMap (FT_Encoding encoding);
/* fcfs.c */
/* fcgram.y */
int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment