From 17b5f025ad12d16b912959d46dcdd1942815e716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 31 Jul 2020 01:05:26 -0300 Subject: [PATCH] mdBook: update to 0.4.1. Add patch to fix page index in void-docs. --- srcpkgs/mdBook/patches/summary.patch | 53 ++++++++++++++++++++++++++++ srcpkgs/mdBook/template | 4 +-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/mdBook/patches/summary.patch diff --git a/srcpkgs/mdBook/patches/summary.patch b/srcpkgs/mdBook/patches/summary.patch new file mode 100644 index 00000000000..5ba202fabac --- /dev/null +++ b/srcpkgs/mdBook/patches/summary.patch @@ -0,0 +1,53 @@ +From dcf9462d1e69975d505dfb1b6d4139acb89f10a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Rolim?= +Date: Tue, 28 Jul 2020 22:54:49 -0300 +Subject: [PATCH] summary: turn SoftBreak events into spaces. + +Summary items that had their name split into two lines ended up with the +last word of one line and the first word of the next line glued +together, since a space wasn't added. + +Added test case for it. + +Fixes #1218 +--- + src/book/summary.rs | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/src/book/summary.rs b/src/book/summary.rs +index 996913a0a5..4782eb84ac 100644 +--- src/book/summary.rs ++++ src/book/summary.rs +@@ -569,6 +569,7 @@ fn stringify_events(events: Vec>) -> String { + .into_iter() + .filter_map(|t| match t { + Event::Text(text) | Event::Code(text) => Some(text.into_string()), ++ Event::SoftBreak => Some(String::from(" ")), + _ => None, + }) + .collect() +@@ -926,4 +927,24 @@ mod tests { + + assert_eq!(got, should_be); + } ++ ++ /// Regression test for https://github.com/rust-lang/mdBook/issues/1218 ++ /// Ensure chapter names spread across multiple lines have spaces between all the words. ++ #[test] ++ fn add_space_for_multi_line_chapter_names() { ++ let src = "- [Chapter\ntitle](./chapter.md)"; ++ let should_be = vec![SummaryItem::Link(Link { ++ name: String::from("Chapter title"), ++ location: Some(PathBuf::from("./chapter.md")), ++ number: Some(SectionNumber(vec![1])), ++ nested_items: Vec::new(), ++ })]; ++ ++ let mut parser = SummaryParser::new(src); ++ let got = parser ++ .parse_numbered(&mut 0, &mut SectionNumber::default()) ++ .unwrap(); ++ ++ assert_eq!(got, should_be); ++ } + } diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template index a1aa6f83a42..94009860d06 100644 --- a/srcpkgs/mdBook/template +++ b/srcpkgs/mdBook/template @@ -1,6 +1,6 @@ # Template file for 'mdBook' pkgname=mdBook -version=0.4.0 +version=0.4.1 revision=1 build_style=cargo short_desc="Create book from markdown files. Like Gitbook but implemented in Rust" @@ -9,7 +9,7 @@ license="MPL-2.0" homepage="https://github.com/rust-lang/mdBook" changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md" distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz" -checksum=402439a3ce61415bb84f0bf7681e15c96a9ce627c9e2c08647ec8c557c1a9b1a +checksum=48ee2d7102b440dbdb5ecb0849e82368a57777b03f3d6750ac7c47157b1da7ac post_install() { vlicense LICENSE