diff --git a/README.md b/README.md index 0ee86be7f..c7029e47f 100644 --- a/README.md +++ b/README.md @@ -406,6 +406,8 @@ Subsection `ligations` is used to customize the ligation set assigned to `calt` - `gteq-as-co-arrow`: Treat `>=` as co-arrow. - `html-comment`: Enable ligation for ` diff --git a/changes/4.1.0.md b/changes/4.1.0.md index 0f5498cd5..3cd8eb2e4 100644 --- a/changes/4.1.0.md +++ b/changes/4.1.0.md @@ -1,2 +1,3 @@ - * Add characters + * Add ligation group `brack-bar` and `brace-bar`, and enabled in `dlig` (#767). + * Add characters: - Telephone Sign (`U+2121`) and Facsimile Sign (`U+213B`). \ No newline at end of file diff --git a/font-src/glyphs/symbol/punctuation.ptl b/font-src/glyphs/symbol/punctuation.ptl index d910b7105..63997873c 100644 --- a/font-src/glyphs/symbol/punctuation.ptl +++ b/font-src/glyphs/symbol/punctuation.ptl @@ -98,16 +98,17 @@ glyph-block Symbol-Punctuation-Brackets : begin define [BracketMask] : Rect MosaicTop MosaicBottom (-Width) (2 * Width) - define [BracketShape top bottom] : glyph-proc - local l : mix SB RightSB DesignParameters.bracketOutside - local r : mix SB RightSB DesignParameters.bracketInside + define [BracketShape top bottom barLeft ext] : glyph-proc + local l : fallback barLeft : mix SB RightSB DesignParameters.bracketOutside + local r : [fallback ext 0] + [mix SB RightSB DesignParameters.bracketInside] include : HBarBottom l r bottom include : HBarTop l r top include : VBarLeft l bottom top - create-glyph 'bracketLeft' '[' : glyph-proc - include : BracketShape ParenTop ParenBot + create-glyph 'bracketLeft' '[' : BracketShape ParenTop ParenBot + + create-glyph 'ligExtBracketLeft' : BracketShape ParenTop ParenBot (Middle - HalfStroke * HVContrast) [mix SB RightSB DesignParameters.bracketInside] create-glyph 'bracketLeftUpper' 0x23A1 : glyph-proc include : intersection [BracketMask] @@ -143,6 +144,7 @@ glyph-block Symbol-Punctuation-Brackets : begin VBarLeft l ParenBot ParenTop turned 'bracketRight' ']' 'bracketLeft' Middle SymbolMid + turned 'ligExtBracketRight' null 'ligExtBracketLeft' Middle SymbolMid turned 'bracketRightLower' 0x23A6 'bracketLeftUpper' Middle SymbolMid turned 'bracketRightExtension' 0x23A5 'bracketLeftExtension' Middle SymbolMid turned 'bracketRightUpper' 0x23A4 'bracketLeftLower' Middle SymbolMid @@ -156,31 +158,37 @@ glyph-block Symbol-Punctuation-Brackets : begin (ParenTop - SymbolMid - Stroke * 1.5) / 2 return : object parenCenter radius - define [BraceUpperHalfShape top bottom] : glyph-proc + define [BraceUpperHalfShape top bottom pExt] : glyph-proc define [object parenCenter radius] : BraceDim + define xIns : mix SB RightSB DesignParameters.braceInside + define xTip : mix SB RightSB DesignParameters.braceOutside include : dispiro - straight.left.start [mix SB RightSB DesignParameters.braceInside] top [widths.heading HalfStroke HalfStroke Leftward] + flat ((1 + [fallback pExt 0]) * xIns) top [widths.center.heading Stroke Leftward] + curl (xIns - 0.1) top [heading Leftward] archv flat parenCenter (top - radius) [heading Downward] curl parenCenter (bottom + radius) [heading Downward] arcvh - straight.left.end [mix SB RightSB DesignParameters.braceOutside] bottom [heading Leftward] + straight.left.end xTip bottom [heading Leftward] + + define [BraceLowerHalfShape top bottom pExt] : glyph-proc + define [object parenCenter radius] : BraceDim + define xIns : mix SB RightSB DesignParameters.braceInside + define xTip : mix SB RightSB DesignParameters.braceOutside + include : dispiro + flat ((1 + [fallback pExt 0]) * xIns) bottom [widths.center.heading Stroke Leftward] + curl (xIns - 0.1) bottom [heading Leftward] + archv + flat parenCenter (bottom + radius) [heading Upward] + curl parenCenter (top - radius) [heading Upward] + arcvh + straight.left.end xTip top [heading Leftward] define [BraceUpperThirdShape top bottom] : glyph-proc define [object parenCenter radius] : BraceDim include : intersection [BracketMask] BraceUpperHalfShape top (bottom - MosaicHeight) - define [BraceLowerHalfShape top bottom] : glyph-proc - define [object parenCenter radius] : BraceDim - include : dispiro - straight.left.start [mix SB RightSB DesignParameters.braceInside] bottom [widths.heading HalfStroke HalfStroke Leftward] - archv - flat parenCenter (bottom + radius) [heading Upward] - curl parenCenter (top - radius) [heading Upward] - arcvh - straight.left.end [mix SB RightSB DesignParameters.braceOutside] top [heading Leftward] - define [BraceLowerThirdShape top bottom] : glyph-proc define [object parenCenter radius] : BraceDim include : intersection [BracketMask] @@ -207,6 +215,10 @@ glyph-block Symbol-Punctuation-Brackets : begin include : BraceUpperHalfShape top SymbolMid include : BraceLowerHalfShape SymbolMid bot + create-glyph 'ligExtBraceLeft.straight' : glyph-proc + include : BraceUpperHalfShape top SymbolMid 1 + include : BraceLowerHalfShape SymbolMid bot 1 + create-glyph 'braceLeftUpper' 0x23A7 : glyph-proc include : BraceUpperThirdShape top bot @@ -220,11 +232,12 @@ glyph-block Symbol-Punctuation-Brackets : begin include : BraceExtensionShape top bot turned 'braceRight.straight' null 'braceLeft.straight' Middle SymbolMid + turned 'ligExtBraceRight.straight' null 'ligExtBraceLeft.straight' Middle SymbolMid turned 'braceRightLower' 0x23AD 'braceLeftUpper' Middle SymbolMid turned 'braceRightUpper' 0x23AB 'braceLeftLower' Middle SymbolMid turned 'braceRightMiddle' 0x23AC 'braceLeftMiddle' Middle SymbolMid - define [CurlyBraceShape sw] : glyph-proc + define [CurlyBraceShape sw pExt] : glyph-proc local hs : sw / 2 local xIns : mix SB RightSB DesignParameters.braceInside local xOus : mix SB RightSB DesignParameters.braceOutside @@ -237,30 +250,37 @@ glyph-block Symbol-Punctuation-Brackets : begin local top : mix SymbolMid ParenTop (1 + DesignParameters.braceOvershoot) local bot : mix SymbolMid ParenBot (1 + DesignParameters.braceOvershoot) include : dispiro - straight.left.start xIns (top - hs) [widths.heading hs hs Leftward] + flat (xIns * (1 + pExt)) (top - hs) [widths.center.heading sw Leftward] + curl (xIns - 0.1) (top - hs) [heading Leftward] archv g4.down.mid m1 (top - radius1) [heading Downward] alsoThru 0.5 0.5 [widths (ess / 2) (ess / 2)] - g4.down.mid m2 (SymbolMid + radius2) [widths.heading hs hs Downward] + g4.down.mid m2 (SymbolMid + radius2) [widths.center.heading sw Downward] arcvh straight.left.end xOus SymbolMid [heading Leftward] include : dispiro - straight.left.start xIns (bot + hs) [widths.heading hs hs Leftward] + flat (xIns * (1 + pExt)) (bot + hs) [widths.center.heading sw Leftward] + curl (xIns - 0.1) (bot + hs) [heading Leftward] archv g4.up.mid m1 (bot + radius1) [heading Upward] alsoThru 0.5 0.5 [widths (ess / 2) (ess / 2)] - g4.up.mid m2 (SymbolMid - radius2) [widths.heading hs hs Upward] + g4.up.mid m2 (SymbolMid - radius2) [widths.center.heading sw Upward] arcvh straight.left.end xOus SymbolMid [heading Leftward] - create-glyph 'braceLeft.curly' : CurlyBraceShape Stroke + create-glyph 'braceLeft.curly' : CurlyBraceShape Stroke 0 + create-glyph 'ligExtBraceLeft.curly' : CurlyBraceShape Stroke 1 turned 'braceRight.curly' null 'braceLeft.curly' Middle SymbolMid + turned 'ligExtBraceRight.curly' null 'ligExtBraceLeft.curly' Middle SymbolMid select-variant 'braceLeft' '{' select-variant 'braceRight' '}' + select-variant 'ligExtBraceLeft' (follow -- 'braceLeft') + select-variant 'ligExtBraceRight' (follow -- 'braceRight') + do local top : mix SymbolMid ParenTop (1 + DesignParameters.braceOvershoot) local bot : mix SymbolMid ParenBot (1 + DesignParameters.braceOvershoot) @@ -274,7 +294,7 @@ glyph-block Symbol-Punctuation-Brackets : begin local xIns : mix SB RightSB DesignParameters.braceInside local top : mix SymbolMid ParenTop (1 + DesignParameters.braceOvershoot) local bot : mix SymbolMid ParenBot (1 + DesignParameters.braceOvershoot) - include : CurlyBraceShape fine + include : CurlyBraceShape fine 0 include : VBarRight xIns (bot + fine / 2) (top - fine / 2) fine turned 'whiteBraceRight' 0x2984 'whiteBraceLeft' Middle SymbolMid @@ -439,16 +459,24 @@ glyph-block Symbol-Punctuation-Bar : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - define [BarShape] : glyph-proc - set-base-anchor 'above' Middle ParenTop - set-base-anchor 'below' Middle ParenBot - include : VBar Middle ParenBot ParenTop + define [BarShape x gap] : glyph-proc + set-base-anchor 'above' x ParenTop + set-base-anchor 'below' x ParenBot + include : VBar x (ParenBot + gap) (ParenTop - gap) - create-glyph 'bar.upright' : BarShape - create-glyph 'bar.italic.naturalSlope' : BarShape + create-glyph 'bar.upright' : BarShape Middle 0 + create-glyph 'bar.italic.naturalSlope' : BarShape Middle 0 create-glyph 'bar.italic.forceUpright' : glyph-proc include : ForceUpright - include : BarShape + include : BarShape Middle 0 + + create-glyph 'ligBarInsideBracketLeft' : BarShape + [mix SB RightSB DesignParameters.bracketOutside] + HalfStroke * HVContrast + Stroke + [Math.max [AdviceStroke 5] (XH / 12)] + + create-glyph 'ligBarInsideBracketRight' : BarShape + [mix RightSB SB DesignParameters.bracketOutside] - HalfStroke * HVContrast + Stroke + [Math.max [AdviceStroke 5] (XH / 12)] define [DoubleBarShape] : glyph-proc set-base-anchor 'above' Middle ParenTop diff --git a/font-src/otl/gsub-ligation.ptl b/font-src/otl/gsub-ligation.ptl index a0e411f2b..dbc86e256 100644 --- a/font-src/otl/gsub-ligation.ptl +++ b/font-src/otl/gsub-ligation.ptl @@ -903,3 +903,20 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] : chain-rule {'colon.mid'} ~> look-around {'greater'} ~> {'greaterArrow'} + + # [| |] {| |} + do "brack-brace-bar" : begin + CreateLigationLookup : keep-if 'brack-bar' : list + chain-rule + {'bracketLeft'} ~> {'ligExtBracketLeft'} + {'bar'} ~> {'ligBarInsideBracketLeft'} + chain-rule + {'bar'} ~> {'ligBarInsideBracketRight'} + {'bracketRight'} ~> {'ligExtBracketRight'} + CreateLigationLookup : keep-if 'brace-bar' : list + chain-rule + {'braceLeft'} ~> {'ligExtBraceLeft'} + {'bar'} ~> {'ligBarInsideBracketLeft'} + chain-rule + {'bar'} ~> {'ligBarInsideBracketRight'} + {'braceRight'} ~> {'ligExtBraceRight'} diff --git a/images/charvars.png b/images/charvars.png index a05c968fd..10455e633 100644 Binary files a/images/charvars.png and b/images/charvars.png differ diff --git a/images/iosevka-aile.png b/images/iosevka-aile.png index 8baa6504b..47ced24fc 100644 Binary files a/images/iosevka-aile.png and b/images/iosevka-aile.png differ diff --git a/images/iosevka-curly-slab.png b/images/iosevka-curly-slab.png index 5bc0e8efd..843672e9b 100644 Binary files a/images/iosevka-curly-slab.png and b/images/iosevka-curly-slab.png differ diff --git a/images/iosevka-curly.png b/images/iosevka-curly.png index 9f5abe7ec..cb109d1ab 100644 Binary files a/images/iosevka-curly.png and b/images/iosevka-curly.png differ diff --git a/images/iosevka-etoile.png b/images/iosevka-etoile.png index 036d32cf4..ffc6f1c43 100644 Binary files a/images/iosevka-etoile.png and b/images/iosevka-etoile.png differ diff --git a/images/iosevka-fixed-curly-slab.png b/images/iosevka-fixed-curly-slab.png index 11f569987..893d9983c 100644 Binary files a/images/iosevka-fixed-curly-slab.png and b/images/iosevka-fixed-curly-slab.png differ diff --git a/images/iosevka-fixed-curly.png b/images/iosevka-fixed-curly.png index bbcddd2bf..3fa5bba60 100644 Binary files a/images/iosevka-fixed-curly.png and b/images/iosevka-fixed-curly.png differ diff --git a/images/iosevka-fixed-slab.png b/images/iosevka-fixed-slab.png index bc5d4bc2e..f4796479c 100644 Binary files a/images/iosevka-fixed-slab.png and b/images/iosevka-fixed-slab.png differ diff --git a/images/iosevka-fixed-ss01.png b/images/iosevka-fixed-ss01.png index 4caf77473..30149f556 100644 Binary files a/images/iosevka-fixed-ss01.png and b/images/iosevka-fixed-ss01.png differ diff --git a/images/iosevka-fixed-ss02.png b/images/iosevka-fixed-ss02.png index 8a399e35a..ed11b7353 100644 Binary files a/images/iosevka-fixed-ss02.png and b/images/iosevka-fixed-ss02.png differ diff --git a/images/iosevka-fixed-ss03.png b/images/iosevka-fixed-ss03.png index 50946674b..518b66771 100644 Binary files a/images/iosevka-fixed-ss03.png and b/images/iosevka-fixed-ss03.png differ diff --git a/images/iosevka-fixed-ss04.png b/images/iosevka-fixed-ss04.png index fb5edf785..f865dbf99 100644 Binary files a/images/iosevka-fixed-ss04.png and b/images/iosevka-fixed-ss04.png differ diff --git a/images/iosevka-fixed-ss05.png b/images/iosevka-fixed-ss05.png index 79ed1125b..d65be5c01 100644 Binary files a/images/iosevka-fixed-ss05.png and b/images/iosevka-fixed-ss05.png differ diff --git a/images/iosevka-fixed-ss06.png b/images/iosevka-fixed-ss06.png index b025a2ed9..d46b66a7e 100644 Binary files a/images/iosevka-fixed-ss06.png and b/images/iosevka-fixed-ss06.png differ diff --git a/images/iosevka-fixed-ss07.png b/images/iosevka-fixed-ss07.png index e41097ecd..b09db73b9 100644 Binary files a/images/iosevka-fixed-ss07.png and b/images/iosevka-fixed-ss07.png differ diff --git a/images/iosevka-fixed-ss08.png b/images/iosevka-fixed-ss08.png index 53a186dbd..bda1e121b 100644 Binary files a/images/iosevka-fixed-ss08.png and b/images/iosevka-fixed-ss08.png differ diff --git a/images/iosevka-fixed-ss09.png b/images/iosevka-fixed-ss09.png index 6ffa97eff..575940d35 100644 Binary files a/images/iosevka-fixed-ss09.png and b/images/iosevka-fixed-ss09.png differ diff --git a/images/iosevka-fixed-ss10.png b/images/iosevka-fixed-ss10.png index 4dda0b635..1f518d4ff 100644 Binary files a/images/iosevka-fixed-ss10.png and b/images/iosevka-fixed-ss10.png differ diff --git a/images/iosevka-fixed-ss11.png b/images/iosevka-fixed-ss11.png index 822d19fd8..1802781c5 100644 Binary files a/images/iosevka-fixed-ss11.png and b/images/iosevka-fixed-ss11.png differ diff --git a/images/iosevka-fixed-ss12.png b/images/iosevka-fixed-ss12.png index d3de8fdd7..a6dc3fb41 100644 Binary files a/images/iosevka-fixed-ss12.png and b/images/iosevka-fixed-ss12.png differ diff --git a/images/iosevka-fixed-ss13.png b/images/iosevka-fixed-ss13.png index c2c0a9bc3..f118da39a 100644 Binary files a/images/iosevka-fixed-ss13.png and b/images/iosevka-fixed-ss13.png differ diff --git a/images/iosevka-fixed-ss14.png b/images/iosevka-fixed-ss14.png index 66c514811..d60f54c5f 100644 Binary files a/images/iosevka-fixed-ss14.png and b/images/iosevka-fixed-ss14.png differ diff --git a/images/iosevka-fixed.png b/images/iosevka-fixed.png index d519ca596..96ffe595e 100644 Binary files a/images/iosevka-fixed.png and b/images/iosevka-fixed.png differ diff --git a/images/iosevka-slab.png b/images/iosevka-slab.png index 73d1c40eb..01212bab6 100644 Binary files a/images/iosevka-slab.png and b/images/iosevka-slab.png differ diff --git a/images/iosevka-sparkle.png b/images/iosevka-sparkle.png index c10cc31ce..3fcbf8c0c 100644 Binary files a/images/iosevka-sparkle.png and b/images/iosevka-sparkle.png differ diff --git a/images/iosevka-ss01.png b/images/iosevka-ss01.png index ee65b5b7a..d7169ab5c 100644 Binary files a/images/iosevka-ss01.png and b/images/iosevka-ss01.png differ diff --git a/images/iosevka-ss02.png b/images/iosevka-ss02.png index 3280846c2..a47b9eb3f 100644 Binary files a/images/iosevka-ss02.png and b/images/iosevka-ss02.png differ diff --git a/images/iosevka-ss03.png b/images/iosevka-ss03.png index 992e5ab83..05f3b8b1a 100644 Binary files a/images/iosevka-ss03.png and b/images/iosevka-ss03.png differ diff --git a/images/iosevka-ss04.png b/images/iosevka-ss04.png index 4e15ba396..d4ddf0fa3 100644 Binary files a/images/iosevka-ss04.png and b/images/iosevka-ss04.png differ diff --git a/images/iosevka-ss05.png b/images/iosevka-ss05.png index 894ee0bd7..83873f719 100644 Binary files a/images/iosevka-ss05.png and b/images/iosevka-ss05.png differ diff --git a/images/iosevka-ss06.png b/images/iosevka-ss06.png index d2b2d1cfb..b060a43b6 100644 Binary files a/images/iosevka-ss06.png and b/images/iosevka-ss06.png differ diff --git a/images/iosevka-ss07.png b/images/iosevka-ss07.png index 187219736..4dd58eb3f 100644 Binary files a/images/iosevka-ss07.png and b/images/iosevka-ss07.png differ diff --git a/images/iosevka-ss08.png b/images/iosevka-ss08.png index df4ded86f..27e59ae1a 100644 Binary files a/images/iosevka-ss08.png and b/images/iosevka-ss08.png differ diff --git a/images/iosevka-ss09.png b/images/iosevka-ss09.png index 572157296..ba2f8bdd9 100644 Binary files a/images/iosevka-ss09.png and b/images/iosevka-ss09.png differ diff --git a/images/iosevka-ss10.png b/images/iosevka-ss10.png index 1b46325dc..eab39f9d6 100644 Binary files a/images/iosevka-ss10.png and b/images/iosevka-ss10.png differ diff --git a/images/iosevka-ss11.png b/images/iosevka-ss11.png index b7cddc4bb..2e861ac26 100644 Binary files a/images/iosevka-ss11.png and b/images/iosevka-ss11.png differ diff --git a/images/iosevka-ss12.png b/images/iosevka-ss12.png index 89b6b345c..c273d65bb 100644 Binary files a/images/iosevka-ss12.png and b/images/iosevka-ss12.png differ diff --git a/images/iosevka-ss13.png b/images/iosevka-ss13.png index fbc1dd387..c465f0d58 100644 Binary files a/images/iosevka-ss13.png and b/images/iosevka-ss13.png differ diff --git a/images/iosevka-ss14.png b/images/iosevka-ss14.png index 82d036781..4c49defca 100644 Binary files a/images/iosevka-ss14.png and b/images/iosevka-ss14.png differ diff --git a/images/iosevka-term-curly-slab.png b/images/iosevka-term-curly-slab.png index fdcbd1663..44d15d64c 100644 Binary files a/images/iosevka-term-curly-slab.png and b/images/iosevka-term-curly-slab.png differ diff --git a/images/iosevka-term-curly.png b/images/iosevka-term-curly.png index a5dd967a5..a50f69b83 100644 Binary files a/images/iosevka-term-curly.png and b/images/iosevka-term-curly.png differ diff --git a/images/iosevka-term-slab.png b/images/iosevka-term-slab.png index d39adf6b9..4915361f1 100644 Binary files a/images/iosevka-term-slab.png and b/images/iosevka-term-slab.png differ diff --git a/images/iosevka-term-ss01.png b/images/iosevka-term-ss01.png index 0e537ae0a..e0a5c52d4 100644 Binary files a/images/iosevka-term-ss01.png and b/images/iosevka-term-ss01.png differ diff --git a/images/iosevka-term-ss02.png b/images/iosevka-term-ss02.png index 78c80c6c5..aa94b76b3 100644 Binary files a/images/iosevka-term-ss02.png and b/images/iosevka-term-ss02.png differ diff --git a/images/iosevka-term-ss03.png b/images/iosevka-term-ss03.png index a1a6fb7a2..89600d8ae 100644 Binary files a/images/iosevka-term-ss03.png and b/images/iosevka-term-ss03.png differ diff --git a/images/iosevka-term-ss04.png b/images/iosevka-term-ss04.png index 271880057..a37da957e 100644 Binary files a/images/iosevka-term-ss04.png and b/images/iosevka-term-ss04.png differ diff --git a/images/iosevka-term-ss05.png b/images/iosevka-term-ss05.png index 6997ff0e6..dcc4c923f 100644 Binary files a/images/iosevka-term-ss05.png and b/images/iosevka-term-ss05.png differ diff --git a/images/iosevka-term-ss06.png b/images/iosevka-term-ss06.png index 3ec03b259..15a20140f 100644 Binary files a/images/iosevka-term-ss06.png and b/images/iosevka-term-ss06.png differ diff --git a/images/iosevka-term-ss07.png b/images/iosevka-term-ss07.png index 0a609b8a1..5acc2ba69 100644 Binary files a/images/iosevka-term-ss07.png and b/images/iosevka-term-ss07.png differ diff --git a/images/iosevka-term-ss08.png b/images/iosevka-term-ss08.png index 631c99759..fd15abf6a 100644 Binary files a/images/iosevka-term-ss08.png and b/images/iosevka-term-ss08.png differ diff --git a/images/iosevka-term-ss09.png b/images/iosevka-term-ss09.png index 10e3ca161..31bf32fda 100644 Binary files a/images/iosevka-term-ss09.png and b/images/iosevka-term-ss09.png differ diff --git a/images/iosevka-term-ss10.png b/images/iosevka-term-ss10.png index 1806812c0..40171ca82 100644 Binary files a/images/iosevka-term-ss10.png and b/images/iosevka-term-ss10.png differ diff --git a/images/iosevka-term-ss11.png b/images/iosevka-term-ss11.png index 00da7fcd6..cf8277019 100644 Binary files a/images/iosevka-term-ss11.png and b/images/iosevka-term-ss11.png differ diff --git a/images/iosevka-term-ss12.png b/images/iosevka-term-ss12.png index 501607949..be29dd9d9 100644 Binary files a/images/iosevka-term-ss12.png and b/images/iosevka-term-ss12.png differ diff --git a/images/iosevka-term-ss13.png b/images/iosevka-term-ss13.png index df0c67314..f7027ae83 100644 Binary files a/images/iosevka-term-ss13.png and b/images/iosevka-term-ss13.png differ diff --git a/images/iosevka-term-ss14.png b/images/iosevka-term-ss14.png index d7f48ec6c..de2fe19b0 100644 Binary files a/images/iosevka-term-ss14.png and b/images/iosevka-term-ss14.png differ diff --git a/images/iosevka-term.png b/images/iosevka-term.png index 1a36505fd..bbf8f4b1f 100644 Binary files a/images/iosevka-term.png and b/images/iosevka-term.png differ diff --git a/images/iosevka.png b/images/iosevka.png index b237a9b3f..1af7319dd 100644 Binary files a/images/iosevka.png and b/images/iosevka.png differ diff --git a/images/languages.png b/images/languages.png index a8da3010a..660bea719 100644 Binary files a/images/languages.png and b/images/languages.png differ diff --git a/images/ligset-CLIK-1.png b/images/ligset-CLIK-1.png index 88393a413..14cf069a7 100644 Binary files a/images/ligset-CLIK-1.png and b/images/ligset-CLIK-1.png differ diff --git a/images/ligset-COQX-1.png b/images/ligset-COQX-1.png index fa7b39f73..ce1234809 100644 Binary files a/images/ligset-COQX-1.png and b/images/ligset-COQX-1.png differ diff --git a/images/ligset-ELMX-1.png b/images/ligset-ELMX-1.png index f417b66bc..a0c3473ed 100644 Binary files a/images/ligset-ELMX-1.png and b/images/ligset-ELMX-1.png differ diff --git a/images/ligset-FSHP-1.png b/images/ligset-FSHP-1.png index 7a0b16157..d9b56e13a 100644 Binary files a/images/ligset-FSHP-1.png and b/images/ligset-FSHP-1.png differ diff --git a/images/ligset-FSTA-1.png b/images/ligset-FSTA-1.png index db9a91d08..0640146eb 100644 Binary files a/images/ligset-FSTA-1.png and b/images/ligset-FSTA-1.png differ diff --git a/images/ligset-HSKL-1.png b/images/ligset-HSKL-1.png index 1f88eb690..4d727bb24 100644 Binary files a/images/ligset-HSKL-1.png and b/images/ligset-HSKL-1.png differ diff --git a/images/ligset-IDRS-1.png b/images/ligset-IDRS-1.png index 3566882b9..b7227c358 100644 Binary files a/images/ligset-IDRS-1.png and b/images/ligset-IDRS-1.png differ diff --git a/images/ligset-JSPT-1.png b/images/ligset-JSPT-1.png index 9b3226cd4..da5d4d2b6 100644 Binary files a/images/ligset-JSPT-1.png and b/images/ligset-JSPT-1.png differ diff --git a/images/ligset-MLXX-1.png b/images/ligset-MLXX-1.png index 105c3ce1d..9ea380333 100644 Binary files a/images/ligset-MLXX-1.png and b/images/ligset-MLXX-1.png differ diff --git a/images/ligset-MTLB-1.png b/images/ligset-MTLB-1.png index 7c9024292..fe00c325a 100644 Binary files a/images/ligset-MTLB-1.png and b/images/ligset-MTLB-1.png differ diff --git a/images/ligset-PHPX-1.png b/images/ligset-PHPX-1.png index b153f9bc9..ea002a03b 100644 Binary files a/images/ligset-PHPX-1.png and b/images/ligset-PHPX-1.png differ diff --git a/images/ligset-PURS-1.png b/images/ligset-PURS-1.png index c197e6638..fbe0dfcd3 100644 Binary files a/images/ligset-PURS-1.png and b/images/ligset-PURS-1.png differ diff --git a/images/ligset-SWFT-1.png b/images/ligset-SWFT-1.png index df4fd0b7a..4d52a3583 100644 Binary files a/images/ligset-SWFT-1.png and b/images/ligset-SWFT-1.png differ diff --git a/images/ligset-VRLG-1.png b/images/ligset-VRLG-1.png index 134259af1..911281443 100644 Binary files a/images/ligset-VRLG-1.png and b/images/ligset-VRLG-1.png differ diff --git a/images/ligset-WFLM-1.png b/images/ligset-WFLM-1.png index b5f93ec56..227b854b7 100644 Binary files a/images/ligset-WFLM-1.png and b/images/ligset-WFLM-1.png differ diff --git a/images/ligset-calt-0.png b/images/ligset-calt-0.png index 8f75f928c..6782d542e 100644 Binary files a/images/ligset-calt-0.png and b/images/ligset-calt-0.png differ diff --git a/images/ligset-calt-1.png b/images/ligset-calt-1.png index e44f31f66..7920ac9f5 100644 Binary files a/images/ligset-calt-1.png and b/images/ligset-calt-1.png differ diff --git a/images/ligset-dlig-1.png b/images/ligset-dlig-1.png index 1fb155346..a76066493 100644 Binary files a/images/ligset-dlig-1.png and b/images/ligset-dlig-1.png differ diff --git a/images/matrix.png b/images/matrix.png index 4cd6f265e..624713e9e 100644 Binary files a/images/matrix.png and b/images/matrix.png differ diff --git a/images/preview-all.png b/images/preview-all.png index 76fd303b8..b6a9cc12e 100644 Binary files a/images/preview-all.png and b/images/preview-all.png differ diff --git a/images/stylistic-set-off-0.png b/images/stylistic-set-off-0.png index da14a1ffb..0ca58d112 100644 Binary files a/images/stylistic-set-off-0.png and b/images/stylistic-set-off-0.png differ diff --git a/images/stylistic-set-ss01-1.png b/images/stylistic-set-ss01-1.png index 7f7d424da..27207a9c1 100644 Binary files a/images/stylistic-set-ss01-1.png and b/images/stylistic-set-ss01-1.png differ diff --git a/images/stylistic-set-ss02-1.png b/images/stylistic-set-ss02-1.png index 139faa34c..74ff2e156 100644 Binary files a/images/stylistic-set-ss02-1.png and b/images/stylistic-set-ss02-1.png differ diff --git a/images/stylistic-set-ss03-1.png b/images/stylistic-set-ss03-1.png index 191457d8d..4d36eed87 100644 Binary files a/images/stylistic-set-ss03-1.png and b/images/stylistic-set-ss03-1.png differ diff --git a/images/stylistic-set-ss04-1.png b/images/stylistic-set-ss04-1.png index 89cb98224..c90a7949c 100644 Binary files a/images/stylistic-set-ss04-1.png and b/images/stylistic-set-ss04-1.png differ diff --git a/images/stylistic-set-ss05-1.png b/images/stylistic-set-ss05-1.png index 439bba8e3..606db31be 100644 Binary files a/images/stylistic-set-ss05-1.png and b/images/stylistic-set-ss05-1.png differ diff --git a/images/stylistic-set-ss06-1.png b/images/stylistic-set-ss06-1.png index d8e74cd21..7fe96e570 100644 Binary files a/images/stylistic-set-ss06-1.png and b/images/stylistic-set-ss06-1.png differ diff --git a/images/stylistic-set-ss07-1.png b/images/stylistic-set-ss07-1.png index 0489c4f35..f5dfe543f 100644 Binary files a/images/stylistic-set-ss07-1.png and b/images/stylistic-set-ss07-1.png differ diff --git a/images/stylistic-set-ss08-1.png b/images/stylistic-set-ss08-1.png index e1c76a8c6..86a197ea0 100644 Binary files a/images/stylistic-set-ss08-1.png and b/images/stylistic-set-ss08-1.png differ diff --git a/images/stylistic-set-ss09-1.png b/images/stylistic-set-ss09-1.png index b561eb4af..26ae57786 100644 Binary files a/images/stylistic-set-ss09-1.png and b/images/stylistic-set-ss09-1.png differ diff --git a/images/stylistic-set-ss10-1.png b/images/stylistic-set-ss10-1.png index a794003e0..c45f8885a 100644 Binary files a/images/stylistic-set-ss10-1.png and b/images/stylistic-set-ss10-1.png differ diff --git a/images/stylistic-set-ss11-1.png b/images/stylistic-set-ss11-1.png index 9d87e83d0..a9da0fc8e 100644 Binary files a/images/stylistic-set-ss11-1.png and b/images/stylistic-set-ss11-1.png differ diff --git a/images/stylistic-set-ss12-1.png b/images/stylistic-set-ss12-1.png index bff8ff1de..0186fca8c 100644 Binary files a/images/stylistic-set-ss12-1.png and b/images/stylistic-set-ss12-1.png differ diff --git a/images/stylistic-set-ss13-1.png b/images/stylistic-set-ss13-1.png index cd4e2a8b5..355c6fd84 100644 Binary files a/images/stylistic-set-ss13-1.png and b/images/stylistic-set-ss13-1.png differ diff --git a/images/stylistic-set-ss14-1.png b/images/stylistic-set-ss14-1.png index be4e20121..a4b84e395 100644 Binary files a/images/stylistic-set-ss14-1.png and b/images/stylistic-set-ss14-1.png differ diff --git a/images/stylistic-set-ss20-1.png b/images/stylistic-set-ss20-1.png index bf86fda01..17be539d9 100644 Binary files a/images/stylistic-set-ss20-1.png and b/images/stylistic-set-ss20-1.png differ diff --git a/images/weights.png b/images/weights.png index 860c9c76d..90d43216f 100644 Binary files a/images/weights.png and b/images/weights.png differ diff --git a/params/ligation-set.toml b/params/ligation-set.toml index b68656911..324a89a2f 100644 --- a/params/ligation-set.toml +++ b/params/ligation-set.toml @@ -122,6 +122,14 @@ desc = 'Enable ligation for `"), - arrow("<=====>"), + brackBar("[|"), + brackBar("|]"), + braceBar("{|"), + braceBar("|}"), + arrow2("<=<"), + arrow2(">=>"), arrow("<~~"), arrow("<~"), arrow("~>"), @@ -94,7 +99,8 @@ const ligationSamples = [ eqeqeq("==="), exeqeq("!=="), eqslasheq("=/="), - eqexeq("=!=") + eqexeq("=!="), + colonGt(":>") ], [ centerOps(":="), @@ -112,8 +118,7 @@ const ligationSamples = [ centerOps("+:"), centerOps("-:"), centerOps("=:"), - centerOps("<***>"), - colonGt(":>"), + centerOps("<******>"), brst("(* comm *)"), plusPlus("++"), plusPlus("+++"), @@ -202,7 +207,12 @@ const ligationSamplesNarrow = [ colonGt(":>") ], [ - brst("(* comm *)"), + brst("(*"), + brst("*)"), + brackBar("[|"), + brackBar("|]"), + braceBar("{|"), + braceBar("|}"), plusPlus("++"), plusPlus("+++"), logc("\\/"),