improved /D /P /R /Thook /r.sc /rinv.sc

5 files changed, 431 insertions, 336 deletions

diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_.glyph
index 6821d1454..6cd93b60a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_.glyph
@@ -159,9 +159,9 @@ nodes = (
 (1071,1490,o),
 (660,1490,cs),
 (256,1490,l),
-(256,1442,l),
-(660,1442,ls),
-(1047,1442,o),
+(256,1444,l),
+(660,1444,ls),
+(1047,1444,o),
 (1268,1185,o),
 (1268,750,cs),
 (1268,309,o),
@@ -177,8 +177,8 @@ closed = 1;
 nodes = (
 (232,1490,l),
 (232,0,l),
-(280,0,l),
-(280,1490,l)
+(278,0,l),
+(278,1490,l)
 );
 }
 );
@@ -347,9 +347,9 @@ nodes = (
 (1007,1490,o),
 (596,1490,cs),
 (192,1490,l),
-(192,1442,l),
-(596,1442,ls),
-(983,1442,o),
+(192,1444,l),
+(596,1444,ls),
+(983,1444,o),
 (1204,1185,o),
 (1204,750,cs),
 (1204,309,o),
@@ -365,8 +365,8 @@ closed = 1;
 nodes = (
 (168,1490,l),
 (168,0,l),
-(216,0,l),
-(216,1490,l)
+(214,0,l),
+(214,1490,l)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_.glyph
index a8bdd4e3c..283d908a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_.glyph
@@ -28,10 +28,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(280,0,l),
-(280,1442,l),
-(670,1442,ls),
-(892,1442,o),
+(278,0,l),
+(278,1444,l),
+(670,1444,ls),
+(892,1444,o),
 (1050,1281,o),
 (1050,1054,cs),
 (1050,826,o),
@@ -479,10 +479,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(216,0,l),
-(216,1442,l),
-(606,1442,ls),
-(828,1442,o),
+(214,0,l),
+(214,1444,l),
+(606,1444,ls),
+(828,1444,o),
 (986,1281,o),
 (986,1054,cs),
 (986,826,o),
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_.glyph
index 5c599ff67..3c534f254 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_.glyph
@@ -24,16 +24,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(280,0,l),
-(280,1442,l),
-(670,1442,ls),
-(892,1442,o),
+(278,0,l),
+(278,1444,l),
+(670,1444,ls),
+(892,1444,o),
 (1050,1293,o),
 (1050,1064,cs),
 (1050,838,o),
-(892,690,o),
-(670,690,cs),
-(256,690,l),
+(892,688,o),
+(670,688,cs),
+(256,688,l),
 (256,642,l),
 (670,642,ls),
 (919,642,o),
@@ -228,38 +228,6 @@ name = top;
 pos = (614,1676);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(360,0,l),
-(360,1330,l),
-(706,1330,ls),
-(905,1329,o),
-(1012,1219,o),
-(1012,1032,cs),
-(1012,855,o),
-(911,745,o),
-(686,744,cs),
-(290,744,l),
-(290,582,l),
-(724,582,l),
-(1038,0,l),
-(1248,0,l),
-(910,616,l),
-(1100,687,o),
-(1190,844,o),
-(1190,1036,cs),
-(1190,1303,o),
-(1015,1489,o),
-(716,1490,cs),
-(180,1490,l),
-(180,0,l)
-);
-}
-);
-};
 guides = (
 {
 orientation = center;
@@ -761,16 +729,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(216,0,l),
-(216,1442,l),
-(606,1442,ls),
-(828,1442,o),
+(214,0,l),
+(214,1444,l),
+(606,1444,ls),
+(828,1444,o),
 (986,1293,o),
 (986,1064,cs),
 (986,838,o),
-(828,690,o),
-(606,690,cs),
-(192,690,l),
+(828,688,o),
+(606,688,cs),
+(192,688,l),
 (192,642,l),
 (606,642,ls),
 (855,642,o),
diff --git a/src/Inter-Roman.glyphspackage/glyphs/r.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/r.sc.glyph
index aa4b775cf..777f14102 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/r.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/r.sc.glyph
@@ -7,39 +7,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(898,0,l),
-(1114,0,l),
-(798,520,l),
-(582,520,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(178,0,l),
-(378,0,l),
-(378,926,l),
-(638,926,ls),
-(788,925,o),
-(852,835,o),
-(852,750,cs),
-(852,666,o),
-(794,579,o),
-(658,578,cs),
-(326,578,l),
-(326,418,l),
-(658,418,ls),
-(908,419,o),
-(1053,561,o),
-(1054,750,cs),
-(1053,943,o),
-(902,1082,o),
-(638,1082,cs),
-(178,1082,l)
+(314,0,l),
+(314,968,l),
+(571,968,ls),
+(768,968,o),
+(847,893,o),
+(847,766,cs),
+(847,641,o),
+(768,568,o),
+(573,568,cs),
+(241,568,l),
+(241,422,l),
+(584,422,ls),
+(878,422,o),
+(1017,560,o),
+(1017,766,cs),
+(1017,972,o),
+(879,1118,o),
+(583,1118,cs),
+(144,1118,l),
+(144,0,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(1066,0,l),
+(754,505,l),
+(563,505,l),
+(869,0,l)
 );
 }
 );
-width = 1292;
+width = 1116;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -47,39 +47,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(872,0,l),
-(1246,0,l),
-(940,564,l),
-(568,564,l)
+(451,0,l),
+(451,818,l),
+(593,818,ls),
+(691,818,o),
+(739,784,o),
+(739,714,cs),
+(739,646,o),
+(689,612,o),
+(587,612,cs),
+(297,612,l),
+(297,346,l),
+(638,346,ls),
+(943,346,o),
+(1135,490,o),
+(1135,720,cs),
+(1135,964,o),
+(949,1118,o),
+(653,1118,cs),
+(77,1118,l),
+(77,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(194,0,l),
-(568,0,l),
-(568,782,l),
-(710,782,ls),
-(806,783,o),
-(855,736,o),
-(856,678,cs),
-(855,623,o),
-(803,576,o),
-(704,576,cs),
-(414,576,l),
-(414,334,l),
-(704,334,ls),
-(1021,335,o),
-(1228,483,o),
-(1228,692,cs),
-(1228,916,o),
-(1027,1082,o),
-(710,1082,cs),
-(194,1082,l)
+(1179,0,l),
+(860,517,l),
+(441,517,l),
+(751,0,l)
 );
 }
 );
-width = 1438;
+width = 1200;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -87,6 +87,168 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(231,0,l),
+(231,1074,l),
+(560,1074,ls),
+(750,1074,o),
+(881,963,o),
+(881,795,cs),
+(881,630,o),
+(750,521,o),
+(560,521,cs),
+(209,521,l),
+(209,477,l),
+(561,477,ls),
+(777,477,o),
+(927,605,o),
+(927,795,cs),
+(927,988,o),
+(777,1118,o),
+(561,1118,cs),
+(185,1118,l),
+(185,0,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(986,0,l),
+(675,508,l),
+(623,508,l),
+(933,0,l)
+);
+}
+);
+width = 1062;
+},
+{
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(288,0,l),
+(288,906,l),
+(571,906,ls),
+(745,906,o),
+(822,850,o),
+(822,723,cs),
+(822,596,o),
+(743,541,o),
+(564,541,cs),
+(214,541,l),
+(214,397,l),
+(578,397,ls),
+(841,397,o),
+(989,514,o),
+(989,723,cs),
+(989,937,o),
+(844,1056,o),
+(585,1056,cs),
+(118,1056,l),
+(118,0,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(1039,0,l),
+(727,476,l),
+(538,476,l),
+(843,0,l)
+);
+}
+);
+width = 1063;
+},
+{
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(438,0,l),
+(438,756,l),
+(580,756,ls),
+(678,756,o),
+(726,730,o),
+(726,660,cs),
+(726,592,o),
+(676,566,o),
+(574,566,cs),
+(284,566,l),
+(284,300,l),
+(625,300,ls),
+(930,300,o),
+(1122,436,o),
+(1122,666,cs),
+(1122,910,o),
+(936,1056,o),
+(640,1056,cs),
+(64,1056,l),
+(64,0,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(1166,0,l),
+(847,455,l),
+(428,455,l),
+(738,0,l)
+);
+}
+);
+width = 1174;
+},
+{
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(180,0,l),
+(180,1074,l),
+(509,1074,ls),
+(699,1074,o),
+(830,963,o),
+(830,795,cs),
+(830,630,o),
+(699,521,o),
+(509,521,cs),
+(158,521,l),
+(158,477,l),
+(510,477,ls),
+(726,477,o),
+(876,605,o),
+(876,795,cs),
+(876,988,o),
+(726,1118,o),
+(510,1118,cs),
+(134,1118,l),
+(134,0,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(935,0,l),
+(624,508,l),
+(572,508,l),
+(882,0,l)
+);
+}
+);
+width = 959;
+},
+{
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "C2F64E99-B671-4ADA-9E18-3340E1AA7366";
+name = "Sep 29, 22, 18:16";
+shapes = (
+{
+closed = 1;
+nodes = (
 (980,0,l),
 (1036,0,l),
 (712,494,l),
@@ -122,7 +284,9 @@ nodes = (
 width = 1204;
 },
 {
-layerId = m007;
+associatedMasterId = m007;
+layerId = "57CA967B-F8A3-47B0-87DA-4246E09AE157";
+name = "Sep 29, 22, 18:18";
 shapes = (
 {
 closed = 1;
@@ -162,84 +326,46 @@ nodes = (
 width = 1228;
 },
 {
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(856,0,l),
-(1230,0,l),
-(924,564,l),
-(552,564,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(178,0,l),
-(552,0,l),
-(552,782,l),
-(694,782,ls),
-(790,783,o),
-(839,736,o),
-(840,678,cs),
-(839,623,o),
-(787,576,o),
-(688,576,cs),
-(398,576,l),
-(398,334,l),
-(688,334,ls),
-(1005,335,o),
-(1212,483,o),
-(1212,692,cs),
-(1212,916,o),
-(1011,1082,o),
-(694,1082,cs),
-(178,1082,l)
-);
-}
-);
-width = 1406;
-},
-{
-layerId = m011;
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "71C69901-F0B4-49F1-862E-22132FB862CA";
+name = "Sep 29, 22, 18:20";
 shapes = (
 {
 closed = 1;
 nodes = (
-(916,0,l),
-(972,0,l),
-(648,494,l),
-(592,494,l)
+(872,0,l),
+(1246,0,l),
+(940,600,l),
+(568,600,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(104,0,l),
-(152,0,l),
-(152,1036,l),
-(530,1036,ls),
-(720,1036,o),
-(839,943,o),
-(840,794,cs),
-(840,623,o),
-(736,518,o),
-(568,518,cs),
-(122,518,l),
-(122,472,l),
-(568,472,ls),
-(761,471,o),
-(884,594,o),
-(884,786,cs),
-(884,969,o),
-(750,1082,o),
-(530,1082,cs),
-(104,1082,l)
+(194,0,l),
+(568,0,l),
+(568,818,l),
+(710,818,ls),
+(806,819,o),
+(855,772,o),
+(856,714,cs),
+(855,659,o),
+(803,612,o),
+(704,612,cs),
+(414,612,l),
+(414,370,l),
+(704,370,ls),
+(1021,371,o),
+(1228,519,o),
+(1228,728,cs),
+(1228,952,o),
+(1027,1118,o),
+(710,1118,cs),
+(194,1118,l)
 );
 }
 );
-width = 1076;
+width = 1438;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rinv.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/rinv.sc.glyph
index 1e29d6809..976f77249 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rinv.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rinv.sc.glyph
@@ -7,39 +7,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1114,1082,l),
-(898,1082,l),
-(582,562,l),
-(798,562,l)
+(583,0,ls),
+(879,0,o),
+(1017,146,o),
+(1017,352,cs),
+(1017,558,o),
+(878,696,o),
+(584,696,cs),
+(241,696,l),
+(241,550,l),
+(573,550,ls),
+(768,550,o),
+(847,477,o),
+(847,352,cs),
+(847,225,o),
+(768,150,o),
+(571,150,cs),
+(314,150,l),
+(314,1118,l),
+(144,1118,l),
+(144,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(902,0,o),
-(1053,143,o),
-(1054,332,cs),
-(1053,524,o),
-(908,663,o),
-(658,664,cs),
-(326,664,l),
-(326,504,l),
-(658,504,ls),
-(794,503,o),
-(852,416,o),
-(852,334,cs),
-(852,247,o),
-(788,157,o),
-(638,158,cs),
-(378,158,l),
-(378,1082,l),
-(178,1082,l),
-(178,0,l),
-(638,0,l)
+(754,613,l),
+(1066,1118,l),
+(869,1118,l),
+(563,613,l)
 );
 }
 );
-width = 1292;
+width = 1116;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -47,39 +47,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1246,1082,l),
-(872,1082,l),
-(568,520,l),
-(940,520,l)
+(653,0,ls),
+(949,0,o),
+(1135,154,o),
+(1135,398,cs),
+(1135,628,o),
+(943,772,o),
+(638,772,cs),
+(297,772,l),
+(297,506,l),
+(587,506,ls),
+(689,506,o),
+(739,472,o),
+(739,404,cs),
+(739,334,o),
+(691,300,o),
+(593,300,cs),
+(451,300,l),
+(451,1118,l),
+(77,1118,l),
+(77,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(1024,0,o),
-(1228,163,o),
-(1228,390,cs),
-(1228,596,o),
-(1024,748,o),
-(704,748,cs),
-(414,748,l),
-(414,506,l),
-(704,506,ls),
-(803,506,o),
-(855,451,o),
-(856,404,cs),
-(855,358,o),
-(803,300,o),
-(710,300,cs),
-(568,300,l),
-(568,1082,l),
-(194,1082,l),
-(194,0,l),
-(710,0,l)
+(860,601,l),
+(1179,1118,l),
+(751,1118,l),
+(441,601,l)
 );
 }
 );
-width = 1438;
+width = 1200;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -87,39 +87,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1036,1082,l),
-(980,1082,l),
-(656,588,l),
-(712,588,l)
+(562,0,ls),
+(778,0,o),
+(928,130,o),
+(928,323,cs),
+(928,513,o),
+(778,641,o),
+(562,641,cs),
+(210,641,l),
+(210,597,l),
+(561,597,ls),
+(751,597,o),
+(882,488,o),
+(882,323,cs),
+(882,155,o),
+(751,44,o),
+(561,44,cs),
+(232,44,l),
+(232,1118,l),
+(186,1118,l),
+(186,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(814,0,o),
-(948,113,o),
-(948,296,cs),
-(948,488,o),
-(825,611,o),
-(632,610,cs),
-(186,610,l),
-(186,564,l),
-(632,564,ls),
-(800,564,o),
-(904,459,o),
-(904,288,cs),
-(903,139,o),
-(784,47,o),
-(594,46,cs),
-(216,46,l),
-(216,1082,l),
-(168,1082,l),
-(168,0,l),
-(594,0,ls)
+(676,610,l),
+(987,1118,l),
+(934,1118,l),
+(624,610,l)
 );
 }
 );
-width = 1204;
+width = 1062;
 },
 {
 layerId = m007;
@@ -127,39 +127,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1082,1082,l),
-(866,1082,l),
-(550,562,l),
-(766,562,l)
+(585,0,ls),
+(844,0,o),
+(989,119,o),
+(989,333,cs),
+(989,542,o),
+(842,659,o),
+(578,659,cs),
+(214,659,l),
+(214,515,l),
+(564,515,ls),
+(743,515,o),
+(822,460,o),
+(822,333,cs),
+(822,206,o),
+(746,150,o),
+(571,150,cs),
+(288,150,l),
+(288,1056,l),
+(118,1056,l),
+(118,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(870,0,o),
-(1021,143,o),
-(1022,332,cs),
-(1021,524,o),
-(876,663,o),
-(626,664,cs),
-(294,664,l),
-(294,504,l),
-(626,504,ls),
-(762,503,o),
-(820,416,o),
-(820,334,cs),
-(820,247,o),
-(756,157,o),
-(606,158,cs),
-(346,158,l),
-(346,1082,l),
-(146,1082,l),
-(146,0,l),
-(606,0,l)
+(727,580,l),
+(1039,1056,l),
+(843,1056,l),
+(538,580,l)
 );
 }
 );
-width = 1228;
+width = 1063;
 },
 {
 layerId = m009;
@@ -167,39 +167,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1230,1082,l),
-(856,1082,l),
-(552,520,l),
-(924,520,l)
+(640,0,ls),
+(936,0,o),
+(1122,146,o),
+(1122,390,cs),
+(1122,620,o),
+(930,756,o),
+(625,756,cs),
+(284,756,l),
+(284,490,l),
+(574,490,ls),
+(676,490,o),
+(726,464,o),
+(726,396,cs),
+(726,326,o),
+(678,300,o),
+(580,300,cs),
+(438,300,l),
+(438,1056,l),
+(64,1056,l),
+(64,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(1008,0,o),
-(1212,163,o),
-(1212,390,cs),
-(1212,596,o),
-(1008,748,o),
-(688,748,cs),
-(398,748,l),
-(398,506,l),
-(688,506,ls),
-(787,506,o),
-(839,451,o),
-(840,404,cs),
-(839,358,o),
-(787,300,o),
-(694,300,cs),
-(552,300,l),
-(552,1082,l),
-(178,1082,l),
-(178,0,l),
-(694,0,l)
+(847,601,l),
+(1166,1056,l),
+(738,1056,l),
+(428,601,l)
 );
 }
 );
-width = 1406;
+width = 1174;
 },
 {
 layerId = m011;
@@ -207,41 +207,42 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(972,1082,l),
-(916,1082,l),
-(592,588,l),
-(648,588,l)
+(510,0,ls),
+(726,0,o),
+(876,130,o),
+(876,323,cs),
+(876,513,o),
+(726,641,o),
+(510,641,cs),
+(158,641,l),
+(158,597,l),
+(509,597,ls),
+(699,597,o),
+(830,488,o),
+(830,323,cs),
+(830,155,o),
+(699,44,o),
+(509,44,cs),
+(180,44,l),
+(180,1118,l),
+(134,1118,l),
+(134,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(750,0,o),
-(884,113,o),
-(884,296,cs),
-(884,488,o),
-(761,611,o),
-(568,610,cs),
-(122,610,l),
-(122,564,l),
-(568,564,ls),
-(736,564,o),
-(840,459,o),
-(840,288,cs),
-(839,139,o),
-(720,47,o),
-(530,46,cs),
-(152,46,l),
-(152,1082,l),
-(104,1082,l),
-(104,0,l),
-(530,0,ls)
+(624,610,l),
+(935,1118,l),
+(882,1118,l),
+(572,610,l)
 );
 }
 );
-width = 1076;
+width = 959;
 }
 );
+note = "after edits, set sidebearings to \"=R*0.8\" and Update Metrics, then remove the sidebearing expressions (or it will oscillate)";
 tags = (
 "TODO-opsz"
 );