Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update Intel One Mono to 1.3.0 #1558

Merged
merged 3 commits into from
Mar 30, 2024
Merged

update Intel One Mono to 1.3.0 #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c2a028
update Intel One Mono to 1.3.0
landfillbaby Mar 25, 2024
16e92d2
Revert fontconfig change
Finii Mar 25, 2024
c286158
IntelOneMono: Simplify unpatched directory
Finii Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/scripts/lib/fonts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,11 @@
{
"unpatchedName": "Intel One Mono",
"RFN": true,
"version": "1.2.1",
"version": "1.3.0",
"patchedName": "IntoneMono",
"folderName": "IntelOneMono",
"imagePreviewFont": "IntoneMono Nerd Font",
"imagePreviewFontSource": "IntelOneMono/Regular/intelone-mono-font-family-regular.ttf",
"imagePreviewFontSource": "IntelOneMono/IntelOneMono-Regular.ttf",
"linkPreviewFont": "intel-one-mono",
"caskName": "intone-mono",
"repoRelease": false,
Expand Down
1 change: 1 addition & 0 deletions font-patcher
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ class font_patcher:
'firasans' : 'furasans',
'IntelOneMono' : 'IntoneMono',
'IntelOne Mono' : 'Intone Mono',
'Intel One Mono' : 'Intone Mono',
Copy link
Contributor Author

@landfillbaby landfillbaby Mar 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this might not be needed actually, the release version 3.1.1 does rename it properly. should I remove it?

Copy link
Collaborator

@Finii Finii Mar 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, the legacy renaming in the font-patcher is not used, normally (probably we should remove it completely).
And the rule added by

  • d3181df name-parser: Add IntelOne replacement to SIL table

is rather forgiving ;-)

(But this change is the correct thing to do, so keep it.)

Lets compare the actual names (via [1])

======== intelone-mono-font-family-regular.ttf ========
SFNT Fullname      ID 4     IntelOne Mono
SFNT Family        ID 1     IntelOne Mono
SFNT SubFamily     ID 2     Regular
SFNT Pref Family   ID 16    -
SFNT Pref Styles   ID 17    -
SFNT PS Name       ID 6     IntelOneMono-Regular
SFNT Compatible    ID 18    -
SFNT CID findfont  ID 20    -
SFNT WWS Family    ID 21    -
SFNT WWS SubFamily ID 22    -
PS fontname                 IntelOneMono-Regular
PS fullname                 IntelOne Mono
PS familyname               IntelOne Mono
fondname                    None

======== IntelOneMono-Regular.ttf ========
SFNT Fullname      ID 4     Intel One Mono
SFNT Family        ID 1     Intel One Mono
SFNT SubFamily     ID 2     Regular
SFNT Pref Family   ID 16    -
SFNT Pref Styles   ID 17    -
SFNT PS Name       ID 6     IntelOneMono-Regular
SFNT Compatible    ID 18    -
SFNT CID findfont  ID 20    -
SFNT WWS Family    ID 21    -
SFNT WWS SubFamily ID 22    -
PS fontname                 IntelOneMono-Regular
PS fullname                 Intel One Mono
PS familyname               Intel One Mono
fondname                    None

[1] bin/scripts/name_parser/query_name

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and ...

'firasans'       : 'furasans',

is technically wrong, which is good, because it is also wrong from the contents, so a bug fixes the bug ;-D

(I believe, the legacy renaming I never test)

}

# remove overly verbose font names
Expand Down
2 changes: 1 addition & 1 deletion patched-fonts/IntelOneMono/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

For more information have a look at the upstream website: https://github.com/intel/intel-one-mono

Version: 1.2.1
Version: 1.3.0

## Why `IntoneMono` and not `Intel One Mono`?

Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ A preview of all fonts can be found [here](https://www.nerdfonts.com/font-downlo
| [Inconsolata Nerd Font][p-inconsolata] | [Inconsolata][f-inconsolata] | 3.000 | NO |
| [InconsolataGo Nerd Font][p-inconsolata-go] | [InconsolataGo][f-inconsolatago] | 1.013 | NO |
| [Inconsolata LGC Nerd Font][p-inconsolata-lgc] | [Inconsolata LGC][f-inconsolatalgc] | 1.3 | NO |
| [IntoneMono Nerd Font][p-intel-one-mono] | [Intel One Mono][f-intel-one-mono] | 1.2.1 | YES |
| [IntoneMono Nerd Font][p-intel-one-mono] | [Intel One Mono][f-intel-one-mono] | 1.3.0 | YES |
| [Iosevka Nerd Font][p-iosevka] | [Iosevka][f-iosevka] | 22.1.0 | NO |
| [IosevkaTerm Nerd Font][p-iosevka-term] | [Iosevka Term][f-iosevka] | 22.1.0 | NO |
| [IosevkaTermSlab Nerd Font][p-iosevka-term-slab] | [Iosevka Term Slab][f-iosevka] | 22.1.1 | NO |
Expand Down
Binary file renamed ...o/Bold/intelone-mono-font-family-bold.ttf → ...-fonts/IntelOneMono/IntelOneMono-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed .../intelone-mono-font-family-bolditalic.ttf → .../IntelOneMono/IntelOneMono-BoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed ...alic/intelone-mono-font-family-italic.ttf → ...onts/IntelOneMono/IntelOneMono-Italic.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed ...Light/intelone-mono-font-family-light.ttf → ...fonts/IntelOneMono/IntelOneMono-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed ...intelone-mono-font-family-lightitalic.ttf → ...IntelOneMono/IntelOneMono-LightItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed ...dium/intelone-mono-font-family-medium.ttf → ...onts/IntelOneMono/IntelOneMono-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ntelone-mono-font-family-mediumitalic.ttf → ...ntelOneMono/IntelOneMono-MediumItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file renamed ...lar/intelone-mono-font-family-regular.ttf → ...nts/IntelOneMono/IntelOneMono-Regular.ttf
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/unpatched-fonts/IntelOneMono/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Copyright (c) 2023 Intel Corp. with Reserved Font Name "Intel One Mono", "IntelOne Mono"
Copyright 2023 Intel Corp. with Reserved Font Name 'Intel One Mono'

This Font Software is licensed under the SIL Open Font License, Version 1.1.

This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/unpatched-fonts/IntelOneMono/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

For more information have a look at the upstream website: https://github.com/intel/intel-one-mono

Version: 1.2.1
Version: 1.3.0
37 changes: 17 additions & 20 deletions src/unpatched-fonts/IntelOneMono/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

VERSION=1.2.1
VERSION=1.3.0
TEMP=$(mktemp -d)

LINK="https://github.com/intel/intel-one-mono/releases/download/V${VERSION}/ttf.zip"
Expand All @@ -29,28 +29,25 @@ unzip_file "$TEMP/iom.zip" "$TEMP"
# │ └── ttf
# ├── iom.zip
# └── ttf
# ├── intelone-mono-font-family-bold.ttf
# ├── intelone-mono-font-family-bolditalic.ttf
# ├── intelone-mono-font-family-italic.ttf
# ├── intelone-mono-font-family-light.ttf
# ├── intelone-mono-font-family-lightitalic.ttf
# ├── intelone-mono-font-family-medium.ttf
# ├── intelone-mono-font-family-mediumitalic.ttf
# └── intelone-mono-font-family-regular.ttf
# ├── IntelOneMono-Bold.ttf
# ├── IntelOneMono-BoldItalic.ttf
# ├── IntelOneMono-Italic.ttf
# ├── IntelOneMono-Light.ttf
# ├── IntelOneMono-LightItalic.ttf
# ├── IntelOneMono-Medium.ttf
# ├── IntelOneMono-MediumItalic.ttf
# └── IntelOneMono-Regular.ttf

echo "Extracted to $TEMP"

echo "Creating directories"
mkdir -p ./Bold/ ./Bold-Italic/ ./Italic/ ./Light/ ./Light-Italic/ ./Medium/ ./Medium-Italic/ ./Regular/

echo "Moving files"
mv "$TEMP/ttf/intelone-mono-font-family-bold.ttf" ./Bold
mv "$TEMP/ttf/intelone-mono-font-family-bolditalic.ttf" ./Bold-Italic
mv "$TEMP/ttf/intelone-mono-font-family-italic.ttf" ./Italic
mv "$TEMP/ttf/intelone-mono-font-family-light.ttf" ./Light
mv "$TEMP/ttf/intelone-mono-font-family-lightitalic.ttf" ./Light-Italic
mv "$TEMP/ttf/intelone-mono-font-family-medium.ttf" ./Medium
mv "$TEMP/ttf/intelone-mono-font-family-mediumitalic.ttf" ./Medium-Italic
mv "$TEMP/ttf/intelone-mono-font-family-regular.ttf" ./Regular
mv "$TEMP/ttf/IntelOneMono-Bold.ttf" .
mv "$TEMP/ttf/IntelOneMono-BoldItalic.ttf" .
mv "$TEMP/ttf/IntelOneMono-Italic.ttf" .
mv "$TEMP/ttf/IntelOneMono-Light.ttf" .
mv "$TEMP/ttf/IntelOneMono-LightItalic.ttf" .
mv "$TEMP/ttf/IntelOneMono-Medium.ttf" .
mv "$TEMP/ttf/IntelOneMono-MediumItalic.ttf" .
mv "$TEMP/ttf/IntelOneMono-Regular.ttf" .

echo "Done. Make sure to patch the fonts now."
2 changes: 1 addition & 1 deletion src/unpatched-fonts/fontfilenames
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ IBMPlexMono/Mono/IBMPlexMono-Regular.ttf
Inconsolata/Inconsolata-Regular.ttf
InconsolataGo/Regular/InconsolataGo-Regular.ttf
InconsolataLGC/Regular/Inconsolata-LGC.ttf
IntelOneMono/Regular/intelone-mono-font-family-regular.ttf
IntelOneMono/IntelOneMono-Regular.ttf
Iosevka/Regular/iosevka-regular.ttf
IosevkaTerm/Regular/iosevka-term-regular.ttf
IosevkaTermSlab/iosevka-term-slab-regular.ttf
Expand Down