about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2019-04-20 19:33:58 -0700
committerManish Goregaokar <manishsmail@gmail.com>2019-04-20 20:50:33 -0700
commit6bafc58cedc6f409dbcd8919a25b2f5d425f42ae (patch)
tree327355dce8e2cae2c917f40c7a12b5b21ab01df6
parente14819ac0379ad178a13b82b063c9718d77f2baf (diff)
downloadrust-6bafc58cedc6f409dbcd8919a25b2f5d425f42ae.tar.gz
rust-6bafc58cedc6f409dbcd8919a25b2f5d425f42ae.zip
Update Source Code Pro fonts to version 2.030
Pulled in from https://github.com/adobe-fonts/source-code-pro/
-rw-r--r--src/librustdoc/html/render.rs2
-rw-r--r--src/librustdoc/html/static/SourceCodePro-LICENSE.md (renamed from src/librustdoc/html/static/SourceCodePro-LICENSE.txt)2
-rw-r--r--src/librustdoc/html/static/SourceCodePro-Regular.woffbin55472 -> 95872 bytes
-rw-r--r--src/librustdoc/html/static/SourceCodePro-Semibold.woffbin55360 -> 95576 bytes
-rw-r--r--src/librustdoc/html/static_files.rs2
5 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 6993bb75289..487c57172d9 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -936,7 +936,7 @@ themePicker.onblur = handleThemeButtonsBlur;
           static_files::source_code_pro::REGULAR)?;
     write(cx.dst.join("SourceCodePro-Semibold.woff"),
           static_files::source_code_pro::SEMIBOLD)?;
-    write(cx.dst.join("SourceCodePro-LICENSE.txt"),
+    write(cx.dst.join("SourceCodePro-LICENSE.md"),
           static_files::source_code_pro::LICENSE)?;
     write(cx.dst.join("LICENSE-MIT.txt"),
           static_files::LICENSE_MIT)?;
diff --git a/src/librustdoc/html/static/SourceCodePro-LICENSE.txt b/src/librustdoc/html/static/SourceCodePro-LICENSE.md
index 07542572e33..1177330426d 100644
--- a/src/librustdoc/html/static/SourceCodePro-LICENSE.txt
+++ b/src/librustdoc/html/static/SourceCodePro-LICENSE.md
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
+fonts, including any derivative works, can be bundled, embedded, 
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff
index 5576670903a..117c7e5142c 100644
--- a/src/librustdoc/html/static/SourceCodePro-Regular.woff
+++ b/src/librustdoc/html/static/SourceCodePro-Regular.woff
Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff
index ca972a11dc4..270873a86a0 100644
--- a/src/librustdoc/html/static/SourceCodePro-Semibold.woff
+++ b/src/librustdoc/html/static/SourceCodePro-Semibold.woff
Binary files differdiff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index 3a2c24b1a96..24fe61e977a 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -103,7 +103,7 @@ pub mod source_code_pro {
     pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
 
     /// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
-    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
+    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md");
 }
 
 /// Files related to the sidebar in rustdoc sources.