From 0a1addd293ed712585783441427a44ce2e0ae568 Mon Sep 17 00:00:00 2001 From: Phil Shafer Date: Fri, 15 Apr 2016 18:03:30 +0000 Subject: Import libxo 0.6.0 --- Makefile.am | 1 + configure.ac | 31 +- doc/libxo-manual.html | 1046 +++++++++++++++++++++---------------- doc/libxo.txt | 318 +++++++---- encoder/cbor/enc_cbor.c | 2 +- libxo-config.in | 16 +- libxo/libxo.c | 563 +++++++++++++++++--- libxo/xo.h | 70 +++ libxo/xo_emit_f.3 | 111 ++++ libxo/xo_format.5 | 318 +++++------ libxo/xo_parse_args.3 | 4 + packaging/libxo.pc.in | 6 +- packaging/libxo.rb.base.in | 8 +- tests/core/Makefile.am | 4 +- tests/core/saved/test_01.E.out | 8 + tests/core/saved/test_01.H.out | 3 +- tests/core/saved/test_01.HIPx.out | 22 + tests/core/saved/test_01.HP.out | 22 + tests/core/saved/test_01.J.out | 2 +- tests/core/saved/test_01.JP.out | 8 + tests/core/saved/test_01.T.out | 4 + tests/core/saved/test_01.X.out | 2 +- tests/core/saved/test_01.XP.out | 8 + tests/core/saved/test_12.E.err | 0 tests/core/saved/test_12.E.out | 89 ++++ tests/core/saved/test_12.H.err | 0 tests/core/saved/test_12.H.out | 1 + tests/core/saved/test_12.HIPx.err | 0 tests/core/saved/test_12.HIPx.out | 160 ++++++ tests/core/saved/test_12.HP.err | 0 tests/core/saved/test_12.HP.out | 160 ++++++ tests/core/saved/test_12.J.err | 0 tests/core/saved/test_12.J.out | 2 + tests/core/saved/test_12.JP.err | 0 tests/core/saved/test_12.JP.out | 88 ++++ tests/core/saved/test_12.T.err | 0 tests/core/saved/test_12.T.out | 20 + tests/core/saved/test_12.X.err | 0 tests/core/saved/test_12.X.out | 1 + tests/core/saved/test_12.XP.err | 0 tests/core/saved/test_12.XP.out | 84 +++ tests/core/test_01.c | 12 + tests/core/test_02.c | 1 + tests/core/test_12.c | 76 +++ tests/gettext/gt_01.c | 2 +- 45 files changed, 2473 insertions(+), 800 deletions(-) create mode 100644 libxo/xo_emit_f.3 create mode 100644 tests/core/saved/test_12.E.err create mode 100644 tests/core/saved/test_12.E.out create mode 100644 tests/core/saved/test_12.H.err create mode 100644 tests/core/saved/test_12.H.out create mode 100644 tests/core/saved/test_12.HIPx.err create mode 100644 tests/core/saved/test_12.HIPx.out create mode 100644 tests/core/saved/test_12.HP.err create mode 100644 tests/core/saved/test_12.HP.out create mode 100644 tests/core/saved/test_12.J.err create mode 100644 tests/core/saved/test_12.J.out create mode 100644 tests/core/saved/test_12.JP.err create mode 100644 tests/core/saved/test_12.JP.out create mode 100644 tests/core/saved/test_12.T.err create mode 100644 tests/core/saved/test_12.T.out create mode 100644 tests/core/saved/test_12.X.err create mode 100644 tests/core/saved/test_12.X.out create mode 100644 tests/core/saved/test_12.XP.err create mode 100644 tests/core/saved/test_12.XP.out create mode 100644 tests/core/test_12.c diff --git a/Makefile.am b/Makefile.am index e050bc46f3391..cb71d522bb51e 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 1d86f0e5030cc..cc371100e9bf5 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 47881da91ab5d..4db374b394f5e 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 ($) { -December 30, 2015 +April 15, 2016

libxo: The Easy Way to Generate text, XML, JSON, and HTML output
libxo-manual

@@ -22130,46 +22130,54 @@ jQuery(function ($) { Field Modifiers @@ -22208,42 +22216,38 @@ jQuery(function ($) {
  • 2.2.11   
    +Retaining Parsed Format Information +
  • +
  • +
    2.2.12   
    Example
  • 2.3   
    -Command-line Arguments -
  • -
  • -
    2.4   
    Representing Hierarchy
  • -
    2.5   
    -Handles -
  • -
  • -
    2.6   
    -UTF-8 +
    2.4   
    +Command-line Arguments
  • @@ -22252,7 +22256,7 @@ jQuery(function ($) { The libxo API