Merge branch 'dev'

be5invis · Aug 24, 2020 · b873019 · b873019
2 parents f1993c9 + eca7e07
commit b873019
Show file tree

Hide file tree

Showing 69 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ Since version 2.0, Iosevka would no longer support building via `makefile`. To i
 		
 
 	<!-- END Section-Private-Build-Plan-Sample -->
-																																																																																							
+																																																																																								
 
 3. Run `npm run build -- contents::<your plan name>` and the built fonts would be avaliable in `dist/`. Aside from `contents::<plan>`, other options are:
 

diff --git a/changes/3.4.6.md b/changes/3.4.6.md
@@ -0,0 +1,2 @@
+ * Fix unbalanced shape of `v`-related shapes.
+ * Fix below marks of `Q`.
diff --git a/font-src/glyphs/letter/latin.ptl b/font-src/glyphs/letter/latin.ptl
@@ -760,7 +760,7 @@ glyph-block Letter-Latin-V : begin
 	define pInktrap : 2 / 3
 	define VShapeMiddleWidth : Math.min [mix Stroke VShapeFineStraight pInktrap] [adviceBlackness 3]
 
-	define StraightSbShrink : mix 1 (designParameters.straightVShapeSbShrink * [StrokeWidthBlend 1 0.25]) : if SLAB 0.75 1
+	define StraightSbShrink : mix 1 (designParameters.straightVShapeSbShrink * [StrokeWidthBlend 1 0.75]) : if SLAB 0.75 1
 	define [VShapeTopFlat top] : if SLAB [Math.min (top - Stroke) (top * 0.9)] (top * 0.9)
 
 	define [VShapeOutline] : params [top [sw Stroke] barStraight div] : glyph-proc
@@ -3559,7 +3559,8 @@ glyph-block Letter-Latin-Upper-Q : begin
 
 	create-glyph 'Q.straight' : glyph-proc
 		set-width Width
-		include [refer-glyph 'O'] AS_BASE
+		include MarkSet.if
+		include [refer-glyph 'O']
 		local shift : StrokeWidthBlend 0 0.25
 		include : dispiro
 			widths.rhs
@@ -3568,7 +3569,8 @@ glyph-block Letter-Latin-Upper-Q : begin
 
 	create-glyph 'Q.taily' : glyph-proc
 		set-width Width
-		include [refer-glyph 'O'] AS_BASE
+		include MarkSet.if
+		include [refer-glyph 'O']
 		local shift : StrokeWidthBlend 0.5 0.6
 		local startx : Middle + (Stroke * shift) * HVContrast
 		local terminalx : Middle + HookX

diff --git a/images/charvars.png b/images/charvars.png
diff --git a/images/iosevka-aile.png b/images/iosevka-aile.png
diff --git a/images/iosevka-curly-slab.png b/images/iosevka-curly-slab.png
diff --git a/images/iosevka-curly.png b/images/iosevka-curly.png
diff --git a/images/iosevka-etoile.png b/images/iosevka-etoile.png
diff --git a/images/iosevka-fixed-curly-slab.png b/images/iosevka-fixed-curly-slab.png
diff --git a/images/iosevka-fixed-curly.png b/images/iosevka-fixed-curly.png
diff --git a/images/iosevka-fixed-slab.png b/images/iosevka-fixed-slab.png
diff --git a/images/iosevka-fixed-ss01.png b/images/iosevka-fixed-ss01.png
diff --git a/images/iosevka-fixed-ss02.png b/images/iosevka-fixed-ss02.png
diff --git a/images/iosevka-fixed-ss03.png b/images/iosevka-fixed-ss03.png
diff --git a/images/iosevka-fixed-ss04.png b/images/iosevka-fixed-ss04.png
diff --git a/images/iosevka-fixed-ss05.png b/images/iosevka-fixed-ss05.png
diff --git a/images/iosevka-fixed-ss06.png b/images/iosevka-fixed-ss06.png
diff --git a/images/iosevka-fixed-ss07.png b/images/iosevka-fixed-ss07.png
diff --git a/images/iosevka-fixed-ss08.png b/images/iosevka-fixed-ss08.png
diff --git a/images/iosevka-fixed-ss09.png b/images/iosevka-fixed-ss09.png
diff --git a/images/iosevka-fixed-ss10.png b/images/iosevka-fixed-ss10.png
diff --git a/images/iosevka-fixed-ss11.png b/images/iosevka-fixed-ss11.png
diff --git a/images/iosevka-fixed-ss12.png b/images/iosevka-fixed-ss12.png
diff --git a/images/iosevka-fixed-ss13.png b/images/iosevka-fixed-ss13.png
diff --git a/images/iosevka-fixed-ss14.png b/images/iosevka-fixed-ss14.png
diff --git a/images/iosevka-fixed.png b/images/iosevka-fixed.png
diff --git a/images/iosevka-slab.png b/images/iosevka-slab.png
diff --git a/images/iosevka-sparkle.png b/images/iosevka-sparkle.png
diff --git a/images/iosevka-ss01.png b/images/iosevka-ss01.png
diff --git a/images/iosevka-ss02.png b/images/iosevka-ss02.png
diff --git a/images/iosevka-ss03.png b/images/iosevka-ss03.png
diff --git a/images/iosevka-ss04.png b/images/iosevka-ss04.png
diff --git a/images/iosevka-ss05.png b/images/iosevka-ss05.png
diff --git a/images/iosevka-ss06.png b/images/iosevka-ss06.png
diff --git a/images/iosevka-ss07.png b/images/iosevka-ss07.png
diff --git a/images/iosevka-ss08.png b/images/iosevka-ss08.png
diff --git a/images/iosevka-ss09.png b/images/iosevka-ss09.png
diff --git a/images/iosevka-ss10.png b/images/iosevka-ss10.png
diff --git a/images/iosevka-ss11.png b/images/iosevka-ss11.png
diff --git a/images/iosevka-ss12.png b/images/iosevka-ss12.png
diff --git a/images/iosevka-ss13.png b/images/iosevka-ss13.png
diff --git a/images/iosevka-ss14.png b/images/iosevka-ss14.png
diff --git a/images/iosevka-term-curly-slab.png b/images/iosevka-term-curly-slab.png
diff --git a/images/iosevka-term-curly.png b/images/iosevka-term-curly.png
diff --git a/images/iosevka-term-slab.png b/images/iosevka-term-slab.png
diff --git a/images/iosevka-term-ss01.png b/images/iosevka-term-ss01.png
diff --git a/images/iosevka-term-ss02.png b/images/iosevka-term-ss02.png
diff --git a/images/iosevka-term-ss03.png b/images/iosevka-term-ss03.png
diff --git a/images/iosevka-term-ss04.png b/images/iosevka-term-ss04.png
diff --git a/images/iosevka-term-ss05.png b/images/iosevka-term-ss05.png
diff --git a/images/iosevka-term-ss06.png b/images/iosevka-term-ss06.png
diff --git a/images/iosevka-term-ss07.png b/images/iosevka-term-ss07.png
diff --git a/images/iosevka-term-ss08.png b/images/iosevka-term-ss08.png
diff --git a/images/iosevka-term-ss09.png b/images/iosevka-term-ss09.png
diff --git a/images/iosevka-term-ss10.png b/images/iosevka-term-ss10.png
diff --git a/images/iosevka-term-ss11.png b/images/iosevka-term-ss11.png
diff --git a/images/iosevka-term-ss12.png b/images/iosevka-term-ss12.png
diff --git a/images/iosevka-term-ss13.png b/images/iosevka-term-ss13.png
diff --git a/images/iosevka-term-ss14.png b/images/iosevka-term-ss14.png
diff --git a/images/iosevka-term.png b/images/iosevka-term.png
diff --git a/images/iosevka.png b/images/iosevka.png
diff --git a/images/languages.png b/images/languages.png
diff --git a/images/ligations.png b/images/ligations.png
diff --git a/images/matrix.png b/images/matrix.png
diff --git a/images/preview-all.png b/images/preview-all.png
diff --git a/images/stylesets.png b/images/stylesets.png
diff --git a/images/weights.png b/images/weights.png
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iosevka",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "main": "./font-src/index.js",
   "scripts": {
     "bump-ver": "node utility/update-package-json-version/index",

diff --git a/utility/generate-release-note/index.js b/utility/generate-release-note/index.js
@@ -126,7 +126,7 @@ async function GeneratePackageList(out) {
 		const img = `<img src="${imagePrefix}/${imageName}.png" width="540"/>`;
 		out.log(
 			`<tr>`,
-			`<td colspan="4"><b><a href="${downloadLink}">📦 ${familyName}</a></b> — ${desc}</td>`,
+			`<td colspan="4"><b><a href="${downloadLink}">&#x1F4E6; ${familyName}</a></b> — ${desc}</td>`,
 			`</tr>`
 		);