new version scheme, shallow checkouts, updated variants

3 files changed, 37 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e715bf4b21b5..899a1c699a14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = ttf-iosevka-term-custom-git
 	pkgdesc = A slender monospace sans-serif and slab-serif typeface inspired by Pragmata Pro, M+ and PF DIN Mono.
-	pkgver = r2317.a3fab8995
+	pkgver = 1619488675
 	pkgrel = 1
 	url = https://be5invis.github.io/Iosevka/
 	arch = any
 	license = custom:OFL
 	makedepends = git
-	makedepends = nodejs>=12.16.0
+	makedepends = nodejs>=12.22.0
 	makedepends = npm
 	makedepends = ttfautohint
 	provides = ttf-iosevka-term-custom
 	conflicts = ttf-iosevka-term-custom
 	replaces = ttf-iosevka-termlig-custom-git
-	source = git+https://github.com/be5invis/Iosevka#branch=dev
 	source = private-build-plans.toml.example
-	sha256sums = SKIP
-	sha256sums = fae9ae12fbf94d4276916b0aecc57fb5eb816c5bba03af2127483dbe068896b3
+	sha256sums = 3c3b60e894209794fde865673171ecefd9f46bda134dff4e240dd17b5eeb55ad
 
 pkgname = ttf-iosevka-term-custom-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 33fb0fd2fbc6..c273816833f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,24 @@
 # Contributor: Markus Weimar <mail@markusweimar.de>
 _pkgname=ttf-iosevka-term-custom
 pkgname=${_pkgname}-git
-pkgver=r2317.a3fab8995
+pkgver=1619488675
 pkgrel=1
 pkgdesc='A slender monospace sans-serif and slab-serif typeface inspired by Pragmata Pro, M+ and PF DIN Mono.'
 arch=('any')
 url='https://be5invis.github.io/Iosevka/'
 license=('custom:OFL')
-makedepends=('git' 'nodejs>=12.16.0' 'npm' 'ttfautohint')
+makedepends=('git' 'nodejs>=12.22.0' 'npm' 'ttfautohint')
 depends=()
 conflicts=(${_pkgname})
 provides=(${_pkgname})
 replaces=('ttf-iosevka-termlig-custom-git')
-source=(
-  'git+https://github.com/be5invis/Iosevka#branch=dev'
-  'private-build-plans.toml.example'
-)
-sha256sums=(
-  'SKIP'
-  'fae9ae12fbf94d4276916b0aecc57fb5eb816c5bba03af2127483dbe068896b3'
-)
+source=('private-build-plans.toml.example')
+sha256sums=('3c3b60e894209794fde865673171ecefd9f46bda134dff4e240dd17b5eeb55ad')
 
-pkgver() {
-  cd Iosevka
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+prepare () {
+  rm -rf Iosevka
+  git clone --depth 1 --branch master 'https://github.com/be5invis/Iosevka'
 
-prepare() {
   buildplans="$HOME/.config/iosevka/private-build-plans.toml"
   if [[ -f "$buildplans" ]]; then
     cp "$buildplans" Iosevka/
@@ -37,14 +29,19 @@ prepare() {
   fi
 }
 
-build() {
+pkgver () {
+  cd Iosevka
+  git log -1 --format=%ct
+}
+
+build () {
   cd Iosevka
   npm install
   npm update
   npm run build -- ttf::${_pkgname#*-}
 }
 
-package() {
+package () {
   install -d "${pkgdir}/usr/share/fonts/TTF"
   install -m644 Iosevka/dist/*/ttf/*.ttf "${pkgdir}/usr/share/fonts/TTF/"
   install -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/private-build-plans.toml.example b/private-build-plans.toml.example
index 6c691490944d..32d8b2edf5d6 100644
--- a/private-build-plans.toml.example
+++ b/private-build-plans.toml.example
@@ -9,10 +9,10 @@ family = "Iosevka Custom"
 # https://github.com/be5invis/Iosevka/tree/dev-v4#configuring-character-variants
 # https://github.com/be5invis/Iosevka/raw/dev-v4/images/charvars.png
 digit-form = "lining"
-capital-a = "curly"
-capital-b = "standard-interrupted-bilateral-motion-serifed"
+capital-a = "curly-serifless"
+capital-b = "standard-interrupted-bilateral-serifed"
 capital-c = "serifless"
-capital-d = "more-rounded-unilateral-motion-serifed"
+capital-d = "more-rounded-unilateral-serifed"
 capital-e = "standard"
 capital-f = "motion-serifed"
 capital-g = "toothless-corner-serifless-hooked"
@@ -27,7 +27,7 @@ capital-p = "closed-motion-serifed"
 capital-q = "crossing"
 capital-r = "curly-open"
 capital-s = "serifless"
-capital-t = "standard"
+capital-t = "serifless"
 capital-u = "toothless-rounded"
 capital-v = "curly"
 capital-w = "curly"
@@ -37,7 +37,7 @@ capital-z = "straight-serifless-with-crossbar"
 a = "double-storey-tailed"
 b = "toothless-corner"
 c = "serifless"
-d = "tailed"
+d = "tailed-serifless"
 e = "rounded"
 f = "flat-hook-tailed"
 g = "double-storey-open"
@@ -123,10 +123,10 @@ spacing = "term"
 # https://github.com/be5invis/Iosevka/tree/dev-v4#configuring-character-variants
 # https://github.com/be5invis/Iosevka/raw/dev-v4/images/charvars.png
 digit-form = "lining"
-capital-a = "curly"
-capital-b = "standard-interrupted-bilateral-motion-serifed"
+capital-a = "curly-serifless"
+capital-b = "standard-interrupted-bilateral-serifed"
 capital-c = "serifless"
-capital-d = "more-rounded-unilateral-motion-serifed"
+capital-d = "more-rounded-unilateral-serifed"
 capital-e = "standard"
 capital-f = "motion-serifed"
 capital-g = "toothless-corner-serifless-hooked"
@@ -141,7 +141,7 @@ capital-p = "closed-motion-serifed"
 capital-q = "crossing"
 capital-r = "curly-open"
 capital-s = "serifless"
-capital-t = "standard"
+capital-t = "serifless"
 capital-u = "toothless-rounded"
 capital-v = "curly"
 capital-w = "curly"
@@ -151,7 +151,7 @@ capital-z = "straight-serifless-with-crossbar"
 a = "double-storey-tailed"
 b = "toothless-corner"
 c = "serifless"
-d = "tailed"
+d = "tailed-serifless"
 e = "rounded"
 f = "flat-hook-tailed"
 g = "double-storey-open"
@@ -237,10 +237,10 @@ spacing = "fontconfig-mono"
 # https://github.com/be5invis/Iosevka/tree/dev-v4#configuring-character-variants
 # https://github.com/be5invis/Iosevka/raw/dev-v4/images/charvars.png
 digit-form = "lining"
-capital-a = "curly"
-capital-b = "standard-interrupted-bilateral-motion-serifed"
+capital-a = "curly-serifless"
+capital-b = "standard-interrupted-bilateral-serifed"
 capital-c = "serifless"
-capital-d = "more-rounded-unilateral-motion-serifed"
+capital-d = "more-rounded-unilateral-serifed"
 capital-e = "standard"
 capital-f = "motion-serifed"
 capital-g = "toothless-corner-serifless-hooked"
@@ -255,7 +255,7 @@ capital-p = "closed-motion-serifed"
 capital-q = "crossing"
 capital-r = "curly-open"
 capital-s = "serifless"
-capital-t = "standard"
+capital-t = "serifless"
 capital-u = "toothless-rounded"
 capital-v = "curly"
 capital-w = "curly"
@@ -265,7 +265,7 @@ capital-z = "straight-serifless-with-crossbar"
 a = "double-storey-tailed"
 b = "toothless-corner"
 c = "serifless"
-d = "tailed"
+d = "tailed-serifless"
 e = "rounded"
 f = "flat-hook-tailed"
 g = "double-storey-open"
@@ -351,10 +351,10 @@ spacing = "fixed"
 # https://github.com/be5invis/Iosevka/tree/dev-v4#configuring-character-variants
 # https://github.com/be5invis/Iosevka/raw/dev-v4/images/charvars.png
 digit-form = "lining"
-capital-a = "curly"
-capital-b = "standard-interrupted-bilateral-motion-serifed"
+capital-a = "curly-serifless"
+capital-b = "standard-interrupted-bilateral-serifed"
 capital-c = "serifless"
-capital-d = "more-rounded-unilateral-motion-serifed"
+capital-d = "more-rounded-unilateral-serifed"
 capital-e = "standard"
 capital-f = "motion-serifed"
 capital-g = "toothless-corner-serifless-hooked"
@@ -369,7 +369,7 @@ capital-p = "closed-motion-serifed"
 capital-q = "crossing"
 capital-r = "curly-open"
 capital-s = "serifless"
-capital-t = "standard"
+capital-t = "serifless"
 capital-u = "toothless-rounded"
 capital-v = "curly"
 capital-w = "curly"
@@ -379,7 +379,7 @@ capital-z = "straight-serifless-with-crossbar"
 a = "double-storey-tailed"
 b = "toothless-corner"
 c = "serifless"
-d = "tailed"
+d = "tailed-serifless"
 e = "rounded"
 f = "flat-hook-tailed"
 g = "double-storey-open"