mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #89782 - konan8205:develop, r=jsha

Browse Source 
Improve CJK font in rustdoc

This PR includes:
- Fix unicode range of korean letters in `rustdoc.css`.
- Add WOFF2 format version of Noto Sans KR font.
- Shorten the font file name.
This commit is contained in:
Yuki Okushi 2021-10-13 21:55:12 +09:00 committed by GitHub
commit cabfda428d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustdoc/html/render/write_shared.rs
View File

@ -39,8 +39,9 @@
"SourceCodePro-Semibold.ttf.woff" => static_files::source_code_pro::SEMIBOLD, "SourceCodePro-Semibold.ttf.woff" => static_files::source_code_pro::SEMIBOLD,
"SourceCodePro-It.ttf.woff" => static_files::source_code_pro::ITALIC, "SourceCodePro-It.ttf.woff" => static_files::source_code_pro::ITALIC,
"SourceCodePro-LICENSE.txt" => static_files::source_code_pro::LICENSE, "SourceCodePro-LICENSE.txt" => static_files::source_code_pro::LICENSE,
"noto-sans-kr-v13-korean-regular.woff" => static_files::noto_sans_kr::REGULAR, "noto-sans-kr-regular.woff2" => static_files::noto_sans_kr::REGULAR2,
"noto-sans-kr-v13-korean-regular-LICENSE.txt" => static_files::noto_sans_kr::LICENSE, "noto-sans-kr-regular.woff" => static_files::noto_sans_kr::REGULAR,
"noto-sans-kr-LICENSE.txt" => static_files::noto_sans_kr::LICENSE,
"LICENSE-MIT.txt" => static_files::LICENSE_MIT, "LICENSE-MIT.txt" => static_files::LICENSE_MIT,
"LICENSE-APACHE.txt" => static_files::LICENSE_APACHE, "LICENSE-APACHE.txt" => static_files::LICENSE_APACHE,
"COPYRIGHT.txt" => static_files::COPYRIGHT, "COPYRIGHT.txt" => static_files::COPYRIGHT,

7
src/librustdoc/html/static/css/rustdoc.css
View File

@ -75,12 +75,13 @@
font-display: swap; font-display: swap;
} }
/* Avoid using legacy CJK serif fonts in Windows like Batang */ /* Avoid using legacy CJK serif fonts in Windows like Batang. */
@font-face { @font-face {
font-family: 'Noto Sans KR'; font-family: 'Noto Sans KR';
src: url("noto-sans-kr-v13-korean-regular.woff") format("woff"); src: url("noto-sans-kr-regular.woff2") format("woff2"),
url("noto-sans-kr-regular.woff") format("woff");
font-display: swap; font-display: swap;
unicode-range: U+A960-A97F, U+AC00-D7AF, U+D7B0-D7FF; unicode-range: U+AC00-D7AF, U+3130-318F, U+1100-11FF, U+A960-A97F, U+D7B0-D7FF;
} }
* { * {

0
src/librustdoc/html/static/fonts/noto-sans-kr-v13-korean-regular-LICENSE.txt → src/librustdoc/html/static/fonts/noto-sans-kr-LICENSE.txt
View File

BIN
src/librustdoc/html/static/fonts/noto-sans-kr-v13-korean-regular.woff → src/librustdoc/html/static/fonts/noto-sans-kr-regular.woff
View File

Binary file not shown.

BIN
src/librustdoc/html/static/fonts/noto-sans-kr-regular.woff2 Normal file
View File

Binary file not shown.

15
src/librustdoc/html/static_files.rs
View File

@ -157,15 +157,14 @@
} }
crate mod noto_sans_kr { crate mod noto_sans_kr {
/// The file `noto-sans-kr-v13-korean-regular.woff`, the Regular variant of the Noto Sans KR /// The file `noto-sans-kr.woff`, the Regular variant of the Noto Sans KR font.
/// font. crate static REGULAR: &[u8] = include_bytes!("static/fonts/noto-sans-kr-regular.woff");
crate static REGULAR: &[u8] =
include_bytes!("static/fonts/noto-sans-kr-v13-korean-regular.woff");
/// The file `noto-sans-kr-v13-korean-regular-LICENSE.txt`, the license text of the Noto Sans KR /// The file `noto-sans-kr.woff2`, the Regular variant of the Noto Sans KR font.
/// font. crate static REGULAR2: &[u8] = include_bytes!("static/fonts/noto-sans-kr-regular.woff2");
crate static LICENSE: &[u8] =
include_bytes!("static/fonts/noto-sans-kr-v13-korean-regular-LICENSE.txt"); /// The file `noto-sans-kr-LICENSE.txt`, the license text of the Noto Sans KR font.
crate static LICENSE: &[u8] = include_bytes!("static/fonts/noto-sans-kr-LICENSE.txt");
} }
/// Files related to the sidebar in rustdoc sources. /// Files related to the sidebar in rustdoc sources.