From d0ec46764b6aa5fecf55760dc177c53411fcc735 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 1 Dec 2018 19:26:04 -0500 Subject: 0.3.3 org mode behavior --- org/meta_conf_make_meta.org | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'org/meta_conf_make_meta.org') diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index a45d7d0..f7b6fd1 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -4,11 +4,11 @@ #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+LANGUAGE: en -#+STARTUP: indent content +#+STARTUP: indent content hideblocks hidestars #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t #+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc #+OPTIONS: author:nil email:nil creator:nil timestamp:nil -#+PROPERTY: header-args :padline no :exports code :noweb yes +#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport #+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) @@ -43,7 +43,7 @@ import doc_reform.meta.conf_make_meta_structs; ** struct ConfComposite -#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_structs.d +#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_structs.d" module doc_reform.meta.conf_make_meta_structs; <> #+END_SRC @@ -422,7 +422,7 @@ auto config_jsonstr = `{ * 1. JSON to DocReformStruct :module:conf_make_meta:json: ** 0. module template -#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_json.d +#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_json.d" /++ json headers
extract json header return json @@ -990,7 +990,8 @@ if (_struct_composite.meta.creator_author.empty) { } } string[] authors_arr; - auto authors_raw_arr = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter); + auto authors_raw_arr + = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter); foreach (author_raw; authors_raw_arr) { authors_arr ~= author_raw.replace(_rgx.raw_author_munge, "$2 $1"); } @@ -1057,7 +1058,7 @@ if (_struct_composite.meta.title_main.empty) { * 2. TOML returns DocReformStruct (via JSON) :module:conf_make_meta:struct: ** 0. parse TOML config return JSON -#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d +#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_toml.d" /++ extract native/orig header return associative array
@@ -1086,7 +1087,7 @@ static template configParseTOMLreturnJSON() { ** 1. parse TOML config to JSON return DocReformStruct -#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d +#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_toml.d" static template configParseTOMLreturnDocReformStruct() { import toml, @@ -1101,7 +1102,8 @@ static template configParseTOMLreturnDocReformStruct() { ){ TOMLDocument _doc = parseTOML(cast(string)(_document_struct.content)); auto _doc_json = toJSON(_doc); - _make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json + _make_and_meta_struct + = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json return _make_and_meta_struct; } } @@ -1109,7 +1111,7 @@ static template configParseTOMLreturnDocReformStruct() { ** 2. parse TOML header to JSON then Struct -#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d +#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_toml.d" static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { import std.exception, @@ -1141,7 +1143,8 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { _doc = parseTOML(cast(string)(header_src)); } auto _doc_json = toJSON(_doc); - auto _header_and_make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header"); + auto _header_and_make_and_meta_struct + = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header"); return _header_and_make_and_meta_struct; } } -- cgit v1.2.3