aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-01-27 20:58:33 -0500
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commitbc6971c1d19d4dcb80f872de6aa1f39a1584b738 (patch)
treeda2364eb1a4166fd5bab76c06a33d52d61956139 /org
parentheader body insert_file_list, template (diff)
read src file and split into head and body, template
Diffstat (limited to 'org')
-rw-r--r--org/ao_read_source_files.org13
-rw-r--r--org/sdp.org4
2 files changed, 14 insertions, 3 deletions
diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org
index 350ee19..c362f9a 100644
--- a/org/ao_read_source_files.org
+++ b/org/ao_read_source_files.org
@@ -75,12 +75,25 @@ template SiSUconfigSDLangHub() {
+/
template SiSUmarkupRaw() {
private import
+ ao_rgx;
+ private import
+ std.array,
std.exception,
+ std.path,
std.regex,
std.stdio,
+ std.traits,
+ std.typecons,
std.utf,
std.conv : to;
+ mixin SiSUrgxInit;
auto rgx = Rgx();
+ auto rawsrc = MarkupRaw();
+ auto SiSUmarkupRaw(Fn)(Fn fn_src) {
+ auto _0_header_1_body_content_2_insert_filelist_tuple =
+ rawsrc.sourceContentSplitIntoHeaderAndBody(rawsrc.sourceContent(fn_src), fn_src);
+ return _0_header_1_body_content_2_insert_filelist_tuple;
+ }
struct MarkupRaw {
final sourceContent(in string fn_src) {
auto raw = MarkupRawUnit();
diff --git a/org/sdp.org b/org/sdp.org
index 48a4e12..86f0c98 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -190,7 +190,6 @@ mixin SiSUnode;
mixin SiSUbiblio;
mixin SiSUrgxInitFlags;
mixin SiSUconfigSDLangHub;
-mixin SiSUmarkupRaw;
mixin outputHub;
#+END_SRC
@@ -198,7 +197,6 @@ mixin outputHub;
#+NAME: sdp_args
#+BEGIN_SRC d
-auto raw = MarkupRaw();
/+
struct DocumentParts {
string[string][] contents;
@@ -381,7 +379,7 @@ enforce(
/+ ↓ read file (filename with path) +/
/+ ↓ file tuple of header and content +/
auto _0_header_1_body_content_2_insert_filelist_tuple =
- raw.sourceContentSplitIntoHeaderAndBody(raw.sourceContent(fn_src), fn_src);
+ SiSUmarkupRaw!()(fn_src);
static assert(!isTypeTuple!(_0_header_1_body_content_2_insert_filelist_tuple));
static assert(_0_header_1_body_content_2_insert_filelist_tuple.length==3);
debug(header_and_body) {