Avoid being specific to mathjax.

huonw · huonw · commit 0bbb5ac74f63 · 2014-09-29T21:59:17.000+10:00
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
@@ -21,7 +21,7 @@ pub struct Layout {
     pub external_html: ExternalHtml,
     pub krate: String,
     pub playground_url: String,
-    pub use_mathjax: bool,
+    pub enable_math: bool,
 }
 
 pub struct Page<'a> {
@@ -165,7 +165,7 @@ r##"<!DOCTYPE html>
 
     // this must be done after everything is rendered, so that
     // `math_seen` captures all possible $$'s on this page.
-    if layout.use_mathjax && markdown::math_seen.get().map_or(false, |x| *x) {
+    if layout.enable_math && markdown::math_seen.get().map_or(false, |x| *x) {
         try!(dst.write_str("\
 <script async src=\"https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML\"></script>"));
     }
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
@@ -108,7 +108,6 @@ struct MyOpaque {
     dfltblk: extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
                            *const hoedown_buffer, *mut libc::c_void),
     toc_builder: Option<TocBuilder>,
-    math_enabled: bool,
     math_seen: bool,
 }
 
@@ -167,9 +166,8 @@ fn stripped_filtered_line<'a>(s: &'a str) -> Option<&'a str> {
 fn hoedown_extensions() -> libc::c_uint {
     let mut extensions = HOEDOWN_EXTENSIONS;
 
-    match use_mathjax.get().as_ref() {
-        Some(use_math) if **use_math => { extensions |= HOEDOWN_EXT_MATH; }
-        _ => {}
+    if enable_math.get().map_or(false, |x| *x) {
+        extensions |= HOEDOWN_EXT_MATH;
     }
 
     extensions
@@ -179,7 +177,7 @@ local_data_key!(used_header_map: RefCell<HashMap<String, uint>>)
 local_data_key!(test_idx: Cell<uint>)
 // None == render an example, but there's no crate name
 local_data_key!(pub playground_krate: Option<String>)
-local_data_key!(pub use_mathjax: bool)
+local_data_key!(pub enable_math: bool)
 local_data_key!(pub math_seen: bool)
 
 pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result {
@@ -305,9 +303,7 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result {
 
         opaque.math_seen = true;
 
-        let (open, close) = if !opaque.math_enabled {
-            ("$$", "$$")
-        } else if display_mode == 1 {
+        let (open, close) = if display_mode == 1 {
             ("\\[", "\\]")
         } else {
             ("\\(", "\\)")
@@ -332,7 +328,6 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result {
         let mut opaque = MyOpaque {
             dfltblk: (*renderer).blockcode.unwrap(),
             toc_builder: if print_toc {Some(TocBuilder::new())} else {None},
-            math_enabled: use_mathjax.get().map_or(false, |x| *x),
             math_seen: false,
         };
         (*(*renderer).opaque).opaque = &mut opaque as *mut _ as *mut libc::c_void;
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
@@ -247,13 +247,13 @@ pub fn run(mut krate: clean::Crate, external_html: &ExternalHtml, dst: Path) ->
             external_html: external_html.clone(),
             krate: krate.name.clone(),
             playground_url: "".to_string(),
-            use_mathjax: false,
+            enable_math: false,
         },
         include_sources: true,
         render_redirect_pages: false,
     };
 
-    markdown::use_mathjax.replace(None);
+    markdown::enable_math.replace(None);
 
     try!(mkdir(&cx.dst));
 
@@ -290,9 +290,9 @@ pub fn run(mut krate: clean::Crate, external_html: &ExternalHtml, dst: Path) ->
                         cx.include_sources = false;
                     }
                     clean::Word(ref x)
-                            if "enable_mathjax" == x.as_slice() => {
-                        cx.layout.use_mathjax = true;
-                        markdown::use_mathjax.replace(Some(true));
+                            if "enable_math" == x.as_slice() => {
+                        cx.layout.enable_math = true;
+                        markdown::enable_math.replace(Some(true));
                     }
                     _ => {}
                 }
