Merge branch 'dev'

be5invis · Oct 25, 2020 · 075dd6e · 075dd6e
2 parents 7474a86 + 58c4723
commit 075dd6e
Show file tree

Hide file tree

Showing 71 changed files with 46 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Modifications since version 2.x
 
+### 3.7.1
+
+ * Fix broken line height under Macintosh (#704).
+
+
 ### 3.7.0
 
  * Make `v-k-cursive` visible in Upright and Oblique; Split variant selectors for `k` and `K` (#700).

diff --git a/README.md b/README.md
@@ -194,7 +194,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.7.1.md b/changes/3.7.1.md
@@ -0,0 +1 @@
+ * Fix broken line height under Macintosh (#704).
diff --git a/font-src/gen/empty-font.js b/font-src/gen/empty-font.js
@@ -42,7 +42,18 @@ module.exports = function () {
 		},
 		OS_2: {
 			achVendID: "BE5N",
-			panose: [2, 0, 5, 9, 0, 0, 0, 0, 0, 0],
+			panose: {
+				bFamilyType: 2,
+				bSerifStyle: 0,
+				bWeight: 5,
+				bProportion: 9,
+				bContrast: 3,
+				bStrokeVariation: 0,
+				bArmStyle: 0,
+				bLetterform: 0,
+				bMidline: 0,
+				bXHeight: 4
+			},
 			fsSelection: 192,
 			fsType: 0,
 			sCapHeight: 0,

diff --git a/font-src/meta/aesthetics.ptl b/font-src/meta/aesthetics.ptl
@@ -205,28 +205,30 @@ export : define [calculateMetrics para] : begin
 
 export : define [setFontMetrics para metrics fm] : begin
 	define [object CAP Descender XH Width] metrics
-	# Metric metadata
-	# Note: we use 1000upm in design, and (1000 * upmsacle)upm in production, to avoid rounding error.
-	define asc : para.leading * CAP / (CAP - Descender)
-	define desc : para.leading * Descender / (CAP - Descender)
-	define descenderPad : fallback para.descenderPad 0
+
+	define leading      : Math.round para.leading
+	define asc          : Math.round : leading * CAP / (CAP - Descender)
+	define desc         : Math.round : leading * Descender / (CAP - Descender)
+	define descenderPad : Math.round : fallback para.descenderPad 0
+	define winMetricAscenderPad  : Math.round : fallback para.winMetricAscenderPad  0
+	define winMetricDescenderPad : Math.round : fallback para.winMetricDescenderPad 0
 
 	set fm.OS_2.xAvgCharWidth     Width
 	set fm.head.unitsPerEm        1000
 	set fm.hhea.ascender          asc
-	set fm.OS_2.usWinAscent       (asc + [fallback para.winMetricAscenderPad 0])
+	set fm.OS_2.usWinAscent       (asc + winMetricAscenderPad)
 	set fm.OS_2.sTypoAscender     asc
 
 	set fm.hhea.descender         (Descender - descenderPad)
-	set fm.OS_2.usWinDescent      ([Math.abs desc] + descenderPad + [fallback para.winMetricDescenderPad 0])
+	set fm.OS_2.usWinDescent      ([Math.abs desc] + descenderPad + winMetricDescenderPad)
 	set fm.OS_2.sTypoDescender    (desc - descenderPad)
 
-	set fm.hhea.lineGap           (para.leading - asc + Descender)
-	set fm.OS_2.sTypoLineGap      (para.leading - asc + desc)
+	set fm.hhea.lineGap           (leading - asc + Descender)
+	set fm.OS_2.sTypoLineGap      (leading - asc + desc)
 
 	set fm.OS_2.sxHeight          XH
 	set fm.OS_2.sCapHeight        CAP
-	set fm.post.italicAngle       (0 - para.slopeAngle)
+	set fm.post.italicAngle       [Math.round (0 - para.slopeAngle)]
 
 
 export : define [compositeBaseAnchors] : begin

diff --git a/font-src/meta/naming.ptl b/font-src/meta/naming.ptl
@@ -171,7 +171,7 @@ export : define [assignFontNames para metrics font] : begin
 	# Weight, width and slope
 	set font.OS_2.usWeightClass     para.naming.weight
 	set font.OS_2.usWidthClass      para.naming.width
-	set font.OS_2.panose.2          : 1 + para.naming.weight / 100
+	set font.OS_2.panose.bWeight    : 1 + para.naming.weight / 100
 	set font.OS_2.fsSelection       : object
 		oblique        : not : not isOblique
 		bold           : not : not isBold
@@ -193,8 +193,8 @@ export : define [assignFontNames para metrics font] : begin
 	set font.head.fontRevision : majorVersion + (minorVersion * 10 + patchVersion) / 1000
 
 	if (para.diversityM == 1 && para.diversityF == 1 && para.diversityI == 1 && para.diversityII == 1) : begin
-		set font.OS_2.panose.3          9 # Monospaced
-		set font.post.isFixedPitch      true
+		set font.OS_2.panose.bProportion 9 # Monospaced
+		set font.post.isFixedPitch       true
 	: else : begin
-		set font.OS_2.panose.3          0
-		set font.post.isFixedPitch      false
+		set font.OS_2.panose.bProportion 0
+		set font.post.isFixedPitch       false
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,21 +1,22 @@
 {
   "name": "iosevka",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "main": "./font-src/index.js",
   "scripts": {
-    "bump-ver": "node utility/update-package-json-version/index",
     "build": "verda -f verdafile.js",
+    "bump-ver": "node utility/update-package-json-version/index",
     "clean": "verda -f verdafile.js clean",
     "install": "node utility/check-env"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
+    "@unicode/unicode-13.0.0": "^1.0.2",
     "cldr": "^5.7.0",
-    "ejs": "^3.1.3",
+    "ejs": "^3.1.5",
     "fs-extra": "^9.0.1",
     "object-assign": "^4.1.1",
-    "ot-builder": "^0.10.28",
-    "otb-ttc-bundle": "^0.10.28",
+    "ot-builder": "^0.10.31",
+    "otb-ttc-bundle": "^0.10.31",
     "patel": "^0.33.1",
     "semver": "^7.3.2",
     "spiro": "^2.0.0",
@@ -24,14 +25,13 @@
     "ttf2woff": "^2.0.2",
     "ttf2woff2": "^3.0.0",
     "typo-geom": "^0.11.0",
-    "@unicode/unicode-13.0.0": "^1.0.0",
-    "verda": "^1.1.0",
+    "verda": "^1.1.1",
     "which": "^2.0.2"
   },
   "devDependencies": {
-    "eslint": "^7.6.0",
-    "eslint-config-prettier": "^6.11.0",
-    "prettier": "^2.0.5"
+    "eslint": "^7.12.0",
+    "eslint-config-prettier": "^6.14.0",
+    "prettier": "^2.1.2"
   },
   "engines": {
     "node": ">=12.16.0"