doc,rustdoc: store webfonts locally

- Avoids cross-domain requests restrictions
- Better availability of content
- No HTML queries needed for an offline build

diff --git a/mk/docs.mk b/mk/docs.mk
index 9c79e1e864253cca4c6727b1e9ac194d605117d2..3e032d597280530a4d431d6c317c1bfbf84c5e2f 100644 (file)
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -141,6 +141,26 @@ doc/footer.inc: $(D)/footer.inc | doc/
        @$(call E, cp: $@)
        $(Q)cp -a $< $@ 2> /dev/null
 
+doc/FiraSans-Regular.woff: $(D)/FiraSans-Regular.woff | doc/
+       @$(call E, cp: $@)
+       $(Q)cp -a $< $@ 2> /dev/null
+
+doc/FiraSans-Medium.woff: $(D)/FiraSans-Medium.woff | doc/
+       @$(call E, cp: $@)
+       $(Q)cp -a $< $@ 2> /dev/null
+
+doc/Heuristica-Regular.woff: $(D)/Heuristica-Regular.woff | doc/
+       @$(call E, cp: $@)
+       $(Q)cp -a $< $@ 2> /dev/null
+
+doc/Heuristica-Italic.woff: $(D)/Heuristica-Italic.woff | doc/
+       @$(call E, cp: $@)
+       $(Q)cp -a $< $@ 2> /dev/null
+
+doc/Heuristica-Bold.woff: $(D)/Heuristica-Bold.woff | doc/
+       @$(call E, cp: $@)
+       $(Q)cp -a $< $@ 2> /dev/null
+
 # The (english) documentation for each doc item.
 
 define DEF_SHOULD_BUILD_PDF_DOC

diff --git a/src/doc/FiraSans-Medium.woff b/src/doc/FiraSans-Medium.woff
new file mode 100644 (file)
index 0000000..5627227
Binary files /dev/null and b/src/doc/FiraSans-Medium.woff differ

diff --git a/src/doc/FiraSans-Regular.woff b/src/doc/FiraSans-Regular.woff
new file mode 100644 (file)
index 0000000..9ff4044
Binary files /dev/null and b/src/doc/FiraSans-Regular.woff differ

diff --git a/src/doc/Heuristica-Bold.woff b/src/doc/Heuristica-Bold.woff
new file mode 100644 (file)
index 0000000..1c952d1
Binary files /dev/null and b/src/doc/Heuristica-Bold.woff differ

diff --git a/src/doc/Heuristica-Italic.woff b/src/doc/Heuristica-Italic.woff
new file mode 100644 (file)
index 0000000..b0cebf0
Binary files /dev/null and b/src/doc/Heuristica-Italic.woff differ

diff --git a/src/doc/Heuristica-Regular.woff b/src/doc/Heuristica-Regular.woff
new file mode 100644 (file)
index 0000000..8d824e6
Binary files /dev/null and b/src/doc/Heuristica-Regular.woff differ

diff --git a/src/doc/rust.css b/src/doc/rust.css
index c3143e35f3efc52bf0ebef4560ccb98b5f558ef1..b9dd7d42fe01e2b900d94fc7652d3fe05116c572 100644 (file)
--- a/src/doc/rust.css
+++ b/src/doc/rust.css
@@ -14,31 +14,31 @@
     font-family: 'Fira Sans';
     font-style: normal;
     font-weight: 400;
-    src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff');
+    src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
 }
 @font-face {
     font-family: 'Fira Sans';
     font-style: normal;
     font-weight: 500;
-    src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff');
+    src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: normal;
     font-weight: 400;
-    src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff');
+    src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: italic;
     font-weight: 400;
-    src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff');
+    src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: normal;
     font-weight: 700;
-    src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff');
+    src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
 }
 
 * {

diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 5799871bd10932dd7428c90e41f24f7cc9858cc0..71bac527801e20c78903f71c29434f8f2cdfa99a 100644 (file)
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -13,31 +13,31 @@
     font-family: 'Fira Sans';
     font-style: normal;
     font-weight: 400;
-    src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff');
+    src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
 }
 @font-face {
     font-family: 'Fira Sans';
     font-style: normal;
     font-weight: 500;
-    src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff');
+    src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: normal;
     font-weight: 400;
-    src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff');
+    src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: italic;
     font-weight: 400;
-    src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff');
+    src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: normal;
     font-weight: 700;
-    src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff');
+    src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
 }
 
 @import "normalize.css";