walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add letter ranges to speed lang lookups, change CVS tag

This commit is contained in:
Keith Packard 2003-03-05 05:48:53 +00:00
parent 4c2967f626
commit 0eadb052fb
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fc-lang/fc-lang.c
View File

@ -1,7 +1,7 @@
/* /*
* $XFree86: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.3 2002/08/22 07:36:43 keithp Exp $ * $RCSId: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.3 2002/08/22 07:36:43 keithp Exp $
* *
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that
@ -207,6 +207,9 @@ main (int argc, char **argv)
char line[1024]; char line[1024];
FcChar32 map[MAX_LANG_SET_MAP]; FcChar32 map[MAX_LANG_SET_MAP];
int num_lang_set_map; int num_lang_set_map;
int setRangeStart[26];
int setRangeEnd[26];
FcChar8 setRangeChar;
while (*++argv) while (*++argv)
{ {
@ -299,6 +302,21 @@ main (int argc, char **argv)
} }
} }
/*
* Find ranges for each letter for faster searching
*/
setRangeChar = 'a';
for (i = 0; sets[i]; i++)
{
char c = names[i][0];
while (setRangeChar <= c && c <= 'z')
setRangeStart[setRangeChar++ - 'a'] = i;
}
for (setRangeChar = 'a'; setRangeChar < 'z'; setRangeChar++)
setRangeEnd[setRangeChar - 'a'] = setRangeStart[setRangeChar+1-'a'] - 1;
setRangeEnd[setRangeChar - 'a'] = i - 1;
/* /*
* Dump arrays * Dump arrays
*/ */
@ -343,13 +361,16 @@ main (int argc, char **argv)
printf ("};\n\n"); printf ("};\n\n");
} }
printf ("#undef L\n\n"); printf ("#undef L\n\n");
/* /*
* Dump sets * Dump sets
*/ */
printf ("static const FcLangCharSet fcLangCharSets[] = {\n"); printf ("static const FcLangCharSet fcLangCharSets[] = {\n");
for (i = 0; sets[i]; i++) for (i = 0; sets[i]; i++)
{ {
int j = duplicate[i]; int j = duplicate[i];
if (j < 0) if (j < 0)
j = i; j = i;
printf (" { (FcChar8 *) \"%s\",\n" printf (" { (FcChar8 *) \"%s\",\n"
@ -404,6 +425,19 @@ main (int argc, char **argv)
printf ("#define NUM_COUNTRY_SET %d\n", ncountry_ent); printf ("#define NUM_COUNTRY_SET %d\n", ncountry_ent);
} }
/*
* Dump sets start/finish for the fastpath
*/
printf ("static const FcLangCharSetRange fcLangCharSetRanges[] = {\n");
for (setRangeChar = 'a'; setRangeChar <= 'z' ; setRangeChar++)
{
printf (" { %d, %d }, /* %c */\n",
setRangeStart[setRangeChar - 'a'],
setRangeEnd[setRangeChar - 'a'], setRangeChar);
}
printf ("};\n\n");
while (fgets (line, sizeof (line), stdin)) while (fgets (line, sizeof (line), stdin))
fputs (line, stdout); fputs (line, stdout);

4
fc-lang/fc-lang.man
View File

@ -1,5 +1,5 @@
.\" .\"
.\" Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. .\" Copyright © 2002 Keith Packard
.\" .\"
.\" Permission to use, copy, modify, distribute, and sell this software and its .\" Permission to use, copy, modify, distribute, and sell this software and its
.\" documentation for any purpose is hereby granted without fee, provided that .\" documentation for any purpose is hereby granted without fee, provided that
@ -20,7 +20,7 @@
.\" PERFORMANCE OF THIS SOFTWARE. .\" PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.\" .\"
.\" $XFree86: xc/programs/fc-lang/fc-lang.man,v 1.3 2001/02/09 03:47:56 tsi Exp $ .\" $RCSId: xc/programs/fc-lang/fc-lang.man,v 1.3 2001/02/09 03:47:56 tsi Exp $
.\" .\"
.TH FC-LANG 1 __vendorversion__ .TH FC-LANG 1 __vendorversion__
.SH NAME .SH NAME

4
fc-lang/fclang.tmpl.h
View File

@ -1,7 +1,7 @@
/* /*
* $XFree86: xc/lib/fontconfig/fc-lang/fclang.tmpl.h,v 1.1 2002/07/06 23:21:36 keithp Exp $ * $RCSId: xc/lib/fontconfig/fc-lang/fclang.tmpl.h,v 1.1 2002/07/06 23:21:36 keithp Exp $
* *
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that