1 files changed, 14 insertions, 17 deletions
diff --git a/src/sisudoc/io_in/read_source_files.d b/src/sisudoc/io_in/read_source_files.d
index c683d1e..428c119 100644
--- a/src/sisudoc/io_in/read_source_files.d
+++ b/src/sisudoc/io_in/read_source_files.d
@@ -55,15 +55,13 @@
 module sisudoc.io_in.read_source_files;
 @safe:
 template spineRawMarkupContent() {
-  import
-    std.digest.sha,
-    std.file,
-    std.path;
-  import
-    sisudoc.meta,
-    sisudoc.io_in.paths_source,
-    sisudoc.meta.rgx_files,
-    sisudoc.meta.rgx;
+  import std.digest.sha;
+  import std.file;
+  import std.path;
+  import sisudoc.meta;
+  import sisudoc.io_in.paths_source;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.meta.rgx;
   mixin spineRgxIn;
   static auto rgx = RgxI();
   mixin spineRgxFiles;
@@ -132,7 +130,7 @@ template spineRawMarkupContent() {
         sourcefile_body_content = _cii.contents;
         insert_file_list_get = _cii.insert_files.dup;
         images_list_get = _cii.images.dup;
-      } else if (_opt_action.source || _opt_action.pod) {
+      } else if (_opt_action.source_or_pod) {
         auto ins = Inserts();
         ST_contents_inserts_images _cii
           = ins.scan_master_src_for_insert_files_and_import_content(_opt_action, sourcefile_body_content, fn_src);
@@ -157,9 +155,8 @@ template spineRawMarkupContent() {
     }
   }
   struct MarkupRawUnit {
-    import
-      std.digest.sha,
-      std.file;
+    import std.digest.sha;
+    import std.file;
     final private string readInMarkupSource(in char[] fn_src) {
       enforce(
         exists(fn_src) != 0,
@@ -297,7 +294,7 @@ template spineRawMarkupContent() {
               markup_sourcesubfile_insert_content.length
             );
           }
-          if (_opt_action.source || _opt_action.pod) {
+          if (_opt_action.source_or_pod) {
             _images ~= _extract_images(markup_sourcesubfile_insert_content);
           }
           auto ins = Inserts();
@@ -313,7 +310,7 @@ template spineRawMarkupContent() {
           +/
         } else {
           contents_insert ~= line; // images to extract for image list?
-          if (_opt_action.source || _opt_action.pod) {
+          if (_opt_action.source_or_pod) {
             string[] _image_linelist = _extract_images(line);
             if (_image_linelist.length > 0) {
               _images ~= _image_linelist;
@@ -392,7 +389,7 @@ template spineRawMarkupContent() {
             fn_src_insert.to!string
           );
           contents ~= contents_insert_st.insert_contents;
-          if (_opt_action.source || _opt_action.pod) {
+          if (_opt_action.source_or_pod) {
             string[] _image_linelist = _extract_images(contents_insert_st.images);
             if (_image_linelist.length > 0) {
               _images ~= _image_linelist;
@@ -410,7 +407,7 @@ template spineRawMarkupContent() {
           +/
         } else {
           contents ~= line;
-          if (_opt_action.source || _opt_action.pod) {
+          if (_opt_action.source_or_pod) {
             string[] _image_linelist = _extract_images(line);
             if (_image_linelist.length > 0) {
               _images ~= _image_linelist;