Import libxo 0.6.0vendor/Juniper/libxo/0.6.0

45 files changed, 2473 insertions, 800 deletions

diff --git a/Makefile.am b/Makefile.am
index e050bc46f339..cb71d522bb51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,7 @@ GH_PAGES_PACKAGE_DIR = ${GH_PAGES_DIR}/${GH_PACKAGING_DIR}
 packages:
 	@-[ -d ${GH_PAGES_DIR} ] && set -x \
 		&& echo "Updating packages on gh-pages ..." \
+                && mkdir -p ${GH_PAGES_DIR}/${GH_PACKAGING_DIR} \
 		&& SHA1="`openssl sha1 ${PACKAGE_FILE} | awk '{print $$2}'`" \
 		&& SHA256="`openssl sha256 ${PACKAGE_FILE} | awk '{print $$2}'`" \
 		&& SIZE="`ls -l ${PACKAGE_FILE} | awk '{print $$5}'`" \
diff --git a/configure.ac b/configure.ac
index 1d86f0e5030c..cc371100e9bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.4.7], [phil@juniper.net])
+AC_INIT([libxo], [0.5.0], [phil@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ctype.h errno.h stdio.h stdlib.h])
 AC_CHECK_HEADERS([string.h sys/param.h unistd.h ])
 AC_CHECK_HEADERS([sys/sysctl.h])
 AC_CHECK_HEADERS([threads.h])
+AC_CHECK_HEADERS([monitor.h])
 
 dnl humanize_number(3) is a great function, but it's not standard.
 dnl Note Macosx has the function in libutil.a but doesn't ship the
@@ -148,10 +149,18 @@ fi
 AC_SUBST(GETTEXT_CFLAGS)
 AC_SUBST(GETTEXT_LIBS)
 
-GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
-AC_SUBST(GETTEXT_BINDIR)
 GETTEXT_LIBDIR=${GETTEXT_PREFIX}/lib
 AC_SUBST(GETTEXT_LIBDIR)
+if test -x ${GETTEXT_PREFIX}/bin/msgfmt ; then
+    GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
+elif test -x ${GETTEXT_PREFIX}/local/bin/msgfmt ; then
+    GETTEXT_BINDIR=${GETTEXT_PREFIX}/local/bin
+else
+    AC_MSG_NOTICE("could not find msgfmt tool")
+    # Use a (bad) fall back value
+    GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
+fi
+AC_SUBST(GETTEXT_BINDIR)
 
 AM_CONDITIONAL([HAVE_GETTEXT], [test "$HAVE_GETTEXT" = "yes"])
 
@@ -287,6 +296,18 @@ if test "${LIBXO_WCWIDTH}" != "no"; then
   AC_DEFINE([LIBXO_WCWIDTH], [1], [Enable local wcwidth implementation])
 fi
 
+AC_MSG_CHECKING([retain hash bucket size])
+AC_ARG_WITH(retain-size,
+        [  --with-retain-size=[DIR]           Specify retain hash bucket size (in bits)],
+        [XO_RETAIN_SIZE=$withval],
+        [XO_RETAIN_SIZE=default]
+)
+
+AC_MSG_RESULT([$XO_RETAIN_SIZE])
+if test "${XO_RETAIN_SIZE}" != "default"; then
+  AC_DEFINE_UNQUOTED([XO_RETAIN_SIZE], ${XO_RETAIN_SIZE}, [Retain hash bucket size])
+fi
+
 AC_CHECK_LIB([m], [lrint])
 AM_CONDITIONAL([HAVE_LIBM], [test "$HAVE_LIBM" != "no"])
 
@@ -347,12 +368,15 @@ XO_SRCDIR=${srcdir}
 XO_LIBDIR=${libdir}
 XO_BINDIR=${bindir}
 XO_INCLUDEDIR=${includedir}
+XO_CFLAGS="${CFLAGS}"
 
+AC_SUBST(XO_LIBS)
 AC_SUBST(XO_SRCDIR)
 AC_SUBST(XO_LIBDIR)
 AC_SUBST(XO_BINDIR)
 AC_SUBST(XO_INCLUDEDIR)
 AC_SUBST(XO_LIBEXT)
+AC_SUBST(XO_CFLAGS)
 
 AC_ARG_WITH(encoder-dir,
         [  --with-encoder-dir=[DIR]           Specify location of encoder libraries],
@@ -449,4 +473,5 @@ AC_MSG_NOTICE([summary of build options:
   isthreaded:       ${HAVE_ISTHREADED:-no}
   thread-local:     ${THREAD_LOCAL:-no}
   local wcwidth:    ${LIBXO_WCWIDTH:-no}
+  retain size:      ${XO_RETAIN_SIZE:-no}
 ])
diff --git a/doc/libxo-manual.html b/doc/libxo-manual.html
index 47881da91ab5..4db374b394f5 100644
--- a/doc/libxo-manual.html
+++ b/doc/libxo-manual.html
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-       content: "December 2015";
+       content: "April 2016";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 </tr>
 <tr>
 <td class="header left"></td>
-<td class="header right">December 30, 2015</td>
+<td class="header right">April 15, 2016</td>
 </tr>
 </table></div>
 <p id="title" class="title">libxo: The Easy Way to Generate text, XML, JSON, and HTML output<br><span class="filename">libxo-manual</span></p>
@@ -22130,46 +22130,54 @@ jQuery(function ($) {
 <a href="#field-modifiers">Field Modifiers</a><ul class="toc">
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_1">2.2.2.1   </div>
-<a href="#the-colon-modifier-c">The Colon Modifier ({c:})</a>
+<a href="#the-argument-modifier-a">The Argument Modifier ({a:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_2">2.2.2.2   </div>
-<a href="#the-display-modifier-d">The Display Modifier ({d:})</a>
+<a href="#the-colon-modifier-c">The Colon Modifier ({c:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_3">2.2.2.3   </div>
-<a href="#e-modifier">The Encoding Modifier ({e:})</a>
+<a href="#the-display-modifier-d">The Display Modifier ({d:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_4">2.2.2.4   </div>
-<a href="#gettext-modifier">The Gettext Modifier ({g:})</a>
+<a href="#e-modifier">The Encoding Modifier ({e:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_5">2.2.2.5   </div>
-<a href="#the-humanize-modifier-h">The Humanize Modifier ({h:})</a>
+<a href="#gettext-modifier">The Gettext Modifier ({g:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_6">2.2.2.6   </div>
-<a href="#the-key-modifier-k">The Key Modifier ({k:})</a>
+<a href="#the-humanize-modifier-h">The Humanize Modifier ({h:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_7">2.2.2.7   </div>
-<a href="#the-leaf-list-modifier-l">The Leaf-List Modifier ({l:})</a>
+<a href="#the-key-modifier-k">The Key Modifier ({k:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_8">2.2.2.8   </div>
-<a href="#the-no-quotes-modifier-n">The No-Quotes Modifier ({n:})</a>
+<a href="#the-leaf-list-modifier-l">The Leaf-List Modifier ({l:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_9">2.2.2.9   </div>
-<a href="#plural-modifier">The Plural Modifier ({p:})</a>
+<a href="#the-no-quotes-modifier-n">The No-Quotes Modifier ({n:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_10">2.2.2.10   </div>
-<a href="#the-quotes-modifier-q">The Quotes Modifier ({q:})</a>
+<a href="#plural-modifier">The Plural Modifier ({p:})</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_2_11">2.2.2.11   </div>
+<a href="#the-quotes-modifier-q">The Quotes Modifier ({q:})</a>
+</li>
+<li class="tocline1">
+<div class="section-number" id="toc_doc_section_2_2_2_12">2.2.2.12   </div>
+<a href="#the-trim-modifier-t">The Trim Modifier ({t:})</a>
+</li>
+<li class="tocline1">
+<div class="section-number" id="toc_doc_section_2_2_2_13">2.2.2.13   </div>
 <a href="#the-white-space-modifier-w">The White Space Modifier ({w:})</a>
 </li>
 </ul>
@@ -22208,42 +22216,38 @@ jQuery(function ($) {
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_2_11">2.2.11   </div>
+<a href="#retain">Retaining Parsed Format Information</a>
+</li>
+<li class="tocline1">
+<div class="section-number" id="toc_doc_section_2_2_12">2.2.12   </div>
 <a href="#example">Example</a>
 </li>
 </ul>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_2_3">2.3   </div>
-<a href="#command-line-arguments">Command-line Arguments</a>
-</li>
-<li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_4">2.4   </div>
 <a href="#representing-hierarchy">Representing Hierarchy</a><ul class="toc">
 <li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_4_1">2.4.1   </div>
+<div class="section-number" id="toc_doc_section_2_3_1">2.3.1   </div>
 <a href="#containers">Containers</a>
 </li>
 <li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_4_2">2.4.2   </div>
+<div class="section-number" id="toc_doc_section_2_3_2">2.3.2   </div>
 <a href="#lists-and-instances">Lists and Instances</a>
 </li>
 <li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_4_3">2.4.3   </div>
+<div class="section-number" id="toc_doc_section_2_3_3">2.3.3   </div>
 <a href="#dtrt-mode">DTRT Mode</a>
 </li>
 <li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_4_4">2.4.4   </div>
+<div class="section-number" id="toc_doc_section_2_3_4">2.3.4   </div>
 <a href="#markers">Markers</a>
 </li>
 </ul>
 </li>
 <li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_5">2.5   </div>
-<a href="#handles">Handles</a>
-</li>
-<li class="tocline1">
-<div class="section-number" id="toc_doc_section_2_6">2.6   </div>
-<a href="#utf-8">UTF-8</a>
+<div class="section-number" id="toc_doc_section_2_4">2.4   </div>
+<a href="#command-line-arguments">Command-line Arguments</a>
 </li>
 </ul>
 </li>
@@ -22252,7 +22256,7 @@ jQuery(function ($) {
 <a href="#the-libxo-api">The libxo API</a><ul class="toc top-toc">
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_3_1">3.1   </div>
-<a href="#handles-2">Handles</a><ul class="toc">
+<a href="#handles">Handles</a><ul class="toc">
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_3_1_1">3.1.1   </div>
 <a href="#xo_create">xo_create</a>
@@ -22306,14 +22310,18 @@ jQuery(function ($) {
 <a href="#emitting-content-xo_emit">Emitting Content (xo_emit)</a><ul class="toc">
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_3_2_1">3.2.1   </div>
-<a href="#xo_attr">Attributes (xo_attr)</a>
+<a href="#xo_emit_field">Single Field Emitting Functions (xo_emit_field)</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_3_2_2">3.2.2   </div>
-<a href="#flushing-output-xo_flush">Flushing Output (xo_flush)</a>
+<a href="#xo_attr">Attributes (xo_attr)</a>
 </li>
 <li class="tocline1">
 <div class="section-number" id="toc_doc_section_3_2_3">3.2.3   </div>
+<a href="#flushing-output-xo_flush">Flushing Output (xo_flush)</a>
+</li>
+<li class="tocline1">
+<div class="section-number" id="toc_doc_section_3_2_4">3.2.4   </div>
 <a href="#finishing-output-xo_finish">Finishing Output (xo_finish)</a>
 </li>
 </ul>
@@ -22851,10 +22859,8 @@ jQuery(function ($) {
 <ul>
 <li><a href="#encoding-styles" title="Encoding Styles">Section 2.1</a></li>
 <li><a href="#format-strings" title="Format Strings">Section 2.2</a></li>
-<li><a href="#command-line-arguments" title="Command-line Arguments">Section 2.3</a></li>
-<li><a href="#representing-hierarchy" title="Representing Hierarchy">Section 2.4</a></li>
-<li><a href="#handles" title="Handles">Section 2.5</a></li>
-<li><a href="#utf-8" title="UTF-8">Section 2.6</a></li>
+<li><a href="#representing-hierarchy" title="Representing Hierarchy">Section 2.3</a></li>
+<li><a href="#command-line-arguments" title="Command-line Arguments">Section 2.4</a></li>
 </ul>
 <div class="content">
 <h2 id="doc_section_2_1">
@@ -22992,7 +22998,8 @@ jQuery(function ($) {
 <li><a href="#the-encoding-format-eformat" title="The Encoding Format (eformat)">Section 2.2.8</a></li>
 <li><a href="#content-strings" title="Content Strings">Section 2.2.9</a></li>
 <li><a href="#printf-like" title="Argument Validation">Section 2.2.10</a></li>
-<li><a href="#example" title="Example">Section 2.2.11</a></li>
+<li><a href="#retain" title="Retaining Parsed Format Information">Section 2.2.11</a></li>
+<li><a href="#example" title="Example">Section 2.2.12</a></li>
 </ul>
 <div class="content">
 <h3 id="doc_section_2_2_1">
@@ -23356,6 +23363,11 @@ jQuery(function ($) {
 </tr></thead>
 <tbody>
 <tr>
+<td>a</td>
+<td>argument</td>
+<td>The content appears as a 'const char *' argument</td>
+</tr>
+<tr>
 <td>c</td>
 <td>colon</td>
 <td>A colon (":") is appended after the label</td>
@@ -23435,87 +23447,107 @@ jQuery(function ($) {
 <p id="doc_section_2_2_2_p_2">Roles and modifiers can also use more verbose names, when preceeded by a comma. For example, the modifier string "Lwc" (or "L,white,colon") means the field has a label role (text that describes the next field) and should be followed by a colon ('c') and a space ('w'). The modifier string "Vkq" (or ":key,quote") means the field has a value role (the default role), that it is a key for the current instance, and that the value should be quoted when encoded for JSON.</p>
 <p id="doc_section_2_2_2_p_3">Section Contents: </p>
 <ul>
-<li><a href="#the-colon-modifier-c" title="The Colon Modifier ({c:})">Section 2.2.2.1</a></li>
-<li><a href="#the-display-modifier-d" title="The Display Modifier ({d:})">Section 2.2.2.2</a></li>
-<li><a href="#e-modifier" title="The Encoding Modifier ({e:})">Section 2.2.2.3</a></li>
-<li><a href="#gettext-modifier" title="The Gettext Modifier ({g:})">Section 2.2.2.4</a></li>
-<li><a href="#the-humanize-modifier-h" title="The Humanize Modifier ({h:})">Section 2.2.2.5</a></li>
-<li><a href="#the-key-modifier-k" title="The Key Modifier ({k:})">Section 2.2.2.6</a></li>
-<li><a href="#the-leaf-list-modifier-l" title="The Leaf-List Modifier ({l:})">Section 2.2.2.7</a></li>
-<li><a href="#the-no-quotes-modifier-n" title="The No-Quotes Modifier ({n:})">Section 2.2.2.8</a></li>
-<li><a href="#plural-modifier" title="The Plural Modifier ({p:})">Section 2.2.2.9</a></li>
-<li><a href="#the-quotes-modifier-q" title="The Quotes Modifier ({q:})">Section 2.2.2.10</a></li>
-<li><a href="#the-white-space-modifier-w" title="The White Space Modifier ({w:})">Section 2.2.2.11</a></li>
+<li><a href="#the-argument-modifier-a" title="The Argument Modifier ({a:})">Section 2.2.2.1</a></li>
+<li><a href="#the-colon-modifier-c" title="The Colon Modifier ({c:})">Section 2.2.2.2</a></li>
+<li><a href="#the-display-modifier-d" title="The Display Modifier ({d:})">Section 2.2.2.3</a></li>
+<li><a href="#e-modifier" title="The Encoding Modifier ({e:})">Section 2.2.2.4</a></li>
+<li><a href="#gettext-modifier" title="The Gettext Modifier ({g:})">Section 2.2.2.5</a></li>
+<li><a href="#the-humanize-modifier-h" title="The Humanize Modifier ({h:})">Section 2.2.2.6</a></li>
+<li><a href="#the-key-modifier-k" title="The Key Modifier ({k:})">Section 2.2.2.7</a></li>
+<li><a href="#the-leaf-list-modifier-l" title="The Leaf-List Modifier ({l:})">Section 2.2.2.8</a></li>
+<li><a href="#the-no-quotes-modifier-n" title="The No-Quotes Modifier ({n:})">Section 2.2.2.9</a></li>
+<li><a href="#plural-modifier" title="The Plural Modifier ({p:})">Section 2.2.2.10</a></li>
+<li><a href="#the-quotes-modifier-q" title="The Quotes Modifier ({q:})">Section 2.2.2.11</a></li>
+<li><a href="#the-trim-modifier-t" title="The Trim Modifier ({t:})">Section 2.2.2.12</a></li>
+<li><a href="#the-white-space-modifier-w" title="The White Space Modifier ({w:})">Section 2.2.2.13</a></li>
 </ul>
 <div class="content">
 <h4 id="doc_section_2_2_2_1">
 <div class="self-section-number">
 <a href="#doc_section_2_2_2_1">2.2.2.1</a> </div>
-<a id="the-colon-modifier-c" href="#the-colon-modifier-c">The Colon Modifier ({c:})</a>
+<a id="the-argument-modifier-a" href="#the-argument-modifier-a">The Argument Modifier ({a:})</a>
 </h4>
-<p id="doc_section_2_2_2_1_p_1">The colon modifier appends a single colon to the data value:</p>
+<p id="doc_section_2_2_2_1_p_1">The argument modifier indicates that the content of the field descriptor will be placed as a UTF-8 string (const char *) argument within the xo_emit parameters.</p>
 <div id="doc_figure_u.48"></div> <pre>
     EXAMPLE:
-      xo_emit("{Lc:Name}{:name}\n", "phil");
+      xo_emit("{La:} {a:}\n", "Label text", "label", "value");
     TEXT:
-      Name:phil
-	    </pre> <p id="doc_section_2_2_2_1_p_3">The colon modifier is only used for the TEXT and HTML output styles. It is commonly combined with the space modifier ('{w:}'). It is purely a convenience feature.</p>
+      Label text value
+    JSON:
+      "label": "value"
+    XML:
+      &lt;label&gt;value&lt;/label&gt;
+	    </pre> <p id="doc_section_2_2_2_1_p_3">The argument modifier allows field names for value fields to be passed on the stack, avoiding the need to build a field descriptor using snprintf. For many field roles, the argument modifier is not needed, since those roles have specific mechanisms for arguments, such as "{C:fg&#8209;%s}".</p>
 </div>
 <div class="content">
 <h4 id="doc_section_2_2_2_2">
 <div class="self-section-number">
 <a href="#doc_section_2_2_2_2">2.2.2.2</a> </div>
-<a id="the-display-modifier-d" href="#the-display-modifier-d">The Display Modifier ({d:})</a>
+<a id="the-colon-modifier-c" href="#the-colon-modifier-c">The Colon Modifier ({c:})</a>
 </h4>
-<p id="doc_section_2_2_2_2_p_1">The display modifier indicated the field should only be generated for the display output styles, TEXT and HTML.</p>
+<p id="doc_section_2_2_2_2_p_1">The colon modifier appends a single colon to the data value:</p>
 <div id="doc_figure_u.49"></div> <pre>
     EXAMPLE:
+      xo_emit("{Lc:Name}{:name}\n", "phil");
+    TEXT:
+      Name:phil
+	    </pre> <p id="doc_section_2_2_2_2_p_3">The colon modifier is only used for the TEXT and HTML output styles. It is commonly combined with the space modifier ('{w:}'). It is purely a convenience feature.</p>
+</div>
+<div class="content">
+<h4 id="doc_section_2_2_2_3">
+<div class="self-section-number">
+<a href="#doc_section_2_2_2_3">2.2.2.3</a> </div>
+<a id="the-display-modifier-d" href="#the-display-modifier-d">The Display Modifier ({d:})</a>
+</h4>
+<p id="doc_section_2_2_2_3_p_1">The display modifier indicated the field should only be generated for the display output styles, TEXT and HTML.</p>
+<div id="doc_figure_u.50"></div> <pre>
+    EXAMPLE:
       xo_emit("{Lcw:Name}{d:name} {:id/%d}\n", "phil", 1);
     TEXT:
       Name: phil 1
     XML:
       &lt;id&gt;1&lt;/id&gt;
-	    </pre> <p id="doc_section_2_2_2_2_p_3">The display modifier is the opposite of the encoding modifier, and they are often used to give to distinct views of the underlying data.</p>
+	    </pre> <p id="doc_section_2_2_2_3_p_3">The display modifier is the opposite of the encoding modifier, and they are often used to give to distinct views of the underlying data.</p>
 </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_3">
+<h4 id="doc_section_2_2_2_4">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_3">2.2.2.3</a> </div>
+<a href="#doc_section_2_2_2_4">2.2.2.4</a> </div>
 <a id="e-modifier" href="#e-modifier">The Encoding Modifier ({e:})</a>
 </h4>
-<p id="doc_section_2_2_2_3_p_1">The display modifier indicated the field should only be generated for the display output styles, TEXT and HTML.</p>
-<div id="doc_figure_u.50"></div> <pre>
+<p id="doc_section_2_2_2_4_p_1">The display modifier indicated the field should only be generated for the display output styles, TEXT and HTML.</p>
+<div id="doc_figure_u.51"></div> <pre>
     EXAMPLE:
       xo_emit("{Lcw:Name}{:name} {e:id/%d}\n", "phil", 1);
     TEXT:
       Name: phil
     XML:
       &lt;name&gt;phil&lt;/name&gt;&lt;id&gt;1&lt;/id&gt;
-	    </pre> <p id="doc_section_2_2_2_3_p_3">The encoding modifier is the opposite of the display modifier, and they are often used to give to distinct views of the underlying data.</p>
+	    </pre> <p id="doc_section_2_2_2_4_p_3">The encoding modifier is the opposite of the display modifier, and they are often used to give to distinct views of the underlying data.</p>
 </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_4">
+<h4 id="doc_section_2_2_2_5">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_4">2.2.2.4</a> </div>
+<a href="#doc_section_2_2_2_5">2.2.2.5</a> </div>
 <a id="gettext-modifier" href="#gettext-modifier">The Gettext Modifier ({g:})</a>
 </h4>
-<p id="doc_section_2_2_2_4_p_1">The gettext modifier is used to translate individual fields using the gettext domain (typically set using the "{G:}" role) and current language settings. Once libxo renders the field value, it is passed to gettext(3), where it is used as a key to find the native language translation.</p>
-<p id="doc_section_2_2_2_4_p_2">In the following example, the strings "State" and "full" are passed to gettext() to find locale-based translated strings.</p>
-<div id="doc_figure_u.51"></div> <pre>
+<p id="doc_section_2_2_2_5_p_1">The gettext modifier is used to translate individual fields using the gettext domain (typically set using the "{G:}" role) and current language settings. Once libxo renders the field value, it is passed to gettext(3), where it is used as a key to find the native language translation.</p>
+<p id="doc_section_2_2_2_5_p_2">In the following example, the strings "State" and "full" are passed to gettext() to find locale-based translated strings.</p>
+<div id="doc_figure_u.52"></div> <pre>
     xo_emit("{Lgwc:State}{g:state}\n", "full");
-	    </pre> <p id="doc_section_2_2_2_4_p_4">See <a href="#gettext-role" title="The Gettext Role ({G:})">Section 2.2.1.3</a>, <a href="#plural-modifier" title="The Plural Modifier ({p:})">Section 2.2.2.9</a>, and <a href="#howto-i18n" title="Howto: Internationalization (i18n)">Section 9.5</a> for additional details.</p>
+	    </pre> <p id="doc_section_2_2_2_5_p_4">See <a href="#gettext-role" title="The Gettext Role ({G:})">Section 2.2.1.3</a>, <a href="#plural-modifier" title="The Plural Modifier ({p:})">Section 2.2.2.10</a>, and <a href="#howto-i18n" title="Howto: Internationalization (i18n)">Section 9.5</a> for additional details.</p>
 </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_5">
+<h4 id="doc_section_2_2_2_6">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_5">2.2.2.5</a> </div>
+<a href="#doc_section_2_2_2_6">2.2.2.6</a> </div>
 <a id="the-humanize-modifier-h" href="#the-humanize-modifier-h">The Humanize Modifier ({h:})</a>
 </h4>
-<p id="doc_section_2_2_2_5_p_1">The humanize modifier is used to render large numbers as in a human-readable format. While numbers like "44470272" are completely readable to computers and savants, humans will generally find "44M" more meaningful.</p>
-<p id="doc_section_2_2_2_5_p_2">"hn" can be used as an alias for "humanize".</p>
-<p id="doc_section_2_2_2_5_p_3">The humanize modifier only affects display styles (TEXT and HMTL). The "no&#8209;humanize" option (See <a href="#LIBXO_OPTIONS" title="LIBXO_OPTIONS">Section 3.4.6</a>) will block the function of the humanize modifier.</p>
-<p id="doc_section_2_2_2_5_p_4">There are a number of modifiers that affect details of humanization. These are only available in as full names, not single characters. The "hn&#8209;space" modifier places a space between the number and any multiplier symbol, such as "M" or "K" (ex: "44 K"). The "hn&#8209;decimal" modifier will add a decimal point and a single tenths digit when the number is less than 10 (ex: "4.4K"). The "hn&#8209;1000" modifier will use 1000 as divisor instead of 1024, following the JEDEC-standard instead of the more natural binary powers-of-two tradition.</p>
-<div id="doc_figure_u.52"></div> <pre>
+<p id="doc_section_2_2_2_6_p_1">The humanize modifier is used to render large numbers as in a human-readable format. While numbers like "44470272" are completely readable to computers and savants, humans will generally find "44M" more meaningful.</p>
+<p id="doc_section_2_2_2_6_p_2">"hn" can be used as an alias for "humanize".</p>
+<p id="doc_section_2_2_2_6_p_3">The humanize modifier only affects display styles (TEXT and HMTL). The "no&#8209;humanize" option (See <a href="#LIBXO_OPTIONS" title="LIBXO_OPTIONS">Section 3.4.6</a>) will block the function of the humanize modifier.</p>
+<p id="doc_section_2_2_2_6_p_4">There are a number of modifiers that affect details of humanization. These are only available in as full names, not single characters. The "hn&#8209;space" modifier places a space between the number and any multiplier symbol, such as "M" or "K" (ex: "44 K"). The "hn&#8209;decimal" modifier will add a decimal point and a single tenths digit when the number is less than 10 (ex: "4.4K"). The "hn&#8209;1000" modifier will use 1000 as divisor instead of 1024, following the JEDEC-standard instead of the more natural binary powers-of-two tradition.</p>
+<div id="doc_figure_u.53"></div> <pre>
     EXAMPLE:
         xo_emit("{h:input/%u}, {h,hn-space:output/%u}, "
             "{h,hn-decimal:errors/%u}, {h,hn-1000:capacity/%u}, "
@@ -23523,19 +23555,19 @@ jQuery(function ($) {
             input, output, errors, capacity, remaining);
     TEXT:
         21, 57 K, 96M, 44M, 1.2G
-	    </pre> <p id="doc_section_2_2_2_5_p_6">In the HTML style, the original numeric value is rendered in the "data&#8209;number" attribute on the &lt;div&gt; element:</p>
-<div id="doc_figure_u.53"></div> <pre>
+	    </pre> <p id="doc_section_2_2_2_6_p_6">In the HTML style, the original numeric value is rendered in the "data&#8209;number" attribute on the &lt;div&gt; element:</p>
+<div id="doc_figure_u.54"></div> <pre>
     &lt;div class="data" data-tag="errors"
          data-number="100663296"&gt;96M&lt;/div&gt;
 	    </pre> </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_6">
+<h4 id="doc_section_2_2_2_7">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_6">2.2.2.6</a> </div>
+<a href="#doc_section_2_2_2_7">2.2.2.7</a> </div>
 <a id="the-key-modifier-k" href="#the-key-modifier-k">The Key Modifier ({k:})</a>
 </h4>
-<p id="doc_section_2_2_2_6_p_1">The key modifier is used to indicate that a particular field helps uniquely identify an instance of list data.</p>
-<div id="doc_figure_u.54"></div> <pre>
+<p id="doc_section_2_2_2_7_p_1">The key modifier is used to indicate that a particular field helps uniquely identify an instance of list data.</p>
+<div id="doc_figure_u.55"></div> <pre>
     EXAMPLE:
         xo_open_list("user");
         for (i = 0; i &lt; num_users; i++) {
@@ -23545,16 +23577,16 @@ jQuery(function ($) {
             xo_close_instance("user");
         }
         xo_close_list("user");
-	    </pre> <p id="doc_section_2_2_2_6_p_3">Currently the key modifier is only used when generating XPath value for the HTML output style when XOF_XPATH is set, but other uses are likely in the near future.</p>
+	    </pre> <p id="doc_section_2_2_2_7_p_3">Currently the key modifier is only used when generating XPath value for the HTML output style when XOF_XPATH is set, but other uses are likely in the near future.</p>
 </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_7">
+<h4 id="doc_section_2_2_2_8">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_7">2.2.2.7</a> </div>
+<a href="#doc_section_2_2_2_8">2.2.2.8</a> </div>
 <a id="the-leaf-list-modifier-l" href="#the-leaf-list-modifier-l">The Leaf-List Modifier ({l:})</a>
 </h4>
-<p id="doc_section_2_2_2_7_p_1">The leaf-list modifier is used to distinguish lists where each instance consists of only a single value. In XML, these are rendered as single elements, where JSON renders them as arrays.</p>
-<div id="doc_figure_u.55"></div> <pre>
+<p id="doc_section_2_2_2_8_p_1">The leaf-list modifier is used to distinguish lists where each instance consists of only a single value. In XML, these are rendered as single elements, where JSON renders them as arrays.</p>
+<div id="doc_figure_u.56"></div> <pre>
     EXAMPLE:
         for (i = 0; i &lt; num_users; i++) {
             xo_emit("Member {l:user}\n", user[i].u_name);
@@ -23564,16 +23596,16 @@ jQuery(function ($) {
         &lt;user&gt;pallavi&lt;/user&gt;
     JSON:
         "user": [ "phil", "pallavi" ]
-	    </pre> <p id="doc_section_2_2_2_7_p_3">The name of the field must match the name of the leaf list.</p>
+	    </pre> <p id="doc_section_2_2_2_8_p_3">The name of the field must match the name of the leaf list.</p>
 </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_8">
+<h4 id="doc_section_2_2_2_9">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_8">2.2.2.8</a> </div>
+<a href="#doc_section_2_2_2_9">2.2.2.9</a> </div>
 <a id="the-no-quotes-modifier-n" href="#the-no-quotes-modifier-n">The No-Quotes Modifier ({n:})</a>
 </h4>
-<p id="doc_section_2_2_2_8_p_1">The no-quotes modifier (and its twin, the 'quotes' modifier) affect the quoting of values in the JSON output style. JSON uses quotes for string value, but no quotes for numeric, boolean, and null data. xo_emit applies a simple heuristic to determine whether quotes are needed, but often this needs to be controlled by the caller.</p>
-<div id="doc_figure_u.56"></div> <pre>
+<p id="doc_section_2_2_2_9_p_1">The no-quotes modifier (and its twin, the 'quotes' modifier) affect the quoting of values in the JSON output style. JSON uses quotes for string value, but no quotes for numeric, boolean, and null data. xo_emit applies a simple heuristic to determine whether quotes are needed, but often this needs to be controlled by the caller.</p>
+<div id="doc_figure_u.57"></div> <pre>
     EXAMPLE:
       const char *bool = is_true ? "true" : "false";
       xo_emit("{n:fancy/%s}", bool);
@@ -23581,45 +23613,61 @@ jQuery(function ($) {
       "fancy": true
 	    </pre> </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_9">
+<h4 id="doc_section_2_2_2_10">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_9">2.2.2.9</a> </div>
+<a href="#doc_section_2_2_2_10">2.2.2.10</a> </div>
 <a id="plural-modifier" href="#plural-modifier">The Plural Modifier ({p:})</a>
 </h4>
-<p id="doc_section_2_2_2_9_p_1">The plural modifier selects the appropriate plural form of an expression based on the most recent number emitted and the current language settings. The contents of the field should be the singular and plural English values, separated by a comma:</p>
-<div id="doc_figure_u.57"></div> <pre>
+<p id="doc_section_2_2_2_10_p_1">The plural modifier selects the appropriate plural form of an expression based on the most recent number emitted and the current language settings. The contents of the field should be the singular and plural English values, separated by a comma:</p>
+<div id="doc_figure_u.58"></div> <pre>
     xo_emit("{:bytes} {Ngp:byte,bytes}\n", bytes);
-	    </pre> <p id="doc_section_2_2_2_9_p_3">The plural modifier is meant to work with the gettext modifier ({g:}) but can work independently. See <a href="#gettext-modifier" title="The Gettext Modifier ({g:})">Section 2.2.2.4</a>.</p>
-<p id="doc_section_2_2_2_9_p_4">When used without the gettext modifier or when the message does not appear in the message catalog, the first token is chosen when the last numeric value is equal to 1; otherwise the second value is used, mimicking the simple pluralization rules of English.</p>
-<p id="doc_section_2_2_2_9_p_5">When used with the gettext modifier, the ngettext(3) function is called to handle the heavy lifting, using the message catalog to convert the singular and plural forms into the native language.</p>
+	    </pre> <p id="doc_section_2_2_2_10_p_3">The plural modifier is meant to work with the gettext modifier ({g:}) but can work independently. See <a href="#gettext-modifier" title="The Gettext Modifier ({g:})">Section 2.2.2.5</a>.</p>
+<p id="doc_section_2_2_2_10_p_4">When used without the gettext modifier or when the message does not appear in the message catalog, the first token is chosen when the last numeric value is equal to 1; otherwise the second value is used, mimicking the simple pluralization rules of English.</p>
+<p id="doc_section_2_2_2_10_p_5">When used with the gettext modifier, the ngettext(3) function is called to handle the heavy lifting, using the message catalog to convert the singular and plural forms into the native language.</p>
 </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_10">
+<h4 id="doc_section_2_2_2_11">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_10">2.2.2.10</a> </div>
+<a href="#doc_section_2_2_2_11">2.2.2.11</a> </div>
 <a id="the-quotes-modifier-q" href="#the-quotes-modifier-q">The Quotes Modifier ({q:})</a>
 </h4>
-<p id="doc_section_2_2_2_10_p_1">The quotes modifier (and its twin, the 'no&#8209;quotes' modifier) affect the quoting of values in the JSON output style. JSON uses quotes for string value, but no quotes for numeric, boolean, and null data. xo_emit applies a simple heuristic to determine whether quotes are needed, but often this needs to be controlled by the caller.</p>
-<div id="doc_figure_u.58"></div> <pre>
+<p id="doc_section_2_2_2_11_p_1">The quotes modifier (and its twin, the 'no&#8209;quotes' modifier) affect the quoting of values in the JSON output style. JSON uses quotes for string value, but no quotes for numeric, boolean, and null data. xo_emit applies a simple heuristic to determine whether quotes are needed, but often this needs to be controlled by the caller.</p>
+<div id="doc_figure_u.59"></div> <pre>
     EXAMPLE:
       xo_emit("{q:time/%d}", 2014);
     JSON:
       "year": "2014"
+	    </pre> <p id="doc_section_2_2_2_11_p_3">The heuristic is based on the format; if the format uses any of the following conversion specifiers, then no quotes are used:</p>
+<div id="doc_figure_u.60"></div> <pre>
+    d i o u x X D O U e E f F g G a A c C p
 	    </pre> </div>
 <div class="content">
-<h4 id="doc_section_2_2_2_11">
+<h4 id="doc_section_2_2_2_12">
 <div class="self-section-number">
-<a href="#doc_section_2_2_2_11">2.2.2.11</a> </div>
+<a href="#doc_section_2_2_2_12">2.2.2.12</a> </div>
+<a id="the-trim-modifier-t" href="#the-trim-modifier-t">The Trim Modifier ({t:})</a>
+</h4>
+<p id="doc_section_2_2_2_12_p_1">The trim modifier removes any leading or trailing whitespace from the value.</p>
+<div id="doc_figure_u.61"></div> <pre>
+    EXAMPLE:
+      xo_emit("{t:description}", "   some  input   ");
+    JSON:
+      "description": "some input"
+	    </pre> </div>
+<div class="content">
+<h4 id="doc_section_2_2_2_13">
+<div class="self-section-number">
+<a href="#doc_section_2_2_2_13">2.2.2.13</a> </div>
 <a id="the-white-space-modifier-w" href="#the-white-space-modifier-w">The White Space Modifier ({w:})</a>
 </h4>
-<p id="doc_section_2_2_2_11_p_1">The white space modifier appends a single space to the data value:</p>
-<div id="doc_figure_u.59"></div> <pre>
+<p id="doc_section_2_2_2_13_p_1">The white space modifier appends a single space to the data value:</p>
+<div id="doc_figure_u.62"></div> <pre>
     EXAMPLE:
       xo_emit("{Lw:Name}{:name}\n", "phil");
     TEXT:
       Name phil
-	    </pre> <p id="doc_section_2_2_2_11_p_3">The white space modifier is only used for the TEXT and HTML output styles. It is commonly combined with the colon modifier ('{c:}'). It is purely a convenience feature.</p>
-<p id="doc_section_2_2_2_11_p_4">Note that the sense of the 'w' modifier is reversed for the units role ({Uw:}); a blank is added before the contents, rather than after it.</p>
+	    </pre> <p id="doc_section_2_2_2_13_p_3">The white space modifier is only used for the TEXT and HTML output styles. It is commonly combined with the colon modifier ('{c:}'). It is purely a convenience feature.</p>
+<p id="doc_section_2_2_2_13_p_4">Note that the sense of the 'w' modifier is reversed for the units role ({Uw:}); a blank is added before the contents, rather than after it.</p>
 </div>
 </div>
 <div class="content">
@@ -23632,7 +23680,7 @@ jQuery(function ($) {
 <p id="doc_section_2_2_3_p_2">If the format string is not provided for a value field, it defaults to "%s".</p>
 <p id="doc_section_2_2_3_p_3">Note a field definition can contain zero or more printf-style 'directives', which are sequences that start with a '%' and end with one of following characters: "diouxXDOUeEfFgGaAcCsSp". Each directive is matched by one of more arguments to the xo_emit function.</p>
 <p id="doc_section_2_2_3_p_4">The format string has the form:</p>
-<div id="doc_figure_u.60"></div> <pre>
+<div id="doc_figure_u.63"></div> <pre>
   '%' format-modifier * format-character
 	    </pre> <p id="doc_section_2_2_3_p_6">The format- modifier can be:</p>
 <p id="doc_section_2_2_3_p_7"> </p>
@@ -23829,8 +23877,42 @@ jQuery(function ($) {
 <a id="utf-8-and-locale-strings" href="#utf-8-and-locale-strings">UTF-8 and Locale Strings</a>
 </h3>
 <p id="doc_section_2_2_4_p_1">For strings, the 'h' and 'l' modifiers affect the interpretation of the bytes pointed to argument. The default '%s' string is a 'char *' pointer to a string encoded as UTF-8. Since UTF-8 is compatible with ASCII data, a normal 7-bit ASCII string can be used. '%ls' expects a 'wchar_t *' pointer to a wide-character string, encoded as a 32-bit Unicode values. '%hs' expects a 'char *' pointer to a multi-byte string encoded with the current locale, as given by the LC_CTYPE, LANG, or LC_ALL environment varibles. The first of this list of variables is used and if none of the variables are set, the locale defaults to "UTF&#8209;8".</p>
-<p id="doc_section_2_2_4_p_2">For example, a function is passed a locale-base name, a hat size, and a time value. The hat size is formatted in a UTF-8 (ASCII) string, and the time value is formatted into a wchar_t string.</p>
-<div id="doc_figure_u.61"></div> <pre>
+<p id="doc_section_2_2_4_p_2">libxo will convert these arguments as needed to either UTF-8 (for XML, JSON, and HTML styles) or locale-based strings for display in text style.</p>
+<div id="doc_figure_u.64"></div> <pre>
+   xo_emit("Alll strings are utf-8 content {:tag/%ls}",
+           L"except for wide strings");
+	    </pre> <p id="doc_section_2_2_4_p_4">"%S" is equivalent to "%ls".</p>
+<div id="doc_table_u.7"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<thead><tr>
+<th class="left">Format</th>
+<th class="left">Argument Type</th>
+<th class="left">Argument Contents</th>
+</tr></thead>
+<tbody>
+<tr>
+<td>%s</td>
+<td>const char *</td>
+<td>UTF-8 string</td>
+</tr>
+<tr>
+<td>%S</td>
+<td>const char *</td>
+<td>UTF-8 string (alias for '%s')</td>
+</tr>
+<tr>
+<td>%ls</td>
+<td>const wchar_t *</td>
+<td>Wide character UNICODE string</td>
+</tr>
+<tr>
+<td>%hs</td>
+<td>const char *</td>
+<td>locale-based string</td>
+</tr>
+</tbody>
+</table></div>
+<p id="doc_section_2_2_4_p_5">For example, a function is passed a locale-base name, a hat size, and a time value. The hat size is formatted in a UTF-8 (ASCII) string, and the time value is formatted into a wchar_t string.</p>
+<div id="doc_figure_u.65"></div> <pre>
     void print_order (const char *name, int size,
                       struct tm *timep) {
         char buf[32];
@@ -23849,10 +23931,10 @@ jQuery(function ($) {
         xo_emit("It was ordered on {:order-time/%ls}.\n",
                 when);
     }
-	    </pre> <p id="doc_section_2_2_4_p_4">It is important to note that xo_emit will perform the conversion required to make appropriate output. Text style output uses the current locale (as described above), while XML, JSON, and HTML use UTF-8.</p>
-<p id="doc_section_2_2_4_p_5">UTF-8 and locale-encoded strings can use multiple bytes to encode one column of data. The traditional "precision'" (aka "max&#8209;width") value for "%s" printf formatting becomes overloaded since it specifies both the number of bytes that can be safely referenced and the maximum number of columns to emit. xo_emit uses the precision as the former, and adds a third value for specifying the maximum number of columns.</p>
-<p id="doc_section_2_2_4_p_6">In this example, the name field is printed with a minimum of 3 columns and a maximum of 6. Up to ten bytes of data at the location given by 'name' are in used in filling those columns.</p>
-<div id="doc_figure_u.62"></div> <pre>
+	    </pre> <p id="doc_section_2_2_4_p_7">It is important to note that xo_emit will perform the conversion required to make appropriate output. Text style output uses the current locale (as described above), while XML, JSON, and HTML use UTF-8.</p>
+<p id="doc_section_2_2_4_p_8">UTF-8 and locale-encoded strings can use multiple bytes to encode one column of data. The traditional "precision'" (aka "max&#8209;width") value for "%s" printf formatting becomes overloaded since it specifies both the number of bytes that can be safely referenced and the maximum number of columns to emit. xo_emit uses the precision as the former, and adds a third value for specifying the maximum number of columns.</p>
+<p id="doc_section_2_2_4_p_9">In this example, the name field is printed with a minimum of 3 columns and a maximum of 6. Up to ten bytes of data at the location given by 'name' are in used in filling those columns.</p>
+<div id="doc_figure_u.66"></div> <pre>
     xo_emit("{:name/%3.10.6s}", name);
 	    </pre> </div>
 <div class="content">
@@ -23862,7 +23944,7 @@ jQuery(function ($) {
 <a id="characters-outside-of-field-definitions" href="#characters-outside-of-field-definitions">Characters Outside of Field Definitions</a>
 </h3>
 <p id="doc_section_2_2_5_p_1">Characters in the format string that are not part of a field definition are copied to the output for the TEXT style, and are ignored for the JSON and XML styles. For HTML, these characters are placed in a &lt;div&gt; with class "text".</p>
-<div id="doc_figure_u.63"></div> <pre>
+<div id="doc_figure_u.67"></div> <pre>
   EXAMPLE:
       xo_emit("The hat is {:size/%s}.\n", size_val);
   TEXT:
@@ -23883,7 +23965,7 @@ jQuery(function ($) {
 <a id="m-is-supported" href="#m-is-supported">"%m" Is Supported</a>
 </h3>
 <p id="doc_section_2_2_6_p_1">libxo supports the '%m' directive, which formats the error message associated with the current value of "errno". It is the equivalent of "%s" with the argument strerror(errno).</p>
-<div id="doc_figure_u.64"></div> <pre>
+<div id="doc_figure_u.68"></div> <pre>
     xo_emit("{:filename} cannot be opened: {:error/%m}", filename);
     xo_emit("{:filename} cannot be opened: {:error/%s}",
             filename, strerror(errno));
@@ -23930,7 +24012,7 @@ jQuery(function ($) {
 <li>distinct encoding formats, where "{:tag/#%s/%s}" means the display styles (text and HTML) will use "#%s" where other styles use "%s";</li>
 </ul>
 <p id="doc_section_2_2_10_p_5">If none of these features are in use by your code, then using the "_p" variants might be wise.</p>
-<div id="doc_table_u.7"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.8"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Function</th>
 <th class="left">printf-like Equivalent</th>
@@ -23987,14 +24069,71 @@ jQuery(function ($) {
 <h3 id="doc_section_2_2_11">
 <div class="self-section-number">
 <a href="#doc_section_2_2_11">2.2.11</a> </div>
+<a id="retain" href="#retain">Retaining Parsed Format Information</a>
+</h3>
+<p id="doc_section_2_2_11_p_1">libxo can retain the parsed internal information related to the given format string, allowing subsequent xo_emit calls, the retained information is used, avoiding repetitive parsing of the format string.</p>
+<div id="doc_figure_u.69"></div> <pre>
+    SYNTAX:
+      int xo_emit_f(xo_emit_flags_t flags, const char fmt, ...);
+    EXAMPLE:
+      xo_emit_f(XOEF_RETAIN, "{:some/%02d}{:thing/%-6s}{:fancy}\n",
+                     some, thing, fancy);
+	    </pre> <p id="doc_section_2_2_11_p_3">To retain parsed format information, use the XOEF_RETAIN flag to the xo_emit_f() function. A complete set of xo_emit_f functions exist to match all the xo_emit function signatures (with handles, varadic argument, and printf-like flags):</p>
+<div id="doc_table_u.9"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<thead><tr>
+<th class="left">Function</th>
+<th class="left">Flags Equivalent</th>
+</tr></thead>
+<tbody>
+<tr>
+<td>xo_emit_hv</td>
+<td>xo_emit_hvf</td>
+</tr>
+<tr>
+<td>xo_emit_h</td>
+<td>xo_emit_hf</td>
+</tr>
+<tr>
+<td>xo_emit</td>
+<td>xo_emit_f</td>
+</tr>
+<tr>
+<td>xo_emit_hvp</td>
+<td>xo_emit_hvfp</td>
+</tr>
+<tr>
+<td>xo_emit_hp</td>
+<td>xo_emit_hfp</td>
+</tr>
+<tr>
+<td>xo_emit_p</td>
+<td>xo_emit_fp</td>
+</tr>
+</tbody>
+</table></div>
+<p id="doc_section_2_2_11_p_4">The format string must be immutable across multiple calls to xo_emit_f(), since the library retains the string. Typically this is done by using static constant strings, such as string literals. If the string is not immutable, the XOEF_RETAIN flag must not be used.</p>
+<p id="doc_section_2_2_11_p_5">The functions xo_retain_clear() and xo_retain_clear_all() release internal information on either a single format string or all format strings, respectively. Neither is required, but the library will retain this information until it is cleared or the process exits.</p>
+<div id="doc_figure_u.70"></div> <pre>
+    const char *fmt = "{:name}  {:count/%d}\n";
+    for (i = 0; i &lt; 1000; i++) {
+        xo_open_instance("item");
+        xo_emit_f(XOEF_RETAIN, fmt, name[i], count[i]);
+    }
+    xo_retain_clear(fmt);
+	    </pre> <p id="doc_section_2_2_11_p_7">The retained information is kept as thread-specific data.</p>
+</div>
+<div class="content">
+<h3 id="doc_section_2_2_12">
+<div class="self-section-number">
+<a href="#doc_section_2_2_12">2.2.12</a> </div>
 <a id="example" href="#example">Example</a>
 </h3>
-<p id="doc_section_2_2_11_p_1">In this example, the value for the number of items in stock is emitted:</p>
-<div id="doc_figure_u.65"></div> <pre>
+<p id="doc_section_2_2_12_p_1">In this example, the value for the number of items in stock is emitted:</p>
+<div id="doc_figure_u.71"></div> <pre>
         xo_emit("{P:   }{Lwc:In stock}{:in-stock/%u}\n",
                 instock);
-	    </pre> <p id="doc_section_2_2_11_p_3">This call will generate the following output:</p>
-<div id="doc_figure_u.66"></div> <pre>
+	    </pre> <p id="doc_section_2_2_12_p_3">This call will generate the following output:</p>
+<div id="doc_figure_u.72"></div> <pre>
   TEXT: 
        In stock: 144
   XML:
@@ -24009,8 +24148,8 @@ jQuery(function ($) {
         &lt;div class="padding"&gt; &lt;/div&gt;
         &lt;div class="data" data-tag="in-stock"&gt;144&lt;/div&gt;
       &lt;/div&gt;
-	    </pre> <p id="doc_section_2_2_11_p_5">Clearly HTML wins the verbosity award, and this output does not include XOF_XPATH or XOF_INFO data, which would expand the penultimate line to:</p>
-<div id="doc_figure_u.67"></div> <pre>
+	    </pre> <p id="doc_section_2_2_12_p_5">Clearly HTML wins the verbosity award, and this output does not include XOF_XPATH or XOF_INFO data, which would expand the penultimate line to:</p>
+<div id="doc_figure_u.73"></div> <pre>
        &lt;div class="data" data-tag="in-stock"
           data-xpath="/top/data/item/in-stock"
           data-type="number"
@@ -24021,17 +24160,148 @@ jQuery(function ($) {
 <h2 id="doc_section_2_3">
 <div class="self-section-number">
 <a href="#doc_section_2_3">2.3</a> </div>
+<a id="representing-hierarchy" href="#representing-hierarchy">Representing Hierarchy</a>
+</h2>
+<p id="doc_section_2_3_p_1">For XML and JSON, individual fields appear inside hierarchies which provide context and meaning to the fields. Unfortunately, these encoding have a basic disconnect between how lists is similar objects are represented.</p>
+<p id="doc_section_2_3_p_2">XML encodes lists as set of sequential elements:</p>
+<div id="doc_figure_u.74"></div> <pre>
+    &lt;user&gt;phil&lt;/user&gt;
+    &lt;user&gt;pallavi&lt;/user&gt;
+    &lt;user&gt;sjg&lt;/user&gt;
+	    </pre> <p id="doc_section_2_3_p_4">JSON encodes lists using a single name and square brackets:</p>
+<div id="doc_figure_u.75"></div> <pre>
+    "user": [ "phil", "pallavi", "sjg" ]
+	    </pre> <p id="doc_section_2_3_p_6">This means libxo needs three distinct indications of hierarchy: one for containers of hierarchy appear only once for any specific parent, one for lists, and one for each item in a list.</p>
+<p id="doc_section_2_3_p_7">Section Contents: </p>
+<ul>
+<li><a href="#containers" title="Containers">Section 2.3.1</a></li>
+<li><a href="#lists-and-instances" title="Lists and Instances">Section 2.3.2</a></li>
+<li><a href="#dtrt-mode" title="DTRT Mode">Section 2.3.3</a></li>
+<li><a href="#markers" title="Markers">Section 2.3.4</a></li>
+</ul>
+<div class="content">
+<h3 id="doc_section_2_3_1">
+<div class="self-section-number">
+<a href="#doc_section_2_3_1">2.3.1</a> </div>
+<a id="containers" href="#containers">Containers</a>
+</h3>
+<p id="doc_section_2_3_1_p_1">A "container" is an element of a hierarchy that appears only once under any specific parent. The container has no value, but serves to contain other nodes.</p>
+<p id="doc_section_2_3_1_p_2">To open a container, call xo_open_container() or xo_open_container_h(). The former uses the default handle and the latter accepts a specific handle.</p>
+<div id="doc_figure_u.76"></div> <pre>
+    int xo_open_container_h (xo_handle_t *xop, const char *name);
+    int xo_open_container (const char *name);
+	    </pre> <p id="doc_section_2_3_1_p_4">To close a level, use the xo_close_container() or xo_close_container_h() functions:</p>
+<div id="doc_figure_u.77"></div> <pre>
+    int xo_close_container_h (xo_handle_t *xop, const char *name);
+    int xo_close_container (const char *name);
+	    </pre> <p id="doc_section_2_3_1_p_6">Each open call must have a matching close call. If the XOF_WARN flag is set and the name given does not match the name of the currently open container, a warning will be generated.</p>
+<div id="doc_figure_u.78"></div> <pre>
+    Example:
+
+        xo_open_container("top");
+        xo_open_container("system");
+        xo_emit("{:host-name/%s%s%s", hostname,
+                domainname ? "." : "", domainname ?: "");
+        xo_close_container("system");
+        xo_close_container("top");
+
+    Sample Output:
+      Text:
+        my-host.example.org
+      XML:
+        &lt;top&gt;
+          &lt;system&gt;
+              &lt;host-name&gt;my-host.example.org&lt;/host-name&gt;
+          &lt;/system&gt;
+        &lt;/top&gt;
+      JSON:
+        "top" : {
+          "system" : {
+              "host-name": "my-host.example.org"
+          }
+        }
+      HTML:
+        &lt;div class="data"
+             data-tag="host-name"&gt;my-host.example.org&lt;/div&gt;
+	    </pre> </div>
+<div class="content">
+<h3 id="doc_section_2_3_2">
+<div class="self-section-number">
+<a href="#doc_section_2_3_2">2.3.2</a> </div>
+<a id="lists-and-instances" href="#lists-and-instances">Lists and Instances</a>
+</h3>
+<p id="doc_section_2_3_2_p_1">A list is set of one or more instances that appear under the same parent. The instances contain details about a specific object. One can think of instances as objects or records. A call is needed to open and close the list, while a distinct call is needed to open and close each instance of the list:</p>
+<div id="doc_figure_u.79"></div> <pre>
+    xo_open_list("item");
+
+    for (ip = list; ip-&gt;i_title; ip++) {
+        xo_open_instance("item");
+        xo_emit("{L:Item} '{:name/%s}':\n", ip-&gt;i_title);
+        xo_close_instance("item");
+    }
+
+    xo_close_list("item");
+	    </pre> <p id="doc_section_2_3_2_p_3">Getting the list and instance calls correct is critical to the proper generation of XML and JSON data.</p>
+</div>
+<div class="content">
+<h3 id="doc_section_2_3_3">
+<div class="self-section-number">
+<a href="#doc_section_2_3_3">2.3.3</a> </div>
+<a id="dtrt-mode" href="#dtrt-mode">DTRT Mode</a>
+</h3>
+<p id="doc_section_2_3_3_p_1">Some users may find tracking the names of open containers, lists, and instances inconvenient. libxo offers a "Do The Right Thing" mode, where libxo will track the names of open containers, lists, and instances so the close function can be called without a name. To enable DTRT mode, turn on the XOF_DTRT flag prior to making any other libxo output.</p>
+<div id="doc_figure_u.80"></div> <pre>
+    xo_set_flags(NULL, XOF_DTRT);
+	    </pre> <p id="doc_section_2_3_3_p_3">Each open and close function has a version with the suffix "_d", which will close the open container, list, or instance:</p>
+<div id="doc_figure_u.81"></div> <pre>
+    xo_open_container("top");
+    ...
+    xo_close_container_d();
+	    </pre> <p id="doc_section_2_3_3_p_5">This also works for lists and instances:</p>
+<div id="doc_figure_u.82"></div> <pre>
+    xo_open_list("item");
+    for (...) {
+        xo_open_instance("item");
+        xo_emit(...);
+        xo_close_instance_d();
+    }
+    xo_close_list_d();
+	    </pre> <p id="doc_section_2_3_3_p_7">Note that the XOF_WARN flag will also cause libxo to track open containers, lists, and instances. A warning is generated when the name given to the close function and the name recorded do not match.</p>
+</div>
+<div class="content">
+<h3 id="doc_section_2_3_4">
+<div class="self-section-number">
+<a href="#doc_section_2_3_4">2.3.4</a> </div>
+<a id="markers" href="#markers">Markers</a>
+</h3>
+<p id="doc_section_2_3_4_p_1">Markers are used to protect and restore the state of open constructs. While a marker is open, no other open constructs can be closed. When a marker is closed, all constructs open since the marker was opened will be closed.</p>
+<p id="doc_section_2_3_4_p_2">Markers use names which are not user-visible, allowing the caller to choose appropriate internal names.</p>
+<p id="doc_section_2_3_4_p_3">In this example, the code whiffles through a list of fish, calling a function to emit details about each fish. The marker "fish&#8209;guts" is used to ensure that any constructs opened by the function are closed properly.</p>
+<div id="doc_figure_u.83"></div> <pre>
+    for (i = 0; fish[i]; i++) {
+        xo_open_instance("fish");
+        xo_open_marker("fish-guts");
+        dump_fish_details(i);
+        xo_close_marker("fish-guts");
+    }
+	    </pre> </div>
+</div>
+<div class="content">
+<h2 id="doc_section_2_4">
+<div class="self-section-number">
+<a href="#doc_section_2_4">2.4</a> </div>
 <a id="command-line-arguments" href="#command-line-arguments">Command-line Arguments</a>
 </h2>
-<p id="doc_section_2_3_p_1">libxo uses command line options to trigger rendering behavior. The following options are recognised:</p>
-<p id="doc_section_2_3_p_2"> </p>
+<p id="doc_section_2_4_p_1">libxo uses command line options to trigger rendering behavior. The following options are recognised:</p>
+<p id="doc_section_2_4_p_2"> </p>
 <ul>
 <li>--libxo &lt;options&gt;</li>
 <li>--libxo=&lt;options&gt;</li>
 <li>--libxo:&lt;brief&#8209;options&gt;</li>
 </ul>
-<p id="doc_section_2_3_p_3">Options is a comma-separated list of tokens that correspond to output styles, flags, or features:</p>
-<div id="doc_table_u.8"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<p id="doc_section_2_4_p_3">Programs using libxo are expecting to call the xo_parse_args function to parse these arguments. See <a href="#xo_parse_args" title="Parsing Command-line Arguments (xo_parse_args)">Section 3.4.1</a> for details.</p>
+<p id="doc_section_2_4_p_4">Options is a comma-separated list of tokens that correspond to output styles, flags, or features:</p>
+<div id="doc_table_u.10"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Token</th>
 <th class="left">Action</th>
@@ -24082,6 +24352,10 @@ jQuery(function ($) {
 <td>Do not initialize the locale setting</td>
 </tr>
 <tr>
+<td>no-retain</td>
+<td>Prevent retaining formatting information</td>
+</tr>
+<tr>
 <td>no-top</td>
 <td>Do not emit a top set of braces (JSON)</td>
 </tr>
@@ -24094,6 +24368,10 @@ jQuery(function ($) {
 <td>Emit pretty-printed output</td>
 </tr>
 <tr>
+<td>retain</td>
+<td>Force retaining formatting information</td>
+</tr>
+<tr>
 <td>text</td>
 <td>Emit TEXT output</td>
 </tr>
@@ -24123,165 +24401,7 @@ jQuery(function ($) {
 </tr>
 </tbody>
 </table></div>
-<p id="doc_section_2_3_p_4">The brief options are detailed in <a href="#LIBXO_OPTIONS" title="LIBXO_OPTIONS">Section 3.4.6</a>.</p>
-</div>
-<div class="content">
-<h2 id="doc_section_2_4">
-<div class="self-section-number">
-<a href="#doc_section_2_4">2.4</a> </div>
-<a id="representing-hierarchy" href="#representing-hierarchy">Representing Hierarchy</a>
-</h2>
-<p id="doc_section_2_4_p_1">For XML and JSON, individual fields appear inside hierarchies which provide context and meaning to the fields. Unfortunately, these encoding have a basic disconnect between how lists is similar objects are represented.</p>
-<p id="doc_section_2_4_p_2">XML encodes lists as set of sequential elements:</p>
-<div id="doc_figure_u.68"></div> <pre>
-    &lt;user&gt;phil&lt;/user&gt;
-    &lt;user&gt;pallavi&lt;/user&gt;
-    &lt;user&gt;sjg&lt;/user&gt;
-	    </pre> <p id="doc_section_2_4_p_4">JSON encodes lists using a single name and square brackets:</p>
-<div id="doc_figure_u.69"></div> <pre>
-    "user": [ "phil", "pallavi", "sjg" ]
-	    </pre> <p id="doc_section_2_4_p_6">This means libxo needs three distinct indications of hierarchy: one for containers of hierarchy appear only once for any specific parent, one for lists, and one for each item in a list.</p>
-<p id="doc_section_2_4_p_7">Section Contents: </p>
-<ul>
-<li><a href="#containers" title="Containers">Section 2.4.1</a></li>
-<li><a href="#lists-and-instances" title="Lists and Instances">Section 2.4.2</a></li>
-<li><a href="#dtrt-mode" title="DTRT Mode">Section 2.4.3</a></li>
-<li><a href="#markers" title="Markers">Section 2.4.4</a></li>
-</ul>
-<div class="content">
-<h3 id="doc_section_2_4_1">
-<div class="self-section-number">
-<a href="#doc_section_2_4_1">2.4.1</a> </div>
-<a id="containers" href="#containers">Containers</a>
-</h3>
-<p id="doc_section_2_4_1_p_1">A "container" is an element of a hierarchy that appears only once under any specific parent. The container has no value, but serves to contain other nodes.</p>
-<p id="doc_section_2_4_1_p_2">To open a container, call xo_open_container() or xo_open_container_h(). The former uses the default handle and the latter accepts a specific handle.</p>
-<div id="doc_figure_u.70"></div> <pre>
-    int xo_open_container_h (xo_handle_t *xop, const char *name);
-    int xo_open_container (const char *name);
-	    </pre> <p id="doc_section_2_4_1_p_4">To close a level, use the xo_close_container() or xo_close_container_h() functions:</p>
-<div id="doc_figure_u.71"></div> <pre>
-    int xo_close_container_h (xo_handle_t *xop, const char *name);
-    int xo_close_container (const char *name);
-	    </pre> <p id="doc_section_2_4_1_p_6">Each open call must have a matching close call. If the XOF_WARN flag is set and the name given does not match the name of the currently open container, a warning will be generated.</p>
-<div id="doc_figure_u.72"></div> <pre>
-    Example:
-
-        xo_open_container("top");
-        xo_open_container("system");
-        xo_emit("{:host-name/%s%s%s", hostname,
-                domainname ? "." : "", domainname ?: "");
-        xo_close_container("system");
-        xo_close_container("top");
-
-    Sample Output:
-      Text:
-        my-host.example.org
-      XML:
-        &lt;top&gt;
-          &lt;system&gt;
-              &lt;host-name&gt;my-host.example.org&lt;/host-name&gt;
-          &lt;/system&gt;
-        &lt;/top&gt;
-      JSON:
-        "top" : {
-          "system" : {
-              "host-name": "my-host.example.org"
-          }
-        }
-      HTML:
-        &lt;div class="data"
-             data-tag="host-name"&gt;my-host.example.org&lt;/div&gt;
-	    </pre> </div>
-<div class="content">
-<h3 id="doc_section_2_4_2">
-<div class="self-section-number">
-<a href="#doc_section_2_4_2">2.4.2</a> </div>
-<a id="lists-and-instances" href="#lists-and-instances">Lists and Instances</a>
-</h3>
-<p id="doc_section_2_4_2_p_1">A list is set of one or more instances that appear under the same parent. The instances contain details about a specific object. One can think of instances as objects or records. A call is needed to open and close the list, while a distinct call is needed to open and close each instance of the list:</p>
-<div id="doc_figure_u.73"></div> <pre>
-    xo_open_list("item");
-
-    for (ip = list; ip-&gt;i_title; ip++) {
-        xo_open_instance("item");
-        xo_emit("{L:Item} '{:name/%s}':\n", ip-&gt;i_title);
-        xo_close_instance("item");
-    }
-
-    xo_close_list("item");
-	    </pre> <p id="doc_section_2_4_2_p_3">Getting the list and instance calls correct is critical to the proper generation of XML and JSON data.</p>
-</div>
-<div class="content">
-<h3 id="doc_section_2_4_3">
-<div class="self-section-number">
-<a href="#doc_section_2_4_3">2.4.3</a> </div>
-<a id="dtrt-mode" href="#dtrt-mode">DTRT Mode</a>
-</h3>
-<p id="doc_section_2_4_3_p_1">Some users may find tracking the names of open containers, lists, and instances inconvenient. libxo offers a "Do The Right Thing" mode, where libxo will track the names of open containers, lists, and instances so the close function can be called without a name. To enable DTRT mode, turn on the XOF_DTRT flag prior to making any other libxo output.</p>
-<div id="doc_figure_u.74"></div> <pre>
-    xo_set_flags(NULL, XOF_DTRT);
-	    </pre> <p id="doc_section_2_4_3_p_3">Each open and close function has a version with the suffix "_d", which will close the open container, list, or instance:</p>
-<div id="doc_figure_u.75"></div> <pre>
-    xo_open_container("top");
-    ...
-    xo_close_container_d();
-	    </pre> <p id="doc_section_2_4_3_p_5">This also works for lists and instances:</p>
-<div id="doc_figure_u.76"></div> <pre>
-    xo_open_list("item");
-    for (...) {
-        xo_open_instance("item");
-        xo_emit(...);
-        xo_close_instance_d();
-    }
-    xo_close_list_d();
-	    </pre> <p id="doc_section_2_4_3_p_7">Note that the XOF_WARN flag will also cause libxo to track open containers, lists, and instances. A warning is generated when the name given to the close function and the name recorded do not match.</p>
-</div>
-<div class="content">
-<h3 id="doc_section_2_4_4">
-<div class="self-section-number">
-<a href="#doc_section_2_4_4">2.4.4</a> </div>
-<a id="markers" href="#markers">Markers</a>
-</h3>
-<p id="doc_section_2_4_4_p_1">Markers are used to protect and restore the state of open constructs. While a marker is open, no other open constructs can be closed. When a marker is closed, all constructs open since the marker was opened will be closed.</p>
-<p id="doc_section_2_4_4_p_2">Markers use names which are not user-visible, allowing the caller to choose appropriate internal names.</p>
-<p id="doc_section_2_4_4_p_3">In this example, the code whiffles through a list of fish, calling a function to emit details about each fish. The marker "fish&#8209;guts" is used to ensure that any constructs opened by the function are closed properly.</p>
-<div id="doc_figure_u.77"></div> <pre>
-    for (i = 0; fish[i]; i++) {
-        xo_open_instance("fish");
-        xo_open_marker("fish-guts");
-        dump_fish_details(i);
-        xo_close_marker("fish-guts");
-    }
-	    </pre> </div>
-</div>
-<div class="content">
-<h2 id="doc_section_2_5">
-<div class="self-section-number">
-<a href="#doc_section_2_5">2.5</a> </div>
-<a id="handles" href="#handles">Handles</a>
-</h2>
-<p id="doc_section_2_5_p_1">libxo uses "handles" to control its rendering functionality. The handle contains state and buffered data, as well as callback functions to process data.</p>
-<p id="doc_section_2_5_p_2">A default handle is used when a NULL is passed to functions accepting a handle. This handle is initialized to write its data to stdout using the default style of text (XO_STYLE_TEXT).</p>
-<p id="doc_section_2_5_p_3">For the convenience of callers, the libxo library includes handle-less functions that implicitly use the default handle. Any function that takes a handle will use the default handle is a value of NULL is passed in place of a valid handle.</p>
-<p id="doc_section_2_5_p_4">For example, the following are equivalent:</p>
-<div id="doc_figure_u.78"></div> <pre>
-    xo_emit("test");
-    xo_emit_h(NULL, "test");
-	    </pre> <p id="doc_section_2_5_p_6">Handles are created using xo_create() and destroy using xo_destroy().</p>
-</div>
-<div class="content">
-<h2 id="doc_section_2_6">
-<div class="self-section-number">
-<a href="#doc_section_2_6">2.6</a> </div>
-<a id="utf-8" href="#utf-8">UTF-8</a>
-</h2>
-<p id="doc_section_2_6_p_1">All strings for libxo must be UTF-8. libxo will handle turning them into locale-based strings for display to the user.</p>
-<p id="doc_section_2_6_p_2">The only exception is argument formatted using the "%ls" format, which require a wide character string (wchar_t *) as input. libxo will convert these arguments as needed to either UTF-8 (for XML, JSON, and HTML styles) or locale-based strings for display in text style.</p>
-<div id="doc_figure_u.79"></div> <pre>
-   xo_emit("Alll strings are utf-8 content {:tag/%ls}",
-           L"except for wide strings");
-	    </pre> <p id="doc_section_2_6_p_4">"%S" is equivalent to "%ls".</p>
+<p id="doc_section_2_4_p_5">The brief options are detailed in <a href="#LIBXO_OPTIONS" title="LIBXO_OPTIONS">Section 3.4.6</a>.</p>
 </div>
 </div>
 <hr class="noprint">
@@ -24294,7 +24414,7 @@ jQuery(function ($) {
 <p id="doc_section_3_p_1">This section gives details about the functions in libxo, how to call them, and the actions they perform.</p>
 <p id="doc_section_3_p_2">Section Contents: </p>
 <ul>
-<li><a href="#handles-2" title="Handles">Section 3.1</a></li>
+<li><a href="#handles" title="Handles">Section 3.1</a></li>
 <li><a href="#emitting-content-xo_emit" title="Emitting Content (xo_emit)">Section 3.2</a></li>
 <li><a href="#emitting-hierarchy" title="Emitting Hierarchy">Section 3.3</a></li>
 <li><a href="#support-functions" title="Support Functions">Section 3.4</a></li>
@@ -24305,13 +24425,19 @@ jQuery(function ($) {
 <h2 id="doc_section_3_1">
 <div class="self-section-number">
 <a href="#doc_section_3_1">3.1</a> </div>
-<a id="handles-2" href="#handles-2">Handles</a>
+<a id="handles" href="#handles">Handles</a>
 </h2>
-<p id="doc_section_3_1_p_1">Handles give an abstraction for libxo that encapsulates the state of a stream of output. Handles have the data type "xo_handle_t" and are opaque to the caller.</p>
-<p id="doc_section_3_1_p_2">The library has a default handle that is automatically initialized. By default, this handle will send text style output to standard output. The xo_set_style and xo_set_flags functions can be used to change this behavior.</p>
-<p id="doc_section_3_1_p_3">Many libxo functions take a handle as their first parameter; most that do not use the default handle. Any function taking a handle can be passed NULL to access the default handle.</p>
+<p id="doc_section_3_1_p_1">libxo uses "handles" to control its rendering functionality. The handle contains state and buffered data, as well as callback functions to process data.</p>
+<p id="doc_section_3_1_p_2">Handles give an abstraction for libxo that encapsulates the state of a stream of output. Handles have the data type "xo_handle_t" and are opaque to the caller.</p>
+<p id="doc_section_3_1_p_3">The library has a default handle that is automatically initialized. By default, this handle will send text style output (XO_STYLE_TEXT) to standard output. The xo_set_style and xo_set_flags functions can be used to change this behavior.</p>
 <p id="doc_section_3_1_p_4">For the typical command that is generating output on standard output, there is no need to create an explicit handle, but they are available when needed, e.g., for daemons that generate multiple streams of output.</p>
-<p id="doc_section_3_1_p_5">Section Contents: </p>
+<p id="doc_section_3_1_p_5">Many libxo functions take a handle as their first parameter; most that do not use the default handle. Any function taking a handle can be passed NULL to access the default handle. For the convenience of callers, the libxo library includes handle-less functions that implicitly use the default handle.</p>
+<p id="doc_section_3_1_p_6">For example, the following are equivalent:</p>
+<div id="doc_figure_u.84"></div> <pre>
+    xo_emit("test");
+    xo_emit_h(NULL, "test");
+	    </pre> <p id="doc_section_3_1_p_8">Handles are created using xo_create() and destroy using xo_destroy().</p>
+<p id="doc_section_3_1_p_9">Section Contents: </p>
 <ul>
 <li><a href="#xo_create" title="xo_create">Section 3.1.1</a></li>
 <li><a href="#xo_create_to_file" title="xo_create_to_file">Section 3.1.2</a></li>
@@ -24327,7 +24453,7 @@ jQuery(function ($) {
 <a id="xo_create" href="#xo_create">xo_create</a>
 </h3>
 <p id="doc_section_3_1_1_p_1">A handle can be allocated using the xo_create() function:</p>
-<div id="doc_figure_u.80"></div> <pre>
+<div id="doc_figure_u.85"></div> <pre>
     xo_handle_t *xo_create (unsigned style, unsigned flags);
 
   Example:
@@ -24343,7 +24469,7 @@ jQuery(function ($) {
 <a id="xo_create_to_file" href="#xo_create_to_file">xo_create_to_file</a>
 </h3>
 <p id="doc_section_3_1_2_p_1">By default, libxo writes output to standard output. A convenience function is provided for situations when output should be written to a different file:</p>
-<div id="doc_figure_u.81"></div> <pre>
+<div id="doc_figure_u.86"></div> <pre>
     xo_handle_t *xo_create_to_file (FILE *fp, unsigned style,
                                     unsigned flags);
 	    </pre> <p id="doc_section_3_1_2_p_3">Use the XOF_CLOSE_FP flag to trigger a call to fclose() for the FILE pointer when the handle is destroyed.</p>
@@ -24355,7 +24481,7 @@ jQuery(function ($) {
 <a id="xo_set_writer" href="#xo_set_writer">xo_set_writer</a>
 </h3>
 <p id="doc_section_3_1_3_p_1">The xo_set_writer function allows custom 'write' functions which can tailor how libxo writes data. An opaque argument is recorded and passed back to the write function, allowing the function to acquire context information. The 'close' function can release this opaque data and any other resources as needed. The flush function can flush buffered data associated with the opaque object.</p>
-<div id="doc_figure_u.82"></div> <pre>
+<div id="doc_figure_u.87"></div> <pre>
     void xo_set_writer (xo_handle_t *xop, void *opaque,
                         xo_write_func_t write_func,
                         xo_close_func_t close_func);
@@ -24368,10 +24494,10 @@ jQuery(function ($) {
 <a id="xo_set_style" href="#xo_set_style">xo_set_style</a>
 </h3>
 <p id="doc_section_3_1_4_p_1">To set the style, use the xo_set_style() function:</p>
-<div id="doc_figure_u.83"></div> <pre>
+<div id="doc_figure_u.88"></div> <pre>
     void xo_set_style(xo_handle_t *xop, unsigned style);
 	    </pre> <p id="doc_section_3_1_4_p_3">To use the default handle, pass a NULL handle:</p>
-<div id="doc_figure_u.84"></div> <pre>
+<div id="doc_figure_u.89"></div> <pre>
     xo_set_style(NULL, XO_STYLE_XML);
 	    </pre> <p id="doc_section_3_1_4_p_5">Section Contents: </p>
 <ul>
@@ -24385,7 +24511,7 @@ jQuery(function ($) {
 <a id="styles" href="#styles">Output Styles (XO_STYLE_*)</a>
 </h4>
 <p id="doc_section_3_1_4_1_p_1">The libxo functions accept a set of output styles:</p>
-<div id="doc_table_u.9"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.11"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Flag</th>
 <th class="left">Description</th>
@@ -24417,10 +24543,10 @@ jQuery(function ($) {
 <a id="xo_set_style_name" href="#xo_set_style_name">xo_set_style_name</a>
 </h4>
 <p id="doc_section_3_1_4_2_p_1">The xo_set_style_name() can be used to set the style based on a name encoded as a string:</p>
-<div id="doc_figure_u.85"></div> <pre>
+<div id="doc_figure_u.90"></div> <pre>
     int xo_set_style_name (xo_handle_t *xop, const char *style);
 	    </pre> <p id="doc_section_3_1_4_2_p_3">The name can be any of the styles: "text", "xml", "json", or "html".</p>
-<div id="doc_figure_u.86"></div> <pre>
+<div id="doc_figure_u.91"></div> <pre>
     EXAMPLE:
         xo_set_style_name(NULL, "html");
 	    </pre> </div>
@@ -24432,10 +24558,10 @@ jQuery(function ($) {
 <a id="xo_set_flags" href="#xo_set_flags">xo_set_flags</a>
 </h3>
 <p id="doc_section_3_1_5_p_1">To set the flags, use the xo_set_flags() function:</p>
-<div id="doc_figure_u.87"></div> <pre>
+<div id="doc_figure_u.92"></div> <pre>
     void xo_set_flags(xo_handle_t *xop, unsigned flags);
 	    </pre> <p id="doc_section_3_1_5_p_3">To use the default handle, pass a NULL handle:</p>
-<div id="doc_figure_u.88"></div> <pre>
+<div id="doc_figure_u.93"></div> <pre>
     xo_set_style(NULL, XO_STYLE_XML);
 	    </pre> <p id="doc_section_3_1_5_p_5">Section Contents: </p>
 <ul>
@@ -24450,7 +24576,7 @@ jQuery(function ($) {
 <a id="flags" href="#flags">Flags (XOF_*)</a>
 </h4>
 <p id="doc_section_3_1_5_1_p_1">The set of valid flags include:</p>
-<div id="doc_table_u.10"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.12"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Flag</th>
 <th class="left">Description</th>
@@ -24528,7 +24654,7 @@ jQuery(function ($) {
 <p id="doc_section_3_1_5_1_p_5">The XOF_WARN flag requests that warnings will trigger diagnostic output (on standard error) when the library notices errors during operations, or with arguments to functions. Without warnings enabled, such conditions are ignored.</p>
 <p id="doc_section_3_1_5_1_p_6">Warnings allow developers to debug their interaction with libxo. The function "xo_failure" can used as a breakpoint for a debugger, regardless of whether warnings are enabled.</p>
 <p id="doc_section_3_1_5_1_p_7">If the style is XO_STYLE_HTML, the following additional flags can be used:</p>
-<div id="doc_table_u.11"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.13"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Flag</th>
 <th class="left">Description</th>
@@ -24547,7 +24673,7 @@ jQuery(function ($) {
 <p id="doc_section_3_1_5_1_p_8">The XOF_XPATH flag enables the emission of XPath expressions detailing the hierarchy of XML elements used to encode the data field, if the XPATH style of output were requested.</p>
 <p id="doc_section_3_1_5_1_p_9">The XOF_INFO flag encodes additional informational fields for HTML output. See <a href="#info" title="Field Information (xo_info_t)">Section 3.4.4</a> for details.</p>
 <p id="doc_section_3_1_5_1_p_10">If the style is XO_STYLE_XML, the following additional flags can be used:</p>
-<div id="doc_table_u.12"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.14"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Flag</th>
 <th class="left">Description</th>
@@ -24558,7 +24684,7 @@ jQuery(function ($) {
 </tr></tbody>
 </table></div>
 <p id="doc_section_3_1_5_1_p_11">The XOF_KEYS flag adds 'key' attribute to the XML encoding for field definitions that use the 'k' modifier. The key attribute has the value "key":</p>
-<div id="doc_figure_u.89"></div> <pre>
+<div id="doc_figure_u.94"></div> <pre>
     xo_emit("{k:name}", item);
 
   XML:
@@ -24571,7 +24697,7 @@ jQuery(function ($) {
 <a id="xo_clear_flags" href="#xo_clear_flags">xo_clear_flags</a>
 </h4>
 <p id="doc_section_3_1_5_2_p_1">The xo_clear_flags() function turns off the given flags in a specific handle.</p>
-<div id="doc_figure_u.90"></div> <pre>
+<div id="doc_figure_u.95"></div> <pre>
     void xo_clear_flags (xo_handle_t *xop, xo_xof_flags_t flags);
 	    </pre> </div>
 <div class="content">
@@ -24581,9 +24707,9 @@ jQuery(function ($) {
 <a id="xo_set_options" href="#xo_set_options">xo_set_options</a>
 </h4>
 <p id="doc_section_3_1_5_3_p_1">The xo_set_options() function accepts a comma-separated list of styles and flags and enables them for a specific handle.</p>
-<div id="doc_figure_u.91"></div> <pre>
+<div id="doc_figure_u.96"></div> <pre>
     int xo_set_options (xo_handle_t *xop, const char *input);
-	    </pre> <p id="doc_section_3_1_5_3_p_3">The options are identical to those listed in <a href="#command-line-arguments" title="Command-line Arguments">Section 2.3</a>.</p>
+	    </pre> <p id="doc_section_3_1_5_3_p_3">The options are identical to those listed in <a href="#command-line-arguments" title="Command-line Arguments">Section 2.4</a>.</p>
 </div>
 </div>
 <div class="content">
@@ -24593,7 +24719,7 @@ jQuery(function ($) {
 <a id="xo_destroy" href="#xo_destroy">xo_destroy</a>
 </h3>
 <p id="doc_section_3_1_6_p_1">The xo_destroy function releases a handle and any resources it is using. Calling xo_destroy with a NULL handle will release any resources associated with the default handle.</p>
-<div id="doc_figure_u.92"></div> <pre>
+<div id="doc_figure_u.97"></div> <pre>
     void xo_destroy(xo_handle_t *xop);
 	    </pre> </div>
 </div>
@@ -24604,33 +24730,57 @@ jQuery(function ($) {
 <a id="emitting-content-xo_emit" href="#emitting-content-xo_emit">Emitting Content (xo_emit)</a>
 </h2>
 <p id="doc_section_3_2_p_1">The following functions are used to emit output:</p>
-<div id="doc_figure_u.93"></div> <pre>
+<div id="doc_figure_u.98"></div> <pre>
     int xo_emit (const char *fmt, ...);
     int xo_emit_h (xo_handle_t *xop, const char *fmt, ...);
     int xo_emit_hv (xo_handle_t *xop, const char *fmt, va_list vap);
-	    </pre> <p id="doc_section_3_2_p_3">The "fmt" argument is a string containing field descriptors as specified in <a href="#format-strings" title="Format Strings">Section 2.2</a>. The use of a handle is optional and NULL can be passed to access the internal 'default' handle. See <a href="#handles" title="Handles">Section 2.5</a>.</p>
+	    </pre> <p id="doc_section_3_2_p_3">The "fmt" argument is a string containing field descriptors as specified in <a href="#format-strings" title="Format Strings">Section 2.2</a>. The use of a handle is optional and NULL can be passed to access the internal 'default' handle. See <a href="#handles" title="Handles">Section 3.1</a>.</p>
 <p id="doc_section_3_2_p_4">The remaining arguments to xo_emit() and xo_emit_h() are a set of arguments corresponding to the fields in the format string. Care must be taken to ensure the argument types match the fields in the format string, since an inappropriate cast can ruin your day. The vap argument to xo_emit_hv() points to a variable argument list that can be used to retrieve arguments via va_arg().</p>
 <p id="doc_section_3_2_p_5">Section Contents: </p>
 <ul>
-<li><a href="#xo_attr" title="Attributes (xo_attr)">Section 3.2.1</a></li>
-<li><a href="#flushing-output-xo_flush" title="Flushing Output (xo_flush)">Section 3.2.2</a></li>
-<li><a href="#finishing-output-xo_finish" title="Finishing Output (xo_finish)">Section 3.2.3</a></li>
+<li><a href="#xo_emit_field" title="Single Field Emitting Functions (xo_emit_field)">Section 3.2.1</a></li>
+<li><a href="#xo_attr" title="Attributes (xo_attr)">Section 3.2.2</a></li>
+<li><a href="#flushing-output-xo_flush" title="Flushing Output (xo_flush)">Section 3.2.3</a></li>
+<li><a href="#finishing-output-xo_finish" title="Finishing Output (xo_finish)">Section 3.2.4</a></li>
 </ul>
 <div class="content">
 <h3 id="doc_section_3_2_1">
 <div class="self-section-number">
 <a href="#doc_section_3_2_1">3.2.1</a> </div>
+<a id="xo_emit_field" href="#xo_emit_field">Single Field Emitting Functions (xo_emit_field)</a>
+</h3>
+<p id="doc_section_3_2_1_p_1">The following functions can also make output, but only make a single field at a time:</p>
+<div id="doc_figure_u.99"></div> <pre>
+    int xo_emit_field_hv (xo_handle_t *xop, const char *rolmod,
+                  const char *contents, const char *fmt, 
+                  const char *efmt, va_list vap);
+
+    int xo_emit_field_h (xo_handle_t *xop, const char *rolmod, 
+                 const char *contents, const char *fmt,
+                 const char *efmt, ...);
+
+    int xo_emit_field (const char *rolmod, const char *contents,
+                 const char *fmt, const char *efmt, ...);
+	    </pre> <p id="doc_section_3_2_1_p_3">These functions are intended to avoid the scenario where one would otherwise need to compose a format descriptors using snprintf(). The individual parts of the format descriptor are passed in distinctly.</p>
+<div id="doc_figure_u.100"></div> <pre>
+    xo_emit("T", "Host name is ", NULL, NULL);
+    xo_emit("V", "host-name", NULL, NULL, host-name);
+	    </pre> </div>
+<div class="content">
+<h3 id="doc_section_3_2_2">
+<div class="self-section-number">
+<a href="#doc_section_3_2_2">3.2.2</a> </div>
 <a id="xo_attr" href="#xo_attr">Attributes (xo_attr)</a>
 </h3>
-<p id="doc_section_3_2_1_p_1">The xo_attr() function emits attributes for the XML output style.</p>
-<div id="doc_figure_u.94"></div> <pre>
+<p id="doc_section_3_2_2_p_1">The xo_attr() function emits attributes for the XML output style.</p>
+<div id="doc_figure_u.101"></div> <pre>
     int xo_attr (const char *name, const char *fmt, ...);
     int xo_attr_h (xo_handle_t *xop, const char *name, 
                    const char *fmt, ...);
     int xo_attr_hv (xo_handle_t *xop, const char *name, 
                    const char *fmt, va_list vap);
-	    </pre> <p id="doc_section_3_2_1_p_3">The name parameter give the name of the attribute to be encoded. The fmt parameter gives a printf-style format string used to format the value of the attribute using any remaining arguments, or the vap parameter passed to xo_attr_hv().</p>
-<div id="doc_figure_u.95"></div> <pre>
+	    </pre> <p id="doc_section_3_2_2_p_3">The name parameter give the name of the attribute to be encoded. The fmt parameter gives a printf-style format string used to format the value of the attribute using any remaining arguments, or the vap parameter passed to xo_attr_hv().</p>
+<div id="doc_figure_u.102"></div> <pre>
     EXAMPLE:
       xo_attr("seconds", "%ld", (unsigned long) login_time);
       struct tm *tmp = localtime(login_time);
@@ -24638,34 +24788,34 @@ jQuery(function ($) {
       xo_emit("Logged in at {:login-time}\n", buf);
     XML:
         &lt;login-time seconds="1408336270"&gt;00:14&lt;/login-time&gt;
-	    </pre> <p id="doc_section_3_2_1_p_5">xo_attr is placed on the next container, instance, leaf, or leaf list that is emitted.</p>
-<p id="doc_section_3_2_1_p_6">Since attributes are only emitted in XML, their use should be limited to meta-data and additional or redundant representations of data already emitted in other form.</p>
+	    </pre> <p id="doc_section_3_2_2_p_5">xo_attr is placed on the next container, instance, leaf, or leaf list that is emitted.</p>
+<p id="doc_section_3_2_2_p_6">Since attributes are only emitted in XML, their use should be limited to meta-data and additional or redundant representations of data already emitted in other form.</p>
 </div>
 <div class="content">
-<h3 id="doc_section_3_2_2">
+<h3 id="doc_section_3_2_3">
 <div class="self-section-number">
-<a href="#doc_section_3_2_2">3.2.2</a> </div>
+<a href="#doc_section_3_2_3">3.2.3</a> </div>
 <a id="flushing-output-xo_flush" href="#flushing-output-xo_flush">Flushing Output (xo_flush)</a>
 </h3>
-<p id="doc_section_3_2_2_p_1">libxo buffers data, both for performance and consistency, but also to allow some advanced features to work properly. At various times, the caller may wish to flush any data buffered within the library. The xo_flush() call is used for this:</p>
-<div id="doc_figure_u.96"></div> <pre>
+<p id="doc_section_3_2_3_p_1">libxo buffers data, both for performance and consistency, but also to allow some advanced features to work properly. At various times, the caller may wish to flush any data buffered within the library. The xo_flush() call is used for this:</p>
+<div id="doc_figure_u.103"></div> <pre>
     void xo_flush (void);
     void xo_flush_h (xo_handle_t *xop);
-	    </pre> <p id="doc_section_3_2_2_p_3">Calling xo_flush also triggers the flush function associated with the handle. For the default handle, this is equivalent to "fflush(stdio);".</p>
+	    </pre> <p id="doc_section_3_2_3_p_3">Calling xo_flush also triggers the flush function associated with the handle. For the default handle, this is equivalent to "fflush(stdio);".</p>
 </div>
 <div class="content">
-<h3 id="doc_section_3_2_3">
+<h3 id="doc_section_3_2_4">
 <div class="self-section-number">
-<a href="#doc_section_3_2_3">3.2.3</a> </div>
+<a href="#doc_section_3_2_4">3.2.4</a> </div>
 <a id="finishing-output-xo_finish" href="#finishing-output-xo_finish">Finishing Output (xo_finish)</a>
 </h3>
-<p id="doc_section_3_2_3_p_1">When the program is ready to exit or close a handle, a call to xo_finish() is required. This flushes any buffered data, closes open libxo constructs, and completes any pending operations.</p>
-<div id="doc_figure_u.97"></div> <pre>
+<p id="doc_section_3_2_4_p_1">When the program is ready to exit or close a handle, a call to xo_finish() is required. This flushes any buffered data, closes open libxo constructs, and completes any pending operations.</p>
+<div id="doc_figure_u.104"></div> <pre>
     int xo_finish (void);
     int xo_finish_h (xo_handle_t *xop);
     void xo_finish_atexit (void);
-	    </pre> <p id="doc_section_3_2_3_p_3">Calling this function is vital to the proper operation of libxo, especially for the non-TEXT output styles.</p>
-<p id="doc_section_3_2_3_p_4">xo_finish_atexit is suitable for use with atexit(3).</p>
+	    </pre> <p id="doc_section_3_2_4_p_3">Calling this function is vital to the proper operation of libxo, especially for the non-TEXT output styles.</p>
+<p id="doc_section_3_2_4_p_4">xo_finish_atexit is suitable for use with atexit(3).</p>
 </div>
 </div>
 <div class="content">
@@ -24676,7 +24826,7 @@ jQuery(function ($) {
 </h2>
 <p id="doc_section_3_3_p_1">libxo represents to types of hierarchy: containers and lists. A container appears once under a given parent where a list contains instances that can appear multiple times. A container is used to hold related fields and to give the data organization and scope.</p>
 <p id="doc_section_3_3_p_2">To create a container, use the xo_open_container and xo_close_container functions:</p>
-<div id="doc_figure_u.98"></div> <pre>
+<div id="doc_figure_u.105"></div> <pre>
     int xo_open_container (const char *name);
     int xo_open_container_h (xo_handle_t *xop, const char *name);
     int xo_open_container_hd (xo_handle_t *xop, const char *name);
@@ -24690,7 +24840,7 @@ jQuery(function ($) {
 <p id="doc_section_3_3_p_5">The close functions with the "_d" suffix are used in "Do The Right Thing" mode, where the name of the open containers, lists, and instances are maintained internally by libxo to allow the caller to avoid keeping track of the open container name.</p>
 <p id="doc_section_3_3_p_6">Use the XOF_WARN flag to generate a warning if the name given on the close does not match the current open container.</p>
 <p id="doc_section_3_3_p_7">For TEXT and HTML output, containers are not rendered into output text, though for HTML they are used when the XOF_XPATH flag is set.</p>
-<div id="doc_figure_u.99"></div> <pre>
+<div id="doc_figure_u.106"></div> <pre>
     EXAMPLE:
        xo_open_container("system");
        xo_emit("The host name is {:host-name}\n", hn);
@@ -24707,7 +24857,7 @@ jQuery(function ($) {
 </h3>
 <p id="doc_section_3_3_1_p_1">Lists are sequences of instances of homogeneous data objects. Two distinct levels of calls are needed to represent them in our output styles. Calls must be made to open and close a list, and for each instance of data in that list, calls must be make to open and close that instance.</p>
 <p id="doc_section_3_3_1_p_2">The name given to all calls must be identical, and it is strongly suggested that the name be singular, not plural, as a matter of style and usage expectations.</p>
-<div id="doc_figure_u.100"></div> <pre>
+<div id="doc_figure_u.107"></div> <pre>
     EXAMPLE:
         xo_open_list("user");
         for (i = 0; i &lt; num_users; i++) {
@@ -24776,11 +24926,11 @@ jQuery(function ($) {
 <a id="xo_parse_args" href="#xo_parse_args">Parsing Command-line Arguments (xo_parse_args)</a>
 </h3>
 <p id="doc_section_3_4_1_p_1">The xo_parse_args() function is used to process a program's arguments. libxo-specific options are processed and removed from the argument list so the calling application does not need to process them. If successful, a new value for argc is returned. On failure, a message it emitted and -1 is returned.</p>
-<div id="doc_figure_u.101"></div> <pre>
+<div id="doc_figure_u.108"></div> <pre>
     argc = xo_parse_args(argc, argv);
     if (argc &lt; 0)
         exit(EXIT_FAILURE);
-	    </pre> <p id="doc_section_3_4_1_p_3">Following the call to xo_parse_args, the application can process the remaining arguments in a normal manner. See <a href="#command-line-arguments" title="Command-line Arguments">Section 2.3</a> for a description of valid arguments.</p>
+	    </pre> <p id="doc_section_3_4_1_p_3">Following the call to xo_parse_args, the application can process the remaining arguments in a normal manner. See <a href="#command-line-arguments" title="Command-line Arguments">Section 2.4</a> for a description of valid arguments.</p>
 </div>
 <div class="content">
 <h3 id="doc_section_3_4_2">
@@ -24789,7 +24939,7 @@ jQuery(function ($) {
 <a id="xo_set_program" href="#xo_set_program">xo_set_program</a>
 </h3>
 <p id="doc_section_3_4_2_p_1">The xo_set_program function sets name of the program as reported by functions like xo_failure, xo_warn, xo_err, etc. The program name is initialized by xo_parse_args, but subsequent calls to xo_set_program can override this value.</p>
-<div id="doc_figure_u.102"></div> <pre>
+<div id="doc_figure_u.109"></div> <pre>
     xo_set_program(argv[0]);
 	    </pre> <p id="doc_section_3_4_2_p_3">Note that the value is not copied, so the memory passed to xo_set_program (and xo_parse_args) must be maintained by the caller.</p>
 </div>
@@ -24800,7 +24950,7 @@ jQuery(function ($) {
 <a id="xo_set_version" href="#xo_set_version">xo_set_version</a>
 </h3>
 <p id="doc_section_3_4_3_p_1">The xo_set_version function records a version number to be emitted as part of the data for encoding styles (XML and JSON). This version number is suitable for tracking changes in the content, allowing a user of the data to discern which version of the data model is in use.</p>
-<div id="doc_figure_u.103"></div> <pre>
+<div id="doc_figure_u.110"></div> <pre>
      void xo_set_version (const char *version);
      void xo_set_version_h (xo_handle_t *xop, const char *version);
 	    </pre> </div>
@@ -24813,7 +24963,7 @@ jQuery(function ($) {
 <p id="doc_section_3_4_4_p_1">HTML data can include additional information in attributes that begin with "data&#8209;". To enable this, three things must occur:</p>
 <p id="doc_section_3_4_4_p_2">First the application must build an array of xo_info_t structures, one per tag. The array must be sorted by name, since libxo uses a binary search to find the entry that matches names from format instructions.</p>
 <p id="doc_section_3_4_4_p_3">Second, the application must inform libxo about this information using the xo_set_info() call:</p>
-<div id="doc_figure_u.104"></div> <pre>
+<div id="doc_figure_u.111"></div> <pre>
     typedef struct xo_info_s {
         const char *xi_name;    /* Name of the element */
         const char *xi_type;    /* Type of field */
@@ -24823,7 +24973,7 @@ jQuery(function ($) {
     void xo_set_info (xo_handle_t *xop, xo_info_t *infop, int count);
 	    </pre> <p id="doc_section_3_4_4_p_5">Like other libxo calls, passing NULL for the handle tells libxo to use the default handle.</p>
 <p id="doc_section_3_4_4_p_6">If the count is -1, libxo will count the elements of infop, but there must be an empty element at the end. More typically, the number is known to the application:</p>
-<div id="doc_figure_u.105"></div> <pre>
+<div id="doc_figure_u.112"></div> <pre>
     xo_info_t info[] = {
         { "in-stock", "number", "Number of items in stock" },
         { "name", "string", "Name of the item" },
@@ -24836,7 +24986,7 @@ jQuery(function ($) {
     xo_set_info(NULL, info, info_count);
 	    </pre> <p id="doc_section_3_4_4_p_8">Third, the emission of info must be triggered with the XOF_INFO flag using either the xo_set_flags() function or the "&#8209;&#8209;libxo=info" command line argument.</p>
 <p id="doc_section_3_4_4_p_9">The type and help values, if present, are emitted as the "data&#8209;type" and "data&#8209;help" attributes:</p>
-<div id="doc_figure_u.106"></div> <pre>
+<div id="doc_figure_u.113"></div> <pre>
   &lt;div class="data" data-tag="sku" data-type="string" 
        data-help="Stock Keeping Unit"&gt;GRO-000-533&lt;/div&gt;
 	    </pre> </div>
@@ -24847,7 +24997,7 @@ jQuery(function ($) {
 <a id="memory-allocation" href="#memory-allocation">Memory Allocation</a>
 </h3>
 <p id="doc_section_3_4_5_p_1">The xo_set_allocator function allows libxo to be used in environments where the standard realloc() and free() functions are not available.</p>
-<div id="doc_figure_u.107"></div> <pre>
+<div id="doc_figure_u.114"></div> <pre>
     void xo_set_allocator (xo_realloc_func_t realloc_func,
                            xo_free_func_t free_func);
 	    </pre> <p id="doc_section_3_4_5_p_3">realloc_func should expect the same arguments as realloc(3) and return a pointer to memory following the same convention. free_func will receive the same argument as free(3) and should release it, as appropriate for the environment.</p>
@@ -24860,7 +25010,7 @@ jQuery(function ($) {
 <a id="LIBXO_OPTIONS" href="#LIBXO_OPTIONS">LIBXO_OPTIONS</a>
 </h3>
 <p id="doc_section_3_4_6_p_1">The environment variable "LIBXO_OPTIONS" can be set to a string of options:</p>
-<div id="doc_table_u.13"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.15"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Option</th>
 <th class="left">Action</th>
@@ -24929,10 +25079,10 @@ jQuery(function ($) {
 </tbody>
 </table></div>
 <p id="doc_section_3_4_6_p_2">For example, warnings can be enabled by:</p>
-<div id="doc_figure_u.108"></div> <pre>
+<div id="doc_figure_u.115"></div> <pre>
     % env LIBXO_OPTIONS=W my-app
 	    </pre> <p id="doc_section_3_4_6_p_4">Complete HTML output can be generated with:</p>
-<div id="doc_figure_u.109"></div> <pre>
+<div id="doc_figure_u.116"></div> <pre>
     % env LIBXO_OPTIONS=HXI my-app
 	    </pre> <p id="doc_section_3_4_6_p_6">Since environment variables are inherited, child processes will have the same options, which may be undesirable, making the use of the "&#8209;&#8209;libxo" option is preferable in most situations.</p>
 </div>
@@ -24943,7 +25093,7 @@ jQuery(function ($) {
 <a id="errors-warnings-and-messages" href="#errors-warnings-and-messages">Errors, Warnings, and Messages</a>
 </h3>
 <p id="doc_section_3_4_7_p_1">Many programs make use of the standard library functions err() and warn() to generate errors and warnings for the user. libxo wants to pass that information via the current output style, and provides compatible functions to allow this:</p>
-<div id="doc_figure_u.110"></div> <pre>
+<div id="doc_figure_u.117"></div> <pre>
     void xo_warn (const char *fmt, ...);
     void xo_warnx (const char *fmt, ...);
     void xo_warn_c (int code, const char *fmt, ...);
@@ -24959,7 +25109,7 @@ jQuery(function ($) {
     void xo_message_hcv (xo_handle_t *xop, int code, 
                          const char *fmt, va_list vap);
 	    </pre> <p id="doc_section_3_4_7_p_3">These functions display the program name, a colon, a formatted message based on the arguments, and then optionally a colon and an error message associated with either "errno" or the "code" parameter.</p>
-<div id="doc_figure_u.111"></div> <pre>
+<div id="doc_figure_u.118"></div> <pre>
     EXAMPLE:
         if (open(filename, O_RDONLY) &lt; 0)
             xo_err(1, "cannot open file '%s'", filename);
@@ -24971,7 +25121,7 @@ jQuery(function ($) {
 <a id="xo_error" href="#xo_error">xo_error</a>
 </h3>
 <p id="doc_section_3_4_8_p_1">The xo_error function can be used for generic errors that should be reported over the handle, rather than to stderr. The xo_error function behaves like xo_err for TEXT and HTML output styles, but puts the error into XML or JSON elements:</p>
-<div id="doc_figure_u.112"></div> <pre>
+<div id="doc_figure_u.119"></div> <pre>
     EXAMPLE::
         xo_error("Does not %s", "compute");
     XML::
@@ -24986,7 +25136,7 @@ jQuery(function ($) {
 <a id="xo_no_setlocale" href="#xo_no_setlocale">xo_no_setlocale</a>
 </h3>
 <p id="doc_section_3_4_9_p_1">libxo automatically initializes the locale based on setting of the environment variables LC_CTYPE, LANG, and LC_ALL. The first of this list of variables is used and if none of the variables, the locale defaults to "UTF&#8209;8". The caller may wish to avoid this behavior, and can do so by calling the xo_no_setlocale() function.</p>
-<div id="doc_figure_u.113"></div> <pre>
+<div id="doc_figure_u.120"></div> <pre>
     void xo_no_setlocale (void);
 	    </pre> </div>
 </div>
@@ -25002,7 +25152,7 @@ jQuery(function ($) {
 <p id="doc_section_3_5_p_4">https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers</p>
 <p id="doc_section_3_5_p_5">Use the <a href="#xo_set_syslog_enterprise_id" title="xo_set_syslog_enterprise_id">Section 3.5.3.5</a>() function to set the Enterprise ID, as needed.</p>
 <p id="doc_section_3_5_p_6">The message name should follow the conventions in <a href="#good-field-names" title="What makes a good field name?">Section 8.1.3</a>, as should the fields within the message.</p>
-<div id="doc_figure_u.114"></div> <pre>
+<div id="doc_figure_u.121"></div> <pre>
     /* Both of these calls are optional */
     xo_set_syslog_enterprise_id(32473);
     xo_open_log("my-program", 0, LOG_DAEMON);
@@ -25030,13 +25180,13 @@ jQuery(function ($) {
 <a id="priority" href="#priority">Priority, Facility, and Flags</a>
 </h3>
 <p id="doc_section_3_5_1_p_1">The xo_syslog, xo_vsyslog, and xo_open_log functions accept a set of flags which provide the priority of the message, the source facility, and some additional features. These values are OR'd together to create a single integer argument:</p>
-<div id="doc_figure_u.115"></div> <pre>
+<div id="doc_figure_u.122"></div> <pre>
     xo_syslog(LOG_ERR | LOG_AUTH, "login-failed",
              "Login failed; user '{:user}' from host '{:address}'",
              user, addr);
 	    </pre> <p id="doc_section_3_5_1_p_3">These values are defined in &lt;syslog.h&gt;.</p>
 <p id="doc_section_3_5_1_p_4">The priority value indicates the importance and potential impact of each message.</p>
-<div id="doc_table_u.14"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.16"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Priority</th>
 <th class="left">Description</th>
@@ -25077,7 +25227,7 @@ jQuery(function ($) {
 </tbody>
 </table></div>
 <p id="doc_section_3_5_1_p_5">The facility value indicates the source of message, in fairly generic terms.</p>
-<div id="doc_table_u.15"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.17"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Facility</th>
 <th class="left">Description</th>
@@ -25142,7 +25292,7 @@ jQuery(function ($) {
 </tbody>
 </table></div>
 <p id="doc_section_3_5_1_p_6">In addition to the values listed above, xo_open_log accepts a set of addition flags requesting specific behaviors.</p>
-<div id="doc_table_u.16"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.18"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Flag</th>
 <th class="left">Description</th>
@@ -25175,7 +25325,7 @@ jQuery(function ($) {
 </h3>
 <p id="doc_section_3_5_2_p_1">Use the xo_syslog function to generate syslog messages by calling it with a log priority and facility, a message name, a format string, and a set of arguments. The priority/facility argument are discussed above, as is the message name.</p>
 <p id="doc_section_3_5_2_p_2">The format string follows the same conventions as xo_emit's format string, with each field being rendered as an SD-PARAM pair.</p>
-<div id="doc_figure_u.116"></div> <pre>
+<div id="doc_figure_u.123"></div> <pre>
     xo_syslog(LOG_ERR, "poofd-missing-file",
               "'{:filename}' not found: {:error/%m}", filename);
 
@@ -25204,7 +25354,7 @@ jQuery(function ($) {
 <a id="xo_vsyslog" href="#xo_vsyslog">xo_vsyslog</a>
 </h4>
 <p id="doc_section_3_5_3_1_p_1">xo_vsyslog is identical in function to xo_syslog, but takes the set of arguments using a va_list.</p>
-<div id="doc_figure_u.117"></div> <pre>
+<div id="doc_figure_u.124"></div> <pre>
     void my_log (const char *name, const char *fmt, ...)
     {
         va_list vap;
@@ -25220,7 +25370,7 @@ jQuery(function ($) {
 <a id="xo_open_log" href="#xo_open_log">xo_open_log</a>
 </h4>
 <p id="doc_section_3_5_3_2_p_1">xo_open_log functions similar to openlog(3), allowing customization of the program name, the log facility number, and the additional option flags described in <a href="#priority" title="Priority, Facility, and Flags">Section 3.5.1</a>.</p>
-<div id="doc_figure_u.118"></div> <pre>
+<div id="doc_figure_u.125"></div> <pre>
     void
     xo_open_log (const char *ident, int logopt, int facility);
 	    </pre> </div>
@@ -25231,7 +25381,7 @@ jQuery(function ($) {
 <a id="xo_close_log" href="#xo_close_log">xo_close_log</a>
 </h4>
 <p id="doc_section_3_5_3_3_p_1">xo_close_log functions similar to closelog(3), closing the log file and releasing any associated resources.</p>
-<div id="doc_figure_u.119"></div> <pre>
+<div id="doc_figure_u.126"></div> <pre>
     void
     xo_close_log (void);
 	    </pre> </div>
@@ -25242,7 +25392,7 @@ jQuery(function ($) {
 <a id="xo_set_logmask" href="#xo_set_logmask">xo_set_logmask</a>
 </h4>
 <p id="doc_section_3_5_3_4_p_1">xo_set_logmask function similar to setlogmask(3), restricting the set of generated log event to those whose associated bit is set in maskpri. Use LOG_MASK(pri) to find the appropriate bit, or LOG_UPTO(toppri) to create a mask for all priorities up to and including toppri.</p>
-<div id="doc_figure_u.120"></div> <pre>
+<div id="doc_figure_u.127"></div> <pre>
     int
     xo_set_logmask (int maskpri);
 
@@ -25257,7 +25407,7 @@ jQuery(function ($) {
 </h4>
 <p id="doc_section_3_5_3_5_p_1">Use the xo_set_syslog_enterprise_id to supply a platform- or application-specific enterprise id. This value is used in any future syslog messages.</p>
 <p id="doc_section_3_5_3_5_p_2">Ideally, the operating system should supply a default value via the "kern.syslog.enterprise_id" sysctl value. Lacking that, the application should provide a suitable value.</p>
-<div id="doc_figure_u.121"></div> <pre>
+<div id="doc_figure_u.128"></div> <pre>
     void
     xo_set_syslog_enterprise_id (unsigned short eid);
 	    </pre> <p id="doc_section_3_5_3_5_p_4">Enterprise IDs are administered by IANA, the Internet Assigned Number Authority. The complete list is EIDs on their web site:</p>
@@ -25299,7 +25449,7 @@ jQuery(function ($) {
 <a id="loading-encoders" href="#loading-encoders">Loading Encoders</a>
 </h3>
 <p id="doc_section_3_6_1_p_1">Encoders can be registered statically or discovered dynamically. Applications can choose to call the xo_encoder_register() function to explicitly register encoders, but more typically they are built as shared libraries, placed in the libxo/extensions directory, and loaded based on name. libxo looks for a file with the name of the encoder and an extension of ".enc". This can be a file or a symlink to the shared library file that supports the encoder.</p>
-<div id="doc_figure_u.122"></div> <pre>
+<div id="doc_figure_u.129"></div> <pre>
     % ls -1 lib/libxo/extensions/*.enc
     lib/libxo/extensions/cbor.enc
     lib/libxo/extensions/test.enc
@@ -25311,7 +25461,7 @@ jQuery(function ($) {
 <a id="encoder-initialization" href="#encoder-initialization">Encoder Initialization</a>
 </h3>
 <p id="doc_section_3_6_2_p_1">Each encoder must export a symbol used to access the library, which must have the following signature:</p>
-<div id="doc_figure_u.123"></div> <pre>
+<div id="doc_figure_u.130"></div> <pre>
     int xo_encoder_library_init (XO_ENCODER_INIT_ARGS);
 	    </pre> <p id="doc_section_3_6_2_p_3">XO_ENCODER_INIT_ARGS is a macro defined in xo_encoder.h that defines an argument called "arg", a pointer of the type xo_encoder_init_args_t. This structure contains two fields:</p>
 <p id="doc_section_3_6_2_p_4"> </p>
@@ -25329,7 +25479,7 @@ jQuery(function ($) {
 <a id="operations" href="#operations">Operations</a>
 </h3>
 <p id="doc_section_3_6_3_p_1">The encoder API defines a set of operations representing the processing model of libxo. Content is formatted within libxo, and callbacks are made to the encoder's handler function when data is ready to be processed.</p>
-<div id="doc_table_u.17"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.19"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Operation</th>
 <th class="left">Meaning (Base function)</th>
@@ -25416,7 +25566,7 @@ jQuery(function ($) {
 <p id="doc_section_4_p_1">The "xo" utility allows command line access to the functionality of the libxo library. Using "xo", shell scripts can emit XML, JSON, and HTML using the same commands that emit text output.</p>
 <p id="doc_section_4_p_2">The style of output can be selected using a specific option: "&#8209;X" for XML, "&#8209;J" for JSON, "&#8209;H" for HTML, or "&#8209;T" for TEXT, which is the default. The "--style &lt;style&gt;" option can also be used. The LIBXO_OPTIONS environment variable can also be used to set the style, as well as other flags.</p>
 <p id="doc_section_4_p_3">The "xo" utility accepts a format string suitable for xo_emit() and a set of zero or more arguments used to supply data for that string.</p>
-<div id="doc_figure_u.124"></div> <pre>
+<div id="doc_figure_u.131"></div> <pre>
     xo "The {k:name} weighs {:weight/%d} pounds.\n" fish 6
 
   TEXT:
@@ -25436,7 +25586,7 @@ jQuery(function ($) {
       &lt;div class="text"&gt; pounds.&lt;/div&gt;
     &lt;/div&gt;
 	    </pre> <p id="doc_section_4_p_5">The "--wrap &lt;path&gt;" option can be used to wrap emitted content in a specific hierarchy. The path is a set of hierarchical names separated by the '/' character.</p>
-<div id="doc_figure_u.125"></div> <pre>
+<div id="doc_figure_u.132"></div> <pre>
     xo --wrap top/a/b/c '{:tag}' value
 
   XML:
@@ -25460,7 +25610,7 @@ jQuery(function ($) {
       }
     }
 	    </pre> <p id="doc_section_4_p_7">The "--open &lt;path&gt;" and "--close &lt;path&gt;" can be used to emit hierarchical information without the matching close and open tag. This allows a shell script to emit open tags, data, and then close tags. The "&#8209;&#8209;depth" option may be used to set the depth for indentation. The "&#8209;&#8209;leading&#8209;xpath" may be used to prepend data to the XPath values used for HTML output style.</p>
-<div id="doc_figure_u.126"></div> <pre>
+<div id="doc_figure_u.133"></div> <pre>
     #!/bin/sh
     xo --open top/data
     xo --depth 2 '{tag}' value
@@ -25489,7 +25639,7 @@ jQuery(function ($) {
 <a id="command-line-options" href="#command-line-options">Command Line Options</a>
 </h2>
 <p id="doc_section_4_1_p_1">Usage: xo [options] format [fields]</p>
-<div id="doc_figure_u.127"></div> <pre>
+<div id="doc_figure_u.134"></div> <pre>
   --close &lt;path&gt;        Close tags for the given path
   --depth &lt;num&gt;         Set the depth for pretty printing
   --help                Display this help text
@@ -25513,7 +25663,7 @@ jQuery(function ($) {
 <a href="#doc_section_4_2">4.2</a> </div>
 <a id="example-2" href="#example-2">Example</a>
 </h2>
-<div id="doc_figure_u.128"></div> <pre>
+<div id="doc_figure_u.135"></div> <pre>
   % xo 'The {:product} is {:status}\n' stereo "in route"
   The stereo is in route
   % ./xo/xo -p -X 'The {:product} is {:status}\n' stereo "in route"
@@ -25530,7 +25680,7 @@ jQuery(function ($) {
 </h1>
 <p id="doc_section_5_p_1">xolint is a tool for reporting common mistakes in format strings in source code that invokes xo_emit(). It allows these errors to be diagnosed at build time, rather than waiting until runtime.</p>
 <p id="doc_section_5_p_2">xolint takes the one or more C files as arguments, and reports and errors, warning, or informational messages as needed.</p>
-<div id="doc_table_u.18"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.20"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Option</th>
 <th class="left">Meaning</th>
@@ -25571,7 +25721,7 @@ jQuery(function ($) {
 </tbody>
 </table></div>
 <p id="doc_section_5_p_3">The output message will contain the source filename and line number, the class of the message, the message, and, if -p is given, the line that contains the error:</p>
-<div id="doc_figure_u.129"></div> <pre>
+<div id="doc_figure_u.136"></div> <pre>
     % xolint.pl -t xolint.c
     xolint.c: 16: error: anchor format should be "%d"
     16         xo_emit("{[:/%s}");
@@ -25587,7 +25737,7 @@ jQuery(function ($) {
 </h1>
 <p id="doc_section_6_p_1">xohtml is a tool for turning the output of libxo-enabled commands into html files suitable for display in modern HTML web browsers. It can be used to test and debug HTML output, as well as to make the user ache to escape the world of 70s terminal devices.</p>
 <p id="doc_section_6_p_2">xohtml is given a command, either on the command line or via the "&#8209;c" option. If not command is given, standard input is used. The command's output is wrapped in HTML tags, with references to supporting CSS and Javascript files, and written to standard output or the file given in the "&#8209;f" option. The "&#8209;b" option can be used to provide an alternative base path for the support files.</p>
-<div id="doc_table_u.19"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.21"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Option</th>
 <th class="left">Meaning</th>
@@ -25619,7 +25769,7 @@ jQuery(function ($) {
 <p id="doc_section_7_p_1">The "xopo" utility filters ".pot" files generated by the "xgettext" utility to remove formatting information suitable for use with the "{G:}" modifier. This means that when the developer changes the formatting portion of the field definitions, or the fields modifiers, the string passed to gettext(3) is unchanged, avoiding the expense of updating any existing translation files (".po" files).</p>
 <p id="doc_section_7_p_2">The syntax for the xopo command is one of two forms; it can be used as a filter for processing a .po or .pot file, rewriting the "msgid" strings with a simplified message string. In this mode, the input is either standard input or a file given by the "&#8209;f" option, and the output is either standard output or a file given by the "&#8209;o" option.</p>
 <p id="doc_section_7_p_3">In the second mode, a simple message given using the "&#8209;s" option on the command, and the simplified version of that message is printed on stdout.</p>
-<div id="doc_table_u.20"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
+<div id="doc_table_u.22"><table summary="" class="tt full" cellpadding="3" cellspacing="0">
 <thead><tr>
 <th class="left">Option</th>
 <th class="left">Meaning</th>
@@ -25639,7 +25789,7 @@ jQuery(function ($) {
 </tr>
 </tbody>
 </table></div>
-<div id="doc_figure_u.130"></div> <pre>
+<div id="doc_figure_u.137"></div> <pre>
     EXAMPLE:
         % xopo -s "There are {:count/%u} {:event/%.6s} events\n"
         There are {:count} {:event} events\n
@@ -25687,9 +25837,9 @@ jQuery(function ($) {
 <a href="#doc_section_8_1_1">8.1.1</a> </div>
 <a id="can-you-share-the-history-of-libxo" href="#can-you-share-the-history-of-libxo">Can you share the history of libxo?</a>
 </h3>
-<p id="doc_section_8_1_1_p_1">In 2001, we added an XML API to the JUNOS operating system, which is built on top of FreeBSD. Eventually this API became standardized as the NETCONF API (RFC 6241). As part of this effort, we modified many FreeBSD utilities to emit XML, typically via a "&#8209;X" switch. The results were mixed. The cost of maintaining this code, updating it and carrying it were non-trivial, and contributed to our expense (and the associated delay) with upgrading the version of FreeBSD on which each release of JUNOS is based.</p>
-<p id="doc_section_8_1_1_p_2">A recent (2014) effort within JUNOS aims at removing our modifications to the underlying FreeBSD code as a means of reducing the expense and delay. JUNOS is structured to have system components generate XML that is rendered by the CLI (think: login shell) into human-readable text. This allows the API to use the same plumbing as the CLI, and ensures that all components emit XML, and that it is emitted with knowledge of the consumer of that XML, yielding an API that have no incremental cost or feature delay.</p>
-<p id="doc_section_8_1_1_p_3">libxo is an effort to mix the best aspects of the JUNOS strategy into FreeBSD in a seemless way, allowing commands to make printf-like output calls without needing to care how the output is rendered.</p>
+<p id="doc_section_8_1_1_p_1">In 2001, we added an XML API to the JUNOS operating system, which is built on top of FreeBSD. Eventually this API became standardized as the NETCONF API (RFC 6241). As part of this effort, we modified many FreeBSD utilities to emit XML, typically via a "&#8209;X" switch. The results were mixed. The cost of maintaining this code, updating it, and carrying it were non-trivial, and contributed to our expense (and the associated delay) with upgrading the version of FreeBSD on which each release of JUNOS is based.</p>
+<p id="doc_section_8_1_1_p_2">A recent (2014) effort within JUNOS aims at removing our modifications to the underlying FreeBSD code as a means of reducing the expense and delay in tracking HEAD. JUNOS is structured to have system components generate XML that is rendered by the CLI (think: login shell) into human-readable text. This allows the API to use the same plumbing as the CLI, and ensures that all components emit XML, and that it is emitted with knowledge of the consumer of that XML, yielding an API that have no incremental cost or feature delay.</p>
+<p id="doc_section_8_1_1_p_3">libxo is an effort to mix the best aspects of the JUNOS strategy into FreeBSD in a seemless way, allowing commands to make printf-like output calls with a single code path.</p>
 </div>
 <div class="content">
 <h3 id="doc_section_8_1_2">
@@ -25698,7 +25848,7 @@ jQuery(function ($) {
 <a id="did-the-complex-semantics-of-format-strings-evolve-over-time" href="#did-the-complex-semantics-of-format-strings-evolve-over-time">Did the complex semantics of format strings evolve over time?</a>
 </h3>
 <p id="doc_section_8_1_2_p_1">The history is both long and short: libxo's functionality is based on what JUNOS does in a data modeling language called ODL (output definition language). In JUNOS, all subcomponents generate XML, which is feed to the CLI, where data from the ODL files tell is how to render that XML into text. ODL might had a set of tags like:</p>
-<div id="doc_figure_u.131"></div> <pre>
+<div id="doc_figure_u.138"></div> <pre>
      tag docsis-state {
          help "State of the DOCSIS interface";
          type string;
@@ -25777,7 +25927,7 @@ jQuery(function ($) {
 <dt>Reuse existing field names</dt>
 <dd>Nothing's worse than writing expressions like:</dd>
 </dl>
-<div id="doc_figure_u.132"></div> <pre>
+<div id="doc_figure_u.139"></div> <pre>
     if ($src1/process[pid == $pid]/name == 
         $src2/proc-table/proc-list
                    /proc-entry[process-id == $pid]/proc-name) {
@@ -25789,7 +25939,7 @@ jQuery(function ($) {
 <dt>Use containment as scoping</dt>
 <dd>In the previous example, all the names are prefixed with "proc&#8209;", which is redundant given that they are nested under the process table.</dd>
 <dt>Think about your users</dt>
-<dd>Have empathy for your users, choosing clear and useful fields that contain clear and useful data. You may need to augment the display content with xo_attr() calls (<a href="#xo_attr" title="Attributes (xo_attr)">Section 3.2.1</a>) or "{e:}" fields (<a href="#e-modifier" title="The Encoding Modifier ({e:})">Section 2.2.2.3</a>) to make the data useful.</dd>
+<dd>Have empathy for your users, choosing clear and useful fields that contain clear and useful data. You may need to augment the display content with xo_attr() calls (<a href="#xo_attr" title="Attributes (xo_attr)">Section 3.2.2</a>) or "{e:}" fields (<a href="#e-modifier" title="The Encoding Modifier ({e:})">Section 2.2.2.4</a>) to make the data useful.</dd>
 <dt>Don't use an arbitrary number postfix</dt>
 <dd>What does "errors2" mean? No one will know. "errors&#8209;after&#8209;restart" would be a better choice. Think of your users, and think of the future. If you make "errors2", the next guy will happily make "errors3" and before you know it, someone will be asking what's the difference between errors37 and errors63.</dd>
 <dt>Be consistent, uniform, unsurprising, and predictable</dt>
@@ -25838,10 +25988,10 @@ jQuery(function ($) {
 <a id="a-percent-sign-appearing-in-text-is-a-literal" href="#a-percent-sign-appearing-in-text-is-a-literal">'A percent sign appearing in text is a literal'</a>
 </h3>
 <p id="doc_section_8_2_1_p_1">The message "A percent sign appearing in text is a literal" can be caused by code like:</p>
-<div id="doc_figure_u.133"></div> <pre>
+<div id="doc_figure_u.140"></div> <pre>
     xo_emit("cost: %d", cost);
 	    </pre> <p id="doc_section_8_2_1_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.134"></div> <pre>
+<div id="doc_figure_u.141"></div> <pre>
     xo_emit("{L:cost}: {:cost/%d}", cost);
 	    </pre> <p id="doc_section_8_2_1_p_5">This can be a bit surprising and could be a field that was not properly converted to a libxo-style format string.</p>
 </div>
@@ -25852,10 +26002,10 @@ jQuery(function ($) {
 <a id="unknown-long-name-for-rolemodifier" href="#unknown-long-name-for-rolemodifier">'Unknown long name for role/modifier'</a>
 </h3>
 <p id="doc_section_8_2_2_p_1">The message "Unknown long name for role/modifier" can be caused by code like:</p>
-<div id="doc_figure_u.135"></div> <pre>
+<div id="doc_figure_u.142"></div> <pre>
     xo_emit("{,humanization:value}", value);
 	    </pre> <p id="doc_section_8_2_2_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.136"></div> <pre>
+<div id="doc_figure_u.143"></div> <pre>
     xo_emit("{,humanize:value}", value);
 	    </pre> <p id="doc_section_8_2_2_p_5">The hn-* modifiers (hn-decimal, hn-space, hn-1000) are only valid for fields with the {h:} modifier.</p>
 </div>
@@ -25867,10 +26017,10 @@ jQuery(function ($) {
 </h3>
 <p id="doc_section_8_2_3_p_1">The message "Last character before field definition is a field type" can be caused by code like:</p>
 <p id="doc_section_8_2_3_p_2">A common typo:</p>
-<div id="doc_figure_u.137"></div> <pre>
+<div id="doc_figure_u.144"></div> <pre>
     xo_emit("{T:Min} T{:Max}");
 	    </pre> <p id="doc_section_8_2_3_p_4">This code should be replaced with code like:</p>
-<div id="doc_figure_u.138"></div> <pre>
+<div id="doc_figure_u.145"></div> <pre>
     xo_emit("{T:Min} {T:Max}");
 	    </pre> <p id="doc_section_8_2_3_p_6">Twiddling the "{" and the field role is a common typo.</p>
 </div>
@@ -25881,10 +26031,10 @@ jQuery(function ($) {
 <a id="encoding-format-uses-different-number-of-arguments" href="#encoding-format-uses-different-number-of-arguments">'Encoding format uses different number of arguments'</a>
 </h3>
 <p id="doc_section_8_2_4_p_1">The message "Encoding format uses different number of arguments" can be caused by code like:</p>
-<div id="doc_figure_u.139"></div> <pre>
+<div id="doc_figure_u.146"></div> <pre>
     xo_emit("{:name/%6.6s %%04d/%s}", name, number);
 	    </pre> <p id="doc_section_8_2_4_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.140"></div> <pre>
+<div id="doc_figure_u.147"></div> <pre>
     xo_emit("{:name/%6.6s %04d/%s-%d}", name, number);
 	    </pre> <p id="doc_section_8_2_4_p_5">Both format should consume the same number of arguments off the stack</p>
 </div>
@@ -25895,10 +26045,10 @@ jQuery(function ($) {
 <a id="only-one-field-role-can-be-used" href="#only-one-field-role-can-be-used">'Only one field role can be used'</a>
 </h3>
 <p id="doc_section_8_2_5_p_1">The message "Only one field role can be used" can be caused by code like:</p>
-<div id="doc_figure_u.141"></div> <pre>
+<div id="doc_figure_u.148"></div> <pre>
     xo_emit("{LT:Max}");
 	    </pre> <p id="doc_section_8_2_5_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.142"></div> <pre>
+<div id="doc_figure_u.149"></div> <pre>
     xo_emit("{T:Max}");
 	    </pre> </div>
 <div class="content">
@@ -25908,10 +26058,10 @@ jQuery(function ($) {
 <a id="potential-missing-slash-after-c-d-n-l-or-t-with-format" href="#potential-missing-slash-after-c-d-n-l-or-t-with-format">'Potential missing slash after C, D, N, L, or T with format'</a>
 </h3>
 <p id="doc_section_8_2_6_p_1">The message "Potential missing slash after C, D, N, L, or T with format" can be caused by code like:</p>
-<div id="doc_figure_u.143"></div> <pre>
+<div id="doc_figure_u.150"></div> <pre>
     xo_emit("{T:%6.6s}\n", "Max");
 	    </pre> <p id="doc_section_8_2_6_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.144"></div> <pre>
+<div id="doc_figure_u.151"></div> <pre>
     xo_emit("{T:/%6.6s}\n", "Max");
 	    </pre> <p id="doc_section_8_2_6_p_5">The "%6.6s" will be a literal, not a field format. While it's possibly valid, it's likely a missing "/".</p>
 </div>
@@ -25922,7 +26072,7 @@ jQuery(function ($) {
 <a id="an-encoding-format-cannot-be-given-roles-dnlt" href="#an-encoding-format-cannot-be-given-roles-dnlt">'An encoding format cannot be given (roles: DNLT)'</a>
 </h3>
 <p id="doc_section_8_2_7_p_1">The message "An encoding format cannot be given (roles: DNLT)" can be caused by code like:</p>
-<div id="doc_figure_u.145"></div> <pre>
+<div id="doc_figure_u.152"></div> <pre>
     xo_emit("{T:Max//%s}", "Max");
 	    </pre> <p id="doc_section_8_2_7_p_3">Fields with the C, D, N, L, and T roles are not emitted in the 'encoding' style (JSON, XML), so an encoding format would make no sense.</p>
 </div>
@@ -25933,7 +26083,7 @@ jQuery(function ($) {
 <a id="format-cannot-be-given-when-content-is-present-roles-cdln" href="#format-cannot-be-given-when-content-is-present-roles-cdln">'Format cannot be given when content is present (roles: CDLN)'</a>
 </h3>
 <p id="doc_section_8_2_8_p_1">The message "Format cannot be given when content is present (roles: CDLN)" can be caused by code like:</p>
-<div id="doc_figure_u.146"></div> <pre>
+<div id="doc_figure_u.153"></div> <pre>
     xo_emit("{N:Max/%6.6s}", "Max");
 	    </pre> <p id="doc_section_8_2_8_p_3">Fields with the C, D, L, or N roles can't have both static literal content ("{L:Label}") and a format ("{L:/%s}"). This error will also occur when the content has a backslash in it, like "{N:Type of I/O}"; backslashes should be escaped, like "{N:Type of I\\/O}". Note the double backslash, one for handling 'C' strings, and one for libxo.</p>
 </div>
@@ -25944,10 +26094,10 @@ jQuery(function ($) {
 <a id="field-has-color-without-fg--or-bg--role-c" href="#field-has-color-without-fg--or-bg--role-c">'Field has color without fg- or bg- (role: C)'</a>
 </h3>
 <p id="doc_section_8_2_9_p_1">The message "Field has color without fg- or bg- (role: C)" can be caused by code like:</p>
-<div id="doc_figure_u.147"></div> <pre>
+<div id="doc_figure_u.154"></div> <pre>
     xo_emit("{C:green}{:foo}{C:}", x);
 	    </pre> <p id="doc_section_8_2_9_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.148"></div> <pre>
+<div id="doc_figure_u.155"></div> <pre>
     xo_emit("{C:fg-green}{:foo}{C:}", x);
 	    </pre> <p id="doc_section_8_2_9_p_5">Colors must be prefixed by either "fg&#8209;" or "bg&#8209;".</p>
 </div>
@@ -25958,10 +26108,10 @@ jQuery(function ($) {
 <a id="field-has-invalid-color-or-effect-role-c" href="#field-has-invalid-color-or-effect-role-c">'Field has invalid color or effect (role: C)'</a>
 </h3>
 <p id="doc_section_8_2_10_p_1">The message "Field has invalid color or effect (role: C)" can be caused by code like:</p>
-<div id="doc_figure_u.149"></div> <pre>
+<div id="doc_figure_u.156"></div> <pre>
     xo_emit("{C:fg-purple,bold}{:foo}{C:gween}", x);
 	    </pre> <p id="doc_section_8_2_10_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.150"></div> <pre>
+<div id="doc_figure_u.157"></div> <pre>
     xo_emit("{C:fg-red,bold}{:foo}{C:fg-green}", x);
 	    </pre> <p id="doc_section_8_2_10_p_5">The list of colors and effects are limited. The set of colors includes default, black, red, green, yellow, blue, magenta, cyan, and white, which must be prefixed by either "fg&#8209;" or "bg&#8209;". Effects are limited to bold, no-bold, underline, no-underline, inverse, no-inverse, normal, and reset. Values must be separated by commas.</p>
 </div>
@@ -25972,10 +26122,10 @@ jQuery(function ($) {
 <a id="field-has-humanize-modifier-but-no-format-string" href="#field-has-humanize-modifier-but-no-format-string">'Field has humanize modifier but no format string'</a>
 </h3>
 <p id="doc_section_8_2_11_p_1">The message "Field has humanize modifier but no format string" can be caused by code like:</p>
-<div id="doc_figure_u.151"></div> <pre>
+<div id="doc_figure_u.158"></div> <pre>
     xo_emit("{h:value}", value);
 	    </pre> <p id="doc_section_8_2_11_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.152"></div> <pre>
+<div id="doc_figure_u.159"></div> <pre>
     xo_emit("{h:value/%d}", value);
 	    </pre> <p id="doc_section_8_2_11_p_5">Humanization is only value for numbers, which are not likely to use the default format ("%s").</p>
 </div>
@@ -25986,10 +26136,10 @@ jQuery(function ($) {
 <a id="field-has-hn--modifier-but-not-h-modifier" href="#field-has-hn--modifier-but-not-h-modifier">'Field has hn-* modifier but not 'h' modifier'</a>
 </h3>
 <p id="doc_section_8_2_12_p_1">The message "Field has hn-* modifier but not 'h' modifier" can be caused by code like:</p>
-<div id="doc_figure_u.153"></div> <pre>
+<div id="doc_figure_u.160"></div> <pre>
     xo_emit("{,hn-1000:value}", value);
 	    </pre> <p id="doc_section_8_2_12_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.154"></div> <pre>
+<div id="doc_figure_u.161"></div> <pre>
     xo_emit("{h,hn-1000:value}", value);
 	    </pre> <p id="doc_section_8_2_12_p_5">The hn-* modifiers (hn-decimal, hn-space, hn-1000) are only valid for fields with the {h:} modifier.</p>
 </div>
@@ -26000,10 +26150,10 @@ jQuery(function ($) {
 <a id="value-field-must-have-a-name-as-content" href="#value-field-must-have-a-name-as-content">'Value field must have a name (as content)")'</a>
 </h3>
 <p id="doc_section_8_2_13_p_1">The message "Value field must have a name (as content)")" can be caused by code like:</p>
-<div id="doc_figure_u.155"></div> <pre>
+<div id="doc_figure_u.162"></div> <pre>
     xo_emit("{:/%s}", "value");
 	    </pre> <p id="doc_section_8_2_13_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.156"></div> <pre>
+<div id="doc_figure_u.163"></div> <pre>
     xo_emit("{:tag-name/%s}", "value");
 	    </pre> <p id="doc_section_8_2_13_p_5">The field name is used for XML and JSON encodings. These tags names are static and must appear directly in the field descriptor.</p>
 </div>
@@ -26014,10 +26164,10 @@ jQuery(function ($) {
 <a id="use-hyphens-not-underscores-for-value-field-name" href="#use-hyphens-not-underscores-for-value-field-name">'Use hyphens, not underscores, for value field name'</a>
 </h3>
 <p id="doc_section_8_2_14_p_1">The message "Use hyphens, not underscores, for value field name" can be caused by code like:</p>
-<div id="doc_figure_u.157"></div> <pre>
+<div id="doc_figure_u.164"></div> <pre>
     xo_emit("{:no_under_scores}", "bad");
 	    </pre> <p id="doc_section_8_2_14_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.158"></div> <pre>
+<div id="doc_figure_u.165"></div> <pre>
     xo_emit("{:no-under-scores}", "bad");
 	    </pre> <p id="doc_section_8_2_14_p_5">Use of hyphens is traditional in XML, and the XOF_UNDERSCORES flag can be used to generate underscores in JSON, if desired. But the raw field name should use hyphens.</p>
 </div>
@@ -26028,10 +26178,10 @@ jQuery(function ($) {
 <a id="value-field-name-cannot-start-with-digit" href="#value-field-name-cannot-start-with-digit">'Value field name cannot start with digit'</a>
 </h3>
 <p id="doc_section_8_2_15_p_1">The message "Value field name cannot start with digit" can be caused by code like:</p>
-<div id="doc_figure_u.159"></div> <pre>
+<div id="doc_figure_u.166"></div> <pre>
     xo_emit("{:10-gig/}");
 	    </pre> <p id="doc_section_8_2_15_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.160"></div> <pre>
+<div id="doc_figure_u.167"></div> <pre>
     xo_emit("{:ten-gig/}");
 	    </pre> <p id="doc_section_8_2_15_p_5">XML element names cannot start with a digit.</p>
 </div>
@@ -26042,10 +26192,10 @@ jQuery(function ($) {
 <a id="value-field-name-should-be-lower-case" href="#value-field-name-should-be-lower-case">'Value field name should be lower case'</a>
 </h3>
 <p id="doc_section_8_2_16_p_1">The message "Value field name should be lower case" can be caused by code like:</p>
-<div id="doc_figure_u.161"></div> <pre>
+<div id="doc_figure_u.168"></div> <pre>
     xo_emit("{:WHY-ARE-YOU-SHOUTING}", "NO REASON");
 	    </pre> <p id="doc_section_8_2_16_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.162"></div> <pre>
+<div id="doc_figure_u.169"></div> <pre>
     xo_emit("{:why-are-you-shouting}", "no reason");
 	    </pre> <p id="doc_section_8_2_16_p_5">Lower case is more civilized. Even TLAs should be lower case to avoid scenarios where the differences between "XPath" and "Xpath" drive your users crazy. Lower case rules the seas.</p>
 </div>
@@ -26056,10 +26206,10 @@ jQuery(function ($) {
 <a id="value-field-name-should-be-longer-than-two-characters" href="#value-field-name-should-be-longer-than-two-characters">'Value field name should be longer than two characters'</a>
 </h3>
 <p id="doc_section_8_2_17_p_1">The message "Value field name should be longer than two characters" can be caused by code like:</p>
-<div id="doc_figure_u.163"></div> <pre>
+<div id="doc_figure_u.170"></div> <pre>
     xo_emit("{:x}", "mumble");
 	    </pre> <p id="doc_section_8_2_17_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.164"></div> <pre>
+<div id="doc_figure_u.171"></div> <pre>
     xo_emit("{:something-meaningful}", "mumble");
 	    </pre> <p id="doc_section_8_2_17_p_5">Field names should be descriptive, and it's hard to be descriptive in less than two characters. Consider your users and try to make something more useful. Note that this error often occurs when the field type is placed after the colon ("{:T/%20s}"), instead of before it ("{T:/20s}").</p>
 </div>
@@ -26070,10 +26220,10 @@ jQuery(function ($) {
 <a id="value-field-name-contains-invalid-character" href="#value-field-name-contains-invalid-character">'Value field name contains invalid character'</a>
 </h3>
 <p id="doc_section_8_2_18_p_1">The message "Value field name contains invalid character" can be caused by code like:</p>
-<div id="doc_figure_u.165"></div> <pre>
+<div id="doc_figure_u.172"></div> <pre>
     xo_emit("{:cost-in-$$/%u}", 15);
 	    </pre> <p id="doc_section_8_2_18_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.166"></div> <pre>
+<div id="doc_figure_u.173"></div> <pre>
     xo_emit("{:cost-in-dollars/%u}", 15);
 	    </pre> <p id="doc_section_8_2_18_p_5">An invalid character is often a sign of a typo, like "{:]}" instead of "{]:}". Field names are restricted to lower-case characters, digits, and hyphens.</p>
 </div>
@@ -26084,10 +26234,10 @@ jQuery(function ($) {
 <a id="decoration-field-contains-invalid-character" href="#decoration-field-contains-invalid-character">'decoration field contains invalid character'</a>
 </h3>
 <p id="doc_section_8_2_19_p_1">The message "decoration field contains invalid character" can be caused by code like:</p>
-<div id="doc_figure_u.167"></div> <pre>
+<div id="doc_figure_u.174"></div> <pre>
     xo_emit("{D:not good}");
 	    </pre> <p id="doc_section_8_2_19_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.168"></div> <pre>
+<div id="doc_figure_u.175"></div> <pre>
     xo_emit("{D:((}{:good}{D:))}", "yes");
 	    </pre> <p id="doc_section_8_2_19_p_5">This is minor, but fields should use proper roles. Decoration fields are meant to hold punctuation and other characters used to decorate the content, typically to make it more readable to human readers.</p>
 </div>
@@ -26098,10 +26248,10 @@ jQuery(function ($) {
 <a id="anchor-content-should-be-decimal-width" href="#anchor-content-should-be-decimal-width">'Anchor content should be decimal width'</a>
 </h3>
 <p id="doc_section_8_2_20_p_1">The message "Anchor content should be decimal width" can be caused by code like:</p>
-<div id="doc_figure_u.169"></div> <pre>
+<div id="doc_figure_u.176"></div> <pre>
     xo_emit("{[:mumble}");
 	    </pre> <p id="doc_section_8_2_20_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.170"></div> <pre>
+<div id="doc_figure_u.177"></div> <pre>
     xo_emit("{[:32}");
 	    </pre> <p id="doc_section_8_2_20_p_5">Anchors need an integer value to specify the width of the set of anchored fields. The value can be positive (for left padding/right justification) or negative (for right padding/left justification) and can appear in either the start or stop anchor field descriptor.</p>
 </div>
@@ -26112,10 +26262,10 @@ jQuery(function ($) {
 <a id="anchor-format-should-be-d" href="#anchor-format-should-be-d">'Anchor format should be "%d"'</a>
 </h3>
 <p id="doc_section_8_2_21_p_1">The message "Anchor format should be "%d"" can be caused by code like:</p>
-<div id="doc_figure_u.171"></div> <pre>
+<div id="doc_figure_u.178"></div> <pre>
     xo_emit("{[:/%s}");
 	    </pre> <p id="doc_section_8_2_21_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.172"></div> <pre>
+<div id="doc_figure_u.179"></div> <pre>
     xo_emit("{[:/%d}");
 	    </pre> <p id="doc_section_8_2_21_p_5">Anchors only grok integer values, and if the value is not static, if must be in an 'int' argument, represented by the "%d" format. Anything else is an error.</p>
 </div>
@@ -26126,10 +26276,10 @@ jQuery(function ($) {
 <a id="anchor-cannot-have-both-format-and-encoding-format" href="#anchor-cannot-have-both-format-and-encoding-format">'Anchor cannot have both format and encoding format")'</a>
 </h3>
 <p id="doc_section_8_2_22_p_1">The message "Anchor cannot have both format and encoding format")" can be caused by code like:</p>
-<div id="doc_figure_u.173"></div> <pre>
+<div id="doc_figure_u.180"></div> <pre>
     xo_emit("{[:32/%d}");
 	    </pre> <p id="doc_section_8_2_22_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.174"></div> <pre>
+<div id="doc_figure_u.181"></div> <pre>
     xo_emit("{[:32}");
 	    </pre> <p id="doc_section_8_2_22_p_5">Anchors can have a static value or argument for the width, but cannot have both.</p>
 </div>
@@ -26140,10 +26290,10 @@ jQuery(function ($) {
 <a id="max-width-only-valid-for-strings" href="#max-width-only-valid-for-strings">'Max width only valid for strings'</a>
 </h3>
 <p id="doc_section_8_2_23_p_1">The message "Max width only valid for strings" can be caused by code like:</p>
-<div id="doc_figure_u.175"></div> <pre>
+<div id="doc_figure_u.182"></div> <pre>
     xo_emit("{:tag/%2.4.6d}", 55);
 	    </pre> <p id="doc_section_8_2_23_p_3">This code should be replaced with code like:</p>
-<div id="doc_figure_u.176"></div> <pre>
+<div id="doc_figure_u.183"></div> <pre>
     xo_emit("{:tag/%2.6d}", 55);
 	    </pre> <p id="doc_section_8_2_23_p_5">libxo allows a true 'max width' in addition to the traditional printf-style 'max number of bytes to use for input'. But this is supported only for string values, since it makes no sense for non-strings. This error may occur from a typo, like "{:tag/%6..6d}" where only one period should be used.</p>
 </div>
@@ -26183,7 +26333,7 @@ jQuery(function ($) {
 <p id="doc_section_9_2_p_1">libxo is open source, under a new BSD license. Source code is available on github, as are recent releases. To get the most current release, please visit:</p>
 <p id="doc_section_9_2_p_2"> <a href="https://github.com/Juniper/libxo/releases">https://github.com/Juniper/libxo/releases</a></p>
 <p id="doc_section_9_2_p_3">After downloading and untarring the source code, building involves the following steps:</p>
-<div id="doc_figure_u.177"></div> <pre>
+<div id="doc_figure_u.184"></div> <pre>
     sh bin/setup.sh
     cd build
     ../configure
@@ -26192,7 +26342,7 @@ jQuery(function ($) {
     sudo make install
 	    </pre> <p id="doc_section_9_2_p_5">libxo uses a distinct "build" directory to keep generated files separated from source files.</p>
 <p id="doc_section_9_2_p_6">Use "../configure --help" to display available configuration options, which include the following:</p>
-<div id="doc_figure_u.178"></div> <pre>
+<div id="doc_figure_u.185"></div> <pre>
   --enable-warnings      Turn on compiler warnings
   --enable-debug         Turn on debugging
   --enable-text-only     Turn on text-only rendering
@@ -26212,7 +26362,7 @@ jQuery(function ($) {
 <a href="#doc_section_9_3">9.3</a> </div>
 <a id="howto-convert-command-line-applications" href="#howto-convert-command-line-applications">Howto: Convert command line applications</a>
 </h2>
-<div id="doc_figure_u.179"></div> <pre>
+<div id="doc_figure_u.186"></div> <pre>
     How do I convert an existing command line application?
 	    </pre> <p id="doc_section_9_3_p_2">There are three basic steps for converting command line application to use libxo.</p>
 <p id="doc_section_9_3_p_3"> </p>
@@ -26236,10 +26386,10 @@ jQuery(function ($) {
 <a id="setting-up-the-context" href="#setting-up-the-context">Setting up the context</a>
 </h3>
 <p id="doc_section_9_3_1_p_1">To use libxo, you'll need to include the "xo.h" header file in your source code files:</p>
-<div id="doc_figure_u.180"></div> <pre>
+<div id="doc_figure_u.187"></div> <pre>
     #include &lt;libxo/xo.h&gt;
 	    </pre> <p id="doc_section_9_3_1_p_3">In your main() function, you'll need to call xo_parse_args to handling argument parsing (<a href="#xo_parse_args" title="Parsing Command-line Arguments (xo_parse_args)">Section 3.4.1</a>). This function removes libxo-specific arguments the program's argv and returns either the number of remaining arguments or -1 to indicate an error.</p>
-<div id="doc_figure_u.181"></div> <pre>
+<div id="doc_figure_u.188"></div> <pre>
     int main (int argc, char **argv)
     {
         argc = xo_parse_args(argc, argv);
@@ -26247,8 +26397,8 @@ jQuery(function ($) {
             return argc;
         ....
     }
-	    </pre> <p id="doc_section_9_3_1_p_5">At the bottom of your main(), you'll need to call xo_finish() to complete output processing for the default handle (<a href="#handles" title="Handles">Section 2.5</a>). libxo provides the xo_finish_atexit function that is suitable for use with the atexit(3) function.</p>
-<div id="doc_figure_u.182"></div> <pre>
+	    </pre> <p id="doc_section_9_3_1_p_5">At the bottom of your main(), you'll need to call xo_finish() to complete output processing for the default handle (<a href="#handles" title="Handles">Section 3.1</a>). libxo provides the xo_finish_atexit function that is suitable for use with the atexit(3) function.</p>
+<div id="doc_figure_u.189"></div> <pre>
     atexit(xo_finish_atexit);
 	    </pre> </div>
 <div class="content">
@@ -26258,20 +26408,20 @@ jQuery(function ($) {
 <a id="converting-printf-calls" href="#converting-printf-calls">Converting printf Calls</a>
 </h3>
 <p id="doc_section_9_3_2_p_1">The second task is inspecting code for printf(3) calls and replacing them with xo_emit() calls. The format strings are similar in task, but libxo format strings wrap output fields in braces. The following two calls produce identical text output:</p>
-<div id="doc_figure_u.183"></div> <pre>
+<div id="doc_figure_u.190"></div> <pre>
     printf("There are %d %s events\n", count, etype);
     xo_emit("There are {:count/%d} {:event} events\n", count, etype);
 	    </pre> <p id="doc_section_9_3_2_p_3">"count" and "event" are used as names for JSON and XML output. The "count" field uses the format "%d" and "event" uses the default "%s" format. Both are "value" roles, which is the default role.</p>
 <p id="doc_section_9_3_2_p_4">Since text outside of output fields is passed verbatim, other roles are less important, but their proper use can help make output more useful. The "note" and "label" roles allow HTML output to recognize the relationship between text and the associated values, allowing appropriate "hover" and "onclick" behavior. Using the "units" role allows the presentation layer to perform conversions when needed. The "warning" and "error" roles allows use of color and font to draw attention to warnings. The "padding" role makes the use of vital whitespace more clear (<a href="#padding-role" title="The Padding Role ({P:})">Section 2.2.1.6</a>).</p>
 <p id="doc_section_9_3_2_p_5">The "title" role indicates the headings of table and sections. This allows HTML output to use CSS to make this relationship more obvious.</p>
-<div id="doc_figure_u.184"></div> <pre>
+<div id="doc_figure_u.191"></div> <pre>
     printf("Statistics:\n");
     xo_emit("{T:Statistics}:\n");
 	    </pre> <p id="doc_section_9_3_2_p_7">The "color" roles controls foreground and background colors, as well as effects like bold and underline (see <a href="#color-role" title="The Color Role ({C:})">Section 2.2.1.1</a>).</p>
-<div id="doc_figure_u.185"></div> <pre>
+<div id="doc_figure_u.192"></div> <pre>
     xo_emit("{C:bold}required{C:}\n");
 	    </pre> <p id="doc_section_9_3_2_p_9">Finally, the start- and stop-anchor roles allow justification and padding over multiple fields (see <a href="#anchor-role" title="The Anchor Roles ({[:} and {]:})">Section 2.2.1.10</a>).</p>
-<div id="doc_figure_u.186"></div> <pre>
+<div id="doc_figure_u.193"></div> <pre>
     snprintf(buf, sizeof(buf), "(%u/%u/%u)", min, ave, max);
     printf("%30s", buf);
 
@@ -26285,7 +26435,7 @@ jQuery(function ($) {
 <a id="creating-hierarchy" href="#creating-hierarchy">Creating Hierarchy</a>
 </h3>
 <p id="doc_section_9_3_3_p_1">Text output doesn't have any sort of hierarchy, but XML and JSON require this. Typically applications use indentation to represent these relationship:</p>
-<div id="doc_figure_u.187"></div> <pre>
+<div id="doc_figure_u.194"></div> <pre>
     printf("table %d\n", tnum);
     for (i = 0; i &lt; tmax; i++) {
         printf("    %s %d\n", table[i].name, table[i].size);
@@ -26303,7 +26453,7 @@ jQuery(function ($) {
 	    </pre> <p id="doc_section_9_3_3_p_3">The open and close list functions are used before and after the list, and the open and close instance functions are used before and after each instance with in the list.</p>
 <p id="doc_section_9_3_3_p_4">Typically these developer looks for a "for" loop as an indication of where to put these calls.</p>
 <p id="doc_section_9_3_3_p_5">In addition, the open and close container functions allow for organization levels of hierarchy.</p>
-<div id="doc_figure_u.188"></div> <pre>
+<div id="doc_figure_u.195"></div> <pre>
     printf("Paging information:\n");
     printf("    Free:      %lu\n", free);
     printf("    Active:    %lu\n", active);
@@ -26322,7 +26472,7 @@ jQuery(function ($) {
 <a id="converting-error-functions" href="#converting-error-functions">Converting Error Functions</a>
 </h3>
 <p id="doc_section_9_3_4_p_1">libxo provides variants of the standard error and warning functions, err(3) and warn(3). There are two variants, one for putting the errors on standard error, and the other writes the errors and warnings to the handle using the appropriate encoding style:</p>
-<div id="doc_figure_u.189"></div> <pre>
+<div id="doc_figure_u.196"></div> <pre>
     err(1, "cannot open output file: %s", file);
 
     xo_err(1, "cannot open output file: %s", file);
@@ -26340,12 +26490,12 @@ jQuery(function ($) {
 <a href="#doc_section_9_5">9.5</a> </div>
 <a id="howto-i18n" href="#howto-i18n">Howto: Internationalization (i18n)</a>
 </h2>
-<div id="doc_figure_u.190"></div> <pre>
+<div id="doc_figure_u.197"></div> <pre>
     How do I use libxo to support internationalization?
 	    </pre> <p id="doc_section_9_5_p_2">libxo allows format and field strings to be used a keys into message catalogs to enable translation into a user's native language by invoking the standard gettext(3) functions.</p>
 <p id="doc_section_9_5_p_3">gettext setup is a bit complicated: text strings are extracted from source files into "portable object template" (.pot) files using the "xgettext" command. For each language, this template file is used as the source for a message catalog in the "portable object" (.po) format, which are translated by hand and compiled into "machine object" (.mo) files using the "msgfmt" command. The .mo files are then typically installed in the /usr/share/locale or /opt/local/share/locale directories. At run time, the user's language settings are used to select a .mo file which is searched for matching messages. Text strings in the source code are used as keys to look up the native language strings in the .mo file.</p>
 <p id="doc_section_9_5_p_4">Since the xo_emit format string is used as the key into the message catalog, libxo removes unimportant field formatting and modifiers from the format string before use so that minor formatting changes will not impact the expensive translation process. We don't want a developer change such as changing "/%06d" to "/%08d" to force hand inspection of all .po files. The simplified version can be generated for a single message using the "xopo -s &lt;text&gt;" command, or an entire .pot can be translated using the "xopo -f &lt;input&gt; -o &lt;output&gt;" command.</p>
-<div id="doc_figure_u.191"></div> <pre>
+<div id="doc_figure_u.198"></div> <pre>
     EXAMPLE:
         % xopo -s "There are {:count/%u} {:event/%.6s} events\n"
         There are {:count} {:event} events\n
@@ -26378,7 +26528,7 @@ jQuery(function ($) {
         sudo cp po/my_lang/LC_MESSAGES/foo.mo \
                 /opt/local/share/locale/my_lang/LC_MESSAGE/
 	    </pre> <p id="doc_section_9_5_p_6">Once these steps are complete, you can use the "gettext" command to test the message catalog:</p>
-<div id="doc_figure_u.192"></div> <pre>
+<div id="doc_figure_u.199"></div> <pre>
     gettext -d foo -e "some text"
 	    </pre> <p id="doc_section_9_5_p_8">Section Contents: </p>
 <ul><li><a href="#i18n-and-xo_emit" title="i18n and xo_emit">Section 9.5.1</a></li></ul>
@@ -26396,7 +26546,7 @@ jQuery(function ($) {
 <li>The "{p:}" modifier looks for a pluralized version of the field.</li>
 </ul>
 <p id="doc_section_9_5_1_p_3">Together these three flags allows a single function call to give native language support, as well as libxo's normal XML, JSON, and HTML support.</p>
-<div id="doc_figure_u.193"></div> <pre>
+<div id="doc_figure_u.200"></div> <pre>
     printf(gettext("Received %zu %s from {g:server} server\n"),
            counter, ngettext("byte", "bytes", counter),
            gettext("web"));
@@ -26404,17 +26554,17 @@ jQuery(function ($) {
     xo_emit("{G:}Received {:received/%zu} {Ngp:byte,bytes} "
             "from {g:server} server\n", counter, "web");
 	    </pre> <p id="doc_section_9_5_1_p_5">libxo will see the "{G:}" role and will first simplify the format string, removing field formats and modifiers.</p>
-<div id="doc_figure_u.194"></div> <pre>
+<div id="doc_figure_u.201"></div> <pre>
     "Received {:received} {N:byte,bytes} from {:server} server\n"
 	    </pre> <p id="doc_section_9_5_1_p_7">libxo calls gettext(3) with that string to get a localized version. If your language were Pig Latin, the result might look like:</p>
-<div id="doc_figure_u.195"></div> <pre>
+<div id="doc_figure_u.202"></div> <pre>
     "Eceivedray {:received} {N:byte,bytes} omfray "
                "{:server} erversay\n"
 	    </pre> <p id="doc_section_9_5_1_p_9">Note the field names do not change and they should not be translated. The contents of the note ("byte,bytes") should also not be translated, since the "g" modifier will need the untranslated value as the key for the message catalog.</p>
 <p id="doc_section_9_5_1_p_10">The field "{g:server}" requests the rendered value of the field be translated using gettext(3). In this example, "web" would be used.</p>
 <p id="doc_section_9_5_1_p_11">The field "{Ngp:byte,bytes}" shows an example of plural form using the "p" modifier with the "g" modifier. The base singular and plural forms appear inside the field, separated by a comma. At run time, libxo uses the previous field's numeric value to decide which form to use by calling ngettext(3).</p>
 <p id="doc_section_9_5_1_p_12">If a domain name is needed, it can be supplied as the content of the {G:} role. Domain names remain in use throughout the format string until cleared with another domain name.</p>
-<div id="doc_figure_u.196"></div> <pre>
+<div id="doc_figure_u.203"></div> <pre>
     printf(dgettext("dns", "Host %s not found: %d(%s)\n"),
         name, errno, dgettext("strerror", strerror(errno)));
 
@@ -26439,7 +26589,7 @@ jQuery(function ($) {
 <a id="unit-test" href="#unit-test">Unit Test</a>
 </h2>
 <p id="doc_section_10_1_p_1">Here is the unit test example:</p>
-<div id="doc_figure_u.197"></div> <pre>
+<div id="doc_figure_u.204"></div> <pre>
     int
     main (int argc, char **argv)
     {
@@ -26532,7 +26682,7 @@ jQuery(function ($) {
         return 0;
     }
 	    </pre> <p id="doc_section_10_1_p_3">Text output:</p>
-<div id="doc_figure_u.198"></div> <pre>
+<div id="doc_figure_u.205"></div> <pre>
     % ./testxo --libxo text
     Item 'gum':
        Total sold: 1412.0
@@ -26565,7 +26715,7 @@ jQuery(function ($) {
        On order: 1
        SKU: GRO-000-533
 	    </pre> <p id="doc_section_10_1_p_5">JSON output:</p>
-<div id="doc_figure_u.199"></div> <pre>
+<div id="doc_figure_u.206"></div> <pre>
     % ./testxo --libxo json,pretty
     "top": {
       "data": {
@@ -26620,7 +26770,7 @@ jQuery(function ($) {
       }
     }
 	    </pre> <p id="doc_section_10_1_p_7">XML output:</p>
-<div id="doc_figure_u.200"></div> <pre>
+<div id="doc_figure_u.207"></div> <pre>
     % ./testxo --libxo pretty,xml
     &lt;top&gt;
       &lt;data&gt;
@@ -26671,7 +26821,7 @@ jQuery(function ($) {
       &lt;/data&gt;
     &lt;/top&gt;
 	    </pre> <p id="doc_section_10_1_p_9">HMTL output:</p>
-<div id="doc_figure_u.201"></div> <pre>
+<div id="doc_figure_u.208"></div> <pre>
     % ./testxo --libxo pretty,html
     &lt;div class="line"&gt;
       &lt;div class="label"&gt;Item&lt;/div&gt;
@@ -26866,7 +27016,7 @@ jQuery(function ($) {
       &lt;div class="data" data-tag="sku"&gt;GRO-000-533&lt;/div&gt;
     &lt;/div&gt;
 	    </pre> <p id="doc_section_10_1_p_11">HTML output with xpath and info flags:</p>
-<div id="doc_figure_u.202"></div> <pre>
+<div id="doc_figure_u.209"></div> <pre>
     % ./testxo --libxo pretty,html,xpath,info
     &lt;div class="line"&gt;
       &lt;div class="label"&gt;Item&lt;/div&gt;
diff --git a/doc/libxo.txt b/doc/libxo.txt
index 1e7acc7984be..ba63702920c5 100644
--- a/doc/libxo.txt
+++ b/doc/libxo.txt
@@ -699,25 +699,26 @@ XOF_WARN is set, a warning will be generated.
 Field modifiers are flags which modify the way content emitted for
 particular output styles:
 
-|---+---------------+-------------------------------------------------|
-| M | Name          | Description                                     |
-|---+---------------+-------------------------------------------------|
-| c | colon         | A colon (":") is appended after the label       |
-| d | display       | Only emit field for display styles (text/HTML)  |
-| e | encoding      | Only emit for encoding styles (XML/JSON)        |
-| g | gettext       | Call gettext on field's render content          |
-| h | humanize (hn) | Format large numbers in human-readable style    |
-|   | hn-space      | Humanize: Place space between numeric and unit  |
-|   | hn-decimal    | Humanize: Add a decimal digit, if number < 10   |
-|   | hn-1000       | Humanize: Use 1000 as divisor instead of 1024   |
-| k | key           | Field is a key, suitable for XPath predicates   |
-| l | leaf-list     | Field is a leaf-list                            |
-| n | no-quotes     | Do not quote the field when using JSON style    |
-| p | plural        | Gettext: Use comma-separated plural form        |
-| q | quotes        | Quote the field when using JSON style           |
-| t | trim          | Trim leading and trailing whitespace            |
-| w | white         | A blank (" ") is appended after the label       |
-|---+---------------+-------------------------------------------------|
+|---+---------------+--------------------------------------------------|
+| M | Name          | Description                                      |
+|---+---------------+--------------------------------------------------|
+| a | argument      | The content appears as a 'const char *' argument |
+| c | colon         | A colon (":") is appended after the label        |
+| d | display       | Only emit field for display styles (text/HTML)   |
+| e | encoding      | Only emit for encoding styles (XML/JSON)         |
+| g | gettext       | Call gettext on field's render content           |
+| h | humanize (hn) | Format large numbers in human-readable style     |
+|   | hn-space      | Humanize: Place space between numeric and unit   |
+|   | hn-decimal    | Humanize: Add a decimal digit, if number < 10    |
+|   | hn-1000       | Humanize: Use 1000 as divisor instead of 1024    |
+| k | key           | Field is a key, suitable for XPath predicates    |
+| l | leaf-list     | Field is a leaf-list                             |
+| n | no-quotes     | Do not quote the field when using JSON style     |
+| p | plural        | Gettext: Use comma-separated plural form         |
+| q | quotes        | Quote the field when using JSON style            |
+| t | trim          | Trim leading and trailing whitespace             |
+| w | white         | A blank (" ") is appended after the label        |
+|---+---------------+--------------------------------------------------|
 
 Roles and modifiers can also use more verbose names, when preceeded by
 a comma.  For example, the modifier string "Lwc" (or "L,white,colon")
@@ -727,6 +728,27 @@ modifier string "Vkq" (or ":key,quote") means the field has a value
 role (the default role), that it is a key for the current instance,
 and that the value should be quoted when encoded for JSON.
 
+**** The Argument Modifier ({a:})
+
+The argument modifier indicates that the content of the field
+descriptor will be placed as a UTF-8 string (const char *) argument
+within the xo_emit parameters.
+
+    EXAMPLE:
+      xo_emit("{La:} {a:}\n", "Label text", "label", "value");
+    TEXT:
+      Label text value
+    JSON:
+      "label": "value"
+    XML:
+      <label>value</label>
+
+The argument modifier allows field names for value fields to be passed
+on the stack, avoiding the need to build a field descriptor using
+snprintf.  For many field roles, the argument modifier is not needed,
+since those roles have specific mechanisms for arguments, such as
+"{C:fg-%s}".
+
 **** The Colon Modifier ({c:})
 
 The colon modifier appends a single colon to the data value:
@@ -907,6 +929,21 @@ needed, but often this needs to be controlled by the caller.
     JSON:
       "year": "2014"
 
+The heuristic is based on the format; if the format uses any of the
+following conversion specifiers, then no quotes are used:
+
+    d i o u x X D O U e E f F g G a A c C p
+
+**** The Trim Modifier ({t:})
+
+The trim modifier removes any leading or trailing whitespace from
+the value.
+
+    EXAMPLE:
+      xo_emit("{t:description}", "   some  input   ");
+    JSON:
+      "description": "some input"
+
 **** The White Space Modifier ({w:})
 
 The white space modifier appends a single space to the data value:
@@ -1029,6 +1066,24 @@ LANG, or LC_ALL environment varibles.  The first of this list of
 variables is used and if none of the variables are set, the locale
 defaults to "UTF-8".
 
+libxo will convert these arguments as needed to either UTF-8 (for XML,
+JSON, and HTML styles) or locale-based strings for display in text
+style.
+
+   xo_emit("Alll strings are utf-8 content {:tag/%ls}",
+           L"except for wide strings");
+
+"%S" is equivalent to "%ls".
+
+|--------+-----------------+-------------------------------|
+| Format | Argument Type   | Argument Contents             |
+|--------+-----------------+-------------------------------|
+| %s     | const char *    | UTF-8 string                  |
+| %S     | const char *    | UTF-8 string (alias for '%s') |
+| %ls    | const wchar_t * | Wide character UNICODE string |
+| %hs    | const char *    | locale-based string           |
+|--------+-----------------+-------------------------------|
+
 For example, a function is passed a locale-base name, a hat size,
 and a time value.  The hat size is formatted in a UTF-8 (ASCII)
 string, and the time value is formatted into a wchar_t string.
@@ -1163,6 +1218,53 @@ variants might be wise.
 | xo_emit_errc     | xo_emit_errc_p         |
 |------------------+------------------------|
 
+*** Retaining Parsed Format Information @retain@
+
+libxo can retain the parsed internal information related to the given
+format string, allowing subsequent xo_emit calls, the retained
+information is used, avoiding repetitive parsing of the format string.
+
+    SYNTAX:
+      int xo_emit_f(xo_emit_flags_t flags, const char fmt, ...);
+    EXAMPLE:
+      xo_emit_f(XOEF_RETAIN, "{:some/%02d}{:thing/%-6s}{:fancy}\n",
+                     some, thing, fancy);
+
+To retain parsed format information, use the XOEF_RETAIN flag to the
+xo_emit_f() function.  A complete set of xo_emit_f functions exist to
+match all the xo_emit function signatures (with handles, varadic
+argument, and printf-like flags):
+
+|------------------+------------------------|
+| Function         | Flags Equivalent       |
+|------------------+------------------------|
+| xo_emit_hv       | xo_emit_hvf            |
+| xo_emit_h        | xo_emit_hf             |
+| xo_emit          | xo_emit_f              |
+| xo_emit_hvp      | xo_emit_hvfp           |
+| xo_emit_hp       | xo_emit_hfp            |
+| xo_emit_p        | xo_emit_fp             |
+|------------------+------------------------|
+
+The format string must be immutable across multiple calls to xo_emit_f(),
+since the library retains the string.  Typically this is done by using
+static constant strings, such as string literals. If the string is not
+immutable, the XOEF_RETAIN flag must not be used.
+
+The functions xo_retain_clear() and xo_retain_clear_all() release
+internal information on either a single format string or all format
+strings, respectively.  Neither is required, but the library will
+retain this information until it is cleared or the process exits.
+
+    const char *fmt = "{:name}  {:count/%d}\n";
+    for (i = 0; i < 1000; i++) {
+        xo_open_instance("item");
+        xo_emit_f(XOEF_RETAIN, fmt, name[i], count[i]);
+    }
+    xo_retain_clear(fmt);
+
+The retained information is kept as thread-specific data.
+
 *** Example
 
 In this example, the value for the number of items in stock is emitted:
@@ -1196,46 +1298,6 @@ penultimate line to:
           data-type="number"
           data-help="Number of items in stock">144</div>
 
-** Command-line Arguments
-
-libxo uses command line options to trigger rendering behavior.  The
-following options are recognised:
-
-- --libxo <options>
-- --libxo=<options>
-- --libxo:<brief-options>
-
-Options is a comma-separated list of tokens that correspond to output
-styles, flags, or features:
-
-|-------------+-------------------------------------------------------|
-| Token       | Action                                                |
-|-------------+-------------------------------------------------------|
-| color       | Enable colors/effects for display styles (TEXT, HTML) |
-| dtrt        | Enable "Do The Right Thing" mode                      |
-| html        | Emit HTML output                                      |
-| indent=xx   | Set the indentation level                             |
-| info        | Add info attributes (HTML)                            |
-| json        | Emit JSON output                                      |
-| keys        | Emit the key attribute for keys (XML)                 |
-| log-gettext | Log (via stderr) each gettext(3) string lookup        |
-| log-syslog  | Log (via stderr) each syslog message (via xo_syslog)  |
-| no-humanize | Ignore the {h:} modifier (TEXT, HTML)                 |
-| no-locale   | Do not initialize the locale setting                  |
-| no-top      | Do not emit a top set of braces (JSON)                |
-| not-first   | Pretend the 1st output item was not 1st (JSON)        |
-| pretty      | Emit pretty-printed output                            |
-| text        | Emit TEXT output                                      |
-| underscores | Replace XML-friendly "-"s with JSON friendly "_"s e   |
-| units       | Add the 'units' (XML) or 'data-units (HTML) attribute |
-| warn        | Emit warnings when libxo detects bad calls            |
-| warn-xml    | Emit warnings in XML                                  |
-| xml         | Emit XML output                                       |
-| xpath       | Add XPath expressions (HTML)                          |
-|-------------+-------------------------------------------------------|
-
-The brief options are detailed in ^LIBXO_OPTIONS^.
-
 ** Representing Hierarchy
 
 For XML and JSON, individual fields appear inside hierarchies which
@@ -1382,68 +1444,89 @@ properly.
         xo_close_marker("fish-guts");
     }
 
-** Handles @handles@
-
-libxo uses "handles" to control its rendering functionality.  The
-handle contains state and buffered data, as well as callback functions
-to process data.
-
-A default handle is used when a NULL is passed to functions accepting
-a handle.  This handle is initialized to write its data to stdout
-using the default style of text (XO_STYLE_TEXT).
-
-For the convenience of callers, the libxo library includes handle-less
-functions that implicitly use the default handle.  Any function that
-takes a handle will use the default handle is a value of NULL is
-passed in place of a valid handle.
-
-For example, the following are equivalent:
-
-    xo_emit("test");
-    xo_emit_h(NULL, "test");
+** Command-line Arguments
 
-Handles are created using xo_create() and destroy using xo_destroy().
+libxo uses command line options to trigger rendering behavior.  The
+following options are recognised:
 
-** UTF-8
+- --libxo <options>
+- --libxo=<options>
+- --libxo:<brief-options>
 
-All strings for libxo must be UTF-8.  libxo will handle turning them
-into locale-based strings for display to the user.
+Programs using libxo are expecting to call the xo_parse_args function
+to parse these arguments.  See ^xo_parse_args^ for details.
 
-The only exception is argument formatted using the "%ls" format, which
-require a wide character string (wchar_t *) as input.  libxo will
-convert these arguments as needed to either UTF-8 (for XML, JSON, and
-HTML styles) or locale-based strings for display in text style.
+Options is a comma-separated list of tokens that correspond to output
+styles, flags, or features:
 
-   xo_emit("Alll strings are utf-8 content {:tag/%ls}",
-           L"except for wide strings");
+|-------------+-------------------------------------------------------|
+| Token       | Action                                                |
+|-------------+-------------------------------------------------------|
+| color       | Enable colors/effects for display styles (TEXT, HTML) |
+| dtrt        | Enable "Do The Right Thing" mode                      |
+| html        | Emit HTML output                                      |
+| indent=xx   | Set the indentation level                             |
+| info        | Add info attributes (HTML)                            |
+| json        | Emit JSON output                                      |
+| keys        | Emit the key attribute for keys (XML)                 |
+| log-gettext | Log (via stderr) each gettext(3) string lookup        |
+| log-syslog  | Log (via stderr) each syslog message (via xo_syslog)  |
+| no-humanize | Ignore the {h:} modifier (TEXT, HTML)                 |
+| no-locale   | Do not initialize the locale setting                  |
+| no-retain   | Prevent retaining formatting information              |
+| no-top      | Do not emit a top set of braces (JSON)                |
+| not-first   | Pretend the 1st output item was not 1st (JSON)        |
+| pretty      | Emit pretty-printed output                            |
+| retain      | Force retaining formatting information                |
+| text        | Emit TEXT output                                      |
+| underscores | Replace XML-friendly "-"s with JSON friendly "_"s e   |
+| units       | Add the 'units' (XML) or 'data-units (HTML) attribute |
+| warn        | Emit warnings when libxo detects bad calls            |
+| warn-xml    | Emit warnings in XML                                  |
+| xml         | Emit XML output                                       |
+| xpath       | Add XPath expressions (HTML)                          |
+|-------------+-------------------------------------------------------|
 
-"%S" is equivalent to "%ls".
+The brief options are detailed in ^LIBXO_OPTIONS^.
 
 * The libxo API
 
 This section gives details about the functions in libxo, how to call
 them, and the actions they perform.
 
-** Handles
+** Handles @handles@
+
+libxo uses "handles" to control its rendering functionality.  The
+handle contains state and buffered data, as well as callback functions
+to process data.
 
 Handles give an abstraction for libxo that encapsulates the state of a
 stream of output.  Handles have the data type "xo_handle_t" and are
 opaque to the caller.
 
 The library has a default handle that is automatically initialized.
-By default, this handle will send text style output to standard output.
-The xo_set_style and xo_set_flags functions can be used to change this
-behavior.
-
-Many libxo functions take a handle as their first parameter; most that
-do not use the default handle.  Any function taking a handle can
-be passed NULL to access the default handle.
+By default, this handle will send text style output (XO_STYLE_TEXT) to
+standard output.  The xo_set_style and xo_set_flags functions can be
+used to change this behavior.
 
 For the typical command that is generating output on standard output,
 there is no need to create an explicit handle, but they are available
 when needed, e.g., for daemons that generate multiple streams of
 output.
 
+Many libxo functions take a handle as their first parameter; most that
+do not use the default handle.  Any function taking a handle can be
+passed NULL to access the default handle.  For the convenience of
+callers, the libxo library includes handle-less functions that
+implicitly use the default handle.
+
+For example, the following are equivalent:
+
+    xo_emit("test");
+    xo_emit_h(NULL, "test");
+
+Handles are created using xo_create() and destroy using xo_destroy().
+
 *** xo_create
 
 A handle can be allocated using the xo_create() function:
@@ -1653,11 +1736,34 @@ string, since an inappropriate cast can ruin your day.  The vap
 argument to xo_emit_hv() points to a variable argument list that can
 be used to retrieve arguments via va_arg().
 
+*** Single Field Emitting Functions (xo_emit_field) @xo_emit_field@
+
+The following functions can also make output, but only make a single
+field at a time:
+
+    int xo_emit_field_hv (xo_handle_t *xop, const char *rolmod,
+                  const char *contents, const char *fmt, 
+		  const char *efmt, va_list vap);
+
+    int xo_emit_field_h (xo_handle_t *xop, const char *rolmod, 
+                 const char *contents, const char *fmt,
+		 const char *efmt, ...);
+
+    int xo_emit_field (const char *rolmod, const char *contents,
+	         const char *fmt, const char *efmt, ...);
+
+These functions are intended to avoid the scenario where one
+would otherwise need to compose a format descriptors using
+snprintf().  The individual parts of the format descriptor are
+passed in distinctly.
+
+    xo_emit("T", "Host name is ", NULL, NULL);
+    xo_emit("V", "host-name", NULL, NULL, host-name);
+
 *** Attributes (xo_attr) @xo_attr@
 
 The xo_attr() function emits attributes for the XML output style.
 
-
     int xo_attr (const char *name, const char *fmt, ...);
     int xo_attr_h (xo_handle_t *xop, const char *name, 
                    const char *fmt, ...);
@@ -2555,23 +2661,23 @@ In 2001, we added an XML API to the JUNOS operating system, which is
 built on top of FreeBSD.  Eventually this API became standardized as
 the NETCONF API (RFC 6241).  As part of this effort, we modified many
 FreeBSD utilities to emit XML, typically via a "-X" switch.  The
-results were mixed.  The cost of maintaining this code, updating it
+results were mixed.  The cost of maintaining this code, updating it,
 and carrying it were non-trivial, and contributed to our expense (and
 the associated delay) with upgrading the version of FreeBSD on which
 each release of JUNOS is based.
 
 A recent (2014) effort within JUNOS aims at removing our modifications
 to the underlying FreeBSD code as a means of reducing the expense and
-delay.  JUNOS is structured to have system components generate XML
-that is rendered by the CLI (think: login shell) into human-readable
-text.  This allows the API to use the same plumbing as the CLI, and
-ensures that all components emit XML, and that it is emitted with
-knowledge of the consumer of that XML, yielding an API that have no
-incremental cost or feature delay.
+delay in tracking HEAD.  JUNOS is structured to have system components
+generate XML that is rendered by the CLI (think: login shell) into
+human-readable text.  This allows the API to use the same plumbing as
+the CLI, and ensures that all components emit XML, and that it is
+emitted with knowledge of the consumer of that XML, yielding an API
+that have no incremental cost or feature delay.
 
 libxo is an effort to mix the best aspects of the JUNOS strategy into
 FreeBSD in a seemless way, allowing commands to make printf-like
-output calls without needing to care how the output is rendered.
+output calls with a single code path.
 
 *** Did the complex semantics of format strings evolve over time?
 
diff --git a/encoder/cbor/enc_cbor.c b/encoder/cbor/enc_cbor.c
index 513063fb1508..7c0a1d33f932 100644
--- a/encoder/cbor/enc_cbor.c
+++ b/encoder/cbor/enc_cbor.c
@@ -135,7 +135,7 @@ cbor_encode_uint (xo_buffer_t *xbp, uint64_t minor, unsigned limit)
     char *bp = xbp->xb_curp;
     int i, m;
 
-    if (minor > (1UL<<32)) {
+    if (minor > (1ULL << 32)) {
 	*bp++ |= CBOR_LEN64;
 	m = 64;
 
diff --git a/libxo-config.in b/libxo-config.in
index 3dbb7d41a364..f08f2340ecdb 100644
--- a/libxo-config.in
+++ b/libxo-config.in
@@ -77,34 +77,34 @@ while test $# -gt 0; do
 	;;
 
     --cflags)
-       	echo -I@LIBXO_INCLUDEDIR@ @LIBXO_CFLAGS@
+       	echo -I@XO_INCLUDEDIR@ @XO_CFLAGS@
        	;;
 
 
     --share)
-       	echo @LIBXO_SHAREDIR@
+       	echo @XO_SHAREDIR@
        	;;
 
     --bindir)
-       	echo @LIBXO_BINDIR@
+       	echo @XO_BINDIR@
        	;;
 
     --libdir)
-       	echo @LIBXO_LIBDIR@
+       	echo @XO_LIBDIR@
        	;;
 
 
     --libs)
         if [ "`uname`" = "Linux" ]
 	then
-	    if [ "@LIBXO_LIBDIR@" = "-L/usr/lib" -o "@LIBXO_LIBDIR@" = "-L/usr/lib64" ]
+	    if [ "@XO_LIBDIR@" = "-L/usr/lib" -o "@XO_LIBDIR@" = "-L/usr/lib64" ]
 	    then
-		echo @LIBXO_LIBS@ 
+		echo @XO_LIBS@ 
 	    else
-		echo -L@LIBXO_LIBDIR@ @LIBXO_LIBS@ 
+		echo -L@XO_LIBDIR@ @XO_LIBS@ 
 	    fi
 	else
-	    echo -L@LIBXO_LIBDIR@ @LIBXO_LIBS@ @WIN32_EXTRA_LIBADD@
+	    echo -L@XO_LIBDIR@ @XO_LIBS@
 	fi
        	;;
 
diff --git a/libxo/libxo.c b/libxo/libxo.c
index bae810f179c7..194a0962b428 100644
--- a/libxo/libxo.c
+++ b/libxo/libxo.c
@@ -19,7 +19,8 @@
  *   http://juniper.github.io/libxo/libxo-manual.html
  *
  * For first time readers, the core bits of code to start looking at are:
- * - xo_do_emit() -- the central function of the library
+ * - xo_do_emit() -- parse and emit a set of fields
+ * - xo_do_emit_fields -- the central function of the library
  * - xo_do_format_field() -- handles formatting a single field
  * - xo_transiton() -- the state machine that keeps things sane
  * and of course the "xo_handle_t" data structure, which carries all
@@ -120,6 +121,7 @@
 
 const char xo_version[] = LIBXO_VERSION;
 const char xo_version_extra[] = LIBXO_VERSION_EXTRA;
+static const char xo_default_format[] = "%s";
 
 #ifndef UNUSED
 #define UNUSED __attribute__ ((__unused__))
@@ -338,6 +340,7 @@ typedef unsigned long xo_xff_flags_t;
 #define XFF_GT_FIELD	(1<<19) /* Call gettext() on a field */
 
 #define XFF_GT_PLURAL	(1<<20)	/* Call dngettext to find plural form */
+#define XFF_ARGUMENT	(1<<21)	/* Content provided via argument */
 
 /* Flags to turn off when we don't want i18n processing */
 #define XFF_GT_FLAGS (XFF_GT_FIELD | XFF_GT_PLURAL)
@@ -1046,7 +1049,7 @@ xo_is_utf8 (char ch)
     return (ch & 0x80);
 }
 
-static int
+static inline int
 xo_utf8_to_wc_len (const char *buf)
 {
     unsigned b = (unsigned char) *buf;
@@ -1105,9 +1108,13 @@ xo_buf_utf8_len (xo_handle_t *xop, const char *buf, int bufsiz)
  * bits we pull off the first character is dependent on the length,
  * but we put 6 bits off all other bytes.
  */
-static wchar_t
+static inline wchar_t
 xo_utf8_char (const char *buf, int len)
 {
+    /* Most common case: singleton byte */
+    if (len == 1)
+	return (unsigned char) buf[0];
+
     int i;
     wchar_t wc;
     const unsigned char *cp = (const unsigned char *) buf;
@@ -1281,6 +1288,195 @@ xo_data_escape (xo_handle_t *xop, const char *str, int len)
     xo_buf_escape(xop, &xop->xo_data, str, len, 0);
 }
 
+#ifdef LIBXO_NO_RETAIN
+/*
+ * Empty implementations of the retain logic
+ */
+
+void
+xo_retain_clear_all (void)
+{
+    return;
+}
+
+void
+xo_retain_clear (const char *fmt UNUSED)
+{
+    return;
+}
+static void
+xo_retain_add (const char *fmt UNUSED, xo_field_info_t *fields UNUSED,
+		unsigned num_fields UNUSED)
+{
+    return;
+}
+
+static int
+xo_retain_find (const char *fmt UNUSED, xo_field_info_t **valp UNUSED,
+		 unsigned *nump UNUSED)
+{
+    return -1;
+}
+
+#else /* !LIBXO_NO_RETAIN */
+/*
+ * Retain: We retain parsed field definitions to enhance performance,
+ * especially inside loops.  We depend on the caller treating the format
+ * strings as immutable, so that we can retain pointers into them.  We
+ * hold the pointers in a hash table, so allow quick access.  Retained
+ * information is retained until xo_retain_clear is called.
+ */
+
+/*
+ * xo_retain_entry_t holds information about one retained set of
+ * parsed fields.
+ */
+typedef struct xo_retain_entry_s {
+    struct xo_retain_entry_s *xre_next; /* Pointer to next (older) entry */
+    unsigned long xre_hits;		 /* Number of times we've hit */
+    const char *xre_format;		 /* Pointer to format string */
+    unsigned xre_num_fields;		 /* Number of fields saved */
+    xo_field_info_t *xre_fields;	 /* Pointer to fields */
+} xo_retain_entry_t;
+
+/*
+ * xo_retain_t holds a complete set of parsed fields as a hash table.
+ */
+#ifndef XO_RETAIN_SIZE
+#define XO_RETAIN_SIZE 6
+#endif /* XO_RETAIN_SIZE */
+#define RETAIN_HASH_SIZE (1<<XO_RETAIN_SIZE)
+
+typedef struct xo_retain_s {
+    xo_retain_entry_t *xr_bucket[RETAIN_HASH_SIZE];
+} xo_retain_t;
+
+static THREAD_LOCAL(xo_retain_t) xo_retain;
+static THREAD_LOCAL(unsigned) xo_retain_count;
+
+/*
+ * Simple hash function based on Thomas Wang's paper.  The original is
+ * gone, but an archive is available on the Way Back Machine:
+ *
+ * http://web.archive.org/web/20071223173210/\
+ *     http://www.concentric.net/~Ttwang/tech/inthash.htm
+ *
+ * For our purposes, we can assume the low four bits are uninteresting
+ * since any string less that 16 bytes wouldn't be worthy of
+ * retaining.  We toss the high bits also, since these bits are likely
+ * to be common among constant format strings.  We then run Wang's
+ * algorithm, and cap the result at RETAIN_HASH_SIZE.
+ */
+static unsigned
+xo_retain_hash (const char *fmt)
+{
+    volatile uintptr_t iptr = (uintptr_t) (const void *) fmt;
+
+    /* Discard low four bits and high bits; they aren't interesting */
+    uint32_t val = (uint32_t) ((iptr >> 4) & (((1 << 24) - 1)));
+
+    val = (val ^ 61) ^ (val >> 16);
+    val = val + (val << 3);
+    val = val ^ (val >> 4);
+    val = val * 0x3a8f05c5;	/* My large prime number */
+    val = val ^ (val >> 15);
+    val &= RETAIN_HASH_SIZE - 1;
+
+    return val;
+}	
+
+/*
+ * Walk all buckets, clearing all retained entries
+ */
+void
+xo_retain_clear_all (void)
+{
+    int i;
+    xo_retain_entry_t *xrep, *next;
+
+    for (i = 0; i < RETAIN_HASH_SIZE; i++) {
+	for (xrep = xo_retain.xr_bucket[i]; xrep; xrep = next) {
+	    next = xrep->xre_next;
+	    xo_free(xrep);
+	}
+	xo_retain.xr_bucket[i] = NULL;
+    }
+    xo_retain_count = 0;
+}
+
+/*
+ * Walk all buckets, clearing all retained entries
+ */
+void
+xo_retain_clear (const char *fmt)
+{
+    xo_retain_entry_t **xrepp;
+    unsigned hash = xo_retain_hash(fmt);
+
+    for (xrepp = &xo_retain.xr_bucket[hash]; *xrepp;
+	 xrepp = &(*xrepp)->xre_next) {
+	if ((*xrepp)->xre_format == fmt) {
+	    *xrepp = (*xrepp)->xre_next;
+	    xo_retain_count -= 1;
+	    return;
+	}
+    }
+}
+
+/*
+ * Search the hash for an entry matching 'fmt'; return it's fields.
+ */
+static int
+xo_retain_find (const char *fmt, xo_field_info_t **valp, unsigned *nump)
+{
+    if (xo_retain_count == 0)
+	return -1;
+
+    unsigned hash = xo_retain_hash(fmt);
+    xo_retain_entry_t *xrep;
+
+    for (xrep = xo_retain.xr_bucket[hash]; xrep != NULL;
+	 xrep = xrep->xre_next) {
+	if (xrep->xre_format == fmt) {
+	    *valp = xrep->xre_fields;
+	    *nump = xrep->xre_num_fields;
+	    xrep->xre_hits += 1;
+	    return 0;
+	}
+    }
+
+    return -1;
+}
+
+static void
+xo_retain_add (const char *fmt, xo_field_info_t *fields, unsigned num_fields)
+{
+    unsigned hash = xo_retain_hash(fmt);
+    xo_retain_entry_t *xrep;
+    unsigned sz = sizeof(*xrep) + (num_fields + 1) * sizeof(*fields);
+    xo_field_info_t *xfip;
+
+    xrep = xo_realloc(NULL, sz);
+    if (xrep == NULL)
+	return;
+
+    xfip = (xo_field_info_t *) &xrep[1];
+    memcpy(xfip, fields, num_fields * sizeof(*fields));
+
+    bzero(xrep, sizeof(*xrep));
+
+    xrep->xre_format = fmt;
+    xrep->xre_fields = xfip;
+    xrep->xre_num_fields = num_fields;
+
+    /* Record the field info in the retain bucket */
+    xrep->xre_next = xo_retain.xr_bucket[hash];
+    xo_retain.xr_bucket[hash] = xrep;
+    xo_retain_count += 1;
+}
+
+#endif /* !LIBXO_NO_RETAIN */
+
 /*
  * Generate a warning.  Normally, this is a text message written to
  * standard error.  If the XOF_WARN_XML flag is set, then we generate
@@ -1574,6 +1770,19 @@ xo_message_hcv (xo_handle_t *xop, int code, const char *fmt, va_list vap)
 	break;
     }
 
+    switch (xo_style(xop)) {
+    case XO_STYLE_HTML:
+	if (XOIF_ISSET(xop, XOIF_DIV_OPEN)) {
+	    static char div_close[] = "</div>";
+	    XOIF_CLEAR(xop, XOIF_DIV_OPEN);
+	    xo_data_append(xop, div_close, sizeof(div_close) - 1);
+
+	    if (XOF_ISSET(xop, XOF_PRETTY))
+		xo_data_append(xop, "\n", 1);
+	}
+	break;
+    }
+
     (void) xo_flush_h(xop);
 }
 
@@ -1680,6 +1889,39 @@ xo_create_to_file (FILE *fp, xo_style_t style, xo_xof_flags_t flags)
 }
 
 /**
+ * Set the default handler to output to a file.
+ * @xop libxo handle
+ * @fp FILE pointer to use
+ */
+int
+xo_set_file_h (xo_handle_t *xop, FILE *fp)
+{
+    xop = xo_default(xop);
+
+    if (fp == NULL) {
+	xo_failure(xop, "xo_set_file: NULL fp");
+	return -1;
+    }
+
+    xop->xo_opaque = fp;
+    xop->xo_write = xo_write_to_file;
+    xop->xo_close = xo_close_file;
+    xop->xo_flush = xo_flush_file;
+
+    return 0;
+}
+
+/**
+ * Set the default handler to output to a file.
+ * @fp FILE pointer to use
+ */
+int
+xo_set_file (FILE *fp)
+{
+    return xo_set_file_h(NULL, fp);
+}
+
+/**
  * Release any resources held by the handle.
  * @xop XO handle to alter (or NULL for default handle)
  */
@@ -1824,9 +2066,11 @@ static xo_mapping_t xo_xof_names[] = {
     { XOF_LOG_SYSLOG, "log-syslog" },
     { XOF_NO_HUMANIZE, "no-humanize" },
     { XOF_NO_LOCALE, "no-locale" },
+    { XOF_RETAIN_NONE, "no-retain" },
     { XOF_NO_TOP, "no-top" },
     { XOF_NOT_FIRST, "not-first" },
     { XOF_PRETTY, "pretty" },
+    { XOF_RETAIN_ALL, "retain" },
     { XOF_UNDERSCORES, "underscores" },
     { XOF_UNITS, "units" },
     { XOF_WARN, "warn" },
@@ -3613,10 +3857,9 @@ xo_format_text (xo_handle_t *xop, const char *str, int len)
 }
 
 static void
-xo_format_title (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_format_title (xo_handle_t *xop, xo_field_info_t *xfip,
+		 const char *str, unsigned len)
 {
-    const char *str = xfip->xfi_content;
-    unsigned len = xfip->xfi_clen;
     const char *fmt = xfip->xfi_format;
     unsigned flen = xfip->xfi_flen;
     xo_xff_flags_t flags = xfip->xfi_flags;
@@ -4083,10 +4326,9 @@ xo_format_value (xo_handle_t *xop, const char *name, int nlen,
 }
 
 static void
-xo_set_gettext_domain (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_set_gettext_domain (xo_handle_t *xop, xo_field_info_t *xfip,
+		       const char *str, unsigned len)
 {
-    const char *str = xfip->xfi_content;
-    unsigned len = xfip->xfi_clen;
     const char *fmt = xfip->xfi_format;
     unsigned flen = xfip->xfi_flen;
 
@@ -4335,13 +4577,13 @@ xo_colors_enabled (xo_handle_t *xop UNUSED)
 }
 
 static void
-xo_colors_handle_text (xo_handle_t *xop UNUSED, xo_colors_t *newp)
+xo_colors_handle_text (xo_handle_t *xop, xo_colors_t *newp)
 {
     char buf[BUFSIZ];
     char *cp = buf, *ep = buf + sizeof(buf);
     unsigned i, bit;
     xo_colors_t *oldp = &xop->xo_colors;
-    const char *code;
+    const char *code = NULL;
 
     /*
      * Start the buffer with an escape.  We don't want to add the '['
@@ -4460,10 +4702,9 @@ xo_colors_handle_html (xo_handle_t *xop, xo_colors_t *newp)
 }
 
 static void
-xo_format_colors (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_format_colors (xo_handle_t *xop, xo_field_info_t *xfip,
+		  const char *str, unsigned len)
 {
-    const char *str = xfip->xfi_content;
-    unsigned len = xfip->xfi_clen;
     const char *fmt = xfip->xfi_format;
     unsigned flen = xfip->xfi_flen;
 
@@ -4534,10 +4775,9 @@ xo_format_colors (xo_handle_t *xop, xo_field_info_t *xfip)
 }
 
 static void
-xo_format_units (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_format_units (xo_handle_t *xop, xo_field_info_t *xfip,
+		 const char *str, unsigned len)
 {
-    const char *str = xfip->xfi_content;
-    unsigned len = xfip->xfi_clen;
     const char *fmt = xfip->xfi_format;
     unsigned flen = xfip->xfi_flen;
     xo_xff_flags_t flags = xfip->xfi_flags;
@@ -4589,10 +4829,9 @@ xo_format_units (xo_handle_t *xop, xo_field_info_t *xfip)
 }
 
 static int
-xo_find_width (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_find_width (xo_handle_t *xop, xo_field_info_t *xfip,
+	       const char *str, unsigned len)
 {
-    const char *str = xfip->xfi_content;
-    unsigned len = xfip->xfi_clen;
     const char *fmt = xfip->xfi_format;
     unsigned flen = xfip->xfi_flen;
 
@@ -4639,7 +4878,8 @@ xo_anchor_clear (xo_handle_t *xop)
  * format it when the end anchor tag is seen.
  */
 static void
-xo_anchor_start (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_anchor_start (xo_handle_t *xop, xo_field_info_t *xfip,
+		 const char *str, unsigned len)
 {
     if (xo_style(xop) != XO_STYLE_TEXT && xo_style(xop) != XO_STYLE_HTML)
 	return;
@@ -4656,11 +4896,12 @@ xo_anchor_start (xo_handle_t *xop, xo_field_info_t *xfip)
      * Now we find the width, if possible.  If it's not there,
      * we'll get it on the end anchor.
      */
-    xop->xo_anchor_min_width = xo_find_width(xop, xfip);
+    xop->xo_anchor_min_width = xo_find_width(xop, xfip, str, len);
 }
 
 static void
-xo_anchor_stop (xo_handle_t *xop, xo_field_info_t *xfip)
+xo_anchor_stop (xo_handle_t *xop, xo_field_info_t *xfip,
+		 const char *str, unsigned len)
 {
     if (xo_style(xop) != XO_STYLE_TEXT && xo_style(xop) != XO_STYLE_HTML)
 	return;
@@ -4672,7 +4913,7 @@ xo_anchor_stop (xo_handle_t *xop, xo_field_info_t *xfip)
 
     XOIF_CLEAR(xop, XOIF_UNITS_PENDING);
 
-    int width = xo_find_width(xop, xfip);
+    int width = xo_find_width(xop, xfip, str, len);
     if (width == 0)
 	width = xop->xo_anchor_min_width;
 
@@ -4787,6 +5028,7 @@ static xo_mapping_t xo_role_names[] = {
 #define XO_ROLE_NEWLINE	'\n'
 
 static xo_mapping_t xo_modifier_names[] = {
+    { XFF_ARGUMENT, "argument" },
     { XFF_COLON, "colon" },
     { XFF_COMMA, "comma" },
     { XFF_DISPLAY_ONLY, "display" },
@@ -4858,6 +5100,7 @@ xo_count_fields (xo_handle_t *xop UNUSED, const char *fmt)
  *   '[': start a section of anchored text
  *   ']': end a section of anchored text
  * The following modifiers are also supported:
+ *   'a': content is provided via argument (const char *), not descriptor
  *   'c': flag: emit a colon after the label
  *   'd': field is only emitted for display styles (text and html)
  *   'e': field is only emitted for encoding styles (xml and json)
@@ -4884,7 +5127,7 @@ xo_parse_roles (xo_handle_t *xop, const char *fmt,
     xo_xff_flags_t flags = 0;
     uint8_t fnum = 0;
 
-    for (sp = basep; sp; sp++) {
+    for (sp = basep; sp && *sp; sp++) {
 	if (*sp == ':' || *sp == '/' || *sp == '}')
 	    break;
 
@@ -4961,6 +5204,10 @@ xo_parse_roles (xo_handle_t *xop, const char *fmt,
 	    fnum = (fnum * 10) + (*sp - '0');
 	    break;
 
+	case 'a':
+	    flags |= XFF_ARGUMENT;
+	    break;
+
 	case 'c':
 	    flags |= XFF_COLON;
 	    break;
@@ -5133,7 +5380,6 @@ static int
 xo_parse_fields (xo_handle_t *xop, xo_field_info_t *fields,
 		 unsigned num_fields, const char *fmt)
 {
-    static const char default_format[] = "%s";
     const char *cp, *sp, *ep, *basep;
     unsigned field = 0;
     xo_field_info_t *xfip = fields;
@@ -5267,12 +5513,12 @@ xo_parse_fields (xo_handle_t *xop, xo_field_info_t *fields,
 	xfip->xfi_next = ++sp;
 
 	/* If we have content, then we have a default format */
-	if (xfip->xfi_clen || format) {
+	if (xfip->xfi_clen || format || (xfip->xfi_flags & XFF_ARGUMENT)) {
 	    if (format) {
 		xfip->xfi_format = format;
 		xfip->xfi_flen = flen;
 	    } else if (xo_role_wants_default_format(xfip->xfi_ftype)) {
-		xfip->xfi_format = default_format;
+		xfip->xfi_format = xo_default_format;
 		xfip->xfi_flen = 2;
 	    }
 	}
@@ -5568,9 +5814,8 @@ xo_gettext_combine_formats (xo_handle_t *xop, const char *fmt UNUSED,
  * Summary: i18n aighn't cheap.
  */
 static const char *
-xo_gettext_build_format (xo_handle_t *xop UNUSED,
-			 xo_field_info_t *fields UNUSED,
-			 int this_field UNUSED,
+xo_gettext_build_format (xo_handle_t *xop,
+			 xo_field_info_t *fields, int this_field,
 			 const char *fmt, char **new_fmtp)
 {
     if (xo_style_is_encoding(xop))
@@ -5686,17 +5931,22 @@ xo_gettext_rebuild_content (xo_handle_t *xop UNUSED,
 #endif /* HAVE_GETTEXT */
 
 /*
- * The central function for emitting libxo output.
+ * Emit a set of fields.  This is really the core of libxo.
  */
 static int
-xo_do_emit (xo_handle_t *xop, const char *fmt)
+xo_do_emit_fields (xo_handle_t *xop, xo_field_info_t *fields,
+		   unsigned max_fields, const char *fmt)
 {
     int gettext_inuse = 0;
     int gettext_changed = 0;
     int gettext_reordered = 0;
+    unsigned ftype;
+    xo_xff_flags_t flags;
     xo_field_info_t *new_fields = NULL;
-
+    xo_field_info_t *xfip;
+    unsigned field;
     int rc = 0;
+
     int flush = XOF_ISSET(xop, XOF_FLUSH);
     int flush_line = XOF_ISSET(xop, XOF_FLUSH_LINE);
     char *new_fmt = NULL;
@@ -5704,20 +5954,6 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
     if (XOIF_ISSET(xop, XOIF_REORDER) || xo_style(xop) == XO_STYLE_ENCODER)
 	flush_line = 0;
 
-    xop->xo_columns = 0;	/* Always reset it */
-    xop->xo_errno = errno;	/* Save for "%m" */
-
-    unsigned max_fields = xo_count_fields(xop, fmt), field;
-    xo_field_info_t fields[max_fields], *xfip;
-
-    bzero(fields, max_fields * sizeof(fields[0]));
-
-    if (xo_parse_fields(xop, fields, max_fields, fmt))
-	return -1;		/* Warning already displayed */
-    
-    unsigned ftype;
-    xo_xff_flags_t flags;
-
     /*
      * Some overhead for gettext; if the fields in the msgstr returned
      * by gettext are reordered, then we need to record start and end
@@ -5745,6 +5981,18 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
 		min_fstart = field;
 	}
 
+	const char *content = xfip->xfi_content;
+	int clen = xfip->xfi_clen;
+
+	if (flags & XFF_ARGUMENT) {
+	    /*
+	     * Argument flag means the content isn't given in the descriptor,
+	     * but as a UTF-8 string ('const char *') argument in xo_vap.
+	     */
+	    content = va_arg(xop->xo_vap, char *);
+	    clen = content ? strlen(content) : 0;
+	}
+
 	if (ftype == XO_ROLE_NEWLINE) {
 	    xo_line_close(xop);
 	    if (flush_line && xo_flush_h(xop) < 0)
@@ -5773,15 +6021,15 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
 	}
 
 	if (ftype == 'V')
-	    xo_format_value(xop, xfip->xfi_content, xfip->xfi_clen,
+	    xo_format_value(xop, content, clen,
 			    xfip->xfi_format, xfip->xfi_flen,
 			    xfip->xfi_encoding, xfip->xfi_elen, flags);
 	else if (ftype == '[')
-	    xo_anchor_start(xop, xfip);
+	    xo_anchor_start(xop, xfip, content, clen);
 	else if (ftype == ']')
-	    xo_anchor_stop(xop, xfip);
+	    xo_anchor_stop(xop, xfip, content, clen);
 	else if (ftype == 'C')
-	    xo_format_colors(xop, xfip);
+	    xo_format_colors(xop, xfip, content, clen);
 
 	else if (ftype == 'G') {
 	    /*
@@ -5792,7 +6040,7 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
 	     * Since gettext returns strings in a static buffer, we make
 	     * a copy in new_fmt.
 	     */
-	    xo_set_gettext_domain(xop, xfip);
+	    xo_set_gettext_domain(xop, xfip, content, clen);
 
 	    if (!gettext_inuse) { /* Only translate once */
 		gettext_inuse = 1;
@@ -5843,17 +6091,17 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
 	    }
 	    continue;
 
-	} else  if (xfip->xfi_clen || xfip->xfi_format) {
+	} else  if (clen || xfip->xfi_format) {
 
 	    const char *class_name = xo_class_name(ftype);
 	    if (class_name)
 		xo_format_content(xop, class_name, xo_tag_name(ftype),
-				  xfip->xfi_content, xfip->xfi_clen,
+				  content, clen,
 				  xfip->xfi_format, xfip->xfi_flen, flags);
 	    else if (ftype == 'T')
-		xo_format_title(xop, xfip);
+		xo_format_title(xop, xfip, content, clen);
 	    else if (ftype == 'U')
-		xo_format_units(xop, xfip);
+		xo_format_units(xop, xfip, content, clen);
 	    else
 		xo_failure(xop, "unknown field type: '%c'", ftype);
 	}
@@ -5884,7 +6132,7 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
     if (flush && !XOIF_ISSET(xop, XOIF_ANCHOR)) {
 	if (xo_write(xop) < 0) 
 	    rc = -1;		/* Report failure */
-	else if (xop->xo_flush && xop->xo_flush(xop->xo_opaque) < 0)
+	else if (xo_flush_h(xop) < 0)
 	    rc = -1;
     }
 
@@ -5905,6 +6153,53 @@ xo_do_emit (xo_handle_t *xop, const char *fmt)
 }
 
 /*
+ * Parse and emit a set of fields
+ */
+static int
+xo_do_emit (xo_handle_t *xop, xo_emit_flags_t flags, const char *fmt)
+{
+    xop->xo_columns = 0;	/* Always reset it */
+    xop->xo_errno = errno;	/* Save for "%m" */
+
+    if (fmt == NULL)
+	return 0;
+
+    unsigned max_fields;
+    xo_field_info_t *fields = NULL;
+
+    /* Adjust XOEF_RETAIN based on global flags */
+    if (XOF_ISSET(xop, XOF_RETAIN_ALL))
+	flags |= XOEF_RETAIN;
+    if (XOF_ISSET(xop, XOF_RETAIN_NONE))
+	flags &= ~XOEF_RETAIN;
+
+    /*
+     * Check for 'retain' flag, telling us to retain the field
+     * information.  If we've already saved it, then we can avoid
+     * re-parsing the format string.
+     */
+    if (!(flags & XOEF_RETAIN)
+	|| xo_retain_find(fmt, &fields, &max_fields) != 0
+	|| fields == NULL) {
+
+	/* Nothing retained; parse the format string */
+	max_fields = xo_count_fields(xop, fmt);
+	fields = alloca(max_fields * sizeof(fields[0]));
+	bzero(fields, max_fields * sizeof(fields[0]));
+
+	if (xo_parse_fields(xop, fields, max_fields, fmt))
+	    return -1;		/* Warning already displayed */
+
+	if (flags & XOEF_RETAIN) {
+	    /* Retain the info */
+	    xo_retain_add(fmt, fields, max_fields);
+	}
+    }
+
+    return xo_do_emit_fields(xop, fields, max_fields, fmt);
+}
+
+/*
  * Rebuild a format string in a gettext-friendly format.  This function
  * is exposed to tools can perform this function.  See xo(1).
  */
@@ -5944,7 +6239,7 @@ xo_emit_hv (xo_handle_t *xop, const char *fmt, va_list vap)
 
     xop = xo_default(xop);
     va_copy(xop->xo_vap, vap);
-    rc = xo_do_emit(xop, fmt);
+    rc = xo_do_emit(xop, 0, fmt);
     va_end(xop->xo_vap);
     bzero(&xop->xo_vap, sizeof(xop->xo_vap));
 
@@ -5958,7 +6253,7 @@ xo_emit_h (xo_handle_t *xop, const char *fmt, ...)
 
     xop = xo_default(xop);
     va_start(xop->xo_vap, fmt);
-    rc = xo_do_emit(xop, fmt);
+    rc = xo_do_emit(xop, 0, fmt);
     va_end(xop->xo_vap);
     bzero(&xop->xo_vap, sizeof(xop->xo_vap));
 
@@ -5972,13 +6267,137 @@ xo_emit (const char *fmt, ...)
     int rc;
 
     va_start(xop->xo_vap, fmt);
-    rc = xo_do_emit(xop, fmt);
+    rc = xo_do_emit(xop, 0, fmt);
+    va_end(xop->xo_vap);
+    bzero(&xop->xo_vap, sizeof(xop->xo_vap));
+
+    return rc;
+}
+
+int
+xo_emit_hvf (xo_handle_t *xop, xo_emit_flags_t flags,
+	     const char *fmt, va_list vap)
+{
+    int rc;
+
+    xop = xo_default(xop);
+    va_copy(xop->xo_vap, vap);
+    rc = xo_do_emit(xop, flags, fmt);
+    va_end(xop->xo_vap);
+    bzero(&xop->xo_vap, sizeof(xop->xo_vap));
+
+    return rc;
+}
+
+int
+xo_emit_hf (xo_handle_t *xop, xo_emit_flags_t flags, const char *fmt, ...)
+{
+    int rc;
+
+    xop = xo_default(xop);
+    va_start(xop->xo_vap, fmt);
+    rc = xo_do_emit(xop, flags, fmt);
+    va_end(xop->xo_vap);
+    bzero(&xop->xo_vap, sizeof(xop->xo_vap));
+
+    return rc;
+}
+
+int
+xo_emit_f (xo_emit_flags_t flags, const char *fmt, ...)
+{
+    xo_handle_t *xop = xo_default(NULL);
+    int rc;
+
+    va_start(xop->xo_vap, fmt);
+    rc = xo_do_emit(xop, flags, fmt);
     va_end(xop->xo_vap);
     bzero(&xop->xo_vap, sizeof(xop->xo_vap));
 
     return rc;
 }
 
+/*
+ * Emit a single field by providing the info information typically provided
+ * inside the field description (role, modifiers, and formats).  This is
+ * a convenience function to avoid callers using snprintf to build field
+ * descriptions.
+ */
+int
+xo_emit_field_hv (xo_handle_t *xop, const char *rolmod, const char *contents,
+		  const char *fmt, const char *efmt,
+		  va_list vap)
+{
+    int rc;
+
+    xop = xo_default(xop);
+
+    if (rolmod == NULL)
+	rolmod = "V";
+
+    xo_field_info_t xfi;
+
+    bzero(&xfi, sizeof(xfi));
+
+    const char *cp;
+    cp = xo_parse_roles(xop, rolmod, rolmod, &xfi);
+    if (cp == NULL)
+	return -1;
+
+    xfi.xfi_start = fmt;
+    xfi.xfi_content = contents;
+    xfi.xfi_format = fmt;
+    xfi.xfi_encoding = efmt;
+    xfi.xfi_clen = contents ? strlen(contents) : 0;
+    xfi.xfi_flen = fmt ? strlen(fmt) : 0;
+    xfi.xfi_elen = efmt ? strlen(efmt) : 0;
+
+    /* If we have content, then we have a default format */
+    if (contents && fmt == NULL
+		&& xo_role_wants_default_format(xfi.xfi_ftype)) {
+	xfi.xfi_format = xo_default_format;
+	xfi.xfi_flen = 2;
+    }
+
+
+
+    va_copy(xop->xo_vap, vap);
+
+    rc = xo_do_emit_fields(xop, &xfi, 1, fmt ?: contents ?: "field");
+
+    va_end(xop->xo_vap);
+
+    return rc;
+}
+
+int
+xo_emit_field_h (xo_handle_t *xop, const char *rolmod, const char *contents,
+		 const char *fmt, const char *efmt, ...)
+{
+    int rc;
+    va_list vap;
+
+    va_start(vap, efmt);
+    rc = xo_emit_field_hv(xop, rolmod, contents, fmt, efmt, vap);
+    va_end(vap);
+
+    return rc;
+}
+
+int
+xo_emit_field (const char *rolmod, const char *contents,
+	       const char *fmt, const char *efmt, ...)
+{
+    int rc;
+    va_list vap;
+
+    va_start(vap, efmt);
+    rc = xo_emit_field_hv(NULL, rolmod, contents, fmt, efmt, vap);
+    va_end(vap);
+
+    return rc;
+}
+
 int
 xo_attr_hv (xo_handle_t *xop, const char *name, const char *fmt, va_list vap)
 {
@@ -6392,7 +6811,7 @@ xo_open_list_hf (xo_handle_t *xop, xo_xsf_flags_t flags, const char *name)
 }
 
 int
-xo_open_list_h (xo_handle_t *xop, const char *name UNUSED)
+xo_open_list_h (xo_handle_t *xop, const char *name)
 {
     return xo_open_list_hf(xop, 0, name);
 }
@@ -6404,7 +6823,7 @@ xo_open_list (const char *name)
 }
 
 int
-xo_open_list_hd (xo_handle_t *xop, const char *name UNUSED)
+xo_open_list_hd (xo_handle_t *xop, const char *name)
 {
     return xo_open_list_hf(xop, XOF_DTRT, name);
 }
@@ -7113,6 +7532,11 @@ xo_transition (xo_handle_t *xop, xo_xsf_flags_t flags, const char *name,
 		   xsp->xs_state, new_state);
     }
 
+    /* Handle the flush flag */
+    if (rc >= 0 && XOF_ISSET(xop, XOF_FLUSH))
+	if (xo_flush_h(xop))
+	    rc = -1;
+
     return rc;
 
  marker_prevents_close:
@@ -7179,22 +7603,11 @@ xo_set_allocator (xo_realloc_func_t realloc_func, xo_free_func_t free_func)
 int
 xo_flush_h (xo_handle_t *xop)
 {
-    static char div_close[] = "</div>";
     int rc;
 
     xop = xo_default(xop);
 
     switch (xo_style(xop)) {
-    case XO_STYLE_HTML:
-	if (XOIF_ISSET(xop, XOIF_DIV_OPEN)) {
-	    XOIF_CLEAR(xop, XOIF_DIV_OPEN);
-	    xo_data_append(xop, div_close, sizeof(div_close) - 1);
-
-	    if (XOF_ISSET(xop, XOF_PRETTY))
-		xo_data_append(xop, "\n", 1);
-	}
-	break;
-
     case XO_STYLE_ENCODER:
 	xo_encoder_handle(xop, XO_OP_FLUSH, NULL, NULL);
     }
@@ -7435,7 +7848,7 @@ xo_set_program (const char *name)
 }
 
 void
-xo_set_version_h (xo_handle_t *xop, const char *version UNUSED)
+xo_set_version_h (xo_handle_t *xop, const char *version)
 {
     xop = xo_default(xop);
 
diff --git a/libxo/xo.h b/libxo/xo.h
index 88bcce2999df..310b21cae366 100644
--- a/libxo/xo.h
+++ b/libxo/xo.h
@@ -94,6 +94,11 @@ typedef unsigned long long xo_xof_flags_t;
 
 #define XOF_LOG_GETTEXT	XOF_BIT(28) /** Log (stderr) gettext lookup strings */
 #define XOF_UTF8	XOF_BIT(29) /** Force text output to be UTF8 */
+#define XOF_RETAIN_ALL	XOF_BIT(30) /** Force use of XOEF_RETAIN */
+#define XOF_RETAIN_NONE	XOF_BIT(31) /** Prevent use of XOEF_RETAIN */
+
+typedef unsigned xo_emit_flags_t; /* Flags to xo_emit() and friends */
+#define XOEF_RETAIN	(1<<0)	  /* Retain parsed formatting information */
 
 /*
  * The xo_info_t structure provides a mapping between names and
@@ -162,6 +167,12 @@ xo_set_flags (xo_handle_t *xop, xo_xof_flags_t flags);
 void
 xo_clear_flags (xo_handle_t *xop, xo_xof_flags_t flags);
 
+int
+xo_set_file_h (xo_handle_t *xop, FILE *fp);
+
+int
+xo_set_file (FILE *fp);
+
 void
 xo_set_info (xo_handle_t *xop, xo_info_t *infop, int count);
 
@@ -180,6 +191,16 @@ xo_emit_h (xo_handle_t *xop, const char *fmt, ...);
 int
 xo_emit (const char *fmt, ...);
 
+int
+xo_emit_hvf (xo_handle_t *xop, xo_emit_flags_t flags,
+	     const char *fmt, va_list vap);
+
+int
+xo_emit_hf (xo_handle_t *xop, xo_emit_flags_t flags, const char *fmt, ...);
+
+int
+xo_emit_f (xo_emit_flags_t flags, const char *fmt, ...);
+
 PRINTFLIKE(2, 0)
 static inline int
 xo_emit_hvp (xo_handle_t *xop, const char *fmt, va_list vap)
@@ -209,6 +230,36 @@ xo_emit_p (const char *fmt, ...)
     return rc;
 }
 
+PRINTFLIKE(3, 0)
+static inline int
+xo_emit_hvfp (xo_handle_t *xop, xo_emit_flags_t flags,
+	      const char *fmt, va_list vap)
+{
+    return xo_emit_hvf(xop, flags, fmt, vap);
+}
+
+PRINTFLIKE(3, 4)
+static inline int
+xo_emit_hfp (xo_handle_t *xop, xo_emit_flags_t flags, const char *fmt, ...)
+{
+    va_list vap;
+    va_start(vap, fmt);
+    int rc = xo_emit_hvf(xop, flags, fmt, vap);
+    va_end(vap);
+    return rc;
+}
+
+PRINTFLIKE(2, 3)
+static inline int
+xo_emit_fp (xo_emit_flags_t flags, const char *fmt, ...)
+{
+    va_list vap;
+    va_start(vap, fmt);
+    int rc = xo_emit_hvf(NULL, flags, fmt, vap);
+    va_end(vap);
+    return rc;
+}
+
 int
 xo_open_container_h (xo_handle_t *xop, const char *name);
 
@@ -593,4 +644,23 @@ char *
 xo_simplify_format (xo_handle_t *xop, const char *fmt, int with_numbers,
 		    xo_simplify_field_func_t field_cb);
 
+int
+xo_emit_field_hv (xo_handle_t *xop, const char *rolmod, const char *contents,
+		  const char *fmt, const char *efmt,
+		  va_list vap);
+
+int
+xo_emit_field_h (xo_handle_t *xop, const char *rolmod, const char *contents,
+		 const char *fmt, const char *efmt, ...);
+
+int
+xo_emit_field (const char *rolmod, const char *contents,
+	       const char *fmt, const char *efmt, ...);
+
+void
+xo_retain_clear_all (void);
+
+void
+xo_retain_clear (const char *fmt);
+
 #endif /* INCLUDE_XO_H */
diff --git a/libxo/xo_emit_f.3 b/libxo/xo_emit_f.3
new file mode 100644
index 000000000000..087954631516
--- /dev/null
+++ b/libxo/xo_emit_f.3
@@ -0,0 +1,111 @@
+.\" #
+.\" # Copyright (c) 2016, Juniper Networks, Inc.
+.\" # All rights reserved.
+.\" # This SOFTWARE is licensed under the LICENSE provided in the
+.\" # ../Copyright file. By downloading, installing, copying, or 
+.\" # using the SOFTWARE, you agree to be bound by the terms of that
+.\" # LICENSE.
+.\" # Phil Shafer, April 2016
+.\" 
+.Dd April 15, 2016
+.Dt LIBXO 3
+.Os
+.Sh NAME
+.Nm xo_emit_f , xo_emit_hf , xo_emit_hvf
+.Nd emit formatted output based on format string and arguments
+.Sh LIBRARY
+.Lb libxo
+.Sh SYNOPSIS
+.In libxo/xo.h
+.Ft int
+.Fn xo_emit_f "xo_emit_flags_t flags" "const char *fmt"  "..."
+.Ft int
+.Fn xo_emit_hf "xo_handle_t *xop" "xo_emit_flags_t flags" "const char *fmt" "..."
+.Ft int
+.Fn xo_emit_hvf "xo_handle_t *xop" "xo_emit_flags_t flags" "const char *fmt" "va_list vap"
+.Ft void
+.Fn xo_retain_clear_all "void"
+.Ft void
+.Fn xo_retain_clear "const char *fmt"
+.Sh DESCRIPTION
+These functions allow callers to pass a set of flags to
+.Nm
+emitting functions.  These processing of arguments, except for
+.Fa flags ,
+is identical to the base functions.
+See
+.Xr xo_emit 3
+for additional information.
+.Pp
+The only currently defined flag is
+.Dv XOEF_RETAIN .
+.Nm
+can retain the parsed internal information related to the given
+format string, allowing subsequent
+.Xr xo_emit 3
+calls, the retained
+information is used, avoiding repetitive parsing of the format string.
+To retain parsed format information, use the
+.Dv XOEF_RETAIN
+flag to the
+.Fn xo_emit_f
+function.
+.Pp
+The format string must be immutable across multiple calls to
+.Xn xo_emit_f ,
+since the library retains the string.
+Typically this is done by using
+static constant strings, such as string literals. If the string is not
+immutable, the
+.Dv XOEF_RETAIN
+flag must not be used.
+.Pp
+The functions
+.Fn xo_retain_clear
+and
+.Fn xo_retain_clear_all
+release internal information on either a single format string or all
+format strings, respectively.
+Neither is required, but the library will
+retain this information until it is cleared or the process exits.
+.Pp
+The retained information is kept as thread-specific data.
+.Pp
+Use
+.Fn xo_retain_clear
+and
+.Fn xo_retain_clear_all
+to clear the retained information, clearing the retained information
+for either a specific format string or all format strings, respectively.
+These functions are only needed when the calling application wants to
+clear this information; they are not generally needed.
+.Sh EXAMPLES
+.Pp
+.Bd  -literal -offset indent
+    for (i = 0; i < 1000; i++) {
+        xo_open_instance("item");
+        xo_emit_f(XOEF_RETAIN, "{:name}  {:count/%d}\n",
+                  name[i], count[i]);
+    }
+.Ed
+.Pp
+In this example, the caller desires to clear the retained information.
+.Bd  -literal -offset indent
+    const char *fmt = "{:name}  {:count/%d}\n";
+    for (i = 0; i < 1000; i++) {
+        xo_open_instance("item");
+        xo_emit_f(XOEF_RETAIN, fmt, name[i], count[i]);
+    }
+    xo_retain_clear(fmt);
+.Ed
+.Sh RETURN CODE
+The return values for these functions is identical to those of their
+traditional counterparts.  See
+.Xr xo_emit 3
+for details.
+.Sh SEE ALSO
+.Xr xo_emit 3 ,
+.Xr xo_open_container 3 ,
+.Xr xo_open_list 3 ,
+.Xr xo_format 5 ,
+.Xr libxo 3
diff --git a/libxo/xo_format.5 b/libxo/xo_format.5
index 8c3cbea31248..d0e6a33abbda 100644
--- a/libxo/xo_format.5
+++ b/libxo/xo_format.5
@@ -51,14 +51,14 @@ field descriptions within the format string.
 .Pp
 The field description is given as follows:
 .Bd -literal -offset indent
-    '{' [ role | modifier ]* [',' long-names ]* ':' [ content ]
-            [ '/' field-format [ '/' encoding-format ]] '}'
+    \(aq{\(aq [ role | modifier ]* [\(aq,\(aq long\-names ]* \(aq:\(aq [ content ]
+            [ \(aq/\(aq field\-format [ \(aq/\(aq encoding\-format ]] \(aq}\(aq
 .Ed
 .Pp
 The role describes the function of the field, while the modifiers
 enable optional behaviors.
-The contents, field-format, and
-encoding-format are used in varying ways, based on the role.
+The contents, field\-format, and
+encoding\-format are used in varying ways, based on the role.
 These are described in the following sections.
 .Pp
 Braces can be escaped by using double braces, similar to "%%" in
@@ -68,26 +68,26 @@ The format string "{{braces}}" would emit "{braces}".
 In the following example, three field descriptors appear.
 The first
 is a padding field containing three spaces of padding, the second is a
-label ("In stock"), and the third is a value field ("in-stock").
-The in-stock field has a "%u" format that will parse the next argument
+label ("In stock"), and the third is a value field ("in\-stock").
+The in\-stock field has a "%u" format that will parse the next argument
 passed to the
 .Xr xo_emit 3 ,
 function as an unsigned integer.
 .Bd -literal -offset indent
-    xo_emit("{P:   }{Lwc:In stock}{:in-stock/%u}\\n", 65);
+    xo_emit("{P:   }{Lwc:In stock}{:in\-stock/%u}\\n", 65);
 .Ed
 .Pp
 This single line of code can generate text ("In stock: 65\\n"), XML
-("<in-stock>65</in-stock>"), JSON ('"in-stock": 65'), or HTML (too
+("<in\-stock>65</in\-stock>"), JSON (\(aq"in\-stock": 65\(aq), or HTML (too
 lengthy to be listed here).
 .Pp
 While roles and modifiers typically use single character for brevity,
 there are alternative names for each which allow more verbose
 formatting strings.
 These names must be preceded by a comma, and may follow any
-single-character values:
+single\-character values:
 .Bd -literal -offset indent
-    xo_emit("{L,white,colon:In stock}{,key:in-stock/%u}\n", 65);
+    xo_emit("{L,white,colon:In stock}{,key:in\-stock/%u}\\n", 65);
 .Ed
 .Ss "Field Roles"
 Field roles are optional, and indicate the role and formatting of the
@@ -96,7 +96,7 @@ The roles are listed below; only one role is permitted:
 .Bl -column "M" "Name12341234"
 .It Sy "M" "Name        " "Description"
 .It C "color       " "Field is a color or effect"
-.It D "decoration  " "Field is non-text (e.g. colon, comma)"
+.It D "decoration  " "Field is non\-text (e.g. colon, comma)"
 .It E "error       " "Field is an error message"
 .It L "label       " "Field is text that prefixes a value"
 .It N "note        " "Field is text that follows a value"
@@ -105,12 +105,12 @@ The roles are listed below; only one role is permitted:
 .It U "units       " "Field is the units for the previous value field"
 .It V "value       " "Field is the name of field (the default)"
 .It W "warning     " "Field is a warning message"
-.It \&[ "start-anchor" "Begin a section of anchored variable-width text"
-.It \&] "stop-anchor " "End a section of anchored variable-width text"
+.It \&[ "start\-anchor" "Begin a section of anchored variable\-width text"
+.It \&] "stop\-anchor " "End a section of anchored variable\-width text"
 .El
 .Bd -literal -offset indent
    EXAMPLE:
-       xo_emit("{L:Free}{D::}{P:   }{:free/%u} {U:Blocks}\n",
+       xo_emit("{L:Free}{D::}{P:   }{:free/%u} {U:Blocks}\\n",
                free_blocks);
 .Ed
 .Pp
@@ -121,50 +121,50 @@ a comma:
 .Bd -literal -offset indent
    EXAMPLE:
         xo_emit("{,label:Free}{,decoration::}{,padding:   }"
-               "{,value:free/%u} {,units:Blocks}\n",
+               "{,value:free/%u} {,units:Blocks}\\n",
                free_blocks);
 .Ed
 .Ss "The Color Role ({C:})"
 Colors and effects control how text values are displayed; they are
 used for display styles (TEXT and HTML).
 .Bd -literal -offset indent
-    xo_emit("{C:bold}{:value}{C:no-bold}\n", value);
+    xo_emit("{C:bold}{:value}{C:no\-bold}\\n", value);
 .Ed
 .Pp
-Colors and effects remain in effect until modified by other "C"-role
+Colors and effects remain in effect until modified by other "C"\-role
 fields.
 .Bd -literal -offset indent
-    xo_emit("{C:bold}{C:inverse}both{C:no-bold}only inverse\n");
+    xo_emit("{C:bold}{C:inverse}both{C:no\-bold}only inverse\\n");
 .Ed
 .Pp
 If the content is empty, the "reset" action is performed.
 .Bd -literal -offset indent
-    xo_emit("{C:both,underline}{:value}{C:}\n", value);
+    xo_emit("{C:both,underline}{:value}{C:}\\n", value);
 .Ed
 .Pp
-The content should be a comma-separated list of zero or more colors or
+The content should be a comma\-separated list of zero or more colors or
 display effects.
 .Bd -literal -offset indent
-    xo_emit("{C:bold,underline,inverse}All three{C:no-bold,no-inverse}\n");
+    xo_emit("{C:bold,underline,inverse}All three{C:no\-bold,no\-inverse}\\n");
 .Ed
 .Pp
 The color content can be either static, when placed directly within
-the field descriptor, or a printf-style format descriptor can be used,
+the field descriptor, or a printf\-style format descriptor can be used,
 if preceded by a slash ("/"):
 .Bd -literal -offset indent
    xo_emit("{C:/%s%s}{:value}{C:}", need_bold ? "bold" : "",
            need_underline ? "underline" : "", value);
 .Ed
 .Pp
-Color names are prefixed with either "fg-" or "bg-" to change the
+Color names are prefixed with either "fg\-" or "bg\-" to change the
 foreground and background colors, respectively.
 .Bd -literal -offset indent
-    xo_emit("{C:/fg-%s,bg-%s}{Lwc:Cost}{:cost/%u}{C:reset}\n",
+    xo_emit("{C:/fg\-%s,bg\-%s}{Lwc:Cost}{:cost/%u}{C:reset}\\n",
             fg_color, bg_color, cost);
 .Ed
 .Pp
 The following table lists the supported effects:
-.Bl -column "no-underline"
+.Bl -column "no\-underline"
 .It Sy "Name         " "Description"
 .It "bg\-xxxxx     " "Change background color"
 .It "bold         " "Start bold text effect"
@@ -179,7 +179,7 @@ The following table lists the supported effects:
 .El
 .Pp
 The following color names are supported:
-.Bl -column "no-underline"
+.Bl -column "no\-underline"
 .It Sy "Name"
 .It black
 .It blue
@@ -193,7 +193,7 @@ The following color names are supported:
 .El
 .Ss "The Decoration Role ({D:})"
 Decorations are typically punctuation marks such as colons,
-semi-colons, and commas used to decorate the text and make it simpler
+semi\-colons, and commas used to decorate the text and make it simpler
 for human readers.
 By marking these distinctly, HTML usage scenarios
 can use CSS to direct their display parameters.
@@ -219,22 +219,23 @@ change such as changing "/%06d" to "/%08d" should not force hand
 inspection of all .po files.
 .Pp
 The simplified version can be generated for a single message using the
-"xopo -s <text>" command, or an entire .pot can be translated using
-the "xopo -f <input> -o <output>" command.
+"xopo \-s <text>" command, or an entire .pot can be translated using
+the "xopo \-f <input> \-o <output>" command.
 .Bd -literal -offset indent
-   xo_emit("{G:}Invalid token\n");
+   xo_emit("{G:}Invalid token\\n");
 .Ed
+.Pp
 The {G:} role allows a domain name to be set.
 .Fn gettext
 calls will
 continue to use that domain name until the current format string
 processing is complete, enabling a library function to emit strings
-using it's own catalog.
+using it\(aqs own catalog.
 The domain name can be either static as the
 content of the field, or a format can be used to get the domain name
 from the arguments.
 .Bd -literal -offset indent
-   xo_emit("{G:libc}Service unavailable in restricted mode\n");
+   xo_emit("{G:libc}Service unavailable in restricted mode\\n");
 .Ed
 .Ss "The Label Role ({L:})"
 Labels are text that appears before a value.
@@ -249,7 +250,7 @@ Notes are text that appears after a value.
 .Ss "The Padding Role ({P:})"
 Padding represents whitespace used before and between fields.
 The padding content can be either static, when placed directly within
-the field descriptor, or a printf-style format descriptor can be used,
+the field descriptor, or a printf\-style format descriptor can be used,
 if preceded by a slash ("/"):
 .Bd -literal -offset indent
     xo_emit("{P:        }{Lwc:Cost}{:cost/%u}\\n", cost);
@@ -259,7 +260,7 @@ if preceded by a slash ("/"):
 Titles are heading or column headers that are meant to be displayed to
 the user.
 The title can be either static, when placed directly within
-the field descriptor, or a printf-style format descriptor can be used,
+the field descriptor, or a printf\-style format descriptor can be used,
 if preceded by a slash ("/"):
 .Bd -literal -offset indent
     xo_emit("{T:Interface Statistics}\\n");
@@ -274,7 +275,7 @@ for the previous value field.
     xo_emit("{Lwc:Distance}{:distance/%u}{Uw:miles}\\n", miles);
 .Ed
 .Pp
-Note that the sense of the 'w' modifier is reversed for units;
+Note that the sense of the \(aqw\(aq modifier is reversed for units;
 a blank is added before the contents, rather than after it.
 .Pp
 When the
@@ -286,14 +287,14 @@ attribute:
     <distance units="miles">50</distance>
 .Ed
 .Pp
-Units can also be rendered in HTML as the "data-units" attribute:
+Units can also be rendered in HTML as the "data\-units" attribute:
 .Bd -literal -offset indent
-    <div class="data" data-tag="distance" data-units="miles"
-         data-xpath="/top/data/distance">50</div>
+    <div class="data" data\-tag="distance" data\-units="miles"
+         data\-xpath="/top/data/distance">50</div>
 .Ed
 .Ss "The Value Role ({V:} and {:})"
 The value role is used to represent the a data value that is
-interesting for the non-display output styles (XML and JSON).
+interesting for the non\-display output styles (XML and JSON).
 Value
 is the default role; if no other role designation is given, the field
 is a value.
@@ -356,16 +357,17 @@ Field modifiers are flags which modify the way content emitted for
 particular output styles:
 .Bl -column M "Name123456789"
 .It Sy M "Name          " "Description"
+.It a "argument      " "The content appears as a ""const char *"" argument"
 .It c "colon         " "A colon ("":"") is appended after the label"
 .It d "display       " "Only emit field for display styles (text/HTML)"
 .It e "encoding      " "Only emit for encoding styles (XML/JSON)"
-.It h "humanize (hn) " "Format large numbers in human-readable style"
-.It " " "hn-space     " "Humanize: Place space between numeric and unit"
-.It " " "hn-decimal   " "Humanize: Add a decimal digit, if number < 10"
-.It " " "hn-1000      " "Humanize: Use 1000 as divisor instead of 1024"
+.It h "humanize (hn) " "Format large numbers in human\-readable style"
+.It " " "hn\-space     " "Humanize: Place space between numeric and unit"
+.It " " "hn\-decimal   " "Humanize: Add a decimal digit, if number < 10"
+.It " " "hn\-1000      " "Humanize: Use 1000 as divisor instead of 1024"
 .It k "key           " "Field is a key, suitable for XPath predicates"
-.It l "leaf-list    " "Field is a leaf-list, a list of leaf values"
-.It n "no-quotes    " "Do not quote the field when using JSON style"
+.It l "leaf\-list    " "Field is a leaf\-list, a list of leaf values"
+.It n "no\-quotes    " "Do not quote the field when using JSON style"
 .It q "quotes        " "Quote the field when using JSON style"
 .It t "trim          " "Trim leading and trailing whitespace"
 .It w "white space   " "A blank ("" "") is appended after the label"
@@ -373,7 +375,7 @@ particular output styles:
 .Pp
 For example, the modifier string "Lwc" means the field has a label
 role (text that describes the next field) and should be followed by a
-colon ('c') and a space ('w').
+colon (\(aqc\(aq) and a space (\(aqw\(aq).
 The modifier string "Vkq" means the
 field has a value role, that it is a key for the current instance, and
 that the value should be quoted when encoded for JSON.
@@ -382,10 +384,31 @@ Roles and modifiers can also use more verbose names, when preceeded by
 a comma.
 For example, the modifier string "Lwc" (or "L,white,colon")
 means the field has a label role (text that describes the next field)
-and should be followed by a colon ('c') and a space ('w').
+and should be followed by a colon (\(aqc\(aq) and a space (\(aqw\(aq).
 The modifier string "Vkq" (or ":key,quote") means the field has a value
 role (the default role), that it is a key for the current instance,
 and that the value should be quoted when encoded for JSON.
+.Ss "The Argument Modifier ({a:})"
+The argument modifier indicates that the content of the field
+descriptor will be placed as a UTF\-8 string (const char *) argument
+within the xo_emit parameters.
+.Bd -literal -offset indent
+    EXAMPLE:
+      xo_emit("{La:} {a:}\\n", "Label text", "label", "value");
+    TEXT:
+      Label text value
+    JSON:
+      "label": "value"
+    XML:
+      <label>value</label>
+.Ed
+.Pp
+The argument modifier allows field names for value fields to be passed
+on the stack, avoiding the need to build a field descriptor using
+.Xr snprintf 1 .
+For many field roles, the argument modifier is not needed,
+since those roles have specific mechanisms for arguments,
+such as "{C:fg\-%s}".
 .Ss "The Colon Modifier ({c:})"
 The colon modifier appends a single colon to the data value:
 .Bd -literal -offset indent
@@ -397,7 +420,7 @@ The colon modifier appends a single colon to the data value:
 .Pp
 The colon modifier is only used for the TEXT and HTML output
 styles.
-It is commonly combined with the space modifier ('{w:}').
+It is commonly combined with the space modifier (\(aq{w:}\(aq).
 It is purely a convenience feature.
 .Ss "The Display Modifier ({d:})"
 The display modifier indicated the field should only be generated for
@@ -429,39 +452,39 @@ The encoding modifier is the opposite of the display modifier, and
 they are often used to give to distinct views of the underlying data.
 .Ss "The Humanize Modifier ({h:})"
 The humanize modifier is used to render large numbers as in a
-human-readable format.
+human\-readable format.
 While numbers like "44470272" are completely readable to computers and
 savants, humans will generally find "44M" more meaningful.
 .Pp
 "hn" can be used as an alias for "humanize".
 .Pp
 The humanize modifier only affects display styles (TEXT and HMTL).
-The "no-humanize" option will block the function of the humanize modifier.
+The "no\-humanize" option will block the function of the humanize modifier.
 .Pp
 There are a number of modifiers that affect details of humanization.
 These are only available in as full names, not single characters.
-The "hn-space" modifier places a space between the number and any
+The "hn\-space" modifier places a space between the number and any
 multiplier symbol, such as "M" or "K" (ex: "44 K").
-The "hn-decimal" modifier will add a decimal point and a single tenths digit
+The "hn\-decimal" modifier will add a decimal point and a single tenths digit
 when the number is less than 10 (ex: "4.4K").
-The "hn-1000" modifier will use 1000 as divisor instead of 1024, following the
-JEDEC-standard instead of the more natural binary powers-of-two
+The "hn\-1000" modifier will use 1000 as divisor instead of 1024, following the
+JEDEC\-standard instead of the more natural binary powers\-of\-two
 tradition.
 .Bd -literal -offset indent
     EXAMPLE:
-        xo_emit("{h:input/%u}, {h,hn-space:output/%u}, "
-           "{h,hn-decimal:errors/%u}, {h,hn-1000:capacity/%u}, "
-           "{h,hn-decimal:remaining/%u}\n",
+        xo_emit("{h:input/%u}, {h,hn\-space:output/%u}, "
+           "{h,hn\-decimal:errors/%u}, {h,hn\-1000:capacity/%u}, "
+           "{h,hn\-decimal:remaining/%u}\\n",
             input, output, errors, capacity, remaining);
     TEXT:
         21, 57 K, 96M, 44M, 1.2G
 .Ed
 .Pp
 In the HTML style, the original numeric value is rendered in the
-"data-number" attribute on the <div> element:
+"data\-number" attribute on the <div> element:
 .Bd -literal -offset indent
-    <div class="data" data-tag="errors"
-         data-number="100663296">96M</div>
+    <div class="data" data\-tag="errors"
+         data\-number="100663296">96M</div>
 .Ed
 .Ss "The Gettext Modifier ({g:})"
 The gettext modifier is used to translate individual fields using the
@@ -476,9 +499,9 @@ translation.
 In the following example, the strings "State" and "full" are passed
 to
 .Fn gettext
-to find locale-based translated strings.
+to find locale\-based translated strings.
 .Bd -literal -offset indent
-    xo_emit("{Lgwc:State}{g:state}\n", "full");
+    xo_emit("{Lgwc:State}{g:state}\\n", "full");
 .Ed
 .Ss "The Key Modifier ({k:})"
 The key modifier is used to indicate that a particular field helps
@@ -499,15 +522,15 @@ Currently the key modifier is only used when generating XPath values
 for the HTML output style when
 .Dv XOF_XPATH
 is set, but other uses are likely in the near future.
-.Ss "The Leaf-List Modifier ({l:})"
-The leaf-list modifier is used to distinguish lists where each
+.Ss "The Leaf\-List Modifier ({l:})"
+The leaf\-list modifier is used to distinguish lists where each
 instance consists of only a single value.  In XML, these are
 rendered as single elements, where JSON renders them as arrays.
 .Bd -literal -offset indent
     EXAMPLE:
         xo_open_list("user");
         for (i = 0; i < num_users; i++) {
-            xo_emit("Member {l:name}\n", user[i].u_name);
+            xo_emit("Member {l:name}\\n", user[i].u_name);
         }
         xo_close_list("user");
     XML:
@@ -516,8 +539,8 @@ rendered as single elements, where JSON renders them as arrays.
     JSON:
         "user": [ "phil", "pallavi" ]
 .Ed
-.Ss "The No-Quotes Modifier ({n:})"
-The no-quotes modifier (and its twin, the 'quotes' modifier) affect
+.Ss "The No\-Quotes Modifier ({n:})"
+The no\-quotes modifier (and its twin, the \(aqquotes\(aq modifier) affect
 the quoting of values in the JSON output style.
 JSON uses quotes for
 string values, but no quotes for numeric, boolean, and null data.
@@ -538,8 +561,9 @@ language settings.
 The contents of the field should be the singular
 and plural English values, separated by a comma:
 .Bd -literal -offset indent
-    xo_emit("{:bytes} {Ngp:byte,bytes}\n", bytes);
+    xo_emit("{:bytes} {Ngp:byte,bytes}\\n", bytes);
 .Ed
+.Pp
 The plural modifier is meant to work with the gettext modifier ({g:})
 but can work independently.
 .Pp
@@ -554,7 +578,7 @@ function is
 called to handle the heavy lifting, using the message catalog to
 convert the singular and plural forms into the native language.
 .Ss "The Quotes Modifier ({q:})"
-The quotes modifier (and its twin, the 'no-quotes' modifier) affect
+The quotes modifier (and its twin, the \(aqno-quotes\(aq modifier) affect
 the quoting of values in the JSON output style.
 JSON uses quotes for
 string values, but no quotes for numeric, boolean, and null data.
@@ -578,23 +602,23 @@ The white space modifier appends a single space to the data value:
 .Pp
 The white space modifier is only used for the TEXT and HTML output
 styles.
-It is commonly combined with the colon modifier ('{c:}').
+It is commonly combined with the colon modifier (\(aq{c:}\(aq).
 It is purely a convenience feature.
 .Pp
-Note that the sense of the 'w' modifier is reversed for the units role
+Note that the sense of the \(aqw\(aq modifier is reversed for the units role
 ({Uw:}); a blank is added before the contents, rather than after it.
 .Ss "Field Formatting"
 The field format is similar to the format string for
 .Xr printf 3 .
 Its use varies based on the role of the field, but generally is used to
-format the field's contents.
+format the field\(aqs contents.
 .Pp
 If the format string is not provided for a value field, it defaults
 to "%s".
 .Pp
-Note a field definition can contain zero or more printf-style
+Note a field definition can contain zero or more printf\-style
 .Dq directives ,
-which are sequences that start with a '%' and end with
+which are sequences that start with a \(aq%\(aq and end with
 one of following characters: "diouxXDOUeEfFgGaAcCsSp".
 Each directive
 is matched by one of more arguments to the
@@ -603,54 +627,54 @@ function.
 .Pp
 The format string has the form:
 .Bd -literal -offset indent
-  '%' format-modifier * format-character
+  \(aq%\(aq format\-modifier * format\-character
 .Ed
 .Pp
-The format- modifier can be:
+The format\- modifier can be:
 .Bl -bullet
 .It
-a '#' character, indicating the output value should be prefixed with
+a \(aq#\(aq character, indicating the output value should be prefixed with
 "0x", typically to indicate a base 16 (hex) value.
 .It
-a minus sign ('-'), indicating the output value should be padded on
+a minus sign (\(aq\-\(aq), indicating the output value should be padded on
 the right instead of the left.
 .It
-a leading zero ('0') indicating the output value should be padded on the
-left with zeroes instead of spaces (' ').
+a leading zero (\(aq0\(aq) indicating the output value should be padded on the
+left with zeroes instead of spaces (\(aq \(aq).
 .It
-one or more digits ('0' - '9') indicating the minimum width of the
+one or more digits (\(aq0\(aq \- \(aq9\(aq) indicating the minimum width of the
 argument.
 If the width in columns of the output value is less than
 the minimum width, the value will be padded to reach the minimum.
 .It
 a period followed by one or more digits indicating the maximum
 number of bytes which will be examined for a string argument, or the maximum
-width for a non-string argument.
+width for a non\-string argument.
 When handling ASCII strings this
-functions as the field width but for multi-byte characters, a single
+functions as the field width but for multi\-byte characters, a single
 character may be composed of multiple bytes.
 .Xr xo_emit 3
 will never dereference memory beyond the given number of bytes.
 .It
 a second period followed by one or more digits indicating the maximum
 width for a string argument.
-This modifier cannot be given for non-string arguments.
+This modifier cannot be given for non\-string arguments.
 .It
-one or more 'h' characters, indicating shorter input data.
+one or more \(aqh\(aq characters, indicating shorter input data.
 .It
-one or more 'l' characters, indicating longer input data.
+one or more \(aql\(aq characters, indicating longer input data.
 .It
-a 'z' character, indicating a 'size_t' argument.
+a \(aqz\(aq character, indicating a \(aqsize_t\(aq argument.
 .It
-a 't' character, indicating a 'ptrdiff_t' argument.
+a \(aqt\(aq character, indicating a \(aqptrdiff_t\(aq argument.
 .It
-a ' ' character, indicating a space should be emitted before
+a \(aq \(aq character, indicating a space should be emitted before
 positive numbers.
 .It
-a '+' character, indicating sign should emitted before any number.
+a \(aq+\(aq character, indicating sign should emitted before any number.
 .El
 .Pp
-Note that 'q', 'D', 'O', and 'U' are considered deprecated and will be
+Note that \(aqq\(aq, \(aqD\(aq, \(aqO\(aq, and \(aqU\(aq are considered deprecated and will be
 removed eventually.
 .Pp
 The format character is described in the following table:
@@ -665,22 +689,22 @@ The format character is described in the following table:
 .It D "long           " "base 10 (decimal)"
 .It O "unsigned long  " "base 8 (octal)"
 .It U "unsigned long  " "base 10 (decimal)"
-.It e "double         " "[-]d.ddde+-dd"
-.It E "double         " "[-]d.dddE+-dd"
-.It f "double         " "[-]ddd.ddd"
-.It F "double         " "[-]ddd.ddd"
-.It g "double         " "as 'e' or 'f'"
-.It G "double         " "as 'E' or 'F'"
-.It a "double         " "[-]0xh.hhhp[+-]d"
-.It A "double         " "[-]0Xh.hhhp[+-]d"
+.It e "double         " "[\-]d.ddde+\-dd"
+.It E "double         " "[\-]d.dddE+\-dd"
+.It f "double         " "[\-]ddd.ddd"
+.It F "double         " "[\-]ddd.ddd"
+.It g "double         " "as \(aqe\(aq or \(aqf\(aq"
+.It G "double         " "as \(aqE\(aq or \(aqF\(aq"
+.It a "double         " "[\-]0xh.hhhp[+\-]d"
+.It A "double         " "[\-]0Xh.hhhp[+\-]d"
 .It c "unsigned char  " "a character"
 .It C "wint_t         " "a character"
-.It s "char *         " "a UTF-8 string"
+.It s "char *         " "a UTF\-8 string"
 .It S "wchar_t *      " "a unicode/WCS string"
-.It p "void *         " "'%#lx'"
+.It p "void *         " "\(aq%#lx\(aq"
 .El
 .Pp
-The 'h' and 'l' modifiers affect the size and treatment of the
+The \(aqh\(aq and \(aql\(aq modifiers affect the size and treatment of the
 argument:
 .Bl -column "Mod" "d, i         " "o, u, x, X         "
 .It Sy "Mod" "d, i        " "o, u, x, X"
@@ -693,27 +717,27 @@ argument:
 .It "z  " "size_t      " "size_t"
 .It "q  " "quad_t      " "u_quad_t"
 .El
-.Ss "UTF-8 and Locale Strings"
+.Ss "UTF\-8 and Locale Strings"
 All strings for
 .Nm libxo
-must be UTF-8.
+must be UTF\-8.
 .Nm libxo
 will handle turning them
-into locale-based strings for display to the user.
+into locale\-based strings for display to the user.
 .Pp
-For strings, the 'h' and 'l' modifiers affect the interpretation of
+For strings, the \(aqh\(aq and \(aql\(aq modifiers affect the interpretation of
 the bytes pointed to argument.
-The default '%s' string is a 'char *'
-pointer to a string encoded as UTF-8.
-Since UTF-8 is compatible with
+The default \(aq%s\(aq string is a \(aqchar *\(aq
+pointer to a string encoded as UTF\-8.
+Since UTF\-8 is compatible with
 .Em ASCII
-data, a normal 7-bit
+data, a normal 7\-bit
 .Em ASCII
 string can be used.
 "%ls" expects a
-"wchar_t *" pointer to a wide-character string, encoded as 32-bit
+"wchar_t *" pointer to a wide\-character string, encoded as 32\-bit
 Unicode values.
-"%hs" expects a "char *" pointer to a multi-byte
+"%hs" expects a "char *" pointer to a multi\-byte
 string encoded with the current locale, as given by the
 .Ev LC_CTYPE ,
 .Ev LANG ,
@@ -722,22 +746,22 @@ or
 environment variables.
 The first of this list of
 variables is used and if none of the variables are set, the locale defaults to
-.Em UTF-8 .
+.Em UTF\-8 .
 .Pp
 .Nm libxo
 will
-convert these arguments as needed to either UTF-8 (for XML, JSON, and
-HTML styles) or locale-based strings for display in text style.
+convert these arguments as needed to either UTF\-8 (for XML, JSON, and
+HTML styles) or locale\-based strings for display in text style.
 .Bd -literal -offset indent
-   xo_emit("All strings are utf-8 content {:tag/%ls}",
+   xo_emit("All strings are utf\-8 content {:tag/%ls}",
            L"except for wide strings");
 .Ed
 .Pp
 "%S" is equivalent to "%ls".
 .Pp
-For example, a function is passed a locale-base name, a hat size,
+For example, a function is passed a locale\-base name, a hat size,
 and a time value.
-The hat size is formatted in a UTF-8 (ASCII)
+The hat size is formatted in a UTF\-8 (ASCII)
 string, and the time value is formatted into a wchar_t string.
 .Bd -literal -offset indent
     void print_order (const char *name, int size,
@@ -755,7 +779,7 @@ string, and the time value is formatted into a wchar_t string.
 
         xo_emit("The hat for {:name/%hs} is {:size/%s}.\\n",
                 name, size_val);
-        xo_emit("It was ordered on {:order-time/%ls}.\\n",
+        xo_emit("It was ordered on {:order\-time/%ls}.\\n",
                 when);
     }
 .Ed
@@ -766,11 +790,11 @@ will perform the conversion
 required to make appropriate output.
 Text style output uses the
 current locale (as described above), while XML, JSON, and HTML use
-UTF-8.
+UTF\-8.
 .Pp
-UTF-8 and locale-encoded strings can use multiple bytes to encode one
+UTF\-8 and locale\-encoded strings can use multiple bytes to encode one
 column of data.
-The traditional "precision'" (aka "max-width") value
+The traditional "precision" (aka "max\-width") value
 for "%s" printf formatting becomes overloaded since it specifies both
 the number of bytes that can be safely referenced and the maximum
 number of columns to emit.
@@ -800,12 +824,12 @@ For HTML, these characters are placed in a <div> with class "text".
       "size": "extra small"
   HTML:
       <div class="text">The hat is </div>
-      <div class="data" data-tag="size">extra small</div>
+      <div class="data" data\-tag="size">extra small</div>
       <div class="text">.</div>
 .Ed
-.Ss "'%n' is Not Supported"
+.Ss "\(aq%n\(aq is Not Supported"
 .Nm libxo
-does not support the '%n' directive.
+does not support the \(aq%n\(aq directive.
 It is a bad idea and we
 just do not do it.
 .Ss "The Encoding Format (eformat)"
@@ -817,7 +841,7 @@ If the primary is not given, both default to "%s".
 .Sh EXAMPLE
 In this example, the value for the number of items in stock is emitted:
 .Bd -literal -offset indent
-        xo_emit("{P:   }{Lwc:In stock}{:in-stock/%u}\\n",
+        xo_emit("{P:   }{Lwc:In stock}{:in\-stock/%u}\\n",
                 instock);
 .Ed
 .Pp
@@ -826,16 +850,16 @@ This call will generate the following output:
   TEXT:
        In stock: 144
   XML:
-      <in-stock>144</in-stock>
+      <in\-stock>144</in\-stock>
   JSON:
-      "in-stock": 144,
+      "in\-stock": 144,
   HTML:
       <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 class="data" data\-tag="in\-stock">144</div>
       </div>
 .Ed
 .Pp
@@ -846,10 +870,10 @@ or
 .Dv XOF_INFO
 data, which would expand the penultimate line to:
 .Bd -literal -offset indent
-       <div class="data" data-tag="in-stock"
-          data-xpath="/top/data/item/in-stock"
-          data-type="number"
-          data-help="Number of items in stock">144</div>
+       <div class="data" data\-tag="in\-stock"
+          data\-xpath="/top/data/item/in\-stock"
+          data\-type="number"
+          data\-help="Number of items in stock">144</div>
 .Ed
 .Sh WHAT MAKES A GOOD FIELD NAME?
 To make useful, consistent field names, follow these guidelines:
@@ -867,23 +891,23 @@ But the raw field name should use hyphens.
 .Ss "Use full words"
 Do not abbreviate especially when the abbreviation is not obvious or
 not widely used.
-Use "data-size", not "dsz" or "dsize".
+Use "data\-size", not "dsz" or "dsize".
 Use
-"interface" instead of "ifname", "if-name", "iface", "if", or "intf".
-.Ss "Use <verb>-<units>"
-Using the form <verb>-<units> or <verb>-<classifier>-<units> helps in
+"interface" instead of "ifname", "if\-name", "iface", "if", or "intf".
+.Ss "Use <verb>\-<units>"
+Using the form <verb>\-<units> or <verb>\-<classifier>\-<units> helps in
 making consistent, useful names, avoiding the situation where one app
-uses "sent-packet" and another "packets-sent" and another
-"packets-we-have-sent".
+uses "sent\-packet" and another "packets\-sent" and another
+"packets\-we\-have\-sent".
 The <units> can be dropped when it is
 obvious, as can obvious words in the classification.
-Use "receive-after-window-packets" instead of
-"received-packets-of-data-after-window".
+Use "receive\-after\-window\-packets" instead of
+"received\-packets\-of\-data\-after\-window".
 .Ss "Reuse existing field names"
 Nothing is worse than writing expressions like:
 .Bd -literal -offset indent
     if ($src1/process[pid == $pid]/name ==
-        $src2/proc-table/proc/p[process-id == $pid]/proc-name) {
+        $src2/proc\-table/proc/p[process\-id == $pid]/proc\-name) {
         ...
     }
 .Ed
@@ -903,7 +927,7 @@ calls or "{e:}" fields to make the data useful.
 .Ss "Do not use an arbitrary number postfix"
 What does "errors2" mean?
 No one will know.
-"errors-after-restart" would be a better choice.
+"errors\-after\-restart" would be a better choice.
 Think of your users, and think of the future.
 If you make "errors2", the next guy will happily make
 "errors3" and before you know it, someone will be asking what is the
@@ -913,7 +937,7 @@ Think of your field vocabulary as an API.
 You want it useful,
 expressive, meaningful, direct, and obvious.
 You want the client
-application's programmer to move between without the need to
+application\(aqs programmer to move between without the need to
 understand a variety of opinions on how fields are named.
 They should
 see the system as a single cohesive whole, not a sack of cats.
@@ -925,12 +949,12 @@ By choosing wise names now, you are making their lives better.
 After using
 .Xr xolint 1
 to find errors in your field descriptors, use
-.Dq "xolint -V"
+.Dq "xolint \-V"
 to spell check your field names and to detect different
 names for the same data.
-.Dq dropped-short
+.Dq dropped\-short
 and
-.Dq dropped-too-short
+.Dq dropped\-too\-short
 are both reasonable names, but using them both will lead users to ask the
 difference between the two fields.
 If there is no difference,
diff --git a/libxo/xo_parse_args.3 b/libxo/xo_parse_args.3
index 80dceca916be..487b50bafb9b 100644
--- a/libxo/xo_parse_args.3
+++ b/libxo/xo_parse_args.3
@@ -83,12 +83,16 @@ Log (via stderr) each syslog message (via
 Ignore the {h:} modifier (TEXT, HTML)
 .It Dv no-locale
 Do not initialize the locale setting
+.It Dv no-retain
+Prevent retaining formatting information
 .It Dv no-top
 Do not emit a top set of braces (JSON)
 .It Dv not-first
 Pretend the 1st output item was not 1st (JSON)
 .It Dv pretty
 Emit pretty-printed output
+.It Dv retain
+Force retaining formatting information
 .It Dv text
 Emit TEXT output
 .If Dv underscores
diff --git a/packaging/libxo.pc.in b/packaging/libxo.pc.in
index b291d07c9db8..0e18234f1020 100644
--- a/packaging/libxo.pc.in
+++ b/packaging/libxo.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 
 Name: libxo
-Version: @VERSION@
+Version: @LIBXO_VERSION@
 Description: The XML Output Library
-Libs: @LIBXO_LIBDIR@ @LIBXO_LIBS@
-Cflags: @LIBXO_INCLUDEDIR@
+Libs: -L@XO_LIBDIR@ @XO_LIBS@
+Cflags: -I@XO_INCLUDEDIR@
diff --git a/packaging/libxo.rb.base.in b/packaging/libxo.rb.base.in
index 70b712da2acb..ab87be296c6c 100644
--- a/packaging/libxo.rb.base.in
+++ b/packaging/libxo.rb.base.in
@@ -6,15 +6,15 @@
 require 'formula'
 
 class Libxo < Formula
-  homepage 'https://github.com/Juniper/@PACKAGE-NAME@'
-  url 'https://github.com/Juniper/@PACKAGE_NAME@/releases/@PACKAGE_VERSION@/@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz'
+  homepage 'https://github.com/Juniper/@PACKAGE_NAME@'
+  url 'https://github.com/Juniper/@PACKAGE_NAME@/releases/download/@PACKAGE_VERSION@/@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz'
   sha1 '__SHA1__'
 
   depends_on 'libtool' => :build
 
   def install
-    system "./configure", "--disable-dependency-tracking",
+    system "./configure", "--disable-dependency-tracking", "--disable-silent-rules",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/tests/core/Makefile.am b/tests/core/Makefile.am
index 0131a6f50ac5..7e61f558146c 100644
--- a/tests/core/Makefile.am
+++ b/tests/core/Makefile.am
@@ -22,7 +22,8 @@ test_07.c \
 test_08.c \
 test_09.c \
 test_10.c \
-test_11.c
+test_11.c \
+test_12.c
 
 test_01_test_SOURCES = test_01.c
 test_02_test_SOURCES = test_02.c
@@ -35,6 +36,7 @@ test_08_test_SOURCES = test_08.c
 test_09_test_SOURCES = test_09.c
 test_10_test_SOURCES = test_10.c
 test_11_test_SOURCES = test_11.c
+test_12_test_SOURCES = test_12.c
 
 # TEST_CASES := $(shell cd ${srcdir} ; echo *.c )
 
diff --git a/tests/core/saved/test_01.E.out b/tests/core/saved/test_01.E.out
index ed615a5aab84..de23baad0b16 100644
--- a/tests/core/saved/test_01.E.out
+++ b/tests/core/saved/test_01.E.out
@@ -2,6 +2,14 @@ op create: [] []
 op open_container: [top] []
 op string: [host] [my-box]
 op string: [domain] [example.com]
+op string: [host] [my-box]
+op string: [domain] [example.com]
+op string: [label] [value]
+op string: [max-chaos] [very]
+op content: [min-chaos] [42]
+op string: [some-chaos] [[42]]
+op string: [host] [my-box]
+op string: [domain] [example.com]
 op attr: [test] [value]
 op open_container: [data] []
 op open_list: [item] []
diff --git a/tests/core/saved/test_01.H.out b/tests/core/saved/test_01.H.out
index 39d8bd4e8a6f..7c0b3de061a6 100644
--- a/tests/core/saved/test_01.H.out
+++ b/tests/core/saved/test_01.H.out
@@ -1 +1,2 @@
-<div class="line"><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="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 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="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/tests/core/saved/test_01.HIPx.out b/tests/core/saved/test_01.HIPx.out
index a3aa369310f1..f6c7290366fb 100644
--- a/tests/core/saved/test_01.HIPx.out
+++ b/tests/core/saved/test_01.HIPx.out
@@ -1,4 +1,26 @@
 <div class="line">
+  <div class="text">testing argument modifier </div>
+  <div class="data" data-tag="host" data-xpath="/top/host">my-box</div>
+  <div class="text">.</div>
+  <div class="data" data-tag="domain" data-xpath="/top/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" data-xpath="/top/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" data-xpath="/top/label">value</div>
+</div>
+<div class="line">
+  <div class="data" data-tag="max-chaos" data-xpath="/top/max-chaos">  very  </div>
+  <div class="data" data-tag="min-chaos" data-xpath="/top/min-chaos">42</div>
+  <div class="data" data-tag="some-chaos" data-xpath="/top/some-chaos">42
+</div>
   <div class="text">Connecting to </div>
   <div class="data" data-tag="host" data-xpath="/top/host">my-box</div>
   <div class="text">.</div>
diff --git a/tests/core/saved/test_01.HP.out b/tests/core/saved/test_01.HP.out
index c877dfd01928..0fdcbd18005b 100644
--- a/tests/core/saved/test_01.HP.out
+++ b/tests/core/saved/test_01.HP.out
@@ -1,4 +1,26 @@
 <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>
diff --git a/tests/core/saved/test_01.J.out b/tests/core/saved/test_01.J.out
index 0515a2a6e615..3fc12a173148 100644
--- a/tests/core/saved/test_01.J.out
+++ b/tests/core/saved/test_01.J.out
@@ -1,2 +1,2 @@
-{"top": {"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","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"}
+{"top": {"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","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"}
 }
diff --git a/tests/core/saved/test_01.JP.out b/tests/core/saved/test_01.JP.out
index 210266d87f77..2c7397f5e20a 100644
--- a/tests/core/saved/test_01.JP.out
+++ b/tests/core/saved/test_01.JP.out
@@ -2,6 +2,14 @@
   "top": {
     "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": [
         {
diff --git a/tests/core/saved/test_01.T.out b/tests/core/saved/test_01.T.out
index cdf704b880ad..71cd130ab350 100644
--- a/tests/core/saved/test_01.T.out
+++ b/tests/core/saved/test_01.T.out
@@ -1,3 +1,7 @@
+testing argument modifier my-box.example.com...
+testing argument modifier with encoding to .example.com...
+Label text value
+  very  4242
 Connecting to my-box.example.com...
 Item        Total Sold    In Stock    On Order  SKU
 gum               1412          54          10  GRO-000-415
diff --git a/tests/core/saved/test_01.X.out b/tests/core/saved/test_01.X.out
index bc9ef84f63ec..da80e681b27b 100644
--- a/tests/core/saved/test_01.X.out
+++ b/tests/core/saved/test_01.X.out
@@ -1 +1 @@
-<top><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><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><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><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/tests/core/saved/test_01.XP.out b/tests/core/saved/test_01.XP.out
index f7d7e5c9246f..c331dceafe62 100644
--- a/tests/core/saved/test_01.XP.out
+++ b/tests/core/saved/test_01.XP.out
@@ -1,6 +1,14 @@
 <top>
   <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>
diff --git a/tests/core/saved/test_12.E.err b/tests/core/saved/test_12.E.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.E.err
diff --git a/tests/core/saved/test_12.E.out b/tests/core/saved/test_12.E.out
new file mode 100644
index 000000000000..1c899a165664
--- /dev/null
+++ b/tests/core/saved/test_12.E.out
@@ -0,0 +1,89 @@
+op create: [] []
+op open_container: [top] []
+op open_container: [data] []
+op open_list: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op open_instance: [thing] []
+op string: [name] [thing]
+op string: [color] [green]
+op content: [time] [2:15]
+op string: [hand] [left]
+op string: [color] [blue]
+op content: [time] [3:45]
+op close_instance: [thing] []
+op close_list: [thing] []
+op close_container: [data] []
+op close_container: [top] []
+op finish: [] []
+op flush: [] []
diff --git a/tests/core/saved/test_12.H.err b/tests/core/saved/test_12.H.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.H.err
diff --git a/tests/core/saved/test_12.H.out b/tests/core/saved/test_12.H.out
new file mode 100644
index 000000000000..5cbac1797776
--- /dev/null
+++ b/tests/core/saved/test_12.H.out
@@ -0,0 +1 @@
+<div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="name">thing</div><div class="text"> is </div><div class="data" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data" data-tag="hand">left</div><div class="text"> hand is </div><div class="data" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div>
\ No newline at end of file
diff --git a/tests/core/saved/test_12.HIPx.err b/tests/core/saved/test_12.HIPx.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.HIPx.err
diff --git a/tests/core/saved/test_12.HIPx.out b/tests/core/saved/test_12.HIPx.out
new file mode 100644
index 000000000000..9b5fea1ca4af
--- /dev/null
+++ b/tests/core/saved/test_12.HIPx.out
@@ -0,0 +1,160 @@
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name" data-xpath="/top/data/thing/name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand" data-xpath="/top/data/thing[name = 'thing']/hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color" data-xpath="/top/data/thing[name = 'thing']/color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time" data-xpath="/top/data/thing[name = 'thing']/time">03:45</div>
+</div>
diff --git a/tests/core/saved/test_12.HP.err b/tests/core/saved/test_12.HP.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.HP.err
diff --git a/tests/core/saved/test_12.HP.out b/tests/core/saved/test_12.HP.out
new file mode 100644
index 000000000000..1e0e9233fbe5
--- /dev/null
+++ b/tests/core/saved/test_12.HP.out
@@ -0,0 +1,160 @@
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
+<div class="line">
+  <div class="text">The </div>
+  <div class="data" data-tag="name">thing</div>
+  <div class="text"> is </div>
+  <div class="data" data-tag="color">green</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">02:15</div>
+</div>
+<div class="line">
+  <div class="text">My </div>
+  <div class="data" data-tag="hand">left</div>
+  <div class="text"> hand is </div>
+  <div class="data" data-tag="color">blue</div>
+  <div class="text"> til </div>
+  <div class="data" data-tag="time">03:45</div>
+</div>
diff --git a/tests/core/saved/test_12.J.err b/tests/core/saved/test_12.J.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.J.err
diff --git a/tests/core/saved/test_12.J.out b/tests/core/saved/test_12.J.out
new file mode 100644
index 000000000000..118bb760eefb
--- /dev/null
+++ b/tests/core/saved/test_12.J.out
@@ -0,0 +1,2 @@
+{"top": {"data": {"thing": [{"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}]}}
+}
diff --git a/tests/core/saved/test_12.JP.err b/tests/core/saved/test_12.JP.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.JP.err
diff --git a/tests/core/saved/test_12.JP.out b/tests/core/saved/test_12.JP.out
new file mode 100644
index 000000000000..3e15e0d554cc
--- /dev/null
+++ b/tests/core/saved/test_12.JP.out
@@ -0,0 +1,88 @@
+{
+  "top": {
+    "data": {
+      "thing": [
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        },
+        {
+          "name": "thing",
+          "color": "green",
+          "time": 2:15,
+          "hand": "left",
+          "color": "blue",
+          "time": 3:45
+        }
+      ]
+    }
+  }
+}
diff --git a/tests/core/saved/test_12.T.err b/tests/core/saved/test_12.T.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.T.err
diff --git a/tests/core/saved/test_12.T.out b/tests/core/saved/test_12.T.out
new file mode 100644
index 000000000000..6f777c7a1f44
--- /dev/null
+++ b/tests/core/saved/test_12.T.out
@@ -0,0 +1,20 @@
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
+The thing is green til 02:15
+My left hand is blue til 03:45
diff --git a/tests/core/saved/test_12.X.err b/tests/core/saved/test_12.X.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.X.err
diff --git a/tests/core/saved/test_12.X.out b/tests/core/saved/test_12.X.out
new file mode 100644
index 000000000000..ed2d8e44e07a
--- /dev/null
+++ b/tests/core/saved/test_12.X.out
@@ -0,0 +1 @@
+<top><data><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing></data></top>
\ No newline at end of file
diff --git a/tests/core/saved/test_12.XP.err b/tests/core/saved/test_12.XP.err
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tests/core/saved/test_12.XP.err
diff --git a/tests/core/saved/test_12.XP.out b/tests/core/saved/test_12.XP.out
new file mode 100644
index 000000000000..73eec4c675b6
--- /dev/null
+++ b/tests/core/saved/test_12.XP.out
@@ -0,0 +1,84 @@
+<top>
+  <data>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+    <thing>
+      <name>thing</name>
+      <color>green</color>
+      <time>2:15</time>
+      <hand>left</hand>
+      <color>blue</color>
+      <time>3:45</time>
+    </thing>
+  </data>
+</top>
diff --git a/tests/core/test_01.c b/tests/core/test_01.c
index 5c748772fb9f..05d778a0bca4 100644
--- a/tests/core/test_01.c
+++ b/tests/core/test_01.c
@@ -79,6 +79,18 @@ main (int argc, char **argv)
 
     xo_open_container_h(NULL, "top");
 
+    xo_emit("testing argument modifier {a:}.{a:}...\n",
+	    "host", "my-box", "domain", "example.com");
+
+    xo_emit("testing argument modifier with encoding to {ea:}.{a:}...\n",
+	    "host", "my-box", "domain", "example.com");
+
+    xo_emit("{La:} {a:}\n", "Label text", "label", "value");
+
+    xo_emit_field("Vt", "max-chaos", NULL, NULL, "  very  ");
+    xo_emit_field("V", "min-chaos", "%d", NULL, 42);
+    xo_emit_field("V", "some-chaos", "%d\n", "[%d]", 42);
+
     xo_emit("Connecting to {:host}.{:domain}...\n", "my-box", "example.com");
 
     xo_attr("test", "value");
diff --git a/tests/core/test_02.c b/tests/core/test_02.c
index abddcf273c97..9a0268009915 100644
--- a/tests/core/test_02.c
+++ b/tests/core/test_02.c
@@ -42,6 +42,7 @@ main (int argc, char **argv)
     }
 
     xo_set_flags(NULL, XOF_UNITS); /* Always test w/ this */
+    xo_set_file(stdout);
 
     xo_open_container_h(NULL, "top");
 
diff --git a/tests/core/test_12.c b/tests/core/test_12.c
new file mode 100644
index 000000000000..17d26a6dae54
--- /dev/null
+++ b/tests/core/test_12.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2014, Juniper Networks, Inc.
+ * All rights reserved.
+ * This SOFTWARE is licensed under the LICENSE provided in the
+ * ../Copyright file. By downloading, installing, copying, or otherwise
+ * using the SOFTWARE, you agree to be bound by the terms of that
+ * LICENSE.
+ * Phil Shafer, July 2014
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "xo_config.h"
+#include "xo.h"
+
+int
+main (int argc, char **argv)
+{
+    int i, count = 10;
+    int mon = 0;
+    xo_emit_flags_t flags = XOEF_RETAIN;
+
+    argc = xo_parse_args(argc, argv);
+    if (argc < 0)
+	return 1;
+
+    for (argc = 1; argv[argc]; argc++) {
+	if (strcmp(argv[argc], "xml") == 0)
+	    xo_set_style(NULL, XO_STYLE_XML);
+	else if (strcmp(argv[argc], "json") == 0)
+	    xo_set_style(NULL, XO_STYLE_JSON);
+	else if (strcmp(argv[argc], "text") == 0)
+	    xo_set_style(NULL, XO_STYLE_TEXT);
+	else if (strcmp(argv[argc], "html") == 0)
+	    xo_set_style(NULL, XO_STYLE_HTML);
+	else if (strcmp(argv[argc], "pretty") == 0)
+	    xo_set_flags(NULL, XOF_PRETTY);
+	else if (strcmp(argv[argc], "xpath") == 0)
+	    xo_set_flags(NULL, XOF_XPATH);
+	else if (strcmp(argv[argc], "info") == 0)
+	    xo_set_flags(NULL, XOF_INFO);
+	else if (strcmp(argv[argc], "no-retain") == 0)
+	    flags &= ~XOEF_RETAIN;
+	else if (strcmp(argv[argc], "big") == 0) {
+	    if (argv[argc + 1])
+		count = atoi(argv[++argc]);
+	}
+    }
+
+    xo_set_flags(NULL, XOF_UNITS); /* Always test w/ this */
+    xo_set_file(stdout);
+
+    xo_open_container("top");
+    xo_open_container("data");
+
+    const char *fmt1 = "The {C:fg-red}{k:name}{C:reset} is "
+	"{C:/fg-%s}{:color}{C:reset} til {:time/%02d:%02d}\n";
+    const char *fmt2 = "My {C:fg-red}{:hand}{C:reset} hand is "
+	"{C:/fg-%s}{:color}{C:reset} til {:time/%02d:%02d}\n";
+
+    for (i = 0; i < count; i++) {
+	xo_open_instance("thing");
+	xo_emit_f(flags, fmt1, "thing", "green", "green", 2, 15);
+	xo_emit_f(flags, fmt2, "left", "blue", "blue", 3, 45);
+    }
+
+    xo_close_container("data");
+    xo_close_container_h(NULL, "top");
+
+    xo_finish();
+
+    return 0;
+}
diff --git a/tests/gettext/gt_01.c b/tests/gettext/gt_01.c
index a0200c2926c4..d63674745d6d 100644
--- a/tests/gettext/gt_01.c
+++ b/tests/gettext/gt_01.c
@@ -26,7 +26,7 @@ int
 main (int argc, char **argv)
 {
     static char domainname[] = "gt_01";
-    char path[MAXPATHLEN];
+    static char path[MAXPATHLEN];
     const char *tzone = "EST";
     const char *lang = "pig_latin";