Add UNCERTAINTY SIGN (U+2BD1) (#2976).

Author: be5invis

changes/34.0.0.md

@@ -1,4 +1,6 @@
 * \[**Breaking**\] Remove support for RIS characters (U+1F1E6..U+1F1FF) as they conflict with Emojis.
+* Add characters:
+  - UNCERTAINTY SIGN (`U+2BD1`) (#2976).
 * Add `straight-vertical-sides-almost-flat-top` and `rounded-vertical-sides-almost-flat-top` variants for `W` and `w`.
 * Refine shape of the following characters:
   - LATIN CAPITAL LETTER GHA (`U+01A2`).

package-lock.json

@@ -125,34 +125,52 @@ glyph-block AutoBuild-Enclosure : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Recursive-Build : Fork Miniature MiniatureParaT
 	glyph-block-import Autobuild-Enclosure-Shared : CircNameNoCheck CircName CollectJobs EnsureComponentGlyphT CreateDerivedFontFromJobs applyRelations getGlyphDefaultShift
+	glyph-block-import CommonShapes-Polygon : Polygon
 
 	define circleWidthClasses {{'NWID' Width 0.12} {'WWID' WideWidth0 0.08}}
 	define [AdjustDigitCount digits width] : Math.max 1 (digits * Width / width)
 	define [EnclosureStrokeScale dscale digits width] : dscale / ([AdjustDigitCount digits width] ** 0.66)
 
 	define enclosureInnerPartActualWidth : new Map
 
-	define [GlyphNameInnerOf gniPrefix subGlyph mp actualWidth accumulatedTfm] : begin
-		define nameParts : list mp actualWidth accumulatedTfm
+	define [GlyphNameInnerOf gniPrefix subGlyph isMultiPart actualWidth accumulatedTfm] : begin
+		define nameParts : list isMultiPart actualWidth accumulatedTfm
 			hashGeometry subGlyph.geometry
 			hashCv subGlyph
 		return : '.ci.' + gniPrefix + '/' + [nameParts.join '/']
 
-	define [EnsureInnerSubGlyphImpl inners markClass miniatureFont mp actualWidth accumulatedTfm] : function [gidPart] : begin
-		define subGlyph : miniatureFont.queryByNameEnsured gidPart
-		define gniPart : GlyphNameInnerOf inners.gniPrefix subGlyph mp actualWidth accumulatedTfm
-		if [query-glyph gniPart] : return gniPart
-
-		enclosureInnerPartActualWidth.set gniPart (actualWidth)
-		create-glyph gniPart : glyph-proc
-			set-width 0
-			set-mark-anchor 'compositeInner' 0 0
-			include : inners.buildInnerShape subGlyph
-			include accumulatedTfm
-			include : inners.addAnchors mp markClass actualWidth
-		return gniPart
+	define flex-params [EnsureInnerSubGlyphImpl] : begin
+		local-parameter inners
+		local-parameter markClass
+		local-parameter miniatureFont
+		local-parameter isMultiPart
+		local-parameter actualWidth
+		local-parameter accumulatedTfm
+
+		return : function [gidPart] : begin
+			define subGlyph : miniatureFont.queryByNameEnsured gidPart
+			define gniPart : GlyphNameInnerOf inners.gniPrefix subGlyph isMultiPart actualWidth accumulatedTfm
+			if [query-glyph gniPart] : return gniPart
+
+			enclosureInnerPartActualWidth.set gniPart (actualWidth)
+			create-glyph gniPart : glyph-proc
+				set-width 0
+				set-mark-anchor 'compositeInner' 0 0
+				include : inners.buildInnerShape subGlyph
+				include accumulatedTfm
+				include : inners.addAnchors isMultiPart markClass actualWidth
+			return gniPart
+
+	define flex-params [EnsureInnerSubGlyphSeq] : begin
+		local-parameter inners
+		local-parameter markClass
+		local-parameter miniatureFont
+		local-parameter job
+		local-parameter dimens
+		local-parameter xCompress
+		local-parameter yCompress
+		local-parameter kExtraYShift
 
-	define [EnsureInnerSubGlyphSeq inners markClass miniatureFont job dimens yCompress kExtraYShift] : begin
 		define { gn unicode parts w bal baly }      job
 		define [object width mockInnerWidth dscale] dimens
 
@@ -162,22 +180,27 @@ glyph-block AutoBuild-Enclosure : begin
 			local derivedGlyph : miniatureFont.queryByNameEnsured gidPart
 			if [not firstDerivedGyph] : set firstDerivedGyph derivedGlyph
 			set totalWidth : totalWidth + derivedGlyph.advanceWidth
-		local xCompress : inners.getXScalar parts.length markClass mockInnerWidth totalWidth
+		local xCompressInternal : inners.getXScalar parts.length markClass mockInnerWidth totalWidth
 		set totalWidth : Math.min mockInnerWidth totalWidth
 
 		local shift : inners.getShift bal baly firstDerivedGyph
 		local accumulatedTfm : Transform.Combine
 			firstDerivedGyph.gizmo.inverse
-			Scale (dscale * xCompress) (dscale * yCompress)
+			Scale (dscale * xCompressInternal * xCompress) (dscale * yCompress)
 			Translate 0 (dscale * shift + SymbolMid + (kExtraYShift - 0.5) * CAP * dscale)
 			begin firstDerivedGyph.gizmo
 
 		local finalParts {}
 		foreach partIndex [range 0 parts.length] : do
 			local gidPart parts.(partIndex)
-			local actualWidth : [miniatureFont.queryByNameEnsured gidPart].advanceWidth * dscale * xCompress
-			finalParts.push : EnsureComponentGlyphT gidPart
-				EnsureInnerSubGlyphImpl inners markClass miniatureFont (parts.length > 1) actualWidth accumulatedTfm
+			local actualWidth : [miniatureFont.queryByNameEnsured gidPart].advanceWidth * dscale * xCompress * xCompressInternal
+			finalParts.push : EnsureComponentGlyphT gidPart : EnsureInnerSubGlyphImpl
+				markClass      -- markClass
+				inners         -- inners
+				miniatureFont  -- miniatureFont
+				isMultiPart    -- (parts.length > 1)
+				actualWidth    -- actualWidth
+				accumulatedTfm -- accumulatedTfm
 
 		return finalParts
 
@@ -192,22 +215,49 @@ glyph-block AutoBuild-Enclosure : begin
 			include : with-transform [Translate x 0] : refer-glyph gniPart
 			set x : x + ([enclosureInnerPartActualWidth.get gniPart] || 0)
 
-	define [EnclosureInner dimens inners miniatureFont job] : glyph-proc
-		define { gn unicode parts w bal baly }      job
+	define [EnclosureInnerWithScale dimens inners miniatureFont xs ys job] : glyph-proc
+		define { gn unicode parts w bal baly } job
 		define [object width] dimens
 
-		local finalParts : EnsureInnerSubGlyphSeq inners 'enclosureInner' miniatureFont job dimens 1 0
+		local finalParts : EnsureInnerSubGlyphSeq
+			markClass     -- 'enclosureInner'
+			inners        -- inners
+			miniatureFont -- miniatureFont
+			job           -- job
+			dimens        -- dimens
+			xCompress     -- xs
+			yCompress     -- ys
+			kExtraYShift  -- (0.5 * (1 - ys))
 
 		include : new-glyph : EnclosureInnerImpl dimens finalParts
 		return finalParts
 
+	define [EnclosureInner dimens inners miniatureFont job] : begin
+		return : EnclosureInnerWithScale dimens inners miniatureFont 1.0 1.0 job
+
 	define [TwoRowEnclosureInner dimens inners miniatureFont job] : glyph-proc
 		define { gn unicode parts w bal baly }      job
 		define [object width] dimens
 		local jobFirstHalf  { gn unicode [parts.slice 0 (parts.length / 2)] w bal baly }
 		local jobSecondHalf { gn unicode [parts.slice   (parts.length / 2)] w bal baly }
-		local finalPartsFirstHalf  : EnsureInnerSubGlyphSeq inners "enclosureInnerFirstHalf"  miniatureFont jobFirstHalf  dimens 0.55 (+0.55)
-		local finalPartsSecondHalf : EnsureInnerSubGlyphSeq inners "enclosureInnerSecondHalf" miniatureFont jobSecondHalf dimens 0.55 (-0.10)
+		local finalPartsFirstHalf  : EnsureInnerSubGlyphSeq
+			markClass     -- 'enclosureInnerFirstHalf'
+			inners        -- inners
+			miniatureFont -- miniatureFont
+			job           -- jobFirstHalf
+			dimens        -- dimens
+			xCompress     -- 1.00
+			yCompress     -- 0.55
+			kExtraYShift  -- (+0.55)
+		local finalPartsSecondHalf : EnsureInnerSubGlyphSeq
+			markClass     -- 'enclosureInnerSecondHalf'
+			inners        -- inners
+			miniatureFont -- miniatureFont
+			job           -- jobSecondHalf
+			dimens        -- dimens
+			xCompress     -- 1.00
+			yCompress     -- 0.55
+			kExtraYShift  -- (-0.10)
 
 		return : {}.concat finalPartsFirstHalf finalPartsSecondHalf
 
@@ -217,8 +267,24 @@ glyph-block AutoBuild-Enclosure : begin
 		local jobFirstHalf  { gn unicode [parts.slice 0 (parts.length / 2)] w bal baly }
 		local jobSecondHalf { gn unicode [parts.slice   (parts.length / 2)] w bal baly }
 
-		local finalPartsFirstHalf  : EnsureInnerSubGlyphSeq inners "enclosureInnerFirstHalf"  miniatureFont jobFirstHalf  dimens 0.6 (+0.55)
-		local finalPartsSecondHalf : EnsureInnerSubGlyphSeq inners "enclosureInnerSecondHalf" miniatureFont jobSecondHalf dimens 0.6 (-0.15)
+		local finalPartsFirstHalf  : EnsureInnerSubGlyphSeq
+			markClass     -- 'enclosureInnerFirstHalf'
+			inners        -- inners
+			miniatureFont -- miniatureFont
+			job           -- jobFirstHalf
+			dimens        -- dimens
+			xCompress     -- 1.0
+			yCompress     -- 0.6
+			kExtraYShift  -- (+0.55)
+		local finalPartsSecondHalf : EnsureInnerSubGlyphSeq
+			markClass     -- 'enclosureInnerSecondHalf'
+			inners        -- inners
+			miniatureFont -- miniatureFont
+			job           -- jobSecondHalf
+			dimens        -- dimens
+			xCompress     -- 1.0
+			yCompress     -- 0.6
+			kExtraYShift  -- (-0.15)
 
 		return : {}.concat finalPartsFirstHalf finalPartsSecondHalf
 
@@ -348,6 +414,14 @@ glyph-block AutoBuild-Enclosure : begin
 			local parts : include : EnclosureInner dimens inners miniatureFont job
 			if decomp : CvDecompose.set currentGlyph [{gnEnclosure}.concat parts]
 
+	define DiamondBuilder : object
+		decomposable true
+		buildGlyph : function [dimens inners miniatureFont decomp job gnEnclosure] : glyph-proc
+			include : refer-glyph gnEnclosure
+			local s : Math.min 1.0 (0.75 * (dimens.width / Width))
+			local parts : include : EnclosureInnerWithScale dimens inners miniatureFont s s job
+			if decomp : CvDecompose.set currentGlyph [{gnEnclosure}.concat parts]
+
 	define DecomposableInsetBuilder : object
 		decomposable true
 		buildGlyph : function [dimens inners miniatureFont decomp job gnEnclosure] : glyph-proc
@@ -430,17 +504,6 @@ glyph-block AutoBuild-Enclosure : begin
 			VBar.r right bot   top sw
 		include : AddEnclosureMark digits : CircleDimens digits ww
 
-	define [createAribSpeedSignGlyphs digits demands]
-		EnclosureT 'aribSpeedSign' CircledBuilder StandardInners digits 1 demands AribSpeedSignEnclosureShape
-	define [AribSpeedSignEnclosureShape digits ww gap] : glyph-proc
-		define [object width sw top bot left right] : CircleDimens digits ww
-		set-width width
-		local f : AdviceStroke 8
-		include : difference
-			Rect top bot left right
-			Ring (top - f) (bot + f) (left + f) (right - f)
-		include : AddEnclosureMark digits : CircleDimens digits ww
-
 	define [createTwoRowBoxedGlyphs digits demands]
 		EnclosureT 'twoRowBoxed' TwoRowBoxedBuilder StandardInners digits 2 demands TwoRowBoxEnclosureShape
 	define [TwoRowBoxEnclosureShape digits ww gap] : glyph-proc
@@ -457,6 +520,30 @@ glyph-block AutoBuild-Enclosure : begin
 		set-base-anchor 'enclosureInnerFirstHalf'  (0.5 * width - 0.5 * dscale * [Math.min (Width * digits) mockInnerWidth]) 0
 		set-base-anchor 'enclosureInnerSecondHalf' (0.5 * width - 0.5 * dscale * [Math.min (Width * digits) mockInnerWidth]) 0
 
+	define [createAribSpeedSignGlyphs digits demands]
+		EnclosureT 'aribSpeedSign' CircledBuilder StandardInners digits 1 demands AribSpeedSignEnclosureShape
+	define [AribSpeedSignEnclosureShape digits ww gap] : glyph-proc
+		define [object width sw top bot left right] : CircleDimens digits ww
+		set-width width
+		local f : AdviceStroke 8
+		include : difference
+			Rect top bot left right
+			Ring (top - f) (bot + f) (left + f) (right - f)
+		include : AddEnclosureMark digits : CircleDimens digits ww
+
+	define [createDiamondGlyphs digits demands]
+		EnclosureT 'diamond' DiamondBuilder StandardInners digits 1 demands DiamondEnclosureShape
+	define [DiamondEnclosureShape digits ww gap] : glyph-proc
+		define [object width sw top bot left right] : CircleDimens digits ww
+		local swAdj : sw * [AdviceStroke 3] / Stroke
+		set-width width
+		include : Polygon.inset-bordered swAdj : list
+			corner (left + O)  [mix bot top 0.5]
+			corner [mix left right 0.5] (bot + O)
+			corner (right - O) [mix bot top 0.5]
+			corner [mix left right 0.5] (top - O)
+		include : AddEnclosureMark digits : CircleDimens digits ww
+
 	define [createPlayingCardGlyphs digits demands]
 		EnclosureT 'playingCard' PlayingCardBuilder PlayingCardInners digits 2 demands PlayingCardEnclosure.Shape
 	define [createTrumpCardGlyphs digits demands]
@@ -926,17 +1013,6 @@ glyph-block AutoBuild-Enclosure : begin
 			list 0x1F19F {'eight.lnum' 'K'} WideWidth1
 			list 0x1F1A6 {'H' 'C'} WideWidth1
 
-	do "ARIB STD B24 speed signs"
-		createAribSpeedSignGlyphs 2 : list
-			list 0x3248 {'one.lnum' 'zero.lnum'} WideWidth1
-			list 0x3249 {'two.lnum' 'zero.lnum'} WideWidth1
-			list 0x324A {'three.lnum' 'zero.lnum'} WideWidth1
-			list 0x324B {'four.lnum' 'zero.lnum'} WideWidth1
-			list 0x324C {'five.lnum' 'zero.lnum'} WideWidth1
-			list 0x324D {'six.lnum' 'zero.lnum'} WideWidth1
-			list 0x324E {'seven.lnum' 'zero.lnum'} WideWidth1
-			list 0x324F {'eight.lnum' 'zero.lnum'} WideWidth1
-
 	do "Triple-digit boxed"
 		createBoxedGlyphs 3 : list
 			list 0x1F14E {'P' 'P' 'V'} WideWidth1
@@ -967,6 +1043,21 @@ glyph-block AutoBuild-Enclosure : begin
 		createTwoRowBoxedGlyphs 4 : list
 			list 0x1F1A9 { 'L' 'O' 'S' 'S' 'L' 'E' 'S' 'S' } WideWidth1
 
+	do "ARIB STD B24 speed signs"
+		createAribSpeedSignGlyphs 2 : list
+			list 0x3248 {'one.lnum' 'zero.lnum'} WideWidth1
+			list 0x3249 {'two.lnum' 'zero.lnum'} WideWidth1
+			list 0x324A {'three.lnum' 'zero.lnum'} WideWidth1
+			list 0x324B {'four.lnum' 'zero.lnum'} WideWidth1
+			list 0x324C {'five.lnum' 'zero.lnum'} WideWidth1
+			list 0x324D {'six.lnum' 'zero.lnum'} WideWidth1
+			list 0x324E {'seven.lnum' 'zero.lnum'} WideWidth1
+			list 0x324F {'eight.lnum' 'zero.lnum'} WideWidth1
+
+	do "Diamond"
+		createDiamondGlyphs 1 : list
+			list 0x2BD1 {'question'} WideWidth2
+
 	do "Playing cards"
 		# Here we always construct the two-digit cards to ensure that all digit and suit glyphs
 		# are aligned across all cards.

packages/font-glyphs/src/auto-build/composite.ptl

@@ -0,0 +1,19 @@
+$$include '../meta/macros.ptl'
+
+import [fallback] from "@iosevka/util"
+
+glyph-module
+
+glyph-block CommonShapes-Polygon : begin
+	glyph-block-import Common-Derivatives
+	glyph-block-import CommonShapes
+
+	glyph-block-export Polygon
+	define Polygon : namespace
+		export : define [outline points] : begin
+			return : spiro-outline points close
+		export : define flex-params [inset-bordered sw points] : begin
+			# local [outline] : spiro-outline points close
+			return : intersection
+				spiro-outline points
+				with-outlined sw : spiro-outline points

packages/font-glyphs/src/common/polygon.ptl

@@ -68,6 +68,7 @@ export : define [buildGlyphs para recursive] : begin
 	run-glyph-module "./common/derivatives.mjs"
 	run-glyph-module "./common/shapes.mjs"
 	run-glyph-module "./common/o-shape-variants.mjs"
+	run-glyph-module "./common/polygon.mjs"
 	run-glyph-module "./space/index.mjs"
 	run-glyph-module "./marks/index.mjs"