summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Andersson <rasmus@notion.se>2017-08-28 21:31:42 +0300
committerRasmus Andersson <rasmus@notion.se>2017-08-28 21:31:42 +0300
commitb116f9abdd12876fc4c1bda79957803b1b3e8d6d (patch)
tree2eea89226e94365d41ae8dd196029e207b224fcf
parentca5fe60c999fa94bc0b8c051eeb0f351ed878fed (diff)
downloadinter-b116f9abdd12876fc4c1bda79957803b1b3e8d6d.tar.xz
Website
-rw-r--r--docs/glyphs/glyphs.css79
-rw-r--r--docs/glyphs/glyphs.js122
-rw-r--r--docs/glyphs/index.html4
-rw-r--r--docs/glyphs/metrics.json398
-rw-r--r--docs/index.html2
-rwxr-xr-xmisc/gen-metrics-and-svgs.py8
6 files changed, 169 insertions, 444 deletions
diff --git a/docs/glyphs/glyphs.css b/docs/glyphs/glyphs.css
index 636211aa1..c2af47a2d 100644
--- a/docs/glyphs/glyphs.css
+++ b/docs/glyphs/glyphs.css
@@ -1,5 +1,5 @@
-h1 span.glyph-name {}
-h1 span.glyph-name:before {
+h1 .glyph-name {}
+h1 .glyph-name:before {
content: " / ";
color: rgba(0,0,0,0.2);
font-weight:400;
@@ -52,7 +52,7 @@ body.single #glyphs {
.glyph .names {
position: absolute;
left:20px; right:20px; bottom:6px;
- color:white;
+ color: white;
text-align: center;
font-size:1em;
}
@@ -106,6 +106,10 @@ body.single .intro p {
#single-info {
max-width: 500px;
}
+#single-info a {
+ background-image: none;
+ text-shadow: none;
+}
#single-info ul {
list-style: none;
}
@@ -119,6 +123,9 @@ body.single .intro p {
font-feature-settings: 'case' 1;
padding-left:0.3em;
}
+#single-info .svgFile {
+ font-feature-settings: 'case' 1;
+}
#single-info .colorMark {
display:inline-block;
vertical-align:baseline;
@@ -177,13 +184,17 @@ body.single .row.kerning {
background: white;
}
.kernpair:target, .kernpair.selected {
- background: rgba(250, 240, 0, 0.9);
+ background: rgba(0, 0, 0, 0.9);
+ /*color: white;*/
+}
+.kernpair:target svg path, .kernpair.selected svg path {
+ fill: white;
}
.kernpair:focus {
outline: none;
- box-shadow: 0 0 0 2px rgba(0,0,0,0.4);
+ box-shadow: inset 0 0 0 1px rgba(0,0,0,0.3);
}
- .kernpair .left, .kernpair .right {
+ .kernpair .g.left, .kernpair .g.right {
width:100px;
height:100px;
/*background:rgba(40,240,90,0.3);*/
@@ -191,16 +202,15 @@ body.single .row.kerning {
background-repeat: no-repeat;
opacity:0.8;
}
- .kernpair:hover .left, .kernpair:hover .right {
+ .kernpair:hover .g.left, .kernpair:hover .g.right {
opacity:0.9;
}
- .kernpair.selected .left, .kernpair.selected .right {
+ .kernpair.selected .g.left, .kernpair.selected .g.right {
opacity:1;
}
- /*.kernpair .left { background-color:rgba(120,90,140,0.3); }*/
+ /*.kernpair .g.left { background-color:rgba(120,90,140,0.3); }*/
.kernpair .kern {
position: absolute;
- /*background-color: blue;*/
background-color: rgba(255,0,0,0.1);
right:0; top:0; bottom:0;
z-index:9;
@@ -209,7 +219,7 @@ body.single .row.kerning {
background-color: rgba(36,207,128,0.3);
}
.kernpair:hover .kern, .kernpair.selected .kern {
- background-color: rgba(255,0,0,0.5);
+ background-color: rgba(255,100,100,0.5);
}
.kernpair:hover .kern.pos, .kernpair.selected .kern.pos {
background-color: rgba(36,207,128,0.5);
@@ -219,17 +229,60 @@ body.single .row.kerning {
white-space: nowrap;
opacity:0.9;
height: 20px;
- right:-8px; bottom:-20px;
+ right:-6px; bottom:-20px;
z-index:1;
text-align: center;
color: rgba(255,0,0,0.8);
visibility:hidden;
+ pointer-events: none;
+ font-size:11px;
}
.kernpair .kern.pos .label {
- color: rgba(36,207,128,0.8);
+ color: rgba(1,163,88,0.8);
}
.kernpair:hover .kern .label,
.kernpair.selected .kern .label {
visibility:visible;
}
+ .kernpair .link {
+ display: flex;
+ justify-content: flex-end;
+ position: absolute;
+ /*background: yellow;*/
+ left:0; right:0; bottom:-22px;
+ height: 20px;
+ padding-top:2px;
+ user-select: none;
+ opacity: 0;
+ z-index:0;
+ }
+ .kernpair:hover .link {
+ opacity: 1;
+ }
+ .kernpair .link a {
+ background: none;
+ box-sizing: border-box;
+ color: rgba(0,0,0,0.2);
+ /*border: 1px solid #aaa;*/
+ text-shadow: none;
+ display: block;
+ text-align: center;
+ font-size: 13px;
+ font-weight: 500;
+ width: 16px; /* sync with JS kLinkAWidth */
+ height: 16px;
+ line-height: 14px;
+ padding-top:3px;
+ border-radius: 50%;
+ }
+ .kernpair .link:hover {
+ z-index:999;
+ }
+ .kernpair .link a:hover {
+ color: white;
+ background: #222;
+ }
+ .kernpair.right .link {
+ justify-content: flex-start;
+ }
diff --git a/docs/glyphs/glyphs.js b/docs/glyphs/glyphs.js
index d2212424b..fccd1bce8 100644
--- a/docs/glyphs/glyphs.js
+++ b/docs/glyphs/glyphs.js
@@ -3,8 +3,25 @@ var kSVGScale = 0.1 // how bmuch metrics are scaled in the SVGs
var kGlyphSize = 346 // at kSVGScale. In sync with CSS and SVGs
var kUPM = 2816
+
+function pxround(n) {
+ return Math.round(n * 2) / 2
+}
+
+// forEachElement(selector, fun)
+// forEachElement(parent, selector, fun)
+function eachElement(parent, selector, fun) {
+ if (typeof selector == 'function') {
+ fun = selector
+ selector = parent
+ parent = document
+ }
+ Array.prototype.forEach.call(parent.querySelectorAll(selector), fun)
+}
+
+
if (!isMac) {
- Array.prototype.forEach.call(document.querySelectorAll('kbd'), function(e) {
+ eachElement('kbd', function(e) {
if (e.innerText == '\u2318') {
e.innerText = 'Ctrl'
}
@@ -226,7 +243,9 @@ function updateLocation() {
var h1 = document.querySelector('h1')
if (queryString.g) {
if (!glyphNameEl) {
- glyphNameEl = document.createElement('span')
+ glyphNameEl = document.createElement('a')
+ glyphNameEl.href = '?g=' + encodeURIComponent(queryString.g)
+ wrapIntLink(glyphNameEl)
glyphNameEl.className = 'glyph-name'
}
document.title = queryString.g + ' – ' + baseTitle
@@ -260,8 +279,10 @@ window.onpopstate = function(ev) {
}
function navto(url) {
- history.pushState({}, "Glyphs", url)
- updateLocation()
+ if (location.href != url) {
+ history.pushState({}, "Glyphs", url)
+ updateLocation()
+ }
window.scrollTo(0,0)
}
@@ -497,6 +518,8 @@ function renderSingleInfo(g) {
var unicode = e.querySelector('.unicode')
function configureUnicodeView(el, g) {
+ var a = el.querySelector('a')
+ a.href = "https://codepoints.net/U+" + fmthex(g.unicode, 4)
setv(el, 'unicodeCodePoint', g.unicode ? 'U+' + fmthex(g.unicode, 4) : '–')
setv(el, 'unicodeName', g.unicodeName || '')
}
@@ -553,35 +576,51 @@ function renderSingleInfo(g) {
var cachedSVGDataURIs = {}
-function getSvgDataURI(svg) {
- var cached = cachedSVGDataURIs[svg.id]
+function getSvgDataURI(svg, fill) {
+ if (!fill) {
+ fill = ''
+ }
+ var cached = cachedSVGDataURIs[svg.id + '-' + fill]
if (!cached) {
- cached = 'data:image/svg+xml,' + svg.outerHTML.replace(/[\r\n]+/g, '')
- cachedSVGDataURIs[svg.id] = cached
+ var src = svg.outerHTML.replace(/[\r\n]+/g, '')
+ if (fill) {
+ src = src.replace(/<path /g, '<path fill="' + fill + '" ')
+ }
+ cached = 'data:image/svg+xml,' + src
+ cachedSVGDataURIs[svg.id + '-' + fill] = cached
}
return cached
}
-function pxround(n) {
- return Math.round(n * 2) / 2
-}
-
function selectKerningPair(id, directly) {
- Array.prototype.forEach.call(
- document.querySelectorAll('.kernpair.selected'),
- function(e) {
- e.classList.remove('selected')
- }
- )
+ // deselect existing
+ eachElement('.kernpair.selected', function(kernpair) {
+ eachElement(kernpair, '.g', function (glyph) {
+ var svgURI = getSvgDataURI(svgRepository[glyph.dataset.name])
+ glyph.style.backgroundImage = "url('" + svgURI + "')"
+ })
+ kernpair.classList.remove('selected')
+ })
+
var el = document.getElementById(id)
- if (el) {
- el.classList.add('selected')
- if (!directly) {
- el.scrollIntoViewIfNeeded()
- }
+
+ if (!el) {
+ history.replaceState({}, '', location.search)
+ return
}
+
+ el.classList.add('selected')
+ eachElement(el, '.g', function (glyph) {
+ var svgURI = getSvgDataURI(svgRepository[glyph.dataset.name], 'white')
+ glyph.style.backgroundImage = "url('" + svgURI + "')"
+ })
+
+ if (!directly) {
+ el.scrollIntoViewIfNeeded()
+ }
+
history.replaceState({}, '', location.search + '#' + id)
}
@@ -632,7 +671,8 @@ function renderSingleKerning(g) {
leftMargin = leftMargin * kSVGScale * lilScale
rightMargin = rightMargin * kSVGScale * lilScale
- el.className = side
+ el.dataset.name = glyphName
+ el.className = 'g ' + side
el.style.backgroundImage = "url('" + svgURI + "')"
el.style.backgroundSize = svgWidth + 'px ' + lilGlyphSize + 'px'
el.style.width = svgWidth + 'px'
@@ -653,7 +693,7 @@ function renderSingleKerning(g) {
var otherSvg = svgRepository[glyphName]
var pair = document.createElement('a')
- pair.className = 'kernpair'
+ pair.className = 'kernpair ' + side
pair.title = (
asLeftSide ? selfName + '/' + glyphName + ' ' + kerningValue :
glyphName + '/' + selfName + ' ' + kerningValue
@@ -701,6 +741,34 @@ function renderSingleKerning(g) {
label.innerText = kerningValue
kern.appendChild(label)
+ if (glyphName != selfName) {
+ var link = document.createElement('div')
+ link.className = 'link'
+ var linkA = document.createElement('a')
+ linkA.href = '?g=' + encodeURIComponent(glyphName)
+ linkA.title = 'View ' + glyphName
+ linkA.innerText = '\u2197'
+ linkA.tabIndex = -1
+ wrapIntLink(linkA)
+ link.appendChild(linkA)
+
+ var kLinkAWidth = 16 // sync with CSS .kernpair .link a
+
+ if (asLeftSide) {
+ var rightMetrics = glyphMetrics.metrics[asLeftSide ? glyphName : selfName]
+ linkA.style.marginRight = pxround(
+ ((rightMetrics.advance / 2) * kSVGScale * lilScale) - (kLinkAWidth / 2)
+ ) + 'px'
+ } else {
+ linkA.style.marginLeft = pxround(
+ ((leftMetrics.advance / 2) * kSVGScale * lilScale) - (kLinkAWidth / 2)
+ ) + 'px'
+ }
+
+ pair.appendChild(link)
+ }
+
+
kerningList.appendChild(pair)
})
@@ -710,7 +778,9 @@ function renderSingleKerning(g) {
var selfLeft = mkpairGlyph(g.name, 'left', 0, thisSvgURI)
var selfRight = mkpairGlyph(g.name, 'right', 0, thisSvgURI)
- if (mkpairs(kerningAsLeft, g.name, selfLeft, 'left')) {
+ if (mkpairs(kerningAsLeft, g.name, selfLeft, 'left') &&
+ kerningAsRightKeys.length != 0)
+ {
var div = document.createElement('div')
div.className = 'divider'
kerningList.appendChild(div)
diff --git a/docs/glyphs/index.html b/docs/glyphs/index.html
index 8d8b8b44c..1d7d7646a 100644
--- a/docs/glyphs/index.html
+++ b/docs/glyphs/index.html
@@ -3182,12 +3182,12 @@
<div id="single-info" style="display:none">
<ul>
<li>Glyph name: <span class="name"></span></li>
- <li class="unicode">Unicode: <span class="unicodeCodePoint num"></span> <span class="unicodeName"></span></li>
+ <li class="unicode">Unicode: <a><span class="unicodeCodePoint num"></span> <span class="unicodeName"></span></a></li>
<li>Advance width: <span class="advanceWidth num"></span></li>
<li>Left margin: <span class="marginLeft num"></span></li>
<li>Right margin: <span class="marginRight num"></span></li>
<li>Color mark: <span class="colorMark">&nbsp;</span></li>
- <li><a class="svgFile">Download SVG file</a></li>
+ <li><a class="svgFile">&darr; Download SVG file</a></li>
</ul>
</div>
</div>
diff --git a/docs/glyphs/metrics.json b/docs/glyphs/metrics.json
index 314fa916f..e417d4b7e 100644
--- a/docs/glyphs/metrics.json
+++ b/docs/glyphs/metrics.json
@@ -6339,7 +6339,6 @@
[38,1281,-82],
[513,497,-56],
[3125,964,-27],
-[578,0,-96],
[410,3074,-96],
[412,3074,-96],
[413,3074,-96],
@@ -6584,47 +6583,6 @@
[1283,3077,-180],
[1280,3077,-180],
[1259,3077,-180],
-[0,761,-83],
-[0,1161,-83],
-[0,713,-83],
-[0,1200,-83],
-[0,701,-83],
-[0,886,-83],
-[0,630,-83],
-[0,766,-83],
-[0,1156,-83],
-[0,1136,-83],
-[0,1267,-83],
-[0,842,-83],
-[0,646,-83],
-[0,785,-83],
-[0,768,-83],
-[0,772,-83],
-[0,781,-83],
-[0,1159,-83],
-[0,1139,-83],
-[0,1145,-83],
-[0,1203,-83],
-[0,1153,-83],
-[0,632,-83],
-[0,648,-83],
-[0,645,-83],
-[0,710,-83],
-[0,798,-83],
-[0,769,-83],
-[0,782,-83],
-[0,816,-83],
-[0,770,-83],
-[0,896,-83],
-[0,894,-83],
-[0,897,-83],
-[0,1170,-83],
-[0,1143,-83],
-[0,1167,-83],
-[0,1144,-83],
-[0,895,-83],
-[0,1192,-83],
-[0,888,-83],
[25,761,-83],
[25,1161,-83],
[25,713,-83],
@@ -7173,7 +7131,6 @@
[904,832,-14],
[900,832,-14],
[1411,818,-70],
-[410,0,-205],
[410,25,-205],
[410,4,-205],
[410,13,-205],
@@ -7185,7 +7142,6 @@
[410,5,-205],
[410,32,-205],
[410,12,-205],
-[412,0,-205],
[412,25,-205],
[412,4,-205],
[412,13,-205],
@@ -7197,7 +7153,6 @@
[412,5,-205],
[412,32,-205],
[412,12,-205],
-[413,0,-205],
[413,25,-205],
[413,4,-205],
[413,13,-205],
@@ -7209,7 +7164,6 @@
[413,5,-205],
[413,32,-205],
[413,12,-205],
-[414,0,-205],
[414,25,-205],
[414,4,-205],
[414,13,-205],
@@ -7221,7 +7175,6 @@
[414,5,-205],
[414,32,-205],
[414,12,-205],
-[418,0,-205],
[418,25,-205],
[418,4,-205],
[418,13,-205],
@@ -7235,7 +7188,6 @@
[418,12,-205],
[206,1050,-82],
[73,1050,-82],
-[125,0,-256],
[125,25,-256],
[125,4,-256],
[125,13,-256],
@@ -7285,7 +7237,6 @@
[259,572,-42],
[537,1277,-27],
[537,1284,-27],
-[928,0,-96],
[928,25,-96],
[928,4,-96],
[928,13,-96],
@@ -7297,7 +7248,6 @@
[928,5,-96],
[928,32,-96],
[928,12,-96],
-[926,0,-96],
[926,25,-96],
[926,4,-96],
[926,13,-96],
@@ -7430,7 +7380,6 @@
[1481,1173,-15],
[1037,889,-152],
[1522,951,-40],
-[0,395,-180],
[25,395,-180],
[4,395,-180],
[13,395,-180],
@@ -8668,7 +8617,6 @@
[300,856,28],
[302,856,28],
[301,856,28],
-[475,0,-54],
[475,25,-54],
[475,4,-54],
[475,13,-54],
@@ -8680,7 +8628,6 @@
[475,5,-54],
[475,32,-54],
[475,12,-54],
-[766,0,-54],
[766,25,-54],
[766,4,-54],
[766,13,-54],
@@ -8692,7 +8639,6 @@
[766,5,-54],
[766,32,-54],
[766,12,-54],
-[1156,0,-54],
[1156,25,-54],
[1156,4,-54],
[1156,13,-54],
@@ -8704,7 +8650,6 @@
[1156,5,-54],
[1156,32,-54],
[1156,12,-54],
-[785,0,-54],
[785,25,-54],
[785,4,-54],
[785,13,-54],
@@ -8716,7 +8661,6 @@
[785,5,-54],
[785,32,-54],
[785,12,-54],
-[768,0,-54],
[768,25,-54],
[768,4,-54],
[768,13,-54],
@@ -8728,7 +8672,6 @@
[768,5,-54],
[768,32,-54],
[768,12,-54],
-[772,0,-54],
[772,25,-54],
[772,4,-54],
[772,13,-54],
@@ -8740,7 +8683,6 @@
[772,5,-54],
[772,32,-54],
[772,12,-54],
-[781,0,-54],
[781,25,-54],
[781,4,-54],
[781,13,-54],
@@ -8752,7 +8694,6 @@
[781,5,-54],
[781,32,-54],
[781,12,-54],
-[798,0,-54],
[798,25,-54],
[798,4,-54],
[798,13,-54],
@@ -8764,7 +8705,6 @@
[798,5,-54],
[798,32,-54],
[798,12,-54],
-[769,0,-54],
[769,25,-54],
[769,4,-54],
[769,13,-54],
@@ -8776,7 +8716,6 @@
[769,5,-54],
[769,32,-54],
[769,12,-54],
-[782,0,-54],
[782,25,-54],
[782,4,-54],
[782,13,-54],
@@ -8788,7 +8727,6 @@
[782,5,-54],
[782,32,-54],
[782,12,-54],
-[816,0,-54],
[816,25,-54],
[816,4,-54],
[816,13,-54],
@@ -8800,7 +8738,6 @@
[816,5,-54],
[816,32,-54],
[816,12,-54],
-[770,0,-54],
[770,25,-54],
[770,4,-54],
[770,13,-54],
@@ -8812,7 +8749,6 @@
[770,5,-54],
[770,32,-54],
[770,12,-54],
-[476,0,-54],
[476,25,-54],
[476,4,-54],
[476,13,-54],
@@ -8824,7 +8760,6 @@
[476,5,-54],
[476,32,-54],
[476,12,-54],
-[477,0,-54],
[477,25,-54],
[477,4,-54],
[477,13,-54],
@@ -9655,7 +9590,6 @@
[1259,572,-124],
[927,497,-83],
[929,497,-83],
-[0,1231,-84],
[25,1231,-84],
[4,1231,-84],
[13,1231,-84],
@@ -10336,7 +10270,6 @@
[1129,1348,-40],
[1509,959,-125],
[486,504,-42],
-[3115,0,-28],
[3115,25,-28],
[3115,4,-28],
[3115,13,-28],
@@ -10348,7 +10281,6 @@
[3115,5,-28],
[3115,32,-28],
[3115,12,-28],
-[3117,0,-28],
[3117,25,-28],
[3117,4,-28],
[3117,13,-28],
@@ -10360,7 +10292,6 @@
[3117,5,-28],
[3117,32,-28],
[3117,12,-28],
-[1113,0,-28],
[1113,25,-28],
[1113,4,-28],
[1113,13,-28],
@@ -10372,7 +10303,6 @@
[1113,5,-28],
[1113,32,-28],
[1113,12,-28],
-[1114,0,-28],
[1114,25,-28],
[1114,4,-28],
[1114,13,-28],
@@ -10384,7 +10314,6 @@
[1114,5,-28],
[1114,32,-28],
[1114,12,-28],
-[1117,0,-28],
[1117,25,-28],
[1117,4,-28],
[1117,13,-28],
@@ -11043,7 +10972,6 @@
[302,395,-42],
[301,395,-42],
[479,1421,-41],
-[1390,0,-83],
[1390,25,-83],
[1390,4,-83],
[1390,13,-83],
@@ -11163,8 +11091,6 @@
[2489,489,-56],
[334,186,-207],
[334,187,-207],
-[0,926,-96],
-[0,928,-96],
[25,926,-96],
[25,928,-96],
[4,926,-96],
@@ -11376,19 +11302,6 @@
[131,3,-70],
[215,1231,-164],
[295,540,-166],
-[0,368,-40],
-[0,350,-40],
-[0,366,-40],
-[0,352,-40],
-[0,355,-40],
-[0,358,-40],
-[0,392,-40],
-[0,378,-40],
-[0,353,-40],
-[0,389,-40],
-[0,374,-40],
-[0,381,-40],
-[0,354,-40],
[25,368,-40],
[25,350,-40],
[25,366,-40],
@@ -12196,7 +12109,6 @@
[1259,547,-152],
[1259,1051,-152],
[1259,826,-152],
-[1509,0,-96],
[1509,25,-96],
[1509,4,-96],
[1509,13,-96],
@@ -12256,7 +12168,6 @@
[718,413,-41],
[718,414,-41],
[718,418,-41],
-[1276,0,-220],
[1276,25,-220],
[1276,4,-220],
[1276,13,-220],
@@ -12268,7 +12179,6 @@
[1276,5,-220],
[1276,32,-220],
[1276,12,-220],
-[1285,0,-220],
[1285,25,-220],
[1285,4,-220],
[1285,13,-220],
@@ -12355,7 +12265,6 @@
[95,1231,-14],
[108,1231,-14],
[84,1231,-14],
-[1381,0,-15],
[1381,25,-15],
[1381,4,-15],
[1381,13,-15],
@@ -12451,14 +12360,6 @@
[608,657,-42],
[1216,657,-42],
[604,657,-42],
-[0,1198,-206],
-[0,703,-206],
-[0,1199,-206],
-[0,704,-206],
-[0,1297,-206],
-[0,1469,-206],
-[0,998,-206],
-[0,1129,-206],
[25,1198,-206],
[25,703,-206],
[25,1199,-206],
@@ -12551,7 +12452,6 @@
[832,717,-14],
[1001,717,-14],
[784,717,-14],
-[0,589,-55],
[25,589,-55],
[4,589,-55],
[13,589,-55],
@@ -13882,8 +13782,6 @@
[1231,428,-82],
[1231,432,-82],
[1231,430,-82],
-[0,929,-96],
-[0,927,-96],
[25,929,-96],
[25,927,-96],
[4,929,-96],
@@ -14070,7 +13968,6 @@
[1469,151,110],
[998,151,110],
[1129,151,110],
-[1231,0,-84],
[1231,25,-84],
[1231,4,-84],
[1231,13,-84],
@@ -14804,8 +14701,6 @@
[840,889,-55],
[132,929,-139],
[132,927,-139],
-[0,1278,-371],
-[0,1281,-371],
[25,1278,-371],
[25,1281,-371],
[4,1278,-371],
@@ -15214,11 +15109,6 @@
[1509,1280,54],
[1509,1259,54],
[132,875,-192],
-[0,3062,-192],
-[0,3064,-192],
-[0,3068,-192],
-[0,3063,-192],
-[0,3065,-192],
[25,3062,-192],
[25,3064,-192],
[25,3068,-192],
@@ -15364,7 +15254,6 @@
[929,511,-138],
[928,875,-68],
[926,875,-68],
-[368,0,-219],
[368,25,-219],
[368,4,-219],
[368,13,-219],
@@ -15566,7 +15455,6 @@
[571,875,-123],
[577,875,-123],
[718,875,-123],
-[1366,0,-304],
[1366,25,-304],
[1366,4,-304],
[1366,13,-304],
@@ -15673,21 +15561,6 @@
[923,1421,-69],
[332,3074,-164],
[335,3074,-164],
-[0,475,-15],
-[0,441,-15],
-[0,533,-15],
-[0,444,-15],
-[0,454,-15],
-[0,582,-15],
-[0,470,-15],
-[0,550,-15],
-[0,551,-15],
-[0,539,-15],
-[0,445,-15],
-[0,544,-15],
-[0,476,-15],
-[0,452,-15],
-[0,477,-15],
[25,475,-15],
[25,441,-15],
[25,533,-15],
@@ -15947,12 +15820,6 @@
[368,3110,-164],
[368,3107,-164],
[344,395,-138],
-[0,1126,-139],
-[0,924,-139],
-[0,1251,-139],
-[0,547,-139],
-[0,1051,-139],
-[0,826,-139],
[25,1126,-139],
[25,924,-139],
[25,1251,-139],
@@ -16146,7 +16013,6 @@
[132,722,-357],
[132,1379,-357],
[132,1237,-357],
-[1161,0,-82],
[1161,25,-82],
[1161,4,-82],
[1161,13,-82],
@@ -16239,8 +16105,6 @@
[206,1302,-42],
[73,1302,-42],
[498,509,-27],
-[0,332,-233],
-[0,335,-233],
[25,332,-233],
[25,335,-233],
[4,332,-233],
@@ -16492,7 +16356,6 @@
[503,964,56],
[500,964,56],
[486,964,-29],
-[399,0,-151],
[399,25,-151],
[399,4,-151],
[399,13,-151],
@@ -16504,7 +16367,6 @@
[399,5,-151],
[399,32,-151],
[399,12,-151],
-[401,0,-151],
[401,25,-151],
[401,4,-151],
[401,13,-151],
@@ -16516,7 +16378,6 @@
[401,5,-151],
[401,32,-151],
[401,12,-151],
-[405,0,-151],
[405,25,-151],
[405,4,-151],
[405,13,-151],
@@ -16528,7 +16389,6 @@
[405,5,-151],
[405,32,-151],
[405,12,-151],
-[400,0,-151],
[400,25,-151],
[400,4,-151],
[400,13,-151],
@@ -16540,7 +16400,6 @@
[400,5,-151],
[400,32,-151],
[400,12,-151],
-[402,0,-151],
[402,25,-151],
[402,4,-151],
[402,13,-151],
@@ -16745,7 +16604,6 @@
[1108,1281,-123],
[452,1278,-123],
[452,1281,-123],
-[45,0,-54],
[45,25,-54],
[45,4,-54],
[45,13,-54],
@@ -16757,7 +16615,6 @@
[45,5,-54],
[45,32,-54],
[45,12,-54],
-[50,0,-54],
[50,25,-54],
[50,4,-54],
[50,13,-54],
@@ -16769,7 +16626,6 @@
[50,5,-54],
[50,32,-54],
[50,12,-54],
-[48,0,-54],
[48,25,-54],
[48,4,-54],
[48,13,-54],
@@ -16781,7 +16637,6 @@
[48,5,-54],
[48,32,-54],
[48,12,-54],
-[52,0,-54],
[52,25,-54],
[52,4,-54],
[52,13,-54],
@@ -16793,7 +16648,6 @@
[52,5,-54],
[52,32,-54],
[52,12,-54],
-[49,0,-54],
[49,25,-54],
[49,4,-54],
[49,13,-54],
@@ -16891,7 +16745,6 @@
[1283,657,-55],
[1280,657,-55],
[1259,657,-55],
-[1198,0,-205],
[1198,25,-205],
[1198,4,-205],
[1198,13,-205],
@@ -16903,7 +16756,6 @@
[1198,5,-205],
[1198,32,-205],
[1198,12,-205],
-[703,0,-205],
[703,25,-205],
[703,4,-205],
[703,13,-205],
@@ -16915,7 +16767,6 @@
[703,5,-205],
[703,32,-205],
[703,12,-205],
-[1199,0,-205],
[1199,25,-205],
[1199,4,-205],
[1199,13,-205],
@@ -16927,7 +16778,6 @@
[1199,5,-205],
[1199,32,-205],
[1199,12,-205],
-[704,0,-205],
[704,25,-205],
[704,4,-205],
[704,13,-205],
@@ -16939,7 +16789,6 @@
[704,5,-205],
[704,32,-205],
[704,12,-205],
-[1297,0,-205],
[1297,25,-205],
[1297,4,-205],
[1297,13,-205],
@@ -16951,7 +16800,6 @@
[1297,5,-205],
[1297,32,-205],
[1297,12,-205],
-[1469,0,-205],
[1469,25,-205],
[1469,4,-205],
[1469,13,-205],
@@ -16963,7 +16811,6 @@
[1469,5,-205],
[1469,32,-205],
[1469,12,-205],
-[998,0,-205],
[998,25,-205],
[998,4,-205],
[998,13,-205],
@@ -16975,7 +16822,6 @@
[998,5,-205],
[998,32,-205],
[998,12,-205],
-[1129,0,-205],
[1129,25,-205],
[1129,4,-205],
[1129,13,-205],
@@ -17145,7 +16991,6 @@
[207,1278,-234],
[207,1281,-234],
[598,818,-6],
-[1286,0,-109],
[1286,25,-109],
[1286,4,-109],
[1286,13,-109],
@@ -17157,7 +17002,6 @@
[1286,5,-109],
[1286,32,-109],
[1286,12,-109],
-[1287,0,-109],
[1287,25,-109],
[1287,4,-109],
[1287,13,-109],
@@ -17169,7 +17013,6 @@
[1287,5,-109],
[1287,32,-109],
[1287,12,-109],
-[1290,0,-109],
[1290,25,-109],
[1290,4,-109],
[1290,13,-109],
@@ -17181,7 +17024,6 @@
[1290,5,-109],
[1290,32,-109],
[1290,12,-109],
-[1289,0,-109],
[1289,25,-109],
[1289,4,-109],
[1289,13,-109],
@@ -17373,7 +17215,6 @@
[1509,572,-40],
[1366,1366,55],
[1037,875,-69],
-[0,1101,-82],
[25,1101,-82],
[4,1101,-82],
[13,1101,-82],
@@ -17492,7 +17333,6 @@
[571,117,96],
[577,117,96],
[718,117,96],
-[259,0,-96],
[259,25,-96],
[259,4,-96],
[259,13,-96],
@@ -17520,7 +17360,6 @@
[1355,406,-40],
[1350,406,-40],
[1348,406,-40],
-[787,0,-15],
[787,25,-15],
[787,4,-15],
[787,13,-15],
@@ -17532,7 +17371,6 @@
[787,5,-15],
[787,32,-15],
[787,12,-15],
-[1435,0,-15],
[1435,25,-15],
[1435,4,-15],
[1435,13,-15],
@@ -17815,7 +17653,6 @@
[1348,1522,-41],
[1413,1231,28],
[1509,580,-40],
-[0,578,-96],
[1283,1378,-179],
[1283,722,-179],
[1283,1379,-179],
@@ -17908,7 +17745,6 @@
[722,1366,-83],
[1237,1366,-83],
[1302,1366,-83],
-[1343,0,-29],
[1343,25,-29],
[1343,4,-29],
[1343,13,-29],
@@ -17920,7 +17756,6 @@
[1343,5,-29],
[1343,32,-29],
[1343,12,-29],
-[1345,0,-29],
[1345,25,-29],
[1345,4,-29],
[1345,13,-29],
@@ -17932,7 +17767,6 @@
[1345,5,-29],
[1345,32,-29],
[1345,12,-29],
-[1355,0,-29],
[1355,25,-29],
[1355,4,-29],
[1355,13,-29],
@@ -17944,7 +17778,6 @@
[1355,5,-29],
[1355,32,-29],
[1355,12,-29],
-[1350,0,-29],
[1350,25,-29],
[1350,4,-29],
[1350,13,-29],
@@ -17956,7 +17789,6 @@
[1350,5,-29],
[1350,32,-29],
[1350,12,-29],
-[1348,0,-29],
[1348,25,-29],
[1348,4,-29],
[1348,13,-29],
@@ -18650,7 +18482,6 @@
[3090,452,-56],
[3090,477,-56],
[1230,1114,-144],
-[956,0,-40],
[956,25,-40],
[956,4,-40],
[956,13,-40],
@@ -18662,7 +18493,6 @@
[956,5,-40],
[956,32,-40],
[956,12,-40],
-[1249,0,-40],
[1249,25,-40],
[1249,4,-40],
[1249,13,-40],
@@ -18674,7 +18504,6 @@
[1249,5,-40],
[1249,32,-40],
[1249,12,-40],
-[740,0,-40],
[740,25,-40],
[740,4,-40],
[740,13,-40],
@@ -18686,7 +18515,6 @@
[740,5,-40],
[740,32,-40],
[740,12,-40],
-[1090,0,-40],
[1090,25,-40],
[1090,4,-40],
[1090,13,-40],
@@ -18831,12 +18659,6 @@
[1192,418,-233],
[1276,787,-40],
[1285,787,-40],
-[0,3080,-192],
-[0,3053,-192],
-[0,3081,-192],
-[0,3084,-192],
-[0,3083,-192],
-[0,3090,-192],
[25,3080,-192],
[25,3053,-192],
[25,3081,-192],
@@ -19149,7 +18971,6 @@
[405,589,54],
[400,589,54],
[402,589,54],
-[0,867,-14],
[25,867,-14],
[4,867,-14],
[13,867,-14],
@@ -19330,11 +19151,6 @@
[876,1129,-13],
[1481,926,-68],
[1481,928,-68],
-[0,410,-207],
-[0,412,-207],
-[0,413,-207],
-[0,414,-207],
-[0,418,-207],
[25,410,-207],
[25,412,-207],
[25,413,-207],
@@ -20047,7 +19863,6 @@
[818,722,-13],
[818,1379,-13],
[818,1237,-13],
-[395,0,-178],
[395,25,-178],
[395,4,-178],
[395,13,-178],
@@ -20451,7 +20266,6 @@
[740,511,-304],
[1090,520,-304],
[1090,511,-304],
-[571,0,-221],
[571,25,-221],
[571,4,-221],
[571,13,-221],
@@ -20463,7 +20277,6 @@
[571,5,-221],
[571,32,-221],
[571,12,-221],
-[577,0,-221],
[577,25,-221],
[577,4,-221],
[577,13,-221],
@@ -20475,7 +20288,6 @@
[577,5,-221],
[577,32,-221],
[577,12,-221],
-[718,0,-221],
[718,25,-221],
[718,4,-221],
[718,13,-221],
@@ -20628,8 +20440,6 @@
[498,486,-13],
[330,342,-111],
[330,292,-111],
-[0,1276,-221],
-[0,1285,-221],
[25,1276,-221],
[25,1285,-221],
[4,1276,-221],
@@ -20734,7 +20544,6 @@
[335,674,-109],
[335,675,-109],
[335,1364,-109],
-[1251,0,-139],
[1251,25,-139],
[1251,4,-139],
[1251,13,-139],
@@ -20746,7 +20555,6 @@
[1251,5,-139],
[1251,32,-139],
[1251,12,-139],
-[924,0,-139],
[924,25,-139],
[924,4,-139],
[924,13,-139],
@@ -20758,7 +20566,6 @@
[924,5,-139],
[924,32,-139],
[924,12,-139],
-[1126,0,-139],
[1126,25,-139],
[1126,4,-139],
[1126,13,-139],
@@ -20770,7 +20577,6 @@
[1126,5,-139],
[1126,32,-139],
[1126,12,-139],
-[1051,0,-139],
[1051,25,-139],
[1051,4,-139],
[1051,13,-139],
@@ -20782,7 +20588,6 @@
[1051,5,-139],
[1051,32,-139],
[1051,12,-139],
-[547,0,-139],
[547,25,-139],
[547,4,-139],
[547,13,-139],
@@ -20794,7 +20599,6 @@
[547,5,-139],
[547,32,-139],
[547,12,-139],
-[826,0,-139],
[826,25,-139],
[826,4,-139],
[826,13,-139],
@@ -21097,7 +20901,6 @@
[3039,1281,-111],
[1494,1278,-111],
[1494,1281,-111],
-[3080,0,-192],
[3080,25,-192],
[3080,4,-192],
[3080,13,-192],
@@ -21109,7 +20912,6 @@
[3080,5,-192],
[3080,32,-192],
[3080,12,-192],
-[3053,0,-192],
[3053,25,-192],
[3053,4,-192],
[3053,13,-192],
@@ -21121,7 +20923,6 @@
[3053,5,-192],
[3053,32,-192],
[3053,12,-192],
-[3081,0,-192],
[3081,25,-192],
[3081,4,-192],
[3081,13,-192],
@@ -21133,7 +20934,6 @@
[3081,5,-192],
[3081,32,-192],
[3081,12,-192],
-[3084,0,-192],
[3084,25,-192],
[3084,4,-192],
[3084,13,-192],
@@ -21145,7 +20945,6 @@
[3084,5,-192],
[3084,32,-192],
[3084,12,-192],
-[3083,0,-192],
[3083,25,-192],
[3083,4,-192],
[3083,13,-192],
@@ -21157,7 +20956,6 @@
[3083,5,-192],
[3083,32,-192],
[3083,12,-192],
-[3090,0,-192],
[3090,25,-192],
[3090,4,-192],
[3090,13,-192],
@@ -21198,7 +20996,6 @@
[1378,1249,-54],
[1378,1090,-54],
[1378,740,-54],
-[79,0,-28],
[79,25,-28],
[79,4,-28],
[79,13,-28],
@@ -21210,7 +21007,6 @@
[79,5,-28],
[79,32,-28],
[79,12,-28],
-[761,0,-28],
[761,25,-28],
[761,4,-28],
[761,13,-28],
@@ -21222,7 +21018,6 @@
[761,5,-28],
[761,32,-28],
[761,12,-28],
-[3104,0,-28],
[3104,25,-28],
[3104,4,-28],
[3104,13,-28],
@@ -21234,7 +21029,6 @@
[3104,5,-28],
[3104,32,-28],
[3104,12,-28],
-[3105,0,-28],
[3105,25,-28],
[3105,4,-28],
[3105,13,-28],
@@ -21246,7 +21040,6 @@
[3105,5,-28],
[3105,32,-28],
[3105,12,-28],
-[3110,0,-28],
[3110,25,-28],
[3110,4,-28],
[3110,13,-28],
@@ -21258,7 +21051,6 @@
[3110,5,-28],
[3110,32,-28],
[3110,12,-28],
-[3107,0,-28],
[3107,25,-28],
[3107,4,-28],
[3107,13,-28],
@@ -21612,7 +21404,6 @@
[589,3084,-137],
[589,3083,-137],
[589,3090,-137],
-[927,0,-96],
[927,25,-96],
[927,4,-96],
[927,13,-96],
@@ -21624,7 +21415,6 @@
[927,5,-96],
[927,32,-96],
[927,12,-96],
-[929,0,-96],
[929,25,-96],
[929,4,-96],
[929,13,-96],
@@ -21691,7 +21481,6 @@
[1259,1381,-123],
[1259,1382,-123],
[1259,1385,-123],
-[3074,0,-14],
[3074,25,-14],
[3074,4,-14],
[3074,13,-14],
@@ -22013,9 +21802,6 @@
[537,1283,84],
[537,1280,84],
[537,1259,84],
-[0,1283,-276],
-[0,1280,-276],
-[0,1259,-276],
[25,1283,-276],
[25,1280,-276],
[25,1259,-276],
@@ -22087,19 +21873,6 @@
[826,3083,-111],
[826,3090,-111],
[598,1181,-70],
-[0,1509,-68],
-[0,1490,-68],
-[0,1507,-68],
-[0,1491,-68],
-[0,1495,-68],
-[0,1499,-68],
-[0,3050,-68],
-[0,1519,-68],
-[0,1493,-68],
-[0,3046,-68],
-[0,1515,-68],
-[0,3039,-68],
-[0,1494,-68],
[25,1509,-68],
[25,1490,-68],
[25,1507,-68],
@@ -22282,7 +22055,6 @@
[1414,1280,56],
[1414,1259,56],
[3074,395,-40],
-[334,0,-151],
[334,25,-151],
[334,4,-151],
[334,13,-151],
@@ -22677,11 +22449,6 @@
[1366,1229,-343],
[1366,1230,-343],
[1161,1063,-41],
-[0,3115,-27],
-[0,3117,-27],
-[0,1381,-27],
-[0,1382,-27],
-[0,1385,-27],
[25,3115,-27],
[25,3117,-27],
[25,1381,-27],
@@ -22796,21 +22563,6 @@
[368,580,-109],
[368,3074,-139],
[889,1390,-96],
-[0,882,-249],
-[0,1373,-249],
-[0,1488,-249],
-[0,1388,-249],
-[0,792,-249],
-[0,1190,-249],
-[0,1095,-249],
-[0,1223,-249],
-[0,829,-249],
-[0,1256,-249],
-[0,1219,-249],
-[0,873,-249],
-[0,3120,-249],
-[0,1120,-249],
-[0,1441,-249],
[25,882,-249],
[25,1373,-249],
[25,1488,-249],
@@ -22977,7 +22729,6 @@
[12,1120,-249],
[12,1441,-249],
[889,840,-42],
-[0,1273,-166],
[25,1273,-166],
[4,1273,-166],
[13,1273,-166],
@@ -22995,9 +22746,6 @@
[132,1249,-205],
[132,1090,-205],
[132,740,-205],
-[0,571,-220],
-[0,577,-220],
-[0,718,-220],
[25,571,-220],
[25,577,-220],
[25,718,-220],
@@ -23088,7 +22836,6 @@
[537,1441,125],
[674,1366,-40],
[1364,1366,-40],
-[856,0,-96],
[856,25,-96],
[856,4,-96],
[856,13,-96],
@@ -23107,7 +22854,6 @@
[904,1390,-70],
[900,1390,-70],
[1381,406,-13],
-[344,0,-111],
[344,25,-111],
[344,4,-111],
[344,13,-111],
@@ -23692,32 +23438,6 @@
[3065,1222,-82],
[3065,1118,-82],
[1509,543,41],
-[0,259,-96],
-[0,238,-96],
-[0,282,-96],
-[0,45,-96],
-[0,129,-96],
-[0,236,-96],
-[0,297,-96],
-[0,50,-96],
-[0,257,-96],
-[0,241,-96],
-[0,247,-96],
-[0,285,-96],
-[0,254,-96],
-[0,48,-96],
-[0,52,-96],
-[0,49,-96],
-[0,137,-96],
-[0,135,-96],
-[0,138,-96],
-[0,267,-96],
-[0,245,-96],
-[0,265,-96],
-[0,246,-96],
-[0,136,-96],
-[0,277,-96],
-[0,131,-96],
[25,259,-96],
[25,238,-96],
[25,282,-96],
@@ -24082,7 +23802,6 @@
[990,875,-55],
[710,787,40],
[1043,787,40],
-[186,0,-41],
[186,25,-41],
[186,4,-41],
[186,13,-41],
@@ -24094,7 +23813,6 @@
[186,5,-41],
[186,32,-41],
[186,12,-41],
-[350,0,-41],
[350,25,-41],
[350,4,-41],
[350,13,-41],
@@ -24106,7 +23824,6 @@
[350,5,-41],
[350,32,-41],
[350,12,-41],
-[366,0,-41],
[366,25,-41],
[366,4,-41],
[366,13,-41],
@@ -24118,7 +23835,6 @@
[366,5,-41],
[366,32,-41],
[366,12,-41],
-[352,0,-41],
[352,25,-41],
[352,4,-41],
[352,13,-41],
@@ -24130,7 +23846,6 @@
[352,5,-41],
[352,32,-41],
[352,12,-41],
-[355,0,-41],
[355,25,-41],
[355,4,-41],
[355,13,-41],
@@ -24142,7 +23857,6 @@
[355,5,-41],
[355,32,-41],
[355,12,-41],
-[358,0,-41],
[358,25,-41],
[358,4,-41],
[358,13,-41],
@@ -24154,7 +23868,6 @@
[358,5,-41],
[358,32,-41],
[358,12,-41],
-[187,0,-41],
[187,25,-41],
[187,4,-41],
[187,13,-41],
@@ -24166,7 +23879,6 @@
[187,5,-41],
[187,32,-41],
[187,12,-41],
-[392,0,-41],
[392,25,-41],
[392,4,-41],
[392,13,-41],
@@ -24178,7 +23890,6 @@
[392,5,-41],
[392,32,-41],
[392,12,-41],
-[378,0,-41],
[378,25,-41],
[378,4,-41],
[378,13,-41],
@@ -24190,7 +23901,6 @@
[378,5,-41],
[378,32,-41],
[378,12,-41],
-[353,0,-41],
[353,25,-41],
[353,4,-41],
[353,13,-41],
@@ -24202,7 +23912,6 @@
[353,5,-41],
[353,32,-41],
[353,12,-41],
-[389,0,-41],
[389,25,-41],
[389,4,-41],
[389,13,-41],
@@ -24214,7 +23923,6 @@
[389,5,-41],
[389,32,-41],
[389,12,-41],
-[374,0,-41],
[374,25,-41],
[374,4,-41],
[374,13,-41],
@@ -24226,7 +23934,6 @@
[374,5,-41],
[374,32,-41],
[374,12,-41],
-[381,0,-41],
[381,25,-41],
[381,4,-41],
[381,13,-41],
@@ -24238,7 +23945,6 @@
[381,5,-41],
[381,32,-41],
[381,12,-41],
-[354,0,-41],
[354,25,-41],
[354,4,-41],
[354,13,-41],
@@ -24554,7 +24260,6 @@
[406,826,-137],
[1277,501,-166],
[1284,501,-166],
-[630,0,-40],
[630,25,-40],
[630,4,-40],
[630,13,-40],
@@ -24566,7 +24271,6 @@
[630,5,-40],
[630,32,-40],
[630,12,-40],
-[646,0,-40],
[646,25,-40],
[646,4,-40],
[646,13,-40],
@@ -24578,7 +24282,6 @@
[646,5,-40],
[646,32,-40],
[646,12,-40],
-[632,0,-40],
[632,25,-40],
[632,4,-40],
[632,13,-40],
@@ -24590,7 +24293,6 @@
[632,5,-40],
[632,32,-40],
[632,12,-40],
-[648,0,-40],
[648,25,-40],
[648,4,-40],
[648,13,-40],
@@ -24602,7 +24304,6 @@
[648,5,-40],
[648,32,-40],
[648,12,-40],
-[645,0,-40],
[645,25,-40],
[645,4,-40],
[645,13,-40],
@@ -24655,7 +24356,6 @@
[3039,335,-221],
[1494,332,-221],
[1494,335,-221],
-[0,1063,-55],
[25,1063,-55],
[4,1063,-55],
[13,1063,-55],
@@ -25341,7 +25041,6 @@
[875,332,-41],
[875,335,-41],
[1428,1522,-40],
-[0,334,-151],
[25,334,-151],
[4,334,-151],
[13,334,-151],
@@ -25493,7 +25192,6 @@
[418,1364,-165],
[215,332,-261],
[215,335,-261],
-[1278,0,-275],
[1278,25,-275],
[1278,4,-275],
[1278,13,-275],
@@ -25505,7 +25203,6 @@
[1278,5,-275],
[1278,32,-275],
[1278,12,-275],
-[1281,0,-275],
[1281,25,-275],
[1281,4,-275],
[1281,13,-275],
@@ -25533,7 +25230,6 @@
[1259,3063,-68],
[1259,3065,-68],
[497,485,-69],
-[288,0,-125],
[288,25,-125],
[288,4,-125],
[288,13,-125],
@@ -25751,10 +25447,6 @@
[1192,406,-83],
[1509,1273,83],
[1522,990,-54],
-[0,3104,-29],
-[0,3105,-29],
-[0,3110,-29],
-[0,3107,-29],
[25,3104,-29],
[25,3105,-29],
[25,3110,-29],
@@ -25912,11 +25604,6 @@
[368,679,-247],
[368,1229,-247],
[368,1230,-247],
-[0,1343,-27],
-[0,1345,-27],
-[0,1355,-27],
-[0,1350,-27],
-[0,1348,-27],
[25,1343,-27],
[25,1345,-27],
[25,1355,-27],
@@ -26095,8 +25782,6 @@
[1509,1406,42],
[1509,1414,42],
[2489,1390,-111],
-[0,1406,-84],
-[0,1414,-84],
[25,1406,-84],
[25,1414,-84],
[4,1406,-84],
@@ -26314,7 +25999,6 @@
[374,1390,-137],
[381,1390,-137],
[354,1390,-137],
-[332,0,-234],
[332,25,-234],
[332,4,-234],
[332,13,-234],
@@ -26326,7 +26010,6 @@
[332,5,-234],
[332,32,-234],
[332,12,-234],
-[335,0,-234],
[335,25,-234],
[335,4,-234],
[335,13,-234],
@@ -26719,7 +26402,6 @@
[923,518,-84],
[923,489,-84],
[520,3125,-28],
-[0,856,-42],
[25,856,-42],
[4,856,-42],
[13,856,-42],
@@ -27297,7 +26979,6 @@
[506,1424,-42],
[518,1424,-42],
[537,3123,-20],
-[923,0,-82],
[923,25,-82],
[923,4,-82],
[923,13,-82],
@@ -27315,7 +26996,6 @@
[1411,1283,54],
[1411,1280,54],
[1411,1259,54],
-[0,787,-29],
[25,787,-29],
[4,787,-29],
[13,787,-29],
@@ -27564,7 +27244,6 @@
[482,717,68],
[503,717,68],
[500,717,68],
-[1273,0,-165],
[1273,25,-165],
[1273,4,-165],
[1273,13,-165],
@@ -28379,7 +28058,6 @@
[1366,717,-68],
[1378,875,-54],
[295,537,-84],
-[882,0,-247],
[882,25,-247],
[882,4,-247],
[882,13,-247],
@@ -28391,7 +28069,6 @@
[882,5,-247],
[882,32,-247],
[882,12,-247],
-[1373,0,-247],
[1373,25,-247],
[1373,4,-247],
[1373,13,-247],
@@ -28403,7 +28080,6 @@
[1373,5,-247],
[1373,32,-247],
[1373,12,-247],
-[1488,0,-247],
[1488,25,-247],
[1488,4,-247],
[1488,13,-247],
@@ -28415,7 +28091,6 @@
[1488,5,-247],
[1488,32,-247],
[1488,12,-247],
-[1388,0,-247],
[1388,25,-247],
[1388,4,-247],
[1388,13,-247],
@@ -28427,7 +28102,6 @@
[1388,5,-247],
[1388,32,-247],
[1388,12,-247],
-[792,0,-247],
[792,25,-247],
[792,4,-247],
[792,13,-247],
@@ -28439,7 +28113,6 @@
[792,5,-247],
[792,32,-247],
[792,12,-247],
-[1190,0,-247],
[1190,25,-247],
[1190,4,-247],
[1190,13,-247],
@@ -28451,7 +28124,6 @@
[1190,5,-247],
[1190,32,-247],
[1190,12,-247],
-[1441,0,-247],
[1441,25,-247],
[1441,4,-247],
[1441,13,-247],
@@ -28463,7 +28135,6 @@
[1441,5,-247],
[1441,32,-247],
[1441,12,-247],
-[1120,0,-247],
[1120,25,-247],
[1120,4,-247],
[1120,13,-247],
@@ -28475,7 +28146,6 @@
[1120,5,-247],
[1120,32,-247],
[1120,12,-247],
-[1223,0,-247],
[1223,25,-247],
[1223,4,-247],
[1223,13,-247],
@@ -28487,7 +28157,6 @@
[1223,5,-247],
[1223,32,-247],
[1223,12,-247],
-[873,0,-247],
[873,25,-247],
[873,4,-247],
[873,13,-247],
@@ -28499,7 +28168,6 @@
[873,5,-247],
[873,32,-247],
[873,12,-247],
-[1219,0,-247],
[1219,25,-247],
[1219,4,-247],
[1219,13,-247],
@@ -28511,7 +28179,6 @@
[1219,5,-247],
[1219,32,-247],
[1219,12,-247],
-[1256,0,-247],
[1256,25,-247],
[1256,4,-247],
[1256,13,-247],
@@ -28523,7 +28190,6 @@
[1256,5,-247],
[1256,32,-247],
[1256,12,-247],
-[3120,0,-247],
[3120,25,-247],
[3120,4,-247],
[3120,13,-247],
@@ -28535,7 +28201,6 @@
[3120,5,-247],
[3120,32,-247],
[3120,12,-247],
-[1095,0,-247],
[1095,25,-247],
[1095,4,-247],
[1095,13,-247],
@@ -28547,7 +28212,6 @@
[1095,5,-247],
[1095,32,-247],
[1095,12,-247],
-[829,0,-247],
[829,25,-247],
[829,4,-247],
[829,13,-247],
@@ -28564,7 +28228,6 @@
[413,1050,-288],
[414,1050,-288],
[418,1050,-288],
-[1382,0,-15],
[1382,25,-15],
[1382,4,-15],
[1382,13,-15],
@@ -28576,7 +28239,6 @@
[1382,5,-15],
[1382,32,-15],
[1382,12,-15],
-[0,1366,-42],
[25,1366,-42],
[4,1366,-42],
[13,1366,-42],
@@ -28837,10 +28499,6 @@
[1476,679,55],
[1476,1229,55],
[1476,1230,55],
-[0,956,-41],
-[0,1249,-41],
-[0,1090,-41],
-[0,740,-41],
[25,956,-41],
[25,1249,-41],
[25,1090,-41],
@@ -29965,7 +29623,6 @@
[395,1218,-260],
[395,1222,-260],
[395,1118,-260],
-[0,1113,-82],
[25,1113,-82],
[4,1113,-82],
[13,1113,-82],
@@ -31118,7 +30775,6 @@
[288,1355,-41],
[288,1350,-41],
[288,1348,-41],
-[129,0,-41],
[129,25,-41],
[129,4,-41],
[129,13,-41],
@@ -31130,7 +30786,6 @@
[129,5,-41],
[129,32,-41],
[129,12,-41],
-[137,0,-41],
[137,25,-41],
[137,4,-41],
[137,13,-41],
@@ -31142,7 +30797,6 @@
[137,5,-41],
[137,32,-41],
[137,12,-41],
-[135,0,-41],
[135,25,-41],
[135,4,-41],
[135,13,-41],
@@ -31154,7 +30808,6 @@
[135,5,-41],
[135,32,-41],
[135,12,-41],
-[138,0,-41],
[138,25,-41],
[138,4,-41],
[138,13,-41],
@@ -31166,7 +30819,6 @@
[138,5,-41],
[138,32,-41],
[138,12,-41],
-[136,0,-41],
[136,25,-41],
[136,4,-41],
[136,13,-41],
@@ -31178,7 +30830,6 @@
[136,5,-41],
[136,32,-41],
[136,12,-41],
-[131,0,-41],
[131,25,-41],
[131,4,-41],
[131,13,-41],
@@ -31202,11 +30853,6 @@
[1284,402,-164],
[206,990,-82],
[73,990,-82],
-[0,399,-152],
-[0,401,-152],
-[0,405,-152],
-[0,400,-152],
-[0,402,-152],
[25,399,-152],
[25,401,-152],
[25,405,-152],
@@ -31299,7 +30945,6 @@
[368,477,-165],
[867,1522,-40],
[132,1173,-357],
-[1101,0,-83],
[1101,25,-83],
[1101,4,-83],
[1101,13,-83],
@@ -31377,7 +31022,6 @@
[1129,413,-29],
[1129,414,-29],
[1129,418,-29],
-[1283,0,-372],
[1283,25,-372],
[1283,4,-372],
[1283,13,-372],
@@ -31389,7 +31033,6 @@
[1283,5,-372],
[1283,32,-372],
[1283,12,-372],
-[1280,0,-372],
[1280,25,-372],
[1280,4,-372],
[1280,13,-372],
@@ -31401,7 +31044,6 @@
[1280,5,-372],
[1280,32,-372],
[1280,12,-372],
-[1259,0,-372],
[1259,25,-372],
[1259,4,-372],
[1259,13,-372],
@@ -31925,7 +31567,6 @@
[292,679,-124],
[292,1229,-124],
[292,1230,-124],
-[3062,0,-192],
[3062,25,-192],
[3062,4,-192],
[3062,13,-192],
@@ -31937,7 +31578,6 @@
[3062,5,-192],
[3062,32,-192],
[3062,12,-192],
-[3064,0,-192],
[3064,25,-192],
[3064,4,-192],
[3064,13,-192],
@@ -31949,7 +31589,6 @@
[3064,5,-192],
[3064,32,-192],
[3064,12,-192],
-[3068,0,-192],
[3068,25,-192],
[3068,4,-192],
[3068,13,-192],
@@ -31961,7 +31600,6 @@
[3068,5,-192],
[3068,32,-192],
[3068,12,-192],
-[3063,0,-192],
[3063,25,-192],
[3063,4,-192],
[3063,13,-192],
@@ -31973,7 +31611,6 @@
[3063,5,-192],
[3063,32,-192],
[3063,12,-192],
-[3065,0,-192],
[3065,25,-192],
[3065,4,-192],
[3065,13,-192],
@@ -32525,7 +32162,6 @@
[1051,395,-180],
[547,395,-180],
[826,395,-180],
-[0,1050,-83],
[25,1050,-83],
[4,1050,-83],
[13,1050,-83],
@@ -32759,7 +32395,6 @@
[1181,679,-70],
[1181,1229,-70],
[1181,1230,-70],
-[1200,0,-84],
[1200,25,-84],
[1200,4,-84],
[1200,13,-84],
@@ -32771,7 +32406,6 @@
[1200,5,-84],
[1200,32,-84],
[1200,12,-84],
-[586,0,-84],
[586,25,-84],
[586,4,-84],
[586,13,-84],
@@ -32783,7 +32417,6 @@
[586,5,-84],
[586,32,-84],
[586,12,-84],
-[1433,0,-84],
[1433,25,-84],
[1433,4,-84],
[1433,13,-84],
@@ -32795,7 +32428,6 @@
[1433,5,-84],
[1433,32,-84],
[1433,12,-84],
-[1136,0,-84],
[1136,25,-84],
[1136,4,-84],
[1136,13,-84],
@@ -32807,7 +32439,6 @@
[1136,5,-84],
[1136,32,-84],
[1136,12,-84],
-[1210,0,-84],
[1210,25,-84],
[1210,4,-84],
[1210,13,-84],
@@ -32819,7 +32450,6 @@
[1210,5,-84],
[1210,32,-84],
[1210,12,-84],
-[1159,0,-84],
[1159,25,-84],
[1159,4,-84],
[1159,13,-84],
@@ -32831,7 +32461,6 @@
[1159,5,-84],
[1159,32,-84],
[1159,12,-84],
-[1139,0,-84],
[1139,25,-84],
[1139,4,-84],
[1139,13,-84],
@@ -32843,7 +32472,6 @@
[1139,5,-84],
[1139,32,-84],
[1139,12,-84],
-[1145,0,-84],
[1145,25,-84],
[1145,4,-84],
[1145,13,-84],
@@ -32855,7 +32483,6 @@
[1145,5,-84],
[1145,32,-84],
[1145,12,-84],
-[1203,0,-84],
[1203,25,-84],
[1203,4,-84],
[1203,13,-84],
@@ -32867,7 +32494,6 @@
[1203,5,-84],
[1203,32,-84],
[1203,12,-84],
-[1153,0,-84],
[1153,25,-84],
[1153,4,-84],
[1153,13,-84],
@@ -32879,7 +32505,6 @@
[1153,5,-84],
[1153,32,-84],
[1153,12,-84],
-[1170,0,-84],
[1170,25,-84],
[1170,4,-84],
[1170,13,-84],
@@ -32891,7 +32516,6 @@
[1170,5,-84],
[1170,32,-84],
[1170,12,-84],
-[1143,0,-84],
[1143,25,-84],
[1143,4,-84],
[1143,13,-84],
@@ -32903,7 +32527,6 @@
[1143,5,-84],
[1143,32,-84],
[1143,12,-84],
-[1167,0,-84],
[1167,25,-84],
[1167,4,-84],
[1167,13,-84],
@@ -32915,7 +32538,6 @@
[1167,5,-84],
[1167,32,-84],
[1167,12,-84],
-[1144,0,-84],
[1144,25,-84],
[1144,4,-84],
[1144,13,-84],
@@ -32927,7 +32549,6 @@
[1144,5,-84],
[1144,32,-84],
[1144,12,-84],
-[1192,0,-84],
[1192,25,-84],
[1192,4,-84],
[1192,13,-84],
@@ -33212,7 +32833,6 @@
[1113,485,-70],
[1114,485,-70],
[1117,485,-70],
-[0,1114,-28],
[25,1114,-28],
[4,1114,-28],
[13,1114,-28],
@@ -33358,7 +32978,6 @@
[1099,3120,125],
[1099,1120,125],
[1099,1441,125],
-[0,1181,-96],
[25,1181,-96],
[4,1181,-96],
[13,1181,-96],
@@ -33371,7 +32990,6 @@
[32,1181,-96],
[12,1181,-96],
[3077,537,-42],
-[0,3074,-13],
[25,3074,-13],
[4,3074,-13],
[13,3074,-13],
@@ -33743,7 +33361,6 @@
[368,136,-109],
[368,277,-109],
[368,131,-109],
-[282,0,-96],
[282,25,-96],
[282,4,-96],
[282,13,-96],
@@ -33755,7 +33372,6 @@
[282,5,-96],
[282,32,-96],
[282,12,-96],
-[63,0,-96],
[63,25,-96],
[63,4,-96],
[63,13,-96],
@@ -33767,7 +33383,6 @@
[63,5,-96],
[63,32,-96],
[63,12,-96],
-[297,0,-96],
[297,25,-96],
[297,4,-96],
[297,13,-96],
@@ -33779,7 +33394,6 @@
[297,5,-96],
[297,32,-96],
[297,12,-96],
-[236,0,-96],
[236,25,-96],
[236,4,-96],
[236,13,-96],
@@ -33791,7 +33405,6 @@
[236,5,-96],
[236,32,-96],
[236,12,-96],
-[117,0,-96],
[117,25,-96],
[117,4,-96],
[117,13,-96],
@@ -33803,7 +33416,6 @@
[117,5,-96],
[117,32,-96],
[117,12,-96],
-[257,0,-96],
[257,25,-96],
[257,4,-96],
[257,13,-96],
@@ -33815,7 +33427,6 @@
[257,5,-96],
[257,32,-96],
[257,12,-96],
-[241,0,-96],
[241,25,-96],
[241,4,-96],
[241,13,-96],
@@ -33827,7 +33438,6 @@
[241,5,-96],
[241,32,-96],
[241,12,-96],
-[247,0,-96],
[247,25,-96],
[247,4,-96],
[247,13,-96],
@@ -33839,7 +33449,6 @@
[247,5,-96],
[247,32,-96],
[247,12,-96],
-[285,0,-96],
[285,25,-96],
[285,4,-96],
[285,13,-96],
@@ -33851,7 +33460,6 @@
[285,5,-96],
[285,32,-96],
[285,12,-96],
-[254,0,-96],
[254,25,-96],
[254,4,-96],
[254,13,-96],
@@ -33863,7 +33471,6 @@
[254,5,-96],
[254,32,-96],
[254,12,-96],
-[67,0,-96],
[67,25,-96],
[67,4,-96],
[67,13,-96],
@@ -33875,7 +33482,6 @@
[67,5,-96],
[67,32,-96],
[67,12,-96],
-[267,0,-96],
[267,25,-96],
[267,4,-96],
[267,13,-96],
@@ -33887,7 +33493,6 @@
[267,5,-96],
[267,32,-96],
[267,12,-96],
-[245,0,-96],
[245,25,-96],
[245,4,-96],
[245,13,-96],
@@ -33899,7 +33504,6 @@
[245,5,-96],
[245,32,-96],
[245,12,-96],
-[265,0,-96],
[265,25,-96],
[265,4,-96],
[265,13,-96],
@@ -33911,7 +33515,6 @@
[265,5,-96],
[265,32,-96],
[265,12,-96],
-[246,0,-96],
[246,25,-96],
[246,4,-96],
[246,13,-96],
@@ -33923,7 +33526,6 @@
[246,5,-96],
[246,32,-96],
[246,12,-96],
-[277,0,-96],
[277,25,-96],
[277,4,-96],
[277,13,-96],
diff --git a/docs/index.html b/docs/index.html
index 44a2ace86..c6f887d0e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -44,7 +44,7 @@
<div class="row white" style="padding-bottom:0"><div>
<h2><a id="sample" href="#sample">Sample</a></h2>
<p style="margin-bottom:0">
- <a href="https://www.figma.com/file/WmU5NWr52bnUcqv5os0V4sWi/Interface-samples" class="plain"><img src="res/sample.png" style="width:100%;display:block"></a>
+ <a href="https://www.figma.com/file/WmU5NWr52bnUcqv5os0V4sWi/Interface-samples" class="plain"><img src="res/sample.png" width="888" style="width:100%;display:block"></a>
</p>
</div></div>
diff --git a/misc/gen-metrics-and-svgs.py b/misc/gen-metrics-and-svgs.py
index 5bd16a3c5..51ea0d510 100755
--- a/misc/gen-metrics-and-svgs.py
+++ b/misc/gen-metrics-and-svgs.py
@@ -285,10 +285,10 @@ def genKerningInfo(font, glyphnames, nameToIdMap):
for lname in leftnames:
for rname in rightnames:
- lnameId = nameToIdMap[lname]
- rnameId = nameToIdMap[rname]
- # print('%r' % [lnameId, rnameId, v])
- pairs.append([lnameId, rnameId, v])
+ lnameId = nameToIdMap.get(lname)
+ rnameId = nameToIdMap.get(rname)
+ if lnameId and rnameId:
+ pairs.append([lnameId, rnameId, v])
# print('pairs: %r' % pairs)
return pairs