Import libxo-1.3.0:

- move from "oxtradoc" to RST/Sphinx documentation
- new "csv" encoder, which allows path and leaf lists
- address warnings from PVS-Stdio tool
- add "xolint" detected errors to the documentation

61 files changed, 480 insertions, 122 deletions

diff --git a/contrib/libxo/tests/core/Makefile.am b/contrib/libxo/tests/core/Makefile.am
index 7f19472b5970..9f7ffc441448 100644
--- a/contrib/libxo/tests/core/Makefile.am
+++ b/contrib/libxo/tests/core/Makefile.am
@@ -86,6 +86,11 @@ TEST_JIG = \
  ${DIFF} -Nu ${srcdir}/saved/$$base.$$fmt.out out/$$base.$$fmt.out ${S2O} ; \
  ${DIFF} -Nu ${srcdir}/saved/$$base.$$fmt.err out/$$base.$$fmt.err ${S2O}
 
+TEST_JIG2 = \
+echo "... $$test ... $$fmt ..."; \
+xoopts==warn,encoder=csv$$csv ; \
+${TEST_JIG}; true;
+
 TEST_FORMATS = T XP JP HP X J H HIPx
 
 test tests: ${bin_PROGRAMS}
@@ -105,6 +110,12 @@ test tests: ${bin_PROGRAMS}
                 true; \
             done) \
 	done)
+	-@ (${TEST_TRACE} test=test_01.c; base=test_01; \
+	    (   fmt=Ecsv1; csv= ; ${TEST_JIG2} ); \
+	    (   fmt=Ecsv2; csv=:path=top/data/item+no-header ; ${TEST_JIG2} ); \
+	    (   fmt=Ecsv3; csv=:path=item+leafs=sku.sold+no-quotes ; ${TEST_JIG2} ); \
+	)
+
 
 one:
 	-@(test=${TEST_CASE}; data=${TEST_DATA}; ${TEST_ONE} ; true)
@@ -112,12 +123,17 @@ one:
 accept:
 	-@(for test in ${TEST_CASES} ; do \
 	    base=`${BASENAME} $$test .c` ; \
-            (for fmt in ${TEST_FORMATS} E; do \
+            (for fmt in ${TEST_FORMATS} E ; do \
 	        echo "... $$test ... $$fmt ..."; \
 	        ${CP} out/$$base.$$fmt.out ${srcdir}/saved/$$base.$$fmt.out ; \
 	        ${CP} out/$$base.$$fmt.err ${srcdir}/saved/$$base.$$fmt.err ; \
 	    done) \
 	done)
+	-@(test=test_01.c; base=test_01; for fmt in Ecsv1 Ecsv2 Ecsv3 ; do \
+	        echo "... $$test ... $$fmt ..."; \
+	        ${CP} out/$$base.$$fmt.out ${srcdir}/saved/$$base.$$fmt.out ; \
+	        ${CP} out/$$base.$$fmt.err ${srcdir}/saved/$$base.$$fmt.err ; \
+	done)
 
 .c.test:
 	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -o $@ $<
diff --git a/contrib/libxo/tests/core/saved/test_01.E.out b/contrib/libxo/tests/core/saved/test_01.E.out
index 9eefca9e08d0..ba0636345851 100644
--- a/contrib/libxo/tests/core/saved/test_01.E.out
+++ b/contrib/libxo/tests/core/saved/test_01.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [top] [] [0x810]
 op string: [type] [ethernet] [0]
 op content: [type] [bridge] [0]
@@ -133,6 +133,55 @@ op attr: [test4] [value4] [0]
 op string: [item] [water] [0x2000]
 op close_list: [item] [] [0]
 op close_container: [data4] [] [0]
+op attr: [test] [value] [0]
+op open_container: [data] [] [0x810]
+op open_list: [item] [] [0]
+op attr: [test2] [value2] [0]
+op open_instance: [item] [] [0x810]
+op attr: [test3] [value3] [0]
+op string: [sku] [GRO-000-415] [0x98]
+op string: [name] [gum] [0x80]
+op content: [sold] [1412] [0x20]
+op content: [on-order] [10] [0]
+op content: [in-stock] [54] [0]
+op close_instance: [item] [] [0]
+op open_instance: [item] [] [0x810]
+op attr: [test3] [value3] [0]
+op string: [sku] [HRD-000-212] [0x98]
+op string: [name] [rope] [0x80]
+op content: [sold] [85] [0x20]
+op string: [extra] [special] [0]
+op content: [on-order] [2] [0]
+op content: [in-stock] [4] [0]
+op close_instance: [item] [] [0]
+op open_instance: [item] [] [0x810]
+op attr: [test3] [value3] [0]
+op string: [sku] [HRD-000-517] [0x98]
+op string: [name] [ladder] [0x80]
+op content: [sold] [0] [0x20]
+op string: [extra] [special] [0]
+op content: [on-order] [1] [0]
+op content: [in-stock] [2] [0]
+op close_instance: [item] [] [0]
+op open_instance: [item] [] [0x810]
+op attr: [test3] [value3] [0]
+op string: [sku] [HRD-000-632] [0x98]
+op string: [name] [bolt] [0x80]
+op content: [sold] [4123] [0x20]
+op content: [on-order] [42] [0]
+op content: [in-stock] [144] [0]
+op close_instance: [item] [] [0]
+op open_instance: [item] [] [0x810]
+op attr: [test3] [value3] [0]
+op string: [sku] [GRO-000-2331] [0x98]
+op string: [name] [water] [0x80]
+op content: [sold] [17] [0x20]
+op string: [extra] [special] [0]
+op content: [on-order] [2] [0]
+op content: [in-stock] [14] [0]
+op close_instance: [item] [] [0]
+op close_list: [item] [] [0]
+op close_container: [data] [] [0]
 op content: [cost] [425] [0]
 op content: [cost] [455] [0]
 op string: [mode] [mode] [0x8]
diff --git a/contrib/libxo/tests/core/saved/test_01.Ecsv1.err b/contrib/libxo/tests/core/saved/test_01.Ecsv1.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/contrib/libxo/tests/core/saved/test_01.Ecsv1.err
diff --git a/contrib/libxo/tests/core/saved/test_01.Ecsv1.out b/contrib/libxo/tests/core/saved/test_01.Ecsv1.out
new file mode 100644
index 000000000000..aa1d9db49f38
--- /dev/null
+++ b/contrib/libxo/tests/core/saved/test_01.Ecsv1.out
@@ -0,0 +1,17 @@
+sku,name,sold,in-stock,on-order
+GRO-000-415,gum,1412,54,10
+HRD-000-212,rope,85,4,2
+HRD-000-517,ladder,0,2,1
+HRD-000-632,bolt,4123,144,42
+GRO-000-2331,water,17,14,2
+GRO-000-415,gum,1412.0,54,10
+HRD-000-212,rope,85.0,4,2
+HRD-000-517,ladder,0,2,1
+HRD-000-632,bolt,4123.0,144,42
+GRO-000-2331,water,17.0,14,2
+GRO-000-533,fish,1321.0,45,1
+GRO-000-415,gum,1412,54,10
+HRD-000-212,rope,85,4,2
+HRD-000-517,ladder,0,2,1
+HRD-000-632,bolt,4123,144,42
+GRO-000-2331,water,17,14,2
diff --git a/contrib/libxo/tests/core/saved/test_01.Ecsv2.err b/contrib/libxo/tests/core/saved/test_01.Ecsv2.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/contrib/libxo/tests/core/saved/test_01.Ecsv2.err
diff --git a/contrib/libxo/tests/core/saved/test_01.Ecsv2.out b/contrib/libxo/tests/core/saved/test_01.Ecsv2.out
new file mode 100644
index 000000000000..b39499961d67
--- /dev/null
+++ b/contrib/libxo/tests/core/saved/test_01.Ecsv2.out
@@ -0,0 +1,10 @@
+GRO-000-415,gum,1412,54,10
+HRD-000-212,rope,85,4,2
+HRD-000-517,ladder,0,2,1
+HRD-000-632,bolt,4123,144,42
+GRO-000-2331,water,17,14,2
+GRO-000-415,gum,1412,54,10
+HRD-000-212,rope,85,4,2
+HRD-000-517,ladder,0,2,1
+HRD-000-632,bolt,4123,144,42
+GRO-000-2331,water,17,14,2
diff --git a/contrib/libxo/tests/core/saved/test_01.Ecsv3.err b/contrib/libxo/tests/core/saved/test_01.Ecsv3.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/contrib/libxo/tests/core/saved/test_01.Ecsv3.err
diff --git a/contrib/libxo/tests/core/saved/test_01.Ecsv3.out b/contrib/libxo/tests/core/saved/test_01.Ecsv3.out
new file mode 100644
index 000000000000..6f1da35193be
--- /dev/null
+++ b/contrib/libxo/tests/core/saved/test_01.Ecsv3.out
@@ -0,0 +1,17 @@
+sku,sold
+GRO-000-415,1412
+HRD-000-212,85
+HRD-000-517,0
+HRD-000-632,4123
+GRO-000-2331,17
+GRO-000-415,1412.0
+HRD-000-212,85.0
+HRD-000-517,0
+HRD-000-632,4123.0
+GRO-000-2331,17.0
+GRO-000-533,1321.0
+GRO-000-415,1412
+HRD-000-212,85
+HRD-000-517,0
+HRD-000-632,4123
+GRO-000-2331,17
diff --git a/contrib/libxo/tests/core/saved/test_01.H.out b/contrib/libxo/tests/core/saved/test_01.H.out
index d25779f46da2..e8ea9fe96e7d 100644
--- a/contrib/libxo/tests/core/saved/test_01.H.out
+++ b/contrib/libxo/tests/core/saved/test_01.H.out
@@ -1,2 +1,2 @@
 <div class="line"><div class="text">static </div><div class="data" data-tag="type">ethernet</div><div class="text"> </div><div class="data" data-tag="type">bridge</div><div class="text"> </div><div class="data" data-tag="type">  18u</div><div class="text"> </div><div class="data" data-tag="type"> 24</div><div class="text">anchor </div><div class="padding">            </div><div class="data" data-tag="address">0x0</div><div class="text">..</div><div class="data" data-tag="port">1</div></div><div class="line"><div class="text">anchor </div><div class="padding">            </div><div class="data" data-tag="address">0x0</div><div class="text">..</div><div class="data" data-tag="port">1</div></div><div class="line"><div class="text">anchor </div><div class="padding">            </div><div class="data" data-tag="address">0x0</div><div class="text">..</div><div class="data" data-tag="port">1</div></div><div class="line"><div class="text">df </div><div class="data" data-tag="used-percent">   12</div><div class="units">%</div></div><div class="line"><div class="text">testing argument modifier </div><div class="data" data-tag="host">my-box</div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="text">testing argument modifier with encoding to </div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="label">Label text</div><div class="text"> </div><div class="data" data-tag="label">value</div></div><div class="line"><div class="data" data-tag="max-chaos">  very  </div><div class="data" data-tag="min-chaos">42</div><div class="data" data-tag="some-chaos">42
-</div><div class="text">Connecting to </div><div class="data" data-tag="host">my-box</div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="title">Item      </div><div class="title">  Total Sold</div><div class="title">    In Stock</div><div class="title">    On Order</div><div class="title">  SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum       </div><div class="data" data-tag="sold">        1412</div><div class="data" data-tag="in-stock">          54</div><div class="data" data-tag="on-order">          10</div><div class="data" data-tag="sku" data-key="key">  GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope      </div><div class="data" data-tag="sold">          85</div><div class="data" data-tag="in-stock">           4</div><div class="data" data-tag="on-order">           2</div><div class="data" data-tag="sku" data-key="key">  HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder    </div><div class="data" data-tag="sold">           0</div><div class="data" data-tag="in-stock">           2</div><div class="data" data-tag="on-order">           1</div><div class="data" data-tag="sku" data-key="key">  HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt      </div><div class="data" data-tag="sold">        4123</div><div class="data" data-tag="in-stock">         144</div><div class="data" data-tag="on-order">          42</div><div class="data" data-tag="sku" data-key="key">  HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water     </div><div class="data" data-tag="sold">          17</div><div class="data" data-tag="in-stock">          14</div><div class="data" data-tag="on-order">           2</div><div class="data" data-tag="sku" data-key="key">  GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">gum</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1412.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">54</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">10</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-415</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">rope</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">85.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">4</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-212</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">ladder</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">2</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-517</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">bolt</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">4123.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">144</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">42</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-632</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">water</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">17.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">14</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-2331</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">fish</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1321.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">45</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-533</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">gum</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">rope</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">ladder</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">bolt</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">water</div></div><div class="line"><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div></div><div class="line"><div class="text">X</div><div class="padding">        </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">425</div></div><div class="line"><div class="text">X</div><div class="padding">                              </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">455</div></div><div class="line"><div class="text"> </div><div class="data" data-tag="links">links</div><div class="text"> </div><div class="data" data-tag="user">user</div><div class="text">  </div><div class="data" data-tag="group">group</div><div class="text">  </div></div><div class="line"><div class="data" data-tag="links">3       </div><div class="data" data-tag="post">this    </div></div><div class="line"><div class="data" data-tag="mode">/some/file</div><div class="text"> </div><div class="data" data-tag="links">       1</div><div class="text"> </div><div class="data" data-tag="user">user      </div><div class="text">  </div><div class="data" data-tag="group">group       </div><div class="text">  </div></div>
\ No newline at end of file
+</div><div class="text">Connecting to </div><div class="data" data-tag="host">my-box</div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="title">Item      </div><div class="title">  Total Sold</div><div class="title">    In Stock</div><div class="title">    On Order</div><div class="title">  SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum       </div><div class="data" data-tag="sold">        1412</div><div class="data" data-tag="in-stock">          54</div><div class="data" data-tag="on-order">          10</div><div class="data" data-tag="sku" data-key="key">  GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope      </div><div class="data" data-tag="sold">          85</div><div class="data" data-tag="in-stock">           4</div><div class="data" data-tag="on-order">           2</div><div class="data" data-tag="sku" data-key="key">  HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder    </div><div class="data" data-tag="sold">           0</div><div class="data" data-tag="in-stock">           2</div><div class="data" data-tag="on-order">           1</div><div class="data" data-tag="sku" data-key="key">  HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt      </div><div class="data" data-tag="sold">        4123</div><div class="data" data-tag="in-stock">         144</div><div class="data" data-tag="on-order">          42</div><div class="data" data-tag="sku" data-key="key">  HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water     </div><div class="data" data-tag="sold">          17</div><div class="data" data-tag="in-stock">          14</div><div class="data" data-tag="on-order">           2</div><div class="data" data-tag="sku" data-key="key">  GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">gum</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1412.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">54</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">10</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-415</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">rope</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">85.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">4</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-212</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">ladder</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">2</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-517</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">bolt</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">4123.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">144</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">42</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-632</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">water</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">17.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">14</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-2331</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">fish</div><div class="text">':</div></div><div class="line"><div class="padding">   </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1321.0</div></div><div class="line"><div class="padding">   </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">45</div></div><div class="line"><div class="padding">   </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding">   </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-533</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">gum</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">rope</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">ladder</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">bolt</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">water</div></div><div class="line"><div class="title">Item      </div><div class="title">  Total Sold</div><div class="title">    In Stock</div><div class="title">    On Order</div><div class="title">  SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum       </div><div class="data" data-tag="sold">        1412</div><div class="data" data-tag="on-order">          10</div><div class="data" data-tag="in-stock">          54</div><div class="data" data-tag="sku" data-key="key">  GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope      </div><div class="data" data-tag="sold">          85</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order">           2</div><div class="data" data-tag="in-stock">           4</div><div class="data" data-tag="sku" data-key="key">  HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder    </div><div class="data" data-tag="sold">           0</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order">           1</div><div class="data" data-tag="in-stock">           2</div><div class="data" data-tag="sku" data-key="key">  HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt      </div><div class="data" data-tag="sold">        4123</div><div class="data" data-tag="on-order">          42</div><div class="data" data-tag="in-stock">         144</div><div class="data" data-tag="sku" data-key="key">  HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water     </div><div class="data" data-tag="sold">          17</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order">           2</div><div class="data" data-tag="in-stock">          14</div><div class="data" data-tag="sku" data-key="key">  GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div></div><div class="line"><div class="text">X</div><div class="padding">        </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">425</div></div><div class="line"><div class="text">X</div><div class="padding">                              </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">455</div></div><div class="line"><div class="text"> </div><div class="data" data-tag="links">links</div><div class="text"> </div><div class="data" data-tag="user">user</div><div class="text">  </div><div class="data" data-tag="group">group</div><div class="text">  </div></div><div class="line"><div class="data" data-tag="links">3       </div><div class="data" data-tag="post">this    </div></div><div class="line"><div class="data" data-tag="mode">/some/file</div><div class="text"> </div><div class="data" data-tag="links">       1</div><div class="text"> </div><div class="data" data-tag="user">user      </div><div class="text">  </div><div class="data" data-tag="group">group       </div><div class="text">  </div></div>
\ No newline at end of file
diff --git a/contrib/libxo/tests/core/saved/test_01.HIPx.out b/contrib/libxo/tests/core/saved/test_01.HIPx.out
index 6eea24d95fa4..fa5fd8314e7a 100644
--- a/contrib/libxo/tests/core/saved/test_01.HIPx.out
+++ b/contrib/libxo/tests/core/saved/test_01.HIPx.out
@@ -330,6 +330,58 @@
   <div class="data" data-tag="item" data-xpath="/top/data4/item">water</div>
 </div>
 <div class="line">
+  <div class="title">Item      </div>
+  <div class="title">  Total Sold</div>
+  <div class="title">    In Stock</div>
+  <div class="title">    On Order</div>
+  <div class="title">  SKU</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-xpath="/top/data/item/name" data-type="string" data-help="Name of the item" data-key="key">gum       </div>
+  <div class="data" data-tag="sold" data-xpath="/top/data/item[sku = 'GRO-000-415'][name = 'gum']/sold" data-type="number" data-help="Number of items sold">        1412</div>
+  <div class="data" data-tag="on-order" data-xpath="/top/data/item[sku = 'GRO-000-415'][name = 'gum']/on-order" data-type="number" data-help="Number of items on order">          10</div>
+  <div class="data" data-tag="in-stock" data-xpath="/top/data/item[sku = 'GRO-000-415'][name = 'gum']/in-stock" data-type="number" data-help="Number of items in stock">          54</div>
+  <div class="data" data-tag="sku" data-xpath="/top/data/item/sku" data-type="string" data-help="Stock Keeping Unit" data-key="key">  GRO-000-415</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-xpath="/top/data/item/name" data-type="string" data-help="Name of the item" data-key="key">rope      </div>
+  <div class="data" data-tag="sold" data-xpath="/top/data/item[sku = 'HRD-000-212'][name = 'rope']/sold" data-type="number" data-help="Number of items sold">          85</div>
+  <div class="text">Extra: </div>
+  <div class="data" data-tag="extra" data-xpath="/top/data/item[sku = 'HRD-000-212'][name = 'rope']/extra">special</div>
+  <div class="data" data-tag="on-order" data-xpath="/top/data/item[sku = 'HRD-000-212'][name = 'rope']/on-order" data-type="number" data-help="Number of items on order">           2</div>
+  <div class="data" data-tag="in-stock" data-xpath="/top/data/item[sku = 'HRD-000-212'][name = 'rope']/in-stock" data-type="number" data-help="Number of items in stock">           4</div>
+  <div class="data" data-tag="sku" data-xpath="/top/data/item/sku" data-type="string" data-help="Stock Keeping Unit" data-key="key">  HRD-000-212</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-xpath="/top/data/item/name" data-type="string" data-help="Name of the item" data-key="key">ladder    </div>
+  <div class="data" data-tag="sold" data-xpath="/top/data/item[sku = 'HRD-000-517'][name = 'ladder']/sold" data-type="number" data-help="Number of items sold">           0</div>
+  <div class="text">Extra: </div>
+  <div class="data" data-tag="extra" data-xpath="/top/data/item[sku = 'HRD-000-517'][name = 'ladder']/extra">special</div>
+  <div class="data" data-tag="on-order" data-xpath="/top/data/item[sku = 'HRD-000-517'][name = 'ladder']/on-order" data-type="number" data-help="Number of items on order">           1</div>
+  <div class="data" data-tag="in-stock" data-xpath="/top/data/item[sku = 'HRD-000-517'][name = 'ladder']/in-stock" data-type="number" data-help="Number of items in stock">           2</div>
+  <div class="data" data-tag="sku" data-xpath="/top/data/item/sku" data-type="string" data-help="Stock Keeping Unit" data-key="key">  HRD-000-517</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-xpath="/top/data/item/name" data-type="string" data-help="Name of the item" data-key="key">bolt      </div>
+  <div class="data" data-tag="sold" data-xpath="/top/data/item[sku = 'HRD-000-632'][name = 'bolt']/sold" data-type="number" data-help="Number of items sold">        4123</div>
+  <div class="data" data-tag="on-order" data-xpath="/top/data/item[sku = 'HRD-000-632'][name = 'bolt']/on-order" data-type="number" data-help="Number of items on order">          42</div>
+  <div class="data" data-tag="in-stock" data-xpath="/top/data/item[sku = 'HRD-000-632'][name = 'bolt']/in-stock" data-type="number" data-help="Number of items in stock">         144</div>
+  <div class="data" data-tag="sku" data-xpath="/top/data/item/sku" data-type="string" data-help="Stock Keeping Unit" data-key="key">  HRD-000-632</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-xpath="/top/data/item/name" data-type="string" data-help="Name of the item" data-key="key">water     </div>
+  <div class="data" data-tag="sold" data-xpath="/top/data/item[sku = 'GRO-000-2331'][name = 'water']/sold" data-type="number" data-help="Number of items sold">          17</div>
+  <div class="text">Extra: </div>
+  <div class="data" data-tag="extra" data-xpath="/top/data/item[sku = 'GRO-000-2331'][name = 'water']/extra">special</div>
+  <div class="data" data-tag="on-order" data-xpath="/top/data/item[sku = 'GRO-000-2331'][name = 'water']/on-order" data-type="number" data-help="Number of items on order">           2</div>
+  <div class="data" data-tag="in-stock" data-xpath="/top/data/item[sku = 'GRO-000-2331'][name = 'water']/in-stock" data-type="number" data-help="Number of items in stock">          14</div>
+  <div class="data" data-tag="sku" data-xpath="/top/data/item/sku" data-type="string" data-help="Stock Keeping Unit" data-key="key">  GRO-000-2331</div>
+</div>
+<div class="line">
+</div>
+<div class="line">
+</div>
+<div class="line">
   <div class="text">X</div>
   <div class="text">X</div>
   <div class="text">X</div>
diff --git a/contrib/libxo/tests/core/saved/test_01.HP.out b/contrib/libxo/tests/core/saved/test_01.HP.out
index 864c7b002485..9eadb4a1fd23 100644
--- a/contrib/libxo/tests/core/saved/test_01.HP.out
+++ b/contrib/libxo/tests/core/saved/test_01.HP.out
@@ -330,6 +330,58 @@
   <div class="data" data-tag="item">water</div>
 </div>
 <div class="line">
+  <div class="title">Item      </div>
+  <div class="title">  Total Sold</div>
+  <div class="title">    In Stock</div>
+  <div class="title">    On Order</div>
+  <div class="title">  SKU</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-key="key">gum       </div>
+  <div class="data" data-tag="sold">        1412</div>
+  <div class="data" data-tag="on-order">          10</div>
+  <div class="data" data-tag="in-stock">          54</div>
+  <div class="data" data-tag="sku" data-key="key">  GRO-000-415</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-key="key">rope      </div>
+  <div class="data" data-tag="sold">          85</div>
+  <div class="text">Extra: </div>
+  <div class="data" data-tag="extra">special</div>
+  <div class="data" data-tag="on-order">           2</div>
+  <div class="data" data-tag="in-stock">           4</div>
+  <div class="data" data-tag="sku" data-key="key">  HRD-000-212</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-key="key">ladder    </div>
+  <div class="data" data-tag="sold">           0</div>
+  <div class="text">Extra: </div>
+  <div class="data" data-tag="extra">special</div>
+  <div class="data" data-tag="on-order">           1</div>
+  <div class="data" data-tag="in-stock">           2</div>
+  <div class="data" data-tag="sku" data-key="key">  HRD-000-517</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-key="key">bolt      </div>
+  <div class="data" data-tag="sold">        4123</div>
+  <div class="data" data-tag="on-order">          42</div>
+  <div class="data" data-tag="in-stock">         144</div>
+  <div class="data" data-tag="sku" data-key="key">  HRD-000-632</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="name" data-key="key">water     </div>
+  <div class="data" data-tag="sold">          17</div>
+  <div class="text">Extra: </div>
+  <div class="data" data-tag="extra">special</div>
+  <div class="data" data-tag="on-order">           2</div>
+  <div class="data" data-tag="in-stock">          14</div>
+  <div class="data" data-tag="sku" data-key="key">  GRO-000-2331</div>
+</div>
+<div class="line">
+</div>
+<div class="line">
+</div>
+<div class="line">
   <div class="text">X</div>
   <div class="text">X</div>
   <div class="text">X</div>
diff --git a/contrib/libxo/tests/core/saved/test_01.J.out b/contrib/libxo/tests/core/saved/test_01.J.out
index 05cc739934ee..4a3b05f967bf 100644
--- a/contrib/libxo/tests/core/saved/test_01.J.out
+++ b/contrib/libxo/tests/core/saved/test_01.J.out
@@ -1 +1 @@
-{"top": {"type":"ethernet","type":"bridge","type":"18u","type":24,"address":"0x0","port":1,"address":"0x0","port":1,"address":"0x0","port":1,"used-percent":12,"kve_start":"0xdeadbeef","kve_end":"0xcabb1e","host":"my-box","domain":"example.com","host":"my-box","domain":"example.com","label":"value","max-chaos":"very","min-chaos":42,"some-chaos":"[42]","host":"my-box","domain":"example.com", "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17,"in-stock":14,"on-order":2}]}, "data2": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412.0,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85.0,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123.0,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17.0,"in-stock":14,"on-order":2}]}, "data3": {"item": [{"sku":"GRO-000-533","name":"fish","sold":1321.0,"in-stock":45,"on-order":1}]}, "data4": {"item": ["gum","rope","ladder","bolt","water"]},"cost":425,"cost":455,"mode":"mode","mode_octal":"octal","links":"links","user":"user","group":"group","pre":"that","links":3,"post":"this","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"}}
+{"top": {"type":"ethernet","type":"bridge","type":"18u","type":24,"address":"0x0","port":1,"address":"0x0","port":1,"address":"0x0","port":1,"used-percent":12,"kve_start":"0xdeadbeef","kve_end":"0xcabb1e","host":"my-box","domain":"example.com","host":"my-box","domain":"example.com","label":"value","max-chaos":"very","min-chaos":42,"some-chaos":"[42]","host":"my-box","domain":"example.com", "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17,"in-stock":14,"on-order":2}]}, "data2": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412.0,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85.0,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123.0,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17.0,"in-stock":14,"on-order":2}]}, "data3": {"item": [{"sku":"GRO-000-533","name":"fish","sold":1321.0,"in-stock":45,"on-order":1}]}, "data4": {"item": ["gum","rope","ladder","bolt","water"]}, "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"on-order":10,"in-stock":54}, {"sku":"HRD-000-212","name":"rope","sold":85,"extra":"special","on-order":2,"in-stock":4}, {"sku":"HRD-000-517","name":"ladder","sold":0,"extra":"special","on-order":1,"in-stock":2}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"on-order":42,"in-stock":144}, {"sku":"GRO-000-2331","name":"water","sold":17,"extra":"special","on-order":2,"in-stock":14}]},"cost":425,"cost":455,"mode":"mode","mode_octal":"octal","links":"links","user":"user","group":"group","pre":"that","links":3,"post":"this","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"}}
diff --git a/contrib/libxo/tests/core/saved/test_01.JP.out b/contrib/libxo/tests/core/saved/test_01.JP.out
index ff42544b53f3..5c226354c761 100644
--- a/contrib/libxo/tests/core/saved/test_01.JP.out
+++ b/contrib/libxo/tests/core/saved/test_01.JP.out
@@ -121,6 +121,48 @@
         "water"
       ]
     },
+    "data": {
+      "item": [
+        {
+          "sku": "GRO-000-415",
+          "name": "gum",
+          "sold": 1412,
+          "on-order": 10,
+          "in-stock": 54
+        },
+        {
+          "sku": "HRD-000-212",
+          "name": "rope",
+          "sold": 85,
+          "extra": "special",
+          "on-order": 2,
+          "in-stock": 4
+        },
+        {
+          "sku": "HRD-000-517",
+          "name": "ladder",
+          "sold": 0,
+          "extra": "special",
+          "on-order": 1,
+          "in-stock": 2
+        },
+        {
+          "sku": "HRD-000-632",
+          "name": "bolt",
+          "sold": 4123,
+          "on-order": 42,
+          "in-stock": 144
+        },
+        {
+          "sku": "GRO-000-2331",
+          "name": "water",
+          "sold": 17,
+          "extra": "special",
+          "on-order": 2,
+          "in-stock": 14
+        }
+      ]
+    },
     "cost": 425,
     "cost": 455,
     "mode": "mode",
diff --git a/contrib/libxo/tests/core/saved/test_01.T.out b/contrib/libxo/tests/core/saved/test_01.T.out
index f41350980b9b..0b051da25fa8 100644
--- a/contrib/libxo/tests/core/saved/test_01.T.out
+++ b/contrib/libxo/tests/core/saved/test_01.T.out
@@ -50,6 +50,14 @@ Item: rope
 Item: ladder
 Item: bolt
 Item: water
+Item        Total Sold    In Stock    On Order  SKU
+gum               1412          10          54  GRO-000-415
+rope                85Extra: special           2           4  HRD-000-212
+ladder               0Extra: special           1           2  HRD-000-517
+bolt              4123          42         144  HRD-000-632
+water               17Extra: special           2          14  GRO-000-2331
+
+
 XXXXXXXX
 X        XCost: 425
 X                              XCost: 455
diff --git a/contrib/libxo/tests/core/saved/test_01.X.out b/contrib/libxo/tests/core/saved/test_01.X.out
index 4bcf1c9f9952..2ba5583fcac1 100644
--- a/contrib/libxo/tests/core/saved/test_01.X.out
+++ b/contrib/libxo/tests/core/saved/test_01.X.out
@@ -1 +1 @@
-<top><type>ethernet</type><type>bridge</type><type>18u</type><type>24</type><address>0x0</address><port>1</port><address>0x0</address><port>1</port><address>0x0</address><port>1</port><used-percent>12</used-percent><kve_start>0xdeadbeef</kve_start><kve_end>0xcabb1e</kve_end><host>my-box</host><domain>example.com</domain><host>my-box</host><domain>example.com</domain><label>value</label><max-chaos>very</max-chaos><min-chaos>42</min-chaos><some-chaos>[42]</some-chaos><host>my-box</host><domain>example.com</domain><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><in-stock>14</in-stock><on-order>2</on-order></item></data><data2><item><sku key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412.0</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku key="key">HRD-000-212</sku><name key="key">rope</name><sold>85.0</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123.0</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku key="key">GRO-000-2331</sku><name key="key">water</name><sold>17.0</sold><in-stock>14</in-stock><on-order>2</on-order></item></data2><data3><item><sku key="key">GRO-000-533</sku><name key="key">fish</name><sold>1321.0</sold><in-stock>45</in-stock><on-order>1</on-order></item></data3><data4><item test4="value4">gum</item><item test4="value4">rope</item><item test4="value4">ladder</item><item test4="value4">bolt</item><item test4="value4">water</item></data4><cost>425</cost><cost>455</cost><mode>mode</mode><mode_octal>octal</mode_octal><links>links</links><user>user</user><group>group</group><pre>that</pre><links>3</links><post>this</post><mode>/some/file</mode><mode_octal>640</mode_octal><links>1</links><user>user</user><group>group</group></top>
\ No newline at end of file
+<top><type>ethernet</type><type>bridge</type><type>18u</type><type>24</type><address>0x0</address><port>1</port><address>0x0</address><port>1</port><address>0x0</address><port>1</port><used-percent>12</used-percent><kve_start>0xdeadbeef</kve_start><kve_end>0xcabb1e</kve_end><host>my-box</host><domain>example.com</domain><host>my-box</host><domain>example.com</domain><label>value</label><max-chaos>very</max-chaos><min-chaos>42</min-chaos><some-chaos>[42]</some-chaos><host>my-box</host><domain>example.com</domain><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><in-stock>14</in-stock><on-order>2</on-order></item></data><data2><item><sku key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412.0</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku key="key">HRD-000-212</sku><name key="key">rope</name><sold>85.0</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123.0</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku key="key">GRO-000-2331</sku><name key="key">water</name><sold>17.0</sold><in-stock>14</in-stock><on-order>2</on-order></item></data2><data3><item><sku key="key">GRO-000-533</sku><name key="key">fish</name><sold>1321.0</sold><in-stock>45</in-stock><on-order>1</on-order></item></data3><data4><item test4="value4">gum</item><item test4="value4">rope</item><item test4="value4">ladder</item><item test4="value4">bolt</item><item test4="value4">water</item></data4><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><on-order>10</on-order><in-stock>54</in-stock></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><extra>special</extra><on-order>2</on-order><in-stock>4</in-stock></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><extra>special</extra><on-order>1</on-order><in-stock>2</in-stock></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><on-order>42</on-order><in-stock>144</in-stock></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><extra>special</extra><on-order>2</on-order><in-stock>14</in-stock></item></data><cost>425</cost><cost>455</cost><mode>mode</mode><mode_octal>octal</mode_octal><links>links</links><user>user</user><group>group</group><pre>that</pre><links>3</links><post>this</post><mode>/some/file</mode><mode_octal>640</mode_octal><links>1</links><user>user</user><group>group</group></top>
\ No newline at end of file
diff --git a/contrib/libxo/tests/core/saved/test_01.XP.out b/contrib/libxo/tests/core/saved/test_01.XP.out
index 27ff1af2e9eb..e40055a21369 100644
--- a/contrib/libxo/tests/core/saved/test_01.XP.out
+++ b/contrib/libxo/tests/core/saved/test_01.XP.out
@@ -112,6 +112,46 @@
     <item test4="value4">bolt</item>
     <item test4="value4">water</item>
   </data4>
+  <data test="value">
+    <item test2="value2">
+      <sku test3="value3" key="key">GRO-000-415</sku>
+      <name key="key">gum</name>
+      <sold>1412</sold>
+      <on-order>10</on-order>
+      <in-stock>54</in-stock>
+    </item>
+    <item>
+      <sku test3="value3" key="key">HRD-000-212</sku>
+      <name key="key">rope</name>
+      <sold>85</sold>
+      <extra>special</extra>
+      <on-order>2</on-order>
+      <in-stock>4</in-stock>
+    </item>
+    <item>
+      <sku test3="value3" key="key">HRD-000-517</sku>
+      <name key="key">ladder</name>
+      <sold>0</sold>
+      <extra>special</extra>
+      <on-order>1</on-order>
+      <in-stock>2</in-stock>
+    </item>
+    <item>
+      <sku test3="value3" key="key">HRD-000-632</sku>
+      <name key="key">bolt</name>
+      <sold>4123</sold>
+      <on-order>42</on-order>
+      <in-stock>144</in-stock>
+    </item>
+    <item>
+      <sku test3="value3" key="key">GRO-000-2331</sku>
+      <name key="key">water</name>
+      <sold>17</sold>
+      <extra>special</extra>
+      <on-order>2</on-order>
+      <in-stock>14</in-stock>
+    </item>
+  </data>
   <cost>425</cost>
   <cost>455</cost>
   <mode>mode</mode>
diff --git a/contrib/libxo/tests/core/saved/test_02.E.out b/contrib/libxo/tests/core/saved/test_02.E.out
index 499b5abc7105..e554b30bab34 100644
--- a/contrib/libxo/tests/core/saved/test_02.E.out
+++ b/contrib/libxo/tests/core/saved/test_02.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [top] [] [0x40010]
 op open_container: [data] [] [0x40010]
 op string: [name] [em0] [0x1080]
diff --git a/contrib/libxo/tests/core/saved/test_03.E.out b/contrib/libxo/tests/core/saved/test_03.E.out
index 21bf7d2760ac..7c27f2d4ed81 100644
--- a/contrib/libxo/tests/core/saved/test_03.E.out
+++ b/contrib/libxo/tests/core/saved/test_03.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [employees] [] [0x10]
 op open_list: [employee] [] [0]
 op close_list: [employee] [] [0]
diff --git a/contrib/libxo/tests/core/saved/test_04.E.out b/contrib/libxo/tests/core/saved/test_04.E.out
index cfb751d6b925..d5d53aedc485 100644
--- a/contrib/libxo/tests/core/saved/test_04.E.out
+++ b/contrib/libxo/tests/core/saved/test_04.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [employees] [] [0x10]
 op open_list: [employee] [] [0]
 op open_instance: [employee] [] [0x10]
diff --git a/contrib/libxo/tests/core/saved/test_05.E.out b/contrib/libxo/tests/core/saved/test_05.E.out
index 8e8fcfe65c58..904a616ce7ce 100644
--- a/contrib/libxo/tests/core/saved/test_05.E.out
+++ b/contrib/libxo/tests/core/saved/test_05.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [indian-languages] [] [0x200010]
 op string: [gurmukhi] [ਲਹੌਰ ਪਾਕਿਸਤਾਨੀ ਪੰਜਾਬ ਦੀ ਰਾਜਧਾਨੀ ਹੈ । ਲੋਕ ਗਿਣਤੀ ਦੇ ਨਾਲ ਕਰਾਚੀ ਤੋਂ ਬਾਅਦ ਲਹੌਰ ਦੂਜਾ ਸਭ ਤੋਂ ਵੱਡਾ ਸ਼ਹਿਰ ਹੈ । ਲਹੌਰ ਪਾਕਿਸਤਾਨ ਦਾ ਸਿਆਸੀ, ਰਹਤਲੀ ਤੇ ਪੜ੍ਹਾਈ ਦਾ ਗੜ੍ਹ ਹੈ ਅਤੇ ਇਸ ਲਈ ਇਹਨੂੰ ਪਾਕਿਸਤਾਨ ਦਾ ਦਿਲ ਵੀ ਕਿਹਾ ਜਾਂਦਾ ਹੈ । ਲਹੌਰ ਦਰਿਆ-ਏ-ਰਾਵੀ ਦੇ ਕੰਢੇ ਤੇ ਵਸਦਾ ਹੈ ਤੇ ਇਸਦੀ ਲੋਕ ਗਿਣਤੀ ਇੱਕ ਕਰੋੜ ਦੇ ਨੇੜੇ ਹੈ ।] [0]
 op string: [shahmukhi] [لہور پاکستانی پنجاب دا دارالحکومت اے۔ لوک گنتی دے نال کراچی توں بعد لہور دوجا سبھ توں وڈا شہر اے۔ لہور پاکستان دا سیاسی، رہتلی تے پڑھائی دا گڑھ اے تے اس لئی ایھنوں پاکستان دا دل وی کیھا جاندا اے۔ لہور دریاۓ راوی دے کنڈھے تے وسدا اے اسدی لوک گنتی اک کروڑ دے نیڑے اے ۔] [0]
diff --git a/contrib/libxo/tests/core/saved/test_06.E.out b/contrib/libxo/tests/core/saved/test_06.E.out
index 12ba8aa34e1e..eff90f86a66b 100644
--- a/contrib/libxo/tests/core/saved/test_06.E.out
+++ b/contrib/libxo/tests/core/saved/test_06.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [employees] [] [0x410]
 op open_list: [employee] [] [0]
 op open_instance: [employee] [] [0x410]
diff --git a/contrib/libxo/tests/core/saved/test_07.E.out b/contrib/libxo/tests/core/saved/test_07.E.out
index 8503ce8a4732..0504c6b97b02 100644
--- a/contrib/libxo/tests/core/saved/test_07.E.out
+++ b/contrib/libxo/tests/core/saved/test_07.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [employees] [] [0x200010]
 op open_list: [test] [] [0]
 op open_instance: [test] [] [0x200010]
diff --git a/contrib/libxo/tests/core/saved/test_08.E.out b/contrib/libxo/tests/core/saved/test_08.E.out
index 389a4bdfe378..11248e8f62e0 100644
--- a/contrib/libxo/tests/core/saved/test_08.E.out
+++ b/contrib/libxo/tests/core/saved/test_08.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [top] [] [0x810]
 op open_container: [data] [] [0x810]
 op open_container: [contents] [] [0x810]
diff --git a/contrib/libxo/tests/core/saved/test_09.E.out b/contrib/libxo/tests/core/saved/test_09.E.out
index abc69cf2e7b2..14e6047b4aa0 100644
--- a/contrib/libxo/tests/core/saved/test_09.E.out
+++ b/contrib/libxo/tests/core/saved/test_09.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [top] [] [0x810]
 op open_container: [data] [] [0x810]
 op open_container: [contents] [] [0x810]
diff --git a/contrib/libxo/tests/core/saved/test_10.E.out b/contrib/libxo/tests/core/saved/test_10.E.out
index dc50d92ab0f0..d869a7c4f0a2 100644
--- a/contrib/libxo/tests/core/saved/test_10.E.out
+++ b/contrib/libxo/tests/core/saved/test_10.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op version: [] [3.1.4] [0]
 op open_container: [top] [] [0x4000810]
 op attr: [test] [value] [0]
diff --git a/contrib/libxo/tests/core/saved/test_11.E.out b/contrib/libxo/tests/core/saved/test_11.E.out
index 76b8f21cc937..6535180b02b6 100644
--- a/contrib/libxo/tests/core/saved/test_11.E.out
+++ b/contrib/libxo/tests/core/saved/test_11.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op version: [] [3.1.4] [0]
 op open_container: [top] [] [0x10]
 {{<14>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-status [animal-status@42 animal="snake" state="loose"] The snake is loose}}
diff --git a/contrib/libxo/tests/core/saved/test_12.E.err b/contrib/libxo/tests/core/saved/test_12.E.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.E.err
+++ b/contrib/libxo/tests/core/saved/test_12.E.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.E.out b/contrib/libxo/tests/core/saved/test_12.E.out
index 2ce69f151960..414311499fee 100644
--- a/contrib/libxo/tests/core/saved/test_12.E.out
+++ b/contrib/libxo/tests/core/saved/test_12.E.out
@@ -1,4 +1,4 @@
-op create: [] [] [0]
+op create: [test] [] [0]
 op open_container: [top] [] [0x4040010]
 op open_container: [data] [] [0x4040010]
 op string: [animal] [fish] [0]
diff --git a/contrib/libxo/tests/core/saved/test_12.H.err b/contrib/libxo/tests/core/saved/test_12.H.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.H.err
+++ b/contrib/libxo/tests/core/saved/test_12.H.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.HIPx.err b/contrib/libxo/tests/core/saved/test_12.HIPx.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.HIPx.err
+++ b/contrib/libxo/tests/core/saved/test_12.HIPx.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.HP.err b/contrib/libxo/tests/core/saved/test_12.HP.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.HP.err
+++ b/contrib/libxo/tests/core/saved/test_12.HP.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.J.err b/contrib/libxo/tests/core/saved/test_12.J.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.J.err
+++ b/contrib/libxo/tests/core/saved/test_12.J.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.JP.err b/contrib/libxo/tests/core/saved/test_12.JP.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.JP.err
+++ b/contrib/libxo/tests/core/saved/test_12.JP.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.T.err b/contrib/libxo/tests/core/saved/test_12.T.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.T.err
+++ b/contrib/libxo/tests/core/saved/test_12.T.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.X.err b/contrib/libxo/tests/core/saved/test_12.X.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.X.err
+++ b/contrib/libxo/tests/core/saved/test_12.X.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/saved/test_12.XP.err b/contrib/libxo/tests/core/saved/test_12.XP.err
index 32a5e4d30db3..6e563c3c236c 100644
--- a/contrib/libxo/tests/core/saved/test_12.XP.err
+++ b/contrib/libxo/tests/core/saved/test_12.XP.err
@@ -1,4 +1,4 @@
-test_12.test: invalid XML tag name: '2by4'
-test_12.test: invalid XML tag name: '4x4'
-test_12.test: invalid XML tag name: '2morrow'
-test_12.test: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '2by4'
+test_12: invalid XML tag name: '4x4'
+test_12: invalid XML tag name: '2morrow'
+test_12: invalid XML tag name: '2by4'
diff --git a/contrib/libxo/tests/core/test_01.c b/contrib/libxo/tests/core/test_01.c
index 2957472464b7..35dc15df6112 100644
--- a/contrib/libxo/tests/core/test_01.c
+++ b/contrib/libxo/tests/core/test_01.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 int
 main (int argc, char **argv)
@@ -55,21 +56,21 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "xml") == 0)
+	if (xo_streq(argv[argc], "xml"))
 	    xo_set_style(NULL, XO_STYLE_XML);
-	else if (strcmp(argv[argc], "json") == 0)
+	else if (xo_streq(argv[argc], "json"))
 	    xo_set_style(NULL, XO_STYLE_JSON);
-	else if (strcmp(argv[argc], "text") == 0)
+	else if (xo_streq(argv[argc], "text"))
 	    xo_set_style(NULL, XO_STYLE_TEXT);
-	else if (strcmp(argv[argc], "html") == 0)
+	else if (xo_streq(argv[argc], "html"))
 	    xo_set_style(NULL, XO_STYLE_HTML);
-	else if (strcmp(argv[argc], "pretty") == 0)
+	else if (xo_streq(argv[argc], "pretty"))
 	    xo_set_flags(NULL, XOF_PRETTY);
-	else if (strcmp(argv[argc], "xpath") == 0)
+	else if (xo_streq(argv[argc], "xpath"))
 	    xo_set_flags(NULL, XOF_XPATH);
-	else if (strcmp(argv[argc], "info") == 0)
+	else if (xo_streq(argv[argc], "info"))
 	    xo_set_flags(NULL, XOF_INFO);
-        else if (strcmp(argv[argc], "error") == 0) {
+        else if (xo_streq(argv[argc], "error")) {
             close(-1);
             xo_err(1, "error detected");
         }
@@ -186,6 +187,44 @@ main (int argc, char **argv)
     xo_close_list("item");
     xo_close_container("data4");
 
+    xo_attr("test", "value");
+    xo_open_container("data");
+    xo_open_list("item");
+    xo_attr("test2", "value2");
+
+    xo_emit("{T:Item/%-10s}{T:Total Sold/%12s}{T:In Stock/%12s}"
+	    "{T:On Order/%12s}{T:SKU/%5s}\n");
+
+    for (ip = list; ip->i_title; ip++) {
+	xo_open_instance("item");
+	xo_attr("test3", "value3");
+
+	xo_emit("{keq:sku/%s-%u/%s-000-%u}"
+		"{k:name/%-10s/%s}{n:sold/%12u/%u}",
+		ip->i_sku_base, ip->i_sku_num,
+		ip->i_title, ip->i_sold);
+
+	if (ip->i_onorder < 5)
+	    xo_emit("Extra: {:extra}", "special");
+
+	if (ip->i_instock & 1)
+	    xo_emit("{:in-stock/%12u/%u}", ip->i_instock);
+	xo_emit("{:on-order/%12u/%u}", ip->i_onorder);
+	if (!(ip->i_instock & 1))
+	    xo_emit("{:in-stock/%12u/%u}", ip->i_instock);
+
+	xo_emit("{qkd:sku/%5s-000-%u/%s-000-%u}\n",
+		ip->i_sku_base, ip->i_sku_num);
+
+	xo_close_instance("item");
+    }
+
+    xo_close_list("item");
+    xo_close_container("data");
+
+    xo_emit("\n\n");
+
+
     xo_emit("X{P:}X", "epic fail");
     xo_emit("X{T:}X", "epic fail");
     xo_emit("X{N:}X", "epic fail");
diff --git a/contrib/libxo/tests/core/test_02.c b/contrib/libxo/tests/core/test_02.c
index b3d5ca92e201..7402f04f4b80 100644
--- a/contrib/libxo/tests/core/test_02.c
+++ b/contrib/libxo/tests/core/test_02.c
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 #include "xo_humanize.h"
 
@@ -25,19 +26,19 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "xml") == 0)
+	if (xo_streq(argv[argc], "xml"))
 	    xo_set_style(NULL, XO_STYLE_XML);
-	else if (strcmp(argv[argc], "json") == 0)
+	else if (xo_streq(argv[argc], "json"))
 	    xo_set_style(NULL, XO_STYLE_JSON);
-	else if (strcmp(argv[argc], "text") == 0)
+	else if (xo_streq(argv[argc], "text"))
 	    xo_set_style(NULL, XO_STYLE_TEXT);
-	else if (strcmp(argv[argc], "html") == 0)
+	else if (xo_streq(argv[argc], "html"))
 	    xo_set_style(NULL, XO_STYLE_HTML);
-	else if (strcmp(argv[argc], "pretty") == 0)
+	else if (xo_streq(argv[argc], "pretty"))
 	    xo_set_flags(NULL, XOF_PRETTY);
-	else if (strcmp(argv[argc], "xpath") == 0)
+	else if (xo_streq(argv[argc], "xpath"))
 	    xo_set_flags(NULL, XOF_XPATH);
-	else if (strcmp(argv[argc], "info") == 0)
+	else if (xo_streq(argv[argc], "info"))
 	    xo_set_flags(NULL, XOF_INFO);
     }
 
diff --git a/contrib/libxo/tests/core/test_03.c b/contrib/libxo/tests/core/test_03.c
index af65ddd98d8c..67d7be3dfce2 100644
--- a/contrib/libxo/tests/core/test_03.c
+++ b/contrib/libxo/tests/core/test_03.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 xo_info_t info[] = {
     { "employee", "object", "Employee data" },
@@ -44,10 +45,10 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "count") == 0) {
+	if (xo_streq(argv[argc], "count")) {
 	    if (argv[argc + 1])
 		opt_count = atoi(argv[++argc]);
-	} else if (strcmp(argv[argc], "extra") == 0) {
+	} else if (xo_streq(argv[argc], "extra")) {
 	    if (argv[argc + 1])
 		opt_extra = atoi(argv[++argc]);
 	}
diff --git a/contrib/libxo/tests/core/test_08.c b/contrib/libxo/tests/core/test_08.c
index 7e19ebeb4c10..80cbff2a4f3a 100644
--- a/contrib/libxo/tests/core/test_08.c
+++ b/contrib/libxo/tests/core/test_08.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 int
 main (int argc, char **argv)
@@ -39,21 +40,21 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "xml") == 0)
+	if (xo_streq(argv[argc], "xml"))
 	    xo_set_style(NULL, XO_STYLE_XML);
-	else if (strcmp(argv[argc], "json") == 0)
+	else if (xo_streq(argv[argc], "json"))
 	    xo_set_style(NULL, XO_STYLE_JSON);
-	else if (strcmp(argv[argc], "text") == 0)
+	else if (xo_streq(argv[argc], "text"))
 	    xo_set_style(NULL, XO_STYLE_TEXT);
-	else if (strcmp(argv[argc], "html") == 0)
+	else if (xo_streq(argv[argc], "html"))
 	    xo_set_style(NULL, XO_STYLE_HTML);
-	else if (strcmp(argv[argc], "pretty") == 0)
+	else if (xo_streq(argv[argc], "pretty"))
 	    xo_set_flags(NULL, XOF_PRETTY);
-	else if (strcmp(argv[argc], "xpath") == 0)
+	else if (xo_streq(argv[argc], "xpath"))
 	    xo_set_flags(NULL, XOF_XPATH);
-	else if (strcmp(argv[argc], "info") == 0)
+	else if (xo_streq(argv[argc], "info"))
 	    xo_set_flags(NULL, XOF_INFO);
-        else if (strcmp(argv[argc], "error") == 0) {
+        else if (xo_streq(argv[argc], "error")) {
             close(-1);
             xo_err(1, "error detected");
         }
diff --git a/contrib/libxo/tests/core/test_09.c b/contrib/libxo/tests/core/test_09.c
index a612a647d7f8..f564d6e72914 100644
--- a/contrib/libxo/tests/core/test_09.c
+++ b/contrib/libxo/tests/core/test_09.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 int
 main (int argc, char **argv)
@@ -39,21 +40,21 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "xml") == 0)
+	if (xo_streq(argv[argc], "xml"))
 	    xo_set_style(NULL, XO_STYLE_XML);
-	else if (strcmp(argv[argc], "json") == 0)
+	else if (xo_streq(argv[argc], "json"))
 	    xo_set_style(NULL, XO_STYLE_JSON);
-	else if (strcmp(argv[argc], "text") == 0)
+	else if (xo_streq(argv[argc], "text"))
 	    xo_set_style(NULL, XO_STYLE_TEXT);
-	else if (strcmp(argv[argc], "html") == 0)
+	else if (xo_streq(argv[argc], "html"))
 	    xo_set_style(NULL, XO_STYLE_HTML);
-	else if (strcmp(argv[argc], "pretty") == 0)
+	else if (xo_streq(argv[argc], "pretty"))
 	    xo_set_flags(NULL, XOF_PRETTY);
-	else if (strcmp(argv[argc], "xpath") == 0)
+	else if (xo_streq(argv[argc], "xpath"))
 	    xo_set_flags(NULL, XOF_XPATH);
-	else if (strcmp(argv[argc], "info") == 0)
+	else if (xo_streq(argv[argc], "info"))
 	    xo_set_flags(NULL, XOF_INFO);
-        else if (strcmp(argv[argc], "error") == 0) {
+        else if (xo_streq(argv[argc], "error")) {
             close(-1);
             xo_err(1, "error detected");
         }
diff --git a/contrib/libxo/tests/core/test_10.c b/contrib/libxo/tests/core/test_10.c
index 223ec55d47f9..a53ddecdf747 100644
--- a/contrib/libxo/tests/core/test_10.c
+++ b/contrib/libxo/tests/core/test_10.c
@@ -16,6 +16,7 @@
 #include <ctype.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 int
 main (int argc, char **argv)
@@ -58,21 +59,21 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "xml") == 0)
+	if (xo_streq(argv[argc], "xml"))
 	    xo_set_style(NULL, XO_STYLE_XML);
-	else if (strcmp(argv[argc], "json") == 0)
+	else if (xo_streq(argv[argc], "json"))
 	    xo_set_style(NULL, XO_STYLE_JSON);
-	else if (strcmp(argv[argc], "text") == 0)
+	else if (xo_streq(argv[argc], "text"))
 	    xo_set_style(NULL, XO_STYLE_TEXT);
-	else if (strcmp(argv[argc], "html") == 0)
+	else if (xo_streq(argv[argc], "html"))
 	    xo_set_style(NULL, XO_STYLE_HTML);
-	else if (strcmp(argv[argc], "pretty") == 0)
+	else if (xo_streq(argv[argc], "pretty"))
 	    xo_set_flags(NULL, XOF_PRETTY);
-	else if (strcmp(argv[argc], "xpath") == 0)
+	else if (xo_streq(argv[argc], "xpath"))
 	    xo_set_flags(NULL, XOF_XPATH);
-	else if (strcmp(argv[argc], "info") == 0)
+	else if (xo_streq(argv[argc], "info"))
 	    xo_set_flags(NULL, XOF_INFO);
-        else if (strcmp(argv[argc], "error") == 0) {
+        else if (xo_streq(argv[argc], "error")) {
             close(-1);
             xo_err(1, "error detected");
         }
diff --git a/contrib/libxo/tests/core/test_11.c b/contrib/libxo/tests/core/test_11.c
index 60851dfffa5a..c4a76beb873b 100644
--- a/contrib/libxo/tests/core/test_11.c
+++ b/contrib/libxo/tests/core/test_11.c
@@ -18,6 +18,7 @@
 #include <syslog.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 void
 test_syslog_open (void)
@@ -50,11 +51,11 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "full") == 0)
+	if (xo_streq(argv[argc], "full"))
 	    unit_test = 0;
-	else if (strcmp(argv[argc], "fire") == 0)
+	else if (xo_streq(argv[argc], "fire"))
 	    fire = 1;
-	else if (strcmp(argv[argc], "tz") == 0)
+	else if (xo_streq(argv[argc], "tz"))
 	    tzone = argv[++argc];
     }
 
diff --git a/contrib/libxo/tests/core/test_12.c b/contrib/libxo/tests/core/test_12.c
index 6a974b5268d5..90392196629f 100644
--- a/contrib/libxo/tests/core/test_12.c
+++ b/contrib/libxo/tests/core/test_12.c
@@ -15,6 +15,7 @@
 
 #include "xo_config.h"
 #include "xo.h"
+#include "xo_encoder.h"
 
 int
 main (int argc, char **argv)
@@ -29,25 +30,25 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "xml") == 0)
+	if (xo_streq(argv[argc], "xml"))
 	    xo_set_style(NULL, XO_STYLE_XML);
-	else if (strcmp(argv[argc], "json") == 0)
+	else if (xo_streq(argv[argc], "json"))
 	    xo_set_style(NULL, XO_STYLE_JSON);
-	else if (strcmp(argv[argc], "text") == 0)
+	else if (xo_streq(argv[argc], "text"))
 	    xo_set_style(NULL, XO_STYLE_TEXT);
-	else if (strcmp(argv[argc], "html") == 0)
+	else if (xo_streq(argv[argc], "html"))
 	    xo_set_style(NULL, XO_STYLE_HTML);
-	else if (strcmp(argv[argc], "no-color") == 0)
+	else if (xo_streq(argv[argc], "no-color"))
 	    opt_color = 0;
-	else if (strcmp(argv[argc], "pretty") == 0)
+	else if (xo_streq(argv[argc], "pretty"))
 	    xo_set_flags(NULL, XOF_PRETTY);
-	else if (strcmp(argv[argc], "xpath") == 0)
+	else if (xo_streq(argv[argc], "xpath"))
 	    xo_set_flags(NULL, XOF_XPATH);
-	else if (strcmp(argv[argc], "info") == 0)
+	else if (xo_streq(argv[argc], "info"))
 	    xo_set_flags(NULL, XOF_INFO);
-	else if (strcmp(argv[argc], "no-retain") == 0)
+	else if (xo_streq(argv[argc], "no-retain"))
 	    flags &= ~XOEF_RETAIN;
-	else if (strcmp(argv[argc], "big") == 0) {
+	else if (xo_streq(argv[argc], "big")) {
 	    if (argv[argc + 1])
 		count = atoi(argv[++argc]);
 	}
diff --git a/contrib/libxo/tests/gettext/gt_01.c b/contrib/libxo/tests/gettext/gt_01.c
index d63674745d6d..2a06a306fc8b 100644
--- a/contrib/libxo/tests/gettext/gt_01.c
+++ b/contrib/libxo/tests/gettext/gt_01.c
@@ -21,6 +21,7 @@
 #include <libintl.h>
 
 #include "xo.h"
+#include "xo_encoder.h"
 
 int
 main (int argc, char **argv)
@@ -35,11 +36,11 @@ main (int argc, char **argv)
 	return 1;
 
     for (argc = 1; argv[argc]; argc++) {
-	if (strcmp(argv[argc], "tz") == 0)
+	if (xo_streq(argv[argc], "tz"))
 	    tzone = argv[++argc];
-	else if (strcmp(argv[argc], "lang") == 0)
+	else if (xo_streq(argv[argc], "lang"))
 	    lang = argv[++argc];
-	else if (strcmp(argv[argc], "po") == 0)
+	else if (xo_streq(argv[argc], "po"))
 	    strlcpy(path, argv[++argc], sizeof(path));
     }
 
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.H.out b/contrib/libxo/tests/gettext/saved/gt_01.H.out
index 13606bf7fb1f..76122633673a 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.H.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.H.out
@@ -1 +1 @@
-<div class="line"><div class="text">Ouryay </div><div class="data" data-tag="noun">ordsway</div><div class="text"> </div><div class="data" data-tag="adjective">amingflay</div><div class="text"> isyay </div><div class="data" data-tag="owner">ymay</div><div class="data" data-tag="target">ouchcay</div><div class="text"> bubbly-bubbly </div><div class="data" data-tag="verb">urningbay</div></div><div class="line"><div class="text">Ethay </div><div class="data" data-tag="noun">ordsway</div><div class="text"> asway '</div><div class="data" data-tag="owner">ymay</div><div class="data" data-tag="adjective">amingflay</div><div class="data" data-tag="target">ouchcay</div><div class="text">' </div><div class="data" data-tag="verb">urningbay</div></div><div class="line"><div class="data" data-tag="bytes">0</div><div class="padding"> </div><div class="note">yebay</div></div><div class="line"><div class="data" data-tag="bytes">1</div><div class="padding"> </div><div class="note">yesbay</div></div><div class="line"><div class="data" data-tag="bytes">2</div><div class="padding"> </div><div class="note">yezbay</div></div><div class="line"><div class="data" data-tag="bytes">3</div><div class="padding"> </div><div class="note">yezbay</div></div><div class="line"><div class="data" data-tag="bytes">4</div><div class="padding"> </div><div class="note">yezbay</div></div><div class="line"><div class="label">otaltay</div><div class="text"> </div><div class="data" data-tag="total">1234</div></div><div class="line"><div class="text">Eceivedray </div><div class="data" data-tag="received">1234</div><div class="text"> </div><div class="note">ldb2</div><div class="text"> omfray </div><div class="data" data-tag="from">foop</div><div class="text">#</div><div class="data" data-tag="port">4321</div><div class="text"> inyay </div><div class="data" data-tag="time">32</div><div class="text"> msyay</div></div><div class="line"><div class="text">Received </div><div class="data" data-tag="received">1234</div><div class="text"> </div><div class="note">yezbay</div><div class="text"> from </div><div class="data" data-tag="from">foop</div><div class="text">#</div><div class="data" data-tag="port">4321</div><div class="text"> in </div><div class="data" data-tag="time">32</div><div class="text"> ms</div></div><div class="line"><div class="text">Eceivedray </div><div class="data" data-tag="received">1234</div><div class="text"> </div><div class="note">ldb2</div><div class="text"> omfray </div><div class="data" data-tag="from">foop</div><div class="text">#</div><div class="data" data-tag="port">4321</div><div class="text"> inyay </div><div class="data" data-tag="time">32</div><div class="text"> msyay</div></div><div class="line"><div class="text">Onlyay </div><div class="data" data-tag="marzlevanes">3</div><div class="text"> </div><div class="note">arzlevanezmay</div><div class="text"> areyay unctioningfay orrectlycay</div></div><div class="line"><div class="text">Ersionvay </div><div class="data" data-tag="date">Tue Jun 23 18:47:09 UTC 2015</div><div class="text"> </div><div class="data" data-tag="version">1.2.3</div></div><div class="line"><div class="data" data-tag="program">gt_01.test</div><div class="decoration">:</div><div class="padding"> </div><div class="text">Nableuay otay </div><div class="data" data-tag="verb">ectulatobjay</div><div class="text"> orwardfay elocipingvay</div><div class="text">: </div><div class="data" data-tag="error">Ermissionpay eniedday</div></div><div class="line"><div class="data" data-tag="program">gt_01.test</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="style">automaticyay</div><div class="text"> ynchronizationsay ofyay </div><div class="data" data-tag="type">ardinalyay</div><div class="text"> </div><div class="data" data-tag="target">ammetersgray</div><div class="text"> ailedfay</div><div class="text">: </div><div class="data" data-tag="error">Ermissionpay eniedday</div></div><div class="line"><div class="label">ydrocoptichay arzlevanesmay</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="marzlevanes">6</div></div><div class="line"><div class="text">Dude, </div><div class="label">Indingsway</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="windings">otuslay-oyay-eltayay</div></div>
\ No newline at end of file
+<div class="line"><div class="text">Ouryay </div><div class="data" data-tag="noun">ordsway</div><div class="text"> </div><div class="data" data-tag="adjective">amingflay</div><div class="text"> isyay </div><div class="data" data-tag="owner">ymay</div><div class="data" data-tag="target">ouchcay</div><div class="text"> bubbly-bubbly </div><div class="data" data-tag="verb">urningbay</div></div><div class="line"><div class="text">Ethay </div><div class="data" data-tag="noun">ordsway</div><div class="text"> asway '</div><div class="data" data-tag="owner">ymay</div><div class="data" data-tag="adjective">amingflay</div><div class="data" data-tag="target">ouchcay</div><div class="text">' </div><div class="data" data-tag="verb">urningbay</div></div><div class="line"><div class="data" data-tag="bytes">0</div><div class="padding"> </div><div class="note">yebay</div></div><div class="line"><div class="data" data-tag="bytes">1</div><div class="padding"> </div><div class="note">yesbay</div></div><div class="line"><div class="data" data-tag="bytes">2</div><div class="padding"> </div><div class="note">yezbay</div></div><div class="line"><div class="data" data-tag="bytes">3</div><div class="padding"> </div><div class="note">yezbay</div></div><div class="line"><div class="data" data-tag="bytes">4</div><div class="padding"> </div><div class="note">yezbay</div></div><div class="line"><div class="label">otaltay</div><div class="text"> </div><div class="data" data-tag="total">1234</div></div><div class="line"><div class="text">Eceivedray </div><div class="data" data-tag="received">1234</div><div class="text"> </div><div class="note">ldb2</div><div class="text"> omfray </div><div class="data" data-tag="from">foop</div><div class="text">#</div><div class="data" data-tag="port">4321</div><div class="text"> inyay </div><div class="data" data-tag="time">32</div><div class="text"> msyay</div></div><div class="line"><div class="text">Received </div><div class="data" data-tag="received">1234</div><div class="text"> </div><div class="note">yezbay</div><div class="text"> from </div><div class="data" data-tag="from">foop</div><div class="text">#</div><div class="data" data-tag="port">4321</div><div class="text"> in </div><div class="data" data-tag="time">32</div><div class="text"> ms</div></div><div class="line"><div class="text">Eceivedray </div><div class="data" data-tag="received">1234</div><div class="text"> </div><div class="note">ldb2</div><div class="text"> omfray </div><div class="data" data-tag="from">foop</div><div class="text">#</div><div class="data" data-tag="port">4321</div><div class="text"> inyay </div><div class="data" data-tag="time">32</div><div class="text"> msyay</div></div><div class="line"><div class="text">Onlyay </div><div class="data" data-tag="marzlevanes">3</div><div class="text"> </div><div class="note">arzlevanezmay</div><div class="text"> areyay unctioningfay orrectlycay</div></div><div class="line"><div class="text">Ersionvay </div><div class="data" data-tag="date">Tue Jun 23 18:47:09 UTC 2015</div><div class="text"> </div><div class="data" data-tag="version">1.2.3</div></div><div class="line"><div class="data" data-tag="program">gt_01</div><div class="decoration">:</div><div class="padding"> </div><div class="text">Nableuay otay </div><div class="data" data-tag="verb">ectulatobjay</div><div class="text"> orwardfay elocipingvay</div><div class="text">: </div><div class="data" data-tag="error">Ermissionpay eniedday</div></div><div class="line"><div class="data" data-tag="program">gt_01</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="style">automaticyay</div><div class="text"> ynchronizationsay ofyay </div><div class="data" data-tag="type">ardinalyay</div><div class="text"> </div><div class="data" data-tag="target">ammetersgray</div><div class="text"> ailedfay</div><div class="text">: </div><div class="data" data-tag="error">Ermissionpay eniedday</div></div><div class="line"><div class="label">ydrocoptichay arzlevanesmay</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="marzlevanes">6</div></div><div class="line"><div class="text">Dude, </div><div class="label">Indingsway</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="windings">otuslay-oyay-eltayay</div></div>
\ No newline at end of file
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.HIPx.out b/contrib/libxo/tests/gettext/saved/gt_01.HIPx.out
index 06b6a3c3858e..597bd1e7f8ab 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.HIPx.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.HIPx.out
@@ -102,7 +102,7 @@
   <div class="data" data-tag="version" data-xpath="/top/version">1.2.3</div>
 </div>
 <div class="line">
-  <div class="data" data-tag="program" data-xpath="/top/xo_emit_warn_hcv/__warning/program">gt_01.test</div>
+  <div class="data" data-tag="program" data-xpath="/top/xo_emit_warn_hcv/__warning/program">gt_01</div>
   <div class="decoration">:</div>
   <div class="padding"> </div>
   <div class="text">Nableuay otay </div>
@@ -112,7 +112,7 @@
   <div class="data" data-tag="error" data-xpath="/top/xo_emit_warn_hcv/__warning/error">Ermissionpay eniedday</div>
 </div>
 <div class="line">
-  <div class="data" data-tag="program" data-xpath="/top/xo_emit_warn_hcv/__warning/program">gt_01.test</div>
+  <div class="data" data-tag="program" data-xpath="/top/xo_emit_warn_hcv/__warning/program">gt_01</div>
   <div class="decoration">:</div>
   <div class="padding"> </div>
   <div class="data" data-tag="style" data-xpath="/top/xo_emit_warn_hcv/__warning/style">automaticyay</div>
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.HP.out b/contrib/libxo/tests/gettext/saved/gt_01.HP.out
index 573d7b38ad95..de711f00b59e 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.HP.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.HP.out
@@ -102,7 +102,7 @@
   <div class="data" data-tag="version">1.2.3</div>
 </div>
 <div class="line">
-  <div class="data" data-tag="program">gt_01.test</div>
+  <div class="data" data-tag="program">gt_01</div>
   <div class="decoration">:</div>
   <div class="padding"> </div>
   <div class="text">Nableuay otay </div>
@@ -112,7 +112,7 @@
   <div class="data" data-tag="error">Ermissionpay eniedday</div>
 </div>
 <div class="line">
-  <div class="data" data-tag="program">gt_01.test</div>
+  <div class="data" data-tag="program">gt_01</div>
   <div class="decoration">:</div>
   <div class="padding"> </div>
   <div class="data" data-tag="style">automaticyay</div>
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.J.out b/contrib/libxo/tests/gettext/saved/gt_01.J.out
index 2d0e7cc63ba8..5a258a8b4cb0 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.J.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.J.out
@@ -1 +1 @@
-{"top": {"adjective":"amingflay","noun":"ordsway","verb":"urningbay","owner":"ymay","target":"ouchcay","adjective":"amingflay","noun":"ordsway","verb":"urningbay","owner":"ymay","target":"ouchcay", "bytes": [0,1,2,3,4],"total":1234,"received":1234,"from":"foop","port":4321,"time":32,"received":1234,"from":"foop","port":4321,"time":32,"received":1234,"from":"foop","port":4321,"time":32,"marzlevanes":3,"version":"1.2.3","date":"Tue Jun 23 18:47:09 UTC 2015", "__warning": {"program":"gt_01.test","message":"Nableuay otay ectulatobjay orwardfay elocipingvay","verb":"ectulatobjay","error":"Ermissionpay eniedday"}, "__warning": {"program":"gt_01.test","message":"automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay","style":"automaticyay","type":"ardinalyay","target":"ammetersgray","error":"Ermissionpay eniedday"},"marzlevanes":6,"windings":"otuslay-oyay-eltayay"}}
+{"top": {"adjective":"amingflay","noun":"ordsway","verb":"urningbay","owner":"ymay","target":"ouchcay","adjective":"amingflay","noun":"ordsway","verb":"urningbay","owner":"ymay","target":"ouchcay", "bytes": [0,1,2,3,4],"total":1234,"received":1234,"from":"foop","port":4321,"time":32,"received":1234,"from":"foop","port":4321,"time":32,"received":1234,"from":"foop","port":4321,"time":32,"marzlevanes":3,"version":"1.2.3","date":"Tue Jun 23 18:47:09 UTC 2015", "__warning": {"program":"gt_01","message":"Nableuay otay ectulatobjay orwardfay elocipingvay","verb":"ectulatobjay","error":"Ermissionpay eniedday"}, "__warning": {"program":"gt_01","message":"automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay","style":"automaticyay","type":"ardinalyay","target":"ammetersgray","error":"Ermissionpay eniedday"},"marzlevanes":6,"windings":"otuslay-oyay-eltayay"}}
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.JP.out b/contrib/libxo/tests/gettext/saved/gt_01.JP.out
index 939526f8b584..0717af5b4a67 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.JP.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.JP.out
@@ -34,13 +34,13 @@
     "version": "1.2.3",
     "date": "Tue Jun 23 18:47:09 UTC 2015",
     "__warning": {
-      "program": "gt_01.test",
+      "program": "gt_01",
       "message": "Nableuay otay ectulatobjay orwardfay elocipingvay",
       "verb": "ectulatobjay",
       "error": "Ermissionpay eniedday"
     },
     "__warning": {
-      "program": "gt_01.test",
+      "program": "gt_01",
       "message": "automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay",
       "style": "automaticyay",
       "type": "ardinalyay",
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.T.out b/contrib/libxo/tests/gettext/saved/gt_01.T.out
index 440d9a5bc9a5..c8d9763616ce 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.T.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.T.out
@@ -11,7 +11,7 @@ Received 1234 yezbay from foop#4321 in 32 ms
 Eceivedray 1234 ldb2 omfray foop#4321 inyay 32 msyay
 Onlyay 3 arzlevanezmay areyay unctioningfay orrectlycay
 Ersionvay Tue Jun 23 18:47:09 UTC 2015 1.2.3
-gt_01.test: Nableuay otay ectulatobjay orwardfay elocipingvay: Ermissionpay eniedday
-gt_01.test: automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay: Ermissionpay eniedday
+gt_01: Nableuay otay ectulatobjay orwardfay elocipingvay: Ermissionpay eniedday
+gt_01: automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay: Ermissionpay eniedday
 ydrocoptichay arzlevanesmay: 6
 Dude, Indingsway: otuslay-oyay-eltayay
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.X.out b/contrib/libxo/tests/gettext/saved/gt_01.X.out
index 4eb46223c72f..803aca9f8572 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.X.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.X.out
@@ -1 +1 @@
-<top><adjective>amingflay</adjective><noun>ordsway</noun><verb>urningbay</verb><owner>ymay</owner><target>ouchcay</target><adjective>amingflay</adjective><noun>ordsway</noun><verb>urningbay</verb><owner>ymay</owner><target>ouchcay</target><bytes>0</bytes><bytes>1</bytes><bytes>2</bytes><bytes>3</bytes><bytes>4</bytes><total>1234</total><received>1234</received><from>foop</from><port>4321</port><time>32</time><received>1234</received><from>foop</from><port>4321</port><time>32</time><received>1234</received><from>foop</from><port>4321</port><time>32</time><marzlevanes>3</marzlevanes><version>1.2.3</version><date>Tue Jun 23 18:47:09 UTC 2015</date><__warning><program>gt_01.test</program><message>Nableuay otay ectulatobjay orwardfay elocipingvay</message><verb>ectulatobjay</verb><error>Ermissionpay eniedday</error></__warning><__warning><program>gt_01.test</program><message>automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay</message><style>automaticyay</style><type>ardinalyay</type><target>ammetersgray</target><error>Ermissionpay eniedday</error></__warning><marzlevanes>6</marzlevanes><windings>otuslay-oyay-eltayay</windings></top>
\ No newline at end of file
+<top><adjective>amingflay</adjective><noun>ordsway</noun><verb>urningbay</verb><owner>ymay</owner><target>ouchcay</target><adjective>amingflay</adjective><noun>ordsway</noun><verb>urningbay</verb><owner>ymay</owner><target>ouchcay</target><bytes>0</bytes><bytes>1</bytes><bytes>2</bytes><bytes>3</bytes><bytes>4</bytes><total>1234</total><received>1234</received><from>foop</from><port>4321</port><time>32</time><received>1234</received><from>foop</from><port>4321</port><time>32</time><received>1234</received><from>foop</from><port>4321</port><time>32</time><marzlevanes>3</marzlevanes><version>1.2.3</version><date>Tue Jun 23 18:47:09 UTC 2015</date><__warning><program>gt_01</program><message>Nableuay otay ectulatobjay orwardfay elocipingvay</message><verb>ectulatobjay</verb><error>Ermissionpay eniedday</error></__warning><__warning><program>gt_01</program><message>automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay</message><style>automaticyay</style><type>ardinalyay</type><target>ammetersgray</target><error>Ermissionpay eniedday</error></__warning><marzlevanes>6</marzlevanes><windings>otuslay-oyay-eltayay</windings></top>
\ No newline at end of file
diff --git a/contrib/libxo/tests/gettext/saved/gt_01.XP.out b/contrib/libxo/tests/gettext/saved/gt_01.XP.out
index eac42845ad59..456536db7744 100644
--- a/contrib/libxo/tests/gettext/saved/gt_01.XP.out
+++ b/contrib/libxo/tests/gettext/saved/gt_01.XP.out
@@ -31,13 +31,13 @@
   <version>1.2.3</version>
   <date>Tue Jun 23 18:47:09 UTC 2015</date>
   <__warning>
-    <program>gt_01.test</program>
+    <program>gt_01</program>
     <message>Nableuay otay ectulatobjay orwardfay elocipingvay</message>
     <verb>ectulatobjay</verb>
     <error>Ermissionpay eniedday</error>
   </__warning>
   <__warning>
-    <program>gt_01.test</program>
+    <program>gt_01</program>
     <message>automaticyay ynchronizationsay ofyay ardinalyay ammetersgray ailedfay</message>
     <style>automaticyay</style>
     <type>ardinalyay</type>
diff --git a/contrib/libxo/tests/xo/saved/xo_02.H.err b/contrib/libxo/tests/xo/saved/xo_02.H.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.H.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.H.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.HIPx.err b/contrib/libxo/tests/xo/saved/xo_02.HIPx.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.HIPx.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.HIPx.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.HP.err b/contrib/libxo/tests/xo/saved/xo_02.HP.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.HP.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.HP.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.J.err b/contrib/libxo/tests/xo/saved/xo_02.J.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.J.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.J.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.JP.err b/contrib/libxo/tests/xo/saved/xo_02.JP.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.JP.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.JP.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.T.err b/contrib/libxo/tests/xo/saved/xo_02.T.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.T.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.T.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.X.err b/contrib/libxo/tests/xo/saved/xo_02.X.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.X.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.X.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)
diff --git a/contrib/libxo/tests/xo/saved/xo_02.XP.err b/contrib/libxo/tests/xo/saved/xo_02.XP.err
index 0c348c734898..1a570eea55a1 100644
--- a/contrib/libxo/tests/xo/saved/xo_02.XP.err
+++ b/contrib/libxo/tests/xo/saved/xo_02.XP.err
@@ -6,6 +6,7 @@ Usage: xo [options] format [fields]
     --depth <num>         Set the depth for pretty printing
     --help                Display this help text
     --html OR -H          Generate HTML output
+    --instance OR -I <name> Wrap in an instance of the given name
     --json OR -J          Generate JSON output
     --leading-xpath <path> OR -l <path> Add a prefix to generated XPaths (HTML)
     --not-first           Indicate this object is not the first (JSON)