0.9.6 node info, and output continueddoc-reform_v0.0.9

1 files changed, 23 insertions, 23 deletions

diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index 8ec51fd..9806285 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -72,39 +72,37 @@ template ObjectSetter() {
     }
     auto contents_heading(
       in string         object,
-      in string[string] _node_str,
-      in int[string]    _node_int,
+      in string[string] _node_heading_str,
+      in int[string]    _node_heading_int,
       in string[]       tags,
     ) {
       ObjComposite object_set;
       object_set.use                                 = "content";
       object_set.of                                  = "para";
       object_set.is_a                                = "heading";
-      object_set.object                              = object;
-      object_set.obj_cite_number                     = _node_str["ocn"];
+      object_set.object                              = object.strip;
+      object_set.obj_cite_number                     = _node_heading_str["ocn"];
       object_set.anchor_tags                         ~= tags;
-      object_set.heading_attrib.lev                  = _node_str["marked_up_lev"];
-      object_set.heading_attrib.lev_int_markup       = _node_int["heading_lev_markup"];
-      object_set.heading_attrib.lev_int_collapsed    = _node_int["heading_lev_collapsed"];
+      object_set.heading_attrib.lev                  = _node_heading_str["marked_up_lev"];
+      object_set.heading_attrib.lev_int_markup       = _node_heading_int["heading_lev_markup"];
+      object_set.heading_attrib.lev_int_collapsed    = _node_heading_int["heading_lev_collapsed"];
       return object_set;
     }
     auto contents_para(
-      in string is_a,
-      in string object,
-      in string attrib,
-      in int obj_cite_number,
-      in int[string] indent,
-      in bool bullet,
+      in string         object,
+      in string[string] _node_para_str,
+      in int[string]    _node_para_int,
     ) {
       ObjComposite object_set;
       object_set.use                      = "content";
       object_set.of                       = "para";
       object_set.is_a                     = "para";
       object_set.object                   = object.strip;
-      object_set.obj_cite_number          = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
-      object_set.para_attrib.indent_start = to!int(indent["hang_position"]);
-      object_set.para_attrib.indent_rest  = to!int(indent["base_position"]);
-      object_set.para_attrib.bullet       = false; // bullet;
+      object_set.obj_cite_number          = (_node_para_int["ocn"]==0) ? "" : to!string(_node_para_int["ocn"]);
+      object_set.anchor_tags              = [];
+      object_set.para_attrib.indent_start = _node_para_int["indent_hang"];
+      object_set.para_attrib.indent_rest  = _node_para_int["indent_base"];
+      object_set.para_attrib.bullet       = (_node_para_int["bullet"] == 1) ? true : false;
       return object_set;
     }
     auto contents_toc(
@@ -146,7 +144,7 @@ template ObjectSetter() {
       return object_set;
     }
     auto contents_block(
-      in string type,
+      in string type_is,
       in string object,
       in string attrib,
       in int obj_cite_number,
@@ -154,13 +152,14 @@ template ObjectSetter() {
       ObjComposite object_set;
       object_set.use                 = "content";
       object_set.of                  = "block";
-      object_set.is_a                = type;
+      object_set.is_a                = type_is;
       object_set.object              = object;
       object_set.obj_cite_number     = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
+      object_set.anchor_tags         = [];
       return object_set;
     }
     auto contents_block_code(
-      in string type,
+      in string type_is,
       in string object,
       in string attrib_language_syntax,
       in int obj_cite_number,
@@ -168,14 +167,15 @@ template ObjectSetter() {
       ObjComposite object_set;
       object_set.use                 = "content";
       object_set.of                  = "block";
-      object_set.is_a                = type;
+      object_set.is_a                = type_is;
       object_set.block_attrib.syntax = attrib_language_syntax;
       object_set.object              = object;
       object_set.obj_cite_number     = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
+      object_set.anchor_tags         = [];
       return object_set;
     }
     auto contents_block_obj_cite_number_string(
-      in string         type,
+      in string         type_is,
       in string         object,
       in string         obj_cite_number,
       in string[string] _node_str,
@@ -184,7 +184,7 @@ template ObjectSetter() {
       ObjComposite object_set;
       object_set.use                               = "content";
       object_set.of                                = "block";
-      object_set.is_a                              = type;
+      object_set.is_a                              = type_is;
       object_set.object                            = object;
       object_set.obj_cite_number                   = obj_cite_number;
       return object_set;