diff --git a/CHANGELOG.md b/CHANGELOG.md index 99b69683c..f86964e65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ FlatLaf Change Log - Native libraries: System property `flatlaf.nativeLibraryPath` now supports loading native libraries named the same as on Maven central. Improved log messages for loading fails. +- Fonts: Updated **Inter** to + [v4.0](https://github.com/rsms/inter/releases/tag/v4.0). #### Fixed bugs diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java index 2bbb44f58..b4bccd64c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java @@ -192,7 +192,8 @@ public static float computeTextYCorrection( Graphics2D g ) { case "Inter": case "Inter Light": - case "Inter Semi Bold": + case "Inter Semi Bold": // Inter v3 + case "Inter SemiBold": // Inter v4 case "Roboto": case "Roboto Light": case "Roboto Medium": diff --git a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts index db17ec21c..5649087ed 100644 --- a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts +++ b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts @@ -18,7 +18,7 @@ // For maven compatibility, should be in format .[.]. // is optional and should be incremented only if a new release is // necessary, but the has not changed. -version = "3.19" +version = "4.0" if( !rootProject.hasProperty( "release" ) ) version = version.toString() + "-SNAPSHOT" diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java b/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java index 2cc808a2a..dc9b3ba2f 100644 --- a/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java @@ -117,7 +117,7 @@ public class FlatInterFont * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 12 ); * } */ - public static final String FAMILY_SEMIBOLD = "Inter Semi Bold"; + public static final String FAMILY_SEMIBOLD = "Inter SemiBold"; /** * Use for {@link #installStyle(String)} to install single font style. diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf index c74cc0c6c..58a38073e 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf index 20d20c195..e67935aa5 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf index 39d6016be..f78848b98 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf index 2a83ae168..7da794bd3 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf index ca9fb1276..32ef937c5 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf index 84e6a61c3..2d0bd1d64 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf index daf4c4413..52c84550b 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf index bc58b80d7..b725bfc88 100644 Binary files a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt index ff80f8c61..9b2ca37b3 100644 --- a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt @@ -1,6 +1,4 @@ -Copyright (c) 2016-2020 The Inter Project Authors. -"Inter" is trademark of Rasmus Andersson. -https://github.com/rsms/inter +Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter) 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: