shithub: fnt

Download patch

ref: 535902538a30859f5208f731810b173e1ad2bdd6
parent: 83519f11fd26cd605dba45d9ce1fc0f39d467d40
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Wed Jul 17 22:43:25 EDT 2024 

cmap subtable format 6


--- a/otf.c.in
+++ b/otf.c.in
@@ -650,8 +650,8 @@
 	PLAT_CUSTOM, /* deprecated, unsupported */
 };
 
-/* supported subtable formats: 4, 10, 12 */
-/* FIXME: need to implement (higher to lower prio): 6, 14, 13 */
+/* supported subtable formats: 4, 6, 10, 12 */
+/* FIXME: need to implement (higher to lower prio): 14, 13 */
 enum {
 	ENC_UNICODE_1_0, /* deprecated, unsupported */
 	ENC_UNICODE_1_1, /* deprecated, unsupported */
@@ -708,6 +708,31 @@
 {
 	USED(aux); USED(g);
 	/* FIXME - other mapper will hopefully pick up after */
+	return 'x';
+}
+
+static int
+cmap6rune2glyph(void *aux, Rune r)
+{
+	SubtableCmap6 *sc;
+
+	sc = aux;
+	if(r >= sc->firstCode){
+		r -= sc->firstCode;
+		if(r < sc->entryCount)
+			return sc->glyphIdArray[r];
+	}
+	return -1;
+}
+
+static Rune
+cmap6glyph2rune(void *aux, int g)
+{
+	SubtableCmap6 *sc;
+
+	sc = aux;
+	if(g >= 0 && g < sc->entryCount)
+		return (Rune)sc->firstCode + g;
 	return NoRune;
 }
 
@@ -780,16 +805,23 @@
 	sc = er->subtable;
 	switch(er->encodingID){
 	case ENC_UNICODE_2_0_BMP:
-		if(sc->format != 4){
-			(*unsupported)++;
-			werrstr("2.0 bmp: fmt %d", sc->format);
-			goto err;
+		if(sc->format == 4){
+			c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub4;
+			(*parsed)++;
+			break;
 		}
-		c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
-		c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
-		c->mappers[c->numMappers++].aux = &sc->sub4;
-		(*parsed)++;
-		break;
+		if(sc->format == 6){
+			c->mappers[c->numMappers].rune2glyph = cmap6rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap6glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub6;
+			(*parsed)++;
+			break;
+		}
+		(*unsupported)++;
+		werrstr("2.0 bmp: fmt %d", sc->format);
+		goto err;
 
 	case ENC_UNICODE_2_0_FULL: /* this one is good */
 		if(sc->format == 10){
@@ -852,16 +884,23 @@
 	sc = er->subtable;
 	switch(er->encodingID){
 	case ENC_WINDOWS_UNICODE_BMP:
-		if(sc->format != 4){
-			(*unsupported)++;
-			werrstr("unicode bmp: fmt %d", sc->format);
-			goto err;
+		if(sc->format == 4){
+			c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub4;
+			(*parsed)++;
+			break;
 		}
-		c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
-		c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
-		c->mappers[c->numMappers++].aux = &sc->sub4;
-		(*parsed)++;
-		break;
+		if(sc->format == 6){
+			c->mappers[c->numMappers].rune2glyph = cmap6rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap6glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub6;
+			(*parsed)++;
+			break;
+		}
+		(*unsupported)++;
+		werrstr("unicode bmp: fmt %d", sc->format);
+		goto err;
 
 	case ENC_WINDOWS_UNICODE_FULL:
 		if(sc->format != 12){
--- a/plan9/otf.c
+++ b/plan9/otf.c
@@ -666,8 +666,8 @@
 	PLAT_CUSTOM, /* deprecated, unsupported */
 };
 
-/* supported subtable formats: 4, 10, 12 */
-/* FIXME: need to implement (higher to lower prio): 6, 14, 13 */
+/* supported subtable formats: 4, 6, 10, 12 */
+/* FIXME: need to implement (higher to lower prio): 14, 13 */
 enum {
 	ENC_UNICODE_1_0, /* deprecated, unsupported */
 	ENC_UNICODE_1_1, /* deprecated, unsupported */
@@ -724,6 +724,31 @@
 {
 	USED(aux); USED(g);
 	/* FIXME - other mapper will hopefully pick up after */
+	return 'x';
+}
+
+static int
+cmap6rune2glyph(void *aux, Rune r)
+{
+	SubtableCmap6 *sc;
+
+	sc = aux;
+	if(r >= sc->firstCode){
+		r -= sc->firstCode;
+		if(r < sc->entryCount)
+			return sc->glyphIdArray[r];
+	}
+	return -1;
+}
+
+static Rune
+cmap6glyph2rune(void *aux, int g)
+{
+	SubtableCmap6 *sc;
+
+	sc = aux;
+	if(g >= 0 && g < sc->entryCount)
+		return (Rune)sc->firstCode + g;
 	return NoRune;
 }
 
@@ -796,16 +821,23 @@
 	sc = er->subtable;
 	switch(er->encodingID){
 	case ENC_UNICODE_2_0_BMP:
-		if(sc->format != 4){
-			(*unsupported)++;
-			werrstr("2.0 bmp: fmt %d", sc->format);
-			goto err;
+		if(sc->format == 4){
+			c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub4;
+			(*parsed)++;
+			break;
 		}
-		c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
-		c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
-		c->mappers[c->numMappers++].aux = &sc->sub4;
-		(*parsed)++;
-		break;
+		if(sc->format == 6){
+			c->mappers[c->numMappers].rune2glyph = cmap6rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap6glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub6;
+			(*parsed)++;
+			break;
+		}
+		(*unsupported)++;
+		werrstr("2.0 bmp: fmt %d", sc->format);
+		goto err;
 
 	case ENC_UNICODE_2_0_FULL: /* this one is good */
 		if(sc->format == 10){
@@ -868,16 +900,23 @@
 	sc = er->subtable;
 	switch(er->encodingID){
 	case ENC_WINDOWS_UNICODE_BMP:
-		if(sc->format != 4){
-			(*unsupported)++;
-			werrstr("unicode bmp: fmt %d", sc->format);
-			goto err;
+		if(sc->format == 4){
+			c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub4;
+			(*parsed)++;
+			break;
 		}
-		c->mappers[c->numMappers].rune2glyph = cmap4rune2glyph;
-		c->mappers[c->numMappers].glyph2rune = cmap4glyph2rune;
-		c->mappers[c->numMappers++].aux = &sc->sub4;
-		(*parsed)++;
-		break;
+		if(sc->format == 6){
+			c->mappers[c->numMappers].rune2glyph = cmap6rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap6glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub6;
+			(*parsed)++;
+			break;
+		}
+		(*unsupported)++;
+		werrstr("unicode bmp: fmt %d", sc->format);
+		goto err;
 
 	case ENC_WINDOWS_UNICODE_FULL:
 		if(sc->format != 12){