diff --git a/glyphs/common-shapes.ptl b/glyphs/common-shapes.ptl index e4b901a..808d335 100644 --- a/glyphs/common-shapes.ptl +++ b/glyphs/common-shapes.ptl @@ -41,7 +41,7 @@ export : define [apply] : begin set newid _newid : else set parts : {}.slice.call arguments 0 - set newid ('glyph' + [newtemp]) + set newid ('composite-glyph' + [newtemp]) return : create-glyph newid : glyph-construction local first true diff --git a/glyphs/letters-unified-extended.ptl b/glyphs/letters-unified-extended.ptl index d6b9b98..27b4942 100644 --- a/glyphs/letters-unified-extended.ptl +++ b/glyphs/letters-unified-extended.ptl @@ -118,25 +118,26 @@ export : define [apply] : begin save 'gamma' 0x3B3 - define [LambdaShape sw] : glyph-construction + define [LambdaShape sw _top] : glyph-construction local TURN (CAP * 0.1) local curviness 0.2 + local top : fallback _top CAP include : dispiro widths.rhs sw flat SB 0 [heading UPWARD] curl SB TURN [heading UPWARD] quadcontrols 0 curviness - g4 (MIDDLE - sw / 2) CAP [widths 0 (sw * 0.8)] + g4 (MIDDLE - sw / 2) top [widths 0 (sw * 0.8)] include : dispiro widths.lhs sw flat RIGHTSB 0 [heading UPWARD] curl RIGHTSB TURN [heading UPWARD] quadcontrols 0 curviness - g4 (MIDDLE + sw / 2) CAP [widths (sw * 0.8) 0] + g4 (MIDDLE + sw / 2) top [widths (sw * 0.8) 0] - start-from (MIDDLE - sw / 2) CAP - line-to (MIDDLE + sw / 2) CAP - line-to MIDDLE (CAP - sw) + start-from (MIDDLE - sw / 2) top + line-to (MIDDLE + sw / 2) top + line-to MIDDLE (top - sw) if SLAB : begin include : CenterBottomSerif (SB + sw / 2 * HVCONTRAST) 0 JUT @@ -153,7 +154,7 @@ export : define [apply] : begin sketch # Delta include glyphs.Lambda AS_BASE - include : HBar (SB + HALFSTROKE) (RIGHTSB - HALFSTROKE) HALFSTROKE + include : HBarBottom (SB + HALFSTROKE) (RIGHTSB - HALFSTROKE) 0 eject-contour 'serif' save 'Delta' 0x394 diff --git a/glyphs/overmarks.ptl b/glyphs/overmarks.ptl index 0f4fa66..2795bbc 100644 --- a/glyphs/overmarks.ptl +++ b/glyphs/overmarks.ptl @@ -228,6 +228,18 @@ export : define [apply] : begin rightEnd -- RIGHTSB hs -- (OPERATORSTROKE / 2) save 'asciitilde.high' + + sketch # asciitilde.high + local t [mix (XH + ACCENT) aboveMarkTop ((RIGHTSB - SB) / (markExtend * 3))] + local b [mix (XH + ACCENT) (aboveMarkBot + markFine / 2) ((RIGHTSB - SB) / (markExtend * 3))] + include : TildeShape + ttop -- t + tbot -- b + leftEnd -- [mix 0 SB (1/3)] + rightEnd -- [mix WIDTH RIGHTSB (1/3)] + hs -- ([adviceBlackness 4.5] / 2) + include : Realign MIDDLE [mix t b (1/2)] MIDDLE parenMid + save 'overlaytilde' sketch set-width 0 diff --git a/glyphs/symbol-geometric.ptl b/glyphs/symbol-geometric.ptl index 3fb9f90..732f720 100644 --- a/glyphs/symbol-geometric.ptl +++ b/glyphs/symbol-geometric.ptl @@ -340,7 +340,7 @@ export : define [apply] : begin hollow 'smallwhitecircle' null 'smallblackcircle' [hollowScale : squareRadius * designParameters.geometric_small_x] hollow 'hwsmallwhitecircle' null 'hwsmallblackcircle' [hollowScale (squareRadius * designParameters.geometric_small_x) 1] hollow 'hwwhitecircle' null 'hwblackcircle' - hollow 'hwwhitediamond' null 'hwblackdiamond' + hollow 'hwwhitediamond' null 'hwblackdiamond' [hollowScale squareRadius nothing (hollowSW * [Math.sqrt 2])] hollow 'whitediamond' 0x25C7 'blackdiamond' [hollowScale squareRadius nothing (hollowSW * [Math.sqrt 2])] let [sts 0.75] diff --git a/glyphs/symbol-math.ptl b/glyphs/symbol-math.ptl index f136396..00f5c86 100644 --- a/glyphs/symbol-math.ptl +++ b/glyphs/symbol-math.ptl @@ -297,6 +297,7 @@ export : define [apply] : begin save 'greatereqslant' 0x2A7E sketch # subst + include markset.plus local top : mix parenMid parenTop 0.5 local bot : mix parenMid parenBot 0.5 include : dispiro @@ -308,17 +309,16 @@ export : define [apply] : begin arcvh flat (SB + (top - bot) / 2) bot curl RIGHTSB bot [heading RIGHTWARD] - save 'subst' 0x2282 sketch # element - include glyphs.subst + include glyphs.subst AS_BASE include : HBar (SB + HALFSTROKE) RIGHTSB parenMid OPERATORSTROKE - save 'element' 0x2208 turned nothing 0x2283 'subst' MIDDLE parenMid turned nothing 0x220B 'element' MIDDLE parenMid - + composite glyphs.element glyphs.underlineBelow [into-unicode 0x22F8] + sketch # sym include : WaveShape l -- SB @@ -413,15 +413,24 @@ export : define [apply] : begin include : VBarLeft l operTop operBot aplBoxSW include : VBarRight r operTop operBot aplBoxSW save 'aplsquare' 0x2395 + sketch # aplibar + local l [mix 0 SB (1 / 3)] + local r [mix WIDTH RIGHTSB (1 / 3)] + include : HBarTop l r operTop aplBoxSW + include : HBarBottom l r operBot aplBoxSW + include : VBar MIDDLE operTop operBot aplBoxSW + save 'aplibar' 0x2336 + sketch # aplsquish + local l SB + local r RIGHTSB + include : HBarTop l r operTop aplBoxSW + include : HBarBottom l r operBot aplBoxSW + include : VBarLeft l operTop operBot aplBoxSW + include : VBarRight r operTop operBot aplBoxSW + save 'aplsquish' 0x2337 sketch # aplbar include : VBar MIDDLE parenTop parenBot aplBoxSW save 'aplbar' - sketch # aplslash - include : dispiro - widths.center aplBoxSW - flat SB operBot - curl RIGHTSB operTop - save 'aplslash' sketch # aplbackslash include : dispiro widths.center aplBoxSW @@ -429,7 +438,7 @@ export : define [apply] : begin curl RIGHTSB operBot save 'aplbackslash' - define aplBoxTfm : ScaleAround MIDDLE parenMid ((WIDTH - aplBoxSW * 1.75) / WIDTH) + define aplBoxTfm : ScaleAround MIDDLE parenMid [Math.min ((WIDTH - aplBoxSW * 1.75) / WIDTH) ((operTop - operBot) / (parenTop - parenBot))] composite glyphs.equal aplBoxTfm glyphs.aplsquare [into-unicode 0x2338] composite glyphs.divide aplBoxTfm glyphs.aplsquare [into-unicode 0x2339] @@ -438,8 +447,8 @@ export : define [apply] : begin composite glyphs.hwwhitecircle aplBoxTfm glyphs.aplsquare [into-unicode 0x233C] composite glyphs.hwwhitecircle glyphs.aplbar [into-unicode 0x233D] composite glyphs.hwwhitecircle glyphs.hwsmallwhitecircle [into-unicode 0x233E] - composite glyphs.minus glyphs.aplslash [into-unicode 0x233F] - composite glyphs.minus glyphs.aplbackslash [into-unicode 0x2340] + composite glyphs.minus glyphs.slash [into-unicode 0x233F] + composite glyphs.minus glyphs.backslash [into-unicode 0x2340] composite glyphs.slash aplBoxTfm glyphs.aplsquare [into-unicode 0x2341] composite glyphs.backslash aplBoxTfm glyphs.aplsquare [into-unicode 0x2342] composite glyphs.less aplBoxTfm glyphs.aplsquare [into-unicode 0x2343] @@ -472,7 +481,14 @@ export : define [apply] : begin composite glyphs.hwarrowdown glyphs.minus [into-unicode 0x2356] composite glyphs.hwarrowdown aplBoxTfm glyphs.aplsquare [into-unicode 0x2357] composite glyphs.singleQuote markset.plus glyphs.underlineBelow [into-unicode 0x2358] - composite glyphs.nabla glyphs.underlineBelow [into-unicode 0x2359] + composite + begin glyphs.space + LambdaShape OPERATORSTROKE (plusTop - plusBot + ACCENT) + HBarBottom (SB + OPERATORSTROKE / 2) (RIGHTSB - OPERATORSTROKE / 2) 0 OPERATORSTROKE + Realign MIDDLE ((plusTop - plusBot) / 2) MIDDLE parenMid + begin markset.plus + begin glyphs.underlineBelow + into-unicode 0x2359 composite glyphs.hwwhitediamond markset.plus glyphs.underlineBelow [into-unicode 0x235A] composite glyphs.hwsmallwhitecircle markset.plus glyphs.underlineBelow [into-unicode 0x235B] composite glyphs.hwwhitecircle markset.plus glyphs.underlineBelow [into-unicode 0x235C] @@ -496,14 +512,14 @@ export : define [apply] : begin composite glyphs.'asciitilde.low' glyphs.dieresisAbove [into-unicode 0x2368] composite glyphs.'greater.narrow' glyphs.dieresisAbove [into-unicode 0x2369] composite glyphs.minus glyphs.comma [Upright] [Translate 0 (XH / 2)] [Italify] [into-unicode 0x236A] - composite glyphs.nabla glyphs.'asciitilde.low' [into-unicode 0x236B] - composite glyphs.'zero.unslashed' glyphs.'asciitilde.low' [into-unicode 0x236C] - composite glyphs.bar glyphs.'asciitilde.low' [into-unicode 0x236D] + composite glyphs.nabla glyphs.overlaytilde [into-unicode 0x236B] + composite glyphs.'zero.unslashed' glyphs.overlaytilde [into-unicode 0x236C] + composite glyphs.bar glyphs.overlaytilde [into-unicode 0x236D] composite glyphs.semicolon [Realign MIDDLE (XH/2) MIDDLE parenMid] markset.plus glyphs.underlineBelow [into-unicode 0x236E] composite glyphs.noteq aplBoxTfm glyphs.aplsquare [into-unicode 0x236F] composite glyphs.question aplBoxTfm glyphs.aplsquare [into-unicode 0x2370] - composite glyphs.vee glyphs.'asciitilde.low' [into-unicode 0x2371] - composite glyphs.wedge glyphs.'asciitilde.low' [into-unicode 0x2372] + composite glyphs.vee glyphs.overlaytilde [into-unicode 0x2371] + composite glyphs.wedge glyphs.overlaytilde [into-unicode 0x2372] alias 'apliota' 0x2373 'iota' alias 'aplrho' 0x2374 'rho' alias 'aplomega' 0x2375 'omega' @@ -516,6 +532,7 @@ export : define [apply] : begin ### Others alias 'mathbullet' 0x2219 'bullet' + alias 'mathbar' 0x2223 'bar' alias 'mathsmallcircle' 0x2218 'hwsmallwhitecircle' alias 'mathstar' 0x22C6 'hwblackstar' diff --git a/parameters.toml b/parameters.toml index b3473b2..62ca175 100644 --- a/parameters.toml +++ b/parameters.toml @@ -1,6 +1,6 @@ [iosevka] family = 'Iosevka' -version = '1.10.1' +version = '1.10.2' codename = 'Juno' copyright = 'Copyright (c) 2015-2016 Belleve Invis.' licence = '''This font software is licenced under the SIL Open Font Licence, Version 1.1. This is licence is avaliable with a FAQ at: http://scripts.sil.org/OFL. This font software is distributes on an 'AS IS' basis, without warranties or conditions of any kind, either express or implied. See the SIL Open Font licence fot the specific language, premissions and limitations governing your use of this font software.''' @@ -710,4 +710,4 @@ at = 'fourfold' [v-at-short.variantSelector] at = 'short' [cv33.variantSelector] -at = 'short' \ No newline at end of file +at = 'short'