---

aturon · alexcrichton · commit eb0c652490aa · 2014-07-24T07:26:17.000-07:00
yaml --- r: 153737 b: refs/heads/try2 c: 31ac8a9 h: refs/heads/master i: 153735: 7c70170 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 62bddfa0a5bf7753f835aa9c299232eb75c7bdaa
+refs/heads/try2: 31ac8a90f1fbe66c3ad34ef0e5f48bc5f7026059
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustdoc/lib.rs b/branches/try2/src/librustdoc/lib.rs
@@ -131,7 +131,8 @@ pub fn opts() -> Vec<getopts::OptGroup> {
                  Markdown file or generated documentation",
                  "FILES"),
         optopt("", "markdown-playground-url",
-               "URL to send code snippets to", "URL")
+               "URL to send code snippets to", "URL"),
+        optflag("", "markdown-no-toc", "don't include table of contents")
     )
 }
 
@@ -220,7 +221,8 @@ pub fn main_args(args: &[String]) -> int {
             return test::run(input, cfgs, libs, externs, test_args)
         }
         (false, true) => return markdown::render(input, output.unwrap_or(Path::new("doc")),
-                                                 &matches, &external_html),
+                                                 &matches, &external_html,
+                                                 !matches.opt_present("markdown-no-toc")),
         (false, false) => {}
     }
 
diff --git a/branches/try2/src/librustdoc/markdown.rs b/branches/try2/src/librustdoc/markdown.rs
@@ -20,7 +20,7 @@ use externalfiles::ExternalHtml;
 
 use html::escape::Escape;
 use html::markdown;
-use html::markdown::{MarkdownWithToc, find_testable_code, reset_headers};
+use html::markdown::{Markdown, MarkdownWithToc, find_testable_code, reset_headers};
 use test::Collector;
 
 /// Separate any lines at the start of the file that begin with `%`.
@@ -42,7 +42,7 @@ fn extract_leading_metadata<'a>(s: &'a str) -> (Vec<&'a str>, &'a str) {
 /// Render `input` (e.g. "foo.md") into an HTML file in `output`
 /// (e.g. output = "bar" => "bar/foo.html").
 pub fn render(input: &str, mut output: Path, matches: &getopts::Matches,
-              external_html: &ExternalHtml) -> int {
+              external_html: &ExternalHtml, include_toc: bool) -> int {
     let input_p = Path::new(input);
     output.push(input_p.filestem().unwrap());
     output.set_extension("html");
@@ -80,6 +80,12 @@ pub fn render(input: &str, mut output: Path, matches: &getopts::Matches,
 
     reset_headers();
 
+    let rendered = if include_toc {
+        format!("{}", MarkdownWithToc(text))
+    } else {
+        format!("{}", Markdown(text))
+    };
+
     let err = write!(
         &mut out,
         r#"<!DOCTYPE html>
@@ -113,7 +119,7 @@ pub fn render(input: &str, mut output: Path, matches: &getopts::Matches,
         css = css,
         in_header = external_html.in_header,
         before_content = external_html.before_content,
-        text = MarkdownWithToc(text),
+        text = rendered,
         after_content = external_html.after_content,
         playground = playground,
         );

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,8 @@ pub fn opts() -> Vec<getopts::OptGroup> {`
`131`	`131`	`Markdown file or generated documentation",`
`132`	`132`	`"FILES"),`
`133`	`133`	`optopt("", "markdown-playground-url",`
`134`		`- "URL to send code snippets to", "URL")`
	`134`	`+ "URL to send code snippets to", "URL"),`
	`135`	`+ optflag("", "markdown-no-toc", "don't include table of contents")`
`135`	`136`	`)`
`136`	`137`	`}`
`137`	`138`
`@@ -220,7 +221,8 @@ pub fn main_args(args: &[String]) -> int {`
`220`	`221`	`return test::run(input, cfgs, libs, externs, test_args)`
`221`	`222`	`}`
`222`	`223`	`(false, true) => return markdown::render(input, output.unwrap_or(Path::new("doc")),`
`223`		`- &matches, &external_html),`
	`224`	`+ &matches, &external_html,`
	`225`	`+ !matches.opt_present("markdown-no-toc")),`
`224`	`226`	`(false, false) => {}`
`225`	`227`	`}`
`226`	`228`