fixes an issue with /dotmacroncomb.cn used by glyphs like /Adotmacron. Closes #298

1 files changed, 156 insertions, 60 deletions

diff --git a/src/Inter.glyphs b/src/Inter.glyphs
index 6b662ac11..b5784d1a9 100755
--- a/src/Inter.glyphs
+++ b/src/Inter.glyphs
@@ -1,8 +1,8 @@
 {
-.appVersion = "1330";
+.appVersion = "1346";
 DisplayStrings = (
-"/dz/dzcaron/dzaltone/dzcurl",
-"/zcurl"
+"/space/macroncomb/space/space/space/dotmacroncomb.cn/space/Adotmacron/Adotmacron/Adieresismacron/uni0226 Ä",
+"/Adotmacron/Adieresismacron/uni0226 Ä/uni0230 Ö\012å/adotmacron/adieresismacron/uni0231"
 );
 classes = (
 {
@@ -2354,12 +2354,6 @@ position = "{0, 1560}";
 position = "{1102, 596}";
 },
 {
-position = "{1684, 2076}";
-},
-{
-position = "{1360, 2140}";
-},
-{
 position = "{816, -576}";
 }
 );
@@ -2487,12 +2481,6 @@ locked = 1;
 position = "{0, 1560}";
 },
 {
-position = "{1360, 2140}";
-},
-{
-position = "{1684, 2076}";
-},
-{
 position = "{816, -576}";
 }
 );
@@ -4781,7 +4769,7 @@ unicode = 01DE;
 },
 {
 glyphname = Adotmacron;
-lastChange = "2019-12-17 15:13:12 +0000";
+lastChange = "2020-08-17 18:00:53 +0000";
 layers = (
 {
 components = (
@@ -4803,7 +4791,7 @@ name = A;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 2080, 124}";
+transform = "{1, 0, 0, 1, 2080, 0}";
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -4816,7 +4804,7 @@ name = A;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 1764, 0}";
+transform = "{1, 0, 0, 1, 1932, 0}";
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -4829,7 +4817,7 @@ name = A;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 2104, 124}";
+transform = "{1, 0, 0, 1, 2132, 0}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -4855,7 +4843,7 @@ name = A;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 1588, 0}";
+transform = "{1, 0, 0, 1, 1858, 0}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -41134,7 +41122,7 @@ unicode = 022E;
 },
 {
 glyphname = uni0230;
-lastChange = "2019-12-17 15:13:12 +0000";
+lastChange = "2020-08-17 18:01:19 +0000";
 layers = (
 {
 components = (
@@ -41156,7 +41144,7 @@ name = O;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 2080, 124}";
+transform = "{1, 0, 0, 1, 2080, 0}";
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -41169,7 +41157,7 @@ name = O;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 1880, 0}";
+transform = "{1, 0, 0, 1, 2048, 0}";
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -41182,7 +41170,7 @@ name = O;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 2104, 124}";
+transform = "{1, 0, 0, 1, 2132, 0}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -41208,7 +41196,7 @@ name = O;
 },
 {
 name = dotmacroncomb.cn;
-transform = "{1, 0, 0, 1, 1764, 0}";
+transform = "{1, 0, 0, 1, 2034, 0}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -445754,7 +445742,7 @@ unicode = E121;
 {
 color = (222,222,222,1);
 glyphname = dotmacroncomb.cn;
-lastChange = "2019-12-17 15:13:12 +0000";
+lastChange = "2020-08-17 18:33:49 +0000";
 layers = (
 {
 anchors = (
@@ -445765,12 +445753,8 @@ position = "{-812, 2304}";
 );
 components = (
 {
-name = dotaccent;
-transform = "{1, 0, 0, 1, -1148, 432}";
-},
-{
 name = macroncomb;
-transform = "{1, 0, 0, 1, 0, 912}";
+transform = "{1, 0, 0, 1, 36, 1024}";
 }
 );
 guideLines = (
@@ -445780,66 +445764,136 @@ position = "{-812, 2700}";
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+paths = (
+{
+closed = 1;
+nodes = (
+"-720 2304 OFFCURVE",
+"-644 2376 OFFCURVE",
+"-644 2464 CURVE SMOOTH",
+"-644 2552 OFFCURVE",
+"-720 2624 OFFCURVE",
+"-812 2624 CURVE SMOOTH",
+"-904 2624 OFFCURVE",
+"-980 2552 OFFCURVE",
+"-980 2464 CURVE SMOOTH",
+"-980 2376 OFFCURVE",
+"-904 2304 OFFCURVE",
+"-812 2304 CURVE SMOOTH"
+);
+}
+);
 width = 0;
 },
 {
 anchors = (
 {
 name = _top;
-position = "{-960, 2180}";
+position = "{-960, 2304}";
 }
 );
 components = (
 {
-name = dotaccent;
-transform = "{1, 0, 0, 0.79383, -1420, 832}";
-},
-{
 name = macroncomb;
-transform = "{1, 0, 0, 0.76, -4, 1308}";
+transform = "{1, 0, 0, 1, -62, 1024}";
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+paths = (
+{
+closed = 1;
+nodes = (
+"-824.775 2227.397 OFFCURVE",
+"-715.33 2332.349 OFFCURVE",
+"-715.33 2459.397 CURVE SMOOTH",
+"-715.33 2588.286 OFFCURVE",
+"-824.775 2691.397 OFFCURVE",
+"-959.339 2691.397 CURVE SMOOTH",
+"-1093.902 2691.397 OFFCURVE",
+"-1203.347 2588.286 OFFCURVE",
+"-1203.347 2459.397 CURVE SMOOTH",
+"-1203.347 2332.349 OFFCURVE",
+"-1093.902 2227.397 OFFCURVE",
+"-959.339 2227.397 CURVE SMOOTH"
+);
+}
+);
 width = 0;
 },
 {
 anchors = (
 {
 name = _top;
-position = "{-556, 2304}";
+position = "{-724, 2304}";
 }
 );
 components = (
 {
-name = dotaccent;
-transform = "{1, 0, 0, 1, -1072, 436}";
-},
-{
 name = macroncomb;
-transform = "{1, 0, 0, 1, 140, 912}";
+transform = "{1, 0, 0, 1, -20, 1024}";
+}
+);
+guideLines = (
+{
+angle = -99.4;
+position = "{-758, 2224}";
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+paths = (
+{
+closed = 1;
+nodes = (
+"-628 2304 OFFCURVE",
+"-552 2376 OFFCURVE",
+"-552 2464 CURVE SMOOTH",
+"-552 2552 OFFCURVE",
+"-628 2624 OFFCURVE",
+"-720 2624 CURVE SMOOTH",
+"-812 2624 OFFCURVE",
+"-888 2552 OFFCURVE",
+"-888 2464 CURVE SMOOTH",
+"-888 2376 OFFCURVE",
+"-812 2304 OFFCURVE",
+"-720 2304 CURVE SMOOTH"
+);
+}
+);
 width = 0;
 },
 {
 anchors = (
 {
 name = _top;
-position = "{-728, 2180}";
+position = "{-756, 2304}";
 }
 );
 components = (
 {
-name = dotaccent;
-transform = "{1, 0, 0, 0.79383, -1332, 832}";
-},
-{
 name = macroncomb;
-transform = "{1, 0, 0, 0.76, 140, 1308}";
+transform = "{1, 0, 0, 1, 66, 1024}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+paths = (
+{
+closed = 1;
+nodes = (
+"-628.623 2227.397 OFFCURVE",
+"-503.031 2332.349 OFFCURVE",
+"-483.295 2459.397 CURVE SMOOTH",
+"-463.559 2588.286 OFFCURVE",
+"-555.062 2691.397 OFFCURVE",
+"-689.625 2691.397 CURVE SMOOTH",
+"-824.189 2691.397 OFFCURVE",
+"-949.781 2588.286 OFFCURVE",
+"-971.312 2459.397 CURVE SMOOTH",
+"-992.842 2332.349 OFFCURVE",
+"-897.75 2227.397 OFFCURVE",
+"-763.187 2227.397 CURVE SMOOTH"
+);
+}
+);
 width = 0;
 },
 {
@@ -445851,35 +445905,77 @@ position = "{-720, 2304}";
 );
 components = (
 {
-name = dotaccent;
-transform = "{1, 0, 0, 1, -976, 440}";
-},
-{
 name = macroncomb;
-transform = "{1, 0, 0, 1, 124, 688}";
+transform = "{1, 0, 0, 1, 124, 902}";
+}
+);
+guideLines = (
+{
+angle = 90;
+position = "{-720, 2228}";
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+paths = (
+{
+closed = 1;
+nodes = (
+"-684 2328 OFFCURVE",
+"-656 2358 OFFCURVE",
+"-656 2392 CURVE SMOOTH",
+"-656 2428 OFFCURVE",
+"-684 2456 OFFCURVE",
+"-720 2456 CURVE SMOOTH",
+"-754 2456 OFFCURVE",
+"-784 2428 OFFCURVE",
+"-784 2392 CURVE SMOOTH",
+"-784 2358 OFFCURVE",
+"-754 2328 OFFCURVE",
+"-720 2328 CURVE SMOOTH"
+);
+}
+);
 width = 0;
 },
 {
 anchors = (
 {
 name = _top;
-position = "{-464, 2304}";
+position = "{-734, 2304}";
 }
 );
 components = (
 {
-name = dotaccent;
-transform = "{1, 0, 0, 1, -904, 440}";
-},
-{
 name = macroncomb;
-transform = "{1, 0, 0, 1, 172, 688}";
+transform = "{1, 0, 0, 1, -66, 902}";
+}
+);
+guideLines = (
+{
+angle = -99.4;
+position = "{-758, 2224}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+paths = (
+{
+closed = 1;
+nodes = (
+"-702 2328 OFFCURVE",
+"-670 2356 OFFCURVE",
+"-666 2384 CURVE SMOOTH",
+"-658 2424 OFFCURVE",
+"-686 2456 OFFCURVE",
+"-726 2456 CURVE SMOOTH",
+"-758 2456 OFFCURVE",
+"-788 2428 OFFCURVE",
+"-794 2400 CURVE SMOOTH",
+"-800 2360 OFFCURVE",
+"-774 2328 OFFCURVE",
+"-734 2328 CURVE SMOOTH"
+);
+}
+);
 width = 0;
 }
 );