Merge pull request #1558 from landfillbaby/master

update Intel One Mono to 1.3.0

bin/scripts/lib/fonts.json

@@ -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,

font-patcher

@@ -700,6 +700,7 @@ class font_patcher:
             'firasans'       : 'furasans',
             'IntelOneMono'   : 'IntoneMono',
             'IntelOne Mono'  : 'Intone Mono',
+            'Intel One Mono' : 'Intone Mono',
         }
 
         # remove overly verbose font names

patched-fonts/IntelOneMono/README.md

@@ -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`?
 

readme.md

@@ -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   |

src/unpatched-fonts/IntelOneMono/LICENSE.txt

@@ -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
 
 
 -----------------------------------------------------------

src/unpatched-fonts/IntelOneMono/README.md

@@ -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

src/unpatched-fonts/IntelOneMono/update.sh

@@ -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"
@@ -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."

src/unpatched-fonts/fontfilenames

@@ -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