Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Modifications since version 2.x
 
+### 5.0.3
+
+ * Add ligation set for chaining number signs (#894).
+
+
 ### 5.0.2
 
  * Fixed SS17 family names for Term and Fixed.

README.md

@@ -445,10 +445,11 @@ Subsection `ligations` is used to customize the ligation set assigned to `calt`
   - `lteq-as-arrow`: Treat `<=` as arrow.
   - `gteq-as-co-arrow`: Treat `>=` as co-arrow.
   - `html-comment`: Enable ligation for `<!--` and `<!---`.
-  - `colon-greater-as-colon-arrow`: Transform `:>` into `:` and a narrow arrow..
+  - `colon-greater-as-colon-arrow`: Transform `:>` into `:` and a narrow arrow.
   - `brace-bar`: Enable ligation for `{|` and `|}`.
   - `brack-bar`: Enable ligation for `[|` and `|]`.
   - `connected-underscore`: Make contiguous underscores (like `__`) connected.
+  - `connected-number-sign`: Make contiguous number signs (like `##`) connected.
 
 <!-- END Section-Cherry-Picking-Ligation-Sets -->
 
@@ -950,13 +951,13 @@ Subsection `variants` is used to configure character variants in the font. Prope
     + `eszet = 'sulzbacher-tailed'`, `cv51 = 4`: More modern, beta-like Eszet (`ß`) (default for Italic).
     + `eszet = 'longs-s-lig'`, `cv51 = 5`: Eszet (`ß`) shown as a ligature of long-S (`ſ`) and `s`.
     + `eszet = 'longs-s-lig-tailed'`, `cv51 = 6`: Eszet (`ß`) shown as a ligature of long-S (`ſ`) and `s`.
-  - Styles for `Λ`, `Δ`:
-    + `turn-v = 'straight'`, `cv52 = 1`: Standard, straight `Λ`, `Δ` (default).
-    + `turn-v = 'curly'`, `cv52 = 2`: Slightly curly `Λ`, `Δ`, like Iosevka 2.x.
+  - Styles for `Λ`, `Δ` (Greek capital Lambda (`Λ`) and Greek capital Delta (`Δ`)):
+    + `turn-v = 'straight'`, `cv52 = 1`: Standard, straight Greek capital Lambda (`Λ`) and Greek capital Delta (`Δ`) (default).
+    + `turn-v = 'curly'`, `cv52 = 2`: Slightly curly Greek capital Lambda (`Λ`) and Greek capital Delta (`Δ`), like Iosevka 2.x.
   - Styles for `α` (Greek lower Alpha):
     + `lower-alpha = 'crossing'`, `cv53 = 1`: Greek lower Alpha (`α`) with a cross-like shape at right (default).
     + `lower-alpha = 'tailed-barred'`, `cv53 = 2`: Greek lower Alpha (`α`) with a straight right bar and tail.
-  - Styles for `Γ` (Greek capital Lambda):
+  - Styles for `Γ` (Greek capital Gamma):
     + `capital-gamma = 'standard'`, `cv54 = 1`: Standard capital Gamma (`Γ`) (default).
     + `capital-gamma = 'motion-serifed'`, `cv54 = 2`: Standard capital Gamma (`Γ`) with motion serifs.
   - Styles for `ɛ` (Latin small Epsilon):

build-plans.toml

@@ -8,6 +8,7 @@ optimizeWithTtx = false
 family = "Iosevka"
 desc = "Default"
 snapshotFamily = 'iosevka'
+snapshotFeature = '"NWID" off'
 
 [buildPlans.iosevka-term]
 family = "Iosevka Term"
@@ -27,6 +28,7 @@ family = "Iosevka Slab"
 desc = "Slab-serif"
 serifs = "slab"
 snapshotFamily = 'iosevka-slab'
+snapshotFeature = '"NWID" off'
 
 [buildPlans.iosevka-term-slab]
 family = "Iosevka Term Slab"

changes/5.0.3.md

@@ -0,0 +1 @@
+ * Add ligation set for chaining number signs (#894).

font-src/glyphs/symbol/punctuation.ptl

@@ -1061,52 +1061,74 @@ glyph-block Symbol-Punctuation-Slashes-And-Number-Sign : begin
 		define nsBot : mix SymbolMid ParenBot 0.85
 		define fine : AdviceStroke 3.5
 
-		define pFineOpen (1 / 8)
-		define l : SB - fine / 2
-		define r : RightSB + fine / 2
-		define hsp : ((r - l) - (fine * 2 * HVContrast)) * 0.3
-
-		define [UprightHBars] : union
-			HBar l r [mix nsTop nsBot 0.3]
-			HBar l r [mix nsTop nsBot 0.7]
-		define [UprightVBars p] : union
-			VBarLeft  (l + hsp + p * fine) nsBot nsTop fine
-			VBarRight (r - hsp - p * fine) nsBot nsTop fine
-
-
-		create-glyph 'numberSign.upright' : union
-			UprightHBars
-			UprightVBars 0
-
-		create-glyph 'numberSign.uprightOpen' : union
-			UprightVBars pFineOpen
-			difference
-				UprightHBars
-				Rect nsTop nsBot (l + hsp + fine * (0.5 + pFineOpen)) (r - hsp - fine * (0.5 + pFineOpen))
-
-		define x : hsp + fine / 2 * HVContrast
-		define w : (r - l) * 0.15
-		define shift : w / 3
-		define [SlantedHBars] : union
-			HBar (l + shift) (r + shift) [mix nsTop nsBot 0.3]
-			HBar (l - shift) (r - shift) [mix nsTop nsBot 0.7]
-		define [SlantedVBars p] : union
-			SlashShape (l + x - w + p * fine) (l + x + w + p * fine) nsTop nsBot fine
-			SlashShape (r - x - w - p * fine) (r - x + w - p * fine) nsTop nsBot fine
-
-		create-glyph 'numberSign.slanted' : union [SlantedHBars] [SlantedVBars 0]
-		create-glyph 'numberSign.slantedOpen' : union
-			SlantedVBars pFineOpen
-			difference
-				SlantedHBars
+		define [HspT l r] : ((r - l) - (fine * 2 * HVContrast)) * 0.3
+
+		define [UprightHBars lx l r p] : union
+			HBar lx r [mix nsTop nsBot 0.3]
+			HBar lx r [mix nsTop nsBot 0.7]
+
+		define [UprightHBarsOpen lx l r p] : begin
+			define hsp : HspT l r
+			return : difference
+				UprightHBars lx l r p
+				Rect nsTop nsBot
+					l + hsp + fine * (0.5 + p)
+					r - hsp - fine * (0.5 + p)
+
+		define [UprightVBars lx l r p] : begin
+			define hsp : HspT l r
+			return : union
+				VBarLeft  (l + hsp + p * fine) nsBot nsTop fine
+				VBarRight (r - hsp - p * fine) nsBot nsTop fine
+
+		define [SlantedDim l r] : begin
+			define hsp : HspT l r
+			define x : hsp + fine / 2 * HVContrast
+			define w : (r - l) * 0.15
+			define shift : w / 3
+			return : object hsp x w shift
+
+		define [SlantedHBars lx l r p] : begin
+			define [object shift] : SlantedDim l r
+			return : union
+				HBar (lx + shift) (r + shift) [mix nsTop nsBot 0.3]
+				HBar (lx - shift) (r - shift) [mix nsTop nsBot 0.7]
+		define [SlantedHBarsOpen lx l r p] : begin
+			define [object x w] : SlantedDim l r
+			return : difference
+				SlantedHBars lx l r p
 				spiro-outline
-					corner (l + x + w + pFineOpen * fine) nsTop
-					corner (r - x + w - pFineOpen * fine) nsTop
-					corner (r - x - w - pFineOpen * fine) nsBot
-					corner (l + x - w + pFineOpen * fine) nsBot
+					corner (l + x + w + p * fine) nsTop
+					corner (r - x + w - p * fine) nsTop
+					corner (r - x - w - p * fine) nsBot
+					corner (l + x - w + p * fine) nsBot
+		define [SlantedVBars lx l r p] : begin
+			define [object x w] : SlantedDim l r
+			return : union
+				SlashShape (l + x - w + p * fine) (l + x + w + p * fine) nsTop nsBot fine
+				SlashShape (r - x - w - p * fine) (r - x + w - p * fine) nsTop nsBot fine
+
+		define NumberSignConfig : object
+			upright     { UprightHBars     UprightVBars  0      }
+			uprightOpen { UprightHBarsOpen UprightVBars (1 / 8) }
+			slanted     { SlantedHBars     SlantedVBars  0      }
+			slantedOpen { SlantedHBarsOpen SlantedVBars (1 / 8) }
+
+		foreach { suffix { FHBars FVBars p } } [Object.entries NumberSignConfig] : do
+
+			define l : SB - fine / 2
+			define r : RightSB + fine / 2
+
+			create-glyph "numberSign.\(suffix)" : union
+				FHBars l l r p
+				FVBars l l r p
 
+			create-glyph "numberSign.jr.\(suffix)" : union
+				FHBars (r - Width) l r p
+				FVBars (r - Width) l r p
 
 		select-variant 'numberSign' '#'
+		select-variant 'numberSign.jr' (follow -- 'numberSign')
 
 
 glyph-block Symbol-Punctuation-Dashes : begin

font-src/otl/gsub-ligation.ptl

@@ -42,10 +42,7 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 	define regexLookAround [less.concat hyphen equal exclam greater anyBar]
 
 	define [acops]  {'less' 'greater' 'hyphen' 'equal' 'plus'}
-	define [acskip] {
-		'slash' 'bar' 'at' 'ampersand' 'percent'
-		'numberSign' 'numberSign.upright' 'numberSign.slanted'
-	}
+	define [acskip] {'slash' 'bar' 'at' 'ampersand' 'percent' 'numberSign'}
 
 	local ligationLookupName : 'lig_' + featureName + '{' + mappedFeature + '}'
 
@@ -101,6 +98,15 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 			.rules rules
 		set lookupRank : lookupRank + 1
 
+	do "Bracket-star" : if [hasLG 'brst'] : begin
+		CreateLigationLookup : list
+			chain-rule # (*
+				{'parenLeft'}  ~> look-around
+				{'asterisk'}   ~> {'asterisk/lowered'}
+			chain-rule # *)
+				{'asterisk'}   ~> {'asterisk/lowered'}
+				{'parenRight'} ~> look-around
+
 	do "Operator centering" : if [hasLG 'center-ops'] : begin
 		define [centerAsterisk]   : {'asterisk'}    ~>  {'asterisk/lowered'}
 		define [centerColon]      : {'colon'}       ~>  {'colon.mid'}
@@ -121,15 +127,6 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 
 		define [Cg] : centerizeL ~> centerizeR
 
-		do "Bracket-star" : if [hasLG 'brst'] : begin
-			CreateLigationLookup : list
-				chain-rule # (*
-					{'parenLeft'}  ~> look-around
-					centerAsterisk
-				chain-rule # *)
-					centerAsterisk
-					{'parenRight'} ~> look-around
-
 		do "Bracket-colon"
 			CreateLigationLookup : list
 				chain-rule # (:
@@ -276,6 +273,12 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 				{'underscore' 'underscore.jr'} ~> look-around
 				{'underscore'} ~> {'underscore.jr'}
 
+	do "Number sign chains" : if [hasLG 'connected-number-sign'] : begin
+		CreateLigationLookup : list
+			chain-rule
+				{'numberSign' 'numberSign.jr'} ~> look-around
+				{'numberSign'} ~> {'numberSign.jr'}
+
 	do "triangles" : if [hasLG 'trig'] : begin
 		CreateLigationLookup : list
 			chain-rule # <|

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosevka",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "main": "./font-src/index.js",
   "scripts": {
     "build": "node utility/ensure-verda-exists && verda -f verdafile.js",

params/ligation-set.toml

@@ -120,7 +120,7 @@ desc = 'Enable ligation for `<!--` and `<!---`'
 
 [simple.colon-greater-as-colon-arrow]
 ligGroup = "colon-greater"
-desc = 'Transform `:>` into `:` and a narrow arrow.'
+desc = 'Transform `:>` into `:` and a narrow arrow'
 
 [simple.brace-bar]
 ligGroup = 'brace-bar'
@@ -134,6 +134,10 @@ desc = 'Enable ligation for `[|` and `|]`'
 ligGroup = 'connected-underscore'
 desc = 'Make contiguous underscores (like `__`) connected'
 
+[simple.connected-number-sign]
+ligGroup = 'connected-number-sign'
+desc = 'Make contiguous number signs (like `##`) connected'
+
 ###################################################################################################
 
 # This feature is on by default by many software
@@ -146,7 +150,7 @@ readmeDesc = 'Inherit default ligation set'
 
 [composite.dlig]
 tag     = 'dlig'
-buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'arrow2', 'llgg', 'eqeq', 'exeq', 'ineq', 'ltgt-diamond', 'plusplus', 'kern-dotty', 'dot-as-operator', 'logic', 'brst', 'brace-bar', 'brack-bar', 'connected-underscore']
+buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'arrow2', 'llgg', 'eqeq', 'exeq', 'ineq', 'ltgt-diamond', 'plusplus', 'kern-dotty', 'dot-as-operator', 'logic', 'brst', 'brace-bar', 'brack-bar', 'connected-underscore', 'connected-number-sign']
 brief   = 'Discretionary'
 desc    = 'Discretionary ligatures'
 

params/variants.toml

@@ -2649,17 +2649,19 @@ selector.eszet = "longSSLigTailed"
 
 [prime.turn-v]
 sampler = "ΛΔ"
+samplerExplain = "Greek capital Lambda (`Λ`) and Greek capital Delta (`Δ`)"
+
 tag = "cv52"
 
 [prime.turn-v.variants.straight]
 rank = 1
-description = "Standard, straight `Λ`, `Δ`"
+description = "Standard, straight Greek capital Lambda (`Λ`) and Greek capital Delta (`Δ`)"
 selector."grek/Lambda" = "straight"
 selector."grek/Delta" = "straight"
 
 [prime.turn-v.variants.curly]
 rank = 2
-description = "Slightly curly `Λ`, `Δ`, like Iosevka 2.x"
+description = "Slightly curly Greek capital Lambda (`Λ`) and Greek capital Delta (`Δ`), like Iosevka 2.x"
 selector."grek/Lambda" = "curly"
 selector."grek/Delta" = "curly"
 
@@ -2684,7 +2686,7 @@ selector."grek/alpha" = "tailedBarred"
 
 [prime.capital-gamma]
 sampler = "Γ"
-samplerExplain = "Greek capital Lambda"
+samplerExplain = "Greek capital Gamma"
 tag = "cv54"
 
 [prime.capital-gamma.variants.standard]

snapshot-src/index.js

@@ -28,7 +28,7 @@ const captureCallbacks = {
 
 const ssStrings = [
 	["ABC.DEF.GHI.JKL.MNO.PQRS.TUV.WXYZ", "abc.def.ghi.jkl.mno.pqrs.tuv.wxyz"],
-	["1234567890 ,._-+= >< ¯-¬_ >~–÷+×<", "{}[]()<> $*-+=/#_%^@\\&|~?'\" !,.;:"],
+	["1234567890 ,._-+= >< ¯-¬_ >~–÷+×<", "{}[]()<> +-=$*/#_%^@\\&|~?'\" !,.;:"],
 	["!iIlL17|¦ coO08BbDQ $5SZ2zsz 96G&", [..."dbqp E3 g9q CGQ vvw VVW /V ", "<=", " ", ">="]]
 ];
 
@@ -99,8 +99,12 @@ function captureElement(options, callback) {
 	window.scroll(0, 0);
 	setTimeout(function () {
 		const element = document.querySelector(options.el);
-		if (options.applyClass) element.className = options.applyClass;
-		if (options.applyFeature) element.style = "font-feature-settings:" + options.applyFeature;
+		if (options.applyClass) {
+			element.className = options.applyClass;
+		}
+		if (options.applyFeature) {
+			element.style = "font-feature-settings:" + options.applyFeature;
+		}
 		if (options.applyCallback) {
 			captureCallbacks[options.applyCallback](element, options.applyCallbackArgs);
 		}