Skip to content

Commit

Permalink
remove "ai" knots
Browse files Browse the repository at this point in the history
  • Loading branch information
@be5invis
be5invis committed Apr 13, 2020
1 parent fbfaecb commit 01f8125
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 47 deletions.
24 changes: 12 additions & 12 deletions glyphs/common-shapes.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ glyph-block CommonShapes : begin
define [CircleRingAt x y r] : CircleRing (y + r) (y - r) (x - r) (x + r)
define [CircleDotAt x y r] : CircleRing (y + r) (y - r) (x - r) (x + r) true

define [OShape u d l r _width _sma _smb ai] : glyph-construction
define [OShape u d l r _width _sma _smb] : glyph-construction
local middle : (l + r) / 2
local width : fallback _width STROKE
local sma : fallback _sma SMALLSMOOTHA
Expand All @@ -211,13 +211,13 @@ glyph-block CommonShapes : begin
widths width 0
g4 (middle - mc) (u - O)
archv
[if ai flat.ai flat] (l + OX) (u - sma)
[if ai curl.ai curl] (l + OX) (d + smb)
flat (l + OX) (u - sma)
curl (l + OX) (d + smb)
arcvh
g4 (middle + mc) (d + O)
archv
[if ai flat.ai flat] (r - OX) (d + sma)
[if ai curl.ai curl] (r - OX) (u - smb)
flat (r - OX) (d + sma)
curl (r - OX) (u - smb)
arcvh
close
: else : begin
Expand All @@ -234,7 +234,7 @@ glyph-block CommonShapes : begin
g4 (r - OX) ymiddleb
arcvh
close
define [OShapeOutline u d l r _width _sma _smb ai] : glyph-construction
define [OShapeOutline u d l r _width _sma _smb] : glyph-construction
local middle : (l + r) / 2
local width : fallback _width STROKE
local sma : fallback _sma SMALLSMOOTHA
Expand All @@ -244,13 +244,13 @@ glyph-block CommonShapes : begin
include : spiro-outline
g4 (middle - mc) (u - O)
archv
[if ai flat.ai flat] (l + OX) (u - sma)
[if ai curl.ai curl] (l + OX) (d + smb)
flat (l + OX) (u - sma)
curl (l + OX) (d + smb)
arcvh
g4 (middle + mc) (d + O)
archv
[if ai flat.ai flat] (r - OX) (d + sma)
[if ai curl.ai curl] (r - OX) (u - smb)
flat (r - OX) (d + sma)
curl (r - OX) (u - smb)
arcvh
close
: else : begin
Expand Down Expand Up @@ -280,8 +280,8 @@ glyph-block CommonShapes : begin
arcvh
g4 (mb) O [widths.heading STROKE 0 {.y (1) .x (-sb)}]
archv
[if ((SMALLSMOOTHA + SMALLSMOOTHB) / top > 0.75) flat.ai flat] (RIGHTSB - OX) (0 + SMALLSMOOTHA)
[if ((SMALLSMOOTHA + SMALLSMOOTHB) / top > 0.75) curl.ai curl] (RIGHTSB - OX) (top - SMALLSMOOTHB)
flat (RIGHTSB - OX) (0 + SMALLSMOOTHA)
curl (RIGHTSB - OX) (top - SMALLSMOOTHB)
arcvh
g4 (mt) (top - O) [widths.heading STROKE 0 {.y (-1) .x (-st)}]
archv
Expand Down
40 changes: 20 additions & 20 deletions glyphs/letters-unified-basic.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1992,8 +1992,8 @@ glyph-block LetterUnified-Basic : begin
arcvh
g4 (MIDDLE - CORRECTION_OMIDS) (top - O)
archv
flat.ai (SB + O) (top - SMALLSMOOTHA)
curl.ai (SB + O) SMALLSMOOTHB
flat (SB + O) (top - SMALLSMOOTHA)
curl (SB + O) SMALLSMOOTHB
arcvh
g4 (MIDDLE + CORRECTION_OMIDS) O
archv
Expand All @@ -2018,8 +2018,8 @@ glyph-block LetterUnified-Basic : begin
arcvh
g4 (MIDDLE - CORRECTION_OMIDS) (top - O)
archv
flat.ai (RIGHTSB - O) (top - SMALLSMOOTHB)
curl.ai (RIGHTSB - O) SMALLSMOOTHA
flat (RIGHTSB - O) (top - SMALLSMOOTHB)
curl (RIGHTSB - O) SMALLSMOOTHA
arcvh
g4 (MIDDLE + CORRECTION_OMIDS) O
archv
Expand Down Expand Up @@ -2754,8 +2754,8 @@ glyph-block LetterUnified-Basic : begin
widths.lhs
g4 RIGHTSB (XH - HOOK)
hookstart XO
flat.ai (SB + OX) (XH - SMALLSMOOTHA)
curl.ai (SB + OX) (0 + SMALLSMOOTHB)
flat (SB + OX) (XH - SMALLSMOOTHA)
curl (SB + OX) (0 + SMALLSMOOTHB)
hookend O
g4 RIGHTSB HOOK
save 'c' 'c'
Expand Down Expand Up @@ -2816,8 +2816,8 @@ glyph-block LetterUnified-Basic : begin
widths.lhs stroke
g4 RIGHTSB (XH - HOOK)
hookstart XH
flat.ai (SB + OX) (XH - SMALLSMOOTHA)
curl.ai (SB + OX) SMALLSMOOTHB
flat (SB + OX) (XH - SMALLSMOOTHA)
curl (SB + OX) SMALLSMOOTHB
arcvh
CurlyTail fine rinner m1 0 RIGHTSB x2 y2
linreg 500 (0.5) 375 (-0.25) : Math.min WIDTH 500
Expand Down Expand Up @@ -2867,13 +2867,13 @@ glyph-block LetterUnified-Basic : begin
flat (MIDDLE + 1) (XH - O)
curl MIDDLE (XH - O)
archv
flat.ai (SB + OX) (XH - SMALLSMOOTHA)
curl.ai (SB + OX) SMALLSMOOTHB
flat (SB + OX) (XH - SMALLSMOOTHA)
curl (SB + OX) SMALLSMOOTHB
arcvh
g4 (MIDDLE + CORRECTION_OMIDS) O
archv
flat.ai (RIGHTSB - OX * 0.5) SMALLSMOOTHA
curl.ai (RIGHTSB - OX * 0.5) (XH - SMALLSMOOTHB)
flat (RIGHTSB - OX * 0.5) SMALLSMOOTHA
curl (RIGHTSB - OX * 0.5) (XH - SMALLSMOOTHB)
arcvh
flat MIDDLE (XH - HALFSTROKE - O) [widths HALFSTROKE 0]
curl (MIDDLE - 1) (XH - HALFSTROKE - O)
Expand All @@ -2885,8 +2885,8 @@ glyph-block LetterUnified-Basic : begin
widths.lhs
g4 RIGHTSB (XH - HOOK)
hookstart XH
flat.ai (SB + OX) (XH - SMALLSMOOTHA)
curl.ai (SB + OX) SMALLSMOOTHB
flat (SB + OX) (XH - SMALLSMOOTHA)
curl (SB + OX) SMALLSMOOTHB
arcvh
g4 (MIDDLE + CORRECTION_OMIDS) 0
alsothru 0.5 0.1353
Expand Down Expand Up @@ -3103,7 +3103,7 @@ glyph-block LetterUnified-Basic : begin
sketch # o
set-width WIDTH
include MarkSet.e
include : OShape XH 0 SB RIGHTSB nothing nothing nothing true
include : OShape XH 0 SB RIGHTSB nothing nothing nothing
set-anchor 'trailing' BASE MIDDLE 0
save 'o' 'o'
save 'omicron' 0x3BF
Expand All @@ -3123,7 +3123,7 @@ glyph-block LetterUnified-Basic : begin
include : HornBaseAnchor RIGHTSB XH (WIDTH / 2) (SMOOTHB) (-1)
include : difference
HornShape RIGHTSB XH (WIDTH / 2) (SMOOTHB) (-1)
OShapeOutline (XH + O) (0 - O) (SB - O) (RIGHTSB + O) nothing nothing nothing true
OShapeOutline (XH + O) (0 - O) (SB - O) (RIGHTSB + O) nothing nothing nothing
include : refer-glyph "o"
save 'oHorn' 0x01A1

Expand Down Expand Up @@ -4128,8 +4128,8 @@ glyph-block LetterUnified-Basic : begin
arcvh
g4 (MIDDLE - CORRECTION_OMIDS) (top - O)
archv
[if ((SMALLSMOOTHA + SMALLSMOOTHB) / top > 0.75) flat.ai flat] (SB + OX) (top - SMALLSMOOTHA)
[if ((SMALLSMOOTHA + SMALLSMOOTHB) / top > 0.75) curl.ai curl] (SB + OX) (0 + SMALLSMOOTHB)
flat (SB + OX) (top - SMALLSMOOTHA)
curl (SB + OX) (0 + SMALLSMOOTHB)
hookend O (sw -- stroke)
g4 (RIGHTSB - OX * [if para.isItalic 0 0.5]) hook
include : HBarBottom (SB + (stroke / 2) + OX) (RIGHTSB - (stroke / 2) - OX) barbottom stroke
Expand Down Expand Up @@ -4164,8 +4164,8 @@ glyph-block LetterUnified-Basic : begin
arcvh
g4 MIDDLE (top - O)
archv
[if ((SMALLSMOOTHA + SMALLSMOOTHB) / top > 0.75) flat.ai flat] (RIGHTSB - OX) (top - SMALLSMOOTHB)
[if ((SMALLSMOOTHA + SMALLSMOOTHB) / top > 0.75) curl.ai curl] (RIGHTSB - OX) SMALLSMOOTHA
flat (RIGHTSB - OX) (top - SMALLSMOOTHB)
curl (RIGHTSB - OX) SMALLSMOOTHA
hookend O (sw -- stroke)
g4 (SB + O) AHOOK
include : HBarBottom (SB + (stroke / 2)) (RIGHTSB - (stroke / 2)) barbottom stroke
Expand Down
22 changes: 11 additions & 11 deletions glyphs/letters-unified-extended.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ glyph-block LetterUnified-Extended : begin
bezcontrols k1 k2 k3 1 6
g4.left.mid (middle + CORRECTION_OMIDS) O [widths 0 STROKE]
archv
flat.ai (SB + OX * 2) SMALLSMOOTHB
curl.ai (SB + OX * 2) (XH - SMALLSMOOTHA)
flat (SB + OX * 2) SMALLSMOOTHB
curl (SB + OX * 2) (XH - SMALLSMOOTHA)
arcvh
g4.right.mid (middle - CORRECTION_OMIDS) XO [widths 0 STROKE]
bezcontrols (1 - k3) 0 (1 - k1) (1 - k2) 6
Expand Down Expand Up @@ -142,13 +142,13 @@ glyph-block LetterUnified-Extended : begin
arcvh 2
g4 xOTLeft bar [heading RIGHTWARD]
alsothruthem : list {0.25 0.05} {0.5 0.13}
flat.ai (RIGHTSB - OX) (bar - smb)
curl.ai (RIGHTSB - OX) sma
flat (RIGHTSB - OX) (bar - smb)
curl (RIGHTSB - OX) sma
arcvh
g4.left.mid (MIDDLE + CORRECTION_OMIDS) O
archv
flat.ai (SB + OX) smb
curl.ai (SB + OX) (bar - sma)
flat (SB + OX) smb
curl (SB + OX) (bar - sma)
arcvh
g4 xOTLeft (bar - (STROKE - fine) / 2) [widths 0 fine]

Expand All @@ -167,8 +167,8 @@ glyph-block LetterUnified-Extended : begin
arcvh
g4 (MIDDLE - CORRECTION_OMIDS) (CAP * 0.7 - O) [widths.rhs STROKE]
archv
flat.ai (RIGHTSB - OX) (XH - SMALLSMOOTHB)
curl.ai (RIGHTSB - OX) SMALLSMOOTHA
flat (RIGHTSB - OX) (XH - SMALLSMOOTHB)
curl (RIGHTSB - OX) SMALLSMOOTHA
arcvh
g4 (MIDDLE + CORRECTION_OMIDS) O
archv
Expand Down Expand Up @@ -465,7 +465,7 @@ glyph-block LetterUnified-Extended : begin
local y1 0
local y2 XH
include : VBar df.middle DESCENDER (y1 + HALFSTROKE)
include : OShape y2 y1 df.leftSB df.rightSB df.mvs (SMOOTHA * df.div) (SMOOTHB * df.div) nothing true
include : OShape y2 y1 df.leftSB df.rightSB df.mvs (SMOOTHA * df.div) (SMOOTHB * df.div) nothing
include : VBar df.middle y1 y2 df.mvs
include : VBar df.middle (y2 - HALFSTROKE) CAP
save 'varphi' 0x3D5
Expand Down Expand Up @@ -944,8 +944,8 @@ glyph-block LetterUnified-Extended : begin
arcvh
g4 (MIDDLE - CORRECTION_OMIDS) (CAP * 0.7 - O) [widths.lhs]
archv
flat.ai (SB + OX) (XH - SMALLSMOOTHA)
curl.ai (SB + OX) SMALLSMOOTHB
flat (SB + OX) (XH - SMALLSMOOTHA)
curl (SB + OX) SMALLSMOOTHB
arcvh
g4 (MIDDLE + CORRECTION_OMIDS) O
archv
Expand Down
4 changes: 0 additions & 4 deletions support/spirokit.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ export : define [SetupBuilders args] : begin

define straight {.l flat .r curl}

#derived knots
#"ai" knots, used for left and right edges of letters `o`, and similar letters
define flat.ai : if para.isItalic g4 flat
define curl.ai : if para.isItalic g4 curl
#directional bi-knots
let
directions {{.name 'up' .x 0 .y 1}, {.name 'down' .x 0 .y (-1)}, {.name 'left' .x (-1) .y 0}, {.name 'right' .x 1 .y 0}}
Expand Down

0 comments on commit 01f8125

Please sign in to comment.