diff options
| -rw-r--r-- | src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m | 2 | ||||
| -rw-r--r-- | src/java.desktop/share/classes/sun/font/SunFontManager.java | 4 | ||||
| -rw-r--r-- | src/java.desktop/share/fonts/JetBrainsMono-Bold-Italic.ttf | bin | 0 -> 79936 bytes | |||
| -rw-r--r-- | src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf | bin | 101056 -> 74704 bytes | |||
| -rw-r--r-- | src/java.desktop/share/fonts/JetBrainsMono-BoldItalic.ttf | bin | 108760 -> 0 bytes | |||
| -rw-r--r-- | src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf | bin | 105892 -> 78060 bytes | |||
| -rw-r--r-- | src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf | bin | 98292 -> 73920 bytes | |||
| -rw-r--r-- | src/java.desktop/share/fonts/fonts.dir | 28 | ||||
| -rw-r--r-- | test/jdk/jbu/quality/text/BundledFontTest.java | 13 |
9 files changed, 26 insertions, 21 deletions
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m index a312665cbbe..b9c8627a34d 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m @@ -1224,7 +1224,7 @@ static NSDictionary* prebuiltFamilyNames() { @"Inconsolata" : @"Inconsolata", @"JetBrainsMono-Bold" : @"JetBrains Mono", @"JetBrainsMono-Regular" : @"JetBrains Mono", -// @"JetBrainsMono-Italic" : @"JetBrains Mono", + @"JetBrainsMono-Italic" : @"JetBrains Mono", @"JetBrainsMono-BoldItalic" : @"JetBrains Mono", @"Roboto-Light" : @"Roboto", @"Roboto-Thin" : @"Roboto", diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java index 6f1fe543810..e8f745a56e1 100644 --- a/src/java.desktop/share/classes/sun/font/SunFontManager.java +++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java @@ -329,8 +329,8 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { jreFontMap.put("JetBrains Mono Bold", "JetBrainsMono-Bold.ttf"); jreFontMap.put("JetBrains Mono Regular", "JetBrainsMono-Regular.ttf"); -// jreFontMap.put("JetBrains Mono Italic", "JetBrainsMono-Italic.ttf"); -// jreFontMap.put("JetBrains Mono Bold Italic", "JetBrainsMono-BoldItalic.ttf"); + jreFontMap.put("JetBrains Mono Italic", "JetBrainsMono-Italic.ttf"); + jreFontMap.put("JetBrains Mono Bold Italic", "JetBrainsMono-Bold-Italic.ttf"); jreBundledFontFiles.addAll(jreFontMap.values()); } diff --git a/src/java.desktop/share/fonts/JetBrainsMono-Bold-Italic.ttf b/src/java.desktop/share/fonts/JetBrainsMono-Bold-Italic.ttf Binary files differnew file mode 100644 index 00000000000..b1e40e4a664 --- /dev/null +++ b/src/java.desktop/share/fonts/JetBrainsMono-Bold-Italic.ttf diff --git a/src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf b/src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf Binary files differindex b031701e573..f1fa3973c31 100644 --- a/src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf +++ b/src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf diff --git a/src/java.desktop/share/fonts/JetBrainsMono-BoldItalic.ttf b/src/java.desktop/share/fonts/JetBrainsMono-BoldItalic.ttf Binary files differdeleted file mode 100644 index de318774194..00000000000 --- a/src/java.desktop/share/fonts/JetBrainsMono-BoldItalic.ttf +++ /dev/null diff --git a/src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf b/src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf Binary files differindex df3fd096319..71ac396b61f 100644 --- a/src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf +++ b/src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf diff --git a/src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf b/src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf Binary files differindex 06155aff1f7..f06b1ac65c2 100644 --- a/src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf +++ b/src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf diff --git a/src/java.desktop/share/fonts/fonts.dir b/src/java.desktop/share/fonts/fonts.dir index cdb512badb3..f3087ca4314 100644 --- a/src/java.desktop/share/fonts/fonts.dir +++ b/src/java.desktop/share/fonts/fonts.dir @@ -279,6 +279,20 @@ Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-1 Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-15 Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-2 Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-9 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-ascii-0 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso10646-1 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-1 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-10 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-13 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-15 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-16 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-2 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-3 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-4 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-9 +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-koi8-r +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-koi8-u +JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252 JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-ascii-0 JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso10646-1 JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-1 @@ -293,20 +307,6 @@ JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-9 JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-koi8-r JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-koi8-u JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-ascii-0 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso10646-1 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-1 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-10 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-13 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-15 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-16 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-2 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-3 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-4 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-9 -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-koi8-r -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-koi8-u -JetBrainsMono-BoldItalic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252 JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-ascii-0 JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso10646-1 JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-1 diff --git a/test/jdk/jbu/quality/text/BundledFontTest.java b/test/jdk/jbu/quality/text/BundledFontTest.java index eb513f3fa8b..adbccc1215d 100644 --- a/test/jdk/jbu/quality/text/BundledFontTest.java +++ b/test/jdk/jbu/quality/text/BundledFontTest.java @@ -127,8 +127,13 @@ public class BundledFontTest { doTestFont("JetBrains Mono", Font.BOLD); } -// @Test -// public void testJetBrainsMonoItalic() throws Exception { -// doTestFont("JetBrains Mono", Font.ITALIC); -// } + @Test + public void testJetBrainsMonoItalic() throws Exception { + doTestFont("JetBrains Mono", Font.ITALIC); + } + + @Test + public void testJetBrainsMonoBoldItalic() throws Exception { + doTestFont("JetBrains Mono", Font.BOLD | Font.ITALIC); + } } |