Description: Use local web resources instead of remote ones Author: Matthijs van Otterdijk Author: Ximin Luo Bug: https://github.com/azerupi/mdBook/issues/271 Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase the patch on top of a newer version. . Make sure the paths here match the ones in debian/rust-doc.links --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: rustc.git/src/tools/linkchecker/main.rs =================================================================== --- rustc.git.orig/src/tools/linkchecker/main.rs +++ rustc.git/src/tools/linkchecker/main.rs @@ -172,6 +172,11 @@ fn check(cache: &mut Cache, root: &Path, { return; } + // Ignore parent URLs, so that the package installation process can + // provide a symbolic link later + if url.starts_with("../") { + return; + } let mut parts = url.splitn(2, '#'); let url = parts.next().unwrap(); let fragment = parts.next(); Index: rustc.git/vendor/mdbook/src/theme/index.hbs =================================================================== --- rustc.git.orig/vendor/mdbook/src/theme/index.hbs +++ rustc.git/vendor/mdbook/src/theme/index.hbs @@ -32,13 +32,10 @@ - - {{#if copy_fonts}} - - {{/if}} + - + @@ -49,7 +46,7 @@ {{#if mathjax_support}} - + {{/if}} @@ -59,46 +56,6 @@ var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}"; - - - - - - - - -

{{#toc}}{{/toc}} @@ -226,53 +183,7 @@ {{/if}} - {{#if google_analytics}} - - - {{/if}} - - {{#if playground_line_numbers}} - - {{/if}} - - {{#if playground_copyable}} - - {{/if}} - - {{#if playground_js}} - - - - - - {{/if}} - - {{#if search_js}} - - - - {{/if}} - - - + Index: rustc.git/vendor/mdbook/src/book/init.rs =================================================================== --- rustc.git.orig/vendor/mdbook/src/book/init.rs +++ rustc.git/vendor/mdbook/src/book/init.rs @@ -151,12 +151,6 @@ impl BookBuilder { let mut js = File::create(themedir.join("book.js"))?; js.write_all(theme::JS)?; - let mut highlight_css = File::create(themedir.join("highlight.css"))?; - highlight_css.write_all(theme::HIGHLIGHT_CSS)?; - - let mut highlight_js = File::create(themedir.join("highlight.js"))?; - highlight_js.write_all(theme::HIGHLIGHT_JS)?; - Ok(()) } Index: rustc.git/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs =================================================================== --- rustc.git.orig/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +++ rustc.git/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs @@ -3,7 +3,7 @@ use crate::config::{Config, HtmlConfig, use crate::errors::*; use crate::renderer::html_handlebars::helpers; use crate::renderer::{RenderContext, Renderer}; -use crate::theme::{self, playground_editor, Theme}; +use crate::theme::{self, Theme}; use crate::utils; use std::borrow::Cow; @@ -198,80 +198,8 @@ impl HtmlHandlebars { if let Some(contents) = &theme.favicon_svg { write_file(destination, "favicon.svg", &contents)?; } - write_file(destination, "highlight.css", &theme.highlight_css)?; write_file(destination, "tomorrow-night.css", &theme.tomorrow_night_css)?; write_file(destination, "ayu-highlight.css", &theme.ayu_highlight_css)?; - write_file(destination, "highlight.js", &theme.highlight_js)?; - write_file(destination, "clipboard.min.js", &theme.clipboard_js)?; - write_file( - destination, - "FontAwesome/css/font-awesome.css", - theme::FONT_AWESOME, - )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.eot", - theme::FONT_AWESOME_EOT, - )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.svg", - theme::FONT_AWESOME_SVG, - )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.ttf", - theme::FONT_AWESOME_TTF, - )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.woff", - theme::FONT_AWESOME_WOFF, - )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.woff2", - theme::FONT_AWESOME_WOFF2, - )?; - write_file( - destination, - "FontAwesome/fonts/FontAwesome.ttf", - theme::FONT_AWESOME_TTF, - )?; - if html_config.copy_fonts { - write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?; - for (file_name, contents) in theme::fonts::LICENSES.iter() { - write_file(destination, file_name, contents)?; - } - for (file_name, contents) in theme::fonts::OPEN_SANS.iter() { - write_file(destination, file_name, contents)?; - } - write_file( - destination, - theme::fonts::SOURCE_CODE_PRO.0, - theme::fonts::SOURCE_CODE_PRO.1, - )?; - } - - let playground_config = &html_config.playground; - - // Ace is a very large dependency, so only load it when requested - if playground_config.editable && playground_config.copy_js { - // Load the editor - write_file(destination, "editor.js", playground_editor::JS)?; - write_file(destination, "ace.js", playground_editor::ACE_JS)?; - write_file(destination, "mode-rust.js", playground_editor::MODE_RUST_JS)?; - write_file( - destination, - "theme-dawn.js", - playground_editor::THEME_DAWN_JS, - )?; - write_file( - destination, - "theme-tomorrow_night.js", - playground_editor::THEME_TOMORROW_NIGHT_JS, - )?; - } Ok(()) } Index: rustc.git/vendor/mdbook/src/renderer/html_handlebars/search.rs =================================================================== --- rustc.git.orig/vendor/mdbook/src/renderer/html_handlebars/search.rs +++ rustc.git/vendor/mdbook/src/renderer/html_handlebars/search.rs @@ -34,8 +34,6 @@ pub fn create_files(search_config: &Sear format!("Object.assign(window.search, {});", index).as_bytes(), )?; utils::fs::write_file(destination, "searcher.js", searcher::JS)?; - utils::fs::write_file(destination, "mark.min.js", searcher::MARK_JS)?; - utils::fs::write_file(destination, "elasticlunr.min.js", searcher::ELASTICLUNR_JS)?; debug!("Copying search files ✓"); } Index: rustc.git/vendor/mdbook/src/theme/mod.rs =================================================================== --- rustc.git.orig/vendor/mdbook/src/theme/mod.rs +++ rustc.git/vendor/mdbook/src/theme/mod.rs @@ -1,9 +1,5 @@ #![allow(missing_docs)] -pub mod playground_editor; - -pub mod fonts; - #[cfg(feature = "search")] pub mod searcher; @@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = includ pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png"); pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg"); pub static JS: &[u8] = include_bytes!("book.js"); -pub static HIGHLIGHT_JS: &[u8] = include_bytes!("highlight.js"); pub static TOMORROW_NIGHT_CSS: &[u8] = include_bytes!("tomorrow-night.css"); -pub static HIGHLIGHT_CSS: &[u8] = include_bytes!("highlight.css"); pub static AYU_HIGHLIGHT_CSS: &[u8] = include_bytes!("ayu-highlight.css"); -pub static CLIPBOARD_JS: &[u8] = include_bytes!("clipboard.min.js"); -pub static FONT_AWESOME: &[u8] = include_bytes!("FontAwesome/css/font-awesome.min.css"); -pub static FONT_AWESOME_EOT: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot"); -pub static FONT_AWESOME_SVG: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg"); -pub static FONT_AWESOME_TTF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf"); -pub static FONT_AWESOME_WOFF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff"); -pub static FONT_AWESOME_WOFF2: &[u8] = - include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2"); -pub static FONT_AWESOME_OTF: &[u8] = include_bytes!("FontAwesome/fonts/FontAwesome.otf"); /// The `Theme` struct should be used instead of the static variables because /// the `new()` method will look if the user has a theme directory in their @@ -57,11 +42,8 @@ pub struct Theme { pub favicon_png: Option>, pub favicon_svg: Option>, pub js: Vec, - pub highlight_css: Vec, pub tomorrow_night_css: Vec, pub ayu_highlight_css: Vec, - pub highlight_js: Vec, - pub clipboard_js: Vec, } impl Theme { @@ -91,9 +73,6 @@ impl Theme { theme_dir.join("css/variables.css"), &mut theme.variables_css, ), - (theme_dir.join("highlight.js"), &mut theme.highlight_js), - (theme_dir.join("clipboard.min.js"), &mut theme.clipboard_js), - (theme_dir.join("highlight.css"), &mut theme.highlight_css), ( theme_dir.join("tomorrow-night.css"), &mut theme.tomorrow_night_css, @@ -156,11 +135,8 @@ impl Default for Theme { favicon_png: Some(FAVICON_PNG.to_owned()), favicon_svg: Some(FAVICON_SVG.to_owned()), js: JS.to_owned(), - highlight_css: HIGHLIGHT_CSS.to_owned(), tomorrow_night_css: TOMORROW_NIGHT_CSS.to_owned(), ayu_highlight_css: AYU_HIGHLIGHT_CSS.to_owned(), - highlight_js: HIGHLIGHT_JS.to_owned(), - clipboard_js: CLIPBOARD_JS.to_owned(), } } } @@ -243,11 +219,8 @@ mod tests { favicon_png: Some(Vec::new()), favicon_svg: Some(Vec::new()), js: Vec::new(), - highlight_css: Vec::new(), tomorrow_night_css: Vec::new(), ayu_highlight_css: Vec::new(), - highlight_js: Vec::new(), - clipboard_js: Vec::new(), }; assert_eq!(got, empty); Index: rustc.git/vendor/mdbook/src/theme/searcher/mod.rs =================================================================== --- rustc.git.orig/vendor/mdbook/src/theme/searcher/mod.rs +++ rustc.git/vendor/mdbook/src/theme/searcher/mod.rs @@ -2,5 +2,3 @@ //! the "search" cargo feature is disabled. pub static JS: &[u8] = include_bytes!("searcher.js"); -pub static MARK_JS: &[u8] = include_bytes!("mark.min.js"); -pub static ELASTICLUNR_JS: &[u8] = include_bytes!("elasticlunr.min.js");