Merge branch 'develop'

.travis.yml

@@ -0,0 +1,12 @@
+language: c
+
+script: printenv && uname -a && /bin/sh ./bin/setup.sh && cd build && ../configure --enable-warnings && make && sudo make install && make test
+
+notifications:
+  recipients:
+    - libslax-noise@googlegroups.com
+
+branches:
+  only:
+    - master
+    - develop

README.md

@@ -1,4 +1,58 @@
 libxo
 =====
 
-library for generating text, XML, JSON, and HTML from a single source code path
+libxo - A Library for Generating Text, XML, JSON, and HTML Output
+
+The libxo library allows an application to generate text, XML, JSON,
+and HTML output using a common set of function calls.  The application
+decides at run time which output style should be produced.  The
+application calls a function "xo_emit" to product output that is
+described in a format string.  A "field descriptor" tells libxo what
+the field is and what it means.
+
+```
+    xo_emit(" {:lines/%7ju/%ju} {:words/%7ju/%ju} "
+            "{:characters/%7ju/%ju}{d:filename/%s}\n",
+            linect, wordct, charct, file);
+```
+
+Output can then be generated in various style, using the "--libxo"
+option: 
+
+```
+    % wc /etc/motd
+          25     165    1140 /etc/motd
+    % wc --libxo xml,pretty,warn /etc/motd
+    <wc>
+      <file>
+        <filename>/etc/motd</filename>
+        <lines>25</lines>
+        <words>165</words>
+        <characters>1140</characters>
+      </file>
+    </wc>
+    % wc --libxo json,pretty,warn /etc/motd
+    {
+      "wc": {
+        "file": [
+          {
+            "filename": "/etc/motd",
+            "lines": 25,
+            "words": 165,
+            "characters": 1140
+          }
+        ]
+      }
+    }
+    % wc --libxo html,pretty,warn /etc/motd
+    <div class="line">
+      <div class="text"> </div>
+      <div class="data" data-tag="lines">     25</div>
+      <div class="text"> </div>
+      <div class="data" data-tag="words">    165</div>
+      <div class="text"> </div>
+      <div class="data" data-tag="characters">   1140</div>
+      <div class="text"> </div>
+      <div class="data" data-tag="filename">/etc/motd</div>
+    </div>
+```

bin/Zaliases

@@ -11,6 +11,7 @@ set opts=' \
 set opts=`echo $opts`
 
 setenv CONFIGURE_OPTS "$opts"
+setenv ADB_PATH $top_src/build/libxo/.libs
 
 alias Zconfigure "(cd $top_src/build; ../configure $opts)"
 alias Zbuild "(cd $top_src/build; make \!* )"