bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #41826 - GuillaumeGomez:add-markdown-content, r=frewsxcv

Browse source 
Add markdown-[before|after]-content options

cc @nical

r? @rust-lang/docs
This commit is contained in:
Mark Simulacrum 2017-05-13 20:55:09 -06:00 • committed by GitHub
commit 27ea129dd3
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustdoc/lib.rs
View file

@ -160,6 +160,14 @@ pub fn opts() -> Vec<RustcOptGroup> {
"files to include inline between the content and </body> of a rendered \
Markdown file or generated documentation",
"FILES")),
unstable(optmulti("", "markdown-before-content",
"files to include inline between <body> and the content of a rendered \
Markdown file or generated documentation",
"FILES")),
unstable(optmulti("", "markdown-after-content",
"files to include inline between the content and </body> of a rendered \
Markdown file or generated documentation",
"FILES")),
stable(optopt("", "markdown-playground-url",
"URL to send code snippets to", "URL")),
stable(optflag("", "markdown-no-toc", "don't include table of contents")),
@ -275,7 +283,10 @@ pub fn main_args(args: &[String]) -> isize {
let external_html = match ExternalHtml::load(
&matches.opt_strs("html-in-header"),
&matches.opt_strs("html-before-content"),
&matches.opt_strs("html-after-content")) {
&matches.opt_strs("html-after-content"),
&matches.opt_strs("markdown-before-content"),
&matches.opt_strs("markdown-after-content"),
render_type) {
Some(eh) => eh,
None => return 3,
};