diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs index 02ad01aa29a02..0270e52897d6c 100644 --- a/src/librustdoc/html/render/write_shared.rs +++ b/src/librustdoc/html/render/write_shared.rs @@ -30,8 +30,9 @@ crate static FILES_UNVERSIONED: Lazy> = Lazy::new(|| { "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, - "SourceCodePro-Regular.woff" => static_files::source_code_pro::REGULAR, - "SourceCodePro-Semibold.woff" => static_files::source_code_pro::SEMIBOLD, + "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, "SourceCodePro-LICENSE.txt" => static_files::source_code_pro::LICENSE, "LICENSE-MIT.txt" => static_files::LICENSE_MIT, "LICENSE-APACHE.txt" => static_files::LICENSE_APACHE, diff --git a/src/librustdoc/html/static/COPYRIGHT.txt b/src/librustdoc/html/static/COPYRIGHT.txt index af77776cca431..24bdca6544d6d 100644 --- a/src/librustdoc/html/static/COPYRIGHT.txt +++ b/src/librustdoc/html/static/COPYRIGHT.txt @@ -23,7 +23,8 @@ included, and carry their own copyright notices and license terms: Copyright (c) Nicolas Gallagher and Jonathan Neal. Licensed under the MIT license (see LICENSE-MIT.txt). -* Source Code Pro (SourceCodePro-Regular.woff, SourceCodePro-Semibold.woff): +* Source Code Pro (SourceCodePro-Regular.ttf.woff, + SourceCodePro-Semibold.ttf.woff, SourceCodePro-It.ttf.woff): Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark diff --git a/src/librustdoc/html/static/SourceCodePro-It.ttf.woff b/src/librustdoc/html/static/SourceCodePro-It.ttf.woff new file mode 100644 index 0000000000000..8d68f2febddb0 Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-It.ttf.woff differ diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff b/src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff new file mode 100644 index 0000000000000..7be076e1fca99 Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff differ diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff deleted file mode 100644 index 5576670903aea..0000000000000 Binary files a/src/librustdoc/html/static/SourceCodePro-Regular.woff and /dev/null differ diff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff new file mode 100644 index 0000000000000..61bc67b80252d Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff differ diff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff deleted file mode 100644 index ca972a11dc428..0000000000000 Binary files a/src/librustdoc/html/static/SourceCodePro-Semibold.woff and /dev/null differ diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 4f287cde73b1b..a65b4ce3a0373 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -48,14 +48,21 @@ font-weight: 400; /* Avoid using locally installed font because bad versions are in circulation: * see https://github.com/rust-lang/rust/issues/24355 */ - src: url("SourceCodePro-Regular.woff") format('woff'); + src: url("SourceCodePro-Regular.ttf.woff") format('woff'); + font-display: swap; +} +@font-face { + font-family: 'Source Code Pro'; + font-style: italic; + font-weight: 400; + src: url("SourceCodePro-It.ttf.woff") format('woff'); font-display: swap; } @font-face { font-family: 'Source Code Pro'; font-style: normal; font-weight: 600; - src: url("SourceCodePro-Semibold.woff") format('woff'); + src: url("SourceCodePro-Semibold.ttf.woff") format('woff'); font-display: swap; } diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs index 701e106df67f3..83d4a11e620a9 100644 --- a/src/librustdoc/html/static_files.rs +++ b/src/librustdoc/html/static_files.rs @@ -107,11 +107,15 @@ crate mod source_serif_pro { /// Files related to the Source Code Pro font. crate mod source_code_pro { - /// The file `SourceCodePro-Regular.woff`, the Regular variant of the Source Code Pro font. - crate static REGULAR: &[u8] = include_bytes!("static/SourceCodePro-Regular.woff"); + /// The file `SourceCodePro-Regular.ttf.woff`, the Regular variant of the Source Code Pro font. + crate static REGULAR: &[u8] = include_bytes!("static/SourceCodePro-Regular.ttf.woff"); - /// The file `SourceCodePro-Semibold.woff`, the Semibold variant of the Source Code Pro font. - crate static SEMIBOLD: &[u8] = include_bytes!("static/SourceCodePro-Semibold.woff"); + /// The file `SourceCodePro-Semibold.ttf.woff`, the Semibold variant of the Source Code Pro + /// font. + crate static SEMIBOLD: &[u8] = include_bytes!("static/SourceCodePro-Semibold.ttf.woff"); + + /// The file `SourceCodePro-It.ttf.woff`, the Italic variant of the Source Code Pro font. + crate static ITALIC: &[u8] = include_bytes!("static/SourceCodePro-It.ttf.woff"); /// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font. crate static LICENSE: &[u8] = include_bytes!("static/SourceCodePro-LICENSE.txt"); 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 c5a9bf2438160..befbdab0ad9bc 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 @@ -6,9 +6,10 @@ FiraSans-Regular.woff FiraSans-Regular.woff2 LICENSE-APACHE.txt LICENSE-MIT.txt +SourceCodePro-It.ttf.woff SourceCodePro-LICENSE.txt -SourceCodePro-Regular.woff -SourceCodePro-Semibold.woff +SourceCodePro-Regular.ttf.woff +SourceCodePro-Semibold.ttf.woff SourceSerifPro-Bold.ttf.woff SourceSerifPro-It.ttf.woff SourceSerifPro-LICENSE.md