1 files changed, 36 insertions, 47 deletions
diff --git a/org/in_source_files.org b/org/in_source_files.org
index cdd220f..5501af5 100644
--- a/org/in_source_files.org
+++ b/org/in_source_files.org
@@ -31,14 +31,12 @@
 +/
 module sisudoc.io_in.read_config_files;
 @safe:
-import
-  std.file,
-  std.path;
-import
-  sisudoc.meta,
-  sisudoc.io_in.paths_source,
-  sisudoc.meta.rgx_files,
-  sisudoc.meta.rgx;
+import std.file;
+import std.path;
+import sisudoc.meta;
+import sisudoc.io_in.paths_source;
+import sisudoc.meta.rgx_files;
+import sisudoc.meta.rgx;
 <<meta_config_file_hub_read_site_config>>
 <<meta_config_file_hub_read_document_config>>
 <<meta_config_file_hub_read_site_yaml>>
@@ -186,14 +184,12 @@ webserv:
 #+HEADER: :noweb yes
 #+BEGIN_SRC d
 static template readConfigDoc() {
-  import
-    std.file,
-    std.path;
-  import
-    sisudoc.meta,
-    sisudoc.io_in.paths_source,
-    sisudoc.meta.rgx_files,
-    sisudoc.meta.rgx;
+  import std.file;
+  import std.path;
+  import sisudoc.meta;
+  import sisudoc.io_in.paths_source;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.meta.rgx;
   @system final auto readConfigDoc(M,E)(M _manifested, E _env) {
     mixin spineRgxIn;
     static auto rgx = RgxI();
@@ -249,14 +245,12 @@ static template readConfigDoc() {
 #+HEADER: :noweb yes
 #+BEGIN_SRC d
 static template configReadSiteYAML() {
-  import
-    std.file,
-    std.path;
-  import
-    sisudoc.meta,
-    sisudoc.io_in.paths_source,
-    sisudoc.meta.rgx_files,
-    sisudoc.meta.rgx;
+  import std.file;
+  import std.path;
+  import sisudoc.meta;
+  import sisudoc.io_in.paths_source;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.meta.rgx;
   final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) {
     string _configuration = configReadInSiteYAML!()(_manifested, _env);
     auto _conf_file_details = configFilePaths!()(_manifested, _env);
@@ -266,12 +260,10 @@ static template configReadSiteYAML() {
   }
 }
 static template configReadDocYAML() {
-  import
-    std.file,
-    std.path;
-  import
-    sisudoc.meta,
-    sisudoc.io_in.paths_source;
+  import std.file;
+  import std.path;
+  import sisudoc.meta;
+  import sisudoc.io_in.paths_source;
   final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) {
     string _configuration = configReadInDocYAML!()(_manifested, _env);
     auto _conf_file_details = configFilePaths!()(_manifested, _env);
@@ -297,15 +289,13 @@ static template configReadDocYAML() {
 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;
@@ -374,7 +364,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);
@@ -399,9 +389,8 @@ template spineRawMarkupContent() {
     }
   }
   struct MarkupRawUnit {
-    import
-      std.digest.sha,
-      std.file;
+    import std.digest.sha;
+    import std.file;
     <<meta_markup_source_raw_read_file_source_string>>
     <<meta_markup_source_raw_doc_header_and_content_split>>
     <<meta_markup_source_raw_source_line_array>>
@@ -630,7 +619,7 @@ if (code_block_status == codeBlock.curly) {
       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();
@@ -646,7 +635,7 @@ if (code_block_status == codeBlock.curly) {
   +/
 } 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;
@@ -735,7 +724,7 @@ if (code_block_status == codeBlock.curly) {
     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;
@@ -753,7 +742,7 @@ if (code_block_status == codeBlock.curly) {
   +/
 } 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;