Merge branch 'liw/refactor' into 'main'

Refactoring ready for YAML-from-separate-file

See merge request subplot/subplot!286

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 3b4e844..725e49c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,11 +21,11 @@ pub use error::Warnings;
 pub mod resource;
 
 mod diagrams;
-pub use diagrams::{DiagramMarkup, DotMarkup, MarkupOpts, PikchrMarkup, PlantumlMarkup};
+pub use diagrams::{DiagramMarkup, DotMarkup, MarkupOpts, PikchrMarkup, PlantumlMarkup, Svg};
 
-mod datafiles;
-pub use datafiles::DataFile;
-pub use datafiles::DataFiles;
+mod embedded;
+pub use embedded::EmbeddedFile;
+pub use embedded::EmbeddedFiles;
 
 mod panhelper;
 mod typeset;
@@ -73,4 +73,4 @@ mod codegen;
 pub use codegen::generate_test_program;
 
 mod ast;
-pub use ast::AbstractSyntaxTree;
+pub use ast::{extract_metadata, AbstractSyntaxTree, YamlMetadata};