webfonts: serve Source Code Pro locally

So that we have freestanding docs.

diff --git a/src/doc/favicon.inc b/src/doc/favicon.inc
index 5de7957cdab285fbf7b21ee35663a27fd0b555bf..51609a660d397194a95586abeaa70b8a54dcda7b 100644 (file)
--- a/src/doc/favicon.inc
+++ b/src/doc/favicon.inc
@@ -1,3 +1 @@
 <link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico">
-<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400'
-        rel='stylesheet' type='text/css'>

diff --git a/src/doc/rust.css b/src/doc/rust.css
index 2d79b321b9a449be2c6a8e8bc39106d5a5dbe96c..668acc9a3893b1db6c215fe675caf04f486c1f83 100644 (file)
--- a/src/doc/rust.css
+++ b/src/doc/rust.css
@@ -40,6 +40,12 @@
     font-weight: 700;
     src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
 }
+@font-face {
+    font-family: 'Source Code Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Source Code Pro'), url("SourceCodePro-Regular.woff") format('woff');
+}
 
 *:not(body) {
   -webkit-box-sizing: border-box;

diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index aa298d07780bfe341da75be01175462e3ba40542..356b224e6d5b862fdf66f009f3fc01d09f6c903e 100644 (file)
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -42,8 +42,6 @@ pub fn render<T: fmt::Show, S: fmt::Show>(
 
     <title>{title}</title>
 
-    <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400,600'
-          rel='stylesheet' type='text/css'>
     <link rel="stylesheet" type="text/css" href="{root_path}main.css">
 
     {favicon}

diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 3cd3a7935dd96f8882a4d291b18980bbdac0518a..891b15d164c9b86dfa8344c58169496a74305ccd 100644 (file)
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -484,6 +484,10 @@ fn write_shared(cx: &Context,
                include_bin!("static/Heuristica-Italic.woff")));
     try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
                include_bin!("static/SourceSerifPro-Bold.woff")));
+    try!(write(cx.dst.join("SourceCodePro-Regular.woff"),
+               include_bin!("static/SourceCodePro-Regular.woff")));
+    try!(write(cx.dst.join("SourceCodePro-Semibold.woff"),
+               include_bin!("static/SourceCodePro-Semibold.woff")));
 
     fn collect(path: &Path, krate: &str,
                key: &str) -> io::IoResult<Vec<String>> {

diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff
new file mode 100644 (file)
index 0000000..5576670
Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-Regular.woff differ

diff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff
new file mode 100644 (file)
index 0000000..ca972a1
Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-Semibold.woff differ

diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 711a60f713f7c41453d43fb3ebc48f06c4ec28c2..f65198fcfe28984cbb4a1d8b534c807fe8369dce 100644 (file)
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -39,6 +39,18 @@
     font-weight: 700;
     src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
 }
+@font-face {
+    font-family: 'Source Code Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Source Code Pro'), url("SourceCodePro-Regular.woff") format('woff');
+}
+@font-face {
+    font-family: 'Source Code Pro';
+    font-style: normal;
+    font-weight: 600;
+    src: local('Source Code Pro Semibold'), url("SourceCodePro-Semibold.woff") format('woff');
+}
 
 @import "normalize.css";