0.9.4 node info, changes to variables & types

1 files changed, 13 insertions, 20 deletions

diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index c293eb0..8ec51fd 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -71,25 +71,21 @@ template ObjectSetter() {
       return object_set;
     }
     auto contents_heading(
-      in string object,
-      in string attrib,
-      in int obj_cite_number,
-      in string[] tags,
-      in string lev,
-      in int lev_int_markup,
-      in int lev_int_collapsed,
-      in string[string][string] _node,
+      in string         object,
+      in string[string] _node_str,
+      in int[string]    _node_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                     = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
+      object_set.obj_cite_number                     = _node_str["ocn"];
       object_set.anchor_tags                         ~= tags;
-      object_set.heading_attrib.lev                  = lev;
-      object_set.heading_attrib.lev_int_markup       = lev_int_markup;
-      object_set.heading_attrib.lev_int_collapsed    = lev_int_collapsed;
+      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"];
       return object_set;
     }
     auto contents_para(
@@ -109,7 +105,6 @@ template ObjectSetter() {
       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.node_structure.node   = _node;
       return object_set;
     }
     auto contents_toc(
@@ -162,7 +157,6 @@ template ObjectSetter() {
       object_set.is_a                = type;
       object_set.object              = object;
       object_set.obj_cite_number     = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
-      // object_set.node_structure.node               = _node;
       return object_set;
     }
     auto contents_block_code(
@@ -178,14 +172,14 @@ template ObjectSetter() {
       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.node_structure.node               = _node;
       return object_set;
     }
     auto contents_block_obj_cite_number_string(
-      in string type,
-      in string object,
-      in string obj_cite_number,
-      in string[string][string] _node
+      in string         type,
+      in string         object,
+      in string         obj_cite_number,
+      in string[string] _node_str,
+      in int[string]    _node_int,
     ) {
       ObjComposite object_set;
       object_set.use                               = "content";
@@ -193,7 +187,6 @@ template ObjectSetter() {
       object_set.is_a                              = type;
       object_set.object                            = object;
       object_set.obj_cite_number                   = obj_cite_number;
-      object_set.node_structure.node               = _node;
       return object_set;
     }
   }