Commit graph

1774 commits

Author SHA1 Message Date
bri
9411186bbd add zipcmp conditional 2023-02-17 09:56:31 +01:00
bri
b4fb18369d On push to (specific paths within) master 2023-02-17 09:56:31 +01:00
bri
be8c8d55f5 let's change things, a lot 2023-02-17 09:56:31 +01:00
bri
27bfc9ad5a release master fontpatcher.zip 2023-02-17 09:56:31 +01:00
Fini Jastrow
0b04391b77 font-patcher: Fix center alignment of ScaleGroup
[why]
When a ScaleGroup's combinded bounding box is wider than the target font
cell the actual X position of a glyph in the group depends on it's own
bonding box and not of the combinded bounding box. When doing center
or right alignment.

[how]
'Overwide' ScaleGroup glyphs are correctly placed and shifted in
position, but that would mean a negative left side bearing (i.e. glyph
extends to the left into previous 'cell').
We do not want that and it is later corrected for all glyphs. But that
is done on an individual glyph level and it is just left aligned for its
concrete bounding box (i.e. left side bearing is set to zero).

The dilemma here is that you can not really center a (combinded) glyph
within a cell, when
* the cell is smaller than the glyph
* a left bearing is not allowd

So we change the algorithm here that 'center' and 'right' alignment
mean:
* Center the glyph in the target font cell
* But if that would create a left side 'overhang' (bearing) just left
  align (move it as far left as possible without creating a negative
  bearing)

The only glyphs affected by this change are the very wide weather icons,
and here escpecially the moon phases F096 and following (target
codepoints E38E ..).

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-15 21:39:16 +01:00
Fini Jastrow
68b381eac5 Fix weather icons cloud scaling
[why]
The scaling of the clouds is not identical but depends on the actual
glyph bounding box. But the clouds should all have the same scaling to
be 'interchangeable'

[how]
Put all clouds in a ScaleGroup.

Also add missing Celsius degrees glyph to other degree glyphs group.

Fixes: #1107

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-15 21:39:16 +01:00
Fini Jastrow
dfffc615ad font-patcher: Reform PowerlineExtra sizing
[why]
The Powerline extra glyph sizing is not really clear.

[how]
Make the triangulars 1 cell wide, as for example Iosevka also does.
Make the Legos 2 cell wide with pa scaling to make them look nicer.
Make the Hexagons 2 cells wide and keep their aspect ratio if possible.
Make small and big Squares also 2 cell wide and keep their aspect ratio
of possible.

For the small and big Squares add a tiny bit of border (negative
overlap), because they have no smooth border line over their open and
closed squares, and that might look strange if some touch and some dont.

Fixes: #1106

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-15 21:18:11 +01:00
Fini Jastrow
3e38c60f52 font-patcher: Fix BTB warning for SymbolsOnly font
[why]
When patching the Symbols Only font we derive the baseline to baseline
distance through abnormal means, so the check fails.

[how]
Set expected baseline to baseline value explicitely for the Symbols Only
font.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-15 21:18:11 +01:00
Fini Jastrow
40d82b0a0a generate-extraglyphs: Correct output
[why]
We print two times the name of the output font, and never the name of
the input font...

[how]
*cough*

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-14 10:11:24 +01:00
Fini Jastrow
869d6f9351 Allow for growing original icon set
[why]
We have an automation for adding glyphs to the original set.
If someone throws in the svg file and adds the glyph to the icons.tsv a
new original-source font is generated.

But the added glyphs are not patched in, because that would need a
change at font-patcher (adjust the end codepoint).

This can be forgotten easily.

[how]
The maximum codepoint of our own (original + seti) set is 0xE6FF. At
0xE700 the Devicons start.

The original-source generation script now checks the offset, they may
not be negative and on the positive end we may not leave our set-range.
If that happens the script fails thus the workflow fails.

Also increate the patch range in font-patcher. If there are no icons to
patch in the symbol font the codepoints are just ignored.

[note]
See also PR #1119

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-13 12:19:52 +01:00
Fini Jastrow
de659388e9 font-patcher: Remove leftover code
[why]
There is a bit of code that is not needed anymore (or was never needed).
This makes things look more complicated than they are.

[how]
1. It is plain wrong to write that we add one (1) glyph if we do not add
   any glyph.
2. One (1) is added to index later anyhow, so we do not need to distort
   the counting in the beginning (the code will run with index=1 for
   both the first and the second patched in glyph).

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-13 12:19:52 +01:00
Fini Jastrow
882e04271e Drop support for Python 2
[why]
Python 2 is long since EOL.

With the last commit we want to use Enums, which are not available in
Python 2.

I believe Python 2 broke some time before already, I stopped caring for
Python 2 some time ago.

This does not change any existing code. It just documents that there are
no efforts anymore to support Python 2.

This is PR #1121

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-12 17:30:31 +01:00
Fini Jastrow
62b972b431 font-patcher: Fix: Use WIN metrics in all conflicting cases
[why]
With commit
  621008773  font-patcher: Use WIN metrics in all conflicting cases
we intended to use the WIN metrics for the baseline to baseline
calculations for fonts that have contradicting (i.e. broken) metrices.

But we use the TYPO metrics instead.

[how]
This is obviously a typo in the code. To prevent such errors and improve
the readability we use Enums now. I believe we silently dropped support
for Python 2 some time back. And if not we drop it today :-}

[note]
Many thanks to Nathaniel Evan for again finding this bug!

Mentioned in: #1116

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-12 17:06:18 +01:00
Fini Jastrow
b112fe12de font-patcher: Fix: Fix line gap redistribution
[why]
With commit
  e69a025a8  font-patcher: Fix line gap redistribution
we fixed the wrong adding instead of subtraction of the bottom gap part
from the descenders.

At least this was done for HHEA and TYPO values.

With WIN values the descenders have positive (!) numbers, so the sign
was not changed for the WIN case.

But that is wrong, as we are already in the ymin xmax coordinate system
(and took the negative of the WIN descenders). So of course here also we
need to subtract and not add.

Mentioned in: #1116

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-12 17:06:02 +01:00
allcontributors[bot]
468b2b974f docs: update .all-contributorsrc 2023-02-12 16:00:15 +01:00
allcontributors[bot]
b31f617a40 docs: update CONTRIBUTORS.md 2023-02-12 16:00:15 +01:00
teatimeguest
773cafb7cc font-patcher: Make sure nf-custom-asm and nf-custom-v_lang icons are included 2023-02-12 15:59:59 +01:00
allcontributors[bot]
bde5c7def1 docs: update .all-contributorsrc 2023-02-12 00:25:01 +01:00
allcontributors[bot]
9eb6dba6d9 docs: update CONTRIBUTORS.md 2023-02-12 00:25:01 +01:00
Fini Jastrow
e69a025a8d font-patcher: Fix line gap redistribution
[why]
Instead of redistributing the line gap we remove it.
At least when HHEA or TYPO metrics are used.
It's ok with WIN metrics.

[how]
If we have negative numbers for a gap and want to add more to it, where
'add' means 'make it more', we must of course _subtract_ the value.

But baseline-to-baseline code into function so we can check it after all
our gymnastics for correctness. It means the metrics.

[note]
Also correct out-of-sync comment.

Fixes: #1116

Reported-by: Nathaniel Evan <nathanielevan>
Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-12 00:24:36 +01:00
Fini Jastrow
59c5cb5a1f font-patcher: Patch in heavy angle brackets
[why]
The heavy angle brackets (276E and 276F) are used for a lot of prompts,
but we do not yet patch them in and a lot of fonts do not bring them
themselves.

[how]
One time rip the glyphs out from Hack and patch them in always, but
careful (do not replace existing glyph).
We take the whole set 276C - 2771.

[note]
Usually we should never again need to run the generate-extraglyphs
script, we rip them out now and they look good. Whatever Hack does with
new versions we can follow but that is optional.

Related: #1110

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-10 16:41:00 +01:00
Fini Jastrow
d083aa6540 docs: Improve self-patching instructions
[why]
A lot of issues arise here. Running through fontforge instead of direct
seems to be more compatibe across setups.

Fixes: #284

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-04 11:54:14 +01:00
Fini
32f1a0ad6b
Merge pull request #1086 from ryanoasis/feature/intermediate-versions
font-patcher: Use git version tag for font version
2023-02-02 16:46:36 +01:00
Fini Jastrow
07a42fcb98 font-patcher: Use git version tag for font version
[why]
When changes are made to the font-patcher and fonts are patched with
that version we can not see which patcher has been used in the fonts
afterwards.

Would be good to have the usual version-patchversion number in the fonts
in these cases (i.e. `v2.3.3-7` for 7 commits after `2.3.3`).

I did this manually before, but it is always a hassle.

[how]
If the font-patcher is run directly from a git repo and git is installed
we try to get the latest tag version including patch number.

If and only if that is successful and that version is 'newer' than the
version encoded in the font-patcher script the git version is trusted
more.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-02 16:37:45 +01:00
Fini Jastrow
ed6488c33b font-patcher: Fixup: Set Panose on "Nerd Font" variants
[why]
Forgot to push these changes to the PR #1099.
They are just 'more output'.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-02 11:43:11 +01:00
Fini
3eed4574bd
Merge pull request #1099 from ryanoasis/bugfix/panose-on-standard-variant
Bugfix Panose on "Nerd Font" variants
2023-02-02 11:00:39 +01:00
Fini Jastrow
7007410afb Publish contributors after allcontributors
[why]
After adding a contributor with allcontributors the website is not
updated.

[how]
Obviously there is a setting if a dependant workflow should be started.
Set that value to 'true'.

Also fix commented-out section of workflow triggers for 'release', that
should not be triggered by allcontributors, when that is commented-in
again (if ever).

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-02 07:52:14 +01:00
allcontributors[bot]
151aa370f0 docs: update .all-contributorsrc [skip ci] 2023-02-02 06:21:23 +01:00
allcontributors[bot]
87bac5f599 docs: update CONTRIBUTORS.md [skip ci] 2023-02-02 06:21:23 +01:00
Micael Jarniac
716589f5e6 Fix minor typo
The period on `Option 7.` was outside the code block.
2023-02-02 06:19:43 +01:00
Fini Jastrow
122bbae54b font-patcher: Set Panose on "Nerd Font" variants
[why]
Some fonts have invalid (or unset) Panose flags. When we create a "Nerd
Font Mono" font the Panose proportion is set to 'monospace'. This
make the font selectable in certain applications that need monospaced
fonts.

After #764 the "Nerd Font" variant shall (again) be detected as
monospaced font, but the glyphs have a big right side bearing (hang into
the next 'cell'). So we need to set the Panose bits there also.

[how]
We already have a check if the font is propably monospaced, independent
from Panose. This is used to prevent --mono patching on originally
proportional fonts.

If we find out with that check that the font is (most probably)
monospaced we also set the appropriate bits in Panose; unless Panose has
valid values that contradict that change.

Fixes: #1098

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-01 18:19:19 +01:00
Fini Jastrow
cdd64ae8a1 Remove old script duplicate
[why]
query_monospace is newer.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-01 17:53:12 +01:00
Fini Jastrow
660aa80013 Mark old MDI as obsolete on cheat sheet
[why]
The (old) Material Design Icons are to be removed.
We should communicate that on the Cheat Sheet.

[how]
See commit
  4452ceee5  Add possibility to add "obsolete" to glyphs

that implements the CSS stuff to display an 'obsolete' marker.

Change the cheat-sheet generatot to actually insert the markers for the
appropriate codepoints. That is, the codepoints are not checked but the
ID.

Fixes: #1096

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-02-01 13:49:32 +01:00
Fini Jastrow
72b9ec663b Fix font previews
[why]
Some font previews in the gh-pages are obviously wrong (showing some
fallback font).

[how]
Recreate all image previes from current master branch.

To make this more easy:
- Add commented out code that displays command to install just the
  needed fonts but all the needed fonts
- Add commented out code that displays the family names of the needed
  fonts - these have to be in sync with the fonts.json database

Fixes: #489

Reported-by: CosmosAtlas
Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-30 08:29:04 +01:00
Fini Jastrow
0a7d64b31c install.sh: Fix installing more than 2 fonts
[why]
The implode function can not work correctly because the bash pattern
expansion inserts blanks in unexpected places.

[how]
Use a dump loop instead of being smart.

Fixes: #280

Reported-by: Geoffrey Biggs <gbiggs>
Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-28 20:07:11 +01:00
Fini Jastrow
a046d98349 font-patcher: Forgot to increase script version
This is important for the docker image so that we can easier see which
version the people use.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-28 15:46:10 +01:00
Fini
f28295b2ff
Merge pull request #1089 from ryanoasis/bugfix/protect-stylistic-sets
Do not destroy ligs or SS
2023-01-28 15:43:50 +01:00
Fini Jastrow
202bca8be1 font-patcher: Fix empty lines output
[why]
When --quiet and --no-progressbar is given we get a lot of empty lines
in the output.

[how]
Just output the carriage return when we have output som eunterminated
stuff before.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-28 15:26:34 +01:00
Fini Jastrow
299fc76096 font-patcher: Do not destroy ligs or SS
[why]
When a certain 'higher codepoint' glyph is needed for a substitution or
ligature rule of a basic glyph and we replace the 'higher codepoint'
glyph with a symbol that stylistic set or ligature will be broken.

[how]
We can not determine if a certain glyph is the _target_ of a pos-sub
rule (at least I could not find a way). What we do is remove all pos-sub
entries that _start_ at a symbol-patched glyph [1], but that is not the
same.

Instead of walking through all substitution tables we just examine the
'basic glyphs' and also protect all glyphs that they reference through
most of the possub tables.

In fact I encountered only "Substitution" entries and never "Ligature"
entries, but we handle both alike. "Pair", "AltSub", and "MultSub" are
not handled, but could be added if need be.

[1] #711

Fixes: #901

Reported-by: Xiangyu Zhu <frefreak.zxy@gmail.com>
Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-28 12:41:28 +01:00
Fini Jastrow
59be26d8c2 docs: Update Arch package links
[why]
All/most fonts are now available as Arch Community packages and not as
AUR anymore.

[how]
Instead of listing all individually link to search page.
Make sure the Symbols Only font in Community is also found.

Fixes: #1057

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-27 16:35:59 +01:00
Fini Jastrow
b94dd2ca2d CI: Fix contributor update
Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-27 15:44:14 +01:00
Fini Jastrow
7d79a489eb CI: Create CI for contributors update
[why]
It's a pain to have the addition of contributors automated via
all-contributors bot, but then it does not end up on the webpage.

[how]
I'm not sure it will automatically be triggered (pretty sure it will
not), but at least one can clickstart manually the workflow.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-27 15:34:25 +01:00
Fini Jastrow
1ed2faccfa Rewrite update-contributors
[why]
The script is not a 'proper' script with shebang.
The CONTRIBUTORS.md format changed.
We want to incorporate this as CI workflow.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-27 15:19:20 +01:00
Fini Jastrow
7e3b7fb6be Repatch SourceCodePro-Italic
[why]
Italic font files were all corrupt, fixed by previous commit.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-27 09:03:27 +01:00
Fini Jastrow
b1439b1e48 SourceCodePro: Remove obsolete font
[why]
In the course of #271 the source for SourceCodePro switched: Before we
used SourceCode Powerline [1], afterwards the original one [2].

One font file has been forgotten, as the font files were differently
named in both variants.

This caused issed with parallel build in the CI and font tweaking (which
is done as additional process after the actual patching).

[note]
[1] https://github.com/ryanmcilmoyl/sourceCodePro-Powerline
[2] https://github.com/adobe-fonts/source-code-pro/releases/tag/2.030R-ro%2F1.050R-it

Maybe, this is not entirely clear, and the 'Powerline' variant does not
have an Italic style.

Fixes: #1084

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-27 09:03:27 +01:00
allcontributors[bot]
07c0f0b2b4 docs: update .all-contributorsrc [skip ci] 2023-01-26 21:03:54 +01:00
allcontributors[bot]
a2b1075eda docs: update CONTRIBUTORS.md [skip ci] 2023-01-26 21:03:54 +01:00
Goooler
5f03997c78 No need --cask params anymore 2023-01-26 21:03:07 +01:00
Finii
d7ea8e5717 [ci] Rebuild original-source font 2023-01-26 19:16:21 +00:00
Fini Jastrow
85e37e754f Fix: Fix JetBrains Mono Family names (repatch)
[why]
The JetBrains Mono family names are still broken.

The commit
  b98c2a19  Fix JetBrains Mono Family names

did not do much, because it was not activated with gotta-patch-em.
The previous commit fixed that.

Put the fonts in the repo are still wrong. Repatching those gives a
chance to test them properly before v3.0.0.

[how]
Run gotta-patch-em with version set to v3.3.3-p6 because thats the git
status right now.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
2023-01-26 20:12:06 +01:00