diff --git a/.gitattributes b/.gitattributes index 7728e387..62ac17da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,7 +20,9 @@ *.gif binary *.jar binary *.lib binary +*.otf binary *.png binary *.sketch binary *.so binary +*.ttf binary *.zip binary diff --git a/.github/workflows/fonts.yml b/.github/workflows/fonts.yml new file mode 100644 index 00000000..b47c5f2e --- /dev/null +++ b/.github/workflows/fonts.yml @@ -0,0 +1,47 @@ +# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Fonts + +on: + push: + branches: + - '*' + tags: + - 'fonts/*-[0-9]*' + paths: + - 'flatlaf-fonts/**' + - '.github/workflows/fonts.yml' + +jobs: + Release: + runs-on: ubuntu-latest + if: | + github.event_name == 'push' && + github.repository == 'JFormDesigner/FlatLaf' + + strategy: + matrix: + font: + - inter + - jetbrains-mono + + steps: + - uses: actions/checkout@v3 + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) + + - name: Setup Java 11 + uses: actions/setup-java@v3 + with: + java-version: 11 + distribution: adopt # pre-installed on ubuntu-latest + cache: gradle + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) + + - name: Release a new stable version to Maven Central + run: ./gradlew publish :flatlaf-fonts-${{ matrix.font }}:build -Drelease=true + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) diff --git a/README.md b/README.md index 72e94fc7..d383098a 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,8 @@ Addons - [SwingX](flatlaf-swingx) - support for SwingX components - [JIDE Common Layer](flatlaf-jide-oss) - support for JIDE Common Layer components +- [Fonts](flatlaf-fonts) - some font families bundled in easy-to-use and + redistributable JARs Getting started diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts index 276e3a25..75132fbf 100644 --- a/flatlaf-demo/build.gradle.kts +++ b/flatlaf-demo/build.gradle.kts @@ -22,6 +22,8 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( project( ":flatlaf-extras" ) ) + implementation( project( ":flatlaf-fonts-inter" ) ) + implementation( project( ":flatlaf-fonts-jetbrains-mono" ) ) implementation( project( ":flatlaf-intellij-themes" ) ) implementation( "com.miglayout:miglayout-swing:5.3" ) implementation( "com.jgoodies:jgoodies-forms:1.9.0" ) @@ -32,6 +34,8 @@ tasks { jar { dependsOn( ":flatlaf-core:jar" ) dependsOn( ":flatlaf-extras:jar" ) + dependsOn( ":flatlaf-fonts-inter:jar" ) + dependsOn( ":flatlaf-fonts-jetbrains-mono:jar" ) dependsOn( ":flatlaf-intellij-themes:jar" ) // dependsOn( ":flatlaf-natives-jna:jar" ) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java index f65def73..2d360001 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java @@ -43,6 +43,8 @@ import com.formdev.flatlaf.extras.FlatSVGIcon; import com.formdev.flatlaf.extras.FlatUIDefaultsInspector; import com.formdev.flatlaf.extras.components.FlatButton; import com.formdev.flatlaf.extras.components.FlatButton.ButtonType; +import com.formdev.flatlaf.fonts.inter.FlatInterFont; +import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont; import com.formdev.flatlaf.icons.FlatAbstractIcon; import com.formdev.flatlaf.themes.FlatMacDarkLaf; import com.formdev.flatlaf.themes.FlatMacLightLaf; @@ -69,6 +71,10 @@ class DemoFrame DemoFrame() { int tabIndex = DemoPrefs.getState().getInt( FlatLafDemo.KEY_TAB, 0 ); + if( SystemInfo.isJava_11_orLater ) + FlatInterFont.install(); + FlatJetBrainsMonoFont.install(); + availableFontFamilyNames = GraphicsEnvironment.getLocalGraphicsEnvironment() .getAvailableFontFamilyNames().clone(); Arrays.sort( availableFontFamilyNames ); @@ -344,7 +350,7 @@ class DemoFrame fontMenu.addSeparator(); ArrayList families = new ArrayList<>( Arrays.asList( "Arial", "Cantarell", "Comic Sans MS", "DejaVu Sans", - "Dialog", "Liberation Sans", "Noto Sans", "Roboto", + "Dialog", "Inter", "JetBrains Mono", "Liberation Sans", "Noto Sans", "Roboto", "SansSerif", "Segoe UI", "Serif", "Tahoma", "Ubuntu", "Verdana" ) ); if( !families.contains( currentFamily ) ) families.add( currentFamily ); diff --git a/flatlaf-fonts/README.md b/flatlaf-fonts/README.md new file mode 100644 index 00000000..fb4d94eb --- /dev/null +++ b/flatlaf-fonts/README.md @@ -0,0 +1,8 @@ +Fonts +===== + +The sub-projects contains fonts from some font families and bundles them into +easy-to-use and redistributable JARs. + +- [Inter](flatlaf-fonts-inter) font +- [JetBrains Mono](flatlaf-fonts-jetbrains-mono) font diff --git a/flatlaf-fonts/flatlaf-fonts-inter/README.md b/flatlaf-fonts/flatlaf-fonts-inter/README.md new file mode 100644 index 00000000..beddf3a3 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/README.md @@ -0,0 +1,62 @@ +Inter font +========== + +This sub-project contains fonts from the Inter font family and bundles them into +an easy-to-use and redistributable JAR. + +**Note:** This font requires **Java 10 or later**. It is displayed too large in +Java 8 and 9. + +Font home page: https://rsms.me/inter/ + +GitHub project: https://github.com/rsms/inter + +License: +[SIL OPEN FONT LICENSE Version 1.1](src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt) + + +How to install? +--------------- + +Invoke the `install()` method once in your `main()` method (on AWT thread): + +~~~java +FlatInterFont.install(); +~~~ + + +How to use? +----------- + +~~~java +// basic styles +new Font( FlatInterFont.FAMILY, Font.PLAIN, 12 ); +new Font( FlatInterFont.FAMILY, Font.ITALIC, 12 ); +new Font( FlatInterFont.FAMILY, Font.BOLD, 12 ); +new Font( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 12 ); + +// light +new Font( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 12 ); +new Font( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 12 ); + +// semibold +new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 12 ); +new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 12 ); +~~~ + + +Download +-------- + +FlatLaf Fonts binaries are available on **Maven Central**. + +If you use Maven or Gradle, add a dependency with following coordinates to your +build script: + + groupId: com.formdev + artifactId: flatlaf-fonts-inter + version: (see button below) + +Otherwise download `flatlaf-fonts-inter-.jar` here: + +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-inter/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-inter) diff --git a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts new file mode 100644 index 00000000..093be791 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts @@ -0,0 +1,54 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Version format: - +// For maven compatibility, should be in format .[.]. +// is usually '1' and should be incremented only if a new release is +// necessary, but the has not changed. +version = "3.19-1" + +plugins { + `java-library` + `flatlaf-module-info` + `flatlaf-publish` +} + +dependencies { + testImplementation( "org.junit.jupiter:junit-jupiter-api:5.7.2" ) + testImplementation( "org.junit.jupiter:junit-jupiter-params" ) + testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" ) +} + +java { + withSourcesJar() + withJavadocJar() +} + +tasks { + named( "sourcesJar" ) { + exclude( "**/*.ttf", "**/*.otf" ) + } + + test { + useJUnitPlatform() + testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + } +} + +flatlafPublish { + artifactId = "flatlaf-fonts-inter" + name = "FlatLaf Inter Fonts Pack" +} 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 new file mode 100644 index 00000000..21cd6366 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java @@ -0,0 +1,129 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.inter; + +import java.awt.Font; +import java.awt.FontFormatException; +import java.awt.GraphicsEnvironment; +import java.io.IOException; +import java.io.InputStream; + +/** + * The Inter font family. + *

+ * Note: This font requires Java 10 or later. + * It is displayed too large in Java 8 and 9. + *

+ * Font home page: https://rsms.me/inter/
+ * GitHub project: https://github.com/rsms/inter + * + * @author Karl Tauber + */ +public class FlatInterFont +{ + /** + * Family name for basic styles (regular, italic and bold). + *

+ * Usage: + * 

{@code
+	 * new Font( FlatInterFont.FAMILY, Font.PLAIN, 12 );
+	 * new Font( FlatInterFont.FAMILY, Font.ITALIC, 12 );
+	 * new Font( FlatInterFont.FAMILY, Font.BOLD, 12 );
+	 * new Font( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY = "Inter"; + + /** + * Family name for light styles. + *

+ * Usage: + * 

{@code
+	 * new Font( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 12 );
+	 * new Font( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY_LIGHT = "Inter Light"; + + /** + * Family name for semibold styles. + *

+ * Usage: + * 

{@code
+	 * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 12 );
+	 * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY_SEMIBOLD = "Inter Semi Bold"; + + /** + * Use for {@link #installStyle(String)} to install single font style. + */ + public static final String + // basic styles + STYLE_REGULAR = "Inter-Regular.otf", + STYLE_ITALIC = "Inter-Italic.otf", + STYLE_BOLD = "Inter-Bold.otf", + STYLE_BOLD_ITALIC = "Inter-BoldItalic.otf", + + // light + STYLE_LIGHT = "Inter-Light.otf", + STYLE_LIGHT_ITALIC = "Inter-LightItalic.otf", + + // semibold + STYLE_SEMIBOLD = "Inter-SemiBold.otf", + STYLE_SEMIBOLD_ITALIC = "Inter-SemiBoldItalic.otf"; + + + private FlatInterFont() {} + + /** + * Creates and registers the fonts for all styles. + */ + public static void install() { + // basic styles + installStyle( STYLE_REGULAR ); + installStyle( STYLE_ITALIC ); + installStyle( STYLE_BOLD ); + installStyle( STYLE_BOLD_ITALIC ); + + // light + installStyle( STYLE_LIGHT ); + installStyle( STYLE_LIGHT_ITALIC ); + + // semibold + installStyle( STYLE_SEMIBOLD ); + installStyle( STYLE_SEMIBOLD_ITALIC ); + } + + /** + * Creates and registers the font for the given style. + * See {@code STYLE_} constants. + */ + public static boolean installStyle( String name ) { + try( InputStream in = FlatInterFont.class.getResourceAsStream( name ) ) { + Font font = Font.createFont( Font.TRUETYPE_FONT, in ); + return GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont( font ); + } catch( FontFormatException ex ) { + ex.printStackTrace(); + return false; + } catch( IOException ex ) { + ex.printStackTrace(); + return false; + } + } +} diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/module-info/module-info.java b/flatlaf-fonts/flatlaf-fonts-inter/src/main/module-info/module-info.java new file mode 100644 index 00000000..46875520 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/module-info/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Karl Tauber + */ +module com.formdev.flatlaf.fonts.inter { + requires java.desktop; + + exports com.formdev.flatlaf.fonts.inter; + + opens com.formdev.flatlaf.fonts.inter; +} 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 new file mode 100644 index 00000000..c74cc0c6 Binary files /dev/null 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 new file mode 100644 index 00000000..20d20c19 Binary files /dev/null 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 new file mode 100644 index 00000000..39d6016b Binary files /dev/null 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 new file mode 100644 index 00000000..2a83ae16 Binary files /dev/null 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 new file mode 100644 index 00000000..ca9fb127 Binary files /dev/null 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 new file mode 100644 index 00000000..84e6a61c Binary files /dev/null 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 new file mode 100644 index 00000000..daf4c441 Binary files /dev/null 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 new file mode 100644 index 00000000..bc58b80d Binary files /dev/null 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 new file mode 100644 index 00000000..ff80f8c6 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt @@ -0,0 +1,94 @@ +Copyright (c) 2016-2020 The Inter Project Authors. +"Inter" is trademark of Rasmus Andersson. +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: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION AND CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/test/java/com/formdev/flatlaf/fonts/inter/TestFlatInterFont.java b/flatlaf-fonts/flatlaf-fonts-inter/src/test/java/com/formdev/flatlaf/fonts/inter/TestFlatInterFont.java new file mode 100644 index 00000000..b370ca50 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/test/java/com/formdev/flatlaf/fonts/inter/TestFlatInterFont.java @@ -0,0 +1,50 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.inter; + +import java.awt.Font; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author Karl Tauber + */ +class TestFlatInterFont +{ + @Test + void testFont() { + FlatInterFont.install(); + + testFont( FlatInterFont.FAMILY, Font.PLAIN, 13 ); + testFont( FlatInterFont.FAMILY, Font.ITALIC, 13 ); + testFont( FlatInterFont.FAMILY, Font.BOLD, 13 ); + testFont( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 13 ); + + testFont( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 13 ); + testFont( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 13 ); + + testFont( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 13 ); + testFont( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 13 ); + } + + private void testFont( String family, int style, int size ) { + Font actual = new Font( family, style, size ); + assertEquals( family, actual.getFamily() ); + assertEquals( style, actual.getStyle() ); + assertEquals( size, actual.getSize() ); + } +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md new file mode 100644 index 00000000..cb47b905 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md @@ -0,0 +1,51 @@ +JetBrains Mono font +=================== + +This sub-project contains fonts from the JetBrains Mono font family and bundles +them into an easy-to-use and redistributable JAR. + +Font home page: https://www.jetbrains.com/mono + +GitHub project: https://github.com/JetBrains/JetBrainsMono + +License: +[SIL OPEN FONT LICENSE Version 1.1](src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt) + + +How to install? +--------------- + +Invoke the `install()` method once in your `main()` method (on AWT thread): + +~~~java +FlatJetBrainsMonoFont.install(); +~~~ + + +How to use? +----------- + +~~~java +// basic styles +new Font( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 12 ); +new Font( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 12 ); +new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 12 ); +new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 ); +~~~ + + +Download +-------- + +FlatLaf Fonts binaries are available on **Maven Central**. + +If you use Maven or Gradle, add a dependency with following coordinates to your +build script: + + groupId: com.formdev + artifactId: flatlaf-fonts-jetbrains-mono + version: (see button below) + +Otherwise download `flatlaf-fonts-jetbrains-mono-.jar` here: + +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-jetbrains-mono/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-jetbrains-mono) diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts new file mode 100644 index 00000000..becd9ae3 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts @@ -0,0 +1,54 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Version format: - +// For maven compatibility, should be in format .[.]. +// is usually '1' and should be incremented only if a new release is +// necessary, but the has not changed. +version = "2.242-1" + +plugins { + `java-library` + `flatlaf-module-info` + `flatlaf-publish` +} + +dependencies { + testImplementation( "org.junit.jupiter:junit-jupiter-api:5.7.2" ) + testImplementation( "org.junit.jupiter:junit-jupiter-params" ) + testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" ) +} + +java { + withSourcesJar() + withJavadocJar() +} + +tasks { + named( "sourcesJar" ) { + exclude( "**/*.ttf", "**/*.otf" ) + } + + test { + useJUnitPlatform() + testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + } +} + +flatlafPublish { + artifactId = "flatlaf-fonts-jetbrains-mono" + name = "FlatLaf JetBrains Mono Fonts Pack" +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/java/com/formdev/flatlaf/fonts/jetbrains_mono/FlatJetBrainsMonoFont.java b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/java/com/formdev/flatlaf/fonts/jetbrains_mono/FlatJetBrainsMonoFont.java new file mode 100644 index 00000000..dbd02607 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/java/com/formdev/flatlaf/fonts/jetbrains_mono/FlatJetBrainsMonoFont.java @@ -0,0 +1,87 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.jetbrains_mono; + +import java.awt.Font; +import java.awt.FontFormatException; +import java.awt.GraphicsEnvironment; +import java.io.IOException; +import java.io.InputStream; + +/** + * The JetBrains Mono font family. + *

+ * Font home page: https://www.jetbrains.com/mono
+ * GitHub project: https://github.com/JetBrains/JetBrainsMono + * + * @author Karl Tauber + */ +public class FlatJetBrainsMonoFont +{ + /** + * Family name for basic styles (regular, italic and bold). + *

+ * Usage: + * 

{@code
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 12 );
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 12 );
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 12 );
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY = "JetBrains Mono"; + + /** + * Use for {@link #installStyle(String)} to install single font styles. + */ + public static final String + // basic styles + STYLE_REGULAR = "JetBrainsMono-Regular.ttf", + STYLE_ITALIC = "JetBrainsMono-Italic.ttf", + STYLE_BOLD = "JetBrainsMono-Bold.ttf", + STYLE_BOLD_ITALIC = "JetBrainsMono-BoldItalic.ttf"; + + + private FlatJetBrainsMonoFont() {} + + /** + * Creates and registers the fonts for all styles. + */ + public static void install() { + installStyle( STYLE_REGULAR ); + installStyle( STYLE_ITALIC ); + installStyle( STYLE_BOLD ); + installStyle( STYLE_BOLD_ITALIC ); + } + + /** + * Creates and registers the font for the given style. + * See {@code STYLE_} constants. + */ + public static boolean installStyle( String name ) { + try( InputStream in = FlatJetBrainsMonoFont.class.getResourceAsStream( name ) ) { + Font font = Font.createFont( Font.TRUETYPE_FONT, in ); + return GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont( font ); + } catch( FontFormatException ex ) { + ex.printStackTrace(); + return false; + } catch( IOException ex ) { + ex.printStackTrace(); + return false; + } + } +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/module-info/module-info.java b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/module-info/module-info.java new file mode 100644 index 00000000..b3984c69 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/module-info/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Karl Tauber + */ +module com.formdev.flatlaf.fonts.jetbrains_mono { + requires java.desktop; + + exports com.formdev.flatlaf.fonts.jetbrains_mono; + + opens com.formdev.flatlaf.fonts.jetbrains_mono; +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf new file mode 100644 index 00000000..0a928091 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 00000000..d051920c Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf new file mode 100644 index 00000000..e54a46ee Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf new file mode 100644 index 00000000..8da8aa40 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt new file mode 100644 index 00000000..821a3dac --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +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: https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/test/java/com/formdev/flatlaf/fonts/jetbrains_mono/TestFlatJetBrainsMonoFont.java b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/test/java/com/formdev/flatlaf/fonts/jetbrains_mono/TestFlatJetBrainsMonoFont.java new file mode 100644 index 00000000..3eb795bd --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/test/java/com/formdev/flatlaf/fonts/jetbrains_mono/TestFlatJetBrainsMonoFont.java @@ -0,0 +1,44 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.jetbrains_mono; + +import java.awt.Font; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author Karl Tauber + */ +class TestFlatJetBrainsMonoFont +{ + @Test + void testFont() { + FlatJetBrainsMonoFont.install(); + + testFont( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 13 ); + testFont( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 13 ); + testFont( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 13 ); + testFont( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 13 ); + } + + private void testFont( String family, int style, int size ) { + Font actual = new Font( family, style, size ); + assertEquals( family, actual.getFamily() ); + assertEquals( style, actual.getStyle() ); + assertEquals( size, actual.getSize() ); + } +} diff --git a/flatlaf-testing/build.gradle.kts b/flatlaf-testing/build.gradle.kts index f72ccbb9..93f420ab 100644 --- a/flatlaf-testing/build.gradle.kts +++ b/flatlaf-testing/build.gradle.kts @@ -24,6 +24,8 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( project( ":flatlaf-extras" ) ) + implementation( project( ":flatlaf-fonts-inter" ) ) + implementation( project( ":flatlaf-fonts-jetbrains-mono" ) ) implementation( project( ":flatlaf-swingx" ) ) implementation( project( ":flatlaf-jide-oss" ) ) implementation( project( ":flatlaf-intellij-themes" ) ) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java index 75c2b254..47913645 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java @@ -23,6 +23,8 @@ import java.awt.GraphicsEnvironment; import java.util.Map; import java.util.TreeMap; import javax.swing.*; +import com.formdev.flatlaf.fonts.inter.FlatInterFont; +import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont; import com.formdev.flatlaf.util.UIScale; import net.miginfocom.swing.*; @@ -34,6 +36,9 @@ public class FlatFontsTest { public static void main( String[] args ) { SwingUtilities.invokeLater( () -> { + FlatInterFont.install(); + FlatJetBrainsMonoFont.install(); + FlatTestFrame frame = FlatTestFrame.create( args, "FlatFontsTest" ); frame.showFrame( FlatFontsTest::new ); } ); diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ff4adda..0e29a165 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,6 +25,9 @@ include( "flatlaf-demo" ) include( "flatlaf-testing" ) include( "flatlaf-theme-editor" ) +includeProject( "flatlaf-fonts-inter", "flatlaf-fonts/flatlaf-fonts-inter" ) +includeProject( "flatlaf-fonts-jetbrains-mono", "flatlaf-fonts/flatlaf-fonts-jetbrains-mono" ) + includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" ) includeProject( "flatlaf-natives-linux", "flatlaf-natives/flatlaf-natives-linux" ) includeProject( "flatlaf-natives-jna", "flatlaf-natives/flatlaf-natives-jna" )