bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #83650 - tspiteri:source-serif-4, r=GuillaumeGomez

Browse source 
Update Source Serif to release 4.004

Now the family name is Source Serif 4 (upstream issue 77) instead of Source Serif Pro.
This commit is contained in:
Dylan DPC 2021-04-05 13:03:40 +02:00 • committed by GitHub
commit ad0a995f0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/html/render/write_shared.rs
View file

@ -26,10 +26,10 @@ crate static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| {
"FiraSans-Regular.woff" => static_files::fira_sans::REGULAR, "FiraSans-Regular.woff" => static_files::fira_sans::REGULAR,
"FiraSans-Medium.woff" => static_files::fira_sans::MEDIUM, "FiraSans-Medium.woff" => static_files::fira_sans::MEDIUM,
"FiraSans-LICENSE.txt" => static_files::fira_sans::LICENSE, "FiraSans-LICENSE.txt" => static_files::fira_sans::LICENSE,
"SourceSerifPro-Regular.ttf.woff" => static_files::source_serif_pro::REGULAR, "SourceSerif4-Regular.ttf.woff" => static_files::source_serif_4::REGULAR,
"SourceSerifPro-Bold.ttf.woff" => static_files::source_serif_pro::BOLD, "SourceSerif4-Bold.ttf.woff" => static_files::source_serif_4::BOLD,
"SourceSerifPro-It.ttf.woff" => static_files::source_serif_pro::ITALIC, "SourceSerif4-It.ttf.woff" => static_files::source_serif_4::ITALIC,
"SourceSerifPro-LICENSE.md" => static_files::source_serif_pro::LICENSE, "SourceSerif4-LICENSE.md" => static_files::source_serif_4::LICENSE,
"SourceCodePro-Regular.ttf.woff" => static_files::source_code_pro::REGULAR, "SourceCodePro-Regular.ttf.woff" => static_files::source_code_pro::REGULAR,
"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,

12
src/librustdoc/html/static/COPYRIGHT.txt
View file

@ -33,14 +33,14 @@ included, and carry their own copyright notices and license terms:
Licensed under the SIL Open Font License, Version 1.1. Licensed under the SIL Open Font License, Version 1.1.
See SourceCodePro-LICENSE.txt. See SourceCodePro-LICENSE.txt.
* Source Serif Pro (SourceSerifPro-Regular.ttf.woff, * Source Serif 4 (SourceSerif4-Regular.ttf.woff, SourceSerif4-Bold.ttf.woff,
SourceSerifPro-Bold.ttf.woff, SourceSerifPro-It.ttf.woff): SourceSerif4-It.ttf.woff):
Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name
Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United
Adobe Systems Incorporated in the United States and/or other countries. States and/or other countries.
Licensed under the SIL Open Font License, Version 1.1. 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. This copyright file is intended to be distributed with rustdoc output.

BIN
src/librustdoc/html/static/SourceSerif4-Bold.ttf.woff Normal file
View file

Binary file not shown.

BIN
src/librustdoc/html/static/SourceSerif4-It.ttf.woff Normal file
View file

Binary file not shown.

2
src/librustdoc/html/static/SourceSerifPro-LICENSE.md → src/librustdoc/html/static/SourceSerif4-LICENSE.md
View file

@ -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. This Font Software is licensed under the SIL Open Font License, Version 1.1.

BIN
src/librustdoc/html/static/SourceSerif4-Regular.ttf.woff Normal file
View file

Binary file not shown.

BIN
src/librustdoc/html/static/SourceSerifPro-Bold.ttf.woff
View file

Binary file not shown.

BIN
src/librustdoc/html/static/SourceSerifPro-It.ttf.woff
View file

Binary file not shown.

BIN
src/librustdoc/html/static/SourceSerifPro-Regular.ttf.woff
View file

Binary file not shown.

16
src/librustdoc/html/static/rustdoc.css
View file

@ -18,26 +18,26 @@
font-display: swap; 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-face {
font-family: 'Source Serif Pro'; font-family: 'Source Serif 4';
font-style: normal; font-style: normal;
font-weight: 400; 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-display: swap;
} }
@font-face { @font-face {
font-family: 'Source Serif Pro'; font-family: 'Source Serif 4';
font-style: italic; font-style: italic;
font-weight: 400; 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-display: swap;
} }
@font-face { @font-face {
font-family: 'Source Serif Pro'; font-family: 'Source Serif 4';
font-style: normal; font-style: normal;
font-weight: 700; 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; font-display: swap;
} }
@ -90,7 +90,7 @@ html {
/* General structure and fonts */ /* General structure and fonts */
body { body {
font: 16px/1.4 "Source Serif Pro", serif; font: 16px/1.4 "Source Serif 4", serif;
margin: 0; margin: 0;
position: relative; position: relative;
padding: 10px 15px 20px 15px; padding: 10px 15px 20px 15px;

21
src/librustdoc/html/static_files.rs
View file

@ -89,20 +89,19 @@ crate mod fira_sans {
crate static LICENSE: &[u8] = include_bytes!("static/FiraSans-LICENSE.txt"); crate static LICENSE: &[u8] = include_bytes!("static/FiraSans-LICENSE.txt");
} }
/// Files related to the Source Serif Pro font. /// Files related to the Source Serif 4 font.
crate mod source_serif_pro { crate mod source_serif_4 {
/// The file `SourceSerifPro-Regular.ttf.woff`, the Regular variant of the Source Serif Pro /// The file `SourceSerif4-Regular.ttf.woff`, the Regular variant of the Source Serif 4 font.
/// font. crate static REGULAR: &[u8] = include_bytes!("static/SourceSerif4-Regular.ttf.woff");
crate static REGULAR: &[u8] = include_bytes!("static/SourceSerifPro-Regular.ttf.woff");
/// The file `SourceSerifPro-Bold.ttf.woff`, the Bold variant of the Source Serif Pro font. /// The file `SourceSerif4-Bold.ttf.woff`, the Bold variant of the Source Serif 4 font.
crate static BOLD: &[u8] = include_bytes!("static/SourceSerifPro-Bold.ttf.woff"); 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. /// The file `SourceSerif4-It.ttf.woff`, the Italic variant of the Source Serif 4 font.
crate static ITALIC: &[u8] = include_bytes!("static/SourceSerifPro-It.ttf.woff"); 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. /// The file `SourceSerif4-LICENSE.txt`, the license text for the Source Serif 4 font.
crate static LICENSE: &[u8] = include_bytes!("static/SourceSerifPro-LICENSE.md"); crate static LICENSE: &[u8] = include_bytes!("static/SourceSerif4-LICENSE.md");
} }
/// Files related to the Source Code Pro font. /// Files related to the Source Code Pro font.

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

@ -10,7 +10,7 @@ SourceCodePro-It.ttf.woff
SourceCodePro-LICENSE.txt SourceCodePro-LICENSE.txt
SourceCodePro-Regular.ttf.woff SourceCodePro-Regular.ttf.woff
SourceCodePro-Semibold.ttf.woff SourceCodePro-Semibold.ttf.woff
SourceSerifPro-Bold.ttf.woff SourceSerif4-Bold.ttf.woff
SourceSerifPro-It.ttf.woff SourceSerif4-It.ttf.woff
SourceSerifPro-LICENSE.md SourceSerif4-LICENSE.md
SourceSerifPro-Regular.ttf.woff SourceSerif4-Regular.ttf.woff

6
src/test/run-make/emit-shared-files/Makefile
View file

@ -14,7 +14,7 @@ invocation-only:
[ -e $(INVOCATION_ONLY)/x/index.html ] [ -e $(INVOCATION_ONLY)/x/index.html ]
[ -e $(INVOCATION_ONLY)/theme-xxx.css ] # generated from z.css [ -e $(INVOCATION_ONLY)/theme-xxx.css ] # generated from z.css
! [ -e $(INVOCATION_ONLY)/storage-xxx.js ] ! [ -e $(INVOCATION_ONLY)/storage-xxx.js ]
! [ -e $(INVOCATION_ONLY)/SourceSerifPro-It.ttf.woff ] ! [ -e $(INVOCATION_ONLY)/SourceSerif4-It.ttf.woff ]
# FIXME: this probably shouldn't have a suffix # FIXME: this probably shouldn't have a suffix
[ -e $(INVOCATION_ONLY)/y-xxx.css ] [ -e $(INVOCATION_ONLY)/y-xxx.css ]
@ -24,7 +24,7 @@ invocation-only:
toolchain-only: toolchain-only:
$(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources --output $(TOOLCHAIN_ONLY) --resource-suffix=-xxx --extend-css z.css x.rs $(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources --output $(TOOLCHAIN_ONLY) --resource-suffix=-xxx --extend-css z.css x.rs
[ -e $(TOOLCHAIN_ONLY)/storage-xxx.js ] [ -e $(TOOLCHAIN_ONLY)/storage-xxx.js ]
! [ -e $(TOOLCHAIN_ONLY)/SourceSerifPro-It.ttf.woff ] ! [ -e $(TOOLCHAIN_ONLY)/SourceSerif4-It.ttf.woff ]
! [ -e $(TOOLCHAIN_ONLY)/search-index-xxx.js ] ! [ -e $(TOOLCHAIN_ONLY)/search-index-xxx.js ]
! [ -e $(TOOLCHAIN_ONLY)/x/index.html ] ! [ -e $(TOOLCHAIN_ONLY)/x/index.html ]
! [ -e $(TOOLCHAIN_ONLY)/theme.css ] ! [ -e $(TOOLCHAIN_ONLY)/theme.css ]
@ -35,7 +35,7 @@ toolchain-only:
all-shared: all-shared:
$(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources,unversioned-shared-resources --output $(ALL_SHARED) --resource-suffix=-xxx --extend-css z.css x.rs $(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources,unversioned-shared-resources --output $(ALL_SHARED) --resource-suffix=-xxx --extend-css z.css x.rs
[ -e $(ALL_SHARED)/storage-xxx.js ] [ -e $(ALL_SHARED)/storage-xxx.js ]
[ -e $(ALL_SHARED)/SourceSerifPro-It.ttf.woff ] [ -e $(ALL_SHARED)/SourceSerif4-It.ttf.woff ]
! [ -e $(ALL_SHARED)/search-index-xxx.js ] ! [ -e $(ALL_SHARED)/search-index-xxx.js ]
! [ -e $(ALL_SHARED)/settings.html ] ! [ -e $(ALL_SHARED)/settings.html ]
! [ -e $(ALL_SHARED)/x ] ! [ -e $(ALL_SHARED)/x ]