mirror/bedstead
1
0
Fork 1
mirror of https://bjh21.me.uk/bedstead/.git synced 2026-08-05 11:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sort elements of the FeatureIndices array by feature tag

Browse Source 
The OpenType spec (version 1.9.1) says, "The FeatureRecord array
should be sorted alphabetically by feature tag."  Bedstead was instead
emitting them in the order in which they appeared in the gsub_features
array, which was determined by the order the lookups need to occur in.
In particular, the 'cvXX' lookups need to occur after the 'ssXX'
lookups so as to override them properly.

Fixing this required some care to keep all the indices straight, but I
think I've managed it.
This commit is contained in:
Ben Harris 2025-01-29 22:10:40 +00:00
parent 37dafb753a
commit 2cee520a53
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bedstead.c
View File

@ -3875,22 +3875,41 @@ docmap(int pid, int eid, int format)
printf("</cmap_format_%d>\n", format);
}
static int
compare_features_by_tag(const void *va, const void *vb)
{
struct gsub_feature const * const *ap = va, * const *bp = vb;
return namecmp((*ap)->tag, (*bp)->tag);
}
static void
dogsub(void)
{
int i, j;
struct gsub_feature const *sorted[lenof(gsub_features)];
for (i = 0; i < lenof(gsub_features); i++)
sorted[i] = &gsub_features[i];
qsort(sorted, lenof(sorted), sizeof(sorted[0]),
&compare_features_by_tag);
printf("<GSUB>\n");
TTXS("Version", "0x00010000");
printf("<ScriptList>\n");
/*
* The FeatureList should be sorted alphabetically by tag, but
* the LookupList has to be in the order in which the lookups
* should be applied. The FeatureIndices can be in any order
* we like. This requires some care with the indexing.
*/
for (i = 0; i < lenof(gsub_scripts); i++) {
printf("<ScriptRecord>\n");
TTXS("ScriptTag", gsub_scripts[i].tag);
printf("<Script><DefaultLangSys>\n");
TTXI("ReqFeatureIndex", 0xffff); /* No required feature. */
for (j = 0; j < lenof(gsub_features); j++)
if (gsub_features[j].scripts & gsub_scripts[i].flag) {
printf("<!-- %s --> ", gsub_features[j].tag);
for (j = 0; j < lenof(sorted); j++)
if (sorted[j]->scripts & gsub_scripts[i].flag) {
printf("<!-- %s --> ", sorted[j]->tag);
TTXI("FeatureIndex", j);
}
printf("</DefaultLangSys></Script>\n");
@ -3898,34 +3917,37 @@ dogsub(void)
}
printf("</ScriptList>\n");
printf("<FeatureList>\n");
for (i = 0; i < lenof(gsub_features); i++) {
for (i = 0; i < lenof(sorted); i++) {
struct gsub_feature const *feat = sorted[i];
int featidx = (feat - gsub_features);
printf("<FeatureRecord>\n");
TTXS("FeatureTag", gsub_features[i].tag);
TTXS("FeatureTag", feat->tag);
printf("<Feature>\n");
if (gsub_features[i].name != NULL) {
if (gsub_features[i].tag[0] == 's') {
if (feat->name != NULL) {
if (feat->tag[0] == 's') {
printf("<FeatureParamsStylisticSet>\n");
TTXI("Version", 0);
TTXI("UINameID", NAMEBASE_GSUB + i);
TTXI("UINameID", NAMEBASE_GSUB + featidx);
printf("</FeatureParamsStylisticSet>\n");
} else {
int nparam = 0;
while (nparam < MAXSUBNAME &&
gsub_features[i].subnames[nparam])
feat->subnames[nparam])
nparam++;
printf("<FeatureParamsCharacterVariants>\n");
TTXI("Format", 0);
TTXI("FeatUILabelNameID", NAMEBASE_GSUB + i);
TTXI("FeatUILabelNameID",
NAMEBASE_GSUB + featidx);
TTXI("FeatUITooltipTextNameID", 0);
TTXI("SampleTextNameID", 0);
TTXI("NumNamedParameters", nparam);
TTXI("FirstParamUILabelNameID",
NAMEBASE_GSUB_SUB + MAXSUBNAME * i);
NAMEBASE_GSUB_SUB + MAXSUBNAME * featidx);
printf("</FeatureParamsCharacterVariants>\n");
}
}
/* We only have one GSUB lookup per feature, thankfully. */
TTXI("LookupListIndex", i);
TTXI("LookupListIndex", featidx);
printf("</Feature>\n");
printf("</FeatureRecord>\n");
}