Skip to content

8387471: Reduce size of web fonts included in API documentation #32058

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

Open
hns wants to merge 1 commit into
base: master
Choose a base branch
from
Open

8387471: Reduce size of web fonts included in API documentation #32058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file removed ...classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...lasses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed .../jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans-BoldOblique.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans-BoldOblique.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...sses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans-Oblique.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...ses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans-Oblique.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...hare/classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...are/classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSans.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...ses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...es/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed .../javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono-BoldOblique.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono-BoldOblique.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed .../jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono-Oblique.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono-Oblique.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed .../classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSansMono.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...lasses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...asses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed .../jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif-BoldItalic.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif-BoldItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...sses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif-Italic.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...ses/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...are/classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif.woff
View file
Open in desktop
Binary file not shown.
Binary file modified ...re/classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/DejaVuLGCSerif.woff2
View file
Open in desktop
Binary file not shown.
38 changes: 13 additions & 25 deletions ...avadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/fonts/dejavu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
Expand All @@ -9,96 +9,84 @@

@font-face {
font-family: 'DejaVu Sans Mono';
src: url('DejaVuLGCSansMono.woff2') format('woff2'),
url('DejaVuLGCSansMono.woff') format('woff');
src: url('DejaVuLGCSansMono.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'DejaVu Sans Mono';
src: url('DejaVuLGCSansMono-Oblique.woff2') format('woff2'),
url('DejaVuLGCSansMono-Oblique.woff') format('woff');
src: url('DejaVuLGCSansMono-Oblique.woff2') format('woff2');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'DejaVu Sans Mono';
src: url('DejaVuLGCSansMono-Bold.woff2') format('woff2'),
url('DejaVuLGCSansMono-Bold.woff') format('woff');
src: url('DejaVuLGCSansMono-Bold.woff2') format('woff2');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'DejaVu Sans Mono';
src: url('DejaVuLGCSansMono-BoldOblique.woff2') format('woff2'),
url('DejaVuLGCSansMono-BoldOblique.woff') format('woff');
src: url('DejaVuLGCSansMono-BoldOblique.woff2') format('woff2');
font-weight: bold;
font-style: italic;
}

@font-face {
font-family: 'DejaVu Sans';
src: url('DejaVuLGCSans.woff2') format('woff2'),
url('DejaVuLGCSans.woff') format('woff');
src: url('DejaVuLGCSans.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'DejaVu Sans';
src: url('DejaVuLGCSans-Oblique.woff2') format('woff2'),
url('DejaVuLGCSans-Oblique.woff') format('woff');
src: url('DejaVuLGCSans-Oblique.woff2') format('woff2');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'DejaVu Sans';
src: url('DejaVuLGCSans-Bold.woff2') format('woff2'),
url('DejaVuLGCSans-Bold.woff') format('woff');
src: url('DejaVuLGCSans-Bold.woff2') format('woff2');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'DejaVu Sans';
src: url('DejaVuLGCSans-BoldOblique.woff2') format('woff2'),
url('DejaVuLGCSans-BoldOblique.woff') format('woff');
src: url('DejaVuLGCSans-BoldOblique.woff2') format('woff2');
font-weight: bold;
font-style: italic;
}

@font-face {
font-family: 'DejaVu Serif';
src: url('DejaVuLGCSerif.woff2') format('woff2'),
url('DejaVuLGCSerif.woff') format('woff');
src: url('DejaVuLGCSerif.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'DejaVu Serif';
src: url('DejaVuLGCSerif-Italic.woff2') format('woff2'),
url('DejaVuLGCSerif-Italic.woff') format('woff');
src: url('DejaVuLGCSerif-Italic.woff2') format('woff2');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'DejaVu Serif';
src: url('DejaVuLGCSerif-Bold.woff2') format('woff2'),
url('DejaVuLGCSerif-Bold.woff') format('woff');
src: url('DejaVuLGCSerif-Bold.woff2') format('woff2');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'DejaVu Serif';
src: url('DejaVuLGCSerif-BoldItalic.woff2') format('woff2'),
url('DejaVuLGCSerif-BoldItalic.woff') format('woff');
src: url('DejaVuLGCSerif-BoldItalic.woff2') format('woff2');
font-weight: bold;
font-style: italic;
}
15 changes: 1 addition & 14 deletions test/langtools/jdk/javadoc/doclet/testFonts/TestFonts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,35 +72,22 @@ public void testFonts(Path base) throws Exception {
"""
@font-face {
font-family: 'DejaVu Sans Mono';
src: url('DejaVuLGCSansMono.woff2') format('woff2'),
url('DejaVuLGCSansMono.woff') format('woff');
src: url('DejaVuLGCSansMono.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}""");
checkFiles(true,
"resource-files/fonts/DejaVuLGCSans-Bold.woff",
"resource-files/fonts/DejaVuLGCSans-Bold.woff2",
"resource-files/fonts/DejaVuLGCSans-BoldOblique.woff",
"resource-files/fonts/DejaVuLGCSans-BoldOblique.woff2",
"resource-files/fonts/DejaVuLGCSans-Oblique.woff",
"resource-files/fonts/DejaVuLGCSans-Oblique.woff2",
"resource-files/fonts/DejaVuLGCSans.woff",
"resource-files/fonts/DejaVuLGCSans.woff2",
"resource-files/fonts/DejaVuLGCSansMono-Bold.woff",
"resource-files/fonts/DejaVuLGCSansMono-Bold.woff2",
"resource-files/fonts/DejaVuLGCSansMono-BoldOblique.woff",
"resource-files/fonts/DejaVuLGCSansMono-BoldOblique.woff2",
"resource-files/fonts/DejaVuLGCSansMono-Oblique.woff",
"resource-files/fonts/DejaVuLGCSansMono-Oblique.woff2",
"resource-files/fonts/DejaVuLGCSansMono.woff",
"resource-files/fonts/DejaVuLGCSansMono.woff2",
"resource-files/fonts/DejaVuLGCSerif-Bold.woff",
"resource-files/fonts/DejaVuLGCSerif-Bold.woff2",
"resource-files/fonts/DejaVuLGCSerif-BoldItalic.woff",
"resource-files/fonts/DejaVuLGCSerif-BoldItalic.woff2",
"resource-files/fonts/DejaVuLGCSerif-Italic.woff",
"resource-files/fonts/DejaVuLGCSerif-Italic.woff2",
"resource-files/fonts/DejaVuLGCSerif.woff",
"resource-files/fonts/DejaVuLGCSerif.woff2");
}

Expand Down
12 changes: 0 additions & 12 deletions test/langtools/jdk/javadoc/tool/api/basic/APITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,29 +216,17 @@ protected void error(String msg) {
"resource-files/x.svg",
"resource-files/sort-a-z.svg",
"resource-files/fonts/dejavu.css",
"resource-files/fonts/DejaVuLGCSans-Bold.woff",
"resource-files/fonts/DejaVuLGCSans-Bold.woff2",
"resource-files/fonts/DejaVuLGCSans-BoldOblique.woff",
"resource-files/fonts/DejaVuLGCSans-BoldOblique.woff2",
"resource-files/fonts/DejaVuLGCSans-Oblique.woff",
"resource-files/fonts/DejaVuLGCSans-Oblique.woff2",
"resource-files/fonts/DejaVuLGCSans.woff",
"resource-files/fonts/DejaVuLGCSans.woff2",
"resource-files/fonts/DejaVuLGCSansMono-Bold.woff",
"resource-files/fonts/DejaVuLGCSansMono-Bold.woff2",
"resource-files/fonts/DejaVuLGCSansMono-BoldOblique.woff",
"resource-files/fonts/DejaVuLGCSansMono-BoldOblique.woff2",
"resource-files/fonts/DejaVuLGCSansMono-Oblique.woff",
"resource-files/fonts/DejaVuLGCSansMono-Oblique.woff2",
"resource-files/fonts/DejaVuLGCSansMono.woff",
"resource-files/fonts/DejaVuLGCSansMono.woff2",
"resource-files/fonts/DejaVuLGCSerif-Bold.woff",
"resource-files/fonts/DejaVuLGCSerif-Bold.woff2",
"resource-files/fonts/DejaVuLGCSerif-BoldItalic.woff",
"resource-files/fonts/DejaVuLGCSerif-BoldItalic.woff2",
"resource-files/fonts/DejaVuLGCSerif-Italic.woff",
"resource-files/fonts/DejaVuLGCSerif-Italic.woff2",
"resource-files/fonts/DejaVuLGCSerif.woff",
"resource-files/fonts/DejaVuLGCSerif.woff2",
"script-files/script.js",
"script-files/search.js",
Expand Down