Drop "Complete" from font names

[why]
Nowadays the Complete font is the normal font. We already dropped the
partially patched fonts long ago. If someone is self patching they will
know if it is a basic font or a complete font.

And already now one can not see if the patched font is bare minimum
(i.e. Seti, Custom, and Devi) or includes Powerline and/or
PowerlineExtra.

[how]
Just drop "Complete" from the naming.

[note]
As the name changes and thus the file name a lot of the other scripts
will break. But they might break anyhow because other naming changes, so
fix that as last commit.

See also commit
  557fc004c  Attempt to fix duplicate fonts in fontbook on osx

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
This commit is contained in:
Fini Jastrow 2023-03-16 14:35:55 +01:00
parent a7ecf075d2
commit 95cae8fd81
2 changed files with 7 additions and 12 deletions

View file

@ -79,11 +79,11 @@ jobs:
- name: Check if patched font generated - name: Check if patched font generated
run: | run: |
[ -e "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font Complete.ttf" ] && echo "File exists" || exit 1 [ -e "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font.ttf" ] && echo "File exists" || exit 1
- name: Setup Spot check font information 1 - name: Setup Spot check font information 1
run: | run: |
echo FONT_INFO=$(fc-scan --format "%{family}:%{fullname}:%{style}\n" "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font Complete.ttf") >> $GITHUB_ENV echo FONT_INFO=$(fc-scan --format "%{family}:%{fullname}:%{style}\n" "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font.ttf") >> $GITHUB_ENV
# TODO fix issues setting and getting fullname and style with GITHUB_ENV :( # TODO fix issues setting and getting fullname and style with GITHUB_ENV :(
- name: Setup Spot check font information 2 - name: Setup Spot check font information 2
@ -97,9 +97,9 @@ jobs:
- name: Spot check font properties - name: Spot check font properties
run: | run: |
${{ env.SHOWTTF }} -c "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font Complete.ttf" | grep -q 'File Checksum.*diff=0\s*$' && echo "TTF checksum ok" || exit 1 ${{ env.SHOWTTF }} -c "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font.ttf" | grep -q 'File Checksum.*diff=0\s*$' && echo "TTF checksum ok" || exit 1
ORIG_MINPPEM=$(${{ env.SHOWTTF }} -c "src/unpatched-fonts/Hack/Regular/Hack-Regular.ttf" | grep 'lowestppem=' ) ORIG_MINPPEM=$(${{ env.SHOWTTF }} -c "src/unpatched-fonts/Hack/Regular/Hack-Regular.ttf" | grep 'lowestppem=' )
PATCH_MINPPEM=$(${{ env.SHOWTTF }} -c "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font Complete.ttf" | grep 'lowestppem=' ) PATCH_MINPPEM=$(${{ env.SHOWTTF }} -c "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font.ttf" | grep 'lowestppem=' )
echo "${ORIG_MINPPEM} == ${PATCH_MINPPEM}" echo "${ORIG_MINPPEM} == ${PATCH_MINPPEM}"
[[ ${ORIG_MINPPEM} == ${PATCH_MINPPEM} ]] && echo "lowestRecPPEM matches" || exit 1 [[ ${ORIG_MINPPEM} == ${PATCH_MINPPEM} ]] && echo "lowestRecPPEM matches" || exit 1
@ -111,7 +111,7 @@ jobs:
- name: Check if patched font generated - name: Check if patched font generated
run: | run: |
[ -e "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font Mono Complete.ttf" ] && echo "File exists" || exit 1 [ -e "$GITHUB_WORKSPACE/temp/Hack Regular Nerd Font Mono.ttf" ] && echo "File exists" || exit 1
- name: Patcher OTF, Bold variant, and RFN compliance - name: Patcher OTF, Bold variant, and RFN compliance
run: | run: |
@ -121,7 +121,7 @@ jobs:
- name: Check if patched font generated - name: Check if patched font generated
run: | run: |
[ -e "$GITHUB_WORKSPACE/temp/Caskaydia Cove Bold Nerd Font Complete.otf" ] && echo "File exists" || exit 1 [ -e "$GITHUB_WORKSPACE/temp/Caskaydia Cove Bold Nerd Font.otf" ] && echo "File exists" || exit 1
- name: Check if font with references is patched - name: Check if font with references is patched
# (patch result not checked) # (patch result not checked)

View file

@ -6,7 +6,7 @@
from __future__ import absolute_import, print_function, unicode_literals from __future__ import absolute_import, print_function, unicode_literals
# Change the script version when you edit this script: # Change the script version when you edit this script:
script_version = "3.7.1" script_version = "3.8.0"
version = "2.3.3" version = "2.3.3"
projectName = "Nerd Fonts" projectName = "Nerd Fonts"
@ -521,11 +521,6 @@ class font_patcher:
additionalFontNameSuffix += " WEA" additionalFontNameSuffix += " WEA"
verboseAdditionalFontNameSuffix += " Plus Weather Icons" verboseAdditionalFontNameSuffix += " Plus Weather Icons"
# if all source glyphs included simplify the name
else:
additionalFontNameSuffix = " Complete"
verboseAdditionalFontNameSuffix = " Complete"
# add mono signifier to beginning of name suffix # add mono signifier to beginning of name suffix
if self.args.single: if self.args.single:
additionalFontNameSuffix = " M" + additionalFontNameSuffix additionalFontNameSuffix = " M" + additionalFontNameSuffix