shithub: fnt

Download patch

ref: bae955e0041d1ed9d5f18fe90145f1b12ee0e16e
parent: 535902538a30859f5208f731810b173e1ad2bdd6
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Wed Jul 17 22:55:54 EDT 2024 

cmap subtable format 13


--- a/otf.c.in
+++ b/otf.c.in
@@ -650,8 +650,8 @@
 	PLAT_CUSTOM, /* deprecated, unsupported */
 };
 
-/* supported subtable formats: 4, 6, 10, 12 */
-/* FIXME: need to implement (higher to lower prio): 14, 13 */
+/* supported subtable formats: 4, 6, 10, 12, 13 */
+/* FIXME: need to implement (higher to lower prio): 14 */
 enum {
 	ENC_UNICODE_1_0, /* deprecated, unsupported */
 	ENC_UNICODE_1_1, /* deprecated, unsupported */
@@ -798,6 +798,42 @@
 }
 
 static int
+cmap13rune2glyph(void *aux, Rune r)
+{
+	SubtableCmap12or13 *sc;
+	MapGroup *m;
+	int b, e, x;
+
+	sc = aux;
+	for(b = 0, e = sc->numGroups-1; b <= e; ){
+		x = (b + e)/2;
+		m = sc->groups + x;
+		if(m->endCharCode < r)
+			b = x + 1;
+		else if(m->startCharCode > r)
+			e = x - 1;
+		else
+			return m->startGlyphID;
+	}
+	return -1;
+}
+
+static Rune
+cmap13glyph2rune(void *aux, int g)
+{
+	SubtableCmap12or13 *sc;
+	MapGroup *m;
+	int i;
+
+	sc = aux;
+	for(i = 0, m = sc->groups; i < sc->numGroups; i++, m++){
+		if(g == m->startGlyphID)
+			return m->startCharCode;/* this doesn't make sense for constant mapping */
+	}
+	return NoRune;
+}
+
+static int
 otfcmapUnicode(TableCmap *c, EncodingRecord *er, int *parsed, int *unsupported)
 {
 	SubtableCmap *sc;
@@ -855,8 +891,20 @@
 		break;
 
 	case ENC_UNICODE_FULL:
-		/* FIXME */
-		break;
+		if(sc->format == 13){
+			if(sc->sub12or13.numGroups < 1){
+				werrstr("full: no groups");
+				goto err;
+			}
+			c->mappers[c->numMappers].rune2glyph = cmap13rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap13glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub12or13;
+			(*parsed)++;
+			break;
+		}
+		(*unsupported)++;
+		werrstr("full: fmt %d", sc->format);
+		goto err;
 
 	case ENC_UNICODE_1_0:
 	case ENC_UNICODE_1_1:
--- a/plan9/otf.c
+++ b/plan9/otf.c
@@ -666,8 +666,8 @@
 	PLAT_CUSTOM, /* deprecated, unsupported */
 };
 
-/* supported subtable formats: 4, 6, 10, 12 */
-/* FIXME: need to implement (higher to lower prio): 14, 13 */
+/* supported subtable formats: 4, 6, 10, 12, 13 */
+/* FIXME: need to implement (higher to lower prio): 14 */
 enum {
 	ENC_UNICODE_1_0, /* deprecated, unsupported */
 	ENC_UNICODE_1_1, /* deprecated, unsupported */
@@ -814,6 +814,42 @@
 }
 
 static int
+cmap13rune2glyph(void *aux, Rune r)
+{
+	SubtableCmap12or13 *sc;
+	MapGroup *m;
+	int b, e, x;
+
+	sc = aux;
+	for(b = 0, e = sc->numGroups-1; b <= e; ){
+		x = (b + e)/2;
+		m = sc->groups + x;
+		if(m->endCharCode < r)
+			b = x + 1;
+		else if(m->startCharCode > r)
+			e = x - 1;
+		else
+			return m->startGlyphID;
+	}
+	return -1;
+}
+
+static Rune
+cmap13glyph2rune(void *aux, int g)
+{
+	SubtableCmap12or13 *sc;
+	MapGroup *m;
+	int i;
+
+	sc = aux;
+	for(i = 0, m = sc->groups; i < sc->numGroups; i++, m++){
+		if(g == m->startGlyphID)
+			return m->startCharCode;/* this doesn't make sense for constant mapping */
+	}
+	return NoRune;
+}
+
+static int
 otfcmapUnicode(TableCmap *c, EncodingRecord *er, int *parsed, int *unsupported)
 {
 	SubtableCmap *sc;
@@ -871,8 +907,20 @@
 		break;
 
 	case ENC_UNICODE_FULL:
-		/* FIXME */
-		break;
+		if(sc->format == 13){
+			if(sc->sub12or13.numGroups < 1){
+				werrstr("full: no groups");
+				goto err;
+			}
+			c->mappers[c->numMappers].rune2glyph = cmap13rune2glyph;
+			c->mappers[c->numMappers].glyph2rune = cmap13glyph2rune;
+			c->mappers[c->numMappers++].aux = &sc->sub12or13;
+			(*parsed)++;
+			break;
+		}
+		(*unsupported)++;
+		werrstr("full: fmt %d", sc->format);
+		goto err;
 
 	case ENC_UNICODE_1_0:
 	case ENC_UNICODE_1_1: