rename files ao_conf_make_meta.d from ao_header_extract.d (org/ output)

2 files changed, 22 insertions, 22 deletions

diff --git a/org/ao_header_extract.org b/org/ao_header_extract.org
index ead930c..f660147 100644
--- a/org/ao_header_extract.org
+++ b/org/ao_header_extract.org
@@ -15,7 +15,7 @@
 [[./sdp.org][sdp]]  [[./][org/]]
 * 0. sdlang to AA
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 private auto sdlangToAAmake(string[string][string] conf, Tag conf_sdlang) {
   foreach (maintag, subtags; conf) {
@@ -36,7 +36,7 @@ private auto sdlangToAAmake(string[string][string] conf, Tag conf_sdlang) {
 
 * A. conf settings sdlang
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 private auto configSettingsSDLangToAAmake(Tag conf_sdlang) {
   auto conf = sdlangToAAmake(conf_aa, conf_sdlang);
@@ -46,7 +46,7 @@ private auto configSettingsSDLangToAAmake(Tag conf_sdlang) {
 
 * B. conf make sdlang
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 private auto documentMakeSDLangToAAmake(Tag document_make_sdlang) {
   auto dochead_make = sdlangToAAmake(make_aa, document_make_sdlang);
@@ -402,7 +402,7 @@ private auto headerNativeToAA(in char[] src_header) {
 * C.b. header sdlang                                             :header:sdl:
 ** sdlang header parse and extract root Tag                 :sdlang:root:tag:
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 final private auto headerMakeSDLang(in string src_header) {
   scope(failure) {
@@ -434,7 +434,7 @@ final private auto headerMakeSDLang(in string src_header) {
 
 ** sdlang header get                                         :sdlang:get:src:
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 private auto headerSDLangGet(in char[] src_header) {
   char[][] source_header_arr =
@@ -464,7 +464,7 @@ private auto headerSDLangGet(in char[] src_header) {
 
 ** sdlang header to associative array make sdlTag in              :sdlang:aa:
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] dochead_make) {
   dochead_make = sdlangToAAmake(dochead_make, header_sdlang);
@@ -570,7 +570,7 @@ private auto headerSDLangToAAmake(Tag header_sdlang, string[string][string] doch
 
 ** hub: get sdlang header and convert to associative array    :hub:sdlang:aa:
 
-#+name: ao_header_extract_sdl
+#+name: ao_conf_make_meta_sdl
 #+BEGIN_SRC d
 private auto headerSDLangToAA(char[] header_sdlang_src, string[string][string] conf_doc_make_aa) {
   auto header_sdlang_tag = headerSDLangGet(header_sdlang_src); // sdlang.ast.Tag
@@ -589,7 +589,7 @@ with a regex check if whether it contains the "native header" required tag/field
 converting the metadata and make instructions to a common json format used by
 program internally. Moved to associative array.
 
-#+BEGIN_SRC d :tangle ../src/sdp/ao_header_extract.d
+#+BEGIN_SRC d :tangle ../src/sdp/ao_conf_make_meta.d
 /+
   extract native/orig header return associative array
 +/
@@ -619,7 +619,7 @@ template SiSUheaderExtractHub() {
 
 ** 2a. Header Native                      :ao_markup_header_extract_native:
 
-#+BEGIN_SRC d :tangle ../src/sdp/ao_header_extract_native.d
+#+BEGIN_SRC d :tangle ../src/sdp/ao_conf_make_meta_native.d
 /+
   extract native/orig header return associative array
 +/
@@ -645,7 +645,7 @@ template SiSUheaderExtractNative() {
 
 ** 2b. Header SDLang                      :ao_markup_header_extract_sdlang:
 
-#+BEGIN_SRC d :tangle ../src/sdp/ao_header_extract_sdlang.d
+#+BEGIN_SRC d :tangle ../src/sdp/ao_conf_make_meta_sdlang.d
 /+
   extract sdl header return sdl
 +/
@@ -658,8 +658,8 @@ template SiSUheaderExtractSDLang() {
     mixin SiSUregisters;
     mixin RgxInit;
     auto rgx = Rgx();
-    <<ao_header_extract_sdl>>
-    <<ao_header_extract_sdl_to_aa>>
+    <<ao_conf_make_meta_sdl>>
+    <<ao_conf_make_meta_sdl_to_aa>>
   }
 }
 #+END_SRC
diff --git a/org/sdp.org b/org/sdp.org
index ba5e04c..613e374 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -48,10 +48,10 @@ import
   compile_time_info,          // sdp/compile_time_info.d
   ao_abstract_doc_source,     // sdp/ao_abstract_doc_source.d
   ao_ansi_colors,             // sdp/ao_ansi_colors.d
+  ao_conf_make_meta,          // sdp/ao_conf_make_meta.d
+  ao_conf_make_meta_native,   // sdp/ao_conf_make_meta_native.d
+  ao_conf_make_meta_sdlang,   // sdp/ao_conf_make_meta_sdlang.d
   ao_defaults,                // sdp/ao_defaults.d
-  ao_header_extract,          // sdp/ao_header_extract.d
-  ao_header_extract_native,   // sdp/ao_header_extract_native.d
-  ao_header_extract_sdlang,   // sdp/ao_header_extract_sdlang.d
   ao_output_debugs,           // sdp/ao_output_debugs.d
   ao_read_config_files,       // sdp/ao_read_config_files.d
   ao_read_source_files,       // sdp/ao_read_source_files.d
@@ -72,9 +72,9 @@ import
 [[./compile_time_info.org][compile time info]]
 [[./ao_abstract_doc_source.org][ao_abstract_doc_source]]
 [[./ao_ansi_colors.org][ao_ansi_colors]]
-[[./ao_header_extract.org][ao_header_extract]]
-[[./ao_header_extract_native.org][ao_header_extract_native]]
-[[./ao_header_extract_sdlang.org][ao_header_extract_sdlang]]
+[[./ao_conf_make_meta.org][ao_onf_make_meta]]
+[[./ao_conf_make_meta_native.org][ao_onf_make_meta_native]]
+[[./ao_conf_make_meta_sdlang.org][ao_onf_make_meta_sdlang]]
 [[./ao_defaults.org][ao_defaults]]
 [[./ao_output_debugs.org][ao_output_debugs]]
 [[./ao_output_hub.org][ao_output_hub]]
@@ -141,8 +141,8 @@ struct SDPoutput {
     auto ref const S         contents,
     string[][string][string] bookindex_unordered_hashes,
     JSONValue[]              biblio,
-    // JSONValue[string]        dochead_make_json,
-    // JSONValue[string]        dochead_meta_json,
+    string[string][string]   dochead_make_json,
+    string[string][string]   dochead_meta_json,
     string                   fn_src,
     bool[string]             opt_action_bool
   ) {
@@ -432,8 +432,8 @@ output.hub(
   doc_ao_contents,
   doc_ao_bookindex_unordered_hashes,
   doc_ao_biblio,
-  // doc_ao_make_aa,
-  // doc_ao_meta_aa,
+  dochead_make_aa,
+  dochead_meta_aa,
   fn_src,
   opt_action_bool
 );