diff --git a/.github/workflows/generate-fonts.yml b/.github/workflows/generate-fonts.yml index 4c87ae1..012f7f0 100644 --- a/.github/workflows/generate-fonts.yml +++ b/.github/workflows/generate-fonts.yml @@ -15,8 +15,6 @@ jobs: sudo apt-get install fontforge -y; - name: Download Font Patcher run: curl -L https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/font-patcher --output font-patcher - - name: Patch Font Patcher for Ligature Glyphs - run: patch -u font-patcher < font-patcher.patch - name: Download source fonts run: | chmod +x download-source-fonts.sh diff --git a/font-patcher.patch b/font-patcher.patch deleted file mode 100644 index 961f895..0000000 --- a/font-patcher.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- font-patcher 2019-10-23 11:12:21.788343892 +0200 -+++ font-patcher.patched 2019-10-23 11:18:04.768600285 +0200 -@@ -784,7 +784,19 @@ - """ Makes self.sourceFont monospace compliant """ - - for glyph in self.sourceFont.glyphs(): -- self.remove_glyph_neg_bearings(glyph) -+ if (glyph.width == self.font_dim['width']): -+ # Don't tough the (negative) bearings if the width is ok -+ # Ligartures will have these. -+ continue -+ -+ if (glyph.width != 0): -+ # If the width is zero this glyph is intened to be printed on top of another one. -+ # In this case we need to keep the negative bearings to shift it 'left'. -+ # Things like Ä have these: composed of U+0041 'A' and U+0308 'double dot above' -+ # -+ # If width is not zero, correct the bearings such that they are within the width: -+ self.remove_glyph_neg_bearings(glyph) -+ - self.set_glyph_width_mono(glyph) - -