Skip to content

Commit

Permalink
Redesign integral
Browse files Browse the repository at this point in the history
Move old, straight, integrals to ss02 feature, and add new slanted
integral based on the italic f shape.

Fixes notofonts#51
  • Loading branch information
khaledhosny committed Mar 6, 2024
1 parent 42b8be6 commit cc407af
Show file tree
Hide file tree
Showing 240 changed files with 7,756 additions and 1,681 deletions.
79 changes: 71 additions & 8 deletions sources/NotoSansMath.glyphspackage/fontinfo.plist
Expand Up @@ -161,9 +161,9 @@ features = (
automatic = 1;
code = "feature rtlm;
feature ss01;
feature ss02;
feature dtls;
feature ssty;
feature fwid;
";
tag = aalt;
},
Expand Down Expand Up @@ -378,6 +378,71 @@ tag = ss01;
},
{
automatic = 1;
code = "sub integral by integral.ss02;
sub dblintegral by dblintegral.ss02;
sub tripleintegral by tripleintegral.ss02;
sub quadrupleintegral by quadrupleintegral.ss02;
sub contourintegral by contourintegral.ss02;
sub surfaceintegral by surfaceintegral.ss02;
sub volumeintegral by volumeintegral.ss02;
sub clockwiseintegral by clockwiseintegral.ss02;
sub clockwisecontourintegral by clockwisecontourintegral.ss02;
sub anticlockwisecontourintegral by anticlockwisecontourintegral.ss02;
sub finitePartIntegral by finitePartIntegral.ss02;
sub doublestrokeintegral by doublestrokeintegral.ss02;
sub slashintegral by slashintegral.ss02;
sub circulationfunction by circulationfunction.ss02;
sub anticlockwiseintegral by anticlockwiseintegral.ss02;
sub rectangularlineintegral by rectangularlineintegral.ss02;
sub semicircularlineintegral by semicircularlineintegral.ss02;
sub nopolelineintegral by nopolelineintegral.ss02;
sub pointoperatorintegral by pointoperatorintegral.ss02;
sub quaternionintegral by quaternionintegral.ss02;
sub leftarrowhookintegral by leftarrowhookintegral.ss02;
sub timesintegral by timesintegral.ss02;
sub intersectionintegral by intersectionintegral.ss02;
sub unionintegral by unionintegral.ss02;
sub overbarintegral by overbarintegral.ss02;
sub underbarintegral by underbarintegral.ss02;
sub summationintegral by summationintegral.ss02;
sub integral.rtlm by integral.rtlm.ss02;
sub dblintegral.rtlm by dblintegral.rtlm.ss02;
sub tripleintegral.rtlm by tripleintegral.rtlm.ss02;
sub quadrupleintegral.rtlm by quadrupleintegral.rtlm.ss02;
sub contourintegral.rtlm by contourintegral.rtlm.ss02;
sub surfaceintegral.rtlm by surfaceintegral.rtlm.ss02;
sub volumeintegral.rtlm by volumeintegral.rtlm.ss02;
sub clockwiseintegral.rtlm by clockwiseintegral.rtlm.ss02;
sub clockwisecontourintegral.rtlm by clockwisecontourintegral.rtlm.ss02;
sub anticlockwisecontourintegral.rtlm by anticlockwisecontourintegral.rtlm.ss02;
sub finitePartIntegral.rtlm by finitePartIntegral.rtlm.ss02;
sub doublestrokeintegral.rtlm by doublestrokeintegral.rtlm.ss02;
sub slashintegral.rtlm by slashintegral.rtlm.ss02;
sub circulationfunction.rtlm by circulationfunction.rtlm.ss02;
sub anticlockwiseintegral.rtlm by anticlockwiseintegral.rtlm.ss02;
sub rectangularlineintegral.rtlm by rectangularlineintegral.rtlm.ss02;
sub semicircularlineintegral.rtlm by semicircularlineintegral.rtlm.ss02;
sub nopolelineintegral.rtlm by nopolelineintegral.rtlm.ss02;
sub pointoperatorintegral.rtlm by pointoperatorintegral.rtlm.ss02;
sub quaternionintegral.rtlm by quaternionintegral.rtlm.ss02;
sub leftarrowhookintegral.rtlm by leftarrowhookintegral.rtlm.ss02;
sub timesintegral.rtlm by timesintegral.rtlm.ss02;
sub intersectionintegral.rtlm by intersectionintegral.rtlm.ss02;
sub unionintegral.rtlm by unionintegral.rtlm.ss02;
sub overbarintegral.rtlm by overbarintegral.rtlm.ss02;
sub underbarintegral.rtlm by underbarintegral.rtlm.ss02;
sub summationintegral.rtlm by summationintegral.rtlm.ss02;
";
labels = (
{
language = dflt;
value = "Straight integrals";
}
);
tag = ss02;
},
{
automatic = 1;
code = "sub i by idotless;
sub j by jdotless;
sub isansitalic-math by isansitalic-math.dtls;
Expand Down Expand Up @@ -827,6 +892,7 @@ sub natural-musical from [natural-musical.ssty1 natural-musical.ssty2];
sub sharp-musical from [sharp-musical.ssty1 sharp-musical.ssty2];
sub integral from [integral.ssty1 integral.ssty2];
sub summation from [summation.ssty1 summation.ssty2];
sub integral.ss02 from [integral.ss02.ssty1 integral.ss02.ssty2];
sub downtackmod from [downtackmod.ssty1 downtackmod.ssty2];
sub uptackmod from [uptackmod.ssty1 uptackmod.ssty2];
sub prime from [prime.ssty1 prime.ssty2];
Expand Down Expand Up @@ -1011,15 +1077,13 @@ stemValues = (
);
userData = {
GSCornerRadius = 20;
GSOffsetHorizontal = 10;
GSOffsetKeepCompatible = 1;
GSOffsetProportional = 1;
GSOffsetVertical = 16;
GSOffsetHorizontal = 26;
GSOffsetVertical = 22;
com.nagwa.MATHPlugin.constants = {
AccentBaseHeight = 556;
AxisHeight = 352;
DelimitedSubFormulaMinHeight = 2400;
DisplayOperatorMinHeight = 2400;
DelimitedSubFormulaMinHeight = 2300;
DisplayOperatorMinHeight = 2300;
FlattenedAccentBaseHeight = 714;
FractionDenomDisplayStyleGapMin = 210;
FractionDenominatorDisplayStyleShiftDown = 690;
Expand Down Expand Up @@ -1075,7 +1139,6 @@ UpperLimitBaselineRiseMin = 200;
UpperLimitGapMin = 100;
};
};
visible = 1;
}
);
instances = (
Expand Down
Expand Up @@ -5,7 +5,7 @@ layers = (
anchors = (
{
name = _center;
pos = (330,322);
pos = (350,322);
}
);
layerId = master01;
Expand Down
Expand Up @@ -5,7 +5,7 @@ layers = (
anchors = (
{
name = _center;
pos = (236,322);
pos = (236,362);
}
);
layerId = master01;
Expand Down
209 changes: 150 additions & 59 deletions sources/NotoSansMath.glyphspackage/glyphs/_part.integral.glyph
Expand Up @@ -6,10 +6,11 @@ layers = (
anchors = (
{
name = "#entry";
pos = (97,0);
},
{
name = "#exit";
pos = (259,0);
pos = (396,0);
}
);
layerId = master01;
Expand All @@ -20,47 +21,58 @@ shapes = (
{
closed = 1;
nodes = (
(227,-240,o),
(282,-179,o),
(282,-62,cs),
(282,701,ls),
(282,777,o),
(310,815,o),
(365,815,cs),
(383,815,o),
(402,811,o),
(421,803,c),
(421,876,l),
(406,882,o),
(385,885,o),
(358,885,cs),
(251,885,o),
(197,826,o),
(197,707,cs),
(197,-56,ls),
(197,-132,o),
(168,-170,o),
(111,-170,cs),
(91,-170,o),
(71,-166,o),
(51,-158,c),
(51,-230,l),
(71,-237,o),
(93,-240,o),
(119,-240,cs)
(90,-228,o),
(129,-238,o),
(166,-238,cs),
(253,-238,o),
(329,-185,o),
(373,-69,cs),
(410,31,o),
(434,174,o),
(458,316,cs),
(483,462,o),
(507,606,o),
(543,699,cs),
(575,785,o),
(617,813,o),
(674,813,cs),
(698,813,o),
(725,808,o),
(755,800,c),
(785,866,l),
(746,883,o),
(707,893,o),
(670,893,cs),
(583,893,o),
(507,841,o),
(463,725,cs),
(424,622,o),
(399,474,o),
(374,328,cs),
(350,186,o),
(327,46,o),
(293,-45,cs),
(261,-130,o),
(219,-158,o),
(162,-158,cs),
(138,-158,o),
(111,-153,o),
(81,-145,c),
(51,-211,l)
);
}
);
width = 472;
width = 836;
},
{
anchors = (
{
name = "#entry";
pos = (193,0);
},
{
name = "#exit";
pos = (259,0);
pos = (545,0);
}
);
associatedMasterId = master01;
Expand All @@ -73,34 +85,112 @@ shapes = (
{
closed = 1;
nodes = (
(227,-830,o),
(282,-769,o),
(282,-652,cs),
(282,1291,ls),
(282,1367,o),
(310,1405,o),
(365,1405,cs),
(383,1405,o),
(402,1401,o),
(421,1393,c),
(421,1466,l),
(406,1472,o),
(385,1475,o),
(358,1475,cs),
(251,1475,o),
(197,1416,o),
(197,1297,cs),
(197,-646,ls),
(197,-722,o),
(168,-760,o),
(111,-760,cs),
(91,-760,o),
(71,-756,o),
(51,-748,c),
(51,-820,l),
(71,-827,o),
(93,-830,o),
(119,-830,cs)
(100,-817,o),
(149,-831,o),
(196,-831,cs),
(315,-831,o),
(420,-739,o),
(476,-497,cs),
(523,-290,o),
(546,12,o),
(574,314,cs),
(602,614,o),
(626,934,o),
(674,1138,cs),
(720,1334,o),
(780,1391,o),
(860,1391,cs),
(892,1391,o),
(928,1382,o),
(967,1368,c),
(1001,1447,l),
(952,1472,o),
(903,1486,o),
(856,1486,cs),
(737,1486,o),
(632,1394,o),
(576,1152,cs),
(527,941,o),
(504,639,o),
(475,321,cs),
(447,18,o),
(424,-284,o),
(378,-483,cs),
(332,-679,o),
(272,-736,o),
(192,-736,cs),
(160,-736,o),
(124,-727,o),
(85,-713,c),
(51,-792,l)
);
}
);
width = 1052;
},
{
anchors = (
{
name = "#entry";
},
{
name = "#exit";
pos = (259,0);
}
);
associatedMasterId = master01;
layerId = "95598981-8D64-468C-8217-FF4E211D02AC";
name = "Regular 6 Mar 24 at 19:14";
partSelection = {
};
shapes = (
{
closed = 0;
nodes = (
(655,833,l),
(538,876,o),
(442,855,o),
(388,712,cs),
(314,518,o),
(290,137,o),
(218,-57,cs),
(164,-200,o),
(68,-221,o),
(-49,-178,c)
);
}
);
width = 472;
},
{
anchors = (
{
name = "#entry";
},
{
name = "#exit";
pos = (259,0);
}
);
associatedMasterId = master01;
layerId = "7F66EB49-53E1-41F5-9F37-751FE5191F06";
name = "Regular-Large 6 Mar 24 at 20:36";
partSelection = {
};
shapes = (
{
closed = 0;
nodes = (
(815,1348,l),
(658,1438,o),
(529,1394,o),
(456,1096,cs),
(371,690,o),
(343,-105,o),
(260,-509,cs),
(187,-807,o),
(58,-851,o),
(-99,-761,c)
);
}
);
Expand All @@ -116,4 +206,5 @@ name = Size;
topValue = 12;
}
);
sortName = integral1;
}

0 comments on commit cc407af

Please sign in to comment.