11 files changed, 99 insertions, 123 deletions
diff --git a/src/sisudoc/io_out/create_zip_file.d b/src/sisudoc/io_out/create_zip_file.d
index e468253..7bd58bc 100644
--- a/src/sisudoc/io_out/create_zip_file.d
+++ b/src/sisudoc/io_out/create_zip_file.d
@@ -50,11 +50,10 @@
 module sisudoc.io_out.create_zip_file;
 @safe:
 template createZipFile() {
-  import
-    std.file,
-    std.outbuffer,
-    std.string,
-    std.zip;
+  import std.file;
+  import std.outbuffer;
+  import std.string;
+  import std.zip;
   void createZipFile(
     string zip_file_name,
     void[] compressed_zip_data,
diff --git a/src/sisudoc/io_out/epub3.d b/src/sisudoc/io_out/epub3.d
index 610d6b8..77bf040 100644
--- a/src/sisudoc/io_out/epub3.d
+++ b/src/sisudoc/io_out/epub3.d
@@ -50,19 +50,17 @@
 module sisudoc.io_out.epub3;
 @safe:
 template outputEPub3() {
-  import
-    std.file,
-    std.outbuffer,
-    std.uri,
-    std.zip,
-    std.conv : to;
-  import
-    sisudoc.io_out,
-    sisudoc.io_out.rgx,
-    sisudoc.io_out.rgx_xhtml,
-    sisudoc.io_out.create_zip_file,
-    sisudoc.io_out.xmls,
-    sisudoc.io_out.xmls_css;
+  import std.file;
+  import std.outbuffer;
+  import std.uri;
+  import std.zip;
+  import std.conv : to;
+  import sisudoc.io_out;
+  import sisudoc.io_out.rgx;
+  import sisudoc.io_out.rgx_xhtml;
+  import sisudoc.io_out.create_zip_file;
+  import sisudoc.io_out.xmls;
+  import sisudoc.io_out.xmls_css;
   mixin InternalMarkup;
   mixin outputXHTMLs;
   static auto rgx = RgxO();
diff --git a/src/sisudoc/io_out/html.d b/src/sisudoc/io_out/html.d
index 6d3129a..5ca320c 100644
--- a/src/sisudoc/io_out/html.d
+++ b/src/sisudoc/io_out/html.d
@@ -50,19 +50,17 @@
 module sisudoc.io_out.html;
 @safe:
 template outputHTML() {
-  import
-    std.file,
-    std.outbuffer,
-    std.uri,
-    std.conv : to;
-  import
-    sisudoc.io_out,
-    sisudoc.io_out.rgx,
-    sisudoc.meta.rgx_files,
-    sisudoc.io_out.rgx_xhtml,
-    sisudoc.io_out.create_zip_file,
-    sisudoc.io_out.xmls,
-    sisudoc.io_out.xmls_css;
+  import std.file;
+  import std.outbuffer;
+  import std.uri;
+  import std.conv : to;
+  import sisudoc.io_out;
+  import sisudoc.io_out.rgx;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.io_out.rgx_xhtml;
+  import sisudoc.io_out.create_zip_file;
+  import sisudoc.io_out.xmls;
+  import sisudoc.io_out.xmls_css;
   mixin outputXHTMLs;
   void scroll(D)(D doc) {
     mixin spineRgxOut;
diff --git a/src/sisudoc/io_out/html_snippet.d b/src/sisudoc/io_out/html_snippet.d
index 9cc9259..7f1edea 100644
--- a/src/sisudoc/io_out/html_snippet.d
+++ b/src/sisudoc/io_out/html_snippet.d
@@ -50,16 +50,14 @@
 module sisudoc.io_out.html_snippet;
 @safe:
 template htmlSnippet() {
-  import
-    std.file,
-    std.outbuffer,
-    std.format,
-    std.uri,
-    std.conv : to;
-  import
-    sisudoc.io_out.rgx,
-    sisudoc.meta.rgx_files,
-    sisudoc.io_out.rgx_xhtml;
+  import std.file;
+  import std.outbuffer;
+  import std.format;
+  import std.uri;
+  import std.conv : to;
+  import sisudoc.io_out.rgx;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.io_out.rgx_xhtml;
   auto format_html_blank_page_guide_home()(
     string css_style,
     string home_url,
diff --git a/src/sisudoc/io_out/latex.d b/src/sisudoc/io_out/latex.d
index d26d502..7df91c3 100644
--- a/src/sisudoc/io_out/latex.d
+++ b/src/sisudoc/io_out/latex.d
@@ -50,9 +50,8 @@
 module sisudoc.io_out.latex;
 @safe:
 template paperLaTeX() {
-  import
-    std.format,
-    std.conv : to;
+  import std.format;
+  import std.conv : to;
   auto paperLaTeX() {
     string mm(uint mmi) {
       string _mm = format(q"┃%smm┃", mmi.to!string);
@@ -319,15 +318,13 @@ template paperLaTeX() {
   }
 }
 template outputLaTeX() {
-  import
-    std.file,
-    std.outbuffer,
-    std.uri,
-    std.conv : to;
-  import
-    sisudoc.io_out,
-    sisudoc.io_out.rgx,
-    sisudoc.io_out.rgx_latex;
+  import std.file;
+  import std.outbuffer;
+  import std.uri;
+  import std.conv : to;
+  import sisudoc.io_out;
+  import sisudoc.io_out.rgx;
+  import sisudoc.io_out.rgx_latex;
   mixin spineRgxOut;
   static auto rgx = RgxO();
   mixin spineRgxLSC;
@@ -1487,9 +1484,8 @@ template outputLaTeXstyInit() {
   }
 }
 template outputLaTeXstyStatic() {
-  import
-    std.format,
-    std.conv : to;
+  import std.format;
+  import std.conv : to;
   string outputLaTeXstyStatic(
     bool   generated_by,
     string name_version_and_compiler,
@@ -1730,9 +1726,8 @@ template outputLaTeXstyStatic() {
   }
 }
 template outputLaTeXstyPaperSizeAndOrientation() {
-  import
-    std.format,
-    std.conv : to;
+  import std.format;
+  import std.conv : to;
   auto outputLaTeXstyPaperSizeAndOrientation(P)(
     P      doc_sty_info,
     bool   generated_by,
diff --git a/src/sisudoc/io_out/metadata.d b/src/sisudoc/io_out/metadata.d
index 4d540af..0d586d2 100644
--- a/src/sisudoc/io_out/metadata.d
+++ b/src/sisudoc/io_out/metadata.d
@@ -109,11 +109,10 @@ template outputMetadata() {
       }
       return o;
     }
-    import
-      std.digest.crc,
-      std.digest.sha,
-      std.file,
-      std.format;
+    import std.digest.crc;
+    import std.digest.sha;
+    import std.file;
+    import std.format;
     import sisudoc.io_out;
     mixin InternalMarkup;
     char[] metadata_;
diff --git a/src/sisudoc/io_out/package.d b/src/sisudoc/io_out/package.d
index 1ab72b0..7cc69ff 100644
--- a/src/sisudoc/io_out/package.d
+++ b/src/sisudoc/io_out/package.d
@@ -48,22 +48,20 @@
 
 +/
 module sisudoc.io_out;
-public import
-  std.algorithm,
-  std.array,
-  std.container,
-  std.exception,
-  std.path,
-  std.process,
-  std.range,
-  std.regex,
-  std.stdio,
-  std.string,
-  std.typecons,
-  // std.uni,
-  std.utf;
-public import
-  sisudoc.share.defaults,
-  sisudoc.io_in.paths_source,
-  sisudoc.io_out.defaults,
-  sisudoc.io_out.paths_output;
+public import std.algorithm;
+public import std.array;
+public import std.container;
+public import std.exception;
+public import std.path;
+public import std.process;
+public import std.range;
+public import std.regex;
+public import std.stdio;
+public import std.string;
+public import std.typecons;
+// public import std.uni;
+public import std.utf;
+public import sisudoc.share.defaults;
+public import sisudoc.io_in.paths_source;
+public import sisudoc.io_out.defaults;
+public import sisudoc.io_out.paths_output;
diff --git a/src/sisudoc/io_out/paths_output.d b/src/sisudoc/io_out/paths_output.d
index 72508fc..a5b73a0 100644
--- a/src/sisudoc/io_out/paths_output.d
+++ b/src/sisudoc/io_out/paths_output.d
@@ -52,13 +52,11 @@
 +/
 module sisudoc.io_out.paths_output;
 @safe:
-import
-  std.array,
-  std.path,
-  std.regex,
-  std.stdio;
-import
-  sisudoc.meta.rgx_files;
+import std.array;
+import std.path;
+import std.regex;
+import std.stdio;
+import sisudoc.meta.rgx_files;
 template spineOutPaths() {
   auto spineOutPaths()(
     string output_pth_root,
diff --git a/src/sisudoc/io_out/source_pod.d b/src/sisudoc/io_out/source_pod.d
index 640e7d2..6ac2590 100644
--- a/src/sisudoc/io_out/source_pod.d
+++ b/src/sisudoc/io_out/source_pod.d
@@ -50,18 +50,15 @@
 module sisudoc.io_out.source_pod;
 @system: // is not @safe: use: @system: or @trusted:
 template spinePod() {
-  import
-    sisudoc.meta.rgx_files,
-    sisudoc.io_out;
-  import
-    std.digest.sha,
-    std.file,
-    std.outbuffer,
-    std.zip,
-    std.conv : to;
-  import
-    sisudoc.io_out.create_zip_file,
-    sisudoc.io_out.xmls;
+  import std.digest.sha;
+  import std.file;
+  import std.outbuffer;
+  import std.zip;
+  import std.conv : to;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.io_out;
+  import sisudoc.io_out.create_zip_file;
+  import sisudoc.io_out.xmls;
   void spinePod(T)(T doc_matters) {
     debug(asserts) {
       // static assert(is(typeof(doc_matters) == tuple));
diff --git a/src/sisudoc/io_out/sqlite.d b/src/sisudoc/io_out/sqlite.d
index ded6e9a..486b87e 100644
--- a/src/sisudoc/io_out/sqlite.d
+++ b/src/sisudoc/io_out/sqlite.d
@@ -48,14 +48,12 @@
 
 +/
 module sisudoc.io_out.sqlite;
-import
-  sisudoc.io_out,
-  sisudoc.io_out.rgx,
-  sisudoc.io_out.rgx_xhtml;
-import
-  // std.digest.sha,
-  std.file,
-  std.uri;
+import sisudoc.io_out;
+import sisudoc.io_out.rgx;
+import sisudoc.io_out.rgx_xhtml;
+import std.file;
+import std.uri;
+// import std.digest.sha;
 import std.conv : to;
 import std.typecons : Nullable;
 import d2sqlite3;
diff --git a/src/sisudoc/io_out/xmls.d b/src/sisudoc/io_out/xmls.d
index 7fc5e51..1091aa5 100644
--- a/src/sisudoc/io_out/xmls.d
+++ b/src/sisudoc/io_out/xmls.d
@@ -50,19 +50,17 @@
 module sisudoc.io_out.xmls;
 @safe:
 template outputXHTMLs() {
-  import
-    std.file,
-    std.outbuffer,
-    std.uri,
-    std.conv : to;
-  import
-    sisudoc.io_out,
-    sisudoc.io_out.rgx,
-    sisudoc.meta.rgx_files,
-    sisudoc.io_out.rgx_xhtml,
-    sisudoc.io_out.create_zip_file,
-    sisudoc.io_out.xmls,
-    sisudoc.io_out.xmls_css;
+  import std.file;
+  import std.outbuffer;
+  import std.uri;
+  import std.conv : to;
+  import sisudoc.io_out;
+  import sisudoc.io_out.rgx;
+  import sisudoc.meta.rgx_files;
+  import sisudoc.io_out.rgx_xhtml;
+  import sisudoc.io_out.create_zip_file;
+  import sisudoc.io_out.xmls;
+  import sisudoc.io_out.xmls_css;
   mixin spineRgxOut;
   mixin spineRgxXHTML;
   struct outputXHTMLs {