Merge branch 'liw/refactor-md' into 'main'

improve Markdown API

See merge request subplot/subplot!307

1 files changed, 2 insertions, 3 deletions

diff --git a/src/doc.rs b/src/doc.rs
index a39ab99..faa3a84 100644
--- a/src/doc.rs
+++ b/src/doc.rs
@@ -13,7 +13,6 @@ use crate::{Metadata, YamlMetadata};
 use crate::{Warning, Warnings};
 
 use std::collections::HashSet;
-use std::convert::TryFrom;
 use std::default::Default;
 use std::fmt::Debug;
 use std::fs::read;
@@ -105,7 +104,7 @@ impl Document {
         subplot: PathBuf,
         markdowns: Vec<PathBuf>,
         yamlmeta: &YamlMetadata,
-        mut md: Markdown,
+        md: Markdown,
         style: Style,
         template: Option<&str>,
     ) -> Result<Document, SubplotError>
@@ -147,7 +146,7 @@ impl Document {
 
         let mdfile = meta.markdown();
         let mdfile = basedir.join(mdfile);
-        let mut md = Markdown::try_from(mdfile.as_path())?;
+        let mut md = Markdown::load_file(mdfile.as_path())?;
         md.set_metadata(&meta);
         let markdowns = vec![mdfile];