((g)->glyph_id == 0 \
|| ((flag) & (1 << (g)->GlyphClass)) \
|| (((flag) & OTF_MarkAttachmentType) \
- && ((flag) >> 8) == (g)->MarkAttachClass))
+ && (g)->GlyphClass == OTF_GlyphClassMark \
+ && ((flag) >> 8) != (g)->MarkAttachClass))
#define GSTRING_DELETE(gstring, from, len) \
do { \
char *errfmt = "GSTRING%s"; \
\
gstring->size = gstring->used + len; \
- gstring->glyphs = (OTF_Glyph *) realloc (gstring->glyphs, \
- gstring->size); \
+ gstring->glyphs \
+ = (OTF_Glyph *) realloc (gstring->glyphs, \
+ sizeof (OTF_Glyph) * gstring->size); \
if (! gstring->glyphs) \
OTF_ERROR (OTF_ERROR_MEMORY, ""); \
} \
static int
-gstring_subst (OTF_GlyphString *gstring, int from, int to, int flag,
+gstring_subst (OTF *otf, OTF_GlyphString *gstring, int from, int to, int flag,
OTF_GlyphID *ids, int num)
{
int errret = -1;
int len = to - from;
int i;
- int c = gstring->glyphs[from].c;
int from_idx = gstring->glyphs[from].f.index.from;
int to_idx = gstring->glyphs[to - 1].f.index.to;
int non_ignored_idx;
OTF_Glyph temp = *g;
memmove (g, g + 1, sizeof (OTF_Glyph) * (non_ignored_idx - i));
+ temp.f.index.from = from_idx;
+ temp.f.index.to = to_idx;
gstring->glyphs[non_ignored_idx--] = temp;
len--;
}
GSTRING_DELETE (gstring, from, (len - num));
for (i = 0; i < num; i++)
{
- gstring->glyphs[from + i].c = c;
+ gstring->glyphs[from + i].c = otf->cmap->decode_table[ids[i]];
gstring->glyphs[from + i].glyph_id = ids[i];
gstring->glyphs[from + i].f.index.from = from_idx;
gstring->glyphs[from + i].f.index.to = to_idx;
{
char tagname[4];
OTF_Tag tag;
- int negate = 0;
+ int use_it = 1;
if (*features == '*')
{
/* Consume all remaining features. */
- /* We are sure that the last LookupCount elements of
- lookup_indices are free to be used for this work. */
- int *free_table = (lookup_indices + (LookupList->LookupCount
- * FeatureList->FeatureCount));
-
- for (i = 0; i < LookupList->LookupCount; i++)
- free_table[i] = 0;
for (i = 0; i < FeatureList->FeatureCount; i++)
if (! feature_table[i])
{
feature = FeatureList->Feature + i;
for (j = 0; j < feature->LookupCount; j++)
- free_table[feature->LookupListIndex[j]] = 1;
+ lookup_indices[n++] = feature->LookupListIndex[j];
}
- for (i = 0; i < LookupList->LookupCount; i++)
- if (free_table[i])
- lookup_indices[n++] = i;
break;
}
if (*features == '~')
- negate = 1, features++;
+ use_it = -1, features++;
for (i = 0; *features && *features != ','; i++, features++)
tagname[i] = *features;
if (*features)
feature = FeatureList->Feature + i;
if (tag == feature->FeatureTag)
{
- if (! negate)
+ if (feature_table[i])
+ break;
+ if (use_it > 0)
for (j = 0; j < feature->LookupCount; j++)
lookup_indices[n++] = feature->LookupListIndex[j];
- feature_table[i] = 1;
+ feature_table[i] = use_it;
break;
}
}
}
static int
-lookup_gsub (OTF_LookupList *lookup_list, unsigned lookup_list_index,
- OTF_GlyphString *gstring, int gidx)
+lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
+ OTF_GlyphString *gstring, int gidx, int alternate_subst)
{
char *errfmt = "GSUB Looking up%s";
int errret = -1;
subtable = extension1->ExtensionSubtable;
}
+ if (alternate_subst
+ ? (lookup_type != 3 && lookup_type != 5 && lookup_type != 6)
+ : (lookup_type == 3))
+ continue;
+
if (subtable->Coverage.offset)
{
coverage_idx = get_coverage_index (&subtable->Coverage,
break;
case 2:
- {
- OTF_GSUB_Multiple1 *multiple1 = &subtable->u.multiple1;
- OTF_Sequence *seq = multiple1->Sequence + coverage_idx;
+ if (subtable->Format == 1)
+ {
+ OTF_GSUB_Multiple1 *multiple1 = &subtable->u.multiple1;
+ OTF_Sequence *seq = multiple1->Sequence + coverage_idx;
- gstring_subst (gstring, gidx, gidx + 1, flag,
- seq->Substitute, seq->GlyphCount);
- gidx += seq->GlyphCount;
- }
+ gstring_subst (otf, gstring, gidx, gidx + 1, flag,
+ seq->Substitute, seq->GlyphCount);
+ gidx += seq->GlyphCount;
+ }
+ else
+ OTF_ERROR (OTF_ERROR_GSUB_DRIVE, " (invalid SubFormat)");
break;
case 3:
- /* For the moment, we always ignore this feature. */
- break;
if (subtable->Format == 1)
{
OTF_GSUB_Alternate1 *alt1 = &subtable->u.alternate1;
OTF_AlternateSet *altset = alt1->AlternateSet + coverage_idx;
- g->glyph_id = altset->Alternate[0];
- gidx++;
+ gstring_subst (otf, gstring, gidx + 1, gidx + 1, flag,
+ altset->Alternate, altset->GlyphCount);
+ gidx += altset->GlyphCount;;
}
else
OTF_ERROR (OTF_ERROR_GSUB_DRIVE, " (invalid SubFormat)");
lig->CompCount - 1, lig->Component);
if (n < 0)
continue;
- gstring_subst (gstring, gidx, gidx + 1 + n, flag,
+ gstring_subst (otf, gstring, gidx, gidx + 1 + n, flag,
&lig->LigGlyph, 1);
gidx++;
break;
continue;
orig_used = gstring->used;
for (k = 0; k < rule->LookupCount; k++)
- lookup_gsub (lookup_list,
+ lookup_gsub (otf, lookup_list,
rule->LookupRecord[k].LookupListIndex,
gstring,
- gidx + rule->LookupRecord[k].SequenceIndex);
+ gidx + rule->LookupRecord[k].SequenceIndex,
+ alternate_subst);
gidx += rule->GlyphCount + (gstring->used - orig_used);
break;
}
continue;
orig_used = gstring->used;
for (k = 0; k < rule->LookupCount; k++)
- lookup_gsub (lookup_list,
+ lookup_gsub (otf, lookup_list,
rule->LookupRecord[k].LookupListIndex,
gstring,
- gidx + rule->LookupRecord[k].SequenceIndex);
+ gidx + rule->LookupRecord[k].SequenceIndex,
+ alternate_subst);
gidx += rule->GlyphCount + (gstring->used - orig_used);
break;
}
continue;
orig_used = gstring->used;
for (j = 0; j < context3->LookupCount; j++)
- lookup_gsub (lookup_list,
+ lookup_gsub (otf, lookup_list,
context3->LookupRecord[j].LookupListIndex,
gstring,
- gidx + context3->LookupRecord[j].SequenceIndex);
+ gidx + context3->LookupRecord[j].SequenceIndex,
+ alternate_subst);
gidx += context3->GlyphCount + (gstring->used - orig_used);
}
break;
continue;
orig_used = gstring->used;
for (k = 0; k < rule->LookupCount; k++)
- lookup_gsub (lookup_list,
+ lookup_gsub (otf, lookup_list,
rule->LookupRecord[k].LookupListIndex,
gstring,
- gidx + rule->LookupRecord[k].SequenceIndex);
+ gidx + rule->LookupRecord[k].SequenceIndex,
+ alternate_subst);
gidx += rule->InputGlyphCount + (gstring->used - orig_used);
break;
}
continue;
orig_used = gstring->used;
for (k = 0; k < rule->LookupCount; k++)
- lookup_gsub (lookup_list,
+ lookup_gsub (otf, lookup_list,
rule->LookupRecord[k].LookupListIndex,
gstring,
- gidx + rule->LookupRecord[k].SequenceIndex);
+ gidx + rule->LookupRecord[k].SequenceIndex,
+ alternate_subst);
gidx += rule->InputGlyphCount + (gstring->used - orig_used);
break;
}
continue;
orig_used = gstring->used;
for (j = 0; j < context3->LookupCount; j++)
- lookup_gsub (lookup_list,
+ lookup_gsub (otf, lookup_list,
context3->LookupRecord[j].LookupListIndex,
gstring,
- gidx + context3->LookupRecord[j].SequenceIndex);
+ gidx + context3->LookupRecord[j].SequenceIndex,
+ alternate_subst);
gidx += context3->InputGlyphCount + (gstring->used - orig_used);
}
break;
if (subtable->Format == 1)
{
OTF_GPOS_MarkLig1 *mark_lig1 = &subtable->u.mark_lig1;
- unsigned class = g->MarkAttachClass;
OTF_Glyph *ligg;
int coverage_idx_lig;
OTF_MarkRecord *mark_record;
- OTF_ComponentRecord *cmp_record;
OTF_LigatureAttach *attach;
int *num_class = alloca (sizeof (int) * mark_lig1->ClassCount);
int j;
num_class[j] = 0;
for (ligg = g - 1;
- ligg >= gstring->glyphs && IGNORED_GLYPH (ligg, flag);
+ (ligg >= gstring->glyphs
+ && (IGNORED_GLYPH (ligg, flag)
+ || ligg->GlyphClass > OTF_GlyphClassLigature));
ligg--)
if (ligg->positioning_type == 5
&& ligg->MarkAttachClass < mark_lig1->ClassCount)
return 0;
}
-
-int
-OTF_drive_gsub (OTF *otf, OTF_GlyphString *gstring,
- char *script, char *language, char *features)
+static int
+OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
+ char *script, char *language, char *features,
+ int alternate_subst)
{
char *errfmt = "GSUB driving%s";
int errret = -1;
gidx = 0;
while (gidx < gstring->used)
{
- gidx = lookup_gsub (&gsub->LookupList, index, gstring, gidx);
+ gidx = lookup_gsub (otf, &gsub->LookupList, index, gstring, gidx,
+ alternate_subst);
if (gidx < 0)
return errret;
}
gidx = gstring->used - 1;
while (gidx >= 0)
{
- gidx = lookup_gsub (&gsub->LookupList, index, gstring, gidx);
+ gidx = lookup_gsub (otf, &gsub->LookupList, index, gstring, gidx,
+ alternate_subst);
if (gidx < 0)
return errret;
}
}
int
+OTF_drive_gsub (OTF *otf, OTF_GlyphString *gstring,
+ char *script, char *language, char *features)
+{
+ return OTF_drive_gsub_internal (otf, gstring, script, language, features, 0);
+}
+
+int
OTF_drive_gpos (OTF *otf, OTF_GlyphString *gstring,
char *script, char *language, char *features)
{
return -1;
return 0;
}
+
+int
+OTF_drive_gsub_alternate (OTF *otf, OTF_GlyphString *gstring,
+ char *script, char *language, char *features)
+{
+ return OTF_drive_gsub_internal (otf, gstring, script, language, features, 1);
+}
projects / m17n / libotf.git / blobdiff