shithub: fnt

Info  •  Files  •  Log  •  Branches

add "avar" table

--- a/otf.c

+++ b/otf.c

@@ -4400,6 +4400,94 @@

 }

 int

+read_AxisValueMap(Otf *o, AxisValueMap *v)

+{

+	u8int *b;

+	if((b = otfreadn(o, 4)) == nil)

+		goto err;

+	v->fromCoordinate = (b[0]<<8 | b[1]>>14)+(b[0]<<8 | b[1]&((1<<14)-1))/16384.0;

+	v->toCoordinate = (b[2]<<8 | b[3]>>14)+(b[2]<<8 | b[3]&((1<<14)-1))/16384.0;

+	return 0;

+err:

+	werrstr("%s: %r", "AxisValueMap");

+	return -1;

+}

+

+void

+print_AxisValueMap(Biobuf *f, int indent, Otf *o, AxisValueMap *v)

+{

+	Bprint(f, "%*s%s: %g\n", indent, "", "fromCoordinate", v->fromCoordinate);

+	Bprint(f, "%*s%s: %g\n", indent, "", "toCoordinate", v->toCoordinate);

+	USED(o);

+}

+

+int

+read_SegmentMaps(Otf *o, SegmentMaps *v)

+{

+	u8int *b;

+	if((b = otfreadn(o, 2)) == nil)

+		goto err;

+	v->positionMapCount = b[0]<<8 | b[1];

+	if(otfarray(o, &v->axisValueMaps, read_AxisValueMap, sizeof(AxisValueMap), v->positionMapCount) < 0){

+		werrstr("%s: %r", "axisValueMaps");

+		goto err;

+	}

+	return 0;

+err:

+	werrstr("%s: %r", "SegmentMaps");

+	return -1;

+}

+

+void

+print_SegmentMaps(Biobuf *f, int indent, Otf *o, SegmentMaps *v)

+{

+	Bprint(f, "%*s%s: %ud\n", indent, "", "positionMapCount", v->positionMapCount);

+	for(int i = 0; i < v->positionMapCount; i++){

+		Bprint(f, "%*s%s[%d]:\n", indent, "", "axisValueMaps", i);

+		print_AxisValueMap(f, indent+indentΔ, o, &v->axisValueMaps[i]);

+	}

+	USED(o);

+}

+

+int

+read_TableAvar(Otf *o, TableAvar *v)

+{

+	u8int *b;

+	if((b = otfreadn(o, 8)) == nil)

+		goto err;

+	u16int majorVersion = b[0]<<8 | b[1];

+	if(majorVersion != 1){

+		werrstr("%s: invalid value: %d (0x%ux)", "majorVersion", majorVersion, majorVersion);

+		goto err;

+	}

+	u16int minorVersion = b[2]<<8 | b[3];

+	if(minorVersion != 0){

+		werrstr("%s: invalid value: %d (0x%ux)", "minorVersion", minorVersion, minorVersion);

+		goto err;

+	}

+	v->axisCount = b[6]<<8 | b[7];

+	if(otfarray(o, &v->axisSegmentMaps, read_SegmentMaps, sizeof(SegmentMaps), v->axisCount) < 0){

+		werrstr("%s: %r", "axisSegmentMaps");

+		goto err;

+	}

+	return 0;

+err:

+	werrstr("%s: %r", "TableAvar");

+	return -1;

+}

+

+void

+print_TableAvar(Biobuf *f, int indent, Otf *o, TableAvar *v)

+{

+	Bprint(f, "%*s%s: %ud\n", indent, "", "axisCount", v->axisCount);

+	for(int i = 0; i < v->axisCount; i++){

+		Bprint(f, "%*s%s[%d]:\n", indent, "", "axisSegmentMaps", i);

+		print_SegmentMaps(f, indent+indentΔ, o, &v->axisSegmentMaps[i]);

+	}

+	USED(o);

+}

+

+int

 read_TableOS∕2(Otf *o, TableOS∕2 *v)

 {

 	u8int *b;

@@ -4859,6 +4947,17 @@

 				}

 				rec->parsed = v->gvar;

 				rec->print = (void*)print_TableGvar;

+				break;

+			case (u32int)('a'<<24|'v'<<16|'a'<<8|'r'):

+				if(v->avar != nil)

+					break;

+				v->avar = calloc(1, sizeof(TableAvar));

+				if(read_TableAvar(o, v->avar) < 0){

+					free(v->avar);

+					goto err;

+				}

+				rec->parsed = v->avar;

+				rec->print = (void*)print_TableAvar;

 				break;

 			case (u32int)('O'<<24|'S'<<16|'/'<<8|'2'):

 				if(v->os∕2 != nil)

--- a/otf.h

+++ b/otf.h

@@ -109,6 +109,9 @@

 typedef struct GaspRange GaspRange;

 typedef struct TableGasp TableGasp;

 typedef struct TableGvar TableGvar;

+typedef struct AxisValueMap AxisValueMap;

+typedef struct SegmentMaps SegmentMaps;

+typedef struct TableAvar TableAvar;

 typedef struct TableOS∕2 TableOS∕2;

 typedef struct TableRecord TableRecord;

 typedef struct TableDirectory TableDirectory;

@@ -1293,6 +1296,33 @@

 int read_TableGvar(Otf *o, TableGvar *v);

 void print_TableGvar(Biobuf *f, int indent, Otf *o, TableGvar *v);

+struct AxisValueMap {

+	float fromCoordinate;

+	float toCoordinate;

+};

+

+int read_AxisValueMap(Otf *o, AxisValueMap *v);

+void print_AxisValueMap(Biobuf *f, int indent, Otf *o, AxisValueMap *v);

+

+struct SegmentMaps {

+	u16int positionMapCount;

+	AxisValueMap *axisValueMaps;

+};

+

+int read_SegmentMaps(Otf *o, SegmentMaps *v);

+void print_SegmentMaps(Biobuf *f, int indent, Otf *o, SegmentMaps *v);

+

+struct TableAvar {

+	// u16int majorVersion;

+	// u16int minorVersion;

+	// u16int reserved;

+	u16int axisCount;

+	SegmentMaps *axisSegmentMaps;

+};

+

+int read_TableAvar(Otf *o, TableAvar *v);

+void print_TableAvar(Biobuf *f, int indent, Otf *o, TableAvar *v);

+

 struct TableOS∕2 {

 	u16int version;

 	s16int xAvgCharWidth;

@@ -1379,6 +1409,7 @@

 	TableSTAT *stat;

 	TableGasp *gasp;

 	TableGvar *gvar;

+	TableAvar *avar;

 	TableOS∕2 *os∕2;

 };

--- a/otf.rkt

+++ b/otf.rkt

@@ -767,6 +767,18 @@

          #;{Offset16/Offset32 glyphVariationDataOffsets [+ glyphCount 1]} ; FIXME

          #:tag "gvar")

+(mkcmplx AxisValueMap {F2DOT14 fromCoordinate} {F2DOT14 toCoordinate})

+

+(mkcmplx SegmentMaps {uint16 positionMapCount} {AxisValueMap axisValueMaps [positionMapCount]})

+

+(mkcmplx TableAvar

+         {uint16 majorVersion (== 1) unused}

+         {uint16 minorVersion (== 0) unused}

+         {uint16 reserved unused}

+         {uint16 axisCount} ; FIXME validate to be the same as in fvar

+         {SegmentMaps axisSegmentMaps [axisCount]}

+         #:tag "avar")

+

 (mkcmplx TableOS∕2

          {uint16 version (<= 5)}

          {FWORD xAvgCharWidth}