cli: Add flexibility in dot and plantuml locations

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/bin/subplot.rs b/src/bin/subplot.rs
index 47dc72b..867ffb2 100644
--- a/src/bin/subplot.rs
+++ b/src/bin/subplot.rs
@@ -5,7 +5,9 @@ use anyhow::Result;
 
 use chrono::{Local, TimeZone};
 use structopt::StructOpt;
-use subplot::{generate_test_program, resource, template_spec, DataFile, Document, Style};
+use subplot::{
+    generate_test_program, resource, template_spec, DataFile, Document, MarkupOpts, Style,
+};
 
 use std::convert::TryFrom;
 use std::ffi::OsString;
@@ -27,6 +29,9 @@ struct Toplevel {
     resources: resource::ResourceOpts,
 
     #[structopt(flatten)]
+    markup: MarkupOpts,
+
+    #[structopt(flatten)]
     command: Cmd,
 }
 
@@ -35,9 +40,10 @@ impl Toplevel {
         self.command.run()
     }
 
-    fn handle_resources(&self) {
+    fn handle_special_args(&self) {
         let doc_path = self.command.doc_path();
         self.resources.handle(doc_path);
+        self.markup.handle();
     }
 }
 
@@ -408,7 +414,7 @@ fn main() {
     let argparser = argparser.long_version(version.as_str());
     let args = argparser.get_matches();
     let args = Toplevel::from_clap(&args);
-    args.handle_resources();
+    args.handle_special_args();
     match args.run() {
         Ok(_) => {}
         Err(e) => {