Updates

example/book.toml → book/book.toml

@@ -3,7 +3,7 @@ authors = ["Patrick Elsen"]
 language = "en"
 multilingual = false
 src = "src"
-title = "mdbook-files demo"
+title = "mdbook-files book"
 
 [preprocessor.files]
 command = "cargo run --"

example/src/SUMMARY.md → book/src/SUMMARY.md

@@ -1,4 +1,5 @@
 # Summary
 
-- [Source](source.md)
+- [Setup](setup.md)
+- [Tests](source.md)
     - [Subchapter](subchapter.md)

book/src/setup.md

@@ -0,0 +1 @@
+# Setup

example/src/subchapter.md → book/src/subchapter.md

@@ -4,5 +4,7 @@ This is a subchapter.
 
 ```files
 title = "This is a title"
-files = ["example/book.toml"]
+files = ["book/book.toml"]
 ```
+
+## Subchapter

src/lib.rs

@@ -138,15 +138,25 @@ impl Config {
             }});
         </script>"#).into())));
 
+        events.push(Event::HardBreak);
         Ok(events)
     }
 
     fn label(&self) -> &str {
         "files"
     }
 
-    fn map_chapter(&self, chapter: Chapter) -> Result<Chapter> {
-        let mut parser = Parser::new_ext(&chapter.content, Options::all());
+    fn map_chapter(&self, mut chapter: Chapter) -> Result<Chapter> {
+        chapter.content = self.map_markdown(&chapter.content)?;
+        chapter.sub_items = std::mem::take(&mut chapter.sub_items)
+            .into_iter()
+            .map(|item| self.map_book_item(item))
+            .collect::<Result<_, _>>()?;
+        Ok(chapter)
+    }
+
+    fn map_markdown(&self, markdown: &str) -> Result<String> {
+        let mut parser = Parser::new_ext(&markdown, Options::all());
         let mut events = vec![];
 
         loop {
@@ -171,16 +181,9 @@ impl Config {
             }
         }
 
-        let mut buf = String::with_capacity(chapter.content.len());
-        let output = cmark(events.iter(), &mut buf).map(|_| buf).unwrap();
-        let mut chapter = chapter;
-        chapter.content = output;
-
-        chapter.sub_items = std::mem::take(&mut chapter.sub_items)
-            .into_iter()
-            .map(|item| self.map_book_item(item))
-            .collect::<Result<_, _>>()?;
-        Ok(chapter)
+        let mut buf = String::with_capacity(markdown.len());
+        let output = cmark(events.iter(), &mut buf).map(|_| buf)?;
+        Ok(output)
     }
 }