Skip to content

Commit 0264f4f

Browse files
authored
Rollup merge of rust-lang#84048 - konan8205:master, r=jsha
Avoid CJK legacy fonts in Windows As metioned in rust-lang#84035, the default serif CJK font in Windows is meh-looking. To avoid this, we should use sans-serif font or provide CJK glyph supported font in `rustdoc.css`.
2 parents 47a90f4 + 8a2d663 commit 0264f4f

File tree

6 files changed

+117
-1
lines changed

6 files changed

+117
-1
lines changed

src/librustdoc/html/render/write_shared.rs

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ crate static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| {
3333
"SourceCodePro-Semibold.ttf.woff" => static_files::source_code_pro::SEMIBOLD,
3434
"SourceCodePro-It.ttf.woff" => static_files::source_code_pro::ITALIC,
3535
"SourceCodePro-LICENSE.txt" => static_files::source_code_pro::LICENSE,
36+
"noto-sans-kr-v13-korean-regular.woff" => static_files::noto_sans_kr::REGULAR,
37+
"noto-sans-kr-v13-korean-regular-LICENSE.txt" => static_files::noto_sans_kr::LICENSE,
3638
"LICENSE-MIT.txt" => static_files::LICENSE_MIT,
3739
"LICENSE-APACHE.txt" => static_files::LICENSE_APACHE,
3840
"COPYRIGHT.txt" => static_files::COPYRIGHT,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
5+
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.

src/librustdoc/html/static/rustdoc.css

+9-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
font-display: swap;
6767
}
6868

69+
/* Avoid using legacy CJK serif fonts in Windows like Batang */
70+
@font-face {
71+
font-family: 'Noto Sans KR';
72+
src: url("noto-sans-kr-v13-korean-regular.woff") format("woff");
73+
font-display: swap;
74+
unicode-range: U+A960-A97F, U+AC00-D7AF, U+D7B0-D7FF;
75+
}
76+
6977
* {
7078
-webkit-box-sizing: border-box;
7179
-moz-box-sizing: border-box;
@@ -90,7 +98,7 @@ html {
9098
/* General structure and fonts */
9199

92100
body {
93-
font: 16px/1.4 "Source Serif 4", serif;
101+
font: 16px/1.4 "Source Serif 4", "Noto Sans KR", serif;
94102
margin: 0;
95103
position: relative;
96104
padding: 10px 15px 20px 15px;

src/librustdoc/html/static_files.rs

+11
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,17 @@ crate mod source_code_pro {
126126
crate static LICENSE: &[u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
127127
}
128128

129+
crate mod noto_sans_kr {
130+
/// The file `noto-sans-kr-v13-korean-regular.woff`, the Regular variant of the Noto Sans KR
131+
/// font.
132+
crate static REGULAR: &[u8] = include_bytes!("static/noto-sans-kr-v13-korean-regular.woff");
133+
134+
/// The file `noto-sans-kr-v13-korean-regular-LICENSE.txt`, the license text of the Noto Sans KR
135+
/// font.
136+
crate static LICENSE: &[u8] =
137+
include_bytes!("static/noto-sans-kr-v13-korean-regular-LICENSE.txt");
138+
}
139+
129140
/// Files related to the sidebar in rustdoc sources.
130141
crate mod sidebar {
131142
/// File script to handle sidebar.

src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt

+2
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ SourceSerif4-Bold.ttf.woff
1414
SourceSerif4-It.ttf.woff
1515
SourceSerif4-LICENSE.md
1616
SourceSerif4-Regular.ttf.woff
17+
noto-sans-kr-v13-korean-regular-LICENSE.txt
18+
noto-sans-kr-v13-korean-regular.woff

0 commit comments

Comments
 (0)