aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/default_imports.org60
-rw-r--r--org/default_misc.org35
-rw-r--r--org/default_paths.org30
-rw-r--r--org/default_shared_snippets.org18
-rw-r--r--org/in_source_files.org73
-rw-r--r--org/meta_conf_make_meta.org157
-rw-r--r--org/meta_debugs.org34
-rw-r--r--org/ocda.org24
-rw-r--r--org/out_curate_metadata.org64
-rw-r--r--org/out_latex.org26
-rw-r--r--org/out_metadata.org9
-rw-r--r--org/out_odt.org25
-rw-r--r--org/out_sqlite.org14
-rw-r--r--org/out_src_pod.org21
-rw-r--r--org/out_xmls.org48
-rw-r--r--org/out_zip.org9
-rw-r--r--org/output_show.org28
-rw-r--r--org/spine.org76
18 files changed, 344 insertions, 407 deletions
diff --git a/org/default_imports.org b/org/default_imports.org
index d708124..fb310c9 100644
--- a/org/default_imports.org
+++ b/org/default_imports.org
@@ -32,20 +32,18 @@ module sisudoc.meta;
#+NAME: imports_for_meta_general
#+BEGIN_SRC d
-public import
- sisudoc.meta.defaults;
+public import sisudoc.meta.defaults;
/+ std +/
-public import
- std.array,
- std.exception,
- std.range,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- // std.uni,
- std.utf,
- std.conv : to;
+public import std.array;
+public import std.exception;
+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 std.conv : to;
#+END_SRC
* imports for _output_ :output:
@@ -63,25 +61,23 @@ module sisudoc.io_out;
#+NAME: imports_for_output_general
#+BEGIN_SRC d
-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;
#+END_SRC
* document header including copyright & license
diff --git a/org/default_misc.org b/org/default_misc.org
index baa7a81..1f58d45 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -190,24 +190,23 @@ module sisudoc.io_out.defaults;
#+NAME: defaults_imports
#+BEGIN_SRC d
-import
- std.algorithm,
- std.array,
- std.container,
- std.exception,
- std.file,
- std.getopt,
- std.json,
- std.path,
- std.process,
- std.range,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.uni,
- std.utf,
- std.conv : to;
+import std.algorithm;
+import std.array;
+import std.container;
+import std.exception;
+import std.file;
+import std.getopt;
+import std.json;
+import std.path;
+import std.process;
+import std.range;
+import std.regex;
+import std.stdio;
+import std.string;
+import std.typecons;
+import std.uni;
+import std.utf;
+import std.conv : to;
#+END_SRC
** defaults shared by meta & output (generic)
diff --git a/org/default_paths.org b/org/default_paths.org
index 3cdb909..6ca6ea5 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -31,16 +31,14 @@
+/
module sisudoc.io_in.paths_source;
@safe:
-import
- std.array,
- std.file,
- std.path,
- std.regex,
- std.stdio,
- std.conv : to;
-import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx_files;
+import std.array;
+import std.file;
+import std.path;
+import std.regex;
+import std.stdio;
+import std.conv : to;
+import sisudoc.meta.defaults;
+import sisudoc.meta.rgx_files;
<<template_paths_src_0>>
<<template_paths_src_1>>
<<template_paths_src_2>>
@@ -974,13 +972,11 @@ template spinePathsPods() {
+/
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_paths_out_0>>
<<template_paths_out_1>>
<<template_paths_url>>
diff --git a/org/default_shared_snippets.org b/org/default_shared_snippets.org
index 3cdcb7d..c6d037f 100644
--- a/org/default_shared_snippets.org
+++ b/org/default_shared_snippets.org
@@ -27,16 +27,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/org/in_source_files.org b/org/in_source_files.org
index e83729f..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;
@@ -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>>
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 00bc3d3..7809370 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -197,24 +197,23 @@ webserv:
#+NAME: meta_defaults_imports
#+BEGIN_SRC d
-import
- std.algorithm,
- std.array,
- std.container,
- std.exception,
- std.file,
- std.getopt,
- std.json,
- std.path,
- std.process,
- std.range,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.uni,
- std.utf,
- std.conv : to;
+import std.algorithm;
+import std.array;
+import std.container;
+import std.exception;
+import std.file;
+import std.getopt;
+import std.json;
+import std.path;
+import std.process;
+import std.range;
+import std.regex;
+import std.stdio;
+import std.string;
+import std.typecons;
+import std.uni;
+import std.utf;
+import std.conv : to;
import sisudoc.meta.conf_make_meta_structs;
#+END_SRC
@@ -239,20 +238,18 @@ module sisudoc.meta.conf_make_meta_structs;
#+NAME: meta_defaults_template_structs_init
#+BEGIN_SRC d
-import
- std.exception,
- std.json,
- std.path,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.utf,
- std.conv : to;
-import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx_yaml,
- sisudoc.meta.rgx;
+import std.exception;
+import std.json;
+import std.path;
+import std.regex;
+import std.stdio;
+import std.string;
+import std.typecons;
+import std.utf;
+import std.conv : to;
+import sisudoc.meta.defaults;
+import sisudoc.meta.rgx_yaml;
+import sisudoc.meta.rgx;
mixin spineRgxIn;
static auto rgx = RgxI();
mixin spineRgxYamlTags;
@@ -621,22 +618,20 @@ string check_input_markup()(
module sisudoc.meta.conf_make_meta_yaml;
@safe:
template contentYAMLtoSpineStruct() {
- import
- std.algorithm,
- std.array,
- std.exception,
- std.path,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.utf,
- std.conv : to;
- import
- sisudoc.meta.conf_make_meta_structs,
- sisudoc.meta.defaults,
- sisudoc.meta.rgx_yaml,
- sisudoc.meta.rgx;
+ import std.algorithm;
+ import std.array;
+ import std.exception;
+ import std.path;
+ import std.regex;
+ import std.stdio;
+ import std.string;
+ import std.typecons;
+ import std.utf;
+ import std.conv : to;
+ import sisudoc.meta.conf_make_meta_structs;
+ import sisudoc.meta.defaults;
+ import sisudoc.meta.rgx_yaml;
+ import sisudoc.meta.rgx;
ConfComposite _struct_composite;
@system ConfComposite contentYAMLtoSpineStruct(C,Y,M,O,Cfg)(
C _struct_composite,
@@ -1448,21 +1443,19 @@ if ("rights" in _yaml
module sisudoc.meta.conf_make_meta_json;
@safe:
static template contentJSONtoSpineStruct() {
- import
- std.algorithm,
- std.array,
- std.exception,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.utf,
- std.conv : to;
- import
- sisudoc.meta.conf_make_meta_structs,
- sisudoc.meta.conf_make_meta_json,
- sisudoc.meta.defaults,
- sisudoc.meta.rgx;
+ import std.algorithm;
+ import std.array;
+ import std.exception;
+ import std.regex;
+ import std.stdio;
+ import std.string;
+ import std.typecons;
+ import std.utf;
+ import std.conv : to;
+ import sisudoc.meta.conf_make_meta_structs;
+ import sisudoc.meta.conf_make_meta_json;
+ import sisudoc.meta.defaults;
+ import sisudoc.meta.rgx;
ConfComposite _struct_composite;
auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
mixin spineRgxIn;
@@ -2116,9 +2109,8 @@ if ("rights" in _json.object) {
#+BEGIN_SRC d
template configParseYAMLreturnSpineStruct() {
import dyaml;
- import
- sisudoc.meta.conf_make_meta_structs,
- sisudoc.meta.conf_make_meta_json;
+ import sisudoc.meta.conf_make_meta_structs;
+ import sisudoc.meta.conf_make_meta_json;
mixin contentYAMLtoSpineStruct;
@system ConfComposite configParseYAMLreturnSpineStruct(T,M,O,Cfg)(
T _document_struct,
@@ -2154,21 +2146,18 @@ template configParseYAMLreturnSpineStruct() {
#+NAME: doc_header_convert_to_struct
#+BEGIN_SRC d
template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
- import
- std.exception,
- std.regex,
- std.stdio,
- // std.traits,
- std.typecons,
- std.utf,
- std.conv : to;
- import
- dyaml;
- import
- sisudoc.meta.conf_make_meta_structs,
- sisudoc.meta.conf_make_meta_json,
- sisudoc.meta.rgx_yaml,
- sisudoc.meta.rgx;
+ import std.exception;
+ import std.regex;
+ import std.stdio;
+ // import std.traits;
+ import std.typecons;
+ import std.utf;
+ import std.conv : to;
+ import dyaml;
+ import sisudoc.meta.conf_make_meta_structs;
+ import sisudoc.meta.conf_make_meta_json;
+ import sisudoc.meta.rgx_yaml;
+ import sisudoc.meta.rgx;
mixin spineRgxIn;
mixin contentJSONtoSpineStruct;
static auto rgx = RgxI();
@@ -2286,7 +2275,11 @@ header.
** dlang rgx example
#+BEGIN_SRC d
-import std.conv, std.regex, std.range, std.file, std.stdio;
+import std.conv;
+import std.regex;
+import std.range;
+import std.file;
+import std.stdio;
import std.string : format;
void main(string[] argv) {
immutable ratio = 1.5824; // UK pounds to US dollar as of this writing
diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index b5948eb..8580c8b 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -52,24 +52,22 @@ template spineDebugs() {
#+NAME: debug_imports
#+BEGIN_SRC d
-import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx_files;
-import
- std.algorithm,
- std.array,
- std.container,
- std.exception,
- std.json,
- std.stdio,
- std.file,
- std.path,
- std.range,
- std.regex,
- std.string,
- std.typecons,
- std.utf,
- std.conv : to;
+import sisudoc.meta.defaults;
+import sisudoc.meta.rgx_files;
+import std.algorithm;
+import std.array;
+import std.container;
+import std.exception;
+import std.json;
+import std.stdio;
+import std.file;
+import std.path;
+import std.range;
+import std.regex;
+import std.string;
+import std.typecons;
+import std.utf;
+import std.conv : to;
#+END_SRC
** initialize :report:
diff --git a/org/ocda.org b/org/ocda.org
index 2509725..4c27706 100644
--- a/org/ocda.org
+++ b/org/ocda.org
@@ -53,19 +53,17 @@ template docAbstraction() {
#+HEADER: :noweb yes
#+BEGIN_SRC d
// ↓ abstraction imports
-import
- std.algorithm,
- std.container,
- std.digest.sha,
- std.file,
- std.json,
- std.path;
-import
- sisudoc.meta,
- sisudoc.meta.defaults,
- sisudoc.meta.rgx,
- sisudoc.meta.metadoc_object_setter,
- sisudoc.meta.rgx;
+import std.algorithm;
+import std.container;
+import std.digest.sha;
+import std.file;
+import std.json;
+import std.path;
+import sisudoc.meta;
+import sisudoc.meta.defaults;
+import sisudoc.meta.rgx;
+import sisudoc.meta.metadoc_object_setter;
+import sisudoc.meta.rgx;
public import sisudoc.meta.metadoc_from_src_functions;
mixin docAbstractionFunctions;
#+END_SRC
diff --git a/org/out_curate_metadata.org b/org/out_curate_metadata.org
index f01229a..559f5e0 100644
--- a/org/out_curate_metadata.org
+++ b/org/out_curate_metadata.org
@@ -50,19 +50,17 @@ template spineMetaDocCurate() {
#+NAME: metadoc_curate_imports
#+BEGIN_SRC d
-import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx;
-import
- std.array,
- std.exception,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.uni,
- std.utf,
- std.conv : to;
+import sisudoc.meta.defaults;
+import sisudoc.meta.rgx;
+import std.array;
+import std.exception;
+import std.regex;
+import std.stdio;
+import std.string;
+import std.typecons;
+import std.uni;
+import std.utf;
+import std.conv : to;
#+END_SRC
*** initialize :report:
@@ -127,17 +125,15 @@ return hvst.curate;
<<doc_header_including_copyright_and_license>>
module sisudoc.meta.metadoc_curate_topics;
@safe:
- import
- std.algorithm,
- std.array,
- std.exception,
- std.regex,
- std.stdio,
- std.string,
- std.conv : to;
- import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx;
+ import std.algorithm;
+ import std.array;
+ import std.exception;
+ import std.regex;
+ import std.stdio;
+ import std.string;
+ import std.conv : to;
+ import sisudoc.meta.defaults;
+ import sisudoc.meta.rgx;
mixin spineCurateMetadata;
mixin InternalMarkup;
template spineMetaDocCuratesTopics() {
@@ -472,17 +468,15 @@ try {
<<doc_header_including_copyright_and_license>>
module sisudoc.meta.metadoc_curate_authors;
@safe:
- import
- std.algorithm,
- std.array,
- std.exception,
- std.regex,
- std.stdio,
- std.string,
- std.conv : to;
- import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx;
+ import std.algorithm;
+ import std.array;
+ import std.exception;
+ import std.regex;
+ import std.stdio;
+ import std.string;
+ import std.conv : to;
+ import sisudoc.meta.defaults;
+ import sisudoc.meta.rgx;
mixin spineCurateMetadata;
mixin InternalMarkup;
template spineMetaDocCuratesAuthors() {
diff --git a/org/out_latex.org b/org/out_latex.org
index 9767286..9312827 100644
--- a/org/out_latex.org
+++ b/org/out_latex.org
@@ -41,9 +41,8 @@ module sisudoc.io_out.latex;
#+HEADER: :noweb yes
#+BEGIN_SRC d
template paperLaTeX() {
- import
- std.format,
- std.conv : to;
+ import std.format;
+ import std.conv : to;
auto paperLaTeX() {
<<Struct_shared_geometry_paper_dimensions>>
return PaperType();
@@ -289,9 +288,8 @@ void outputLaTeX(D,M)(
#+NAME: Initialize_output_style
#+BEGIN_SRC d
-import
- std.format,
- std.conv : to;
+import std.format;
+import std.conv : to;
#+END_SRC
**** write latex styles output :latex:out:
@@ -663,15 +661,13 @@ fonts to try:
#+NAME: ImportsAndMixins_imports
#+BEGIN_SRC d
-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;
diff --git a/org/out_metadata.org b/org/out_metadata.org
index 92f3eda..7a080fa 100644
--- a/org/out_metadata.org
+++ b/org/out_metadata.org
@@ -47,11 +47,10 @@ template outputMetadata() {
#+NAME: output_imports
#+BEGIN_SRC d
-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/org/out_odt.org b/org/out_odt.org
index 75ea565..3acc5ed 100644
--- a/org/out_odt.org
+++ b/org/out_odt.org
@@ -1041,20 +1041,17 @@ void outputODT(D,I)(
#+NAME: output_imports
#+BEGIN_SRC d
-import
- sisudoc.io_out,
- sisudoc.io_out.rgx,
- sisudoc.io_out.rgx_xhtml;
-import
- std.file,
- std.outbuffer,
- std.uri,
- std.zip,
- std.conv : to;
-import
- sisudoc.io_out.create_zip_file,
- sisudoc.io_out.xmls,
- sisudoc.io_out.xmls_css;
+import sisudoc.io_out;
+import sisudoc.io_out.rgx;
+import sisudoc.io_out.rgx_xhtml;
+import std.file;
+import std.outbuffer;
+import std.uri;
+import std.zip;
+import std.conv : to;
+import sisudoc.io_out.create_zip_file;
+import sisudoc.io_out.xmls;
+import sisudoc.io_out.xmls_css;
#+END_SRC
*** make directory tree
diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index 2d10d87..a6802f6 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -560,14 +560,12 @@ db.close;
#+NAME: sqlite_imports
#+BEGIN_SRC d
-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/org/out_src_pod.org b/org/out_src_pod.org
index a8a35ad..4da9133 100644
--- a/org/out_src_pod.org
+++ b/org/out_src_pod.org
@@ -69,18 +69,15 @@ template spinePod() {
#+NAME: output_imports
#+BEGIN_SRC d
-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;
#+END_SRC
*** init
diff --git a/org/out_xmls.org b/org/out_xmls.org
index 8d0b475..65afb8c 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -91,38 +91,34 @@ template outputXHTMLs() {
#+NAME: output_imports_xml
#+BEGIN_SRC d
-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;
#+END_SRC
**** epub3
#+NAME: output_imports_epub
#+BEGIN_SRC d
-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;
#+END_SRC
*** misc
diff --git a/org/out_zip.org b/org/out_zip.org
index 5bd503b..5ffd1ae 100644
--- a/org/out_zip.org
+++ b/org/out_zip.org
@@ -28,11 +28,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/org/output_show.org b/org/output_show.org
index 6f54451..ffea8b3 100644
--- a/org/output_show.org
+++ b/org/output_show.org
@@ -532,27 +532,25 @@ writefln(
#+NAME: metadoc_show_imports_shared
#+BEGIN_SRC d
-import
- std.array,
- std.digest.crc,
- std.digest.sha,
- std.exception,
- std.regex,
- std.stdio,
- std.string,
- std.typecons,
- std.uni,
- std.utf,
- std.conv : to;
+import std.array;
+import std.digest.crc;
+import std.digest.sha;
+import std.exception;
+import std.regex;
+import std.stdio;
+import std.string;
+import std.typecons;
+import std.uni;
+import std.utf;
+import std.conv : to;
#+END_SRC
*** imports
#+NAME: metadoc_show_summary_imports
#+BEGIN_SRC d
-import
- sisudoc.meta.defaults,
- sisudoc.meta.rgx;
+import sisudoc.meta.defaults;
+import sisudoc.meta.rgx;
#+END_SRC
*** initialize :report:
diff --git a/org/spine.org b/org/spine.org
index 05245f7..2b4b14e 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -125,52 +125,48 @@ string program_name = "spine";
#+NAME: imports_spine
#+BEGIN_SRC d
-import
- std.algorithm,
- std.datetime,
- std.getopt,
- std.file,
- std.path,
- std.process;
-import
- sisudoc.conf.compile_time_info,
- sisudoc.meta,
- sisudoc.meta.metadoc,
- sisudoc.meta.metadoc_curate,
- sisudoc.meta.metadoc_curate_authors,
- sisudoc.meta.metadoc_curate_topics,
- sisudoc.meta.metadoc_from_src,
- sisudoc.meta.conf_make_meta_structs,
- sisudoc.meta.conf_make_meta_json,
- sisudoc.meta.defaults,
- sisudoc.meta.doc_debugs,
- sisudoc.meta.rgx,
- sisudoc.meta.rgx_yaml,
- sisudoc.meta.rgx_files,
- sisudoc.io_in.paths_source,
- sisudoc.io_in.read_config_files,
- sisudoc.io_in.read_source_files,
- sisudoc.io_out.hub;
+import std.algorithm;
+import std.datetime;
+import std.getopt;
+import std.file;
+import std.path;
+import std.process;
+import sisudoc.conf.compile_time_info;
+import sisudoc.meta;
+import sisudoc.meta.metadoc;
+import sisudoc.meta.metadoc_curate;
+import sisudoc.meta.metadoc_curate_authors;
+import sisudoc.meta.metadoc_curate_topics;
+import sisudoc.meta.metadoc_from_src;
+import sisudoc.meta.conf_make_meta_structs;
+import sisudoc.meta.conf_make_meta_json;
+import sisudoc.meta.defaults;
+import sisudoc.meta.doc_debugs;
+import sisudoc.meta.rgx;
+import sisudoc.meta.rgx_yaml;
+import sisudoc.meta.rgx_files;
+import sisudoc.io_in.paths_source;
+import sisudoc.io_in.read_config_files;
+import sisudoc.io_in.read_source_files;
+import sisudoc.io_out.hub;
#+END_SRC
***** spine metadoc :spine:
#+NAME: imports_spine_metadoc
#+BEGIN_SRC d
-import
- std.datetime,
- std.digest.crc,
- std.digest.sha;
-import
- sisudoc.meta,
- sisudoc.meta.metadoc_from_src,
- sisudoc.meta.conf_make_meta_structs,
- sisudoc.meta.conf_make_meta_json,
- sisudoc.meta.defaults,
- sisudoc.io_in.paths_source,
- sisudoc.io_in.read_config_files,
- sisudoc.io_in.read_source_files,
- sisudoc.io_out.hub;
+import std.datetime;
+import std.digest.crc;
+import std.digest.sha;
+import sisudoc.meta;
+import sisudoc.meta.metadoc_from_src;
+import sisudoc.meta.conf_make_meta_structs;
+import sisudoc.meta.conf_make_meta_json;
+import sisudoc.meta.defaults;
+import sisudoc.io_in.paths_source;
+import sisudoc.io_in.read_config_files;
+import sisudoc.io_in.read_source_files;
+import sisudoc.io_out.hub;
#+END_SRC
****** notes