From 4d1e80cec4ad274d81b73a65b93913e1c1e51905 Mon Sep 17 00:00:00 2001
From: Andrei Astafev <dev@246060.ru>
Date: Mon, 24 Jun 2024 13:20:50 +0300
Subject: [PATCH] 30.3.0

---
 README.md                  |  2 +-
 build-iosevka-prog-font.sh | 27 ++++++++++++++++-----------
 private-build-plans.toml   | 20 ++++++++++----------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index b439ef9..81f03c7 100644
--- a/README.md
+++ b/README.md
@@ -13,5 +13,5 @@ sudo apt-get install docker.io python3-fonttools
 
 Сборка шрифта выполняется командой `make`, результат сохраняется в каталог `dist`.
 
-Готовый шрифт версии [26.0.0](../../../releases/download/26.0.0/iosevka-prog-26.0.0.tar.xz).
+Готовый шрифт версии [30.3.0](../../../releases/download/30.3.0/iosevka-prog-30.3.0.tar.xz).
 
diff --git a/build-iosevka-prog-font.sh b/build-iosevka-prog-font.sh
index 95be0f8..20b675c 100755
--- a/build-iosevka-prog-font.sh
+++ b/build-iosevka-prog-font.sh
@@ -2,27 +2,32 @@
 
 set -e
 
-IOSEVKA_VERSION=26.0.0
-FONT_NAME=iosevka-prog
+IOSEVKA_VERSION=30.3.0
+FONT_NAME=IosevkaProg
 FILE=$( readlink -f "${BASH_SOURCE[0]}" )
 DIR=$( dirname "${FILE}" )
 DIST="${DIR}/dist"
-OBLIQUE="${DIST}/oblique"
-REGULAR="${DIST}/regular"
+OBLIQUE="${DIST}/Oblique"
+REGULAR="${DIST}/Regular"
 CONFIG="${DIR}/private-build-plans.toml"
-OUT_DIR="${DIST}/${FONT_NAME}/ttf"
+OUT_DIR="${DIST}/${FONT_NAME}/TTF"
 
 if [ -r "${CONFIG}" ]; then
 	if command -v docker >/dev/null 2>&1; then
-		docker pull avivace/iosevka-build
-		docker pull nerdfonts/patcher
-		docker run -e FONT_VERSION="${IOSEVKA_VERSION}" -it -v "$DIR":/build avivace/iosevka-build ttf::${FONT_NAME}
+		wget -c https://github.com/be5invis/Iosevka/archive/refs/tags/v${IOSEVKA_VERSION}.tar.gz
+		tar axf v${IOSEVKA_VERSION}.tar.gz
+		pushd Iosevka-${IOSEVKA_VERSION}/docker
+		docker build -t=iosevka-builder .
+		popd
+		rm -rf Iosevka-${IOSEVKA_VERSION} v${IOSEVKA_VERSION}.tar.gz
+		docker pull cdalvaro/docker-nerd-fonts-patcher:latest
+		docker run -e FONT_VERSION="${IOSEVKA_VERSION}" -it -v "$DIR":/work iosevka-builder ttf::${FONT_NAME}
 		sudo chown -R "$(id -u)":"$(id -g)" "${DIST}"
 		mkdir -p "${OBLIQUE}"
-		cp -af "${OUT_DIR}/${FONT_NAME}-oblique.ttf" "${OBLIQUE}"
+		cp -af "${OUT_DIR}/${FONT_NAME}-Oblique.ttf" "${OBLIQUE}"
 		docker run --rm -v "${OBLIQUE}":/in -v "${OUT_DIR}":/out nerdfonts/patcher --complete --adjust-line-height --makegroups 1
 		mkdir -p "${REGULAR}"
-		cp -af "${OUT_DIR}/${FONT_NAME}-regular.ttf" "${REGULAR}"
+		cp -af "${OUT_DIR}/${FONT_NAME}-Regular.ttf" "${REGULAR}"
 		docker run --rm -v "${REGULAR}":/in -v "${OUT_DIR}":/out nerdfonts/patcher --complete --adjust-line-height --makegroups 1 --mono --removeligatures
 		sudo chown -R "$(id -u)":"$(id -g)" "${DIST}"
 		cd "${OUT_DIR}"
@@ -32,7 +37,7 @@ if [ -r "${CONFIG}" ]; then
 		mv Iosevka*Nerd*ttf "iosevka-prog-nerd-$IOSEVKA_VERSION"
 		tar acf "${DIST}/iosevka-prog-nerd-${IOSEVKA_VERSION}.tar.xz" "iosevka-prog-nerd-$IOSEVKA_VERSION"
 		mkdir -p "iosevka-prog-$IOSEVKA_VERSION"
-		mv iosevka*ttf "iosevka-prog-$IOSEVKA_VERSION"
+		mv Iosevka*ttf "iosevka-prog-$IOSEVKA_VERSION"
 		tar acf "${DIST}/iosevka-prog-${IOSEVKA_VERSION}.tar.xz" "iosevka-prog-$IOSEVKA_VERSION"
 		cd "${DIST}"
 		ln -s "iosevka-prog-nerd-${IOSEVKA_VERSION}.tar.xz" "fonts-iosevka-prog-nerd_${IOSEVKA_VERSION}.orig.tar.xz"
diff --git a/private-build-plans.toml b/private-build-plans.toml
index d9d025e..9118212 100644
--- a/private-build-plans.toml
+++ b/private-build-plans.toml
@@ -1,34 +1,34 @@
-[buildPlans.iosevka-prog]
+[buildPlans.IosevkaProg]
 family = "Iosevka Prog"
 spacing = "fontconfig-mono"
 serifs = "sans"
-no-cv-ss = false
-no-ligation = true
-export-glyph-names = true
+noCvSs = false
+noLigation = true
+exportGlyphNames = true
 
-[buildPlans.iosevka-prog.variants]
+[buildPlans.IosevkaProg.variants]
 inherits = "ss08"
 
-[buildPlans.iosevka-prog.metric-override]
+[buildPlans.IosevkaProg.metricOverride]
 sb = 55
 leading = 1200
 
-[buildPlans.iosevka-prog.widths.normal]
+[buildPlans.IosevkaProg.widths.Normal]
 shape = 420
 menu  = 5
 css   = "normal"
 
-[buildPlans.iosevka-prog.weights.thin]
+[buildPlans.IosevkaProg.weights.Thin]
 shape = 100
 menu = 100
 css = 100
 
-[buildPlans.iosevka-prog.weights.regular]
+[buildPlans.IosevkaProg.weights.Regular]
 shape = 400
 menu = 400
 css = 400
 
-[buildPlans.iosevka-prog.weights.bold]
+[buildPlans.IosevkaProg.weights.Bold]
 shape = 700
 menu = 700
 css = 700