diff --git a/.github/workflows/pub.yml b/.github/workflows/pub.yml index 3e44881..0e12445 100644 --- a/.github/workflows/pub.yml +++ b/.github/workflows/pub.yml @@ -18,15 +18,8 @@ jobs: with: distribution: temurin java-version: 21 - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: fontforge apt - run: sudo add-apt-repository universe; sudo apt update - continue-on-error: true - name: deps - run: sudo apt install fontforge bdfresize + run: sudo apt install bdfresize - name: build env: REF: ${{ github.ref_name }} diff --git a/build.sh b/build.sh index 33b805d..88831dd 100755 --- a/build.sh +++ b/build.sh @@ -14,30 +14,23 @@ done rm -rf out mkdir -p deps out -[ ! -f deps/BitsNPicas.jar ] && wget -O deps/BitsNPicas.jar "https://github.com/kreativekorp/bitsnpicas/releases/latest/download/BitsNPicas.jar" +[ ! -f deps/BitsNPicas.jar ] && wget -O deps/BitsNPicas.jar https://github.com/kreativekorp/bitsnpicas/releases/latest/download/BitsNPicas.jar cp LICENSE out cp README.md out -ff() { - fontforge -script scripts/fix.py "$@" -} - bnp() { java -jar deps/BitsNPicas.jar convertbitmap -f "$3" -o out/"$2.$3" "$1" } bnp src/eldur.kbitx eldur ttf -ff eldur ttf bnp src/eldur.kbitx eldur bdf sed -i -e '/^FONT/s/-[pc]-/-M-/i' -e '/^FONT/s/-80-/-50-/' out/eldur.bdf -ff eldur bdf -ff eldur otb 1 +bnp src/eldur.kbitx eldur otb bdfresize -f 2 out/eldur.bdf >out/eldur2x.bdf -sed -i 's/^iso.*-FONT/FONT/g' out/eldur2x.bdf -ff eldur2x bdf -ff eldur2x otb 1 +sed -i -e 's/^iso.*-FONT/FONT/g' -e 's/eldur/eldur2x/g' out/eldur2x.bdf +bnp out/eldur2x.bdf eldur2x otb rm -f out/*-*.bdf diff --git a/scripts/fix.py b/scripts/fix.py deleted file mode 100644 index 06b7819..0000000 --- a/scripts/fix.py +++ /dev/null @@ -1,16 +0,0 @@ -from sys import argv -import os -import fontforge - -d = os.path.dirname(os.path.realpath(__file__)) -if len(argv) > 3: - f = fontforge.open(os.path.join(d, f"../out/{argv[1]}.sfd")) - f.importBitmaps(os.path.join(d, f"../out/{argv[1]}.bdf")) -else: - f = fontforge.open(os.path.join(d, f"../out/{argv[1]}.{argv[2]}")) -f.fontname = argv[1] -f.fullname = argv[1] -f.encoding = "UnicodeFull" -f.os2_panose = (0, 0, 0, 9, 0, 0, 0, 0, 0, 0) -f.save(os.path.join(d, f"../out/{argv[1]}.sfd")) -f.generate(os.path.join(d, f"../out/{argv[1]}.{argv[2]}"))