31.6.1

Makefile

@@ -12,13 +12,17 @@ v:
 
 dist: $(BUILD_DIR)/iosevka-prog-$(V).tar.xz
 
-$(BUILD_DIR)/iosevka-prog-$(V).tar.xz: $(BUILD_DIR)/iosevka-prog/ttf/*.ttf
-	cd $(BUILD_DIR)/iosevka-prog/ttf; tar Jcf $(BUILD_DIR)/iosevka-prog-$(V).tar.xz *.ttf
+$(BUILD_DIR)/iosevka-prog-$(V).tar.xz: $(BUILD_DIR)/IosevkaProg/TTF/iosevka-prog-$(V)/*.ttf
+	cd $(BUILD_DIR)/iosevka-prog/ttf/iosevka-prog-$(V); tar Jcf $(BUILD_DIR)/iosevka-prog-$(V).tar.xz *.ttf
+
+$(BUILD_DIR)/iosevka-prog-nerd-$(V).tar.xz: $(BUILD_DIR)/IosevkaProg/TTF/iosevka-prog-nerd-$(V)/*.ttf
+	cd $(BUILD_DIR)/iosevka-prog/ttf/iosevka-prog-nerd-$(V); tar Jcf $(BUILD_DIR)/iosevka-prog-nerd-$(V).tar.xz *.ttf
 
 upload: dist
 	git tag $(V)
 	gitea-tea r c --repo f1x1t/iosevka-prog-font-builder -t $(V) --tag $(V) \
-		-a $(BUILD_DIR)/iosevka-prog-$(V).tar.xz
+		-a $(BUILD_DIR)/iosevka-prog-$(V).tar.xz \
+		-a $(BUILD_DIR)/iosevka-prog-nerd-$(V).tar.xz
 	git tag -d $(V)
 	git push
 

README.md

@@ -13,5 +13,5 @@ sudo apt-get install docker.io python3-fonttools
 
 Сборка шрифта выполняется командой `make`, результат сохраняется в каталог `dist`.
 
-Готовый шрифт версии [25.1.1](../../../releases/download/25.1.1/iosevka-prog-25.1.1.tar.xz).
+Готовый шрифт версии [31.6.1](../../../releases/download/31.6.1/iosevka-prog-31.6.1.tar.xz).
 

build-iosevka-prog-font.sh

@@ -2,39 +2,46 @@
 
 set -e
 
-IOSEVKA_VERSION=25.1.1
-FONT_NAME=iosevka-prog
+IOSEVKA_VERSION=31.6.1
+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}"
 		python3 "${DIR}/fontname.py" "Iosevka Prog Nerd Font" IosevkaProgNerdFont-Oblique.ttf
 		python3 "${DIR}/fontname.py" "Iosevka Prog Nerd Font Mono" IosevkaProgNerdFontMono-Regular.ttf
-		tar acf "${DIST}/iosevka-prog-${IOSEVKA_VERSION}.tar.xz" *ttf
 		mkdir -p "iosevka-prog-nerd-$IOSEVKA_VERSION"
 		mv Iosevka*Nerd*ttf "iosevka-prog-nerd-$IOSEVKA_VERSION"
-		tar acf "${DIST}/fonts-iosevka-prog-nerd_${IOSEVKA_VERSION}.orig.tar.xz" "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"
-		tar acf "${DIST}/fonts-iosevka-prog_${IOSEVKA_VERSION}.orig.tar.xz" "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"
+		ln -s "iosevka-prog-${IOSEVKA_VERSION}.tar.xz" "fonts-iosevka-prog_${IOSEVKA_VERSION}.orig.tar.xz"
 	else
 		echo "Docker executable not found"
 	fi

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