diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs
index 59dc4ef9449..8fb6d68f3c6 100644
--- a/src/librustdoc/html/render/write_shared.rs
+++ b/src/librustdoc/html/render/write_shared.rs
@@ -26,10 +26,10 @@ crate static FILES_UNVERSIONED: Lazy> = Lazy::new(|| {
"FiraSans-Regular.woff" => static_files::fira_sans::REGULAR,
"FiraSans-Medium.woff" => static_files::fira_sans::MEDIUM,
"FiraSans-LICENSE.txt" => static_files::fira_sans::LICENSE,
- "SourceSerifPro-Regular.ttf.woff" => static_files::source_serif_pro::REGULAR,
- "SourceSerifPro-Bold.ttf.woff" => static_files::source_serif_pro::BOLD,
- "SourceSerifPro-It.ttf.woff" => static_files::source_serif_pro::ITALIC,
- "SourceSerifPro-LICENSE.md" => static_files::source_serif_pro::LICENSE,
+ "SourceSerif4-Regular.ttf.woff" => static_files::source_serif_4::REGULAR,
+ "SourceSerif4-Bold.ttf.woff" => static_files::source_serif_4::BOLD,
+ "SourceSerif4-It.ttf.woff" => static_files::source_serif_4::ITALIC,
+ "SourceSerif4-LICENSE.md" => static_files::source_serif_4::LICENSE,
"SourceCodePro-Regular.ttf.woff" => static_files::source_code_pro::REGULAR,
"SourceCodePro-Semibold.ttf.woff" => static_files::source_code_pro::SEMIBOLD,
"SourceCodePro-It.ttf.woff" => static_files::source_code_pro::ITALIC,
diff --git a/src/librustdoc/html/static/COPYRIGHT.txt b/src/librustdoc/html/static/COPYRIGHT.txt
index 24bdca6544d..16d79032fcc 100644
--- a/src/librustdoc/html/static/COPYRIGHT.txt
+++ b/src/librustdoc/html/static/COPYRIGHT.txt
@@ -33,14 +33,14 @@ included, and carry their own copyright notices and license terms:
Licensed under the SIL Open Font License, Version 1.1.
See SourceCodePro-LICENSE.txt.
-* Source Serif Pro (SourceSerifPro-Regular.ttf.woff,
- SourceSerifPro-Bold.ttf.woff, SourceSerifPro-It.ttf.woff):
+* Source Serif 4 (SourceSerif4-Regular.ttf.woff, SourceSerif4-Bold.ttf.woff,
+ SourceSerif4-It.ttf.woff):
- Copyright 2014 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.
+ Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name
+ 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United
+ States and/or other countries.
Licensed under the SIL Open Font License, Version 1.1.
- See SourceSerifPro-LICENSE.txt.
+ See SourceSerif4-LICENSE.md.
This copyright file is intended to be distributed with rustdoc output.
diff --git a/src/librustdoc/html/static/SourceSerif4-Bold.ttf.woff b/src/librustdoc/html/static/SourceSerif4-Bold.ttf.woff
new file mode 100644
index 00000000000..8ad41888e6e
Binary files /dev/null and b/src/librustdoc/html/static/SourceSerif4-Bold.ttf.woff differ
diff --git a/src/librustdoc/html/static/SourceSerif4-It.ttf.woff b/src/librustdoc/html/static/SourceSerif4-It.ttf.woff
new file mode 100644
index 00000000000..2a34b5c42a8
Binary files /dev/null and b/src/librustdoc/html/static/SourceSerif4-It.ttf.woff differ
diff --git a/src/librustdoc/html/static/SourceSerifPro-LICENSE.md b/src/librustdoc/html/static/SourceSerif4-LICENSE.md
similarity index 98%
rename from src/librustdoc/html/static/SourceSerifPro-LICENSE.md
rename to src/librustdoc/html/static/SourceSerif4-LICENSE.md
index 22cb755f2f1..68ea1892406 100644
--- a/src/librustdoc/html/static/SourceSerifPro-LICENSE.md
+++ b/src/librustdoc/html/static/SourceSerif4-LICENSE.md
@@ -1,4 +1,4 @@
-Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
diff --git a/src/librustdoc/html/static/SourceSerif4-Regular.ttf.woff b/src/librustdoc/html/static/SourceSerif4-Regular.ttf.woff
new file mode 100644
index 00000000000..45a5521ab0c
Binary files /dev/null and b/src/librustdoc/html/static/SourceSerif4-Regular.ttf.woff differ
diff --git a/src/librustdoc/html/static/SourceSerifPro-Bold.ttf.woff b/src/librustdoc/html/static/SourceSerifPro-Bold.ttf.woff
deleted file mode 100644
index ca254318fe9..00000000000
Binary files a/src/librustdoc/html/static/SourceSerifPro-Bold.ttf.woff and /dev/null differ
diff --git a/src/librustdoc/html/static/SourceSerifPro-It.ttf.woff b/src/librustdoc/html/static/SourceSerifPro-It.ttf.woff
deleted file mode 100644
index a287bbe6ed3..00000000000
Binary files a/src/librustdoc/html/static/SourceSerifPro-It.ttf.woff and /dev/null differ
diff --git a/src/librustdoc/html/static/SourceSerifPro-Regular.ttf.woff b/src/librustdoc/html/static/SourceSerifPro-Regular.ttf.woff
deleted file mode 100644
index a3d55cfdf25..00000000000
Binary files a/src/librustdoc/html/static/SourceSerifPro-Regular.ttf.woff and /dev/null differ
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index f3ddd8ec6fa..585b7459bd7 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -18,26 +18,26 @@
font-display: swap;
}
-/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */
+/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
@font-face {
- font-family: 'Source Serif Pro';
+ font-family: 'Source Serif 4';
font-style: normal;
font-weight: 400;
- src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
+ src: local('Source Serif 4'), url("SourceSerif4-Regular.ttf.woff") format('woff');
font-display: swap;
}
@font-face {
- font-family: 'Source Serif Pro';
+ font-family: 'Source Serif 4';
font-style: italic;
font-weight: 400;
- src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
+ src: local('Source Serif 4 Italic'), url("SourceSerif4-It.ttf.woff") format('woff');
font-display: swap;
}
@font-face {
- font-family: 'Source Serif Pro';
+ font-family: 'Source Serif 4';
font-style: normal;
font-weight: 700;
- src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
+ src: local('Source Serif 4 Bold'), url("SourceSerif4-Bold.ttf.woff") format('woff');
font-display: swap;
}
@@ -90,7 +90,7 @@ html {
/* General structure and fonts */
body {
- font: 16px/1.4 "Source Serif Pro", serif;
+ font: 16px/1.4 "Source Serif 4", serif;
margin: 0;
position: relative;
padding: 10px 15px 20px 15px;
diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index 83d4a11e620..b3ac865d55e 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -89,20 +89,19 @@ crate mod fira_sans {
crate static LICENSE: &[u8] = include_bytes!("static/FiraSans-LICENSE.txt");
}
-/// Files related to the Source Serif Pro font.
-crate mod source_serif_pro {
- /// The file `SourceSerifPro-Regular.ttf.woff`, the Regular variant of the Source Serif Pro
- /// font.
- crate static REGULAR: &[u8] = include_bytes!("static/SourceSerifPro-Regular.ttf.woff");
+/// Files related to the Source Serif 4 font.
+crate mod source_serif_4 {
+ /// The file `SourceSerif4-Regular.ttf.woff`, the Regular variant of the Source Serif 4 font.
+ crate static REGULAR: &[u8] = include_bytes!("static/SourceSerif4-Regular.ttf.woff");
- /// The file `SourceSerifPro-Bold.ttf.woff`, the Bold variant of the Source Serif Pro font.
- crate static BOLD: &[u8] = include_bytes!("static/SourceSerifPro-Bold.ttf.woff");
+ /// The file `SourceSerif4-Bold.ttf.woff`, the Bold variant of the Source Serif 4 font.
+ crate static BOLD: &[u8] = include_bytes!("static/SourceSerif4-Bold.ttf.woff");
- /// The file `SourceSerifPro-It.ttf.woff`, the Italic variant of the Source Serif Pro font.
- crate static ITALIC: &[u8] = include_bytes!("static/SourceSerifPro-It.ttf.woff");
+ /// The file `SourceSerif4-It.ttf.woff`, the Italic variant of the Source Serif 4 font.
+ crate static ITALIC: &[u8] = include_bytes!("static/SourceSerif4-It.ttf.woff");
- /// The file `SourceSerifPro-LICENSE.txt`, the license text for the Source Serif Pro font.
- crate static LICENSE: &[u8] = include_bytes!("static/SourceSerifPro-LICENSE.md");
+ /// The file `SourceSerif4-LICENSE.txt`, the license text for the Source Serif 4 font.
+ crate static LICENSE: &[u8] = include_bytes!("static/SourceSerif4-LICENSE.md");
}
/// Files related to the Source Code Pro font.
diff --git a/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt b/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
index befbdab0ad9..4b20cd5d745 100644
--- a/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
+++ b/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
@@ -10,7 +10,7 @@ SourceCodePro-It.ttf.woff
SourceCodePro-LICENSE.txt
SourceCodePro-Regular.ttf.woff
SourceCodePro-Semibold.ttf.woff
-SourceSerifPro-Bold.ttf.woff
-SourceSerifPro-It.ttf.woff
-SourceSerifPro-LICENSE.md
-SourceSerifPro-Regular.ttf.woff
+SourceSerif4-Bold.ttf.woff
+SourceSerif4-It.ttf.woff
+SourceSerif4-LICENSE.md
+SourceSerif4-Regular.ttf.woff