From 8cd71830c2c8dca58e79325f4d7f79b7bfd7de60 Mon Sep 17 00:00:00 2001 From: Blai Pratdesaba Date: Wed, 5 Aug 2015 19:52:42 +0100 Subject: [PATCH 1/2] Generate fontMetricsData as JavaScript --- Makefile | 2 +- metrics/format_json.py | 2 +- src/{fontMetricsData.json => fontMetricsData.js} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/{fontMetricsData.json => fontMetricsData.js} (99%) diff --git a/Makefile b/Makefile index a8276b34c..1d2e3d691 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ PERL=perl PYTHON=$(shell python2 --version >/dev/null 2>&1 && echo python2 || echo python) metrics: - cd metrics && $(PERL) ./mapping.pl | $(PYTHON) ./extract_tfms.py | $(PYTHON) ./extract_ttfs.py | $(PYTHON) ./format_json.py > ../src/fontMetricsData.json + cd metrics && $(PERL) ./mapping.pl | $(PYTHON) ./extract_tfms.py | $(PYTHON) ./extract_ttfs.py | $(PYTHON) ./format_json.py > ../src/fontMetricsData.js clean: rm -rf build/* diff --git a/metrics/format_json.py b/metrics/format_json.py index 2e2dfe610..06f3ad8c7 100644 --- a/metrics/format_json.py +++ b/metrics/format_json.py @@ -4,7 +4,7 @@ import sys import json data = json.load(sys.stdin) -sep = "{\n" +sep = "module.exports = {\n" for font in sorted(data): sys.stdout.write(sep + json.dumps(font)) sep = ": {\n " diff --git a/src/fontMetricsData.json b/src/fontMetricsData.js similarity index 99% rename from src/fontMetricsData.json rename to src/fontMetricsData.js index cdbdaaff4..8995103f1 100644 --- a/src/fontMetricsData.json +++ b/src/fontMetricsData.js @@ -1,4 +1,4 @@ -{ +module.exports = { "AMS-Regular": { "65": {"depth": 0.0, "height": 0.68889, "italic": 0.0, "skew": 0.0}, "66": {"depth": 0.0, "height": 0.68889, "italic": 0.0, "skew": 0.0}, From 236b7925f1844a09f12c623ec4af175d465e160a Mon Sep 17 00:00:00 2001 From: Blai Pratdesaba Date: Thu, 6 Aug 2015 09:17:42 +0100 Subject: [PATCH 2/2] Add missing semicolon at the end of fontMetricsData --- metrics/format_json.py | 2 +- src/fontMetricsData.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metrics/format_json.py b/metrics/format_json.py index 06f3ad8c7..7021a191d 100644 --- a/metrics/format_json.py +++ b/metrics/format_json.py @@ -13,4 +13,4 @@ for font in sorted(data): sys.stdout.write(json.dumps(data[font][glyph], sort_keys=True)) sep = ",\n " sep = "\n},\n" -sys.stdout.write("\n}}\n"); +sys.stdout.write("\n}};\n"); diff --git a/src/fontMetricsData.js b/src/fontMetricsData.js index 8995103f1..e6c9c1a55 100644 --- a/src/fontMetricsData.js +++ b/src/fontMetricsData.js @@ -1748,4 +1748,4 @@ module.exports = { "2018": {"depth": 0.0, "height": 0.61111, "italic": 0.0, "skew": 0.0}, "2019": {"depth": 0.0, "height": 0.61111, "italic": 0.0, "skew": 0.0}, "8242": {"depth": 0.0, "height": 0.61111, "italic": 0.0, "skew": 0.0} -}} +}};