From 60e34a2acd828681be9043ac710174aee6aba203 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 7 Mar 2022 12:13:48 -0500
Subject: latex, pagebreaks, make headers

- for book, article and manually set pagebreaks,
  not fully utilized but flexibility introduced
---
 src/doc_reform/meta/conf_make_meta_json.d    | 11 ++++++++---
 src/doc_reform/meta/conf_make_meta_structs.d |  9 +++++++--
 src/doc_reform/meta/conf_make_meta_yaml.d    | 17 ++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'src/doc_reform/meta')

diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 076487d..af2cc3e 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -90,16 +90,21 @@ static template contentJSONtoSpineStruct() {
     confCompositeMakeBuild _mk;
     /+ make ------------------------------------------------------------------- +/
     if ("make" in _json.object) {
-      if ("bold" in _json.object["make"]
-        && (_json.object["make"]["bold"].type().to!string == "string")
+      if ("doc_type" in _json.object["make"]
+        && (_json.object["make"]["doc_type"].type().to!string == "string")
       ) {
-        _struct_composite.make_str.bold = _json.object["make"]["bold"].str;
+        _struct_composite.make_str.doc_type = _json.object["make"]["doc_type"].str;
       }
       if ("breaks" in _json.object["make"]
         && (_json.object["make"]["breaks"].type().to!string == "string")
       ) {
         _struct_composite.make_str.breaks = _json.object["make"]["breaks"].str;
       }
+      if ("bold" in _json.object["make"]
+        && (_json.object["make"]["bold"].type().to!string == "string")
+      ) {
+        _struct_composite.make_str.bold = _json.object["make"]["bold"].str;
+      }
       if ("cover_image" in _json.object["make"]
         && (_json.object["make"]["cover_image"].type().to!string == "string")
       ) {
diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 664c1b1..966e8d0 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -89,8 +89,9 @@ static auto mkup = InlineMarkup();
   return line_;
 }
 struct ConfCompositeMakeStr {
-  string     bold;
+  string     doc_type = "book"; // book, article
   string     breaks;
+  string     bold;
   string     cover_image;
   string     css;
   string     emphasis;
@@ -115,6 +116,9 @@ struct confCompositeMakeBuild {
     }
     return _out;
   }
+  string doc_type(string _mk) {
+    return _mk;
+  }
   string breaks(string _mk) {
     return _mk;
   }
@@ -172,10 +176,11 @@ struct confCompositeMakeBuild {
   }
 }
 struct ConfCompositeMakeInit {
-  string[]   bold;
+  string     doc_type;
   string     breaks;
   string     cover_image;
   string     css;
+  string[]   bold;
   string[]   emphasis;
   string[]   footer;
   string[]   headings;
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 5af22ad..cb4a661 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -652,11 +652,11 @@ template contentYAMLtoSpineStruct() {
         if (_yaml["make"].type.mapping
           && _yaml["make"].tag.match(rgx.yaml_tag_is_map)
         ) {
-          if ("bold" in _yaml["make"]
-            && _yaml["make"]["bold"].type.string
-            && _yaml["make"]["bold"].tag.match(rgx.yaml_tag_is_str)
+          if ("doc_type" in _yaml["make"]
+            && _yaml["make"]["doc_type"].type.string
+            && _yaml["make"]["doc_type"].tag.match(rgx.yaml_tag_is_str)
           ) {
-            _struct_composite.make_str.bold = _yaml["make"]["bold"].get!string;
+            _struct_composite.make_str.doc_type = _yaml["make"]["doc_type"].get!string;
           }
           if ("breaks" in _yaml["make"]
             && _yaml["make"]["breaks"].type.string
@@ -664,6 +664,12 @@ template contentYAMLtoSpineStruct() {
           ) {
             _struct_composite.make_str.breaks = _yaml["make"]["breaks"].get!string;
           }
+          if ("bold" in _yaml["make"]
+            && _yaml["make"]["bold"].type.string
+            && _yaml["make"]["bold"].tag.match(rgx.yaml_tag_is_str)
+          ) {
+            _struct_composite.make_str.bold = _yaml["make"]["bold"].get!string;
+          }
           if ("cover_image" in _yaml["make"]
             && _yaml["make"]["cover_image"].type.string
             && _yaml["make"]["cover_image"].tag.match(rgx.yaml_tag_is_str)
@@ -779,8 +785,9 @@ template contentYAMLtoSpineStruct() {
             _struct_composite.make_str.texpdf_font = _yaml["make"]["texpdf_font"].get!string;
           }
         }
-        _struct_composite.make.bold                     = _mk.bold(_struct_composite.make_str.bold);
+        _struct_composite.make.doc_type                 = _mk.doc_type(_struct_composite.make_str.doc_type);
         _struct_composite.make.breaks                   = _mk.breaks(_struct_composite.make_str.breaks);
+        _struct_composite.make.bold                     = _mk.bold(_struct_composite.make_str.bold);
         _struct_composite.make.cover_image              = _mk.cover_image(_struct_composite.make_str.cover_image);
         _struct_composite.make.css                      = _mk.css(_struct_composite.make_str.css);
         _struct_composite.make.emphasis                 = _mk.emphasis(_struct_composite.make_str.emphasis);
-- 
cgit v1.2.3