From d7ed4f0aa862615fbba630ac278ae21b1b96e812 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 27 Jun 2016 01:30:24 -0400 Subject: registers, minor cleaning --- org/sdp.org | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'org/sdp.org') diff --git a/org/sdp.org b/org/sdp.org index 89cd588..014cb0c 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -173,8 +173,9 @@ mixin(import("version.txt")); #+NAME: sdp_args #+BEGIN_SRC d -mixin SiSUheaderRegister; +mixin SiSUregisters; mixin SiSUheaderExtractHub; +mixin SiSUheaderExtractSDLang; mixin SiSUbiblio; mixin SiSUrgxInitFlags; mixin SiSUconfigSDLangHub; @@ -312,6 +313,8 @@ foreach(arg; args) { auto conf = ConfigHub(); auto sdl_root_configuration = conf.configSDLang("conf.sdl"); auto sdl_root_document_make = conf.configSDLang("sisu_document_make"); +auto confsdl = HeaderExtractSDL(); +auto conf_doc_make_json = confsdl.documentMakeSDLangToJSONmake(sdl_root_document_make); #+END_SRC ** each file (loop) [+2] :loop:files: @@ -362,7 +365,7 @@ debug(header_and_content) { **** [#A] read doc header: metadata & make :doc:header:metadata:make: #+NAME: sdp_each_file_do #+BEGIN_SRC d -auto header_make_and_meta_tuple = head.headerContentJSON(header); +auto header_make_and_meta_tuple = head.headerContentJSON(header, conf_doc_make_json); static assert(!isTypeTuple!(header_make_and_meta_tuple)); JSONValue[string] dochead_make_json = header_make_and_meta_tuple[0]; JSONValue[string] dochead_meta_json = header_make_and_meta_tuple[1]; -- cgit v1.2.3