Only enable CI when push to master & tag

Select gcc binaries to release
Run brew update-reset when brew update fails
2026-11-01 12:05:54 +00:00 · 2023-07-01 12:03:29 -07:00 · 2023-07-01 11:46:41 -07:00 · 2023-07-01 11:23:31 -07:00 · 2023-07-01 11:23:31 -07:00 · 2023-07-01 11:23:31 -07:00
130 changed files with 29618 additions and 4551 deletions
@@ -1,2 +1,3 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+* text=auto eol=lf
@@ -7,7 +7,7 @@ about: Create a report to help us improve
 <!--
 READ THIS FIRST!

-If you have a usage question, please ask us on either Stack Overflow (https://stackoverflow.com/questions/tagged/jq) or in the #jq channel (http://irc.lc/freenode/%23jq/) on Freenode (https://webchat.freenode.net/).
+If you have a usage question, please ask us on either Stack Overflow (https://stackoverflow.com/questions/tagged/jq) or in the #jq channel (https://web.libera.chat/#jq) on Libera.Chat (https://libera.chat/).

 -->

@@ -0,0 +1,209 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - "v*"
+  pull_request:
+jobs:
+  linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [gcc, clang]
+        image: [ubuntu-20.04, ubuntu-22.04]
+    runs-on: ${{ matrix.image }}
+    env:
+      CC: ${{ matrix.compiler }}
+      SUFFIX: linux-${{ matrix.image}}-${{ matrix.compiler }}
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install packages
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y \
+            automake \
+            autoconf \
+            bison \
+            flex \
+            gdb \
+            python3
+      - name: Build
+        run: |
+          autoreconf -fi
+          ./configure --disable-dependency-tracking \
+            --disable-silent-rules \
+            --disable-maintainer-mode \
+            --disable-valgrind \
+            --with-oniguruma=builtin \
+            YACC="$(which bison) -y"
+          make
+      - name: Test
+        run: |
+          make check
+      - name: Upload Test Logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-logs-${{ env.SUFFIX }}
+          retention-days: 7
+          path: |
+            test-suite.log
+            tests/*.log
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: jq-${{ env.SUFFIX }}
+          if-no-files-found: error
+          retention-days: 7
+          path: |
+            jq
+  macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [gcc, clang]
+        image: [macos-11, macos-12, macos-13]
+    runs-on: ${{ matrix.image }}
+    env:
+      CC: ${{ matrix.compiler }}
+      SUFFIX: macos-${{ matrix.image}}-${{ matrix.compiler }}
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install packages
+        run: |
+          # brew update sometimes fails with "Fetching /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask failed!"
+          brew update || brew update-reset
+          brew install \
+            autoconf \
+            automake \
+            libtool \
+            flex \
+            bison
+          sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
+      - name: Build
+        run: |
+          autoreconf -fi
+          ./configure --disable-dependency-tracking \
+            --disable-silent-rules \
+            --disable-maintainer-mode \
+            --disable-valgrind \
+            --with-oniguruma=builtin \
+            YACC="$(brew --prefix)/opt/bison/bin/bison -y"
+          make
+      - name: Test
+        run: |
+          make check
+      - name: Upload Test Logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-logs-${{ env.SUFFIX }}
+          retention-days: 7
+          path: |
+            test-suite.log
+            tests/*.log
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: jq-${{ env.SUFFIX }}
+          if-no-files-found: error
+          retention-days: 7
+          path: |
+            jq
+  windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [gcc]
+        image: [windows-2019, windows-2022]
+    runs-on: ${{ matrix.image }}
+    env:
+      CC: ${{ matrix.compiler }}
+      SUFFIX: windows-${{ matrix.image}}-${{ matrix.compiler }}
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            base-devel
+            git
+            clang
+            autoconf
+            automake
+            libtool
+            bison
+            flex
+      - name: Build
+        shell: msys2 {0}
+        run: |
+          autoreconf -fi
+          ./configure --disable-dependency-tracking \
+            --disable-silent-rules \
+            --disable-maintainer-mode \
+            --disable-valgrind \
+            --with-oniguruma=builtin \
+            --disable-shared \
+            --enable-static \
+            --enable-all-static \
+            YACC="$(which bison) -y"
+          make
+      - name: Test
+        shell: msys2 {0}
+        run: |
+          make check
+      - name: Upload Test Logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-logs-${{ env.SUFFIX }}
+          retention-days: 7
+          path: |
+            test-suite.log
+            tests/*.log
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: jq-${{ env.SUFFIX }}
+          if-no-files-found: error
+          retention-days: 7
+          path: |
+            jq.exe
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    needs: [linux, macos, windows]
+    if: startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Merge built artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+      - name: Upload release
+        env:
+          TAG_NAME: ${{ github.ref_name }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          mkdir release
+          cp artifacts/jq-linux-ubuntu-22.04-gcc/jq release/jq-linux-amd64
+          cp artifacts/jq-macos-macos-13-gcc/jq release/jq-macos-amd64
+          cp artifacts/jq-windows-windows-2022-gcc/jq.exe release/jq-windows-amd64.exe
+
+          gh release create $TAG_NAME --draft --title "jq ${TAG_NAME#v}" --generate-notes
+          gh release upload $TAG_NAME --clobber release/jq-*
@@ -0,0 +1,77 @@
+name: Linux Clang scan-build Static Analyzer Build
+
+on:
+    # Don't do this for PRs.  It eats up minutes.
+    push:
+      branches:
+         - 'master'
+         - 'scan-build'
+      paths:
+         - '.github/workflows/scanbuild.yml'
+
+jobs:
+    unix:
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                name: [linux-clang]
+                include:
+                    - name: linux-clang
+                      os: ubuntu-latest
+                      compiler: clang
+                      cflags: ''
+        steps:
+            - name: Clone repository
+              uses: actions/checkout@v1
+            - name: Open Submodule(s)
+              run: |
+                git submodule update --init --recursive
+            - name: Install packages
+              if: startsWith(matrix.os, 'ubuntu')
+              run: |
+                sudo apt-get update -qq
+                sudo apt-get install -y automake autoconf bison flex gdb python3 valgrind clang-tools
+            - name: Prep
+              run: |
+                #pyenv global 3.6.7
+                #pip3 install pipenv
+                #(cd docs && pipenv sync)
+                #if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
+                echo SHELL=$SHELL
+                echo PATH=$PATH
+                which bison
+                bison --version
+
+            - name: Build
+              env:
+                CC: ${{ matrix.compiler }}
+                MAKEVARS: ${{ matrix.makevars }}
+              run: |
+                autoreconf -fi
+                rm src/lexer.c src/lexer.h
+                rm src/parser.c src/parser.h
+                ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE
+                scan-build --keep-going make -j4
+            - name: Test
+              env:
+                CC: ${{ matrix.compiler }}
+                MAKEVARS: ${{ matrix.makevars }}
+              run: |
+                ulimit -c unlimited
+                scan-build --keep-going make -j4 check
+            - name: Core dump stacks
+              run: |
+                echo "thread apply all bt" > /tmp/x
+                find . -name core -print | while read core; do gdb -batch -x x `file "$core"|sed -e "s/^[^']*'//" -e "s/[ '].*$//"` "$core"; done
+                if [ "$(find . -name core -print | wc -l)" -gt 0 ]; then false; fi
+            - name: Test logs
+              if: ${{ failure() }}
+              run: |
+                cat test-suite.log
+                cat tests/*.log
+            - name: Upload Logs
+              uses: actions/upload-artifact@v2
+              with:
+                name: Scan-Build Reports
+                path: '/tmp/scan-build*/'
@@ -0,0 +1,40 @@
+name: Update website
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'docs/**'
+concurrency: website
+permissions:
+  contents: write
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+          cache: pipenv
+      - name: Install pipenv
+        run: pip install pipenv
+      - name: Install dependencies
+        run: pipenv sync
+        working-directory: docs
+      - name: Update website
+        run: scripts/update-website
+      - name: Commit changes
+        run: |
+          if ! git diff --quiet; then
+            git add --all
+            git config user.name 'github-actions[bot]'
+            git config user.email 'github-actions[bot]@users.noreply.github.com'
+            git commit -m 'Update website'
+            git push origin gh-pages
+          fi
@@ -18,6 +18,7 @@ jq.1

 # Generated source
 src/builtin.inc
+*.pc

 # Autotools junk
 .libs
@@ -46,6 +47,10 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 tests/*.trs

+# Docs output
+docs/output
+
 cscope.in.out
 cscope.out
 cscope.po.out
+jq.dSYM
@@ -1,202 +0,0 @@
-sudo: false
-
-language: c
-
-stages:
-    -   name: test
-
-    -   name: build
-        # Don't run build stage for pull requests to save time and resources.
-        if: type != pull_request
-
-
-jobs:
-    include:
-        # Build with gcc and run tests on Ubuntu.
-        -   &test-ubuntu
-            stage: test
-            os: linux
-            compiler: gcc
-
-            addons:
-                apt:
-                    packages:
-                        - valgrind
-                        - bison
-                        - automake
-
-            before_install:
-                - uname -s
-                - rvm install ruby-1.9.3-p551
-                - rvm use 1.9.3
-                - rm src/{lexer,parser}.{c,h}
-                - sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
-
-            install:
-                - bundle install --gemfile=docs/Gemfile
-                - wget http://ftp.debian.org/debian/pool/main/b/bison/bison_3.0.2.dfsg-2_amd64.deb
-                - ar p bison_3.0.2.dfsg-2_amd64.deb data.tar.xz | tar xJ
-                - if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
-
-            before_script:
-                # If this is OS X we'll get bison from brew, else we'll get bison
-                # from the .deb unpacked above in the install section.
-                - PATH=/usr/local/opt/bison/bin:$PWD/usr/bin:$PATH
-                - echo SHELL=$SHELL
-                - echo PATH=$PATH
-                - which bison
-                - bison --version
-                - autoreconf -if
-                - ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE
-
-            script:
-                # When using the bison from Debian we need to tell that bison where
-                # to find its data.  Yay non-relocatable code.  Not.
-                - echo PATH=$PATH
-                - which bison
-                - make BISON_PKGDATADIR=$PWD/usr/share/bison src/parser.c || make src/parser.c
-                # Make dist!
-                #
-                # Make it first to fail the build early, before we test with
-                # valgrind.
-                - make dist
-                # Build and test the dist (without valgrind)
-                - |
-                    (
-                    tar xvf jq-`scripts/version`.tar.gz &&
-                    cd jq-`scripts/version` &&
-                    pwd &&
-                    ./configure --disable-valgrind --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE &&
-                    make BISON_PKGDATADIR=$PWD/usr/share/bison src/parser.c || make src/parser.c &&
-                    make -j4 &&
-                    make check -j4 || true
-                    )
-                # Build and test the HEAD
-                - make -j4
-                - make check -j4
-
-            after_failure:
-                - cat test-suite.log
-                - cat tests/*.log
-
-
-        # Build with clang and run tests on Ubuntu.
-        -   <<: *test-ubuntu
-            compiler: clang
-
-
-        # Build with gcc and run tests with gcov on Ubuntu.
-        -   <<: *test-ubuntu
-            env: COVERAGE="--disable-valgrind --enable-gcov"
-
-            after_script:
-                - rm -rf src/.libs # don't care about coverage for libjq
-                - coveralls --gcov-options '\-lp'
-                    -e src/lexer.c -e src/parser.c -e src/jv_dtoa.c
-
-
-        # Build with gcc and run tests on macOS.
-        -   &test-osx
-            <<: *test-ubuntu
-            os: osx
-
-            before_install:
-                - uname -s
-                - brew update
-                - brew install flex bison
-                - rvm install ruby-1.9.3-p551
-                - rvm use 1.9.3
-                - gem install bundler
-                - rm src/{lexer,parser}.{c,h}
-                - sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
-
-            install:
-                - bundle install --gemfile=docs/Gemfile
-                - if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
-
-
-        # Build with clang and run tests on macOS.
-        -   <<: *test-osx
-            compiler: clang
-
-
-        # Build with gcc and run tests on Alpine Linux v3.7 (inside chroot).
-        # Note: Alpine uses musl libc.
-        -   &test-alpine
-            stage: test
-            os: linux
-            language: minimal
-            compiler: gcc
-            sudo: true
-
-            before_install:
-                - "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.7.0/alpine-chroot-install' \
-                    && echo '090d323d887ef3a2fd4e752428553f22a52b87bb  alpine-chroot-install' | sha1sum -c || travis_terminate 1"
-                - alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
-
-            install:
-                - sudo sh alpine-chroot-install -b v3.7 -a "$ARCH"
-                    -p 'build-base automake autoconf bison libtool oniguruma-dev'
-
-            before_script:
-                - autoreconf -if
-
-            script:
-                - alpine ./configure --disable-docs
-                - alpine make
-                - alpine make check
-
-
-        # Build release binary statically linked with musl libc on Alpine Linux
-        # (inside chroot). If building a tagged commit, then deploy release
-        # tarball to GitHub Releases.
-        -   &build-alpine
-            <<: *test-alpine
-            stage: build
-            env: ARCH=x86_64
-
-            script:
-                - alpine ./configure --disable-docs --enable-all-static
-                    CFLAGS='-Os -static -no-pie' CXXFLAGS='-Os -static -no-pie'
-                - alpine make
-                - alpine strip jq
-
-                - jq -V
-                - ls -lah jq
-                - file jq
-                # Ensure that the built executable is really statically linked.
-                - file jq | grep -Fw 'statically linked'
-
-            before_deploy:
-                - PKGNAME="jq-$TRAVIS_TAG-$ARCH-linux"
-                - mkdir $PKGNAME && mv jq $PKGNAME/
-                - tar -czf $PKGNAME.tar.gz $PKGNAME/
-                - sha256sum $PKGNAME.tar.gz > $PKGNAME.tar.gz.sha256
-
-            deploy:
-                provider: releases
-                api_key:
-                    secure:  # TODO: put encrypted GitHub token here!
-                file: jq-$TRAVIS_TAG-*.tar.gz*
-                file_glob: true
-                skip_cleanup: true
-                on:
-                    tags: true
-
-        # Build binaries for other architectures using QEMU user-mode emulation.
-        -   <<: *build-alpine
-            env: ARCH=x86
-
-        -   <<: *build-alpine
-            env: ARCH=aarch64
-
-        -   <<: *build-alpine
-            env: ARCH=armhf
-
-        -   <<: *build-alpine
-            env: ARCH=ppc64le
-
-
-notifications:
-    email: false
-
@@ -33,7 +33,6 @@ i                    <isomorphisms@sdf.org>
 Ian Miell            <ian.miell@gmail.com>
 Jack Pearkes         <jackpearkes@gmail.com>          - update tutorial
 James Andariese      <james.andariese@locationlabs.com> - Dockerfile
-Jingwen Owen Ou      <jingweno@gmail.com>             - jqplay.org and link to it
 jkleint              <jkleint@gmail.com>
 Joe Littlejohn       <joe.littlejohn@nokia.com>       - bug fixes
 Joel Purra           <code+github@joelpurra.com>
@@ -52,6 +51,7 @@ Mike Fletcher        <john.m.fletcher@bankofamerica.com>
 Mike McCabe          <mccabe@archive.org>             - math (libm) functions
 Nicolas Pouillard    <nicolas.pouillard@gmail.com>    - add tests
 Nicolas Williams     <nico@cryptonector.com>          - library-fication, autoconf stuff, exception handling, various
+Owen Ou              <o@owenou.com>                   - jqplay.org and link to it
 Peter van Dijk       <peter@7bits.nl>                 - doc fixes
 Philipp Hagemeister  <phihag@phihag.de>               - doc fixes
 pkoppstein           <pkoppstein@gmail.com>           - various builtins, improvements
@@ -27,7 +27,7 @@ license, which can be found at:

         https://creativecommons.org/licenses/by/3.0/

-The documentation website includes a copy of Twitter's Boostrap and
+The documentation website includes a copy of Twitter's Bootstrap and
 relies on Bonsai, Liquid templates and various other projects, look
 them up for detailed licensing conditions.

@@ -68,3 +68,69 @@ WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
 REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
 OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.

+
+
+jq uses parts of the open source C library "decNumber", which is distributed
+under the following license:
+
+
+ICU License - ICU 1.8.1 and later
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2005 International Business Machines Corporation and others
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+Portions Copyright (c) 2016 Kungliga Tekniska Högskolan
+(Royal Institute of Technology, Stockholm, Sweden).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
@@ -372,7 +372,7 @@

 	Add BLOCK_8() macro

-	Fix `foreach` non-progation of errors
+	Fix `foreach` non-propagation of errors

 	Allow zero-length buffers in jv_parser_set_buf()

@@ -1183,7 +1183,7 @@

 	Fix various UTF8 parsing bugs.
 	In particular, parse bad UTF8 by replacing the broken bits with U+FFFD
-	and resychronise correctly after broken sequences.
+	and resynchronise correctly after broken sequences.

 	Fix example in manual for `floor`. See #155.

@@ -1,4 +1,9 @@
-FROM debian:8
+FROM debian:9
+
+ENV DEBIAN_FRONTEND=noninteractive \
+    DEBCONF_NONINTERACTIVE_SEEN=true \
+    LC_ALL=C.UTF-8 \
+    LANG=C.UTF-8

 COPY . /app

@@ -13,29 +18,23 @@ RUN apt-get update && \
        git \
        bison \
        flex \
-        ruby \
-        wget \
-        ruby-dev && \
-    wget https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz -O onig-5.9.6.tar.gz && \
-    sha512sum onig-5.9.6.tar.gz | grep 6b048d345e148c9da38af7a8df76d4a358eb3d4db91fa7834076e511f526a63544284f212b0d56badbbd33112c8b458a5fff02bfbbda012ecfe478bc436ea679 && \
-    tar zxvf onig-5.9.6.tar.gz && \
-    (cd oniguruma-5.9.6 && \
-        touch NEWS ChangeLog && \
-        autoreconf -i && \
-        ./configure --prefix=/usr/local && \
-        make && \
-        make install ) && \
-    gem install bundler && \
-    (cd /app/docs && bundle install) && \
+        python3 \
+        python3-pip \
+        wget && \
+    pip3 install pipenv && \
+    (cd /app/docs && pipenv sync) && \
    (cd /app && \
+        git submodule init && \
+        git submodule update && \
        autoreconf -i && \
        ./configure --disable-valgrind --enable-all-static --prefix=/usr/local && \
        make -j8 && \
        make check && \
-        make install && \
-        make distclean ) && \
-    (cd oniguruma-5.9.6 && \
+        make install ) && \
+    (cd /app/modules/oniguruma && \
        make uninstall ) && \
+    (cd /app && \
+        make distclean ) && \
    apt-get purge -y \
        build-essential \
        autoconf \
@@ -43,10 +42,12 @@ RUN apt-get update && \
        bison \
        git \
        flex \
-        ruby \
-        ruby-dev && \
+        python3 \
+        python3-pip && \
    apt-get autoremove -y && \
-    rm -rf oniguruma-5.9.6 && \
+    rm -rf /app/modules/oniguruma/* && \
+    rm -rf /app/modules/oniguruma/.git && \
+    rm -rf /app/modules/oniguruma/.gitignore && \
    rm -rf /var/lib/apt/lists/* /var/lib/gems

 ENTRYPOINT ["/usr/local/bin/jq"]
@@ -5,12 +5,16 @@ LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h                 \
        src/exec_stack.h src/jq_parser.h src/jv_alloc.h src/jv_dtoa.h   \
        src/jv_unicode.h src/jv_utf8_tables.h src/lexer.l src/libm.h    \
        src/linker.h src/locfile.h src/opcode_list.h src/parser.y       \
-        src/util.h
+        src/util.h src/decNumber/decContext.h src/decNumber/decNumber.h \
+        src/decNumber/decNumberLocal.h src/jv_dtoa_tsd.h src/jv_thread.h \
+        src/jv_type_private.h

 LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c    \
        src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c              \
        src/jv_dtoa.c src/jv_file.c src/jv_parse.c src/jv_print.c       \
        src/jv_unicode.c src/linker.c src/locfile.c src/util.c          \
+        src/decNumber/decContext.c src/decNumber/decNumber.c            \
+        src/jv_dtoa_tsd.c                                               \
        ${LIBJQ_INCS}

 ### C build options
@@ -42,10 +46,10 @@ BUILT_SOURCES = src/builtin.inc src/version.h
 	$(AM_V_LEX) echo "NOT building lexer.c!"
 endif

-# Tell YACC (bison) autoconf macros that you want a header file created.
-# If the --warnings=all fails, you probably have an old version of bison
-# OSX ships an old bison, so update with homebrew or macports
-AM_YFLAGS = --warnings=all -d
+# Tell YACC (Bison) autoconf macros that you want a header file created.
+# If the --warnings=all fails, you probably have an old version of Bison
+# macOS ships an old Bison, so update with Homebrew or MacPorts.
+AM_YFLAGS = --warnings=all -Wno-yacc -d

 ### libjq

@@ -108,9 +112,9 @@ src/version.h: .remake-version-h
 	$(AM_V_GEN) $(generate_ver); echo "$$ver" > $@
 src/main.c: src/version.h

-src/builtin.inc: src/builtin.jq
+src/builtin.inc: $(srcdir)/src/builtin.jq
 	mkdir -p src
-	$(AM_V_GEN) sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' src/builtin.jq > $@
+	$(AM_V_GEN) sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $(srcdir)/src/builtin.jq > $@
 src/builtin.o: src/builtin.inc

 bin_PROGRAMS = jq
@@ -131,20 +135,43 @@ endif
 TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test
 TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND)

+# This is a magic make variable that causes it to treat tests/man.test as a
+# DATA-type dependency for the check target. As a result, it will attempt to
+# run any defined targets for tests/man.test as a dependency for check. This
+# allows us to ensure that the tests are up-to-date if the manual has been updated
+check_DATA = tests/man.test
+
+### Building the man tests
+
+# We use the examples in the manual as additional tests, to ensure they always work.
+# As a result, we need to rebuild the tests if the manual has been updated.
+# Making changes to the manpage without having the python deps means your
+# tests won't run. If you aren't making changes to the examples, you probably
+# don't care. But if you are, then you need to run the tests anyway.
+tests/man.test: $(srcdir)/docs/content/manual/manual.yml
+if ENABLE_DOCS
+	$(AM_V_GEN) ( cd ${abs_srcdir}/docs; $(PIPENV) run python build_mantests.py ) > $@
+else
+	@echo Changes to the manual.yml require docs to be enabled to update the manual test.
+	@echo As a result, the manual test is out of date.
+endif

 ### Building the manpage

+# We build the docs from the manpage yml. If no changes have been made to the
+# manpage, then we'll end up using the cached version. Otherwise, we need to
+# rebuild it.
 man_MANS = jq.1
+jq.1.prebuilt: $(srcdir)/docs/content/manual/manual.yml
 if ENABLE_DOCS
-jq.1: $(srcdir)/docs/content/3.manual/manual.yml
-	$(AM_V_GEN) ( cd ${abs_srcdir}/docs; '$(BUNDLER)' exec rake manpage ) > $@ || { rm -f $@; false; }
-jq.1.prebuilt: jq.1
-	$(AM_V_GEN) cp jq.1 $@ || { rm -f $@; false; }
+	$(AM_V_GEN) ( cd ${abs_srcdir}/docs; $(PIPENV) run python build_manpage.py ) > $@ || { rm -f $@; false; }
 else
-jq.1: $(srcdir)/jq.1.prebuilt
-	$(AM_V_GEN) cp $(srcdir)/jq.1.prebuilt $@
+	@echo Changes to the manual.yml require docs to be enabled to update the manpage.
+	@echo As a result, the manpage is out of date.
 endif

+jq.1: jq.1.prebuilt
+	$(AM_V_GEN) cp $(srcdir)/jq.1.prebuilt $@

 ### Build oniguruma

@@ -165,33 +192,39 @@ install-binaries: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec

 DOC_FILES = docs/content docs/public docs/templates docs/site.yml       \
-        docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md     \
-        jq.1.prebuilt
+        docs/Pipfile docs/Pipfile.lock docs/build_manpage.py            \
+        docs/build_manpage.py docs/README.md jq.1.prebuilt

 EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER)     \
        jq.1.prebuilt jq.spec src/lexer.c src/lexer.h src/parser.c      \
-        src/parser.h src/version.h src/builtin.jq                       \
-        scripts/version tests/jq.test tests/modules/.jq                 \
+        src/parser.h src/version.h src/builtin.jq scripts/version       \
+        libjq.pc                                                        \
+        tests/base64.test tests/jq-f-test.sh tests/jq.test              \
        tests/modules/a.jq tests/modules/b/b.jq tests/modules/c/c.jq    \
        tests/modules/c/d.jq tests/modules/data.json                    \
+        tests/modules/home1/.jq tests/modules/home2/.jq/g.jq            \
        tests/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq           \
+        tests/modules/shadow1.jq tests/modules/shadow2.jq               \
        tests/modules/syntaxerror/syntaxerror.jq                        \
        tests/modules/test_bind_order.jq                                \
        tests/modules/test_bind_order0.jq                               \
        tests/modules/test_bind_order1.jq                               \
-        tests/modules/test_bind_order2.jq tests/onig.supp               \
+        tests/modules/test_bind_order2.jq                               \
+        tests/onig.supp tests/local.supp                                \
        tests/onig.test tests/setup tests/torture/input0.json		\
        tests/optional.test tests/optionaltest				\
-	tests/utf8-truncate.jq tests/utf8test				\
-	tests/base64.test tests/base64test 				\
-	tests/jq-f-test.sh tests/shtest
+        tests/utf8-truncate.jq tests/utf8test				\
+        tests/base64.test tests/base64test 				\
+        tests/jq-f-test.sh tests/shtest

+DISTCHECK_CONFIGURE_FLAGS=--disable-maintainer-mode --with-oniguruma=builtin

-
-# README.md is expected in Github projects, good stuff in it, so we'll
+# README.md is expected in GitHub projects, good stuff in it, so we'll
 # distribute it and install it with the package in the doc directory.
-docdir = ${datadir}/doc/${PACKAGE}
-dist_doc_DATA = README.md COPYING AUTHORS README
+dist_doc_DATA = README.md COPYING AUTHORS
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libjq.pc

 RELEASE ?= 1
 rpm: dist jq.spec
@@ -106,7 +106,7 @@ New features in 1.4 since 1.3:

 - math functions

-    - floor, sqrt, cbrt, etetera (depends on what's available from libm)
+    - floor, sqrt, cbrt, etcetera (depends on what's available from libm)

 - libjq -- a C API interface to jq's JSON representation and for
   running jq programs from C applications
@@ -1 +0,0 @@
-README.md
@@ -3,24 +3,23 @@ jq

 jq is a lightweight and flexible command-line JSON processor.

-[![Coverage Status](https://coveralls.io/repos/stedolan/jq/badge.svg?branch=master&service=github)](https://coveralls.io/github/stedolan/jq?branch=master),
-Unix: [![Build Status](https://travis-ci.org/stedolan/jq.svg?branch=master)](https://travis-ci.org/stedolan/jq),
-Windows: [![Windows build status](https://ci.appveyor.com/api/projects/status/mi816811c9e9mx29?svg=true)](https://ci.appveyor.com/project/stedolan/jq)
-
+[![Linux Build](https://github.com/jqlang/jq/actions/workflows/linux.yml/badge.svg?branch=master)](https://github.com/jqlang/jq/actions/workflows/linux.yml?query=branch%3Amaster)
+[![macOS Build](https://github.com/jqlang/jq/actions/workflows/macos.yml/badge.svg?branch=master)](https://github.com/jqlang/jq/actions/workflows/macos.yml?query=branch%3Amaster)
+[![Windows Build](https://github.com/jqlang/jq/actions/workflows/windows.yml/badge.svg?branch=master)](https://github.com/jqlang/jq/actions/workflows/windows.yml?query=branch%3Amaster)

 If you want to learn to use jq, read the documentation at
-[https://stedolan.github.io/jq](https://stedolan.github.io/jq).  This
+[https://jqlang.github.io/jq](https://jqlang.github.io/jq).  This
 documentation is generated from the docs/ folder of this repository.
 You can also try it online at [jqplay.org](https://jqplay.org).

 If you want to hack on jq, feel free, but be warned that its internals
 are not well-documented at the moment. Bring a hard hat and a
-shovel.  Also, read the wiki: https://github.com/stedolan/jq/wiki, where
+shovel.  Also, read the wiki: https://github.com/jqlang/jq/wiki, where
 you will find cookbooks, discussion of advanced topics, internals,
 release engineering, and more.

 Source tarball and built executable releases can be found on the
-homepage and on the github release page, https://github.com/stedolan/jq/releases
+homepage and on the github release page, https://github.com/jqlang/jq/releases

 If you're building directly from the latest git, you'll need flex,
 bison (3.0 or newer), libtool, make, automake, and autoconf installed.
@@ -67,7 +66,13 @@ Cross-compilation requires a clean workspace, then:
    make distclean
    scripts/crosscompile <name-of-build> <configure-options>

-Use the --host= and --target= ./configure options to select a
-cross-compilation environment.  See also the wiki.
+Use the `--host=` and `--target=` ./configure options to select a
+cross-compilation environment.  See also
+["Cross compilation"](https://github.com/jqlang/jq/wiki/Cross-compilation) on
+the wiki.

-Send questions to https://stackoverflow.com/questions/tagged/jq or to the #jq channel (http://irc.lc/freenode/%23jq/) on Freenode (https://webchat.freenode.net/).
+
+# Community
+
+* Send questions to https://stackoverflow.com/questions/tagged/jq.
+* Join our [Discord server](https://discord.gg/yg6yjNmgAC).
@@ -0,0 +1,7 @@
+# How to report security vulnerabilities in `jq`
+
+GitHub has a [mechanism for private disclosure of vulnerabilities](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability) to repository owners and authorized persons such as maintainers.  The `jqlang/jq` repository now has this feature enabled.
+
+## Reporting a Vulnerability
+
+See [Privately Reporting a Security Vulnerability](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability).  Click on [`jqlang/jq`](https://github.com/jqlang/jq)'s [Security page](https://github.com/jqlang/jq/security) and click on [Report a vulnerability](https://github.com/jqlang/jq/security/advisories/new).  This will notify the owners and maintainers.  After submitting you'll get an option to start a private clone of `jqlang/jq` for collaboration with the maintainers.
@@ -1,26 +1,41 @@
 environment:
  matrix:
  - MSYSTEM: MINGW64
-    PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%
+    PATH: C:\Python36;C:\Python36\Scripts;C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%
  - MSYSTEM: MINGW32
-    PATH: C:\msys64\usr\bin;C:\msys64\mingw32\bin;C:\Windows\System32;C:\Windows;%PATH%
+    PATH: C:\Python36;C:\Python36\Scripts;C:\msys64\usr\bin;C:\msys64\mingw32\bin;C:\Windows\System32;C:\Windows;%PATH%

 clone_script:
-  - bash -lc "git clone -q --branch=$APPVEYOR_REPO_BRANCH https://github.com/${APPVEYOR_REPO_NAME}.git $APPVEYOR_BUILD_FOLDER"
-  - bash -lc "cd $APPVEYOR_BUILD_FOLDER && git checkout -qf $APPVEYOR_REPO_BRANCH"
+  - bash -lc "git clone -q --branch=${APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH:-$APPVEYOR_REPO_BRANCH} https://github.com/${APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME:-$APPVEYOR_REPO_NAME}.git $APPVEYOR_BUILD_FOLDER"
+  - bash -lc "cd $APPVEYOR_BUILD_FOLDER && git checkout -qf ${APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH:APPVEYOR_REPO_BRANCH}"
  - bash -lc "cd $APPVEYOR_BUILD_FOLDER && git submodule update --init --recursive"

 install:
-  # update mysy2
-  - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors"
-  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy"
-  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex"
-  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S git"
+  # update msys2
+  - C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+  - C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+  - C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/bison-3.5.4-1-x86_64.pkg.tar.xz"
+  - C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/bison-3.5.4-1-x86_64.pkg.tar.xz.sig"
+  - C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/flex-2.6.4-1-x86_64.pkg.tar.xz"
+  - C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/flex-2.6.4-1-x86_64.pkg.tar.xz.sig"
+  #- C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/git-2.33.1-1-x86_64.pkg.tar.zst"
+  - C:\msys64\usr\bin\bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+  - C:\msys64\usr\bin\bash -lc "pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+  - C:\msys64\usr\bin\bash -lc "pacman-key --verify bison-3.5.4-1-x86_64.pkg.tar.xz.sig"
+  - C:\msys64\usr\bin\bash -lc "pacman -U --noconfirm bison-3.5.4-1-x86_64.pkg.tar.xz"
+  - C:\msys64\usr\bin\bash -lc "pacman-key --verify flex-2.6.4-1-x86_64.pkg.tar.xz.sig"
+  - C:\msys64\usr\bin\bash -lc "pacman -U --noconfirm flex-2.6.4-1-x86_64.pkg.tar.xz"
+  - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process
+  #- C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors"
+  #- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Su"
+  #- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex git"
+  - C:\msys64\usr\bin\bash -lc "pip3 install --upgrade pipenv"
+  - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/docs && pipenv sync"

 build_script:
  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && autoreconf -i"
  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static"
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make -j8"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make"
  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && cat jq.1  | groff -mandoc -Thtml > jq.html"
  - 7z a jq-package.zip jq.1 jq.html jq.exe
  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && pwd && ls -la"
@@ -1,102 +1,106 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# Mac C. compile-ios.sh for JQ.

-# old values
-OLD_CFLAGS=$CFLAGS
-OLD_LDFLAGS=$LDFLAGS
-ORIG_PWD=`pwd`
+# Defaults
+set -e
+oniguruma='6.9.3'

-# For parallelism in make
-NJOBS="-j`sysctl -n hw.ncpu || echo 1`"
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS

+# Parse args. 
+usage(){
+cat << EOF
+${0##*/}: usage

-# Get oniguruma
-rm -rf $PWD/build/ios oniguruma-5.9.6
-echo "Downloading oniguruma 5.9.6"
-curl -L https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz | tar xz
-cd oniguruma-5.9.6
+    Description:
+       This simple script builds oniguruma and jq for all *-apple-darwin devices.

-# So, we need to remake the configure scripts so that the arm64 architecture
-# exists in config.sub.  In order to keep autoreconf from failing, create
-# NEWS and ChangeLog.
-touch NEWS ChangeLog
-autoreconf -fi >/dev/null 2>&1
+    Arguments:
+    --extra-cflags <arg>: Pass defines or includes to clang.
+    --extra-ldflags <arg>: Pass libs or includes to ld64.

+    --with-oniguruma <arg>: Change default version of onigurma from ${oniguruma}.
+EOF
+exit 1
+}

+while (( $# )); do
+   case "$1" in
+      --with-oniguruma) shift; oniguruma="${1}" ;;

+      --extra-cflags) shift; export CFLAGS_="${1}" ;;
+      --extra-ldflags) shift; export LDFLAGS_="${1}" ;;

-CC=`xcrun -f clang`
-cd $ORIG_PWD
+      --help) usage ;;
+      *) echo -e "Unknown option: ${1}\n"; usage ;;
+   esac
+   shift
+done 

-autoreconf -fi
-for arch in i386 x86_64 armv7 armv7s arm64; do
+# Start building.
+echo "Building..."
+MAKEJOBS="$(sysctl -n hw.ncpu || echo 1)"
+CC_="$(xcrun -f clang || echo clang)"

-	# Some of the architectures are a bit different...
-	if [[ "$arch" = "i386" || "$arch" = "x86_64" ]]
-	then
-		SYSROOT=`xcrun -f --sdk iphonesimulator --show-sdk-path`
-	else
-		SYSROOT=`xcrun -f --sdk iphoneos --show-sdk-path`
-	fi
-	if [[ "$arch" = "arm64" ]]
-	then
-		HOST="aarch64-apple-darwin"
-	else
-		HOST="$arch-apple-darwin"
-	fi
+onig_url="https://github.com/kkos/oniguruma/releases/download/v${oniguruma}/onig-${oniguruma}.tar.gz"
+builddir="${TMPDIR:-/tmp}/${RANDOM:-'xxxxx'}-compile-ios-build"
+cwd="$(realpath ${PWD} 2>/dev/null || echo ${PWD})"

-	CFLAGS="-arch $arch -miphoneos-version-min=6.0 -isysroot $SYSROOT $OLD_CFLAGS"
-	LDFLAGS="-arch $arch -miphoneos-version-min=6.0 -isysroot $SYSROOT $OLD_LDFLAGS"
+t_exit() {
+cat << EOF

+A error as occurred.
+    oniguruma location: ${builddir}/onig/onig-${oniguruma}
+    jq location: ${cwd}

+    Provide config.log and console logs when posting a issue.

-	# Build oniguruma for this architecture
-	cd oniguruma-5.9.6
-	CC=$CC CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS ./configure --disable-shared --enable-static --host=$HOST --prefix=$ORIG_PWD/build/ios/$arch
-	STATUS=$?
-	if [ $STATUS -ne 0 ]
-	then
-		echo "Failed to configure oniguruma for architecture $arch.  Check `pwd`/config.log for details."
-		cd $PWD
-		exit $STATUS
-	fi
-	make clean
-	make $NJBOS install
-	STATUS=$?
-	if [ $STATUS -ne 0 ]
-	then
-		echo "Failed to make oniguruma for architecture $arch."
-		cd $PWD
-		exit $STATUS
-	fi
+EOF
+}
+trap t_exit ERR

+#  Onig.
+mkdir -p "${builddir}/onig"
+cd "${builddir}/"
+ curl -L ${onig_url} | tar xz
+ for arch in i386 x86_64 armv7 armv7s arm64; do
+     if [[ "$arch" = "i386" || "$arch" = "x86_64" ]]; then
+         SYSROOT=$(xcrun -f --sdk iphonesimulator --show-sdk-path)
+     else
+         SYSROOT=$(xcrun -f --sdk iphoneos --show-sdk-path)
+     fi
+     HOST="${arch}-apple-darwin"
+     [[ "${arch}" = "arm64" ]] && HOST="aarch64-apple-darwin"

+     CFLAGS="-arch ${arch} -miphoneos-version-min=9.0 -isysroot ${SYSROOT} ${CFLAGS_} -D_REENTRANT"
+     LDFLAGS="-arch ${arch} -miphoneos-version-min=9.0 -isysroot ${SYSROOT} ${LDFLAGS_}"
+     CC="${CC_} ${CFLAGS}"

-	# Build jq for this architecture
-	cd $ORIG_PWD
-	CC=$CC CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS ./configure --disable-shared --enable-static -host=$HOST --prefix=$ORIG_PWD/build/ios/$arch --with-oniguruma=$ORIG_PWD/build/ios/$arch
-	STATUS=$?
-	if [ $STATUS -ne 0 ]
-	then
-		echo "Failed to configure jq for architecture $arch"
-		exit $STATUS
-	fi
-	make clean
-	make $NJOBS install
-	STATUS=$?
-	if [ $STATUS -ne 0 ]
-	then
-		echo "Failed to make jq for architecture $arch"
-		exit $STATUS
-	fi
-done
+     # ./configure; make install
+     cd "${builddir}/onig-${oniguruma}"
+     CC=${CC} LDFLAGS=${LDFLAGS} \
+     ./configure --host=${HOST} --build=$(./config.guess) --enable-shared=no --enable-static=yes --prefix=/
+     make -j${MAKEJOBS} install DESTDIR="${cwd}/ios/onig/${arch}"
+     make clean
+     
+     # Jump back to JQ.
+     cd ${cwd}
+     [[ ! -f ./configure ]] && autoreconf -ivf
+     CC=${CC} LDFLAGS=${LDFLAGS} \
+     ./configure --host=${HOST} --build=$(./config/config.guess) --enable-docs=no --enable-shared=no --enable-static=yes --prefix=/ --with-oniguruma=${cwd}/ios/onig/${arch} $(test -z ${BISON+x} && echo '--disable-maintainer-mode')
+     make -j${MAKEJOBS} install DESTDIR="${cwd}/ios/jq/${arch}"
+     make clean
+ done

+mkdir -p "${cwd}/ios/dest/lib"
+# lipo, make a static lib.
+lipo -create -output ${cwd}/ios/dest/lib/libonig.a ${cwd}/ios/onig/{i386,x86_64,armv7,armv7s,arm64}/lib/libonig.a
+lipo -create -output ${cwd}/ios/dest/lib/libjq.a ${cwd}/ios/jq/{i386,x86_64,armv7,armv7s,arm64}/lib/libjq.a

-# lipo together the different architectures into a universal 'fat' file
-lipo -create -output $ORIG_PWD/build/ios/libonig.a $ORIG_PWD/build/ios/{i386,x86_64,armv7,armv7s,arm64}/lib/libonig.a
-lipo -create -output $ORIG_PWD/build/ios/libjq.a $ORIG_PWD/build/ios/{i386,x86_64,armv7,armv7s,arm64}/lib/libjq.a
+# Take the arm64 headers- the most common target.
+cp -r ${cwd}/ios/jq/arm64/include ${cwd}/ios/dest/
+rm -rf ${cwd}/build/ios/{i386,x86_64,armv7,armv7s,arm64}

-# copy the products into the destination directory and clean up the single-architecture files.
-cp $ORIG_PWD/build/ios/i386/include/*.h $ORIG_PWD/build/ios/
-rm -rf $ORIG_PWD/build/ios/{i386,x86_64,armv7,armv7s,arm64}
-
-echo "Products are in $ORIG_PWD/build/ios"
+echo "Output to ${cwd}/ios/dest"
@@ -1,13 +1,7 @@
-m4_define([jq_version],
-          m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null &&
-                        (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) ||
-                        echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`])))
+m4_define([jq_version], m4_esyscmd_s([scripts/version])))

-AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
-             [jq], [https://stedolan.github.io/jq])
-
-m4_include([m4/ax_compare_version.m4])
-m4_include([m4/ax_prog_bison_version.m4])
+AC_INIT([jq], [jq_version], [https://github.com/jqlang/jq/issues],
+             [jq], [https://jqlang.github.io/jq])

 dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
 AC_PREREQ([2.64])
@@ -22,9 +16,11 @@ AC_PROG_CPP_WERROR
 AC_PROG_YACC
 AC_OBJEXT
 AC_EXEEXT
+AC_USE_SYSTEM_EXTENSIONS
 LT_INIT([shared static win32-dll])
 AM_PROG_CC_C_O

+AC_SYS_LARGEFILE # issue 2167

 dnl couldn't use AM_PROG_LEX as it doesn't support header files like the
 dnl AC_PROG_YACC macros...
@@ -52,8 +48,9 @@ fi
 AC_CHECK_FUNCS(memmem)
 AC_CHECK_FUNCS(mkstemp)

-AC_CHECK_HEADER("shlwapi.h",[have_win32=1;])
-AM_CONDITIONAL([WIN32], [test "x$have_win32" = x1])
+AC_CHECK_HEADER("sys/cygwin.h", [have_cygwin=1;])
+AC_CHECK_HEADER("shlwapi.h",[have_shlwapi=1;])
+AM_CONDITIONAL([WIN32], [test \( "x$have_shlwapi" = x1 \) -a ! \( "x$have_cygwin" = x1 \)])

 dnl Running tests with Valgrind is slow. It is faster to iterate on
 dnl code without Valgrind until tests pass, then enable Valgrind and
@@ -74,9 +71,9 @@ dnl Code coverage
 AC_ARG_ENABLE([gcov],
   AC_HELP_STRING([--enable-gcov], [enable gcov code coverage tool]))

-dnl Don't attempt to build docs if there's no Ruby lying around
+dnl Don't attempt to build docs if python deps aren't installed
 AC_ARG_ENABLE([docs],
-   AC_HELP_STRING([--disable-docs], [don't build docs]))
+   AC_HELP_STRING([--disable-docs], [don't build docs]), [], [enable_docs=yes])

 dnl Don't attempt to build the error injection object (if there is no LD_PRELOAD support)
 AC_ARG_ENABLE([error-injection],
@@ -86,28 +83,37 @@ dnl Enable building all static
 AC_ARG_ENABLE([all-static],
   AC_HELP_STRING([--enable-all-static], [link jq with static libraries only]))

+dnl find pipenv
+AC_ARG_VAR([PIPENV], [pipenv command])
+AC_CHECK_PROGS([PIPENV], pipenv)
+
 AS_IF([test "x$enable_docs" != "xno"],[
-   AC_CHECK_PROGS(bundle_cmd, bundle)
+   AC_CACHE_CHECK([for Python dependencies], [jq_cv_python_deps],[
+      jq_cv_python_deps=yes
+      AS_IF([test "x$PIPENV" = "x" || \
+      ! bmsg="`cd ${srcdir}/docs; LC_ALL=$LANG "$PIPENV" --venv`"],[
+         jq_cv_python_deps=no
+      ])
+   ])

-   AC_CACHE_CHECK([for Ruby dependencies], [jq_cv_ruby_deps],
-     [jq_cv_ruby_deps=yes;
-        AS_IF([test "x$bundle_cmd" = "x" || \
-        ! bmsg="`cd ${srcdir}/docs; "$bundle_cmd" check 2>/dev/null`"],[
-           AC_MSG_WARN([$bmsg])
-           cat <<EOF
+   AS_IF([test "x$jq_cv_python_deps" != "xyes"], [
+      AC_MSG_WARN([Error checking python dependencies: $bmsg
 *****************************************************************
-*  Ruby dependencies for building jq documentation not found.   *
+*  Python dependencies for building jq documentation not found. *
 *  You can still build, install and hack on jq, but the manpage *
-*  will not be rebuilt and some of the tests will not run.      *
+*  will not be rebuilt and new manpage tests will not be run.   *
 *  See docs/README.md for how to install the docs dependencies. *
-*****************************************************************
-EOF
-           jq_cv_ruby_deps=no
-     ])])
+*****************************************************************])
+      enable_docs=no
+   ])
+])

-   if test "x$jq_cv_ruby_deps" != "xyes"; then
-     enable_docs=no
-   fi
+dnl Disable decNumber support
+AC_ARG_ENABLE([decnum],
+   AC_HELP_STRING([--disable-decnum], [disable decnum support]))
+
+AS_IF([test "x$enable_decnum" != "xno"],[
+   AC_DEFINE([USE_DECNUM],1)
 ])

 AM_CONDITIONAL([ENABLE_VALGRIND], [test "x$enable_valgrind" != xno])
@@ -118,6 +124,15 @@ AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" != xno])
 AM_CONDITIONAL([ENABLE_ERROR_INJECTION], [test "x$enable_error_injection" = xyes])
 AM_CONDITIONAL([ENABLE_ALL_STATIC], [test "x$enable_all_static" = xyes])

+dnl Find pthread, if we have it. We do this first because we may set -pthread on CFLAGS
+dnl which can cause various macros to be defined (__REENTRANT on Darwin, for example)
+AX_PTHREAD([
+   AC_DEFINE([HAVE_PTHREAD], [1])
+   LIBS="$PTHREAD_LIBS $LIBS"
+   CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+   CC="$PTHREAD_CC"
+])
+
 AC_FUNC_ALLOCA

 AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
@@ -130,23 +145,16 @@ AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
 AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
 AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0])
 AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0])
-AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
+AC_FIND_FUNC([gettimeofday], [c], [#include <sys/time.h>], [0, 0])
 AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])],
                [], [[#include <time.h>]])
 AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
                [], [[#include <time.h>]])

-AC_ARG_ENABLE([pthread-tls],
-              [AC_HELP_STRING([--enable-pthread-tls],
-                              [Enable use of pthread thread local storage])],
-              [],
-              [enable_pthread_tls=no])
-
-if test $enable_pthread_tls = yes; then
-    AC_FIND_FUNC([pthread_key_create], [pthread], [#include <pthread.h>], [NULL, NULL])
-    AC_FIND_FUNC([pthread_once], [pthread], [#include <pthread.h>], [NULL, NULL])
-    AC_FIND_FUNC([atexit], [pthread], [#include <stdlib.h>], [NULL])
-fi
+dnl Figure out if we have the pthread functions we actually need
+AC_FIND_FUNC_NO_LIBS([pthread_key_create], [], [#include <pthread.h>], [NULL, NULL])
+AC_FIND_FUNC_NO_LIBS([pthread_once], [], [#include <pthread.h>], [NULL, NULL])
+AC_FIND_FUNC_NO_LIBS([atexit], [], [#include <stdlib.h>], [NULL])

 dnl libm math.h functions
 AC_CHECK_MATH_FUNC(acos)
@@ -165,6 +173,7 @@ AC_CHECK_MATH_FUNC(drem)
 AC_CHECK_MATH_FUNC(erf)
 AC_CHECK_MATH_FUNC(erfc)
 AC_CHECK_MATH_FUNC(exp10)
+AC_CHECK_MATH_FUNC(__exp10) dnl macOS has an __exp10
 AC_CHECK_MATH_FUNC(exp2)
 AC_CHECK_MATH_FUNC(exp)
 AC_CHECK_MATH_FUNC(expm1)
@@ -201,6 +210,10 @@ AC_CHECK_MATH_FUNC(round)
 AC_CHECK_MATH_FUNC(scalb)
 AC_CHECK_MATH_FUNC(scalbln)
 AC_CHECK_MATH_FUNC(significand)
+dnl scalbn and ilogb are used on macos to replace significand if we don't have frexp
+AC_CHECK_MATH_FUNC(scalbn)
+AC_CHECK_MATH_FUNC(ilogb)
+
 AC_CHECK_MATH_FUNC(sin)
 AC_CHECK_MATH_FUNC(sinh)
 AC_CHECK_MATH_FUNC(sqrt)
@@ -227,8 +240,8 @@ AC_MSG_RESULT($have___thread)
 AC_C_BIGENDIAN(
   AC_DEFINE([IEEE_MC68k], 1, [machine is bigendian]),
   AC_DEFINE([IEEE_8087], 1, [machine is littleendian]),
-   AC_MSG_ERROR(unknown endianess),
-   AC_MSG_ERROR(universial endianess not supported)
+   AC_MSG_ERROR(unknown endianness),
+   AC_MSG_ERROR(universal endianness not supported)
 )

 dnl Oniguruma
@@ -278,7 +291,7 @@ AC_SUBST(onig_LDFLAGS)
 AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
 AC_SUBST([BUNDLER], ["$bundle_cmd"])

-AC_CONFIG_MACRO_DIR([config/m4])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_MACRO_DIRS([config/m4 m4])
+AC_CONFIG_FILES([Makefile libjq.pc])
 AC_OUTPUT

@@ -1,6 +0,0 @@
-.DS_Store
-.sass-cache
-output/*
-
-# Autogenerated from public/css/base.scss
-public/css/base.css
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "rake"
-gem "bonsai"
-gem "maruku"
-gem "ronn"
-gem "mustache", "<1.0" # to support ruby <2.0
@@ -1,63 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    bonsai (1.4.9)
-      activesupport (>= 3.0.3)
-      builder (>= 3.0.0)
-      i18n (>= 0.5.0)
-      launchy (>= 0.3.7)
-      liquid (>= 2.2.2)
-      maruku (>= 0.6.0)
-      rack
-      sass
-      sinatra (>= 1.0)
-      tilt (>= 1.3)
-      watch (>= 0.1.0)
-      yui-compressor
-    builder (3.2.2)
-    hpricot (0.8.6)
-    i18n (0.7.0)
-    json (1.8.3)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    liquid (3.0.6)
-    maruku (0.7.2)
-    minitest (5.8.0)
-    mustache (0.99.8)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
-    rake (10.4.2)
-    rdiscount (2.1.8)
-    ronn (0.7.3)
-      hpricot (>= 0.8.2)
-      mustache (>= 0.7.0)
-      rdiscount (>= 1.5.8)
-    sass (3.4.16)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    thread_safe (0.3.5)
-    tilt (2.0.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    watch (0.1.0)
-    yui-compressor (0.12.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bonsai
-  maruku
-  mustache (< 1.0)
-  rake
-  ronn
@@ -0,0 +1,12 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+jinja2 = "*"
+pyyaml = "*"
+markdown = "*"
+lxml = "*"
@@ -0,0 +1,226 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "16a9ef323592a417142c30be17e58c3cf36dc2bfdbf4757106a796b22262a1ce"
+        },
+        "pipfile-spec": 6,
+        "requires": {},
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15",
+                "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==4.8.1"
+        },
+        "jinja2": {
+            "hashes": [
+                "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45",
+                "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"
+            ],
+            "index": "pypi",
+            "version": "==3.0.2"
+        },
+        "lxml": {
+            "hashes": [
+                "sha256:079f3ae844f38982d156efce585bc540c16a926d4436712cf4baee0cce487a3d",
+                "sha256:0fbcf5565ac01dff87cbfc0ff323515c823081c5777a9fc7703ff58388c258c3",
+                "sha256:122fba10466c7bd4178b07dba427aa516286b846b2cbd6f6169141917283aae2",
+                "sha256:1b38116b6e628118dea5b2186ee6820ab138dbb1e24a13e478490c7db2f326ae",
+                "sha256:1b7584d421d254ab86d4f0b13ec662a9014397678a7c4265a02a6d7c2b18a75f",
+                "sha256:26e761ab5b07adf5f555ee82fb4bfc35bf93750499c6c7614bd64d12aaa67927",
+                "sha256:289e9ca1a9287f08daaf796d96e06cb2bc2958891d7911ac7cae1c5f9e1e0ee3",
+                "sha256:2a9d50e69aac3ebee695424f7dbd7b8c6d6eb7de2a2eb6b0f6c7db6aa41e02b7",
+                "sha256:3082c518be8e97324390614dacd041bb1358c882d77108ca1957ba47738d9d59",
+                "sha256:33bb934a044cf32157c12bfcfbb6649807da20aa92c062ef51903415c704704f",
+                "sha256:3439c71103ef0e904ea0a1901611863e51f50b5cd5e8654a151740fde5e1cade",
+                "sha256:36108c73739985979bf302006527cf8a20515ce444ba916281d1c43938b8bb96",
+                "sha256:39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468",
+                "sha256:4289728b5e2000a4ad4ab8da6e1db2e093c63c08bdc0414799ee776a3f78da4b",
+                "sha256:4bff24dfeea62f2e56f5bab929b4428ae6caba2d1eea0c2d6eb618e30a71e6d4",
+                "sha256:4c61b3a0db43a1607d6264166b230438f85bfed02e8cff20c22e564d0faff354",
+                "sha256:542d454665a3e277f76954418124d67516c5f88e51a900365ed54a9806122b83",
+                "sha256:5a0a14e264069c03e46f926be0d8919f4105c1623d620e7ec0e612a2e9bf1c04",
+                "sha256:5c8c163396cc0df3fd151b927e74f6e4acd67160d6c33304e805b84293351d16",
+                "sha256:64812391546a18896adaa86c77c59a4998f33c24788cadc35789e55b727a37f4",
+                "sha256:66e575c62792c3f9ca47cb8b6fab9e35bab91360c783d1606f758761810c9791",
+                "sha256:6f12e1427285008fd32a6025e38e977d44d6382cf28e7201ed10d6c1698d2a9a",
+                "sha256:74f7d8d439b18fa4c385f3f5dfd11144bb87c1da034a466c5b5577d23a1d9b51",
+                "sha256:7610b8c31688f0b1be0ef882889817939490a36d0ee880ea562a4e1399c447a1",
+                "sha256:76fa7b1362d19f8fbd3e75fe2fb7c79359b0af8747e6f7141c338f0bee2f871a",
+                "sha256:7728e05c35412ba36d3e9795ae8995e3c86958179c9770e65558ec3fdfd3724f",
+                "sha256:8157dadbb09a34a6bd95a50690595e1fa0af1a99445e2744110e3dca7831c4ee",
+                "sha256:820628b7b3135403540202e60551e741f9b6d3304371712521be939470b454ec",
+                "sha256:884ab9b29feaca361f7f88d811b1eea9bfca36cf3da27768d28ad45c3ee6f969",
+                "sha256:89b8b22a5ff72d89d48d0e62abb14340d9e99fd637d046c27b8b257a01ffbe28",
+                "sha256:92e821e43ad382332eade6812e298dc9701c75fe289f2a2d39c7960b43d1e92a",
+                "sha256:b007cbb845b28db4fb8b6a5cdcbf65bacb16a8bd328b53cbc0698688a68e1caa",
+                "sha256:bc4313cbeb0e7a416a488d72f9680fffffc645f8a838bd2193809881c67dd106",
+                "sha256:bccbfc27563652de7dc9bdc595cb25e90b59c5f8e23e806ed0fd623755b6565d",
+                "sha256:c1a40c06fd5ba37ad39caa0b3144eb3772e813b5fb5b084198a985431c2f1e8d",
+                "sha256:c47ff7e0a36d4efac9fd692cfa33fbd0636674c102e9e8d9b26e1b93a94e7617",
+                "sha256:c4f05c5a7c49d2fb70223d0d5bcfbe474cf928310ac9fa6a7c6dddc831d0b1d4",
+                "sha256:cdaf11d2bd275bf391b5308f86731e5194a21af45fbaaaf1d9e8147b9160ea92",
+                "sha256:ce256aaa50f6cc9a649c51be3cd4ff142d67295bfc4f490c9134d0f9f6d58ef0",
+                "sha256:d2e35d7bf1c1ac8c538f88d26b396e73dd81440d59c1ef8522e1ea77b345ede4",
+                "sha256:d916d31fd85b2f78c76400d625076d9124de3e4bda8b016d25a050cc7d603f24",
+                "sha256:df7c53783a46febb0e70f6b05df2ba104610f2fb0d27023409734a3ecbb78fb2",
+                "sha256:e1cbd3f19a61e27e011e02f9600837b921ac661f0c40560eefb366e4e4fb275e",
+                "sha256:efac139c3f0bf4f0939f9375af4b02c5ad83a622de52d6dfa8e438e8e01d0eb0",
+                "sha256:efd7a09678fd8b53117f6bae4fa3825e0a22b03ef0a932e070c0bdbb3a35e654",
+                "sha256:f2380a6376dfa090227b663f9678150ef27543483055cc327555fb592c5967e2",
+                "sha256:f8380c03e45cf09f8557bdaa41e1fa7c81f3ae22828e1db470ab2a6c96d8bc23",
+                "sha256:f90ba11136bfdd25cae3951af8da2e95121c9b9b93727b1b896e3fa105b2f586"
+            ],
+            "index": "pypi",
+            "version": "==4.6.3"
+        },
+        "markdown": {
+            "hashes": [
+                "sha256:31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49",
+                "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c"
+            ],
+            "index": "pypi",
+            "version": "==3.3.4"
+        },
+        "markupsafe": {
+            "hashes": [
+                "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298",
+                "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64",
+                "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b",
+                "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194",
+                "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567",
+                "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff",
+                "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724",
+                "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74",
+                "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646",
+                "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35",
+                "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6",
+                "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a",
+                "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6",
+                "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad",
+                "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26",
+                "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38",
+                "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac",
+                "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7",
+                "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6",
+                "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047",
+                "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75",
+                "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f",
+                "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b",
+                "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135",
+                "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8",
+                "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a",
+                "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a",
+                "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1",
+                "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9",
+                "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864",
+                "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914",
+                "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee",
+                "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f",
+                "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18",
+                "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8",
+                "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2",
+                "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d",
+                "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b",
+                "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b",
+                "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86",
+                "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6",
+                "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f",
+                "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb",
+                "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833",
+                "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28",
+                "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e",
+                "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415",
+                "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902",
+                "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f",
+                "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d",
+                "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9",
+                "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d",
+                "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145",
+                "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066",
+                "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c",
+                "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1",
+                "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a",
+                "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207",
+                "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f",
+                "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53",
+                "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd",
+                "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134",
+                "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85",
+                "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9",
+                "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5",
+                "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94",
+                "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509",
+                "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51",
+                "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"
+            ],
+            "version": "==2.0.1"
+        },
+        "pyyaml": {
+            "hashes": [
+                "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
+                "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
+                "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
+                "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b",
+                "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4",
+                "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07",
+                "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba",
+                "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9",
+                "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
+                "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
+                "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
+                "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
+                "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
+                "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
+                "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
+                "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
+                "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
+                "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
+                "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
+                "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
+                "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
+                "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
+                "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
+                "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
+                "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
+                "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
+                "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
+                "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
+                "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
+                "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
+                "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
+                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
+                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
+            ],
+            "index": "pypi",
+            "version": "==6.0"
+        },
+        "typing-extensions": {
+            "hashes": [
+                "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e",
+                "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7",
+                "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.10.0.2"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832",
+                "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"
+            ],
+            "version": "==3.6.0"
+        }
+    },
+    "develop": {}
+}
@@ -2,24 +2,19 @@ Documentation
 =============

 The jq website, manpages and some of the tests are generated from this
-directory. The directory holds a [Bonsai](http://tinytree.info)
-website, and the manual is a YAML file in `content/3.manual`.
+directory. The manual is a YAML file in `content/manual`.

 To build the documentation (including building the jq manpage), you'll
-need a working Ruby setup. The easiest way to get one is to install
-RVM and Ruby 1.9.3 like so:
+need python3 and pipenv. You can install pipenv like so:

-    \curl -L https://get.rvm.io | bash -s stable --ruby=1.9.3
+    pip install pipenv

-After that finishes installing, you'll need to make sure RVM is on
-your path by doing `source $HOME/.rvm/scripts/rvm`, or just opening a
-new shell. See <https://rvm.io> for more info on RVM.
+Though, you may need to say pip3 instead, depending on your system. Once
+you have pipenv installed, you can install the dependencies by running
+`pipenv install` from the `docs` directory.

-Once RVM is installed, you can install all the dependencies for jq's
-documentation build by running this from the `docs` directory:
+Once this is done, rerun `./configure` in the jq root directory and then
+the Makefile will be able to generate the jq manpage.

-    bundle install
-
-When bundle manages to install the dependencies, rerun `./configure`
-in the jq root directory and then the Makefile will be able to
-generate the jq manpage.
+To build the website, run `pipenv run ./build_website.py` from inside
+the `docs` directory.
@@ -1,24 +0,0 @@
-current_dir = File.dirname(__FILE__)
-rakefile_manual = File.expand_path(File.join(current_dir, "Rakefile.manual"))
-rakefile_website = File.expand_path(File.join(current_dir, "Rakefile.website"))
-
-desc "Build the manpage from the bonsai source of the manual"
-task :manpage do
-    system %(#{$0} -f #{rakefile_manual} manpage)
-end
-
-desc "Collect jq unit test cases from the bonsai source of the manual"
-task :mantests do
-    system %(#{$0} -f #{rakefile_manual} mantests)
-end
-
-desc "Build the website from the bonsai sources"
-task :build do
-    system %(#{$0} -f #{rakefile_website} build)
-end
-
-desc "Serve a live view of the website on http://localhost:5000/jq/"
-task :serve do
-    system %(#{$0} -f #{rakefile_website} serve)
-end
-
@@ -1,49 +0,0 @@
-require 'ronn'
-require 'tempfile'
-require 'yaml'
-
-def load_manual
-  YAML::load(File.open("content/3.manual/manual.yml"))
-end
-
-task :manpage do
-  Tempfile.open "manpage" do |f|
-    manual = load_manual
-    f.puts manual['manpage_intro']
-    f.puts manual['body']
-    manual['sections'].each do |section|
-
-      f.puts "## #{section['title'].upcase}\n"
-      f.puts section['body']
-      f.puts ""
-      (section['entries'] || []).each do |entry|
-        f.puts "### #{entry['title']}\n"
-        f.puts entry['body']
-        f.puts ""
-        (entry['examples'] || []).each do |example|
-          f.puts "    jq '#{example['program']}'"
-          f.puts "       #{example['input']}"
-          f.puts "    => #{example['output'].join(", ")}"
-          f.puts
-        end
-      end
-      f.puts ""
-    end
-    f.puts manual['manpage_epilogue']
-    f.close
-    puts Ronn::Document.new(f.path).convert('roff').gsub(/<\/?code>/,"")
-  end
-end
-
-task :mantests do
-  load_manual['sections'].each do |section|
-    (section['entries'] || []).each do |entry|
-      (entry['examples'] || []).each do |example|
-        puts example['program'].gsub("\n", " ")
-        puts example['input']
-        example['output'].each do |s| puts s end
-        puts
-      end
-    end
-  end
-end
@@ -1,76 +0,0 @@
-require 'bonsai'
-require 'json'
-require 'liquid'
-require 'maruku'
-
-module ExtraFilters
-  def markdownify(input)
-    Maruku.new(input).to_html
-  end
-  def search_id(input)
-    input.gsub(/`/, '')
-  end
-  def section_id(input)
-    input.gsub(/[^a-zA-Z0-9_]/, '')
-  end
-  def entry_id(input)
-    input.gsub(/[ `]/, '')
-  end
-  def no_paragraph(input)
-    input.gsub('<p>', '').gsub('</p>', '')
-  end
-  def json(input)
-    input.to_json
-  end
-  def unique(input)
-    @n = (@n || 0) + 1
-    input + @n.to_s
-  end
-end
-
-Liquid::Template.register_filter(ExtraFilters)
-
-begin
-  `java 2>&1`
-rescue
-  class Bonsai::Exporter
-    def self.compress_assets
-      Bonsai.log "java not found! Not compressing javascript or stylesheets"
-    end
-  end
-end
-
-task :build do
-  Bonsai.root_dir = Dir.pwd
-  Bonsai::Exporter.publish!
-end
-
-task :serve do
-  begin
-    Bonsai.log "Press Control+C to quit"
-
-    require 'rack'
-    require 'sinatra'
-    require 'watch'
-    require 'launchy'
-
-    Bonsai.root_dir = Dir.pwd
-
-    server = fork {
-      app = Rack::Builder.app {
-        map "/jq" do
-          use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
-        end
-        run Bonsai::DevelopmentServer
-      }
-      Rack::Handler.default.run(app, :Port => 5000) do
-        Launchy.open("http://localhost:5000/jq/")
-      end
-    }
-    Watch.new("{content,templates,public}/**/*") { Bonsai::Exporter.process! }
-  rescue Interrupt
-    Process.kill("QUIT", server)
-    Process.wait(server)
-    exit
-  end
-end
@@ -0,0 +1,248 @@
+#!/usr/bin/env python3
+from datetime import date
+from io import StringIO
+from lxml import etree
+import markdown
+from markdown.extensions import Extension
+import re
+import sys
+import yaml
+
+
+# Prevent our markdown parser from trying to help by interpreting things in angle brackets as HTML tags.
+class EscapeHtml(Extension):
+
+    def extendMarkdown(self, md, md_globals):
+        del md.preprocessors['html_block']
+        del md.inlinePatterns['html']
+
+
+class RoffWalker(object):
+
+    def __init__(self, tree, output=sys.stdout):
+        self.tree = tree
+        self.target = output
+        self.f = StringIO()
+
+    def walk(self):
+        self._walk(self.tree, parent_tag=None)
+        # We don't want to start lines with \. because that can confuse man
+        # For lines that start with \., we need to prefix them with \& so it
+        # knows not to treat that line as a directive
+        data = re.sub(r'^\\\.', r'\&.', self.f.getvalue(), flags=re.MULTILINE)
+        self.target.write(data)
+
+    def _ul_is_special(self, root):
+        if len(root) != 1:
+            return False
+        child = root[0]
+        if child.tag != 'li':
+            return False
+        msg = ''.join(child.itertext()).strip()
+        return msg.endswith(':')
+
+    def _walk_child(self, root):
+        if len(root) > 0:
+            self._walk(root[0], parent_tag=root.tag)
+
+    def _write_element(self, root, ensure_newline=True):
+        if root.text is not None:
+            text = self._sanitize(root.text)
+            self.__write_raw(text)
+        self._walk_child(root)
+        self._write_tail(root, ensure_newline=ensure_newline)
+
+    def _write_tail(self, root, ensure_newline=False, inline=False):
+        if root.tail is not None:
+            if inline or root.tail != '\n':
+                text = self._sanitize(root.tail)
+                if text.endswith('\n'):
+                    ensure_newline = False
+                self.__write_raw(text)
+        if ensure_newline:
+            self.__write_raw('\n')
+
+    def _walk(self, root, parent_tag=None):
+        last_tag = None
+        while root is not None:
+            if root.tag == 'h1':
+                self.__write_cmd('.TH "JQ" "1" "{}" "" ""'.format(
+                    date.today().strftime('%B %Y')))
+                self.__write_cmd('.SH "NAME"')
+                # TODO: properly parse this
+                self.__write_raw(r'\fBjq\fR \- Command\-line JSON processor' +
+                                 "\n")
+
+            elif root.tag == 'h2':
+                self.__write_cmd('.SH "{}"'.format(''.join(
+                    root.itertext()).strip()))
+
+            elif root.tag == 'h3':
+                text = ''.join(root.itertext()).strip()
+                self.__write_cmd('.SS "{}"'.format(self._h3_sanitize(text)))
+
+            elif root.tag == 'p':
+                if last_tag not in ['h2', 'h3'] and parent_tag not in ['li']:
+                    self.__write_cmd('.P')
+                self._write_element(root, ensure_newline=(parent_tag != 'li'))
+
+            elif root.tag == 'ul':
+                if self._ul_is_special(root):
+                    li = root[0]
+                    self.__write_cmd('.TP')
+                    self._write_element(li)
+                    next = root.getnext()
+                    while next is not None and next.tag == 'p':
+                        if next.getnext() is not None and next.getnext(
+                        ).tag == 'pre':
+                            # we don't want to .IP these, because it'll look funny with the code indent
+                            break
+                        self.__write_cmd('.IP')
+                        self._write_element(next)
+                        root = next
+                        next = root.getnext()
+                else:
+                    self._walk_child(root)
+                    self._write_tail(root)
+                    # A pre tag after the end of a list doesn't want two of the indentation commands
+                    if root.getnext() is None or root.getnext().tag != 'pre':
+                        self.__write_cmd('.IP "" 0')
+
+            elif root.tag == 'li':
+                self.__write_cmd(r'.IP "\(bu" 4')
+                if root.text is not None and root.text.strip() != '':
+                    text = self._sanitize(root.text)
+                    self.__write_raw(text)
+                self._walk_child(root)
+                self._write_tail(root, ensure_newline=True)
+
+            elif root.tag == 'strong':
+                if root.text is not None:
+                    text = self._sanitize(root.text)
+                    self.__write_raw('\\fB{}\\fR'.format(text))
+
+                self._write_tail(root, inline=True)
+
+            elif root.tag == 'em':
+                if root.text is not None:
+                    text = self._sanitize(root.text)
+                    self.__write_raw('\\fI{}\\fR'.format(text))
+                self._write_tail(root, inline=True)
+
+            elif root.tag == 'code':
+                if root.text is not None:
+                    text = self._code_sanitize(root.text)
+                    self.__write_raw('\\fB{}\\fR'.format(text))
+                self._write_tail(root, inline=True)
+
+            elif root.tag == 'pre':
+                self.__write_cmd('.IP "" 4')
+                self.__write_cmd('.nf\n')  # extra newline for spacing reasons
+                next = root
+                first = True
+                while next is not None and next.tag == 'pre':
+                    if not first:
+                        self.__write_raw('\n')
+                    text = ''.join(next.itertext(with_tail=False))
+                    self.__write_raw(self._pre_sanitize(text))
+                    first = False
+                    root = next
+                    next = next.getnext()
+                self.__write_cmd('.fi')
+                self.__write_cmd('.IP "" 0')
+
+            else:
+                self._walk_child(root)
+
+            last_tag = root.tag
+            root = root.getnext()
+
+    def _base_sanitize(self, text):
+        text = re.sub(r'\\', r'\\e', text)
+        text = re.sub(r'\.', r'\\.', text)
+        text = re.sub("'", r"\'", text)
+        text = re.sub('-', r'\-', text)
+        return text
+
+    def _pre_sanitize(self, text):
+        return self._base_sanitize(text)
+
+    def _code_sanitize(self, text):
+        text = self._base_sanitize(text)
+        text = re.sub(r'\s', ' ', text)
+        return text
+
+    def _h3_sanitize(self, text):
+        text = self._base_sanitize(text)
+        text = re.sub(' \n|\n ', ' ', text)
+        text = re.sub('\n', ' ', text)
+        return text
+
+    def _sanitize(self, text):
+        text = self._base_sanitize(text)
+        text = re.sub(r'<([^>]+)>', r'\\fI\1\\fR', text)
+        text = re.sub(r' +', ' ', text)
+        text = re.sub('\n', ' ', text)
+        return text
+
+    def __write_cmd(self, dat):
+        print('.', dat, sep='\n', file=self.f)
+        pass
+
+    def __write_raw(self, dat):
+        print(dat, sep='', end='', file=self.f)
+        pass
+
+
+def load_yml_file(fn):
+    with open(fn) as f:
+        return yaml.safe_load(f)
+
+
+def dedent_body(body):
+    lines = [re.sub(r'^  (\S)', r'\1', l) for l in body.split('\n')]
+    return '\n'.join(lines)
+
+
+def convert_manual_to_markdown():
+    f = StringIO()
+    manual = load_yml_file("content/manual/manual.yml")
+    f.write(manual.get('manpage_intro', '\n'))
+    f.write(dedent_body(manual.get('body', '\n')))
+    for section in manual.get('sections', []):
+        f.write('## {}\n'.format(section.get('title', '').upper()))
+        f.write(dedent_body(section.get('body', '\n')))
+        f.write('\n')
+        for entry in section.get('entries', []):
+            f.write('### {}\n'.format(entry.get('title', '')))
+            f.write(dedent_body(entry.get('body', '\n')))
+            f.write('\n')
+            if entry.get('examples') is not None:
+                f.write("~~~~\n")
+                first = True
+                for example in entry.get('examples'):
+                    if not first:
+                        f.write('\n')
+                    f.write("jq '{}'\n".format(example.get('program', '')))
+                    f.write("   {}\n".format(example.get('input', '')))
+                    output = [str(x) for x in example.get('output', [])]
+                    f.write("=> {}\n".format(', '.join(output)))
+                    first = False
+                f.write("~~~~\n")
+        f.write('\n')
+    f.write(manual.get('manpage_epilogue', ''))
+    return f.getvalue()
+
+
+# Convert manual.yml to our special markdown format
+markdown_data = convert_manual_to_markdown()
+
+# Convert markdown to html
+html_data = markdown.markdown(markdown_data,
+                              extensions=[EscapeHtml(), 'fenced_code'])
+
+# Parse the html into a tree so we can walk it
+tr = etree.HTML(html_data, etree.HTMLParser())
+
+# Convert the markdown to ROFF
+RoffWalker(tr).walk()
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+import yaml
+
+with open("content/manual/manual.yml") as f:
+    manual = yaml.safe_load(f)
+    for section in manual.get('sections', []):
+        for entry in section.get('entries', []):
+            for example in entry.get('examples', []):
+                print(example.get('program', '').replace('\n', ' '))
+                print(example.get('input', ''))
+                for s in example.get('output', []):
+                    print(s)
+                print('')
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+import glob
+import itertools
+from jinja2 import Environment, FileSystemLoader, Markup, select_autoescape, contextfunction
+from markdown import markdown
+import os
+import os.path
+import re
+import shutil
+import yaml
+
+env = Environment(
+    loader=FileSystemLoader('templates'),
+    autoescape=select_autoescape(['html.j2']),
+)
+
+
+def load_yml_file(fn):
+    with open(fn) as f:
+        return yaml.safe_load(f)
+
+
+env.filters['search_id'] = lambda input: input.replace(r'`', '')
+env.filters['section_id'] = lambda input: re.sub(r"[^a-zA-Z0-9_]", '', input)
+env.filters['entry_id'] = lambda input: re.sub(r"[ `]", '', input)
+env.filters['markdownify'] = lambda input: Markup(markdown(input))
+env.filters['no_paragraph'] = lambda input: Markup(re.sub(r"</?p>", '', input))
+
+env.globals['unique_id'] = contextfunction(
+    lambda ctx: str(next(ctx['unique_ctr'])))
+
+env.globals.update(load_yml_file('site.yml'))
+
+env.globals['navigation'] = ['tutorial', 'download', 'manual']
+
+
+def generate_file(env, fname='content/1.tutorial/default.yml'):
+    path, base = os.path.split(fname)
+    path = os.path.relpath(path, 'content')
+    if path == '.':
+        path = ''
+        slug = 'index'
+        permalink = ''
+    else:
+        slug = os.path.basename(path)
+        permalink = path + '/'
+
+    output_dir = os.path.join('output', path)
+    output_path = os.path.join(output_dir, 'index.html')
+
+    template_name = re.sub(r".yml$", '.html.j2', base)
+
+    ctx = load_yml_file(fname)
+    ctx.update(unique_ctr=itertools.count(1),
+               permalink=permalink,
+               slug=slug,
+               navitem=path)
+    os.makedirs(output_dir, exist_ok=True)
+    env.get_template(template_name).stream(ctx).dump(output_path,
+                                                     encoding='utf-8')
+
+
+def copy_public_files(root=''):
+    for f in os.scandir(os.path.join('public', root)):
+        src = os.path.join(root, f.name)
+        dst = os.path.join('output', src)
+        if f.is_dir():
+            os.makedirs(dst, exist_ok=True)
+            copy_public_files(src)
+        else:
+            shutil.copyfile(f.path, dst)
+
+
+copy_public_files()
+
+for fn in glob.glob('content/**/*.yml', recursive=True):
+    generate_file(env, fn)
@@ -1,327 +0,0 @@
-headline: Tutorial
-body:
-  - text: |
-
-      GitHub has a JSON API, so let's play with that. This URL gets us the last
-      5 commits from the jq repo.
-
-  - command: "curl 'https://api.github.com/repos/stedolan/jq/commits?per_page=5'"
-    result: |
-      [
-        {
-          "sha": "d25341478381063d1c76e81b3a52e0592a7c997f",
-          "commit": {
-            "author": {
-              "name": "Stephen Dolan",
-              "email": "mu@netsoc.tcd.ie",
-              "date": "2013-06-22T16:30:59Z"
-            },
-            "committer": {
-              "name": "Stephen Dolan",
-              "email": "mu@netsoc.tcd.ie",
-              "date": "2013-06-22T16:30:59Z"
-            },
-            "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-            "tree": {
-              "sha": "6ab697a8dfb5a96e124666bf6d6213822599fb40",
-              "url": "https://api.github.com/repos/stedolan/jq/git/trees/6ab697a8dfb5a96e124666bf6d6213822599fb40"
-            },
-            "url": "https://api.github.com/repos/stedolan/jq/git/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
-            "comment_count": 0
-          },
-          "url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
-          "html_url": "https://github.com/stedolan/jq/commit/d25341478381063d1c76e81b3a52e0592a7c997f",
-          "comments_url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f/comments",
-          "author": {
-            "login": "stedolan",
-      ...
-
-  - text: |
-
-      GitHub returns nicely formatted JSON. For servers that don't, it can be
-      helpful to pipe the response through jq to pretty-print it. The simplest
-      jq program is the expression `.`, which takes the input and produces it
-      unchanged as output.
-
-  - command: "curl 'https://api.github.com/repos/stedolan/jq/commits?per_page=5' | jq '.'"
-    result: |
-      [
-        {
-          "sha": "d25341478381063d1c76e81b3a52e0592a7c997f",
-          "commit": {
-            "author": {
-              "name": "Stephen Dolan",
-              "email": "mu@netsoc.tcd.ie",
-              "date": "2013-06-22T16:30:59Z"
-            },
-            "committer": {
-              "name": "Stephen Dolan",
-              "email": "mu@netsoc.tcd.ie",
-              "date": "2013-06-22T16:30:59Z"
-            },
-            "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-            "tree": {
-              "sha": "6ab697a8dfb5a96e124666bf6d6213822599fb40",
-              "url": "https://api.github.com/repos/stedolan/jq/git/trees/6ab697a8dfb5a96e124666bf6d6213822599fb40"
-            },
-            "url": "https://api.github.com/repos/stedolan/jq/git/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
-            "comment_count": 0
-          },
-          "url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
-          "html_url": "https://github.com/stedolan/jq/commit/d25341478381063d1c76e81b3a52e0592a7c997f",
-          "comments_url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f/comments",
-          "author": {
-            "login": "stedolan",
-      ...
-
-  - text: |
-
-      We can use jq to extract just the first commit.
-
-  - command: "curl 'https://api.github.com/repos/stedolan/jq/commits?per_page=5' | jq '.[0]'"
-    result: |
-      {
-        "sha": "d25341478381063d1c76e81b3a52e0592a7c997f",
-        "commit": {
-          "author": {
-            "name": "Stephen Dolan",
-            "email": "mu@netsoc.tcd.ie",
-            "date": "2013-06-22T16:30:59Z"
-          },
-          "committer": {
-            "name": "Stephen Dolan",
-            "email": "mu@netsoc.tcd.ie",
-            "date": "2013-06-22T16:30:59Z"
-          },
-          "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-          "tree": {
-            "sha": "6ab697a8dfb5a96e124666bf6d6213822599fb40",
-            "url": "https://api.github.com/repos/stedolan/jq/git/trees/6ab697a8dfb5a96e124666bf6d6213822599fb40"
-          },
-          "url": "https://api.github.com/repos/stedolan/jq/git/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
-          "comment_count": 0
-        },
-        "url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
-        "html_url": "https://github.com/stedolan/jq/commit/d25341478381063d1c76e81b3a52e0592a7c997f",
-        "comments_url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f/comments",
-        "author": {
-          "login": "stedolan",
-          "id": 79765,
-          "avatar_url": "https://avatars.githubusercontent.com/u/79765?v=3",
-          "gravatar_id": "",
-          "url": "https://api.github.com/users/stedolan",
-          "html_url": "https://github.com/stedolan",
-          "followers_url": "https://api.github.com/users/stedolan/followers",
-          "following_url": "https://api.github.com/users/stedolan/following{/other_user}",
-          "gists_url": "https://api.github.com/users/stedolan/gists{/gist_id}",
-          "starred_url": "https://api.github.com/users/stedolan/starred{/owner}{/repo}",
-          "subscriptions_url": "https://api.github.com/users/stedolan/subscriptions",
-          "organizations_url": "https://api.github.com/users/stedolan/orgs",
-          "repos_url": "https://api.github.com/users/stedolan/repos",
-          "events_url": "https://api.github.com/users/stedolan/events{/privacy}",
-          "received_events_url": "https://api.github.com/users/stedolan/received_events",
-          "type": "User",
-          "site_admin": false
-        },
-        "committer": {
-          "login": "stedolan",
-          "id": 79765,
-          "avatar_url": "https://avatars.githubusercontent.com/u/79765?v=3",
-          "gravatar_id": "",
-          "url": "https://api.github.com/users/stedolan",
-          "html_url": "https://github.com/stedolan",
-          "followers_url": "https://api.github.com/users/stedolan/followers",
-          "following_url": "https://api.github.com/users/stedolan/following{/other_user}",
-          "gists_url": "https://api.github.com/users/stedolan/gists{/gist_id}",
-          "starred_url": "https://api.github.com/users/stedolan/starred{/owner}{/repo}",
-          "subscriptions_url": "https://api.github.com/users/stedolan/subscriptions",
-          "organizations_url": "https://api.github.com/users/stedolan/orgs",
-          "repos_url": "https://api.github.com/users/stedolan/repos",
-          "events_url": "https://api.github.com/users/stedolan/events{/privacy}",
-          "received_events_url": "https://api.github.com/users/stedolan/received_events",
-          "type": "User",
-          "site_admin": false
-        },
-        "parents": [
-          {
-            "sha": "54b9c9bdb225af5d886466d72f47eafc51acb4f7",
-            "url": "https://api.github.com/repos/stedolan/jq/commits/54b9c9bdb225af5d886466d72f47eafc51acb4f7",
-            "html_url": "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7"
-          },
-          {
-            "sha": "8b1b503609c161fea4b003a7179b3fbb2dd4345a",
-            "url": "https://api.github.com/repos/stedolan/jq/commits/8b1b503609c161fea4b003a7179b3fbb2dd4345a",
-            "html_url": "https://github.com/stedolan/jq/commit/8b1b503609c161fea4b003a7179b3fbb2dd4345a"
-          }
-        ]
-      }
-
-  - text: |
-
-      For the rest of the examples, I'll leave out the `curl` command - it's not
-      going to change.
-
-      There's a lot of info we don't care about there, so we'll restrict it down
-      to the most interesting fields.
-
-  - command: "jq '.[0] | {message: .commit.message, name: .commit.committer.name}'"
-    result: |
-      {
-        "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-        "name": "Stephen Dolan"
-      }
-
-  - text: |
-
-      The `|` operator in jq feeds the output of one filter (`.[0]` which gets
-      the first element of the array in the response) into the input of another
-      (`{...}` which builds an object out of those fields). You can access
-      nested attributes, such as `.commit.message`.
-
-      Now let's get the rest of the commits.
-
-  - command:  "jq '.[] | {message: .commit.message, name: .commit.committer.name}'"
-    result: |
-      {
-        "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-        "name": "Stephen Dolan"
-      }
-      {
-        "message": "Reject all overlong UTF8 sequences.",
-        "name": "Stephen Dolan"
-      }
-      {
-        "message": "Fix various UTF8 parsing bugs.\n\nIn particular, parse bad UTF8 by replacing the broken bits with U+FFFD\nand resychronise correctly after broken sequences.",
-        "name": "Stephen Dolan"
-      }
-      {
-        "message": "Fix example in manual for `floor`. See #155.",
-        "name": "Stephen Dolan"
-      }
-      {
-        "message": "Document floor",
-        "name": "Nicolas Williams"
-      }
-
-  - text: |
-
-      `.[]` returns each element of the array returned in the response, one at a
-      time, which are all fed into
-      `{message: .commit.message, name: .commit.committer.name}`.
-
-      Data in jq is represented as streams of JSON values - every jq
-      expression runs for each value in its input stream, and can
-      produce any number of values to its output stream.
-
-      Streams are serialised by just separating JSON values with
-      whitespace. This is a `cat`-friendly format - you can just join
-      two JSON streams together and get a valid JSON stream.
-
-      If you want to get the output as a single array, you can tell jq to
-      "collect" all of the answers by wrapping the filter in square
-      brackets:
-
-  - command: "jq '[.[] | {message: .commit.message, name: .commit.committer.name}]'"
-    result: |
-      [
-        {
-          "message": "Merge pull request #163 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-          "name": "Stephen Dolan"
-        },
-        {
-          "message": "Reject all overlong UTF8 sequences.",
-          "name": "Stephen Dolan"
-        },
-        {
-          "message": "Fix various UTF8 parsing bugs.\n\nIn particular, parse bad UTF8 by replacing the broken bits with U+FFFD\nand resychronise correctly after broken sequences.",
-          "name": "Stephen Dolan"
-        },
-        {
-          "message": "Fix example in manual for `floor`. See #155.",
-          "name": "Stephen Dolan"
-        },
-        {
-          "message": "Document floor",
-          "name": "Nicolas Williams"
-        }
-      ]
-
-  - text: |
-
-      - - -
-
-      Next, let's try getting the URLs of the parent commits out of the
-      API results as well. In each commit, the GitHub API includes information
-      about "parent" commits. There can be one or many.
-
-          "parents": [
-            {
-              "sha": "54b9c9bdb225af5d886466d72f47eafc51acb4f7",
-              "url": "https://api.github.com/repos/stedolan/jq/commits/54b9c9bdb225af5d886466d72f47eafc51acb4f7",
-              "html_url": "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7"
-            },
-            {
-              "sha": "8b1b503609c161fea4b003a7179b3fbb2dd4345a",
-              "url": "https://api.github.com/repos/stedolan/jq/commits/8b1b503609c161fea4b003a7179b3fbb2dd4345a",
-              "html_url": "https://github.com/stedolan/jq/commit/8b1b503609c161fea4b003a7179b3fbb2dd4345a"
-            }
-          ]
-
-      We want to pull out all of the "html_url" fields inside that array of parent
-      commits and make a simple list of strings to go along with the
-      "message" and "author" fields we already have.
-
-  - command: "jq '[.[] | {message: .commit.message, name: .commit.committer.name, parents: [.parents[].html_url]}]'"
-    result: |
-      [
-        {
-          "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
-          "name": "Stephen Dolan",
-          "parents": [
-            "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7",
-            "https://github.com/stedolan/jq/commit/8b1b503609c161fea4b003a7179b3fbb2dd4345a"
-          ]
-        },
-        {
-          "message": "Reject all overlong UTF8 sequences.",
-          "name": "Stephen Dolan",
-          "parents": [
-            "https://github.com/stedolan/jq/commit/ff48bd6ec538b01d1057be8e93b94eef6914e9ef"
-          ]
-        },
-        {
-          "message": "Fix various UTF8 parsing bugs.\n\nIn particular, parse bad UTF8 by replacing the broken bits with U+FFFD\nand resychronise correctly after broken sequences.",
-          "name": "Stephen Dolan",
-          "parents": [
-            "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7"
-          ]
-        },
-        {
-          "message": "Fix example in manual for `floor`. See #155.",
-          "name": "Stephen Dolan",
-          "parents": [
-            "https://github.com/stedolan/jq/commit/3dcdc582ea993afea3f5503a78a77675967ecdfa"
-          ]
-        },
-        {
-          "message": "Document floor",
-          "name": "Nicolas Williams",
-          "parents": [
-            "https://github.com/stedolan/jq/commit/7c4171d414f647ab08bcd20c76a4d8ed68d9c602"
-          ]
-        }
-      ]
-
-  - text: |
-
-      Here we're making an object as before, but this time the `parents`
-      field is being set to `[.parents[].html_url]`, which collects
-      all of the parent commit URLs defined in the parents object.
-
-  - text: |
-
-      - - -
-
-      Here endeth the tutorial! There's lots more to play with. Go
-      read [the manual](../manual/) if you're interested, and [download
-      jq](../download/) if you haven't already.
@@ -1,193 +0,0 @@
-headline: Download jq
-body:
-
-  - text: |
-
-      jq is written in C and has no runtime dependencies, so it should be
-      possible to build it for nearly any platform. Prebuilt binaries are
-      available for Linux, OS X and Windows.
-
-      The binaries should just run, but on OS X and Linux you may need
-      to make them executable first using `chmod +x jq`.
-
-      jq is licensed under the MIT license. For all of the gory
-      details, read the file `COPYING` in the source distribution.
-
-
-      ### Linux
-
-       * jq 1.5 is in the official [Debian](https://packages.debian.org/jq) and
-         [Ubuntu](http://packages.ubuntu.com/jq) repositories. Install using
-         `sudo apt-get install jq`.
-
-       * jq 1.5 is in the official
-         [Fedora](http://pkgs.fedoraproject.org/cgit/jq.git/) repository.
-         Install using `sudo dnf install jq`.
-
-       * jq 1.4 is in the official [openSUSE](https://software.opensuse.org/package/jq)
-         repository. Install using `sudo zypper install jq`.
-
-       * jq 1.5 is in the official
-         [Arch](https://www.archlinux.org/packages/?sort=&q=jq&maintainer=&flagged=)
-         repository.  Install using `sudo pacman -Sy jq`.
-
-       * jq 1.6 binaries for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux32).
-
-       * jq 1.5 binaries for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux32).
-
-       * jq 1.4 binaries for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-linux-x86_64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-linux-x86).
-
-       * jq 1.3 binaries for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-linux-x86_64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-linux-x86).
-
-      ### OS X
-
-       * Use [Homebrew](http://brew.sh/) to install jq 1.5 with
-         `brew install jq`.
-
-       * jq 1.6 binary for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64).
-
-       * jq 1.5 binary for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-osx-amd64).
-
-       * jq 1.4 binaries for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-osx-x86_64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-osx-x86).
-
-       * jq 1.3 binaries for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-osx-x86_64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-osx-x86).
-
-      ### FreeBSD
-
-       * `pkg install jq` as root installs a pre-built
-         [binary package](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html).
-
-       * `make -C /usr/ports/textproc/jq install clean` as root installs the
-         [jq](https://www.freshports.org/textproc/jq/)
-         [port](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html)
-         from source.
-
-      ### Solaris
-
-       * `pkgutil -i jq` in [OpenCSW](https://www.opencsw.org/p/jq) for Solaris
-         10+, Sparc and x86.
-
-       * jq 1.4 binaries for Solaris 11
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-solaris11-64)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-solaris11-32).
-
-      ### Windows
-
-       * Use [Chocolatey NuGet](https://chocolatey.org/) to install jq 1.5 with
-         `chocolatey install jq`.
-
-       * jq 1.6 executables for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win32.exe).
-
-       * jq 1.5 executables for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win64.exe)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win32.exe).
-
-       * jq 1.4 executables for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-win64.exe)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-win32.exe).
-
-       * jq 1.3 executables for
-         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-win64.exe)
-         or
-         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-win32.exe).
-
-      ### Checksums and signatures
-
-      SHA-256 checksums are provided for all release and pre-release binaries.
-      They can be found under
-      [sig/v1.x/sha256sum.txt](https://github.com/stedolan/jq/tree/master/sig).
-      The checksums for jq 1.6 are in
-      [sig/v1.6/sha256sum.txt](https://raw.githubusercontent.com/stedolan/jq/master/sig/v1.6/sha256sum.txt).
-      The checksums for jq 1.5 are in
-      [sig/v1.5/sha256sum.txt](https://raw.githubusercontent.com/stedolan/jq/master/sig/v1.5/sha256sum.txt).
-
-      Additionally, all binaries are signed by the
-      [jq Package Signing Key](https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key).
-      The signatures can be found under
-      [sig/v1.x/\*.asc](https://github.com/stedolan/jq/tree/master/sig).
-      The signatures for jq 1.6 are in
-      [sig/v1.5/\*.asc](https://github.com/stedolan/jq/tree/master/sig/v1.6).
-      The signatures for jq 1.5 are in
-      [sig/v1.5/\*.asc](https://github.com/stedolan/jq/tree/master/sig/v1.5).
-      You can use [GnuPG](https://gnupg.org/) to verify a signature by downloading
-      the signature and running `gpg --verify signature.asc`.
-
-      ### From source on Linux, OS X, Cygwin, and other POSIX-like operating systems
-
-       * [Source tarball for jq 1.6](https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz)
-       * [Source tarball for jq 1.5](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz)
-
-      You can build it using the usual `./configure && make && sudo
-      make install` rigmarole.
-
-      If you're interested in using the lastest development version, try:
-
-          git clone https://github.com/stedolan/jq.git
-          cd jq
-          autoreconf -i
-          ./configure --disable-maintainer-mode
-          make
-          sudo make install
-
-      To build it from a git clone, you'll need to install a few
-      packages first:
-
-       * [GCC](https://gcc.gnu.org)
-       * [Make](https://www.gnu.org/software/make/)
-       * [Autotools](https://www.gnu.org/software/automake/)
-
-      For Linux systems, these will all be in your system's package
-      manager, and if you do development on the machine they're most
-      likely already installed.
-
-      On OS X, these are all included in Apple's command line tools, which can
-      be installed from [Xcode](https://developer.apple.com/xcode/). However,
-      you may find that you need a newer version of Bison than the one provided
-      by Apple. This can be found in [Homebrew](http://brew.sh) or
-      [MacPorts](https://macports.org/).
-
-      The `--disable-maintainer-mode` flag says to use the pre-generated lexer
-      and parser that come with the code. To compile the lexer and parser also
-      from source, leave out this flag. You will need to install
-      [Flex](http://flex.sourceforge.net/) and
-      [Bison](https://www.gnu.org/software/bison/).
-
-      #### Building the documentation
-
-      jq's documentation is compiled into static HTML using
-      [Bonsai](http://www.tinytree.info).  To view the documentation
-      locally, run `rake serve` (or `bundle exec rake serve`) from the
-      docs/ subdirectory.  To build the docs just `rake build` from the
-      docs subdirectory.  You'll need a few Ruby dependencies, which can
-      be installed by following the instructions in `docs/README.md`.
-
-      The man page is built by `make jq.1`, or just `make`, also from
-      the YAML docs, and you'll still need the Ruby dependencies to
-      build the manpage.
-
@@ -0,0 +1,199 @@
+headline: Download jq
+body:
+  - text: |
+
+      jq is written in C and has no runtime dependencies, so it should be
+      possible to build it for nearly any platform. Prebuilt binaries are
+      available for Linux, macOS and Windows.
+
+      The binaries should just run, but on macOS and Linux you may need
+      to make them executable first using `chmod +x jq`.
+
+      jq is licensed under the MIT license. For all of the gory
+      details, read the file `COPYING` in the source distribution.
+
+      jq uses a C library for decimal number support. This is an ICU 1.8.1
+      licensed code obtained from the ICU downloads archive
+      http://download.icu-project.org/files/decNumber/decNumber-icu-368.zip.
+
+
+      ### Linux
+
+       * jq is in the official [Debian](https://packages.debian.org/jq) and
+         [Ubuntu](http://packages.ubuntu.com/jq) repositories. Install using
+         `sudo apt-get install jq`.
+
+       * jq is in the official [Fedora](https://src.fedoraproject.org/rpms/jq) repository.
+         Install using `sudo dnf install jq`.
+
+       * jq is in the official [openSUSE](https://software.opensuse.org/package/jq) repository.
+         Install using `sudo zypper install jq`.
+
+       * jq is in the official [Arch](https://archlinux.org/packages/?q=jq) repository.
+         Install using `sudo pacman -S jq`.
+
+       * jq 1.6 binaries for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32).
+
+       * jq 1.5 binaries for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.5/jq-linux64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.5/jq-linux32).
+
+       * jq 1.4 binaries for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-linux-x86_64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-linux-x86).
+
+       * jq 1.3 binaries for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.3/jq-linux-x86_64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.3/jq-linux-x86).
+
+      ### macOS
+
+       * Use [Homebrew](http://brew.sh/) to install jq with `brew install jq`.
+
+       * Use [MacPorts](https://www.macports.org) to install jq with `port install jq`.
+
+       * Use [Fink](https://finkproject.org) to install jq with `fink install jq`.
+
+       * jq 1.6 binary for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.6/jq-osx-amd64).
+
+       * jq 1.5 binary for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.5/jq-osx-amd64).
+
+       * jq 1.4 binaries for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-osx-x86_64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-osx-x86).
+
+       * jq 1.3 binaries for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.3/jq-osx-x86_64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.3/jq-osx-x86).
+
+      ### FreeBSD
+
+       * `pkg install jq` as root installs a pre-built
+         [binary package](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html).
+
+       * `make -C /usr/ports/textproc/jq install clean` as root installs the
+         [jq](https://www.freshports.org/textproc/jq/)
+         [port](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html)
+         from source.
+
+      ### Solaris
+
+       * `pkgutil -i jq` in [OpenCSW](https://www.opencsw.org/p/jq) for Solaris
+         10+, Sparc and x86.
+
+       * jq 1.4 binaries for Solaris 11
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-solaris11-64)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-solaris11-32).
+
+      ### Windows
+       * Use [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/)
+         to install jq with `winget install jqlang.jq`.
+
+       * Use [scoop](https://scoop.sh/) to install jq with `scoop install jq`.
+
+       * Use [Chocolatey NuGet](https://chocolatey.org/) to install jq with
+         `chocolatey install jq`.
+
+       * jq 1.6 executables for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.6/jq-win64.exe)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.6/jq-win32.exe).
+
+       * jq 1.5 executables for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.5/jq-win64.exe)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.5/jq-win32.exe).
+
+       * jq 1.4 executables for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-win64.exe)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.4/jq-win32.exe).
+
+       * jq 1.3 executables for
+         [64-bit](https://github.com/jqlang/jq/releases/download/jq-1.3/jq-win64.exe)
+         or
+         [32-bit](https://github.com/jqlang/jq/releases/download/jq-1.3/jq-win32.exe).
+
+      ### Checksums and signatures
+
+      SHA-256 checksums are provided for all release and pre-release binaries.
+      They can be found under
+      [sig/v1.x/sha256sum.txt](https://github.com/jqlang/jq/tree/master/sig).
+      The checksums for jq 1.6 are in
+      [sig/v1.6/sha256sum.txt](https://raw.githubusercontent.com/jqlang/jq/master/sig/v1.6/sha256sum.txt).
+      The checksums for jq 1.5 are in
+      [sig/v1.5/sha256sum.txt](https://raw.githubusercontent.com/jqlang/jq/master/sig/v1.5/sha256sum.txt).
+
+      Additionally, all binaries are signed by the
+      [jq Package Signing Key](https://raw.githubusercontent.com/jqlang/jq/master/sig/jq-release.key).
+      The signatures can be found under
+      [sig/v1.x/\*.asc](https://github.com/jqlang/jq/tree/master/sig).
+      The signatures for jq 1.6 are in
+      [sig/v1.5/\*.asc](https://github.com/jqlang/jq/tree/master/sig/v1.6).
+      The signatures for jq 1.5 are in
+      [sig/v1.5/\*.asc](https://github.com/jqlang/jq/tree/master/sig/v1.5).
+      You can use [GnuPG](https://gnupg.org/) to verify a signature by downloading
+      the signature and running `gpg --verify signature.asc`.
+
+      ### From source on Linux, macOS, Cygwin, and other POSIX-like operating systems
+
+       * [Source tarball for jq 1.6](https://github.com/jqlang/jq/releases/download/jq-1.6/jq-1.6.tar.gz)
+       * [Source tarball for jq 1.5](https://github.com/jqlang/jq/releases/download/jq-1.5/jq-1.5.tar.gz)
+
+      You can build it using the usual `./configure && make && sudo
+      make install` rigmarole.
+
+      If you're interested in using the lastest development version, try:
+
+          git clone --recursive https://github.com/jqlang/jq.git
+          cd jq
+          autoreconf -i
+          ./configure --disable-maintainer-mode
+          make
+          sudo make install
+
+      To build it from a git clone, you'll need to install a few
+      packages first:
+
+       * [GCC](https://gcc.gnu.org)
+       * [Make](https://www.gnu.org/software/make/)
+       * [Autotools](https://www.gnu.org/software/automake/)
+
+      For Linux systems, these will all be in your system's package
+      manager, and if you do development on the machine they're most
+      likely already installed.
+
+      On macOS, these are all included in Apple's command line tools, which can
+      be installed from [Xcode](https://developer.apple.com/xcode/). However,
+      you may find that you need a newer version of Bison than the one provided
+      by Apple. This can be found in [Homebrew](http://brew.sh) or
+      [MacPorts](https://macports.org/).
+
+      The `--disable-maintainer-mode` flag says to use the pre-generated lexer
+      and parser that come with the code. To compile the lexer and parser also
+      from source, leave out this flag. You will need to install
+      [Flex](https://github.com/westes/flex) and
+      [Bison](https://www.gnu.org/software/bison/).
+
+      #### Building the documentation
+
+      jq's documentation is compiled into static HTML using Python.
+      To build the docs, run `pipenv run python3 build_website.py` from
+      the docs/ subdirectory. To serve them locally, you can run
+      `python3 -m SimpleHTTPServer`. You'll need a few Python dependencies,
+      which can be installed by following the instructions in `docs/README.md`.
+
+      The man page is built by `make jq.1`, or just `make`, also from
+      the YAML docs, and you'll still need the Python dependencies to
+      build the manpage.
@@ -29,14 +29,13 @@ tail: |

  Ask questions on [stackoverflow](https://stackoverflow.com/) using the [jq
  tag](https://stackoverflow.com/questions/tagged/jq), or on the
-  [#jq](http://irc.lc/freenode/%23jq/) channel on
-  [Freenode](https://webchat.freenode.net/).
+  [#jq](https://web.libera.chat/#jq) channel on [Libera.Chat](https://libera.chat/).

 news:
  - date: 1 November 2018
    body: |
        jq 1.6 released. See installation options on the [download](/jq/download/)
-        page, and the [release notes](https://github.com/stedolan/jq/releases/tag/jq-1.6)
+        page, and the [release notes](https://github.com/jqlang/jq/releases/tag/jq-1.6)
        for details.

  - date: 15 August 2015
@@ -46,20 +45,20 @@ news:
        try/catch syntax, array and object destructuring, a streaming parser,
        and a module system. See installation options on the
        [download](/jq/download/) page, and the
-        [release notes](https://github.com/stedolan/jq/releases/tag/jq-1.5)
+        [release notes](https://github.com/jqlang/jq/releases/tag/jq-1.5)
        for details.

  - date: 26 July 2015
    body: |

      jq 1.5rc2 is available. Get it on the
-      [releases](https://github.com/stedolan/jq/releases) page.
+      [releases](https://github.com/jqlang/jq/releases) page.

  - date: 01 January 2015
    body: |

      jq 1.5rc1 is available. Get it on the
-      [releases](https://github.com/stedolan/jq/releases) page.
+      [releases](https://github.com/jqlang/jq/releases) page.

  - date: 09 June 2014
    body: |
@@ -63,7 +63,7 @@ manpage_epilogue: |

  Presumably. Report them or discuss them at:

-      https://github.com/stedolan/jq/issues
+      https://github.com/jqlang/jq/issues

  ## AUTHOR

@@ -171,7 +171,7 @@ sections:
        body: |

          You can also look up fields of an object using syntax like
-          `.["foo"]` (.foo above is a shorthand version of this). This
+          `.["foo"]` (`.foo` above is a shorthand version of this). This
          one works for arrays as well, if the key is an
          integer. Arrays are zero-based (like javascript), so `.[2]`
          returns the third element of the array.
@@ -285,7 +285,7 @@ sections:
      instead.

    entries:
-      - title: Array construction - `[]`
+      - title: "Array construction: `[]`"
        body: |

          As in JSON, `[]` is used to construct arrays, as in
@@ -310,7 +310,7 @@ sections:
          - program: "[.user, .projects[]]"
            input: '{"user":"stedolan", "projects": ["jq", "wikiflow"]}'
            output: ['["stedolan", "jq", "wikiflow"]']
-      - title: Objects - `{}`
+      - title: "Objects: `{}`"
        body: |

          Like JSON, `{}` is for constructing objects (aka
@@ -371,14 +371,14 @@ sections:
  - title: Builtin operators and functions
    body: |

-      Some jq operator (for instance, `+`) do different things
+      Some jq operators (for instance, `+`) do different things
      depending on the type of their arguments (arrays, numbers,
      etc.). However, jq never does implicit type conversions. If you
      try to add a string to an object you'll get an error message and
      no result.

    entries:
-      - title: Addition - `+`
+      - title: "Addition: `+`"
        body: |

          The operator `+` takes two filters, applies them both
@@ -416,11 +416,11 @@ sections:
            input: 'null'
            output: ['{"a": 42, "b": 2, "c": 3}']

-      - title: Subtraction - `-`
+      - title: "Subtraction: `-`"
        body: |

          As well as normal arithmetic subtraction on numbers, the `-`
-          operator can be used on arrays to remove all occurences of
+          operator can be used on arrays to remove all occurrences of
          the second array's elements from the first array.

        examples:
@@ -431,7 +431,7 @@ sections:
            input: '["xml", "yaml", "json"]'
            output: ['["json"]']

-      - title: Multiplication, division - `*` and `/`
+      - title: "Multiplication, division: `*` and `/`"
        body: |

          These operators only work on numbers, and do the expected.
@@ -441,7 +441,7 @@ sections:
            input: 5
            output: [6]

-      - title: `length`
+      - title: '`length`'
        body: |

          The builtin function `length` gets the length of various
@@ -462,7 +462,7 @@ sections:
            input: '[[1,2], "string", {"a":2}, null]'
            output: [2, 6, 1, 0]

-      - title: `keys`
+      - title: '`keys`'
        body: |

          The builtin function `keys`, when given an object, returns
@@ -485,7 +485,7 @@ sections:
            input: '[42,3,35]'
            output: ['[0,1,2]']

-      - title: `has`
+      - title: '`has`'
        body: |

          The builtin function `has` returns whether the input object
@@ -504,7 +504,7 @@ sections:
            input: '[[0,1], ["a","b","c"]]'
            output: ['[false, true]']

-      - title: `to_entries`, `from_entries`, `with_entries`
+      - title: "`to_entries`, `from_entries`, `with_entries(f)`"
        body: |

          These functions convert between an object and an array of
@@ -513,9 +513,9 @@ sections:
          includes `{"key": k, "value": v}`.

          `from_entries` does the opposite conversion, and
-          `with_entries(foo)` is a shorthand for `to_entries |
-          map(foo) | from_entries`, useful for doing some operation to
-          all keys and values of an object.
+          `with_entries(f)` is a shorthand for `to_entries | map(f) |
+          from_entries`, useful for doing some operation to all keys
+          and values of an object.

        examples:
          - program: 'to_entries'
@@ -529,14 +529,14 @@ sections:
            output: ['{"KEY_a": 1, "KEY_b": 2}']


-      - title: `select`
+      - title: '`select`'
        body: |

          The function `select(foo)` produces its input unchanged if
          `foo` returns true for that input, and produces no output
          otherwise.

-          It's useful for filtering lists: `[1,2,3] | map(select(. >= 2))`
+          It's useful for filtering lists: '`[1,2,3] | map(select(. >= 2))`'
          will give you `[3]`.

        examples:
@@ -544,7 +544,7 @@ sections:
            input: '[1,5,3,0,7]'
            output: ['[5,3,7]']

-      - title: `empty`
+      - title: '`empty`'
        body: |

          `empty` returns no results. None at all. Not even `null`.
@@ -559,14 +559,14 @@ sections:
            input: 'null'
            output: ['[1,2,3]']

-      - title: `map(x)`
+      - title: '`map(f)`'
        body: |

-          For any filter `x`, `map(x)` will run that filter for each
+          For any filter `f`, `map(f)` will run that filter for each
          element of the input array, and produce the outputs a new
          array. `map(.+1)` will increment each element of an array of numbers.

-          `map(x)` is equivalent to `[.[] | x]`. In fact, this is how
+          `map(f)` is equivalent to `[.[] | f]`. In fact, this is how
          it's defined.

        examples:
@@ -574,7 +574,7 @@ sections:
            input: '[1,2,3]'
            output: ['[2,3,4]']

-      - title: `add`
+      - title: '`add`'
        body: |

          The filter `add` takes as input an array, and produces as
@@ -596,7 +596,7 @@ sections:
            input: '[]'
            output: ["null"]

-      - title: `range`
+      - title: '`range`'
        body: |

          The `range` function produces a range of numbers. `range(4;10)`
@@ -612,7 +612,7 @@ sections:
            input: 'null'
            output: ['[2,3]']

-      - title: `tonumber`
+      - title: '`tonumber`'
        body: |

          The `tonumber` function parses its input as a number. It
@@ -624,7 +624,7 @@ sections:
            input: '[1, "1"]'
            output: [1, 1]

-      - title: `tostring`
+      - title: '`tostring`'
        body: |

          The `tostring` function prints its input as a
@@ -636,7 +636,7 @@ sections:
            input: '[1, "1", [1]]'
            output: ['"1"', '"1"', '"[1]"']

-      - title: `type`
+      - title: '`type`'
        body: |

          The `type` function returns the type of its argument as a
@@ -648,7 +648,7 @@ sections:
            input: '[0, false, [], {}, null, "hello"]'
            output: ['["number", "boolean", "array", "object", "null", "string"]']

-      - title: `sort, sort_by`
+      - title: '`sort`, `sort_by`'
        body: |

          The `sort` functions sorts its input, which must be an
@@ -680,7 +680,7 @@ sections:
            input: '[{"foo":4, "bar":10}, {"foo":3, "bar":100}, {"foo":2, "bar":1}]'
            output: ['[{"foo":2, "bar":1}, {"foo":3, "bar":100}, {"foo":4, "bar":10}]']

-      - title: `group_by`
+      - title: '`group_by`'
        body: |

          `group_by(.foo)` takes as input an array, groups the
@@ -697,7 +697,7 @@ sections:
            input: '[{"foo":1, "bar":10}, {"foo":3, "bar":100}, {"foo":1, "bar":1}]'
            output: ['[[{"foo":1, "bar":10}, {"foo":1, "bar":1}], [{"foo":3, "bar":100}]]']

-      - title: `min`, `max`, `min_by`, `max_by`
+      - title: '`min`, `max`, `min_by`, `max_by`'
        body: |

          Find the minimum or maximum element of the input array. The
@@ -713,7 +713,7 @@ sections:
            input: '[{"foo":1, "bar":14}, {"foo":2, "bar":3}]'
            output: ['{"foo":2, "bar":3}']

-      - title: `unique`
+      - title: '`unique`'
        body: |

          The `unique` function takes as input an array and produces
@@ -725,7 +725,7 @@ sections:
            input: '[1,2,5,3,5,3,1,3]'
            output: ['[1,2,3,5]']

-      - title: `reverse`
+      - title: '`reverse`'
        body: |

          This function reverses an array.
@@ -735,7 +735,7 @@ sections:
            input: '[1,2,3,4]'
            output: ['[4,3,2,1]']

-      - title: `contains`
+      - title: '`contains`'
        body: |

          The filter `contains(b)` will produce true if b is
@@ -764,7 +764,7 @@ sections:
            input: '{"foo": 12, "bar":[1,2,{"barp":12, "blip":13}]}'
            output: ['false']

-      - title: `recurse`
+      - title: '`recurse`'
        body: |

          The `recurse` function allows you to search through a
@@ -796,7 +796,7 @@ sections:
              - '{"foo":[]}'


-      - title: "String interpolation - `\(foo)`"
+      - title: "String interpolation: `\\(exp)`"
        body: |

          Inside a string, you can put an expression inside parens
@@ -872,24 +872,20 @@ sections:
            input: '"This works if x < y"'
            output: ['"This works if x &lt; y"']

-#          - program: '@html "<span>Anonymous said: \(.)</span>"'
-#            input: '"<script>alert(\"lol hax\");</script>"'
-#            output: ["<span>Anonymous said: &lt;script&gt;alert(&quot;lol hax&quot;);&lt;/script&gt;</span>"]
-
          - program: '@sh "echo \(.)"'
            input: "\"O'Hara's Ale\""
            output: ["\"echo 'O'\\\\''Hara'\\\\''s Ale'\""]

  - title: Conditionals and Comparisons
    entries:
-      - title: `==`, `!=`
+      - title: '`==`, `!=`'
        body: |

          The expression 'a == b' will produce 'true' if the result of a and b
          are equal (that is, if they represent equivalent JSON documents) and
          'false' otherwise. In particular, strings are never considered equal
-          to numbers. If you're coming from Javascript, jq's == is like
-          Javascript's === - considering values equal only when they have the
+          to numbers. If you're coming from JavaScript, jq's == is like
+          JavaScript's === - considering values equal only when they have the
          same type as well as the same value.

          != is "not equal", and 'a != b' returns the opposite value of 'a == b'
@@ -898,7 +894,8 @@ sections:
          - program: '.[] == 1'
            input: '[1, 1.0, "1", "banana"]'
            output: ['true', 'true', 'false', 'false']
-      - title: if-then-else
+
+      - title: if-then-else-end
        body: |

          `if A then B else C end` will act the same as `B` if `A`
@@ -906,7 +903,7 @@ sections:
          as `C` otherwise.

          Checking for false or null is a simpler notion of
-          "truthiness" than is found in Javascript or Python, but it
+          "truthiness" than is found in JavaScript or Python, but it
          means that you'll sometimes have to be more explicit about
          the condition you want: you can't test whether, e.g. a
          string is empty using `if .name then A else B end`, you'll
@@ -931,7 +928,7 @@ sections:
            input: 2
            output: ['"many"']

-      - title: `>, >=, <=, <`
+      - title: "`>`, `>=`, `<=`, `<`"
        body: |

          The comparison operators `>`, `>=`, `<=`, `<` return whether
@@ -946,12 +943,13 @@ sections:
            input: 2
            output: ['true']

-      - title: and/or/not
+      - title: "`and`, `or`, `not`"
        body: |

-          jq supports the normal Boolean operators and/or/not. They have the
-          same standard of truth as if expressions - false and null are
-          considered "false values", and anything else is a "true value".
+          jq supports the normal Boolean operators `and`, `or`, `not`.
+          They have the same standard of truth as if expressions -
+          `false` and `null` are considered "false values", and
+          anything else is a "true value".

          If an operand of one of these operators produces multiple
          results, the operator itself will produce a result for each input.
@@ -961,12 +959,12 @@ sections:
          rather than with special syntax, as in `.foo and .bar |
          not`.

-          These three only produce the values "true" and "false", and
+          These three only produce the values `true` and `false`, and
          so are only useful for genuine Boolean operations, rather
          than the common Perl/Python/Ruby idiom of
          "value_that_may_be_null or default". If you want to use this
          form of "or", picking between two values rather than
-          evaluating a condition, see the "//" operator below.
+          evaluating a condition, see the `//` operator below.

        examples:
          - program: '42 and "a string"'
@@ -975,9 +973,6 @@ sections:
          - program: '(true, false) or false'
            input: 'null'
            output: ['true', 'false']
-#          - program: '(true, false) and (true, false)'
-#            input: 'null'
-#            output: ['true', 'false', 'false', 'false']
          - program: '(true, true) and (true, false)'
            input: 'null'
            output: ['true', 'false', 'true', 'false']
@@ -985,7 +980,7 @@ sections:
            input: 'null'
            output: ['[false, true]']

-      - title: Alternative operator - `//`
+      - title: "Alternative operator: `//`"
        body: |

          A filter of the form `a // b` produces the same
@@ -1020,7 +1015,7 @@ sections:

      It is also possible to define functions in jq, although this is
      is a feature whose biggest use is defining jq's standard library
-      (many jq functions such as `map` and `find` are in fact written
+      (many jq functions such as `map` and `select` are in fact written
      in jq).

      Finally, jq has a `reduce` operation, which is very powerful but a
@@ -1061,7 +1056,7 @@ sections:
          fields, and another object which is used to map author usernames to
          real names. Our input looks like:

-              {"posts": [{"title": "Frist psot", "author": "anon"},
+              {"posts": [{"title": "First post", "author": "anon"},
                         {"title": "A well-written article", "author": "person1"}],
               "realnames": {"anon": "Anonymous Coward",
                             "person1": "Person McPherson"}}
@@ -1069,7 +1064,7 @@ sections:
          We want to produce the posts with the author field containing a real
          name, as in:

-              {"title": "Frist psot", "author": "Anonymous Coward"}
+              {"title": "First post", "author": "Anonymous Coward"}
              {"title": "A well-written article", "author": "Person McPherson"}

          We use a variable, $names, to store the realnames object, so that we
@@ -1169,7 +1164,7 @@ sections:
      If an object has two fields which are arrays, `.foo` and `.bar`,
      and you append something to `.foo`, then `.bar` will not get
      bigger. Even if you've just set `.bar = .foo`. If you're used to
-      programming in languages like Python, Java, Ruby, Javascript,
+      programming in languages like Python, Java, Ruby, JavaScript,
      etc. then you can think of it as though jq does a full deep copy
      of every object before it does the assignment (for performance,
      it doesn't actually do that, but that's the general idea).
@@ -1186,7 +1181,7 @@ sections:
           .foo = .bar | .foo.baz = 1

          will not have the side-effect of setting .bar.baz to be set
-          to 1, as the similar-looking program in Javascript, Python,
+          to 1, as the similar-looking program in JavaScript, Python,
          Ruby or other languages would. Unlike these languages (but
          like Haskell and some other functional languages), there is
          no notion of two arrays or objects being "the same array" or
@@ -1232,7 +1227,7 @@ sections:
      - title: Complex assignments
        body: |
          Lots more things are allowed on the left-hand side of a jq assignment
-          than in most langauges. We've already seen simple field accesses on
+          than in most languages. We've already seen simple field accesses on
          the left hand side, and it's no surprise that array accesses work just
          as well:

@@ -63,7 +63,7 @@ manpage_epilogue: |

  Presumably. Report them or discuss them at:

-      https://github.com/stedolan/jq/issues
+      https://github.com/jqlang/jq/issues

  ## AUTHOR

@@ -142,7 +142,7 @@ sections:
        ASCII output with every non-ASCII character replaced with the
        equivalent escape sequence.

-      * `--unbuffered`
+      * `--unbuffered`:

        Flush the output after each JSON object is printed (useful if
        you're piping a slow data source into jq and piping jq's
@@ -166,7 +166,7 @@ sections:

      * `-e` / `--exit-status`:

-        Sets the exit status of jq to 0 if the last output values was
+        Sets the exit status of jq to 0 if the last output value was
        neither `false` nor `null`, 1 if the last output value was
        either `false` or `null`, or 4 if no valid result was ever
        produced.  Normally jq exits with 2 if there was any usage
@@ -212,8 +212,8 @@ sections:
          JSON object (aka dictionary or hash) as input, it produces
          the value at the key "foo", or null if there's none present.

-          If the key contains special characters, you need to surround
-          it with double quotes like this: `."foo$"`.
+          If the key contains special characters or starts with a digit,
+          you need to surround it with double quotes like this: `."foo$"`.

          A filter of the form `.foo.bar` is equivalent to `.foo|.bar`.

@@ -231,8 +231,8 @@ sections:
      - title: "`.foo?`"
        body: |

-          Just like `.foo`, but does not output even an error when `.`
-          is not an array or an object.
+          Just like `.foo`, but does not output an error when `.` is not an
+          object.

        examples:
          - program: '.foo?'
@@ -248,11 +248,11 @@ sections:
            input: '[1,2]'
            output: ['[]']

-      - title: "`.[<string>]`, `.[2]`, `.[10:15]`"
+      - title: "`.[<string>]`, `.[<number>]`, `.[<number>:<number>]`"
        body: |

          You can also look up fields of an object using syntax like
-          `.["foo"]` (.foo above is a shorthand version of this). This
+          `.["foo"]` (`.foo` above is a shorthand version of this). This
          one works for arrays as well, if the key is an
          integer. Arrays are zero-based (like javascript), so `.[2]`
          returns the third element of the array.
@@ -381,7 +381,7 @@ sections:
      instead.

    entries:
-      - title: Array construction - `[]`
+      - title: "Array construction: `[]`"
        body: |

          As in JSON, `[]` is used to construct arrays, as in
@@ -406,7 +406,7 @@ sections:
          - program: "[.user, .projects[]]"
            input: '{"user":"stedolan", "projects": ["jq", "wikiflow"]}'
            output: ['["stedolan", "jq", "wikiflow"]']
-      - title: Objects - `{}`
+      - title: "Objects: `{}`"
        body: |

          Like JSON, `{}` is for constructing objects (aka
@@ -467,14 +467,14 @@ sections:
  - title: Builtin operators and functions
    body: |

-      Some jq operator (for instance, `+`) do different things
+      Some jq operators (for instance, `+`) do different things
      depending on the type of their arguments (arrays, numbers,
      etc.). However, jq never does implicit type conversions. If you
      try to add a string to an object you'll get an error message and
      no result.

    entries:
-      - title: Addition - `+`
+      - title: "Addition: `+`"
        body: |

          The operator `+` takes two filters, applies them both
@@ -513,11 +513,11 @@ sections:
            input: 'null'
            output: ['{"a": 42, "b": 2, "c": 3}']

-      - title: Subtraction - `-`
+      - title: "Subtraction: `-`"
        body: |

          As well as normal arithmetic subtraction on numbers, the `-`
-          operator can be used on arrays to remove all occurences of
+          operator can be used on arrays to remove all occurrences of
          the second array's elements from the first array.

        examples:
@@ -528,7 +528,7 @@ sections:
            input: '["xml", "yaml", "json"]'
            output: ['["json"]']

-      - title: Multiplication, division, modulo - `*`, `/`, and `%`
+      - title: "Multiplication, division, modulo: `*`, `/`, `%`"
        body: |

          These operators only work on numbers, and do the expected.
@@ -632,7 +632,7 @@ sections:
            input: '["foo", "bar", "baz"]'
            output: ['["foo"]']

-      - title: "`to_entries`, `from_entries`, `with_entries`"
+      - title: "`to_entries`, `from_entries`, `with_entries(f)`"
        body: |

          These functions convert between an object and an array of
@@ -641,9 +641,9 @@ sections:
          includes `{"key": k, "value": v}`.

          `from_entries` does the opposite conversion, and
-          `with_entries(foo)` is a shorthand for `to_entries |
-          map(foo) | from_entries`, useful for doing some operation to
-          all keys and values of an object.
+          `with_entries(f)` is a shorthand for `to_entries | map(f) |
+          from_entries`, useful for doing some operation to all keys
+          and values of an object.

        examples:
          - program: 'to_entries'
@@ -700,14 +700,14 @@ sections:
            input: 'null'
            output: ['[1,2,3]']

-      - title: "`map(x)`"
+      - title: "`map(f)`"
        body: |

-          For any filter `x`, `map(x)` will run that filter for each
+          For any filter `f`, `map(f)` will run that filter for each
          element of the input array, and produce the outputs a new
          array. `map(.+1)` will increment each element of an array of numbers.

-          `map(x)` is equivalent to `[.[] | x]`. In fact, this is how
+          `map(f)` is equivalent to `[.[] | f]`. In fact, this is how
          it's defined.

        examples:
@@ -875,7 +875,7 @@ sections:
            input: '[0, false, [], {}, null, "hello"]'
            output: ['["number", "boolean", "array", "object", "null", "string"]']

-      - title: "`sort, sort_by`"
+      - title: "`sort`, `sort_by`"
        body: |

          The `sort` functions sorts its input, which must be an
@@ -957,7 +957,7 @@ sections:

          The `unique_by(.foo)` function takes as input an array and produces
          an array of the same elements, in sorted order, with
-          elqements with a duplicate `.foo` field removed. Think of it as making
+          elements with a duplicate `.foo` field removed. Think of it as making
          an array by taking one element out of every group produced by
          `group_by`.

@@ -1179,7 +1179,7 @@ sections:
            input: '[[{"a":1}]]'
            output: ['1']

-      - title: "String interpolation - `\\(foo)`"
+      - title: "String interpolation: `\\(exp)`"
        body: |

          Inside a string, you can put an expression inside parens
@@ -1274,10 +1274,6 @@ sections:
            input: '"This works if x < y"'
            output: ['"This works if x &lt; y"']

-#          - program: '@html "<span>Anonymous said: \(.)</span>"'
-#            input: '"<script>alert(\"lol hax\");</script>"'
-#            output: ["<span>Anonymous said: &lt;script&gt;alert(&quot;lol hax&quot;);&lt;/script&gt;</span>"]
-
          - program: '@sh "echo \(.)"'
            input: "\"O'Hara's Ale\""
            output: ["\"echo 'O'\\\\''Hara'\\\\''s Ale'\""]
@@ -1290,8 +1286,8 @@ sections:
          The expression 'a == b' will produce 'true' if the result of a and b
          are equal (that is, if they represent equivalent JSON documents) and
          'false' otherwise. In particular, strings are never considered equal
-          to numbers. If you're coming from Javascript, jq's == is like
-          Javascript's === - considering values equal only when they have the
+          to numbers. If you're coming from JavaScript, jq's == is like
+          JavaScript's === - considering values equal only when they have the
          same type as well as the same value.

          != is "not equal", and 'a != b' returns the opposite value of 'a == b'
@@ -1300,7 +1296,8 @@ sections:
          - program: '.[] == 1'
            input: '[1, 1.0, "1", "banana"]'
            output: ['true', 'true', 'false', 'false']
-      - title: if-then-else
+
+      - title: if-then-else-end
        body: |

          `if A then B else C end` will act the same as `B` if `A`
@@ -1308,7 +1305,7 @@ sections:
          as `C` otherwise.

          Checking for false or null is a simpler notion of
-          "truthiness" than is found in Javascript or Python, but it
+          "truthiness" than is found in JavaScript or Python, but it
          means that you'll sometimes have to be more explicit about
          the condition you want: you can't test whether, e.g. a
          string is empty using `if .name then A else B end`, you'll
@@ -1333,7 +1330,7 @@ sections:
            input: 2
            output: ['"many"']

-      - title: "`>, >=, <=, <`"
+      - title: "`>`, `>=`, `<=`, `<`"
        body: |

          The comparison operators `>`, `>=`, `<=`, `<` return whether
@@ -1348,12 +1345,13 @@ sections:
            input: 2
            output: ['true']

-      - title: and/or/not
+      - title: "`and`, `or`, `not`"
        body: |

-          jq supports the normal Boolean operators and/or/not. They have the
-          same standard of truth as if expressions - false and null are
-          considered "false values", and anything else is a "true value".
+          jq supports the normal Boolean operators `and`, `or`, `not`.
+          They have the same standard of truth as if expressions -
+          `false` and `null` are considered "false values", and
+          anything else is a "true value".

          If an operand of one of these operators produces multiple
          results, the operator itself will produce a result for each input.
@@ -1363,12 +1361,12 @@ sections:
          rather than with special syntax, as in `.foo and .bar |
          not`.

-          These three only produce the values "true" and "false", and
+          These three only produce the values `true` and `false`, and
          so are only useful for genuine Boolean operations, rather
          than the common Perl/Python/Ruby idiom of
          "value_that_may_be_null or default". If you want to use this
          form of "or", picking between two values rather than
-          evaluating a condition, see the "//" operator below.
+          evaluating a condition, see the `//` operator below.

        examples:
          - program: '42 and "a string"'
@@ -1377,9 +1375,6 @@ sections:
          - program: '(true, false) or false'
            input: 'null'
            output: ['true', 'false']
-#          - program: '(true, false) and (true, false)'
-#            input: 'null'
-#            output: ['true', 'false', 'false', 'false']
          - program: '(true, true) and (true, false)'
            input: 'null'
            output: ['true', 'false', 'true', 'false']
@@ -1387,7 +1382,7 @@ sections:
            input: 'null'
            output: ['[false, true]']

-      - title: Alternative operator - `//`
+      - title: "Alternative operator: `//`"
        body: |

          A filter of the form `a // b` produces the same
@@ -1422,7 +1417,7 @@ sections:

      It is also possible to define functions in jq, although this is
      is a feature whose biggest use is defining jq's standard library
-      (many jq functions such as `map` and `find` are in fact written
+      (many jq functions such as `map` and `select` are in fact written
      in jq).

      Finally, jq has a `reduce` operation, which is very powerful but a
@@ -1463,7 +1458,7 @@ sections:
          fields, and another object which is used to map author usernames to
          real names. Our input looks like:

-              {"posts": [{"title": "Frist psot", "author": "anon"},
+              {"posts": [{"title": "First post", "author": "anon"},
                         {"title": "A well-written article", "author": "person1"}],
               "realnames": {"anon": "Anonymous Coward",
                             "person1": "Person McPherson"}}
@@ -1471,7 +1466,7 @@ sections:
          We want to produce the posts with the author field containing a real
          name, as in:

-              {"title": "Frist psot", "author": "Anonymous Coward"}
+              {"title": "First post", "author": "Anonymous Coward"}
              {"title": "A well-written article", "author": "Person McPherson"}

          We use a variable, $names, to store the realnames object, so that we
@@ -1571,7 +1566,7 @@ sections:
      If an object has two fields which are arrays, `.foo` and `.bar`,
      and you append something to `.foo`, then `.bar` will not get
      bigger. Even if you've just set `.bar = .foo`. If you're used to
-      programming in languages like Python, Java, Ruby, Javascript,
+      programming in languages like Python, Java, Ruby, JavaScript,
      etc. then you can think of it as though jq does a full deep copy
      of every object before it does the assignment (for performance,
      it doesn't actually do that, but that's the general idea).
@@ -1588,7 +1583,7 @@ sections:
           .foo = .bar | .foo.baz = 1

          will not have the side-effect of setting .bar.baz to be set
-          to 1, as the similar-looking program in Javascript, Python,
+          to 1, as the similar-looking program in JavaScript, Python,
          Ruby or other languages would. Unlike these languages (but
          like Haskell and some other functional languages), there is
          no notion of two arrays or objects being "the same array" or
@@ -1634,7 +1629,7 @@ sections:
      - title: Complex assignments
        body: |
          Lots more things are allowed on the left-hand side of a jq assignment
-          than in most langauges. We've already seen simple field accesses on
+          than in most languages. We've already seen simple field accesses on
          the left hand side, and it's no surprise that array accesses work just
          as well:

@@ -65,7 +65,7 @@ manpage_epilogue: |

  Presumably. Report them or discuss them at:

-      https://github.com/stedolan/jq/issues
+      https://github.com/jqlang/jq/issues

  ## AUTHOR

@@ -107,15 +107,15 @@ sections:
        output and an ASCII LF (line feed) is printed after every
        output.  Input JSON texts that fail to parse are ignored (but
        warned about), discarding all subsequent input until the next
-        RS.  This more also parses the output of jq without the `--seq`
+        RS.  This mode also parses the output of jq without the `--seq`
        option.

      * `--stream`:

-        Parse the input in streaming fashion, outputing arrays of path
+        Parse the input in streaming fashion, outputting arrays of path
        and leaf values (scalars and empty arrays or empty objects).
        For example, `"a"` becomes `[[],"a"]`, and `[[],"a",["b"]]`
-        becomes `[[0],[]]`, `[[1],"a"]`, and `[[1,0],"b"]`.
+        becomes `[[0],[]]`, `[[1],"a"]`, and `[[2,0],"b"]`.

        This is useful for processing very large inputs.  Use this in
        conjunction with filtering and the `reduce` and `foreach` syntax
@@ -152,7 +152,7 @@ sections:

      * `--indent n`:

-        Use the given number of spaces (no more than 8) for indentation.
+        Use the given number of spaces (no more than 7) for indentation.

      * `--color-output` / `-C` and `--monochrome-output` / `-M`:

@@ -168,7 +168,7 @@ sections:
        ASCII output with every non-ASCII character replaced with the
        equivalent escape sequence.

-      * `--unbuffered`
+      * `--unbuffered`:

        Flush the output after each JSON object is printed (useful if
        you're piping a slow data source into jq and piping jq's
@@ -202,7 +202,7 @@ sections:

      * `-e` / `--exit-status`:

-        Sets the exit status of jq to 0 if the last output values was
+        Sets the exit status of jq to 0 if the last output value was
        neither `false` nor `null`, 1 if the last output value was
        either `false` or `null`, or 4 if no valid result was ever
        produced.  Normally jq exits with 2 if there was any usage
@@ -278,8 +278,8 @@ sections:
          JSON object (aka dictionary or hash) as input, it produces
          the value at the key "foo", or null if there's none present.

-          If the key contains special characters, you need to surround
-          it with double quotes like this: `."foo$"`.
+          If the key contains special characters or starts with a digit,
+          you need to surround it with double quotes like this: `."foo$"`.

          A filter of the form `.foo.bar` is equivalent to `.foo|.bar`.

@@ -297,8 +297,8 @@ sections:
      - title: "`.foo?`"
        body: |

-          Just like `.foo`, but does not output even an error when `.`
-          is not an array or an object.
+          Just like `.foo`, but does not output an error when `.` is not an
+          object.

        examples:
          - program: '.foo?'
@@ -314,11 +314,11 @@ sections:
            input: '[1,2]'
            output: ['[]']

-      - title: "`.[<string>]`, `.[2]`, `.[10:15]`"
+      - title: "`.[<string>]`, `.[<number>]`, `.[<number>:<number>]`"
        body: |

          You can also look up fields of an object using syntax like
-          `.["foo"]` (.foo above is a shorthand version of this). This
+          `.["foo"]` (`.foo` above is a shorthand version of this). This
          one works for arrays as well, if the key is an
          integer. Arrays are zero-based (like javascript), so `.[2]`
          returns the third element of the array.
@@ -462,7 +462,7 @@ sections:
      instead.

    entries:
-      - title: Array construction - `[]`
+      - title: "Array construction: `[]`"
        body: |

          As in JSON, `[]` is used to construct arrays, as in
@@ -487,7 +487,7 @@ sections:
          - program: "[.user, .projects[]]"
            input: '{"user":"stedolan", "projects": ["jq", "wikiflow"]}'
            output: ['["stedolan", "jq", "wikiflow"]']
-      - title: Objects - `{}`
+      - title: "Objects: `{}`"
        body: |

          Like JSON, `{}` is for constructing objects (aka
@@ -548,14 +548,14 @@ sections:
  - title: Builtin operators and functions
    body: |

-      Some jq operator (for instance, `+`) do different things
+      Some jq operators (for instance, `+`) do different things
      depending on the type of their arguments (arrays, numbers,
      etc.). However, jq never does implicit type conversions. If you
      try to add a string to an object you'll get an error message and
      no result.

    entries:
-      - title: Addition - `+`
+      - title: "Addition: `+`"
        body: |

          The operator `+` takes two filters, applies them both
@@ -594,7 +594,7 @@ sections:
            input: 'null'
            output: ['{"a": 42, "b": 2, "c": 3}']

-      - title: Subtraction - `-`
+      - title: "Subtraction: `-`"
        body: |

          As well as normal arithmetic subtraction on numbers, the `-`
@@ -609,7 +609,7 @@ sections:
            input: '["xml", "yaml", "json"]'
            output: ['["json"]']

-      - title: Multiplication, division, modulo - `*`, `/`, and `%`
+      - title: "Multiplication, division, modulo: `*`, `/`, `%`"
        body: |

          These infix operators behave as expected when given two numbers.
@@ -770,7 +770,7 @@ sections:
            input: '["foo", "bar", "baz"]'
            output: ['["foo"]']

-      - title: "`to_entries`, `from_entries`, `with_entries`"
+      - title: "`to_entries`, `from_entries`, `with_entries(f)`"
        body: |

          These functions convert between an object and an array of
@@ -779,10 +779,10 @@ sections:
          includes `{"key": k, "value": v}`.

          `from_entries` does the opposite conversion, and
-          `with_entries(foo)` is a shorthand for `to_entries |
-          map(foo) | from_entries`, useful for doing some operation to
-          all keys and values of an object. `from_entries` accepts key, Key,
-          Name, value and Value as keys.
+          `with_entries(f)` is a shorthand for `to_entries | map(f) |
+          from_entries`, useful for doing some operation to all keys
+          and values of an object. `from_entries` accepts `"key"`,
+          `"Key"`, `"Name"`, `"value"`, and `"Value"` as keys.

        examples:
          - program: 'to_entries'
@@ -799,8 +799,8 @@ sections:
      - title: "`select(boolean_expression)`"
        body: |

-          The function `select(foo)` produces its input unchanged if
-          `foo` returns true for that input, and produces no output
+          The function `select(f)` produces its input unchanged if
+          `f` returns true for that input, and produces no output
          otherwise.

          It's useful for filtering lists: `[1,2,3] | map(select(. >= 2))`
@@ -862,18 +862,18 @@ sections:
            input: 'null'
            output: ['"{\"file\":\"<top-level>\",\"line\":1}"']

-      - title: "`map(x)`, `map_values(x)`"
+      - title: "`map(f)`, `map_values(f)`"
        body: |

-          For any filter `x`, `map(x)` will run that filter for each
+          For any filter `f`, `map(f)` will run that filter for each
          element of the input array, and return the outputs in a new
          array. `map(.+1)` will increment each element of an array of numbers.

-          Similarly, `map_values(x)` will run that filter for each element,
+          Similarly, `map_values(f)` will run that filter for each element,
          but it will return an object when an object is passed.

-          `map(x)` is equivalent to `[.[] | x]`. In fact, this is how
-          it's defined. Similarly, `map_values(x)` is defined as `.[] |= x`.
+          `map(f)` is equivalent to `[.[] | f]`. In fact, this is how
+          it's defined. Similarly, `map_values(f)` is defined as `.[] |= f`.

        examples:
          - program: 'map(.+1)'
@@ -1005,12 +1005,12 @@ sections:
            input: '[{"foo": "bar"}, [{"foo": "baz"}]]'
            output: ['[{"foo": "bar"}, {"foo": "baz"}]']

-      - title: "`range(upto)`, `range(from;upto)` `range(from;upto;by)`"
+      - title: "`range(upto)`, `range(from; upto)` `range(from; upto; by)`"
        body: |

-          The `range` function produces a range of numbers. `range(4;10)`
+          The `range` function produces a range of numbers. `range(4; 10)`
          produces 6 numbers, from 4 (inclusive) to 10 (exclusive). The numbers
-          are produced as separate outputs. Use `[range(4;10)]` to get a range as
+          are produced as separate outputs. Use `[range(4; 10)]` to get a range as
          an array.

          The one argument form generates numbers from 0 to the given
@@ -1023,22 +1023,22 @@ sections:
          with an increment of `by`.

        examples:
-          - program: 'range(2;4)'
+          - program: 'range(2; 4)'
            input: 'null'
            output: ['2', '3']
-          - program: '[range(2;4)]'
+          - program: '[range(2; 4)]'
            input: 'null'
            output: ['[2,3]']
          - program: '[range(4)]'
            input: 'null'
            output: ['[0,1,2,3]']
-          - program: '[range(0;10;3)]'
+          - program: '[range(0; 10; 3)]'
            input: 'null'
            output: ['[0,3,6,9]']
-          - program: '[range(0;10;-1)]'
+          - program: '[range(0; 10; -1)]'
            input: 'null'
            output: ['[]']
-          - program: '[range(0;-5;-1)]'
+          - program: '[range(0; -5; -1)]'
            input: 'null'
            output: ['[0,-1,-2,-3,-4]']

@@ -1122,7 +1122,7 @@ sections:
            input: 'null'
            output: ['"number"', '"number"']

-      - title: "`sort, sort_by(path_expression)`"
+      - title: "`sort`, `sort_by(path_expression)`"
        body: |

          The `sort` functions sorts its input, which must be an
@@ -1144,8 +1144,8 @@ sections:
          `sort` may be used to sort by a particular field of an
          object, or by applying any jq filter.

-          `sort_by(foo)` compares two elements by comparing the result of
-          `foo` on each element.
+          `sort_by(f)` compares two elements by comparing the result of
+          `f` on each element.

        examples:
          - program: 'sort'
@@ -1560,13 +1560,13 @@ sections:
      - title: "`bsearch(x)`"
        body: |

-          bsearch(x) conducts a binary search for x in the input
+          `bsearch(x)` conducts a binary search for x in the input
          array.  If the input is sorted and contains x, then
-          bsearch(x) will return its index in the array; otherwise, if
+          `bsearch(x)` will return its index in the array; otherwise, if
          the array is sorted, it will return (-1 - ix) where ix is an
          insertion point such that the array would still be sorted
          after the insertion of x at ix.  If the array is not sorted,
-          bsearch(x) will return an integer that is probably of no
+          `bsearch(x)` will return an integer that is probably of no
          interest.

        examples:
@@ -1580,7 +1580,7 @@ sections:
            input: '[1,2,3]'
            output: ['[1,2,3,4]']

-      - title: "String interpolation - `\\(foo)`"
+      - title: "String interpolation: `\\(exp)`"
        body: |

          Inside a string, you can put an expression inside parens
@@ -1685,10 +1685,6 @@ sections:
            input: '"This works if x < y"'
            output: ['"This works if x &lt; y"']

-#          - program: '@html "<span>Anonymous said: \(.)</span>"'
-#            input: '"<script>alert(\"lol hax\");</script>"'
-#            output: ["<span>Anonymous said: &lt;script&gt;alert(&quot;lol hax&quot;);&lt;/script&gt;</span>"]
-
          - program: '@sh "echo \(.)"'
            input: "\"O'Hara's Ale\""
            output: ["\"echo 'O'\\\\''Hara'\\\\''s Ale'\""]
@@ -1768,8 +1764,8 @@ sections:
          The expression 'a == b' will produce 'true' if the result of a and b
          are equal (that is, if they represent equivalent JSON documents) and
          'false' otherwise. In particular, strings are never considered equal
-          to numbers. If you're coming from Javascript, jq's == is like
-          Javascript's === - considering values equal only when they have the
+          to numbers. If you're coming from JavaScript, jq's == is like
+          JavaScript's === - considering values equal only when they have the
          same type as well as the same value.

          != is "not equal", and 'a != b' returns the opposite value of 'a == b'
@@ -1779,7 +1775,7 @@ sections:
            input: '[1, 1.0, "1", "banana"]'
            output: ['true', 'true', 'false', 'false']

-      - title: if-then-else
+      - title: if-then-else-end
        body: |

          `if A then B else C end` will act the same as `B` if `A`
@@ -1787,7 +1783,7 @@ sections:
          as `C` otherwise.

          Checking for false or null is a simpler notion of
-          "truthiness" than is found in Javascript or Python, but it
+          "truthiness" than is found in JavaScript or Python, but it
          means that you'll sometimes have to be more explicit about
          the condition you want: you can't test whether, e.g. a
          string is empty using `if .name then A else B end`, you'll
@@ -1812,7 +1808,7 @@ sections:
            input: 2
            output: ['"many"']

-      - title: "`>, >=, <=, <`"
+      - title: "`>`, `>=`, `<=`, `<`"
        body: |

          The comparison operators `>`, `>=`, `<=`, `<` return whether
@@ -1827,12 +1823,13 @@ sections:
            input: 2
            output: ['true']

-      - title: and/or/not
+      - title: "`and`, `or`, `not`"
        body: |

-          jq supports the normal Boolean operators and/or/not. They have the
-          same standard of truth as if expressions - false and null are
-          considered "false values", and anything else is a "true value".
+          jq supports the normal Boolean operators `and`, `or`, `not`.
+          They have the same standard of truth as if expressions -
+          `false` and `null` are considered "false values", and
+          anything else is a "true value".

          If an operand of one of these operators produces multiple
          results, the operator itself will produce a result for each input.
@@ -1842,12 +1839,12 @@ sections:
          rather than with special syntax, as in `.foo and .bar |
          not`.

-          These three only produce the values "true" and "false", and
+          These three only produce the values `true` and `false`, and
          so are only useful for genuine Boolean operations, rather
          than the common Perl/Python/Ruby idiom of
          "value_that_may_be_null or default". If you want to use this
          form of "or", picking between two values rather than
-          evaluating a condition, see the "//" operator below.
+          evaluating a condition, see the `//` operator below.

        examples:
          - program: '42 and "a string"'
@@ -1856,9 +1853,6 @@ sections:
          - program: '(true, false) or false'
            input: 'null'
            output: ['true', 'false']
-#          - program: '(true, false) and (true, false)'
-#            input: 'null'
-#            output: ['true', 'false', 'false', 'false']
          - program: '(true, true) and (true, false)'
            input: 'null'
            output: ['true', 'false', 'true', 'false']
@@ -1866,7 +1860,7 @@ sections:
            input: 'null'
            output: ['[false, true]']

-      - title: Alternative operator - `//`
+      - title: "Alternative operator: `//`"
        body: |

          A filter of the form `a // b` produces the same
@@ -1920,7 +1914,7 @@ sections:
              # Repeat an expression until it raises "break" as an
              # error, then stop repeating without re-raising the error.
              # But if the error caught is not "break" then re-raise it.
-              try repeat(exp) catch .=="break" then empty else error;
+              try repeat(exp) catch if .=="break" then empty else error

          jq has a syntax for named lexical labels to "break" or "go (back) to":

@@ -1954,46 +1948,47 @@ sections:
            output: ['[null, 1]']


-  - title: Regular expressions (PCRE)
+  - title: Regular expressions
    body: |

-      jq uses the Oniguruma regular expression library, as do php,
-      ruby, TextMate, Sublime Text, etc, so the description here
+      jq uses the Oniguruma regular expression library, as do PHP,
+      Ruby, TextMate, Sublime Text, etc, so the description here
      will focus on jq specifics.

      The jq regex filters are defined so that they can be used using
      one of these patterns:

-          STRING | FILTER( REGEX )
-          STRING | FILTER( REGEX; FLAGS )
-          STRING | FILTER( [REGEX] )
-          STRING | FILTER( [REGEX, FLAGS] )
+          STRING | FILTER(REGEX)
+          STRING | FILTER(REGEX; FLAGS)
+          STRING | FILTER([REGEX])
+          STRING | FILTER([REGEX, FLAGS])

      where:
-      * STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation;
-      * REGEX, after string interpolation, should be a valid PCRE regex;
+
+      * STRING, REGEX, and FLAGS are jq strings and subject to jq string interpolation;
+      * REGEX, after string interpolation, should be a valid regular expression;
      * FILTER is one of `test`, `match`, or `capture`, as described below.

      FLAGS is a string consisting of one of more of the supported flags:

      * `g` - Global search (find all matches, not just the first)
      * `i` - Case insensitive search
-      * `m` - Multi line mode ('.' will match newlines)
+      * `m` - Multi line mode (`.` will match newlines)
      * `n` - Ignore empty matches
      * `p` - Both s and m modes are enabled
-      * `s` - Single line mode ('^' -> '\A', '$' -> '\Z')
+      * `s` - Single line mode (`^` -> `\A`, `$` -> `\Z`)
      * `l` - Find longest possible matches
      * `x` - Extended regex format (ignore whitespace and comments)

-      To match whitespace in an x pattern use an escape such as \s, e.g.
+      To match a whitespace with the `x` flag, use `\s`, e.g.

-      * test( "a\\sb", "x" ).
+          jq -n '"a b" | test("a\\sb"; "x")'

      Note that certain flags may also be specified within REGEX, e.g.

-      * jq -n '("test", "TEst", "teST", "TEST") | test( "(?i)te(?-i)st" )'
+          jq -n '("test", "TEst", "teST", "TEST") | test("(?i)te(?-i)st")'

-      evaluates to: true, true, false, false.
+      evaluates to: `true`, `true`, `false`, `false`.

    entries:
      - title: "`test(val)`, `test(regex; flags)`"
@@ -2115,7 +2110,7 @@ sections:
          be a jq string, and may contain references to named captures. The
          named captures are, in effect, presented as a JSON object (as
          constructed by `capture`) to `tostring`, so a reference to a captured
-          variable named "x" would take the form: "\(.x)".
+          variable named "x" would take the form: `"\(.x)"`.

        example:
          - program: 'sub("^[^a-z]*(?<x>[a-z]*).*")'
@@ -2149,7 +2144,7 @@ sections:

      It is also possible to define functions in jq, although this is
      is a feature whose biggest use is defining jq's standard library
-      (many jq functions such as `map` and `find` are in fact written
+      (many jq functions such as `map` and `select` are in fact written
      in jq).

      jq has reduction operators, which are very powerful but a bit
@@ -2199,7 +2194,7 @@ sections:
          fields, and another object which is used to map author usernames to
          real names. Our input looks like:

-              {"posts": [{"title": "Frist psot", "author": "anon"},
+              {"posts": [{"title": "First post", "author": "anon"},
                         {"title": "A well-written article", "author": "person1"}],
               "realnames": {"anon": "Anonymous Coward",
                             "person1": "Person McPherson"}}
@@ -2207,7 +2202,7 @@ sections:
          We want to produce the posts with the author field containing a real
          name, as in:

-              {"title": "Frist psot", "author": "Anonymous Coward"}
+              {"title": "First post", "author": "Anonymous Coward"}
              {"title": "A well-written article", "author": "Person McPherson"}

          We use a variable, $names, to store the realnames object, so that we
@@ -2221,7 +2216,7 @@ sections:
          foreach loop.

          Just as `{foo}` is a handy way of writing `{foo: .foo}`, so
-          `{$foo}` is a handy way of writing `{foo:$foo}`.
+          `{$foo}` is a handy way of writing `{foo: $foo}`.

          Multiple variables may be declared using a single `as` expression by
          providing a pattern that matches the structure of the input
@@ -2620,7 +2615,7 @@ sections:
      If an object has two fields which are arrays, `.foo` and `.bar`,
      and you append something to `.foo`, then `.bar` will not get
      bigger. Even if you've just set `.bar = .foo`. If you're used to
-      programming in languages like Python, Java, Ruby, Javascript,
+      programming in languages like Python, Java, Ruby, JavaScript,
      etc. then you can think of it as though jq does a full deep copy
      of every object before it does the assignment (for performance,
      it doesn't actually do that, but that's the general idea).
@@ -2640,7 +2635,7 @@ sections:
           .foo = .bar | .foo.baz = 1

          will not have the side-effect of setting .bar.baz to be set
-          to 1, as the similar-looking program in Javascript, Python,
+          to 1, as the similar-looking program in JavaScript, Python,
          Ruby or other languages would. Unlike these languages (but
          like Haskell and some other functional languages), there is
          no notion of two arrays or objects being "the same array" or
@@ -65,7 +65,7 @@ manpage_epilogue: |

  Presumably. Report them or discuss them at:

-      https://github.com/stedolan/jq/issues
+      https://github.com/jqlang/jq/issues

  ## AUTHOR

@@ -90,7 +90,15 @@ sections:
      defined`.  When using the Windows command shell (cmd.exe) it's
      best to use double quotes around your jq program when given on the
      command-line (instead of the `-f program-file` option), but then
-      double-quotes in the jq program need backslash escaping.
+      double-quotes in the jq program need backslash escaping. When using
+      the Powershell (`powershell.exe`) or the Powershell Core
+      (`pwsh`/`pwsh.exe`), use single-quote characters around the jq
+      program and backslash-escaped double-quotes (`\"`) inside the jq
+      program.
+
+      * Unix shells: `jq '.["foo"]'`
+      * Powershell: `jq '.[\"foo\"]'`
+      * Windows command shell: `jq ".[\"foo\"]"`

      You can affect how jq reads and writes its input and output
      using some command-line options:
@@ -112,10 +120,10 @@ sections:

      * `--stream`:

-        Parse the input in streaming fashion, outputing arrays of path
+        Parse the input in streaming fashion, outputting arrays of path
        and leaf values (scalars and empty arrays or empty objects).
        For example, `"a"` becomes `[[],"a"]`, and `[[],"a",["b"]]`
-        becomes `[[0],[]]`, `[[1],"a"]`, and `[[1,0],"b"]`.
+        becomes `[[0],[]]`, `[[1],"a"]`, and `[[2,0],"b"]`.

        This is useful for processing very large inputs.  Use this in
        conjunction with filtering and the `reduce` and `foreach` syntax
@@ -152,7 +160,7 @@ sections:

      * `--indent n`:

-        Use the given number of spaces (no more than 8) for indentation.
+        Use the given number of spaces (no more than 7) for indentation.

      * `--color-output` / `-C` and `--monochrome-output` / `-M`:

@@ -171,7 +179,7 @@ sections:
        ASCII output with every non-ASCII character replaced with the
        equivalent escape sequence.

-      * `--unbuffered`
+      * `--unbuffered`:

        Flush the output after each JSON object is printed (useful if
        you're piping a slow data source into jq and piping jq's
@@ -205,7 +213,7 @@ sections:

      * `-e` / `--exit-status`:

-        Sets the exit status of jq to 0 if the last output values was
+        Sets the exit status of jq to 0 if the last output value was
        neither `false` nor `null`, 1 if the last output value was
        either `false` or `null`, or 4 if no valid result was ever
        produced.  Normally jq exits with 2 if there was any usage
@@ -244,7 +252,7 @@ sections:

        This option reads in the named file and binds its contents to the given
        global variable.  If you run jq with `--rawfile foo bar`, then `$foo` is
-        available in the program and has a string whose contents are to the texs
+        available in the program and has a string whose contents are to the texts
        in the file named `bar`.

      * `--argfile variable-name filename`:
@@ -297,6 +305,7 @@ sections:
            input: '"Hello, world!"'
            output: ['"Hello, world!"']

+
      - title: "Object Identifier-Index: `.foo`, `.foo.bar`"
        body: |

@@ -310,8 +319,9 @@ sections:
          is, keys that are all made of alphanumeric characters and
          underscore, and which do not start with a digit.

-          If the key contains special characters, you need to surround
-          it with double quotes like this: `."foo$"`, or else `.["foo$"]`.
+          If the key contains special characters or starts with a digit,
+          you need to surround it with double quotes like this:
+          `."foo$"`, or else `.["foo$"]`.

          For example `.["foo::bar"]` and `.["foo.bar"]` work while
          `.foo::bar` does not, and `.foo.bar` means `.["foo"].["bar"]`.
@@ -330,8 +340,8 @@ sections:
      - title: "Optional Object Identifier-Index: `.foo?`"
        body: |

-          Just like `.foo`, but does not output even an error when `.`
-          is not an array or an object.
+          Just like `.foo`, but does not output an error when `.` is not an
+          object.

        examples:
          - program: '.foo?'
@@ -347,17 +357,17 @@ sections:
            input: '[1,2]'
            output: ['[]']

-      - title: "Generic Object Index: `.[<string>]`"
+      - title: "Object Index: `.[<string>]`"
        body: |

          You can also look up fields of an object using syntax like
-          `.["foo"]` (.foo above is a shorthand version of this, but
+          `.["foo"]` (`.foo` above is a shorthand version of this, but
          only for identifier-like strings).

-      - title: "Array Index: `.[2]`"
+      - title: "Array Index: `.[<number>]`"
        body: |

-          When the index value is an integer, `.[<value>]` can index
+          When the index value is an integer, `.[<number>]` can index
          arrays.  Arrays are zero-based, so `.[2]` returns the third
          element.

@@ -377,16 +387,16 @@ sections:
            input: '[1,2,3]'
            output: ['2']

-      - title: "Array/String Slice: `.[10:15]`"
+      - title: "Array/String Slice: `.[<number>:<number>]`"
        body: |

-          The `.[10:15]` syntax can be used to return a subarray of an
-          array or substring of a string. The array returned by
-          `.[10:15]` will be of length 5, containing the elements from
-          index 10 (inclusive) to index 15 (exclusive). Either index may
-          be negative (in which case it counts backwards from the end of
-          the array), or omitted (in which case it refers to the start
-          or end of the array).
+          The `.[<number>:<number>]` syntax can be used to return a
+          subarray of an array or substring of a string. The array
+          returned by `.[10:15]` will be of length 5, containing the
+          elements from index 10 (inclusive) to index 15 (exclusive).
+          Either index may be negative (in which case it counts
+          backwards from the end of the array), or omitted (in which
+          case it refers to the start or end of the array).

        examples:
          - program: '.[2:4]'
@@ -644,10 +654,10 @@ sections:
          - **Strings** are added by being joined into a larger string.

          - **Objects** are added by merging, that is, inserting all
-              the key-value pairs from both objects into a single
-              combined object. If both objects contain a value for the
-              same key, the object on the right of the `+` wins. (For
-              recursive merge use the `*` operator.)
+            the key-value pairs from both objects into a single
+            combined object. If both objects contain a value for the
+            same key, the object on the right of the `+` wins. (For
+            recursive merge use the `*` operator.)

          `null` can be added to any value, and returns the other
          value unchanged.
@@ -684,7 +694,7 @@ sections:
            input: '["xml", "yaml", "json"]'
            output: ['["json"]']

-      - title: "Multiplication, division, modulo: `*`, `/`, and `%`"
+      - title: "Multiplication, division, modulo: `*`, `/`, `%`"
        body: |

          These infix operators behave as expected when given two numbers.
@@ -726,16 +736,20 @@ sections:
            codepoints it contains (which will be the same as its
            JSON-encoded length in bytes if it's pure ASCII).

+          - The length of a **number** is its absolute value.
+
          - The length of an **array** is the number of elements.

          - The length of an **object** is the number of key-value pairs.

          - The length of **null** is zero.

+          - It is an error to use `length` on a **boolean**.
+
        examples:
          - program: '.[] | length'
-            input: '[[1,2], "string", {"a":2}, null]'
-            output: [2, 6, 1, 0]
+            input: '[[1,2], "string", {"a":2}, null, -5]'
+            output: [2, 6, 1, 0, 5]


      - title: "`utf8bytelength`"
@@ -811,18 +825,18 @@ sections:
            input: '[2, 0]'
            output: ['[false, true]']

-      - title: "`map(x)`, `map_values(x)`"
+      - title: "`map(f)`, `map_values(f)`"
        body: |

-          For any filter `x`, `map(x)` will run that filter for each
+          For any filter `f`, `map(f)` will run that filter for each
          element of the input array, and return the outputs in a new
          array. `map(.+1)` will increment each element of an array of numbers.

-          Similarly, `map_values(x)` will run that filter for each element,
+          Similarly, `map_values(f)` will run that filter for each element,
          but it will return an object when an object is passed.

-          `map(x)` is equivalent to `[.[] | x]`. In fact, this is how
-          it's defined. Similarly, `map_values(x)` is defined as `.[] |= x`.
+          `map(f)` is equivalent to `[.[] | f]`. In fact, this is how
+          it's defined. Similarly, `map_values(f)` is defined as `.[] |= f`.

        examples:
          - program: 'map(.+1)'
@@ -921,7 +935,7 @@ sections:
            input: '{"a":{"b":1},"x":{"y":2}}'
            output: ['{"a":{},"x":{"y":2}}']

-      - title: "`to_entries`, `from_entries`, `with_entries`"
+      - title: "`to_entries`, `from_entries`, `with_entries(f)`"
        body: |

          These functions convert between an object and an array of
@@ -929,11 +943,11 @@ sections:
          for each `k: v` entry in the input, the output array
          includes `{"key": k, "value": v}`.

-          `from_entries` does the opposite conversion, and
-          `with_entries(foo)` is a shorthand for `to_entries |
-          map(foo) | from_entries`, useful for doing some operation to
-          all keys and values of an object. `from_entries` accepts key, Key,
-          name, Name, value and Value as keys.
+          `from_entries` does the opposite conversion, and `with_entries(f)`
+          is a shorthand for `to_entries | map(f) | from_entries`, useful for
+          doing some operation to all keys and values of an object.
+          `from_entries` accepts `"key"`, `"Key"`, `"name"`, `"Name"`,
+          `"value"`, and `"Value"` as keys.

        examples:
          - program: 'to_entries'
@@ -950,8 +964,8 @@ sections:
      - title: "`select(boolean_expression)`"
        body: |

-          The function `select(foo)` produces its input unchanged if
-          `foo` returns true for that input, and produces no output
+          The function `select(f)` produces its input unchanged if
+          `f` returns true for that input, and produces no output
          otherwise.

          It's useful for filtering lists: `[1,2,3] | map(select(. >= 2))`
@@ -1017,7 +1031,7 @@ sections:
          The given `exit_code` (defaulting to `5`) will be jq's exit
          status.

-          For example, `"Error: somthing went wrong\n"|halt_error(1)`.
+          For example, `"Error: something went wrong\n"|halt_error(1)`.

      - title: "`$__loc__`"
        body: |
@@ -1152,12 +1166,12 @@ sections:
            input: '[{"foo": "bar"}, [{"foo": "baz"}]]'
            output: ['[{"foo": "bar"}, {"foo": "baz"}]']

-      - title: "`range(upto)`, `range(from;upto)` `range(from;upto;by)`"
+      - title: "`range(upto)`, `range(from; upto)`, `range(from; upto; by)`"
        body: |

-          The `range` function produces a range of numbers. `range(4;10)`
+          The `range` function produces a range of numbers. `range(4; 10)`
          produces 6 numbers, from 4 (inclusive) to 10 (exclusive). The numbers
-          are produced as separate outputs. Use `[range(4;10)]` to get a range as
+          are produced as separate outputs. Use `[range(4; 10)]` to get a range as
          an array.

          The one argument form generates numbers from 0 to the given
@@ -1170,22 +1184,22 @@ sections:
          with an increment of `by`.

        examples:
-          - program: 'range(2;4)'
+          - program: 'range(2; 4)'
            input: 'null'
            output: ['2', '3']
-          - program: '[range(2;4)]'
+          - program: '[range(2; 4)]'
            input: 'null'
            output: ['[2,3]']
          - program: '[range(4)]'
            input: 'null'
            output: ['[0,1,2,3]']
-          - program: '[range(0;10;3)]'
+          - program: '[range(0; 10; 3)]'
            input: 'null'
            output: ['[0,3,6,9]']
-          - program: '[range(0;10;-1)]'
+          - program: '[range(0; 10; -1)]'
            input: 'null'
            output: ['[]']
-          - program: '[range(0;-5;-1)]'
+          - program: '[range(0; -5; -1)]'
            input: 'null'
            output: ['[0,-1,-2,-3,-4]']

@@ -1269,7 +1283,7 @@ sections:
            input: 'null'
            output: ['"number"', '"number"']

-      - title: "`sort, sort_by(path_expression)`"
+      - title: "`sort`, `sort_by(path_expression)`"
        body: |

          The `sort` functions sorts its input, which must be an
@@ -1291,8 +1305,8 @@ sections:
          `sort` may be used to sort by a particular field of an
          object, or by applying any jq filter.

-          `sort_by(foo)` compares two elements by comparing the result of
-          `foo` on each element.
+          `sort_by(f)` compares two elements by comparing the result of
+          `f` on each element.

        examples:
          - program: 'sort'
@@ -1735,13 +1749,13 @@ sections:
      - title: "`bsearch(x)`"
        body: |

-          bsearch(x) conducts a binary search for x in the input
+          `bsearch(x)` conducts a binary search for x in the input
          array.  If the input is sorted and contains x, then
-          bsearch(x) will return its index in the array; otherwise, if
+          `bsearch(x)` will return its index in the array; otherwise, if
          the array is sorted, it will return (-1 - ix) where ix is an
          insertion point such that the array would still be sorted
          after the insertion of x at ix.  If the array is not sorted,
-          bsearch(x) will return an integer that is probably of no
+          `bsearch(x)` will return an integer that is probably of no
          interest.

        examples:
@@ -1755,7 +1769,7 @@ sections:
            input: '[1,2,3]'
            output: ['[1,2,3,4]']

-      - title: "String interpolation - `\\(foo)`"
+      - title: "String interpolation: `\\(exp)`"
        body: |

          Inside a string, you can put an expression inside parens
@@ -1771,9 +1785,9 @@ sections:
        body: |

          The `tojson` and `fromjson` builtins dump values as JSON texts
-          or parse JSON texts into values, respectively.  The tojson
-          builtin differs from tostring in that tostring returns strings
-          unmodified, while tojson encodes strings as JSON strings.
+          or parse JSON texts into values, respectively.  The `tojson`
+          builtin differs from `tostring` in that `tostring` returns strings
+          unmodified, while `tojson` encodes strings as JSON strings.

        examples:
          - program: '[.[]|tostring]'
@@ -1865,10 +1879,6 @@ sections:
            input: '"This works if x < y"'
            output: ['"This works if x &lt; y"']

-#          - program: '@html "<span>Anonymous said: \(.)</span>"'
-#            input: '"<script>alert(\"lol hax\");</script>"'
-#            output: ["<span>Anonymous said: &lt;script&gt;alert(&quot;lol hax&quot;);&lt;/script&gt;</span>"]
-
          - program: '@sh "echo \(.)"'
            input: "\"O'Hara's Ale\""
            output: ["\"echo 'O'\\\\''Hara'\\\\''s Ale'\""]
@@ -1913,7 +1923,7 @@ sections:

          The `gmtime` builtin consumes a number of seconds since the
          Unix epoch and outputs a "broken down time" representation of
-          Greenwhich Meridian time as an array of numbers representing
+          Greenwich Mean Time as an array of numbers representing
          (in this order): the year, the month (zero-based), the day of
          the month (one-based), the hour of the day, the minute of the
          hour, the second of the minute, the day of the week, and the
@@ -1961,40 +1971,40 @@ sections:

          jq provides a few SQL-style operators.

-           * INDEX(stream; index_expression):
+          * INDEX(stream; index_expression):

-             This builtin produces an object whose keys are computed by
-             the given index expression applied to each value from the
-             given stream.
+            This builtin produces an object whose keys are computed by
+            the given index expression applied to each value from the
+            given stream.

-           * JOIN($idx; stream; idx_expr; join_expr):
+          * JOIN($idx; stream; idx_expr; join_expr):

-             This builtin joins the values from the given stream to the
-             given index.  The index's keys are computed by applying the
-             given index expression to each value from the given stream.
-             An array of the value in the stream and the corresponding
-             value from the index is fed to the given join expression to
-             produce each result.
+            This builtin joins the values from the given stream to the
+            given index.  The index's keys are computed by applying the
+            given index expression to each value from the given stream.
+            An array of the value in the stream and the corresponding
+            value from the index is fed to the given join expression to
+            produce each result.

-           * JOIN($idx; stream; idx_expr):
+          * JOIN($idx; stream; idx_expr):

-             Same as `JOIN($idx; stream; idx_expr; .)`.
+            Same as `JOIN($idx; stream; idx_expr; .)`.

-           * JOIN($idx; idx_expr):
+          * JOIN($idx; idx_expr):

-             This builtin joins the input `.` to the given index, applying
-             the given index expression to `.` to compute the index key.
-             The join operation is as described above.
+            This builtin joins the input `.` to the given index, applying
+            the given index expression to `.` to compute the index key.
+            The join operation is as described above.

-           * IN(s):
+          * IN(s):

-             This builtin outputs `true` if `.` appears in the given
-             stream, otherwise it outputs `false`.
+            This builtin outputs `true` if `.` appears in the given
+            stream, otherwise it outputs `false`.

-           * IN(source; s):
+          * IN(source; s):

-             This builtin outputs `true` if any value in the source stream
-             appears in the second stream, otherwise it outputs `false`.
+            This builtin outputs `true` if any value in the source stream
+            appears in the second stream, otherwise it outputs `false`.

      - title: "`builtins`"
        body: |
@@ -2012,8 +2022,8 @@ sections:
          The expression 'a == b' will produce 'true' if the result of a and b
          are equal (that is, if they represent equivalent JSON documents) and
          'false' otherwise. In particular, strings are never considered equal
-          to numbers. If you're coming from Javascript, jq's == is like
-          Javascript's === - considering values equal only when they have the
+          to numbers. If you're coming from JavaScript, jq's == is like
+          JavaScript's === - considering values equal only when they have the
          same type as well as the same value.

          != is "not equal", and 'a != b' returns the opposite value of 'a == b'
@@ -2023,7 +2033,7 @@ sections:
            input: '[1, 1.0, "1", "banana"]'
            output: ['true', 'true', 'false', 'false']

-      - title: if-then-else
+      - title: if-then-else-end
        body: |

          `if A then B else C end` will act the same as `B` if `A`
@@ -2031,12 +2041,11 @@ sections:
          as `C` otherwise.

          Checking for false or null is a simpler notion of
-          "truthiness" than is found in Javascript or Python, but it
+          "truthiness" than is found in JavaScript or Python, but it
          means that you'll sometimes have to be more explicit about
-          the condition you want: you can't test whether, e.g. a
+          the condition you want.  You can't test whether, e.g. a
          string is empty using `if .name then A else B end`, you'll
-          need something more like `if (.name | length) > 0 then A else
-          B end` instead.
+          need something more like `if .name == "" then A else B end` instead.

          If the condition `A` produces multiple results, then `B` is evaluated
          once for each result that is not false or null, and `C` is evaluated
@@ -2056,7 +2065,7 @@ sections:
            input: 2
            output: ['"many"']

-      - title: "`>, >=, <=, <`"
+      - title: "`>`, `>=`, `<=`, `<`"
        body: |

          The comparison operators `>`, `>=`, `<=`, `<` return whether
@@ -2071,12 +2080,13 @@ sections:
            input: 2
            output: ['true']

-      - title: and/or/not
+      - title: "`and`, `or`, `not`"
        body: |

-          jq supports the normal Boolean operators and/or/not. They have the
-          same standard of truth as if expressions - false and null are
-          considered "false values", and anything else is a "true value".
+          jq supports the normal Boolean operators `and`, `or`, `not`. They
+          have the same standard of truth as if expressions - `false` and
+          `null` are considered "false values", and anything else is a "true
+          value".

          If an operand of one of these operators produces multiple
          results, the operator itself will produce a result for each input.
@@ -2086,12 +2096,12 @@ sections:
          rather than with special syntax, as in `.foo and .bar |
          not`.

-          These three only produce the values "true" and "false", and
+          These three only produce the values `true` and `false`, and
          so are only useful for genuine Boolean operations, rather
          than the common Perl/Python/Ruby idiom of
          "value_that_may_be_null or default". If you want to use this
          form of "or", picking between two values rather than
-          evaluating a condition, see the "//" operator below.
+          evaluating a condition, see the `//` operator below.

        examples:
          - program: '42 and "a string"'
@@ -2100,9 +2110,6 @@ sections:
          - program: '(true, false) or false'
            input: 'null'
            output: ['true', 'false']
-#          - program: '(true, false) and (true, false)'
-#            input: 'null'
-#            output: ['true', 'false', 'false', 'false']
          - program: '(true, true) and (true, false)'
            input: 'null'
            output: ['true', 'false', 'true', 'false']
@@ -2164,7 +2171,7 @@ sections:
              # Repeat an expression until it raises "break" as an
              # error, then stop repeating without re-raising the error.
              # But if the error caught is not "break" then re-raise it.
-              try repeat(exp) catch .=="break" then empty else error;
+              try repeat(exp) catch if .=="break" then empty else error

          jq has a syntax for named lexical labels to "break" or "go (back) to":

@@ -2193,51 +2200,54 @@ sections:
          The `?` operator, used as `EXP?`, is shorthand for `try EXP`.

        examples:
-          - program: '[.[]|(.a)?]'
+          - program: '[.[] | .a?]'
            input: '[{}, true, {"a":1}]'
            output: ['[null, 1]']
+          - program: '[.[] | tonumber?]'
+            input: '["1", "invalid", "3", 4]'
+            output: ['[1, 3, 4]']

-
-  - title: Regular expressions (PCRE)
+  - title: Regular expressions
    body: |

-      jq uses the Oniguruma regular expression library, as do php,
-      ruby, TextMate, Sublime Text, etc, so the description here
+      jq uses the Oniguruma regular expression library, as do PHP,
+      Ruby, TextMate, Sublime Text, etc, so the description here
      will focus on jq specifics.

      The jq regex filters are defined so that they can be used using
      one of these patterns:

-          STRING | FILTER( REGEX )
-          STRING | FILTER( REGEX; FLAGS )
-          STRING | FILTER( [REGEX] )
-          STRING | FILTER( [REGEX, FLAGS] )
+          STRING | FILTER(REGEX)
+          STRING | FILTER(REGEX; FLAGS)
+          STRING | FILTER([REGEX])
+          STRING | FILTER([REGEX, FLAGS])

      where:
-      * STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation;
-      * REGEX, after string interpolation, should be a valid PCRE regex;
+
+      * STRING, REGEX, and FLAGS are jq strings and subject to jq string interpolation;
+      * REGEX, after string interpolation, should be a valid regular expression;
      * FILTER is one of `test`, `match`, or `capture`, as described below.

      FLAGS is a string consisting of one of more of the supported flags:

      * `g` - Global search (find all matches, not just the first)
      * `i` - Case insensitive search
-      * `m` - Multi line mode ('.' will match newlines)
+      * `m` - Multi line mode (`.` will match newlines)
      * `n` - Ignore empty matches
      * `p` - Both s and m modes are enabled
-      * `s` - Single line mode ('^' -> '\A', '$' -> '\Z')
+      * `s` - Single line mode (`^` -> `\A`, `$` -> `\Z`)
      * `l` - Find longest possible matches
      * `x` - Extended regex format (ignore whitespace and comments)

-      To match whitespace in an x pattern use an escape such as \s, e.g.
+      To match a whitespace with the `x` flag, use `\s`, e.g.

-      * test( "a\\sb", "x" ).
+          jq -n '"a b" | test("a\\sb"; "x")'

      Note that certain flags may also be specified within REGEX, e.g.

-      * jq -n '("test", "TEst", "teST", "TEST") | test( "(?i)te(?-i)st" )'
+          jq -n '("test", "TEst", "teST", "TEST") | test("(?i)te(?-i)st")'

-      evaluates to: true, true, false, false.
+      evaluates to: `true`, `true`, `false`, `false`.

    entries:
      - title: "`test(val)`, `test(regex; flags)`"
@@ -2351,7 +2361,7 @@ sections:
            input: '("ab,cd", "ef, gh")'
            output: ['"ab"', '"cd"', '"ef"', '"gh"']

-      - title: "`sub(regex; tostring)` `sub(regex; string; flags)`"
+      - title: "`sub(regex; tostring)`, `sub(regex; string; flags)`"
        body: |

          Emit the string obtained by replacing the first match of regex in the
@@ -2359,7 +2369,7 @@ sections:
          be a jq string, and may contain references to named captures. The
          named captures are, in effect, presented as a JSON object (as
          constructed by `capture`) to `tostring`, so a reference to a captured
-          variable named "x" would take the form: "\(.x)".
+          variable named "x" would take the form: `"\(.x)"`.

        example:
          - program: 'sub("^[^a-z]*(?<x>[a-z]*).*")'
@@ -2393,7 +2403,7 @@ sections:

      It is also possible to define functions in jq, although this is
      is a feature whose biggest use is defining jq's standard library
-      (many jq functions such as `map` and `find` are in fact written
+      (many jq functions such as `map` and `select` are in fact written
      in jq).

      jq has reduction operators, which are very powerful but a bit
@@ -2443,7 +2453,7 @@ sections:
          fields, and another object which is used to map author usernames to
          real names. Our input looks like:

-              {"posts": [{"title": "Frist psot", "author": "anon"},
+              {"posts": [{"title": "First post", "author": "anon"},
                         {"title": "A well-written article", "author": "person1"}],
               "realnames": {"anon": "Anonymous Coward",
                             "person1": "Person McPherson"}}
@@ -2451,7 +2461,7 @@ sections:
          We want to produce the posts with the author field containing a real
          name, as in:

-              {"title": "Frist psot", "author": "Anonymous Coward"}
+              {"title": "First post", "author": "Anonymous Coward"}
              {"title": "A well-written article", "author": "Person McPherson"}

          We use a variable, $names, to store the realnames object, so that we
@@ -2465,7 +2475,7 @@ sections:
          foreach loop.

          Just as `{foo}` is a handy way of writing `{foo: .foo}`, so
-          `{$foo}` is a handy way of writing `{foo:$foo}`.
+          `{$foo}` is a handy way of writing `{foo: $foo}`.

          Multiple variables may be declared using a single `as` expression by
          providing a pattern that matches the structure of the input
@@ -2512,7 +2522,7 @@ sections:

      - title: 'Destructuring Alternative Operator: `?//`'
        body: |
-        
+
          The destructuring alternative operator provides a concise mechanism
          for destructuring an input that can take one of several forms.

@@ -2521,10 +2531,10 @@ sections:
          the first event for each resource. The API (having been clumsily
          converted from XML) will only wrap the events in an array if the resource
          has multiple events:
-          
+
              {"resources": [{"id": 1, "kind": "widget", "events": {"action": "create", "user_id": 1, "ts": 13}},
                             {"id": 2, "kind": "widget", "events": [{"action": "create", "user_id": 1, "ts": 14}, {"action": "destroy", "user_id": 1, "ts": 15}]}]}
-          
+
          We can use the destructuring alternative operator to handle this structural change simply:

              .resources[] as {$id, $kind, events: {$user_id, $ts}} ?// {$id, $kind, events: [{$user_id, $ts}]} | {$user_id, $kind, $id, $ts}
@@ -2626,9 +2636,9 @@ sections:

          For example, in the following expression there is a binding
          which is visible "to the right" of it, `... | .*3 as
-          $times_three | [.  + $times_three] | ...`, but not "to the
+          $times_three | [. + $times_three] | ...`, but not "to the
          left".  Consider this expression now, `... | (.*3 as
-          $times_three | [.+ $times_three]) | ...`: here the binding
+          $times_three | [. + $times_three]) | ...`: here the binding
          `$times_three` is _not_ visible past the closing parenthesis.

      - title: Reduce
@@ -2970,7 +2980,7 @@ sections:
      and you append something to `.foo`, then `.bar` will not get
      bigger, even if you've previously set `.bar = .foo`.  If you're
      used to programming in languages like Python, Java, Ruby,
-      Javascript, etc. then you can think of it as though jq does a full
+      JavaScript, etc. then you can think of it as though jq does a full
      deep copy of every object before it does the assignment (for
      performance it doesn't actually do that, but that's the general
      idea).
@@ -3007,16 +3017,16 @@ sections:
    entries:
      - title: "Update-assignment: `|=`"
        body: |
-          This is the "update" operator '|='.  It takes a filter on the
+          This is the "update" operator `|=`.  It takes a filter on the
          right-hand side and works out the new value for the property
          of `.` being assigned to by running the old value through this
-          expression. For instance, (.foo, .bar) |= .+1 will build an
+          expression. For instance, `(.foo, .bar) |= .+1` will build an
          object with the "foo" field set to the input's "foo" plus 1,
          and the "bar" field set to the input's "bar" plus 1.

          The left-hand side can be any general path expression; see `path()`.

-          Note that the left-hand side of '|=' refers to a value in `.`.
+          Note that the left-hand side of `|=` refers to a value in `.`.
          Thus `$var.foo |= . + 1` won't work as expected (`$var.foo` is
          not a valid or useful path expression in `.`); use `$var |
          .foo |= . + 1` instead.
@@ -3063,27 +3073,27 @@ sections:

          This example should show the difference between '=' and '|=':

-          Provide input '{"a": {"b": 10}, "b": 20}' to the programs:
+          Provide input `{"a": {"b": 10}, "b": 20}` to the programs:

-          .a = .b
+          `.a = .b`

-          .a |= .b
+          `.a |= .b`

          The former will set the "a" field of the input to the "b"
-          field of the input, and produce the output {"a": 20, "b": 20}.
+          field of the input, and produce the output `{"a": 20, "b": 20}`.
          The latter will set the "a" field of the input to the "a"
-          field's "b" field, producing {"a": 10, "b": 20}.
+          field's "b" field, producing `{"a": 10, "b": 20}`.

-          Another example of the difference between '=' and '|=':
+          Another example of the difference between `=` and `|=`:

-          null|(.a,.b)=range(3)
+          `null|(.a,.b)=range(3)`

-          outputs '{"a":0,"b":0}', '{"a":1,"b":1}', and '{"a":2,"b":2}',
+          outputs `{"a":0,"b":0}, {"a":1,"b":1}, {"a":2,"b":2}`,
          while

-          null|(.a,.b)|=range(3)
+          `null|(.a,.b)|=range(3)`

-          outputs just '{"a":0,"b":0}'.
+          outputs just `{"a":0,"b":0}`.

      - title: Complex assignments
        body: |
@@ -3262,7 +3272,7 @@ sections:
        - color for objects

      The default color scheme is the same as setting
-      `"JQ_COLORS=1;30:0;39:0;39:0;39:0;32:1;39:1;39"`.
+      `"JQ_COLORS=1;30:0;37:0;37:0;37:0;32:1;37:1;37"`.

      This is not a manual for VT100/ANSI escapes.  However, each of
      these color specifications should consist of two numbers separated
@@ -0,0 +1,337 @@
+headline: Tutorial
+body:
+  - text: |
+
+      GitHub has a JSON API, so let's play with that. This URL gets us the last
+      5 commits from the jq repo.
+
+  - command: "curl 'https://api.github.com/repos/jqlang/jq/commits?per_page=5'"
+    result: |
+      [
+        {
+          "sha": "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "node_id": "C_kwDOAE3WVdoAKGNmZjUzMzZlYzcxYjZmZWUzOTZhOTViYjBlNGJlYTM2NWUwY2QxZTg",
+          "commit": {
+            "author": {
+              "name": "Mattias Wadman",
+              "email": "mattias.wadman@gmail.com",
+              "date": "2021-06-09T14:02:22Z"
+            },
+            "committer": {
+              "name": "Nico Williams",
+              "email": "nico@cryptonector.com",
+              "date": "2022-05-26T21:04:32Z"
+            },
+            "message": "docs: Document repeat(exp)",
+            "tree": {
+              "sha": "d67d5542df1f16d1a48e1fb75749f60482cd874b",
+              "url": "https://api.github.com/repos/jqlang/jq/git/trees/d67d5542df1f16d1a48e1fb75749f60482cd874b"
+            },
+            "url": "https://api.github.com/repos/jqlang/jq/git/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+            "comment_count": 0,
+            "verification": {
+              "verified": false,
+              "reason": "unsigned",
+              "signature": null,
+              "payload": null
+            }
+          },
+          "url": "https://api.github.com/repos/jqlang/jq/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "html_url": "https://github.com/jqlang/jq/commit/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "comments_url": "https://api.github.com/repos/jqlang/jq/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8/comments",
+          "author": {
+      ...
+
+  - text: |
+
+      GitHub returns nicely formatted JSON. For servers that don't, it can be
+      helpful to pipe the response through jq to pretty-print it. The simplest
+      jq program is the expression `.`, which takes the input and produces it
+      unchanged as output.
+
+  - command: "curl 'https://api.github.com/repos/jqlang/jq/commits?per_page=5' | jq '.'"
+    result: |
+      [
+        {
+          "sha": "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "node_id": "C_kwDOAE3WVdoAKGNmZjUzMzZlYzcxYjZmZWUzOTZhOTViYjBlNGJlYTM2NWUwY2QxZTg",
+          "commit": {
+            "author": {
+              "name": "Mattias Wadman",
+              "email": "mattias.wadman@gmail.com",
+              "date": "2021-06-09T14:02:22Z"
+            },
+            "committer": {
+              "name": "Nico Williams",
+              "email": "nico@cryptonector.com",
+              "date": "2022-05-26T21:04:32Z"
+            },
+            "message": "docs: Document repeat(exp)",
+            "tree": {
+              "sha": "d67d5542df1f16d1a48e1fb75749f60482cd874b",
+              "url": "https://api.github.com/repos/jqlang/jq/git/trees/d67d5542df1f16d1a48e1fb75749f60482cd874b"
+            },
+            "url": "https://api.github.com/repos/jqlang/jq/git/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+            "comment_count": 0,
+            "verification": {
+              "verified": false,
+              "reason": "unsigned",
+              "signature": null,
+              "payload": null
+            }
+          },
+          "url": "https://api.github.com/repos/jqlang/jq/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "html_url": "https://github.com/jqlang/jq/commit/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "comments_url": "https://api.github.com/repos/jqlang/jq/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8/comments",
+          "author": {
+      ...
+
+  - text: |
+
+      We can use jq to extract just the first commit.
+
+  - command: "curl 'https://api.github.com/repos/jqlang/jq/commits?per_page=5' | jq '.[0]'"
+    result: |
+      {
+        "sha": "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+        "node_id": "C_kwDOAE3WVdoAKGNmZjUzMzZlYzcxYjZmZWUzOTZhOTViYjBlNGJlYTM2NWUwY2QxZTg",
+        "commit": {
+          "author": {
+            "name": "Mattias Wadman",
+            "email": "mattias.wadman@gmail.com",
+            "date": "2021-06-09T14:02:22Z"
+          },
+          "committer": {
+            "name": "Nico Williams",
+            "email": "nico@cryptonector.com",
+            "date": "2022-05-26T21:04:32Z"
+          },
+          "message": "docs: Document repeat(exp)",
+          "tree": {
+            "sha": "d67d5542df1f16d1a48e1fb75749f60482cd874b",
+            "url": "https://api.github.com/repos/jqlang/jq/git/trees/d67d5542df1f16d1a48e1fb75749f60482cd874b"
+          },
+          "url": "https://api.github.com/repos/jqlang/jq/git/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+          "comment_count": 0,
+          "verification": {
+            "verified": false,
+            "reason": "unsigned",
+            "signature": null,
+            "payload": null
+          }
+        },
+        "url": "https://api.github.com/repos/jqlang/jq/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+        "html_url": "https://github.com/jqlang/jq/commit/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8",
+        "comments_url": "https://api.github.com/repos/jqlang/jq/commits/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8/comments",
+        "author": {
+          "login": "wader",
+          "id": 185566,
+          "node_id": "MDQ6VXNlcjE4NTU2Ng==",
+          "avatar_url": "https://avatars.githubusercontent.com/u/185566?v=4",
+          "gravatar_id": "",
+          "url": "https://api.github.com/users/wader",
+          "html_url": "https://github.com/wader",
+          "followers_url": "https://api.github.com/users/wader/followers",
+          "following_url": "https://api.github.com/users/wader/following{/other_user}",
+          "gists_url": "https://api.github.com/users/wader/gists{/gist_id}",
+          "starred_url": "https://api.github.com/users/wader/starred{/owner}{/repo}",
+          "subscriptions_url": "https://api.github.com/users/wader/subscriptions",
+          "organizations_url": "https://api.github.com/users/wader/orgs",
+          "repos_url": "https://api.github.com/users/wader/repos",
+          "events_url": "https://api.github.com/users/wader/events{/privacy}",
+          "received_events_url": "https://api.github.com/users/wader/received_events",
+          "type": "User",
+          "site_admin": false
+        },
+        "committer": {
+          "login": "nicowilliams",
+          "id": 604851,
+          "node_id": "MDQ6VXNlcjYwNDg1MQ==",
+          "avatar_url": "https://avatars.githubusercontent.com/u/604851?v=4",
+          "gravatar_id": "",
+          "url": "https://api.github.com/users/nicowilliams",
+          "html_url": "https://github.com/nicowilliams",
+          "followers_url": "https://api.github.com/users/nicowilliams/followers",
+          "following_url": "https://api.github.com/users/nicowilliams/following{/other_user}",
+          "gists_url": "https://api.github.com/users/nicowilliams/gists{/gist_id}",
+          "starred_url": "https://api.github.com/users/nicowilliams/starred{/owner}{/repo}",
+          "subscriptions_url": "https://api.github.com/users/nicowilliams/subscriptions",
+          "organizations_url": "https://api.github.com/users/nicowilliams/orgs",
+          "repos_url": "https://api.github.com/users/nicowilliams/repos",
+          "events_url": "https://api.github.com/users/nicowilliams/events{/privacy}",
+          "received_events_url": "https://api.github.com/users/nicowilliams/received_events",
+          "type": "User",
+          "site_admin": false
+        },
+        "parents": [
+          {
+            "sha": "f2ad9517c72f6267ae317639ab56bbfd4a8653d4",
+            "url": "https://api.github.com/repos/jqlang/jq/commits/f2ad9517c72f6267ae317639ab56bbfd4a8653d4",
+            "html_url": "https://github.com/jqlang/jq/commit/f2ad9517c72f6267ae317639ab56bbfd4a8653d4"
+          }
+        ]
+      }
+
+  - text: |
+
+      For the rest of the examples, I'll leave out the `curl` command - it's not
+      going to change.
+
+      There's a lot of info we don't care about there, so we'll restrict it down
+      to the most interesting fields.
+
+  - command: "jq '.[0] | {message: .commit.message, name: .commit.committer.name}'"
+    result: |
+      {
+        "message": "docs: Document repeat(exp)",
+        "name": "Nico Williams"
+      }
+
+  - text: |
+
+      The `|` operator in jq feeds the output of one filter (`.[0]` which gets
+      the first element of the array in the response) into the input of another
+      (`{...}` which builds an object out of those fields). You can access
+      nested attributes, such as `.commit.message`.
+
+      Now let's get the rest of the commits.
+
+  - command:  "jq '.[] | {message: .commit.message, name: .commit.committer.name}'"
+    result: |
+      {
+        "message": "docs: Document repeat(exp)",
+        "name": "Nico Williams"
+      }
+      {
+        "message": "Mention -n in IO-section and for input/inputs",
+        "name": "Nico Williams"
+      }
+      {
+        "message": "Fix iterration problem for non decimal string\n\nWhen the string transformation to number failed, all following\ntransformation failed too.\n\nThis happend because status in decNumberFromString function is\nupdated just in error case. Reusing the DEC_CONTEXT that failed\nbefore results into error even if the string is valid number.",
+        "name": "Nico Williams"
+      }
+      {
+        "message": "docs: point to Libera.Chat instead of Freenode",
+        "name": "Nico Williams"
+      }
+      {
+        "message": "Missing \"va_end\" call. This was found by running the cppcheck static analysis where it shows as error.",
+        "name": "Nico Williams"
+      }
+
+  - text: |
+
+      `.[]` returns each element of the array returned in the response, one at a
+      time, which are all fed into
+      `{message: .commit.message, name: .commit.committer.name}`.
+
+      Data in jq is represented as streams of JSON values - every jq
+      expression runs for each value in its input stream, and can
+      produce any number of values to its output stream.
+
+      Streams are serialised by just separating JSON values with
+      whitespace. This is a `cat`-friendly format - you can just join
+      two JSON streams together and get a valid JSON stream.
+
+      If you want to get the output as a single array, you can tell jq to
+      "collect" all of the answers by wrapping the filter in square
+      brackets:
+
+  - command: "jq '[.[] | {message: .commit.message, name: .commit.committer.name}]'"
+    result: |
+      [
+        {
+          "message": "docs: Document repeat(exp)",
+          "name": "Nico Williams"
+        },
+        {
+          "message": "Mention -n in IO-section and for input/inputs",
+          "name": "Nico Williams"
+        },
+        {
+          "message": "Fix iterration problem for non decimal string\n\nWhen the string transformation to number failed, all following\ntransformation failed too.\n\nThis happend because status in decNumberFromString function is\nupdated just in error case. Reusing the DEC_CONTEXT that failed\nbefore results into error even if the string is valid number.",
+          "name": "Nico Williams"
+        },
+        {
+          "message": "docs: point to Libera.Chat instead of Freenode",
+          "name": "Nico Williams"
+        },
+        {
+          "message": "Missing \"va_end\" call. This was found by running the cppcheck static analysis where it shows as error.",
+          "name": "Nico Williams"
+        }
+      ]
+
+  - text: |
+
+      - - -
+
+      Next, let's try getting the URLs of the parent commits out of the
+      API results as well. In each commit, the GitHub API includes information
+      about "parent" commits. There can be one or many.
+
+          "parents": [
+            {
+              "sha": "f2ad9517c72f6267ae317639ab56bbfd4a8653d4",
+              "url": "https://api.github.com/repos/jqlang/jq/commits/f2ad9517c72f6267ae317639ab56bbfd4a8653d4",
+              "html_url": "https://github.com/jqlang/jq/commit/f2ad9517c72f6267ae317639ab56bbfd4a8653d4"
+            }
+          ]
+
+      We want to pull out all of the "html_url" fields inside that array of parent
+      commits and make a simple list of strings to go along with the
+      "message" and "author" fields we already have.
+
+  - command: "jq '[.[] | {message: .commit.message, name: .commit.committer.name, parents: [.parents[].html_url]}]'"
+    result: |
+      [
+        {
+          "message": "docs: Document repeat(exp)",
+          "name": "Nico Williams",
+          "parents": [
+            "https://github.com/jqlang/jq/commit/f2ad9517c72f6267ae317639ab56bbfd4a8653d4"
+          ]
+        },
+        {
+          "message": "Mention -n in IO-section and for input/inputs",
+          "name": "Nico Williams",
+          "parents": [
+            "https://github.com/jqlang/jq/commit/c4d39c4d22f2b12225ca1b311708f7e084ad9ff8"
+          ]
+        },
+        {
+          "message": "Fix iterration problem for non decimal string\n\nWhen the string transformation to number failed, all following\ntransformation failed too.\n\nThis happend because status in decNumberFromString function is\nupdated just in error case. Reusing the DEC_CONTEXT that failed\nbefore results into error even if the string is valid number.",
+          "name": "Nico Williams",
+          "parents": [
+            "https://github.com/jqlang/jq/commit/174db0f93552bdb551ae1f3c5c64744df0ad8e2f"
+          ]
+        },
+        {
+          "message": "docs: point to Libera.Chat instead of Freenode",
+          "name": "Nico Williams",
+          "parents": [
+            "https://github.com/jqlang/jq/commit/29cf77977ef52eec708982b19bf9d2ec17443337"
+          ]
+        },
+        {
+          "message": "Missing \"va_end\" call. This was found by running the cppcheck static analysis where it shows as error.",
+          "name": "Nico Williams",
+          "parents": [
+            "https://github.com/jqlang/jq/commit/55e6e2c21829bd866bd4b18ee254b05c9020320a"
+          ]
+        }
+      ]
+
+  - text: |
+
+      Here we're making an object as before, but this time the `parents`
+      field is being set to `[.parents[].html_url]`, which collects
+      all of the parent commit URLs defined in the parents object.
+
+  - text: |
+
+      - - -
+
+      Here endeth the tutorial! There's lots more to play with. Go
+      read [the manual](../manual/) if you're interested, and [download
+      jq](../download/) if you haven't already.
@@ -0,0 +1,173 @@
+body {
+    padding-top: 80px;
+}
+
+.container {
+    max-width: 970px;
+}
+
+/* index.liquid *******************************************/
+#blurb {
+    padding-top: 40px;
+}
+#blurb p {
+    font-size: 1.9em;
+}
+#blurb .btn-group {
+    margin: 4px;
+}
+
+#multiblurb {
+    line-height: 1.7;
+    text-align: center;
+    font-size: 12pt;
+}
+#multiblurb code {
+    border: 0;
+    font-size: 12pt;
+}
+
+#news {
+    font-size: 12pt;
+}
+#news .date {
+    font-style: italic;
+}
+
+/* default.liquid *****************************************/
+.tutorial-example {
+    position: relative;
+    margin-bottom: 10px;
+}
+.tutorial-example pre {
+    margin-bottom: 0px;
+}
+.tutorial-example a {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    padding: 15px 8px;
+    color: #777777;
+    font-weight: bold;
+    line-height: 10px;
+    font-size: 12px;
+    border-left: 1px solid #DDDDDD;
+    display: block;
+}
+.tutorial-example .accordion-body pre {
+    margin: 0 4px;
+    border-top: 0;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+}
+
+@media print {
+    .tutorial-example a {
+        display: none;
+    }
+}
+/* manual.liquid ******************************************/
+section {
+    padding-top: 24px;
+}
+
+h3 code {
+    border: 0;
+    font-size: 20px;
+}
+
+@media (max-width: 991px) {
+    #navcolumn {
+        /* Put nav column above manual content */
+        position: relative !important;
+        margin-bottom: 60px;
+    }
+}
+@media (min-width: 992px) {
+    #manualcontent {
+        /* Put nav column left of manual content */
+        padding-left: 280px;
+    }
+}
+.nav-pills {
+    margin-bottom: 20px;
+}
+    .nav-pills li a {
+        padding: 8px 12px;
+}
+
+.manual-example table {
+    border-top: 1px solid #E5E5E5;
+}
+.manual-example table td {
+    white-space: pre-wrap;
+    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+}
+.manual-example table td.jqprogram {
+    font-weight: bold;
+}
+.manual-example table th {
+    text-align: right;
+    padding-right: 10px;
+}
+
+@media print {
+    #navcolumn {
+        display: none !important;
+    }
+
+    .manual-example {
+        display: block !important;
+        height: auto !important;
+    }
+
+    .jqplay-btn {
+        display: none !important;
+    }
+}
+/* shared/_footer.liquid **********************************/
+footer {
+    background-color: #F5F5F5;
+    padding: 20px 0;
+    margin-top: 40px;
+    color: #999999;
+    text-align: center;
+}
+footer p {
+    margin: 8px 0;
+}
+
+/* typeahead **********************************************/
+.twitter-typeahead {
+    width: 100%;
+}
+
+.tt-menu {
+    width: 100%;
+    background-color: #fff;
+    padding: 8px 0;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    -webkit-border-radius: 8px;
+    -moz-border-radius: 8px;
+    border-radius: 8px;
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+}
+
+.tt-suggestion {
+    padding: 3px 20px;
+}
+.tt-suggestion:hover {
+    cursor: pointer;
+    color: #fff;
+    background-color: #446e9b;
+}
+.tt-suggestion.tt-cursor {
+    color: #fff;
+    background-color: #446e9b;
+}
+.tt-suggestion p {
+    margin: 0;
+}
@@ -1,9 +1,9 @@
 # The key value pairs found below are available within the templates.

-:url: https://stedolan.github.io/jq
+url: https://jqlang.github.io/jq

 # This line is modified by the Makefile. To change the version number,
 # edit the Autoconf version number at the top of configure.ac
-jq_version: "1.4-2-g15c4a7f-dirty"
+jq_version: "1.6-159-gcff5336-dirty"

 root: '/jq'
@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html lang="en">
-{% include "shared/head" %}
+{% include "shared/_head.html.j2" %}

  <body id="{{slug}}">
-{% include "shared/navbar" %}
+{% include "shared/_navbar.html.j2" %}

    <div class="container">
      <div class="row">
        <h1>{{headline}}</h1>
        {% for item in body %}
          {% if item.text %}
-            {{ item.text | replace: '$JQ_VERSION', jq_version | markdownify }}
+            {{ item.text | replace('$JQ_VERSION', jq_version) | markdownify }}
          {% endif %}

          {% if item.command %}
-            {% capture resultID %}{{ "result" | unique}}{% endcapture %}
+            {% set resultID = unique_id() %}
            <div class="tutorial-example">
              <div class="accordion-heading">
                <pre>{{item.command}}</pre>
-                <a data-toggle="collapse" href="#{{resultID}}">Show result</a>
+                <a data-toggle="collapse" href="#result{{resultID}}">Show result</a>
              </div>
-              <div id="{{resultID}}" class="accordion-body collapse">
+              <div id="result{{resultID}}" class="accordion-body collapse">
                <pre>{{item.result}}</pre>
              </div>
            </div>
@@ -29,6 +29,6 @@
      </div>
    </div>

-{% include "shared/footer" %}
+{% include "shared/_footer.html.j2" %}
  </body>
 </html>
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-{% include "shared/head" %}
+{% include "shared/_head.html.j2" %}

-  <body id="{{slug}}">
-{% include "shared/navbar" %}
+  <body id="{{ slug }}">
+{% include "shared/_navbar.html.j2" %}

    <div class="container">
      <div class="row">
@@ -24,10 +24,10 @@
                      <span class="caret"></span>
                    </a>
                    <ul class="dropdown-menu">
-                      <li><a href="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64">Linux (64-bit)</a></li>
-                      <li><a href="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64">OS X (64-bit)</a></li>
-                      <li><a href="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe">Windows (64-bit)</a></li>
-                      <li><a href="/jq/download/">Other platforms, older versions, and source</a></li>
+                      <li><a href="https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64">Linux (64-bit)</a></li>
+                      <li><a href="https://github.com/jqlang/jq/releases/download/jq-1.6/jq-osx-amd64">macOS (64-bit)</a></li>
+                      <li><a href="https://github.com/jqlang/jq/releases/download/jq-1.6/jq-win64.exe">Windows (64-bit)</a></li>
+                      <li><a href="{{root}}/download/">Other platforms, older versions, and source</a></li>
                    </ul>
                  </div>

@@ -68,6 +68,6 @@
      </div>
    </div>

-{% include "shared/footer" %}
+{% include "shared/_footer.html.j2" %}
  </body>
 </html>
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-{% include "shared/head" %}
+{% include "shared/_head.html.j2" %}

  <body id="{{slug}}" data-spy="scroll" data-target="#navcolumn" data-offset="100">
-{% include "shared/navbar" %}
+{% include "shared/_navbar.html.j2" %}

    <div class="container">
      <div class="row">
@@ -32,41 +32,41 @@
          {% for section in sections %}
            <section id="{{section.title | section_id}}">
              <h2>{{section.title}}</h2>
-              {{section.body | markdownify}}
+              {{ (section.body | markdownify) if section.body }}
              {% for entry in section.entries %}
                <section id="{{entry.title | entry_id}}">
                  <h3>
-                    {{entry.title | markdownify | no_paragraph}}
+                    {{entry.title | markdownify | no_paragraph }}
                    {% if entry.subtitle %}<small>{{entry.subtitle}}</small>{% endif %}
                  </h3>
                  {{entry.body | markdownify}}

                  {% if entry.examples %}
                    <div>
-                      {% capture exampleID %}{{ "" | unique }}{% endcapture %}
+                      {% set exampleID = unique_id() %}
                      <a data-toggle="collapse" href="#example{{exampleID}}">
                        <i class="glyphicon glyphicon-chevron-right"></i>
-                        {% if entry.examples[1] %}Examples{%else%}Example{%endif%}
+                        {% if entry.examples | length > 1 %}Examples{%else%}Example{%endif%}
                      </a>
                      <div id="example{{exampleID}}" class="manual-example collapse">
                        {% for example in entry.examples %}
                          <table>
-                            <tr><th></th><td class="jqprogram">jq '{{example.program | escape}}'</td></tr>
-                            <tr><th>Input</th><td>{{example.input | escape}}</td></tr>
-                            {% unless example.output[0] %}
+                            <tr><th></th><td class="jqprogram">jq '{{ example.program }}'</td></tr>
+                            <tr><th>Input</th><td>{{ example.input }}</td></tr>
+                            {% if not example.output[0] %}
                              <tr>
                                <th>Output</th>
                                <td><i>none</i></td>
                              </tr>
-                            {% endunless %}
+                            {% endif %}
                            {% for output in example.output %}
                              <tr>
-                                {% if forloop.index == 1 %}
+                                {% if loop.first %}
                                  <th>Output</th>
                                {% else %}
                                  <th></th>
                                {% endif %}
-                                <td>{{output | escape}}</td>
+                                <td>{{ output }}</td>
                              </tr>
                            {% endfor %}
                          </table>
@@ -82,15 +82,15 @@
      </div>
    </div>

-{% include "shared/footer" %}
+{% include "shared/_footer.html.j2" %}
    <script>
      var section_map = {
        {% for section in sections %}
          {% for entry in section.entries %}
-            {{entry.title | search_id | json}} : {{entry.title | entry_id | json}},
+            {{entry.title | search_id | tojson }} : {{entry.title | entry_id | tojson }},
          {% endfor %}
-          {{section.title | search_id | json}} : {{section.title | section_id | json}}
-          {% unless forloop.last %},{% endunless %}
+          {{section.title | search_id | tojson }} : {{section.title | section_id | tojson }}
+          {% if not loop.last %},{% endif %}
        {% endfor %}
      };
    </script>
@@ -1,6 +1,6 @@
    <footer>
      <div class="container">
-        <p>This website is made with <a href="http://www.tinytree.info">Bonsai</a> and <a href="http://getbootstrap.com">Bootstrap</a>, themed with <a href="https://bootswatch.com">Bootswatch</a>.</p>
+        <p>This website is made with <a href="http://getbootstrap.com">Bootstrap</a>, themed with <a href="https://bootswatch.com">Bootswatch</a>.</p>
        <p>jq is licensed under the MIT license (code) and the <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a> license (docs).</p>
      </div>
    </footer>
@@ -1,15 +1,15 @@
  <head>
    <script>
-      if ((window.location.host == "stedolan.github.io") && (window.location.protocol != "https:"))
+      if ((window.location.host == "jqlang.github.io") && (window.location.protocol != "https:"))
        window.location.protocol = "https";
    </script>
    <meta charset="utf-8">
    <title>{{headline}}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="canonical" href="{{url}}{{permalink | remove:'/index'}}" />
+    <link rel="canonical" href="{{ url }}/{{ permalink }}" />
    <link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
-    <link rel="stylesheet" href="{{root}}/css/base.css" type="text/css">
+    <link rel="stylesheet" href="{{ root }}/css/base.css" type="text/css">
    <!--[if lt IE 9]>
      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
@@ -13,14 +13,14 @@
        <div class="navbar-collapse collapse" id="nav-collapse">
          <ul class="nav navbar-nav">
            {% for item in navigation %}
-              <li {% if item.permalink == permalink %} class="active" {% endif %}>
-                <a href="{{root}}{{item.permalink}}">{{item.name}}</a>
+              <li {% if item == navitem %} class="active" {% endif %}>
+                <a href="{{root}}/{{item}}/">{{item | capitalize}}</a>
              </li>
            {% endfor %}
-            <li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>
-            <li><a href="https://github.com/stedolan/jq">Source</a></li>
+            <li><a href="https://github.com/jqlang/jq/issues">Issues</a></li>
+            <li><a href="https://github.com/jqlang/jq">Source</a></li>
            <li><a href="https://jqplay.org">Try online!</a></li>
-            <li><a href="https://raw.githubusercontent.com/stedolan/jq/master/NEWS">News</a></li>
+            <li><a href="https://raw.githubusercontent.com/jqlang/jq/master/NEWS">News</a></li>
          </ul>
        </div>
      </div>
@@ -1,7 +1,5 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "JQ" "1" "December 2017" "" ""
+.TH "JQ" "1" "May 2023" "" ""
 .
 .SH "NAME"
 \fBjq\fR \- Command\-line JSON processor
@@ -16,7 +14,7 @@
 \fBjq\fR can accept text input as well, but by default, \fBjq\fR reads a stream of JSON entities (including numbers and other literals) from \fBstdin\fR\. Whitespace is only needed to separate entities such as 1 and 2, and true and false\. One or more \fIfiles\fR may be specified, in which case \fBjq\fR will read input from those instead\.
 .
 .P
-The \fIoptions\fR are described in the \fIINVOKING JQ\fR section; they mostly concern input and output formatting\. The \fIfilter\fR is written in the jq language and specifies how to transform the input file or document\.
+The \fIoptions\fR are described in the [INVOKING JQ] section; they mostly concern input and output formatting\. The \fIfilter\fR is written in the jq language and specifies how to transform the input file or document\.
 .
 .SH "FILTERS"
 A jq program is a "filter": it takes an input, and produces an output\. There are a lot of builtin filters for extracting a particular field of an object, or converting a number to a string, or various other standard tasks\.
@@ -42,64 +40,64 @@ Note: it is important to mind the shell\'s quoting rules\. As a general rule it\
 .P
 You can affect how jq reads and writes its input and output using some command\-line options:
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-version\fR:
 .
 .IP
 Output the jq version and exit with zero\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-seq\fR:
 .
 .IP
 Use the \fBapplication/json\-seq\fR MIME type scheme for separating JSON texts in jq\'s input and output\. This means that an ASCII RS (record separator) character is printed before each value on output and an ASCII LF (line feed) is printed after every output\. Input JSON texts that fail to parse are ignored (but warned about), discarding all subsequent input until the next RS\. This mode also parses the output of jq without the \fB\-\-seq\fR option\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-stream\fR:
 .
 .IP
-Parse the input in streaming fashion, outputing arrays of path and leaf values (scalars and empty arrays or empty objects)\. For example, \fB"a"\fR becomes \fB[[],"a"]\fR, and \fB[[],"a",["b"]]\fR becomes \fB[[0],[]]\fR, \fB[[1],"a"]\fR, and \fB[[1,0],"b"]\fR\.
+Parse the input in streaming fashion, outputting arrays of path and leaf values (scalars and empty arrays or empty objects)\. For example, \fB"a"\fR becomes \fB[[],"a"]\fR, and \fB[[],"a",["b"]]\fR becomes \fB[[0],[]]\fR, \fB[[1],"a"]\fR, and \fB[[2,0],"b"]\fR\.
 .
 .IP
 This is useful for processing very large inputs\. Use this in conjunction with filtering and the \fBreduce\fR and \fBforeach\fR syntax to reduce large inputs incrementally\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-slurp\fR/\fB\-s\fR:
 .
 .IP
 Instead of running the filter for each JSON object in the input, read the entire input stream into a large array and run the filter just once\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-raw\-input\fR/\fB\-R\fR:
 .
 .IP
 Don\'t parse the input as JSON\. Instead, each line of text is passed to the filter as a string\. If combined with \fB\-\-slurp\fR, then the entire input is passed to the filter as a single long string\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-null\-input\fR/\fB\-n\fR:
 .
 .IP
 Don\'t read any input at all! Instead, the filter is run once using \fBnull\fR as the input\. This is useful when using jq as a simple calculator or to construct JSON data from scratch\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-compact\-output\fR / \fB\-c\fR:
 .
 .IP
 By default, jq pretty\-prints JSON output\. Using this option will result in more compact output by instead putting each JSON object on a single line\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-tab\fR:
 .
 .IP
 Use a tab for each indentation level instead of two spaces\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-indent n\fR:
 .
 .IP
-Use the given number of spaces (no more than 8) for indentation\.
+Use the given number of spaces (no more than 7) for indentation\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-color\-output\fR / \fB\-C\fR and \fB\-\-monochrome\-output\fR / \fB\-M\fR:
 .
 .IP
@@ -108,49 +106,61 @@ By default, jq outputs colored JSON if writing to a terminal\. You can force it
 .IP
 Colors can be configured with the \fBJQ_COLORS\fR environment variable (see below)\.
 .
-.IP "\(bu" 4
+.TP
+\fB\-\-binary\fR / \fB\-b\fR:
+.
+.IP
+Windows users using WSL, MSYS2, or Cygwin, should use this option when using a native jq\.exe, otherwise jq will turn newlines (LFs) into carriage\-return\-then\-newline (CRLF)\.
+.
+.TP
 \fB\-\-ascii\-output\fR / \fB\-a\fR:
 .
 .IP
 jq usually outputs non\-ASCII Unicode codepoints as UTF\-8, even if the input specified them as escape sequences (like "\eu03bc")\. Using this option, you can force jq to produce pure ASCII output with every non\-ASCII character replaced with the equivalent escape sequence\.
 .
-.IP "\(bu" 4
-\fB\-\-unbuffered\fR
+.TP
+\fB\-\-unbuffered\fR:
 .
 .IP
 Flush the output after each JSON object is printed (useful if you\'re piping a slow data source into jq and piping jq\'s output elsewhere)\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-sort\-keys\fR / \fB\-S\fR:
 .
 .IP
 Output the fields of each object with the keys in sorted order\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-raw\-output\fR / \fB\-r\fR:
 .
 .IP
 With this option, if the filter\'s result is a string then it will be written directly to standard output rather than being formatted as a JSON string with quotes\. This can be useful for making jq filters talk to non\-JSON\-based systems\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-join\-output\fR / \fB\-j\fR:
 .
 .IP
 Like \fB\-r\fR but jq won\'t print a newline after each output\.
 .
-.IP "\(bu" 4
+.TP
+\fB\-\-nul\-output\fR / \fB\-0\fR:
+.
+.IP
+Like \fB\-r\fR but jq will print NUL instead of newline after each output\. This can be useful when the values being output can contain newlines\.
+.
+.TP
 \fB\-f filename\fR / \fB\-\-from\-file filename\fR:
 .
 .IP
 Read filter from the file rather than from a command line, like awk\'s \-f option\. You can also use \'#\' to make comments\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-Ldirectory\fR / \fB\-L directory\fR:
 .
 .IP
 Prepend \fBdirectory\fR to the search list for modules\. If this option is used then no builtin search list is used\. See the section on modules below\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-e\fR / \fB\-\-exit\-status\fR:
 .
 .IP
@@ -159,7 +169,7 @@ Sets the exit status of jq to 0 if the last output values was neither \fBfalse\f
 .IP
 Another way to set the exit status is with the \fBhalt_error\fR builtin function\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-arg name value\fR:
 .
 .IP
@@ -168,19 +178,25 @@ This option passes a value to the jq program as a predefined variable\. If you r
 .IP
 Named arguments are also available to the jq program as \fB$ARGS\.named\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-argjson name JSON\-text\fR:
 .
 .IP
 This option passes a JSON\-encoded value to the jq program as a predefined variable\. If you run jq with \fB\-\-argjson foo 123\fR, then \fB$foo\fR is available in the program and has the value \fB123\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-slurpfile variable\-name filename\fR:
 .
 .IP
-This option reads all the JSON texts in the named file and binds an array of the parsed JSON values to the given global variable\. If you run jq with \fB\-\-argfile foo bar\fR, then \fB$foo\fR is available in the program and has an array whose elements correspond to the texts in the file named \fBbar\fR\.
+This option reads all the JSON texts in the named file and binds an array of the parsed JSON values to the given global variable\. If you run jq with \fB\-\-slurpfile foo bar\fR, then \fB$foo\fR is available in the program and has an array whose elements correspond to the texts in the file named \fBbar\fR\.
 .
-.IP "\(bu" 4
+.TP
+\fB\-\-rawfile variable\-name filename\fR:
+.
+.IP
+This option reads in the named file and binds its contents to the given global variable\. If you run jq with \fB\-\-rawfile foo bar\fR, then \fB$foo\fR is available in the program and has a string whose contents are to the texts in the file named \fBbar\fR\.
+.
+.TP
 \fB\-\-argfile variable\-name filename\fR:
 .
 .IP
@@ -189,19 +205,19 @@ Do not use\. Use \fB\-\-slurpfile\fR instead\.
 .IP
 (This option is like \fB\-\-slurpfile\fR, but when the file has just one text, then that is used, else an array of texts is used as in \fB\-\-slurpfile\fR\.)
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-args\fR:
 .
 .IP
 Remaining arguments are positional string arguments\. These are available to the jq program as \fB$ARGS\.positional[]\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-jsonargs\fR:
 .
 .IP
 Remaining arguments are positional JSON text arguments\. These are available to the jq program as \fB$ARGS\.positional[]\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-run\-tests [filename]\fR:
 .
 .IP
@@ -210,8 +226,6 @@ Runs the tests in the given file or standard input\. This must be the last optio
 .IP
 Be warned that this option can change backwards\-incompatibly\.
 .
-.IP "" 0
-.
 .SH "BASIC FILTERS"
 .
 .SS "Identity: \."
@@ -220,6 +234,15 @@ The absolute simplest filter is \fB\.\fR \. This is a filter that takes its inpu
 .P
 Since jq by default pretty\-prints all output, this trivial program can be a useful way of formatting JSON output from, say, \fBcurl\fR\.
 .
+.P
+An important point about the identity filter is that it  guarantees to preserve the literal decimal representation  of values\. This is particularly important when dealing with numbers  which can\'t be losslessly converted to an IEEE754 double precision  representation\.
+.
+.P
+jq doesn\'t truncate the literal numbers to double unless there is a need to make arithmetic operations with the number\. Comparisons are carried out over the untruncated big decimal  representation of the number\.
+.
+.P
+jq will also try to maintain the original decimal precision of the provided number literal\. See below for examples\. 
+.
 .IP "" 4
 .
 .nf
@@ -227,6 +250,18 @@ Since jq by default pretty\-prints all output, this trivial program can be a use
 jq \'\.\'
   "Hello, world!"
 => "Hello, world!"
+
+jq \'\. | tojson\'
+   12345678909876543212345
+=> "12345678909876543212345"
+
+jq \'map([\., \. == 1]) | tojson\'
+   [1, 1\.000, 1\.0, 100e\-2]
+=> "[[1,true],[1\.000,true],[1\.0,true],[1\.00,true]]"
+
+jq \'\. as $big | [$big, $big + 1] | map(\. > 10000000000000000000000000000000)\'
+   10000000000000000000000000000001
+=> [true, false]
 .
 .fi
 .
@@ -242,7 +277,7 @@ A filter of the form \fB\.foo\.bar\fR is equivalent to \fB\.foo|\.bar\fR\.
 This syntax only works for simple, identifier\-like keys, that is, keys that are all made of alphanumeric characters and underscore, and which do not start with a digit\.
 .
 .P
-If the key contains special characters, you need to surround it with double quotes like this: \fB\."foo$"\fR, or else \fB\.["foo$"]\fR\.
+If the key contains special characters or starts with a digit, you need to surround it with double quotes like this: \fB\."foo$"\fR, or else \fB\.["foo$"]\fR\.
 .
 .P
 For example \fB\.["foo::bar"]\fR and \fB\.["foo\.bar"]\fR work while \fB\.foo::bar\fR does not, and \fB\.foo\.bar\fR means \fB\.["foo"]\.["bar"]\fR\.
@@ -366,7 +401,7 @@ jq \'\.[]\'

 jq \'\.[]\'
   []
-=>
+=> 

 jq \'\.[]\'
   {"a": 1, "b": 1}
@@ -447,6 +482,12 @@ jq supports the same set of datatypes as JSON \- numbers, strings, booleans, arr
 .P
 Booleans, null, strings and numbers are written the same way as in javascript\. Just like everything else in jq, these simple values take an input and produce an output \- \fB42\fR is a valid jq expression that takes an input, ignores it, and returns 42 instead\.
 .
+.P
+Numbers in jq are internally represented by their IEEE754 double  precision approximation\. Any arithmetic operation with numbers,  whether they are literals or results of previous filters, will  produce a double precision floating point result\.
+.
+.P
+However, when parsing a literal jq will store the original literal string\. If no mutation is applied to this value then it will make to the output in its original form, even if conversion to double  would result in a loss\. 
+.
 .SS "Array construction: []"
 As in JSON, \fB[]\fR is used to construct arrays, as in \fB[1,2,3]\fR\. The elements of the arrays can be any jq expression, including a pipeline\. All of the results produced by all of the expressions are collected into one big array\. You can use it to construct an array out of a known quantity of values (as in \fB[\.foo, \.bar, \.baz]\fR) or to "collect" all the results of a filter into an array (as in \fB[\.items[]\.name]\fR)
 .
@@ -476,10 +517,10 @@ jq \'[ \.[] | \. * 2]\'
 Like JSON, \fB{}\fR is for constructing objects (aka dictionaries or hashes), as in: \fB{"a": 42, "b": 17}\fR\.
 .
 .P
-If the keys are "identifier\-like", then the quotes can be left off, as in \fB{a:42, b:17}\fR\. Keys generated by expressions need to be parenthesized, e\.g\., \fB{("a"+"b"):59}\fR\.
+If the keys are "identifier\-like", then the quotes can be left off, as in \fB{a:42, b:17}\fR\. Variable references as key expressions use the value of the variable as the key\. Key expressions other than constant literals, identifiers, or variable references, need to be parenthesized, e\.g\., \fB{("a"+"b"):59}\fR\.
 .
 .P
-The value can be any expression (although you may need to wrap it in parentheses if it\'s a complicated one), which gets applied to the {} expression\'s input (remember, all filters have an input and an output)\.
+The value can be any expression (although you may need to wrap it in parentheses if, for example, it contains colons), which gets applied to the {} expression\'s input (remember, all filters have an input and an output)\.
 .
 .IP "" 4
 .
@@ -568,6 +609,32 @@ produces
 .nf

 {"stedolan": ["JQ Primer", "More JQ"]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Variable references as keys use the value of the variable as the key\. Without a value then the variable\'s name becomes the key and its value becomes the value,
+.
+.IP "" 4
+.
+.nf
+
+"f o o" as $foo | "b a r" as $bar | {$foo, $bar:$foo}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+produces
+.
+.IP "" 4
+.
+.nf
+
+{"f o o":"f o o","b a r":"f o o"}

 jq \'{user, title: \.titles[]}\'
   {"user":"stedolan","titles":["JQ Primer", "More JQ"]}
@@ -602,6 +669,12 @@ jq \'\.\.|\.a?\'
 .SH "BUILTIN OPERATORS AND FUNCTIONS"
 Some jq operator (for instance, \fB+\fR) do different things depending on the type of their arguments (arrays, numbers, etc\.)\. However, jq never does implicit type conversions\. If you try to add a string to an object you\'ll get an error message and no result\.
 .
+.P
+Please note that all numbers are converted to IEEE754 double precision  floating point representation\. Arithmetic and logical operators are working with these converted doubles\. Results of all such operations are also limited  to the double precision\. 
+.
+.P
+The only exception to this behaviour of number is a snapshot of original number  literal\. When a number which originally was provided as a literal is never mutated until the end of the program then it is printed to the output in its  original literal form\. This also includes cases when the original literal  would be truncated when converted to the IEEE754 double precision floating point number\.
+.
 .SS "Addition: +"
 The operator \fB+\fR takes two filters, applies them both to the same input, and adds the results together\. What "adding" means depends on the types involved:
 .
@@ -720,8 +793,15 @@ The length of an \fBobject\fR is the number of key\-value pairs\.
 .IP "\(bu" 4
 The length of \fBnull\fR is zero\.
 .
-.IP
-jq \'\.[] | length\' [[1,2], "string", {"a":2}, null] => 2, 6, 1, 0
+.IP "" 4
+.
+.nf
+
+jq \'\.[] | length\'
+   [[1,2], "string", {"a":2}, null]
+=> 2, 6, 1, 0
+.
+.fi
 .
 .IP "" 0
 .
@@ -1039,7 +1119,7 @@ Stops the jq program with no further outputs\. The input will be printed on \fBs
 The given \fBexit_code\fR (defaulting to \fB5\fR) will be jq\'s exit status\.
 .
 .P
-For example, \fB"Error: somthing went wrong\en"|halt_error(1)\fR\.
+For example, \fB"Error: something went wrong\en"|halt_error(1)\fR\.
 .
 .SS "$__loc__"
 Produces an object with a "file" key and a "line" key, with the filename and line number where \fB$__loc__\fR occurs, as values\.
@@ -1201,7 +1281,7 @@ jq \'flatten\'
 .
 .IP "" 0
 .
-.SS "range(upto), range(from;upto) range(from;upto;by)"
+.SS "range(upto), range(from;upto), range(from;upto;by)"
 The \fBrange\fR function produces a range of numbers\. \fBrange(4;10)\fR produces 6 numbers, from 4 (inclusive) to 10 (exclusive)\. The numbers are produced as separate outputs\. Use \fB[range(4;10)]\fR to get a range as an array\.
 .
 .P
@@ -1748,6 +1828,24 @@ jq \'[while(\.<100; \.*2)]\'
 .
 .IP "" 0
 .
+.SS "repeat(exp)"
+The \fBrepeat(exp)\fR function allows you to repeatedly apply expression \fBexp\fR to \fB\.\fR until an error is raised\.
+.
+.P
+Note that \fBrepeat(exp)\fR is internally defined as a recursive jq function\. Recursive calls within \fBrepeat\fR will not consume additional memory if \fBexp\fR produces at most one output for each input\. See advanced topics below\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'[repeat(\.*2, error)?]\'
+   1
+=> [2]
+.
+.fi
+.
+.IP "" 0
+.
 .SS "until(cond; next)"
 The \fBuntil(cond; next)\fR function allows you to repeatedly apply the expression \fBnext\fR, initially to \fB\.\fR then to its own output, until \fBcond\fR is true\. For example, this can be used to implement a factorial function (see below)\.
 .
@@ -1893,7 +1991,7 @@ jq \'transpose\'
 .IP "" 0
 .
 .SS "bsearch(x)"
-bsearch(x) conducts a binary search for x in the input array\. If the input is sorted and contains x, then bsearch(x) will return its index in the array; otherwise, if the array is sorted, it will return (\-1 \- ix) where ix is an insertion point such that the array would still be sorted after the insertion of x at ix\. If the array is not sorted, bsearch(x) will return an integer that is probably of no interest\.
+\fBbsearch(x)\fR conducts a binary search for x in the input array\. If the input is sorted and contains x, then \fBbsearch(x)\fR will return its index in the array; otherwise, if the array is sorted, it will return (\-1 \- ix) where ix is an insertion point such that the array would still be sorted after the insertion of x at ix\. If the array is not sorted, \fBbsearch(x)\fR will return an integer that is probably of no interest\.
 .
 .IP "" 4
 .
@@ -1931,7 +2029,7 @@ jq \'"The input was \e(\.), which is one less than \e(\.+1)"\'
 .IP "" 0
 .
 .SS "Convert to/from JSON"
-The \fBtojson\fR and \fBfromjson\fR builtins dump values as JSON texts or parse JSON texts into values, respectively\. The tojson builtin differs from tostring in that tostring returns strings unmodified, while tojson encodes strings as JSON strings\.
+The \fBtojson\fR and \fBfromjson\fR builtins dump values as JSON texts or parse JSON texts into values, respectively\. The \fBtojson\fR builtin differs from \fBtostring\fR in that \fBtostring\fR returns strings unmodified, while \fBtojson\fR encodes strings as JSON strings\.
 .
 .IP "" 4
 .
@@ -2008,7 +2106,7 @@ The input is converted to base64 as specified by RFC 4648\.
 \fB@base64d\fR:
 .
 .IP
-The inverse of \fB@base64\fR, input is decoded as specified by RFC 4648\. Note: If the decoded string is not UTF\-8, the results are undefined\.
+The inverse of \fB@base64\fR, input is decoded as specified by RFC 4648\. Note\e: If the decoded string is not UTF\-8, the results are undefined\.
 .
 .P
 This syntax can be combined with string interpolation in a useful way\. You can follow a \fB@foo\fR token with a string literal\. The contents of the string literal will \fInot\fR be escaped\. However, all interpolations made inside that string literal will be escaped\. For instance,
@@ -2082,7 +2180,7 @@ The \fBnow\fR builtin outputs the current time, in seconds since the Unix epoch\
 Low\-level jq interfaces to the C\-library time functions are also provided: \fBstrptime\fR, \fBstrftime\fR, \fBstrflocaltime\fR, \fBmktime\fR, \fBgmtime\fR, and \fBlocaltime\fR\. Refer to your host operating system\'s documentation for the format strings used by \fBstrptime\fR and \fBstrftime\fR\. Note: these are not necessarily stable interfaces in jq, particularly as to their localization functionality\.
 .
 .P
-The \fBgmtime\fR builtin consumes a number of seconds since the Unix epoch and outputs a "broken down time" representation of Greenwhich Meridian time as an array of numbers representing (in this order): the year, the month (zero\-based), the day of the month (one\-based), the hour of the day, the minute of the hour, the second of the minute, the day of the week, and the day of the year \-\- all one\-based unless otherwise stated\. The day of the week number may be wrong on some systems for dates before March 1st 1900, or after December 31 2099\.
+The \fBgmtime\fR builtin consumes a number of seconds since the Unix epoch and outputs a "broken down time" representation of Greenwich Mean Time as an array of numbers representing (in this order): the year, the month (zero\-based), the day of the month (one\-based), the hour of the day, the minute of the hour, the second of the minute, the day of the week, and the day of the year \-\- all one\-based unless otherwise stated\. The day of the week number may be wrong on some systems for dates before March 1st 1900, or after December 31 2099\.
 .
 .P
 The \fBlocaltime\fR builtin works like the \fBgmtime\fR builtin, but using the local timezone setting\.
@@ -2167,7 +2265,7 @@ Returns a list of all builtin functions in the format \fBname/arity\fR\. Since f
 .SH "CONDITIONALS AND COMPARISONS"
 .
 .SS "==, !="
-The expression \'a == b\' will produce \'true\' if the result of a and b are equal (that is, if they represent equivalent JSON documents) and \'false\' otherwise\. In particular, strings are never considered equal to numbers\. If you\'re coming from Javascript, jq\'s == is like Javascript\'s === \- considering values equal only when they have the same type as well as the same value\.
+The expression \'a == b\' will produce \'true\' if the result of a and b are equal (that is, if they represent equivalent JSON documents) and \'false\' otherwise\. In particular, strings are never considered equal to numbers\. If you\'re coming from JavaScript, jq\'s == is like JavaScript\'s === \- considering values equal only when they have the same type as well as the same value\.
 .
 .P
 != is "not equal", and \'a != b\' returns the opposite value of \'a == b\'
@@ -2188,7 +2286,10 @@ jq \'\.[] == 1\'
 \fBif A then B else C end\fR will act the same as \fBB\fR if \fBA\fR produces a value other than false or null, but act the same as \fBC\fR otherwise\.
 .
 .P
-Checking for false or null is a simpler notion of "truthiness" than is found in Javascript or Python, but it means that you\'ll sometimes have to be more explicit about the condition you want: you can\'t test whether, e\.g\. a string is empty using \fBif \.name then A else B end\fR, you\'ll need something more like \fBif (\.name | length) > 0 then A else B end\fR instead\.
+\fBif A then B end\fR is the same as \fBif A then B else \.  end\fR\. That is, the \fBelse\fR branch is optional, and if absent is the same as \fB\.\fR\.
+.
+.P
+Checking for false or null is a simpler notion of "truthiness" than is found in JavaScript or Python, but it means that you\'ll sometimes have to be more explicit about the condition you want\. You can\'t test whether, e\.g\. a string is empty using \fBif \.name then A else B end\fR, you\'ll need something more like \fBif \.name == "" then A else B end\fR instead\.
 .
 .P
 If the condition \fBA\fR produces multiple results, then \fBB\fR is evaluated once for each result that is not false or null, and \fBC\fR is evaluated once for each false or null\.
@@ -2200,15 +2301,14 @@ More cases can be added to an if using \fBelif A then B\fR syntax\.
 .
 .nf

-jq \'if \. == 0 then
+jq \'if \. == 0 then "zero" elif \. == 1 then "one" else "many" end\'
+   2
+=> "many"
 .
 .fi
 .
 .IP "" 0
 .
-.P
-"zero" elif \. == 1 then "one" else "many" end\' 2 => "many"
-.
 .SS ">, >=, <=, <"
 The comparison operators \fB>\fR, \fB>=\fR, \fB<=\fR, \fB<\fR return whether their left argument is greater than, greater than or equal to, less than or equal to or less than their right argument (respectively)\.
 .
@@ -2413,7 +2513,18 @@ STRING | FILTER( [REGEX, FLAGS] )
 .IP "" 0
 .
 .P
-where: * STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation; * REGEX, after string interpolation, should be a valid PCRE regex; * FILTER is one of \fBtest\fR, \fBmatch\fR, or \fBcapture\fR, as described below\.
+where:
+.
+.IP "\(bu" 4
+STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation;
+.
+.IP "\(bu" 4
+REGEX, after string interpolation, should be a valid PCRE regex;
+.
+.IP "\(bu" 4
+FILTER is one of \fBtest\fR, \fBmatch\fR, or \fBcapture\fR, as described below\.
+.
+.IP "" 0
 .
 .P
 FLAGS is a string consisting of one of more of the supported flags:
@@ -2448,7 +2559,7 @@ FLAGS is a string consisting of one of more of the supported flags:
 To match whitespace in an x pattern use an escape such as \es, e\.g\.
 .
 .IP "\(bu" 4
-test( "a\esb", "x" )\.
+test( "a\e\esb"; "x" )
 .
 .IP "" 0
 .
@@ -2571,7 +2682,7 @@ For backwards compatibility, \fBsplit\fR splits on a string, not a regex\.
 .SS "splits(regex), splits(regex; flags)"
 These provide the same results as their \fBsplit\fR counterparts, but as a stream instead of an array\.
 .
-.SS "sub(regex; tostring) sub(regex; string; flags)"
+.SS "sub(regex; tostring), sub(regex; string; flags)"
 Emit the string obtained by replacing the first match of regex in the input string with \fBtostring\fR, after interpolation\. \fBtostring\fR should be a jq string, and may contain references to named captures\. The named captures are, in effect, presented as a JSON object (as constructed by \fBcapture\fR) to \fBtostring\fR, so a reference to a captured variable named "x" would take the form: "(\.x)"\.
 .
 .SS "gsub(regex; string), gsub(regex; string; flags)"
@@ -2657,7 +2768,7 @@ We use a variable, $names, to store the realnames object, so that we can refer t
 .
 .nf

-\&\.realnames as $names | \.posts[] | {title, author: $names[\.author]}
+\&.realnames as $names | \.posts[] | {title, author: $names[\.author]}
 .
 .fi
 .
@@ -2676,7 +2787,7 @@ Multiple variables may be declared using a single \fBas\fR expression by providi
 .
 .nf

-\&\. as {realnames: $names, posts: [$first, $second]} | \.\.\.
+\&. as {realnames: $names, posts: [$first, $second]} | \.\.\.
 .
 .fi
 .
@@ -2692,7 +2803,7 @@ Variables are scoped over the rest of the expression that defines them, so
 .
 .nf

-\&\.realnames as $names | (\.posts[] | {title, author: $names[\.author]})
+\&.realnames as $names | (\.posts[] | {title, author: $names[\.author]})
 .
 .fi
 .
@@ -2741,6 +2852,87 @@ jq \'\.[] as [$a, $b] | {a: $a, b: $b}\'
 .
 .IP "" 0
 .
+.SS "Destructuring Alternative Operator: ?//"
+The destructuring alternative operator provides a concise mechanism for destructuring an input that can take one of several forms\.
+.
+.P
+Suppose we have an API that returns a list of resources and events associated with them, and we want to get the user_id and timestamp of the first event for each resource\. The API (having been clumsily converted from XML) will only wrap the events in an array if the resource has multiple events:
+.
+.IP "" 4
+.
+.nf
+
+{"resources": [{"id": 1, "kind": "widget", "events": {"action": "create", "user_id": 1, "ts": 13}},
+               {"id": 2, "kind": "widget", "events": [{"action": "create", "user_id": 1, "ts": 14}, {"action": "destroy", "user_id": 1, "ts": 15}]}]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+We can use the destructuring alternative operator to handle this structural change simply:
+.
+.IP "" 4
+.
+.nf
+
+\&.resources[] as {$id, $kind, events: {$user_id, $ts}} ?// {$id, $kind, events: [{$user_id, $ts}]} | {$user_id, $kind, $id, $ts}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Or, if we aren\'t sure if the input is an array of values or an object:
+.
+.IP "" 4
+.
+.nf
+
+\&.[] as [$id, $kind, $user_id, $ts] ?// {$id, $kind, $user_id, $ts} | \.\.\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Each alternative need not define all of the same variables, but all named variables will be available to the subsequent expression\. Variables not matched in the alternative that succeeded will be \fBnull\fR:
+.
+.IP "" 4
+.
+.nf
+
+\&.resources[] as {$id, $kind, events: {$user_id, $ts}} ?// {$id, $kind, events: [{$first_user_id, $first_ts}]} | {$user_id, $first_user_id, $kind, $id, $ts, $first_ts}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Additionally, if the subsequent expression returns an error, the alternative operator will attempt to try the next binding\. Errors that occur during the final alternative are passed through\.
+.
+.IP "" 4
+.
+.nf
+
+[[3]] | \.[] as [$a] ?// [$b] | if $a != null then error("err: \e($a)") else {$a,$b} end
+
+jq \'\.[] as {$a, $b, c: {$d, $e}} ?// {$a, $b, c: [{$d, $e}]} | {$a, $b, $d, $e}\'
+   [{"a": 1, "b": 2, "c": {"d": 3, "e": 4}}, {"a": 1, "b": 2, "c": [{"d": 3, "e": 4}]}]
+=> {"a":1,"b":2,"d":3,"e":4}, {"a":1,"b":2,"d":3,"e":4}
+
+jq \'\.[] as {$a, $b, c: {$d}} ?// {$a, $b, c: [{$e}]} | {$a, $b, $d, $e}\'
+   [{"a": 1, "b": 2, "c": {"d": 3, "e": 4}}, {"a": 1, "b": 2, "c": [{"d": 3, "e": 4}]}]
+=> {"a":1,"b":2,"d":3,"e":null}, {"a":1,"b":2,"d":null,"e":4}
+
+jq \'\.[] as [$a] ?// [$b] | if $a != null then error("err: \e($a)") else {$a,$b} end\'
+   [[3]]
+=> {"a":null,"b":3}
+.
+.fi
+.
+.IP "" 0
+.
 .SS "Defining Functions"
 You can give a filter a name using "def" syntax:
 .
@@ -2836,7 +3028,7 @@ jq \'def addvalue(f): f as $x | map(\. + $x); addvalue(\.[0])\'
 There are two types of symbols in jq: value bindings (a\.k\.a\., "variables"), and functions\. Both are scoped lexically, with expressions being able to refer only to symbols that have been defined "to the left" of them\. The only exception to this rule is that functions can refer to themselves so as to be able to create recursive functions\.
 .
 .P
-For example, in the following expression there is a binding which is visible "to the right" of it, \fB\.\.\. | \.*3 as $times_three | [\. + $times_three] | \.\.\.\fR, but not "to the left"\. Consider this expression now, \fB\.\.\. | (\.*3 as $times_three | [\.+ $times_three]) | \.\.\.\fR: here the binding \fB$times_three\fR is \fInot\fR visible past the closing parenthesis\.
+For example, in the following expression there is a binding which is visible "to the right" of it, \fB\.\.\. | \.*3 as $times_three | [\. + $times_three] | \.\.\.\fR, but not "to the left"\. Consider this expression now, \fB\.\.\. | (\.*3 as $times_three | [\. + $times_three]) | \.\.\.\fR: here the binding \fB$times_three\fR is \fInot\fR visible past the closing parenthesis\.
 .
 .SS "Reduce"
 The \fBreduce\fR syntax in jq allows you to combine all of the results of an expression by accumulating them into a single answer\. As an example, we\'ll pass \fB[3,2,1]\fR to this expression:
@@ -3036,7 +3228,7 @@ Three\-input C math functions: \fBfma\fR\.
 See your system\'s manual for more information on each of these\.
 .
 .SH "I/O"
-At this time jq has minimal support for I/O, mostly in the form of control over when inputs are read\. Two builtins functions are provided for this, \fBinput\fR and \fBinputs\fR, that read from the same sources (e\.g\., \fBstdin\fR, files named on the command\-line) as jq itself\. These two builtins, and jq\'s own reading actions, can be interleaved with each other\.
+At this time jq has minimal support for I/O, mostly in the form of control over when inputs are read\. Two builtins functions are provided for this, \fBinput\fR and \fBinputs\fR, that read from the same sources (e\.g\., \fBstdin\fR, files named on the command\-line) as jq itself\. These two builtins, and jq\'s own reading actions, can be interleaved with each other\. They are commonly used in combination with the null input option \fB\-n\fR to prevent one input from being read implicitly\.
 .
 .P
 Two builtins provide minimal output capabilities, \fBdebug\fR, and \fBstderr\fR\. (Recall that a jq program\'s output values are always output as JSON texts on \fBstdout\fR\.) The \fBdebug\fR builtin can have application\-specific behavior, such as for executables that use the libjq C API but aren\'t the jq executable itself\. The \fBstderr\fR builtin outputs its input in raw mode to stder with no additional decoration, not even a newline\.
@@ -3047,11 +3239,14 @@ Most jq builtins are referentially transparent, and yield constant and repeatabl
 .SS "input"
 Outputs one new input\.
 .
+.P
+Note that when using \fBinput\fR it is generally be necessary to invoke jq with the \-n command\-line option, otherwise the first entity will be lost\.
+.
 .SS "inputs"
 Outputs all remaining inputs, one by one\.
 .
 .P
-This is primarily useful for reductions over a program\'s inputs\.
+This is primarily useful for reductions over a program\'s inputs\. Note that when using \fBinputs\fR it is generally necessary to invoke jq with the \-n command\-line option, otherwise the first entity will be lost\.
 .
 .SS "debug"
 Causes a debug message based on the input value to be produced\. The jq executable wraps the input value with \fB["DEBUG:", <input\-value>]\fR and prints that and a newline on stderr, compactly\. This may change in the future\.
@@ -3129,13 +3324,13 @@ jq \'\. as $dot|fromstream($dot|tostream)|\.==$dot\'
 Assignment works a little differently in jq than in most programming languages\. jq doesn\'t distinguish between references to and copies of something \- two objects or arrays are either equal or not equal, without any further notion of being "the same object" or "not the same object"\.
 .
 .P
-If an object has two fields which are arrays, \fB\.foo\fR and \fB\.bar\fR, and you append something to \fB\.foo\fR, then \fB\.bar\fR will not get bigger, even if you\'ve previously set \fB\.bar = \.foo\fR\. If you\'re used to programming in languages like Python, Java, Ruby, Javascript, etc\. then you can think of it as though jq does a full deep copy of every object before it does the assignment (for performance it doesn\'t actually do that, but that\'s the general idea)\.
+If an object has two fields which are arrays, \fB\.foo\fR and \fB\.bar\fR, and you append something to \fB\.foo\fR, then \fB\.bar\fR will not get bigger, even if you\'ve previously set \fB\.bar = \.foo\fR\. If you\'re used to programming in languages like Python, Java, Ruby, JavaScript, etc\. then you can think of it as though jq does a full deep copy of every object before it does the assignment (for performance it doesn\'t actually do that, but that\'s the general idea)\.
 .
 .P
 This means that it\'s impossible to build circular values in jq (such as an array whose first element is itself)\. This is quite intentional, and ensures that anything a jq program can produce can be represented in JSON\.
 .
 .P
-All the assignment operators in jq have path expressions on the left\-hand side (LHS)\. The right\-hand side (RHS) procides values to set to the paths named by the LHS path expressions\.
+All the assignment operators in jq have path expressions on the left\-hand side (LHS)\. The right\-hand side (RHS) provides values to set to the paths named by the LHS path expressions\.
 .
 .P
 Values in jq are always immutable\. Internally, assignment works by using a reduction to compute new, replacement values for \fB\.\fR that have had all the desired assignments applied to \fB\.\fR, then outputting the modified value\. This might be made clear by this example: \fB{a:{b:{c:1}}} | (\.a\.b|=3), \.\fR\. This will output \fB{"a":{"b":3}}\fR and \fB{"a":{"b":{"c":1}}}\fR because the last sub\-expression, \fB\.\fR, sees the original value, not the modified value\.
@@ -3203,11 +3398,17 @@ This example should show the difference between \'=\' and \'|=\':
 .P
 Provide input \'{"a": {"b": 10}, "b": 20}\' to the programs:
 .
-.P
-\&\.a = \.b
+.IP "" 4
 .
-.P
-\&\.a |= \.b
+.nf
+
+\&.a = \.b
+
+\&.a |= \.b
+.
+.fi
+.
+.IP "" 0
 .
 .P
 The former will set the "a" field of the input to the "b" field of the input, and produce the output {"a": 20, "b": 20}\. The latter will set the "a" field of the input to the "a" field\'s "b" field, producing {"a": 10, "b": 20}\.
@@ -3215,15 +3416,29 @@ The former will set the "a" field of the input to the "b" field of the input, an
 .P
 Another example of the difference between \'=\' and \'|=\':
 .
-.P
+.IP "" 4
+.
+.nf
+
 null|(\.a,\.b)=range(3)
 .
+.fi
+.
+.IP "" 0
+.
 .P
 outputs \'{"a":0,"b":0}\', \'{"a":1,"b":1}\', and \'{"a":2,"b":2}\', while
 .
-.P
+.IP "" 4
+.
+.nf
+
 null|(\.a,\.b)|=range(3)
 .
+.fi
+.
+.IP "" 0
+.
 .P
 outputs just \'{"a":0,"b":0}\'\.
 .
@@ -3234,7 +3449,7 @@ Lots more things are allowed on the left\-hand side of a jq assignment than in m
 .
 .nf

-\&\.posts[0]\.title = "JQ Manual"
+\&.posts[0]\.title = "JQ Manual"
 .
 .fi
 .
@@ -3247,7 +3462,7 @@ What may come as a surprise is that the expression on the left may produce multi
 .
 .nf

-\&\.posts[]\.comments |= \. + ["this is great"]
+\&.posts[]\.comments |= \. + ["this is great"]
 .
 .fi
 .
@@ -3266,7 +3481,7 @@ This is a very powerful operation\. Suppose we wanted to add a comment to blog p
 .
 .nf

-\&\.posts[] | select(\.author == "stedolan")
+\&.posts[] | select(\.author == "stedolan")
 .
 .fi
 .
@@ -3388,7 +3603,7 @@ color for objects
 .IP "" 0
 .
 .P
-The default color scheme is the same as setting \fB"JQ_COLORS=1;30:0;39:0;39:0;39:0;32:1;39:1;39"\fR\.
+The default color scheme is the same as setting \fB"JQ_COLORS=1;30:0;37:0;37:0;37:0;32:1;37:1;37"\fR\.
 .
 .P
 This is not a manual for VT100/ANSI escapes\. However, each of these color specifications should consist of two numbers separated by a semi\-colon, where the first number is one of these:
@@ -3449,7 +3664,7 @@ Presumably\. Report them or discuss them at:
 .
 .nf

-https://github\.com/stedolan/jq/issues
+https://github\.com/jqlang/jq/issues
 .
 .fi
 .
@@ -5,7 +5,7 @@ Name: jq
 Version: %{myver}
 Release: %{myrel}%{?dist}
 Source0: jq-%{myver}.tar.gz
-URL: https://stedolan.github.io/jq
+URL: https://jqlang.github.io/jq
 License: BSD
 AutoReqProv: no
 #BuildPrereq: autoconf, libtool, automake, flex, bison, python
@@ -52,7 +52,6 @@ rm -rf %{buildroot}
 %endif
 %{_datadir}/doc/%{name}/AUTHORS
 %{_datadir}/doc/%{name}/COPYING
-%{_datadir}/doc/%{name}/README
 %{_datadir}/doc/%{name}/README.md
 %{_datadir}/man/man1/jq.1
 %{_includedir}/jq.h
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libjq
+URL: https://jqlang.github.io/jq/
+Description: Library to process JSON using a query language
+Version: @VERSION@
+Libs: -L${libdir} -ljq
+Cflags: -I${includedir}
@@ -0,0 +1,507 @@
+# ===========================================================================
+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also to link with them as well. For example, you might link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threaded programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 27
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_SED])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on Tru64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items with a "," contain both
+# C compiler flags (before ",") and linker flags (after ","). Other items
+# starting with a "-" are C compiler flags, and remaining items are
+# library names, except for "none" which indicates that we try without
+# any flags at all, and "pthread-config" which is a program returning
+# the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case $host_os in
+
+        freebsd*)
+
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
+
+        hpux*)
+
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
+
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
+
+        openedition*)
+
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
+
+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+            [
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            ],
+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+        ;;
+
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
+
+        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
+        ;;
+esac
+
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+# Note that for GCC and Clang -pthread generally implies -lpthread,
+# except when -nostdlib is passed.
+# This is problematic using libtool to build C++ shared libraries with pthread:
+# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
+# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
+# To solve this, first try -pthread together with -lpthread for GCC
+
+AS_IF([test "x$GCC" = "xyes"],
+      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
+
+# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
+
+AS_IF([test "x$ax_pthread_clang" = "xyes"],
+      [ax_pthread_flags="-pthread,-lpthread -pthread"])
+
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
+
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
+
+        *)
+        ax_pthread_check_macro="--"
+        ;;
+esac
+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
+      [ax_pthread_check_cond=0],
+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
+
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                *,*)
+                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
+                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
+                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void *some_global = NULL;
+                        static void routine(void *a)
+                          {
+                             /* To avoid any unused-parameter or
+                                unused-but-set-parameter warning.  */
+                             some_global = a;
+                          }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                    [ac_link="$ax_pthread_2step_ac_link"
+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                         [break])
+                    ])
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            ])
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
+
+fi # $ax_pthread_clang = yes
+
+
+
+# Various other checks:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_CACHE_CHECK([for joinable pthread attribute],
+            [ax_cv_PTHREAD_JOINABLE_ATTR],
+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+                                [])
+             done
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+                                  [Define to necessary symbol if this constant
+                                   uses a non-standard name on your system.])
+               ax_pthread_joinable_attr_defined=yes
+              ])
+
+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"],
+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes])
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT],
+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                             [[int i = PTHREAD_PRIO_INHERIT;
+                                               return i;]])],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+               ax_pthread_prio_inherit_defined=yes
+              ])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                    [#handle absolute path differently from PATH based program lookup
+                     AS_CASE(["x$CC"],
+                         [x/*],
+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
@@ -1,17 +1,18 @@
-#!/bin/sh
+#!/bin/bash

 # This script builds the website from the docs directory of
 # the current branch and copies it over to the gh-pages
 # branch.

-set -eu
-set -o xtrace
+set -eux
+shopt -s dotglob

 # build website
-scriptdir=`dirname "$0"`
+scriptdir=$(dirname "$0")
 cd "$scriptdir"/../docs
 rm -rf output
-rake build
+mkdir output
+pipenv run python3 build_website.py
 cd ..

 # copy to /tmp
@@ -1,10 +1,11 @@
 #!/bin/sh
-set -e
-cd `dirname "$0"`
-if git rev-parse --verify -q jq-1.0 > /dev/null 2>&1; then
-    git describe --tags --match 'jq-*' --dirty | sed 's/^jq-//'
+set -eu
+
+cd "$(dirname "$0")"
+if git describe --tags --match 'jq-*' >/dev/null 2>&1; then
+  git describe --tags --match 'jq-*' --dirty | sed 's/^jq-//'
 else
-    b=`git rev-parse --abbrev-ref HEAD`
-    c=`git describe --always --dirty`
-    echo "${b}-${c}"
+  branch=$(git rev-parse --abbrev-ref HEAD)
+  commit=$(git describe --always --dirty)
+  echo "${branch}-${commit}"
 fi
@@ -1,5 +1,6 @@
-#define _BSD_SOURCE
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
 #ifndef __sun__
 # define _XOPEN_SOURCE
 # define _XOPEN_SOURCE_EXTENDED 1
@@ -90,8 +91,11 @@ static jv f_plus(jq_state *jq, jv input, jv a, jv b) {
    jv_free(b);
    return a;
  } else if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    return jv_number(jv_number_value(a) +
+    jv r = jv_number(jv_number_value(a) +
                     jv_number_value(b));
+    jv_free(a);
+    jv_free(b);
+    return r;
  } else if (jv_get_kind(a) == JV_KIND_STRING && jv_get_kind(b) == JV_KIND_STRING) {
    return jv_string_concat(a, b);
  } else if (jv_get_kind(a) == JV_KIND_ARRAY && jv_get_kind(b) == JV_KIND_ARRAY) {
@@ -103,6 +107,36 @@ static jv f_plus(jq_state *jq, jv input, jv a, jv b) {
  }
 }

+#ifdef __APPLE__
+// macOS has a bunch of libm deprecation warnings, so let's clean those up
+#ifdef HAVE_TGAMMA
+#define gamma tgamma
+#endif
+#ifdef HAVE___EXP10
+#define exp10 __exp10
+#endif
+#ifdef HAVE_REMAINDER
+#define drem remainder
+#endif
+
+// We replace significand with our own, since there's not a rename-replacement
+#ifdef HAVE_FREXP
+#define HAVE_CUSTOM_SIGNIFICAND
+static double __jq_significand(double x) {
+  int z;
+  return 2*frexp(x, &z);
+}
+#define significand __jq_significand
+#elif defined(HAVE_SCALBN) && defined(HAVE_ILOGB)
+#define HAVE_CUSTOM_SIGNIFICAND
+static double __jq_significand(double x) {
+  return scalbn(x, -ilogb(x));
+}
+#define significand __jq_significand
+#endif
+
+#endif // ifdef __APPLE__
+
 #define LIBM_DD(name) \
 static jv f_ ## name(jq_state *jq, jv input) { \
  if (jv_get_kind(input) != JV_KIND_NUMBER) { \
@@ -165,6 +199,14 @@ static jv f_ ## name(jq_state *jq, jv input, jv a, jv b, jv c) { \
 #undef LIBM_DDD
 #undef LIBM_DD

+#ifdef __APPLE__ // Clean up after ourselves
+#undef HAVE_CUSTOM_SIGNIFICAND
+#undef gamma
+#undef drem
+#undef significand
+#undef exp10
+#endif
+
 #ifdef HAVE_FREXP
 static jv f_frexp(jq_state *jq, jv input) {
  if (jv_get_kind(input) != JV_KIND_NUMBER) {
@@ -274,7 +316,10 @@ static jv f_rtrimstr(jq_state *jq, jv input, jv right) {
 static jv f_minus(jq_state *jq, jv input, jv a, jv b) {
  jv_free(input);
  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    return jv_number(jv_number_value(a) - jv_number_value(b));
+    jv r = jv_number(jv_number_value(a) - jv_number_value(b));
+    jv_free(a);
+    jv_free(b);
+    return r;
  } else if (jv_get_kind(a) == JV_KIND_ARRAY && jv_get_kind(b) == JV_KIND_ARRAY) {
    jv out = jv_array();
    jv_array_foreach(a, i, x) {
@@ -302,7 +347,10 @@ static jv f_multiply(jq_state *jq, jv input, jv a, jv b) {
  jv_kind bk = jv_get_kind(b);
  jv_free(input);
  if (ak == JV_KIND_NUMBER && bk == JV_KIND_NUMBER) {
-    return jv_number(jv_number_value(a) * jv_number_value(b));
+    jv r = jv_number(jv_number_value(a) * jv_number_value(b));
+    jv_free(a);
+    jv_free(b);
+    return r;
  } else if ((ak == JV_KIND_STRING && bk == JV_KIND_NUMBER) ||
             (ak == JV_KIND_NUMBER && bk == JV_KIND_STRING)) {
    jv str = a;
@@ -311,18 +359,17 @@ static jv f_multiply(jq_state *jq, jv input, jv a, jv b) {
      str = b;
      num = a;
    }
-    int n;
-    size_t alen = jv_string_length_bytes(jv_copy(str));
-    jv res = str;
-
-    for (n = jv_number_value(num) - 1; n > 0; n--)
-      res = jv_string_append_buf(res, jv_string_value(str), alen);
-
-    jv_free(num);
-    if (n < 0) {
-      jv_free(str);
-      return jv_null();
+    jv res = jv_null();
+    int n = jv_number_value(num);
+    if (n > 0) {
+      size_t alen = jv_string_length_bytes(jv_copy(str));
+      res = jv_string_empty(alen * n);
+      for (; n > 0; n--) {
+        res = jv_string_append_buf(res, jv_string_value(str), alen);
+      }
    }
+    jv_free(str);
+    jv_free(num);
    return res;
  } else if (ak == JV_KIND_OBJECT && bk == JV_KIND_OBJECT) {
    return jv_object_merge_recursive(a, b);
@@ -336,7 +383,10 @@ static jv f_divide(jq_state *jq, jv input, jv a, jv b) {
  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
    if (jv_number_value(b) == 0.0)
      return type_error2(a, b, "cannot be divided because the divisor is zero");
-    return jv_number(jv_number_value(a) / jv_number_value(b));
+    jv r = jv_number(jv_number_value(a) / jv_number_value(b));
+    jv_free(a);
+    jv_free(b);
+    return r;
  } else if (jv_get_kind(a) == JV_KIND_STRING && jv_get_kind(b) == JV_KIND_STRING) {
    return jv_string_split(a, b);
  } else {
@@ -347,9 +397,14 @@ static jv f_divide(jq_state *jq, jv input, jv a, jv b) {
 static jv f_mod(jq_state *jq, jv input, jv a, jv b) {
  jv_free(input);
  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    if ((intmax_t)jv_number_value(b) == 0)
+    intmax_t bi = (intmax_t)jv_number_value(b);
+    if (bi == 0)
      return type_error2(a, b, "cannot be divided (remainder) because the divisor is zero");
-    return jv_number((intmax_t)jv_number_value(a) % (intmax_t)jv_number_value(b));
+    // Check if the divisor is -1 to avoid overflow when the dividend is INTMAX_MIN.
+    jv r = jv_number(bi == -1 ? 0 : (intmax_t)jv_number_value(a) % bi);
+    jv_free(a);
+    jv_free(b);
+    return r;
  } else {
    return type_error2(a, b, "cannot be divided (remainder)");
  }
@@ -440,7 +495,9 @@ static jv f_length(jq_state *jq, jv input) {
  } else if (jv_get_kind(input) == JV_KIND_STRING) {
    return jv_number(jv_string_length_codepoints(input));
  } else if (jv_get_kind(input) == JV_KIND_NUMBER) {
-    return jv_number(fabs(jv_number_value(input)));
+    jv r = jv_number(fabs(jv_number_value(input)));
+    jv_free(input);
+    return r;
  } else if (jv_get_kind(input) == JV_KIND_NULL) {
    jv_free(input);
    return jv_number(0);
@@ -953,7 +1010,7 @@ static jv f_match(jq_state *jq, jv input, jv regex, jv modifiers, jv testmode) {
 }
 #else /* !HAVE_LIBONIG */
 static jv f_match(jq_state *jq, jv input, jv regex, jv modifiers, jv testmode) {
-  return jv_invalid_with_msg(jv_string("jq was compiled without ONIGURUMA regex libary. match/test/sub and related functions are not available."));
+  return jv_invalid_with_msg(jv_string("jq was compiled without ONIGURUMA regex library. match/test/sub and related functions are not available."));
 }
 #endif /* HAVE_LIBONIG */

@@ -1448,7 +1505,7 @@ static jv f_gmtime(jq_state *jq, jv a) {
  jv_free(a);
  tmp = gmtime_r(&secs, &tm);
  if (tmp == NULL)
-    return jv_invalid_with_msg(jv_string("errror converting number of seconds since epoch to datetime"));
+    return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime"));
  a = tm2jv(tmp);
  return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs))));
 }
@@ -1463,7 +1520,7 @@ static jv f_gmtime(jq_state *jq, jv a) {
  jv_free(a);
  tmp = gmtime(&secs);
  if (tmp == NULL)
-    return jv_invalid_with_msg(jv_string("errror converting number of seconds since epoch to datetime"));
+    return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime"));
  a = tm2jv(tmp);
  return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs))));
 }
@@ -1515,6 +1572,10 @@ static jv f_localtime(jq_state *jq, jv a) {
 static jv f_strftime(jq_state *jq, jv a, jv b) {
  if (jv_get_kind(a) == JV_KIND_NUMBER) {
    a = f_gmtime(jq, a);
+    if (!jv_is_valid(a)) {
+      jv_free(b);
+      return a;
+    }
  } else if (jv_get_kind(a) != JV_KIND_ARRAY) {
    return ret_error2(a, b, jv_string("strftime/1 requires parsed datetime inputs"));
  } else if (jv_get_kind(b) != JV_KIND_STRING) {
@@ -1759,13 +1820,13 @@ static const char jq_builtins[] =
 #define LIBM_DDDD_NO(name) "def " #name "(a;b;c): \"Error: " #name "/3 not found at build time\"|error;"
 #include "libm.h"
 #ifndef HAVE_FREXP
-  "def frexp: \"Error: frexp/0 not found found at build time\"|error;"
+  "def frexp: \"Error: frexp/0 not found at build time\"|error;"
 #endif
 #ifndef HAVE_MODF
-  "def modf: \"Error: modf/0 not found found at build time\"|error;"
+  "def modf: \"Error: modf/0 not found at build time\"|error;"
 #endif
 #ifndef HAVE_LGAMMA_R
-  "def lgamma_r: \"Error: lgamma_r/0 not found found at build time\"|error;"
+  "def lgamma_r: \"Error: lgamma_r/0 not found at build time\"|error;"
 #endif
 ;

@@ -1793,7 +1854,6 @@ int builtins_bind(jq_state *jq, block* bb) {
  builtins = gen_cbinding(function_list, sizeof(function_list)/sizeof(function_list[0]), builtins);
  builtins = gen_builtin_list(builtins);

-  *bb = block_bind_incremental(builtins, *bb, OP_IS_CALL_PSEUDO);
-  *bb = block_drop_unreferenced(*bb);
+  *bb = block_bind_referenced(builtins, *bb, OP_IS_CALL_PSEUDO);
  return nerrors;
 }
@@ -11,7 +11,25 @@ def min_by(f): _min_by_impl(map([f]));
 def add: reduce .[] as $x (null; . + $x);
 def del(f): delpaths([path(f)]);
 def _assign(paths; $value): reduce path(paths) as $p (.; setpath($p; $value));
-def _modify(paths; update): reduce path(paths) as $p (.; label $out | (setpath($p; getpath($p) | update) | ., break $out), delpaths([$p]));
+def _modify(paths; update):
+    reduce path(paths) as $p (.;
+        . as $dot
+      | null
+      | label $out
+      | ($dot | getpath($p)) as $v
+      | (
+          (   $$$$v
+            | update
+            | (., break $out) as $v
+            | $$$$dot
+            | setpath($p; $v)
+          ),
+          (
+              $$$$dot
+            | delpaths([$p])
+          )
+        )
+    );
 def map_values(f): .[] |= f;

 # recurse
@@ -32,33 +50,18 @@ def index($i):   indices($i) | .[0];       # TODO: optimize
 def rindex($i):  indices($i) | .[-1:][0];  # TODO: optimize
 def paths: path(recurse(if (type|. == "array" or . == "object") then .[] else empty end))|select(length > 0);
 def paths(node_filter): . as $dot|paths|select(. as $p|$dot|getpath($p)|node_filter);
-def any(generator; condition):
-        [label $out | foreach generator as $i
-                 (false;
-                  if . then break $out elif $i | condition then true else . end;
-                  if . then . else empty end)] | length == 1;
-def any(condition): any(.[]; condition);
-def any: any(.);
-def all(generator; condition):
-        [label $out | foreach generator as $i
-                 (true;
-                  if .|not then break $out elif $i | condition then . else false end;
-                  if .|not then . else empty end)] | length == 0;
-def all(condition): all(.[]; condition);
-def all: all(.);
 def isfinite: type == "number" and (isinfinite | not);
 def arrays: select(type == "array");
 def objects: select(type == "object");
-def iterables: arrays, objects;
+def iterables: select(type|. == "array" or . == "object");
 def booleans: select(type == "boolean");
 def numbers: select(type == "number");
 def normals: select(isnormal);
 def finites: select(isfinite);
 def strings: select(type == "string");
-def nulls: select(type == "null");
+def nulls: select(. == null);
 def values: select(. != null);
-def scalars: select(. == null or . == true or . == false or type == "number" or type == "string");
-def scalars_or_empty: select(. == null or . == true or . == false or type == "number" or type == "string" or ((type=="array" or type=="object") and length==0));
+def scalars: select(type|. != "array" and . != "object");
 def leaf_paths: paths(scalars);
 def join($x): reduce .[] as $i (null;
            (if .==null then "" else .+$x end) +
@@ -153,11 +156,6 @@ def gsub($re; s; flags): sub($re; s; flags + "g");
 def gsub($re; s): sub($re; s; "g");

 ########################################################################
-# range/3, with a `by` expression argument
-def range($init; $upto; $by):
-    def _range:
-        if ($by > 0 and . < $upto) or ($by < 0 and . > $upto) then ., ((.+$by)|_range) else . end;
-    if $by == 0 then $init else $init|_range end | select(($by > 0 and . < $upto) or ($by < 0 and . > $upto));
 # generic iterator/generator
 def while(cond; update):
     def _while:
@@ -171,8 +169,19 @@ def limit($n; exp):
    if $n > 0 then label $out | foreach exp as $item ($n; .-1; $item, if . <= 0 then break $out else empty end)
    elif $n == 0 then empty
    else exp end;
-def isempty(g): 0 == ((label $go | g | (1, break $go)) // 0);
+# range/3, with a `by` expression argument
+def range($init; $upto; $by):
+    if $by > 0 then $init|while(. < $upto; . + $by)
+  elif $by < 0 then $init|while(. > $upto; . + $by)
+  else empty end;
 def first(g): label $out | g | ., break $out;
+def isempty(g): first((g|false), true);
+def all(generator; condition): isempty(generator|condition and empty);
+def any(generator; condition): isempty(generator|condition or empty)|not;
+def all(condition): all(.[]; condition);
+def any(condition): any(.[]; condition);
+def all: all(.[]; .);
+def any: any(.[]; .);
 def last(g): reduce g as $item (null; $item);
 def nth($n; g): if $n < 0 then error("nth doesn't support negative indices") else last(limit($n + 1; g)) end;
 def first: .[0];
@@ -204,7 +213,7 @@ def repeat(exp):
     def _repeat:
         exp, _repeat;
     _repeat;
-def inputs: try repeat(input) catch if .=="break" then empty else .|error end;
+def inputs: try repeat(input) catch if .=="break" then empty else error end;
 # like ruby's downcase - only characters A to Z are affected
 def ascii_downcase:
  explode | map( if 65 <= . and . <= 90 then . + 32  else . end) | implode;
@@ -215,53 +224,28 @@ def ascii_upcase:
 # Streaming utilities
 def truncate_stream(stream):
  . as $n | null | stream | . as $input | if (.[0]|length) > $n then setpath([0];$input[0][$n:]) else empty end;
-def fromstream(i):
-  foreach i as $i (
-    [null, null];
-
-    if ($i | length) == 2 then
-      if ($i[0] | length) == 0 then .
-      else [ ( .[0] | setpath($i[0]; $i[1]) ), .[1] ]
-      end
-    elif ($i[0] | length) == 1 then [ null, .[0] ]
-    else .
-    end;
-
-    if ($i | length) == 1 then
-      if ($i[0] | length) == 1 then .[1]
-      else empty
-      end
-    elif ($i[0] | length) == 0 then $i[1]
-    else empty
-    end
-  );
+def fromstream(i): {x: null, e: false} as $init |
+  # .x = object being built; .e = emit and reset state
+  foreach i as $i ($init
+  ; if .e then $init else . end
+  | if $i|length == 2
+    then setpath(["e"]; $i[0]|length==0) | setpath(["x"]+$i[0]; $i[1])
+    else setpath(["e"]; $i[0]|length==1) end
+  ; if .e then .x else empty end);
 def tostream:
-  {string:true,number:true,boolean:true,null:true} as $leaf_types |
-  . as $dot |
-  if $leaf_types[$dot|type] or length==0 then [[],$dot]
-  else
-    # We really need a _streaming_ form of `keys`.
-    # We can use `range` for arrays, but not for objects.
-    keys_unsorted as $keys |
-    $keys[-1] as $last|
-    ((# for each key
-      $keys[] | . as $key |
-      $dot[$key] | . as $dot |
-      # recurse on each key/value
-      tostream|.[0]|=[$key]+.),
-     # then add the closing marker
-     [[$last]])
-  end;
+  path(def r: (.[]?|r), .; r) as $p |
+  getpath($p) |
+  reduce path(.[]?) as $q ([$p, .]; [$p+$q]);


 # Assuming the input array is sorted, bsearch/1 returns
 # the index of the target if the target is in the input array; and otherwise
 #  (-1 - ix), where ix is the insertion point that would leave the array sorted.
 # If the input is not sorted, bsearch will terminate but with irrelevant results.
-def bsearch(target):
+def bsearch($target):
  if length == 0 then -1
  elif length == 1 then
-     if target == .[0] then 0 elif target < .[0] then -1 else -2 end
+     if $target == .[0] then 0 elif $target < .[0] then -1 else -2 end
  else . as $in
    # state variable: [start, end, answer]
    # where start and end are the upper and lower offsets to use.
@@ -271,14 +255,14 @@ def bsearch(target):
             else
               ( ( (.[1] + .[0]) / 2 ) | floor ) as $mid
               | $in[$mid] as $monkey
-               | if $monkey == target  then (.[2] = $mid)   # success
+               | if $monkey == $target  then (.[2] = $mid)   # success
                 elif .[0] == .[1]     then (.[1] = -1)     # failure
-                 elif $monkey < target then (.[0] = ($mid + 1))
+                 elif $monkey < $target then (.[0] = ($mid + 1))
                 else (.[1] = ($mid - 1))
                 end
             end )
    | if .[2] == null then          # compute the insertion point
-         if $in[ .[0] ] < target then (-2 -.[0])
+         if $in[ .[0] ] < $target then (-2 -.[0])
         else (-1 -.[0])
         end
      else .[2]
@@ -297,11 +281,7 @@ def walk(f):

 # SQL-ish operators here:
 def INDEX(stream; idx_expr):
-  reduce stream as $row ({};
-    .[$row|idx_expr|
-      if type != "string" then tojson
-      else .
-      end] |= $row);
+  reduce stream as $row ({}; .[$row|idx_expr|tostring] = $row);
 def INDEX(idx_expr): INDEX(.[]; idx_expr);
 def JOIN($idx; idx_expr):
  [.[] | [., $idx[idx_expr]]];
@@ -309,5 +289,5 @@ def JOIN($idx; stream; idx_expr):
  stream | [., $idx[idx_expr]];
 def JOIN($idx; stream; idx_expr; join_expr):
  stream | [., $idx[idx_expr]] | join_expr;
-def IN(s): reduce (first(select(. == s)) | true) as $v (false; if . or $v then true else false end);
-def IN(src; s): reduce (src|IN(s)) as $v (false; if . or $v then true else false end);
+def IN(s): any(s == .; .);
+def IN(src; s): any(src == s; .);
@@ -290,18 +290,6 @@ int block_has_only_binders(block binders, int bindflags) {
  return 1;
 }

-// Count a binder's (function) formal params
-static int block_count_formals(block b) {
-  int args = 0;
-  if (b.first->op == CLOSURE_CREATE_C)
-    return b.first->imm.cfunc->nargs - 1;
-  for (inst* i = b.first->arglist.first; i; i = i->next) {
-    assert(i->op == CLOSURE_PARAM);
-    args++;
-  }
-  return args;
-}
-
 // Count a call site's actual params
 static int block_count_actuals(block b) {
  int args = 0;
@@ -326,8 +314,6 @@ static int block_bind_subblock_inner(int* any_unbound, block binder, block body,
  assert(break_distance >= 0);

  binder.first->bound_by = binder.first;
-  if (binder.first->nformals == -1)
-    binder.first->nformals = block_count_formals(binder);
  int nrefs = 0;
  for (inst* i = body.first; i; i = i->next) {
    if (i->any_unbound == 0)
@@ -341,8 +327,6 @@ static int block_bind_subblock_inner(int* any_unbound, block binder, block body,
          break_distance <= 3 && (i->symbol[1] == '1' + break_distance) &&
          i->symbol[2] == '\0'))) {
      // bind this instruction
-      if (i->op == CALL_JQ && i->nactuals == -1)
-        i->nactuals = block_count_actuals(i->arglist);
      if (i->nactuals == -1 || i->nactuals == binder.first->nformals) {
        i->bound_by = binder.first;
        nrefs++;
@@ -400,7 +384,7 @@ block block_bind_library(block binder, block body, int bindflags, const char *li
    matchlen += 2;
  }
  assert(block_has_only_binders(binder, bindflags));
-  for (inst *curr = binder.first; curr; curr = curr->next) {
+  for (inst *curr = binder.last; curr; curr = curr->prev) {
    int bindflags2 = bindflags;
    char* cname = curr->symbol;
    char* tname = jv_mem_alloc(strlen(curr->symbol)+matchlen+1);
@@ -421,20 +405,6 @@ block block_bind_library(block binder, block body, int bindflags, const char *li
  return body; // We don't return a join because we don't want those sticking around...
 }

-// Bind binder to body, then throw it away if not referenced.
-block block_bind_referenced(block binder, block body, int bindflags) {
-  assert(block_is_single(binder));
-  assert(block_has_only_binders(binder, bindflags));
-  bindflags |= OP_HAS_BINDING;
-
-  if (block_bind_subblock(binder, body, bindflags, 0) == 0) {
-    block_free(binder);
-  } else {
-    body = BLOCK(binder, body);
-  }
-  return body;
-}
-
 static inst* block_take_last(block* b) {
  inst* i = b->last;
  if (i == 0)
@@ -450,15 +420,20 @@ static inst* block_take_last(block* b) {
  return i;
 }

-// Binds a sequence of binders, which *must not* alrady be bound to each other,
+// Binds a sequence of binders, which *must not* already be bound to each other,
 // to body, throwing away unreferenced defs
-block block_bind_incremental(block binder, block body, int bindflags) {
+block block_bind_referenced(block binder, block body, int bindflags) {
  assert(block_has_only_binders(binder, bindflags));
  bindflags |= OP_HAS_BINDING;

  inst* curr;
  while ((curr = block_take_last(&binder))) {
-    body = block_bind_referenced(inst_block(curr), body, bindflags);
+    block b = inst_block(curr);
+    if (block_bind_subblock(b, body, bindflags, 0) == 0) {
+      block_free(b);
+    } else {
+      body = BLOCK(b, body);
+    }
  }
  return body;
 }
@@ -503,7 +478,7 @@ block block_drop_unreferenced(block body) {
    if (curr->bound_by == curr && !curr->referenced) {
      inst_free(curr);
    } else {
-      refd = BLOCK(inst_block(curr), refd);
+      refd = BLOCK(refd, inst_block(curr));
    }
  }
  return refd;
@@ -539,6 +514,7 @@ jv block_list_funcs(block body, int omit_underscores) {
 }

 block gen_module(block metadata) {
+  assert(block_is_const(metadata) && block_const_kind(metadata) == JV_KIND_OBJECT);
  inst* i = inst_new(MODULEMETA);
  i->imm.constant = block_const(metadata);
  if (jv_get_kind(i->imm.constant) != JV_KIND_OBJECT)
@@ -575,7 +551,10 @@ block gen_import_meta(block import, block metadata) {

 block gen_function(const char* name, block formals, block body) {
  inst* i = inst_new(CLOSURE_CREATE);
+  int nformals = 0;
  for (inst* i = formals.last; i; i = i->prev) {
+    nformals++;
+    i->nformals = 0;
    if (i->op == CLOSURE_PARAM_REGULAR) {
      i->op = CLOSURE_PARAM;
      body = gen_var_binding(gen_call(i->symbol, gen_noop()), i->symbol, body);
@@ -585,6 +564,7 @@ block gen_function(const char* name, block formals, block body) {
  i->subfn = body;
  i->symbol = strdup(name);
  i->any_unbound = -1;
+  i->nformals = nformals;
  i->arglist = formals;
  block b = inst_block(i);
  block_bind_subblock(b, b, OP_IS_CALL_PSEUDO | OP_HAS_BINDING, 0);
@@ -606,6 +586,7 @@ block gen_lambda(block body) {
 block gen_call(const char* name, block args) {
  block b = gen_op_unbound(CALL_JQ, name);
  b.first->arglist = args;
+  b.first->nactuals = block_count_actuals(b.first->arglist);
  return b;
 }

@@ -1058,7 +1039,7 @@ block gen_try_handler(block handler) {
  return gen_cond(// `if type=="object" and .__jq
                  gen_and(gen_call("_equal",
                                   BLOCK(gen_lambda(gen_const(jv_string("object"))),
-                                         gen_lambda(gen_noop()))),
+                                         gen_lambda(gen_call("type", gen_noop())))),
                          BLOCK(gen_subexp(gen_const(jv_string("__jq"))),
                                gen_noop(),
                                gen_op_simple(INDEX))),
@@ -1115,7 +1096,8 @@ block gen_cbinding(const struct cfunction* cfunctions, int ncfunctions, block co
  for (int cfunc=0; cfunc<ncfunctions; cfunc++) {
    inst* i = inst_new(CLOSURE_CREATE_C);
    i->imm.cfunc = &cfunctions[cfunc];
-    i->symbol = strdup(i->imm.cfunc->name);
+    i->symbol = strdup(cfunctions[cfunc].name);
+    i->nformals = cfunctions[cfunc].nargs - 1;
    i->any_unbound = 0;
    code = BLOCK(inst_block(i), code);
  }
@@ -1183,7 +1165,7 @@ static int expand_call_arglist(block* b, jv args, jv *env) {
        else if (curr->op == LOADV)
          locfile_locate(curr->locfile, curr->source, "jq: error: $%s is not defined", curr->symbol);
        else
-          locfile_locate(curr->locfile, curr->source, "jq: error: %s/%d is not defined", curr->symbol, block_count_actuals(curr->arglist));
+          locfile_locate(curr->locfile, curr->source, "jq: error: %s/%d is not defined", curr->symbol, curr->nactuals);
        errors++;
        // don't process this instruction if it's not well-defined
        ret = BLOCK(ret, inst_block(curr));
@@ -74,7 +74,6 @@ int block_is_funcdef(block b);
 int block_is_single(block b);
 block block_bind_library(block binder, block body, int bindflags, const char* libname);
 block block_bind_referenced(block binder, block body, int bindflags);
-block block_bind_incremental(block binder, block body, int bindflags);
 block block_bind_self(block binder, int bindflags);
 block block_drop_unreferenced(block body);

@@ -88,7 +87,7 @@ void block_free(block);


 // Here's some horrible preprocessor gunk so that code
-// sequences can be contructed as BLOCK(block1, block2, block3)
+// sequences can be constructed as BLOCK(block1, block2, block3)

 #define BLOCK_1(b1) (b1)
 #define BLOCK_2(b1,b2) (block_join((b1),(b2)))
@@ -0,0 +1,45 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></meta>
+<title>ICU License - ICU 1.8.1 and later</title>
+</head>
+
+<body>
+<h1>ICU License - ICU 1.8.1 and later</h1>
+<pre>
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2005 International Business Machines Corporation and others
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+--------------------------------------------------------------------------------
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
+</pre>
+</body>
+</html>
@@ -0,0 +1,437 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Context module                                             */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2009.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises the routines for handling arithmetic         */
+/* context structures.                                                */
+/* ------------------------------------------------------------------ */
+
+#include <string.h>           // for strcmp
+#include <stdio.h>            // for printf if DECCHECK
+#include "decContext.h"       // context and base types
+#include "decNumberLocal.h"   // decNumber local types, etc.
+
+/* compile-time endian tester [assumes sizeof(Int)>1] */
+static  const  Int mfcone=1;                       // constant 1
+static  const  Flag *mfctop=(const Flag *)&mfcone; // -> top byte
+#define LITEND *mfctop        // named flag; 1=little-endian
+
+/* ------------------------------------------------------------------ */
+/* round-for-reround digits                                           */
+/* ------------------------------------------------------------------ */
+const uByte DECSTICKYTAB[10]={1,1,2,3,4,6,6,7,8,9}; /* used if sticky */
+
+/* ------------------------------------------------------------------ */
+/* Powers of ten (powers[n]==10**n, 0<=n<=9)                          */
+/* ------------------------------------------------------------------ */
+const uInt DECPOWERS[10]={1, 10, 100, 1000, 10000, 100000, 1000000,
+                          10000000, 100000000, 1000000000};
+
+/* ------------------------------------------------------------------ */
+/* decContextClearStatus -- clear bits in current status              */
+/*                                                                    */
+/*  context is the context structure to be queried                    */
+/*  mask indicates the bits to be cleared (the status bit that        */
+/*    corresponds to each 1 bit in the mask is cleared)               */
+/*  returns context                                                   */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decContext *decContextClearStatus(decContext *context, uInt mask) {
+  context->status&=~mask;
+  return context;
+  } // decContextClearStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextDefault -- initialize a context structure                */
+/*                                                                    */
+/*  context is the structure to be initialized                        */
+/*  kind selects the required set of default values, one of:          */
+/*      DEC_INIT_BASE       -- select ANSI X3-274 defaults            */
+/*      DEC_INIT_DECIMAL32  -- select IEEE 754 defaults, 32-bit       */
+/*      DEC_INIT_DECIMAL64  -- select IEEE 754 defaults, 64-bit       */
+/*      DEC_INIT_DECIMAL128 -- select IEEE 754 defaults, 128-bit      */
+/*      For any other value a valid context is returned, but with     */
+/*      Invalid_operation set in the status field.                    */
+/*  returns a context structure with the appropriate initial values.  */
+/* ------------------------------------------------------------------ */
+decContext * decContextDefault(decContext *context, Int kind) {
+  // set defaults...
+  context->digits=9;                         // 9 digits
+  context->emax=DEC_MAX_EMAX;                // 9-digit exponents
+  context->emin=DEC_MIN_EMIN;                // .. balanced
+  context->round=DEC_ROUND_HALF_UP;          // 0.5 rises
+  context->traps=DEC_Errors;                 // all but informational
+  context->status=0;                         // cleared
+  context->clamp=0;                          // no clamping
+  #if DECSUBSET
+  context->extended=0;                       // cleared
+  #endif
+  switch (kind) {
+    case DEC_INIT_BASE:
+      // [use defaults]
+      break;
+    case DEC_INIT_DECIMAL32:
+      context->digits=7;                     // digits
+      context->emax=96;                      // Emax
+      context->emin=-95;                     // Emin
+      context->round=DEC_ROUND_HALF_EVEN;    // 0.5 to nearest even
+      context->traps=0;                      // no traps set
+      context->clamp=1;                      // clamp exponents
+      #if DECSUBSET
+      context->extended=1;                   // set
+      #endif
+      break;
+    case DEC_INIT_DECIMAL64:
+      context->digits=16;                    // digits
+      context->emax=384;                     // Emax
+      context->emin=-383;                    // Emin
+      context->round=DEC_ROUND_HALF_EVEN;    // 0.5 to nearest even
+      context->traps=0;                      // no traps set
+      context->clamp=1;                      // clamp exponents
+      #if DECSUBSET
+      context->extended=1;                   // set
+      #endif
+      break;
+    case DEC_INIT_DECIMAL128:
+      context->digits=34;                    // digits
+      context->emax=6144;                    // Emax
+      context->emin=-6143;                   // Emin
+      context->round=DEC_ROUND_HALF_EVEN;    // 0.5 to nearest even
+      context->traps=0;                      // no traps set
+      context->clamp=1;                      // clamp exponents
+      #if DECSUBSET
+      context->extended=1;                   // set
+      #endif
+      break;
+
+    default:                                 // invalid Kind
+      // use defaults, and ..
+      decContextSetStatus(context, DEC_Invalid_operation); // trap
+    }
+
+  return context;} // decContextDefault
+
+/* ------------------------------------------------------------------ */
+/* decContextGetRounding -- return current rounding mode              */
+/*                                                                    */
+/*  context is the context structure to be queried                    */
+/*  returns the rounding mode                                         */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+enum rounding decContextGetRounding(decContext *context) {
+  return context->round;
+  } // decContextGetRounding
+
+/* ------------------------------------------------------------------ */
+/* decContextGetStatus -- return current status                       */
+/*                                                                    */
+/*  context is the context structure to be queried                    */
+/*  returns status                                                    */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decContextGetStatus(decContext *context) {
+  return context->status;
+  } // decContextGetStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextRestoreStatus -- restore bits in current status          */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  newstatus is the source for the bits to be restored               */
+/*  mask indicates the bits to be restored (the status bit that       */
+/*    corresponds to each 1 bit in the mask is set to the value of    */
+/*    the correspnding bit in newstatus)                              */
+/*  returns context                                                   */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decContext *decContextRestoreStatus(decContext *context,
+                                    uInt newstatus, uInt mask) {
+  context->status&=~mask;               // clear the selected bits
+  context->status|=(mask&newstatus);    // or in the new bits
+  return context;
+  } // decContextRestoreStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextSaveStatus -- save bits in current status                */
+/*                                                                    */
+/*  context is the context structure to be queried                    */
+/*  mask indicates the bits to be saved (the status bits that         */
+/*    correspond to each 1 bit in the mask are saved)                 */
+/*  returns the AND of the mask and the current status                */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decContextSaveStatus(decContext *context, uInt mask) {
+  return context->status&mask;
+  } // decContextSaveStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextSetRounding -- set current rounding mode                 */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  newround is the value which will replace the current mode         */
+/*  returns context                                                   */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decContext *decContextSetRounding(decContext *context,
+                                  enum rounding newround) {
+  context->round=newround;
+  return context;
+  } // decContextSetRounding
+
+/* ------------------------------------------------------------------ */
+/* decContextSetStatus -- set status and raise trap if appropriate    */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  status  is the DEC_ exception code                                */
+/*  returns the context structure                                     */
+/*                                                                    */
+/* Control may never return from this routine, if there is a signal   */
+/* handler and it takes a long jump.                                  */
+/* ------------------------------------------------------------------ */
+decContext * decContextSetStatus(decContext *context, uInt status) {
+  context->status|=status;
+  if (status & context->traps) raise(SIGFPE);
+  return context;} // decContextSetStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextSetStatusFromString -- set status from a string + trap   */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  string is a string exactly equal to one that might be returned    */
+/*            by decContextStatusToString                             */
+/*                                                                    */
+/*  The status bit corresponding to the string is set, and a trap     */
+/*  is raised if appropriate.                                         */
+/*                                                                    */
+/*  returns the context structure, unless the string is equal to      */
+/*    DEC_Condition_MU or is not recognized.  In these cases NULL is  */
+/*    returned.                                                       */
+/* ------------------------------------------------------------------ */
+decContext * decContextSetStatusFromString(decContext *context,
+                                           const char *string) {
+  if (strcmp(string, DEC_Condition_CS)==0)
+    return decContextSetStatus(context, DEC_Conversion_syntax);
+  if (strcmp(string, DEC_Condition_DZ)==0)
+    return decContextSetStatus(context, DEC_Division_by_zero);
+  if (strcmp(string, DEC_Condition_DI)==0)
+    return decContextSetStatus(context, DEC_Division_impossible);
+  if (strcmp(string, DEC_Condition_DU)==0)
+    return decContextSetStatus(context, DEC_Division_undefined);
+  if (strcmp(string, DEC_Condition_IE)==0)
+    return decContextSetStatus(context, DEC_Inexact);
+  if (strcmp(string, DEC_Condition_IS)==0)
+    return decContextSetStatus(context, DEC_Insufficient_storage);
+  if (strcmp(string, DEC_Condition_IC)==0)
+    return decContextSetStatus(context, DEC_Invalid_context);
+  if (strcmp(string, DEC_Condition_IO)==0)
+    return decContextSetStatus(context, DEC_Invalid_operation);
+  #if DECSUBSET
+  if (strcmp(string, DEC_Condition_LD)==0)
+    return decContextSetStatus(context, DEC_Lost_digits);
+  #endif
+  if (strcmp(string, DEC_Condition_OV)==0)
+    return decContextSetStatus(context, DEC_Overflow);
+  if (strcmp(string, DEC_Condition_PA)==0)
+    return decContextSetStatus(context, DEC_Clamped);
+  if (strcmp(string, DEC_Condition_RO)==0)
+    return decContextSetStatus(context, DEC_Rounded);
+  if (strcmp(string, DEC_Condition_SU)==0)
+    return decContextSetStatus(context, DEC_Subnormal);
+  if (strcmp(string, DEC_Condition_UN)==0)
+    return decContextSetStatus(context, DEC_Underflow);
+  if (strcmp(string, DEC_Condition_ZE)==0)
+    return context;
+  return NULL;  // Multiple status, or unknown
+  } // decContextSetStatusFromString
+
+/* ------------------------------------------------------------------ */
+/* decContextSetStatusFromStringQuiet -- set status from a string     */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  string is a string exactly equal to one that might be returned    */
+/*            by decContextStatusToString                             */
+/*                                                                    */
+/*  The status bit corresponding to the string is set; no trap is     */
+/*  raised.                                                           */
+/*                                                                    */
+/*  returns the context structure, unless the string is equal to      */
+/*    DEC_Condition_MU or is not recognized.  In these cases NULL is  */
+/*    returned.                                                       */
+/* ------------------------------------------------------------------ */
+decContext * decContextSetStatusFromStringQuiet(decContext *context,
+                                                const char *string) {
+  if (strcmp(string, DEC_Condition_CS)==0)
+    return decContextSetStatusQuiet(context, DEC_Conversion_syntax);
+  if (strcmp(string, DEC_Condition_DZ)==0)
+    return decContextSetStatusQuiet(context, DEC_Division_by_zero);
+  if (strcmp(string, DEC_Condition_DI)==0)
+    return decContextSetStatusQuiet(context, DEC_Division_impossible);
+  if (strcmp(string, DEC_Condition_DU)==0)
+    return decContextSetStatusQuiet(context, DEC_Division_undefined);
+  if (strcmp(string, DEC_Condition_IE)==0)
+    return decContextSetStatusQuiet(context, DEC_Inexact);
+  if (strcmp(string, DEC_Condition_IS)==0)
+    return decContextSetStatusQuiet(context, DEC_Insufficient_storage);
+  if (strcmp(string, DEC_Condition_IC)==0)
+    return decContextSetStatusQuiet(context, DEC_Invalid_context);
+  if (strcmp(string, DEC_Condition_IO)==0)
+    return decContextSetStatusQuiet(context, DEC_Invalid_operation);
+  #if DECSUBSET
+  if (strcmp(string, DEC_Condition_LD)==0)
+    return decContextSetStatusQuiet(context, DEC_Lost_digits);
+  #endif
+  if (strcmp(string, DEC_Condition_OV)==0)
+    return decContextSetStatusQuiet(context, DEC_Overflow);
+  if (strcmp(string, DEC_Condition_PA)==0)
+    return decContextSetStatusQuiet(context, DEC_Clamped);
+  if (strcmp(string, DEC_Condition_RO)==0)
+    return decContextSetStatusQuiet(context, DEC_Rounded);
+  if (strcmp(string, DEC_Condition_SU)==0)
+    return decContextSetStatusQuiet(context, DEC_Subnormal);
+  if (strcmp(string, DEC_Condition_UN)==0)
+    return decContextSetStatusQuiet(context, DEC_Underflow);
+  if (strcmp(string, DEC_Condition_ZE)==0)
+    return context;
+  return NULL;  // Multiple status, or unknown
+  } // decContextSetStatusFromStringQuiet
+
+/* ------------------------------------------------------------------ */
+/* decContextSetStatusQuiet -- set status without trap                */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  status  is the DEC_ exception code                                */
+/*  returns the context structure                                     */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decContext * decContextSetStatusQuiet(decContext *context, uInt status) {
+  context->status|=status;
+  return context;} // decContextSetStatusQuiet
+
+/* ------------------------------------------------------------------ */
+/* decContextStatusToString -- convert status flags to a string       */
+/*                                                                    */
+/*  context is a context with valid status field                      */
+/*                                                                    */
+/*  returns a constant string describing the condition.  If multiple  */
+/*    (or no) flags are set, a generic constant message is returned.  */
+/* ------------------------------------------------------------------ */
+const char *decContextStatusToString(const decContext *context) {
+  Int status=context->status;
+
+  // test the five IEEE first, as some of the others are ambiguous when
+  // DECEXTFLAG=0
+  if (status==DEC_Invalid_operation    ) return DEC_Condition_IO;
+  if (status==DEC_Division_by_zero     ) return DEC_Condition_DZ;
+  if (status==DEC_Overflow             ) return DEC_Condition_OV;
+  if (status==DEC_Underflow            ) return DEC_Condition_UN;
+  if (status==DEC_Inexact              ) return DEC_Condition_IE;
+
+  if (status==DEC_Division_impossible  ) return DEC_Condition_DI;
+  if (status==DEC_Division_undefined   ) return DEC_Condition_DU;
+  if (status==DEC_Rounded              ) return DEC_Condition_RO;
+  if (status==DEC_Clamped              ) return DEC_Condition_PA;
+  if (status==DEC_Subnormal            ) return DEC_Condition_SU;
+  if (status==DEC_Conversion_syntax    ) return DEC_Condition_CS;
+  if (status==DEC_Insufficient_storage ) return DEC_Condition_IS;
+  if (status==DEC_Invalid_context      ) return DEC_Condition_IC;
+  #if DECSUBSET
+  if (status==DEC_Lost_digits          ) return DEC_Condition_LD;
+  #endif
+  if (status==0                        ) return DEC_Condition_ZE;
+  return DEC_Condition_MU;  // Multiple errors
+  } // decContextStatusToString
+
+/* ------------------------------------------------------------------ */
+/* decContextTestEndian -- test whether DECLITEND is set correctly    */
+/*                                                                    */
+/*  quiet is 1 to suppress message; 0 otherwise                       */
+/*  returns 0 if DECLITEND is correct                                 */
+/*          1 if DECLITEND is incorrect and should be 1               */
+/*         -1 if DECLITEND is incorrect and should be 0               */
+/*                                                                    */
+/* A message is displayed if the return value is not 0 and quiet==0.  */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+Int decContextTestEndian(Flag quiet) {
+  Int res=0;                  // optimist
+  uInt dle=(uInt)DECLITEND;   // unsign
+  if (dle>1) dle=1;           // ensure 0 or 1
+
+  if (LITEND!=DECLITEND) {
+    if (!quiet) {             // always refer to this
+      #if DECPRINT
+      const char *adj;
+      if (LITEND) adj="little";
+             else adj="big";
+      printf("Warning: DECLITEND is set to %d, but this computer appears to be %s-endian\n",
+             DECLITEND, adj);
+      #endif
+      }
+    res=(Int)LITEND-dle;
+    }
+  return res;
+  } // decContextTestEndian
+
+/* ------------------------------------------------------------------ */
+/* decContextTestSavedStatus -- test bits in saved status             */
+/*                                                                    */
+/*  oldstatus is the status word to be tested                         */
+/*  mask indicates the bits to be tested (the oldstatus bits that     */
+/*    correspond to each 1 bit in the mask are tested)                */
+/*  returns 1 if any of the tested bits are 1, or 0 otherwise         */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decContextTestSavedStatus(uInt oldstatus, uInt mask) {
+  return (oldstatus&mask)!=0;
+  } // decContextTestSavedStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextTestStatus -- test bits in current status                */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  mask indicates the bits to be tested (the status bits that        */
+/*    correspond to each 1 bit in the mask are tested)                */
+/*  returns 1 if any of the tested bits are 1, or 0 otherwise         */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decContextTestStatus(decContext *context, uInt mask) {
+  return (context->status&mask)!=0;
+  } // decContextTestStatus
+
+/* ------------------------------------------------------------------ */
+/* decContextZeroStatus -- clear all status bits                      */
+/*                                                                    */
+/*  context is the context structure to be updated                    */
+/*  returns context                                                   */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decContext *decContextZeroStatus(decContext *context) {
+  context->status=0;
+  return context;
+  } // decContextZeroStatus
+
@@ -0,0 +1,254 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Context module header                                      */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/*                                                                    */
+/* Context variables must always have valid values:                   */
+/*                                                                    */
+/*  status   -- [any bits may be cleared, but not set, by user]       */
+/*  round    -- must be one of the enumerated rounding modes          */
+/*                                                                    */
+/* The following variables are implied for fixed size formats (i.e.,  */
+/* they are ignored) but should still be set correctly in case used   */
+/* with decNumber functions:                                          */
+/*                                                                    */
+/*  clamp    -- must be either 0 or 1                                 */
+/*  digits   -- must be in the range 1 through 999999999              */
+/*  emax     -- must be in the range 0 through 999999999              */
+/*  emin     -- must be in the range 0 through -999999999             */
+/*  extended -- must be either 0 or 1 [present only if DECSUBSET]     */
+/*  traps    -- only defined bits may be set                          */
+/*                                                                    */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECCONTEXT)
+  #define DECCONTEXT
+  #define DECCNAME     "decContext"                     /* Short name */
+  #define DECCFULLNAME "Decimal Context Descriptor"   /* Verbose name */
+  #define DECCAUTHOR   "Mike Cowlishaw"               /* Who to blame */
+
+  #if !defined(int32_t)
+    #include <stdint.h>            /* C99 standard integers           */
+  #endif
+  #include <stdio.h>               /* for printf, etc.                */
+  #include <signal.h>              /* for traps                       */
+
+  /* Extended flags setting -- set this to 0 to use only IEEE flags   */
+  #if !defined(DECEXTFLAG)
+  #define DECEXTFLAG 1             /* 1=enable extended flags         */
+  #endif
+
+  /* Conditional code flag -- set this to 0 for best performance      */
+  #if !defined(DECSUBSET)
+  #define DECSUBSET  0             /* 1=enable subset arithmetic      */
+  #endif
+
+  /* Context for operations, with associated constants                */
+  enum rounding {
+    DEC_ROUND_CEILING,             /* round towards +infinity         */
+    DEC_ROUND_UP,                  /* round away from 0               */
+    DEC_ROUND_HALF_UP,             /* 0.5 rounds up                   */
+    DEC_ROUND_HALF_EVEN,           /* 0.5 rounds to nearest even      */
+    DEC_ROUND_HALF_DOWN,           /* 0.5 rounds down                 */
+    DEC_ROUND_DOWN,                /* round towards 0 (truncate)      */
+    DEC_ROUND_FLOOR,               /* round towards -infinity         */
+    DEC_ROUND_05UP,                /* round for reround               */
+    DEC_ROUND_MAX                  /* enum must be less than this     */
+    };
+  #define DEC_ROUND_DEFAULT DEC_ROUND_HALF_EVEN;
+
+  typedef struct {
+    int32_t  digits;               /* working precision               */
+    int32_t  emax;                 /* maximum positive exponent       */
+    int32_t  emin;                 /* minimum negative exponent       */
+    enum     rounding round;       /* rounding mode                   */
+    uint32_t traps;                /* trap-enabler flags              */
+    uint32_t status;               /* status flags                    */
+    uint8_t  clamp;                /* flag: apply IEEE exponent clamp */
+    #if DECSUBSET
+    uint8_t  extended;             /* flag: special-values allowed    */
+    #endif
+    } decContext;
+
+  /* Maxima and Minima for context settings                           */
+  #define DEC_MAX_DIGITS 999999999
+  #define DEC_MIN_DIGITS         1
+  #define DEC_MAX_EMAX   999999999
+  #define DEC_MIN_EMAX           0
+  #define DEC_MAX_EMIN           0
+  #define DEC_MIN_EMIN  -999999999
+  #define DEC_MAX_MATH      999999 /* max emax, etc., for math funcs. */
+
+  /* Classifications for decimal numbers, aligned with 754 (note that */
+  /* 'normal' and 'subnormal' are meaningful only with a decContext   */
+  /* or a fixed size format).                                         */
+  enum decClass {
+    DEC_CLASS_SNAN,
+    DEC_CLASS_QNAN,
+    DEC_CLASS_NEG_INF,
+    DEC_CLASS_NEG_NORMAL,
+    DEC_CLASS_NEG_SUBNORMAL,
+    DEC_CLASS_NEG_ZERO,
+    DEC_CLASS_POS_ZERO,
+    DEC_CLASS_POS_SUBNORMAL,
+    DEC_CLASS_POS_NORMAL,
+    DEC_CLASS_POS_INF
+    };
+  /* Strings for the decClasses */
+  #define DEC_ClassString_SN  "sNaN"
+  #define DEC_ClassString_QN  "NaN"
+  #define DEC_ClassString_NI  "-Infinity"
+  #define DEC_ClassString_NN  "-Normal"
+  #define DEC_ClassString_NS  "-Subnormal"
+  #define DEC_ClassString_NZ  "-Zero"
+  #define DEC_ClassString_PZ  "+Zero"
+  #define DEC_ClassString_PS  "+Subnormal"
+  #define DEC_ClassString_PN  "+Normal"
+  #define DEC_ClassString_PI  "+Infinity"
+  #define DEC_ClassString_UN  "Invalid"
+
+  /* Trap-enabler and Status flags (exceptional conditions), and      */
+  /* their names.  The top byte is reserved for internal use          */
+  #if DECEXTFLAG
+    /* Extended flags */
+    #define DEC_Conversion_syntax    0x00000001
+    #define DEC_Division_by_zero     0x00000002
+    #define DEC_Division_impossible  0x00000004
+    #define DEC_Division_undefined   0x00000008
+    #define DEC_Insufficient_storage 0x00000010 /* [when malloc fails]  */
+    #define DEC_Inexact              0x00000020
+    #define DEC_Invalid_context      0x00000040
+    #define DEC_Invalid_operation    0x00000080
+    #if DECSUBSET
+    #define DEC_Lost_digits          0x00000100
+    #endif
+    #define DEC_Overflow             0x00000200
+    #define DEC_Clamped              0x00000400
+    #define DEC_Rounded              0x00000800
+    #define DEC_Subnormal            0x00001000
+    #define DEC_Underflow            0x00002000
+  #else
+    /* IEEE flags only */
+    #define DEC_Conversion_syntax    0x00000010
+    #define DEC_Division_by_zero     0x00000002
+    #define DEC_Division_impossible  0x00000010
+    #define DEC_Division_undefined   0x00000010
+    #define DEC_Insufficient_storage 0x00000010 /* [when malloc fails]  */
+    #define DEC_Inexact              0x00000001
+    #define DEC_Invalid_context      0x00000010
+    #define DEC_Invalid_operation    0x00000010
+    #if DECSUBSET
+    #define DEC_Lost_digits          0x00000000
+    #endif
+    #define DEC_Overflow             0x00000008
+    #define DEC_Clamped              0x00000000
+    #define DEC_Rounded              0x00000000
+    #define DEC_Subnormal            0x00000000
+    #define DEC_Underflow            0x00000004
+  #endif
+
+  /* IEEE 754 groupings for the flags                                 */
+  /* [DEC_Clamped, DEC_Lost_digits, DEC_Rounded, and DEC_Subnormal    */
+  /* are not in IEEE 754]                                             */
+  #define DEC_IEEE_754_Division_by_zero  (DEC_Division_by_zero)
+  #if DECSUBSET
+  #define DEC_IEEE_754_Inexact           (DEC_Inexact | DEC_Lost_digits)
+  #else
+  #define DEC_IEEE_754_Inexact           (DEC_Inexact)
+  #endif
+  #define DEC_IEEE_754_Invalid_operation (DEC_Conversion_syntax |     \
+                                          DEC_Division_impossible |   \
+                                          DEC_Division_undefined |    \
+                                          DEC_Insufficient_storage |  \
+                                          DEC_Invalid_context |       \
+                                          DEC_Invalid_operation)
+  #define DEC_IEEE_754_Overflow          (DEC_Overflow)
+  #define DEC_IEEE_754_Underflow         (DEC_Underflow)
+
+  /* flags which are normally errors (result is qNaN, infinite, or 0) */
+  #define DEC_Errors (DEC_IEEE_754_Division_by_zero |                 \
+                      DEC_IEEE_754_Invalid_operation |                \
+                      DEC_IEEE_754_Overflow | DEC_IEEE_754_Underflow)
+  /* flags which cause a result to become qNaN                        */
+  #define DEC_NaNs    DEC_IEEE_754_Invalid_operation
+
+  /* flags which are normally for information only (finite results)   */
+  #if DECSUBSET
+  #define DEC_Information (DEC_Clamped | DEC_Rounded | DEC_Inexact    \
+                          | DEC_Lost_digits)
+  #else
+  #define DEC_Information (DEC_Clamped | DEC_Rounded | DEC_Inexact)
+  #endif
+
+  /* IEEE 854 names (for compatibility with older decNumber versions) */
+  #define DEC_IEEE_854_Division_by_zero  DEC_IEEE_754_Division_by_zero
+  #define DEC_IEEE_854_Inexact           DEC_IEEE_754_Inexact
+  #define DEC_IEEE_854_Invalid_operation DEC_IEEE_754_Invalid_operation
+  #define DEC_IEEE_854_Overflow          DEC_IEEE_754_Overflow
+  #define DEC_IEEE_854_Underflow         DEC_IEEE_754_Underflow
+
+  /* Name strings for the exceptional conditions                      */
+  #define DEC_Condition_CS "Conversion syntax"
+  #define DEC_Condition_DZ "Division by zero"
+  #define DEC_Condition_DI "Division impossible"
+  #define DEC_Condition_DU "Division undefined"
+  #define DEC_Condition_IE "Inexact"
+  #define DEC_Condition_IS "Insufficient storage"
+  #define DEC_Condition_IC "Invalid context"
+  #define DEC_Condition_IO "Invalid operation"
+  #if DECSUBSET
+  #define DEC_Condition_LD "Lost digits"
+  #endif
+  #define DEC_Condition_OV "Overflow"
+  #define DEC_Condition_PA "Clamped"
+  #define DEC_Condition_RO "Rounded"
+  #define DEC_Condition_SU "Subnormal"
+  #define DEC_Condition_UN "Underflow"
+  #define DEC_Condition_ZE "No status"
+  #define DEC_Condition_MU "Multiple status"
+  #define DEC_Condition_Length 21  /* length of the longest string,   */
+                                   /* including terminator            */
+
+  /* Initialization descriptors, used by decContextDefault            */
+  #define DEC_INIT_BASE         0
+  #define DEC_INIT_DECIMAL32   32
+  #define DEC_INIT_DECIMAL64   64
+  #define DEC_INIT_DECIMAL128 128
+  /* Synonyms */
+  #define DEC_INIT_DECSINGLE  DEC_INIT_DECIMAL32
+  #define DEC_INIT_DECDOUBLE  DEC_INIT_DECIMAL64
+  #define DEC_INIT_DECQUAD    DEC_INIT_DECIMAL128
+
+  /* decContext routines                                              */
+  extern decContext  * decContextClearStatus(decContext *, uint32_t);
+  extern decContext  * decContextDefault(decContext *, int32_t);
+  extern enum rounding decContextGetRounding(decContext *);
+  extern uint32_t      decContextGetStatus(decContext *);
+  extern decContext  * decContextRestoreStatus(decContext *, uint32_t, uint32_t);
+  extern uint32_t      decContextSaveStatus(decContext *, uint32_t);
+  extern decContext  * decContextSetRounding(decContext *, enum rounding);
+  extern decContext  * decContextSetStatus(decContext *, uint32_t);
+  extern decContext  * decContextSetStatusFromString(decContext *, const char *);
+  extern decContext  * decContextSetStatusFromStringQuiet(decContext *, const char *);
+  extern decContext  * decContextSetStatusQuiet(decContext *, uint32_t);
+  extern const char  * decContextStatusToString(const decContext *);
+  extern int32_t       decContextTestEndian(uint8_t);
+  extern uint32_t      decContextTestSavedStatus(uint32_t, uint32_t);
+  extern uint32_t      decContextTestStatus(decContext *, uint32_t);
+  extern decContext  * decContextZeroStatus(decContext *);
+
+#endif
@@ -0,0 +1,140 @@
+/* ------------------------------------------------------------------ */
+/* decDouble.c -- decDouble operations module                         */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is included in the package as decNumber.pdf.  This   */
+/* document is also available in HTML, together with specifications,  */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises decDouble operations (including conversions) */
+/* ------------------------------------------------------------------ */
+
+#include "decContext.h"       // public includes
+#include "decDouble.h"        // ..
+
+/* Constant mappings for shared code */
+#define DECPMAX     DECDOUBLE_Pmax
+#define DECEMIN     DECDOUBLE_Emin
+#define DECEMAX     DECDOUBLE_Emax
+#define DECEMAXD    DECDOUBLE_EmaxD
+#define DECBYTES    DECDOUBLE_Bytes
+#define DECSTRING   DECDOUBLE_String
+#define DECECONL    DECDOUBLE_EconL
+#define DECBIAS     DECDOUBLE_Bias
+#define DECLETS     DECDOUBLE_Declets
+#define DECQTINY    (-DECDOUBLE_Bias)
+// parameters of next-wider format
+#define DECWBYTES   DECQUAD_Bytes
+#define DECWPMAX    DECQUAD_Pmax
+#define DECWECONL   DECQUAD_EconL
+#define DECWBIAS    DECQUAD_Bias
+
+/* Type and function mappings for shared code */
+#define decFloat                   decDouble      // Type name
+#define decFloatWider              decQuad        // Type name
+
+// Utilities and conversions (binary results, extractors, etc.)
+#define decFloatFromBCD            decDoubleFromBCD
+#define decFloatFromInt32          decDoubleFromInt32
+#define decFloatFromPacked         decDoubleFromPacked
+#define decFloatFromPackedChecked  decDoubleFromPackedChecked
+#define decFloatFromString         decDoubleFromString
+#define decFloatFromUInt32         decDoubleFromUInt32
+#define decFloatFromWider          decDoubleFromWider
+#define decFloatGetCoefficient     decDoubleGetCoefficient
+#define decFloatGetExponent        decDoubleGetExponent
+#define decFloatSetCoefficient     decDoubleSetCoefficient
+#define decFloatSetExponent        decDoubleSetExponent
+#define decFloatShow               decDoubleShow
+#define decFloatToBCD              decDoubleToBCD
+#define decFloatToEngString        decDoubleToEngString
+#define decFloatToInt32            decDoubleToInt32
+#define decFloatToInt32Exact       decDoubleToInt32Exact
+#define decFloatToPacked           decDoubleToPacked
+#define decFloatToString           decDoubleToString
+#define decFloatToUInt32           decDoubleToUInt32
+#define decFloatToUInt32Exact      decDoubleToUInt32Exact
+#define decFloatToWider            decDoubleToWider
+#define decFloatZero               decDoubleZero
+
+// Computational (result is a decFloat)
+#define decFloatAbs                decDoubleAbs
+#define decFloatAdd                decDoubleAdd
+#define decFloatAnd                decDoubleAnd
+#define decFloatDivide             decDoubleDivide
+#define decFloatDivideInteger      decDoubleDivideInteger
+#define decFloatFMA                decDoubleFMA
+#define decFloatInvert             decDoubleInvert
+#define decFloatLogB               decDoubleLogB
+#define decFloatMax                decDoubleMax
+#define decFloatMaxMag             decDoubleMaxMag
+#define decFloatMin                decDoubleMin
+#define decFloatMinMag             decDoubleMinMag
+#define decFloatMinus              decDoubleMinus
+#define decFloatMultiply           decDoubleMultiply
+#define decFloatNextMinus          decDoubleNextMinus
+#define decFloatNextPlus           decDoubleNextPlus
+#define decFloatNextToward         decDoubleNextToward
+#define decFloatOr                 decDoubleOr
+#define decFloatPlus               decDoublePlus
+#define decFloatQuantize           decDoubleQuantize
+#define decFloatReduce             decDoubleReduce
+#define decFloatRemainder          decDoubleRemainder
+#define decFloatRemainderNear      decDoubleRemainderNear
+#define decFloatRotate             decDoubleRotate
+#define decFloatScaleB             decDoubleScaleB
+#define decFloatShift              decDoubleShift
+#define decFloatSubtract           decDoubleSubtract
+#define decFloatToIntegralValue    decDoubleToIntegralValue
+#define decFloatToIntegralExact    decDoubleToIntegralExact
+#define decFloatXor                decDoubleXor
+
+// Comparisons
+#define decFloatCompare            decDoubleCompare
+#define decFloatCompareSignal      decDoubleCompareSignal
+#define decFloatCompareTotal       decDoubleCompareTotal
+#define decFloatCompareTotalMag    decDoubleCompareTotalMag
+
+// Copies
+#define decFloatCanonical          decDoubleCanonical
+#define decFloatCopy               decDoubleCopy
+#define decFloatCopyAbs            decDoubleCopyAbs
+#define decFloatCopyNegate         decDoubleCopyNegate
+#define decFloatCopySign           decDoubleCopySign
+
+// Non-computational
+#define decFloatClass              decDoubleClass
+#define decFloatClassString        decDoubleClassString
+#define decFloatDigits             decDoubleDigits
+#define decFloatIsCanonical        decDoubleIsCanonical
+#define decFloatIsFinite           decDoubleIsFinite
+#define decFloatIsInfinite         decDoubleIsInfinite
+#define decFloatIsInteger          decDoubleIsInteger
+#define decFloatIsLogical          decDoubleIsLogical
+#define decFloatIsNaN              decDoubleIsNaN
+#define decFloatIsNegative         decDoubleIsNegative
+#define decFloatIsNormal           decDoubleIsNormal
+#define decFloatIsPositive         decDoubleIsPositive
+#define decFloatIsSignaling        decDoubleIsSignaling
+#define decFloatIsSignalling       decDoubleIsSignalling
+#define decFloatIsSigned           decDoubleIsSigned
+#define decFloatIsSubnormal        decDoubleIsSubnormal
+#define decFloatIsZero             decDoubleIsZero
+#define decFloatRadix              decDoubleRadix
+#define decFloatSameQuantum        decDoubleSameQuantum
+#define decFloatVersion            decDoubleVersion
+
+#include "decNumberLocal.h"   // local includes (need DECPMAX)
+#include "decCommon.c"        // non-arithmetic decFloat routines
+#include "decBasic.c"         // basic formats routines
+
@@ -0,0 +1,155 @@
+/* ------------------------------------------------------------------ */
+/* decDouble.h -- Decimal 64-bit format module header                 */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is included in the package as decNumber.pdf.  This   */
+/* document is also available in HTML, together with specifications,  */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECDOUBLE)
+  #define DECDOUBLE
+
+  #define DECDOUBLENAME       "decimalDouble"         /* Short name   */
+  #define DECDOUBLETITLE      "Decimal 64-bit datum"  /* Verbose name */
+  #define DECDOUBLEAUTHOR     "Mike Cowlishaw"        /* Who to blame */
+
+  /* parameters for decDoubles */
+  #define DECDOUBLE_Bytes   8      /* length                          */
+  #define DECDOUBLE_Pmax    16     /* maximum precision (digits)      */
+  #define DECDOUBLE_Emin   -383    /* minimum adjusted exponent       */
+  #define DECDOUBLE_Emax    384    /* maximum adjusted exponent       */
+  #define DECDOUBLE_EmaxD   3      /* maximum exponent digits         */
+  #define DECDOUBLE_Bias    398    /* bias for the exponent           */
+  #define DECDOUBLE_String  25     /* maximum string length, +1       */
+  #define DECDOUBLE_EconL   8      /* exponent continuation length    */
+  #define DECDOUBLE_Declets 5      /* count of declets                */
+  /* highest biased exponent (Elimit-1) */
+  #define DECDOUBLE_Ehigh (DECDOUBLE_Emax + DECDOUBLE_Bias - (DECDOUBLE_Pmax-1))
+
+  /* Required includes                                                */
+  #include "decContext.h"
+  #include "decQuad.h"
+
+  /* The decDouble decimal 64-bit type, accessible by all sizes */
+  typedef union {
+    uint8_t   bytes[DECDOUBLE_Bytes];   /* fields: 1, 5, 8, 50 bits */
+    uint16_t shorts[DECDOUBLE_Bytes/2];
+    uint32_t  words[DECDOUBLE_Bytes/4];
+    #if DECUSE64
+    uint64_t  longs[DECDOUBLE_Bytes/8];
+    #endif
+    } decDouble;
+
+  /* ---------------------------------------------------------------- */
+  /* Routines -- implemented as decFloat routines in common files     */
+  /* ---------------------------------------------------------------- */
+
+  /* Utilities and conversions, extractors, etc.) */
+  extern decDouble * decDoubleFromBCD(decDouble *, int32_t, const uint8_t *, int32_t);
+  extern decDouble * decDoubleFromInt32(decDouble *, int32_t);
+  extern decDouble * decDoubleFromPacked(decDouble *, int32_t, const uint8_t *);
+  extern decDouble * decDoubleFromPackedChecked(decDouble *, int32_t, const uint8_t *);
+  extern decDouble * decDoubleFromString(decDouble *, const char *, decContext *);
+  extern decDouble * decDoubleFromUInt32(decDouble *, uint32_t);
+  extern decDouble * decDoubleFromWider(decDouble *, const decQuad *, decContext *);
+  extern int32_t     decDoubleGetCoefficient(const decDouble *, uint8_t *);
+  extern int32_t     decDoubleGetExponent(const decDouble *);
+  extern decDouble * decDoubleSetCoefficient(decDouble *, const uint8_t *, int32_t);
+  extern decDouble * decDoubleSetExponent(decDouble *, decContext *, int32_t);
+  extern void        decDoubleShow(const decDouble *, const char *);
+  extern int32_t     decDoubleToBCD(const decDouble *, int32_t *, uint8_t *);
+  extern char      * decDoubleToEngString(const decDouble *, char *);
+  extern int32_t     decDoubleToInt32(const decDouble *, decContext *, enum rounding);
+  extern int32_t     decDoubleToInt32Exact(const decDouble *, decContext *, enum rounding);
+  extern int32_t     decDoubleToPacked(const decDouble *, int32_t *, uint8_t *);
+  extern char      * decDoubleToString(const decDouble *, char *);
+  extern uint32_t    decDoubleToUInt32(const decDouble *, decContext *, enum rounding);
+  extern uint32_t    decDoubleToUInt32Exact(const decDouble *, decContext *, enum rounding);
+  extern decQuad   * decDoubleToWider(const decDouble *, decQuad *);
+  extern decDouble * decDoubleZero(decDouble *);
+
+  /* Computational (result is a decDouble) */
+  extern decDouble * decDoubleAbs(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleAdd(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleAnd(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleDivide(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleDivideInteger(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleFMA(decDouble *, const decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleInvert(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleLogB(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleMax(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleMaxMag(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleMin(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleMinMag(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleMinus(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleMultiply(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleNextMinus(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleNextPlus(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleNextToward(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleOr(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoublePlus(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleQuantize(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleReduce(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleRemainder(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleRemainderNear(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleRotate(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleScaleB(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleShift(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleSubtract(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleToIntegralValue(decDouble *, const decDouble *, decContext *, enum rounding);
+  extern decDouble * decDoubleToIntegralExact(decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleXor(decDouble *, const decDouble *, const decDouble *, decContext *);
+
+  /* Comparisons */
+  extern decDouble * decDoubleCompare(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleCompareSignal(decDouble *, const decDouble *, const decDouble *, decContext *);
+  extern decDouble * decDoubleCompareTotal(decDouble *, const decDouble *, const decDouble *);
+  extern decDouble * decDoubleCompareTotalMag(decDouble *, const decDouble *, const decDouble *);
+
+  /* Copies */
+  extern decDouble * decDoubleCanonical(decDouble *, const decDouble *);
+  extern decDouble * decDoubleCopy(decDouble *, const decDouble *);
+  extern decDouble * decDoubleCopyAbs(decDouble *, const decDouble *);
+  extern decDouble * decDoubleCopyNegate(decDouble *, const decDouble *);
+  extern decDouble * decDoubleCopySign(decDouble *, const decDouble *, const decDouble *);
+
+  /* Non-computational */
+  extern enum decClass decDoubleClass(const decDouble *);
+  extern const char *  decDoubleClassString(const decDouble *);
+  extern uint32_t      decDoubleDigits(const decDouble *);
+  extern uint32_t      decDoubleIsCanonical(const decDouble *);
+  extern uint32_t      decDoubleIsFinite(const decDouble *);
+  extern uint32_t      decDoubleIsInfinite(const decDouble *);
+  extern uint32_t      decDoubleIsInteger(const decDouble *);
+  extern uint32_t      decDoubleIsLogical(const decDouble *);
+  extern uint32_t      decDoubleIsNaN(const decDouble *);
+  extern uint32_t      decDoubleIsNegative(const decDouble *);
+  extern uint32_t      decDoubleIsNormal(const decDouble *);
+  extern uint32_t      decDoubleIsPositive(const decDouble *);
+  extern uint32_t      decDoubleIsSignaling(const decDouble *);
+  extern uint32_t      decDoubleIsSignalling(const decDouble *);
+  extern uint32_t      decDoubleIsSigned(const decDouble *);
+  extern uint32_t      decDoubleIsSubnormal(const decDouble *);
+  extern uint32_t      decDoubleIsZero(const decDouble *);
+  extern uint32_t      decDoubleRadix(const decDouble *);
+  extern uint32_t      decDoubleSameQuantum(const decDouble *, const decDouble *);
+  extern const char *  decDoubleVersion(void);
+
+  /* decNumber conversions; these are implemented as macros so as not  */
+  /* to force a dependency on decimal64 and decNumber in decDouble.    */
+  /* decDoubleFromNumber returns a decimal64 * to avoid warnings.      */
+  #define decDoubleToNumber(dq, dn) decimal64ToNumber((decimal64 *)(dq), dn)
+  #define decDoubleFromNumber(dq, dn, set) decimal64FromNumber((decimal64 *)(dq), dn, set)
+
+#endif
@@ -0,0 +1,182 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number arithmetic module header                            */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECNUMBER)
+  #define DECNUMBER
+  #define DECNAME     "decNumber"                       /* Short name */
+  #define DECFULLNAME "Decimal Number Module"         /* Verbose name */
+  #define DECAUTHOR   "Mike Cowlishaw"                /* Who to blame */
+
+  #if !defined(DECCONTEXT)
+    #include "decContext.h"
+  #endif
+
+  /* Bit settings for decNumber.bits                                  */
+  #define DECNEG    0x80      /* Sign; 1=negative, 0=positive or zero */
+  #define DECINF    0x40      /* 1=Infinity                           */
+  #define DECNAN    0x20      /* 1=NaN                                */
+  #define DECSNAN   0x10      /* 1=sNaN                               */
+  /* The remaining bits are reserved; they must be 0                  */
+  #define DECSPECIAL (DECINF|DECNAN|DECSNAN) /* any special value     */
+
+  /* Define the decNumber data structure.  The size and shape of the  */
+  /* units array in the structure is determined by the following      */
+  /* constant.  This must not be changed without recompiling the      */
+  /* decNumber library modules. */
+
+  #define DECDPUN 3           /* DECimal Digits Per UNit [must be >0  */
+                              /* and <10; 3 or powers of 2 are best]. */
+
+  /* DECNUMDIGITS is the default number of digits that can be held in */
+  /* the structure.  If undefined, 1 is assumed and it is assumed     */
+  /* that the structure will be immediately followed by extra space,  */
+  /* as required.  DECNUMDIGITS is always >0.                         */
+  #if !defined(DECNUMDIGITS)
+    #define DECNUMDIGITS 1
+  #endif
+
+  /* The size (integer data type) of each unit is determined by the   */
+  /* number of digits it will hold.                                   */
+  #if   DECDPUN<=2
+    #define decNumberUnit uint8_t
+  #elif DECDPUN<=4
+    #define decNumberUnit uint16_t
+  #else
+    #define decNumberUnit uint32_t
+  #endif
+  /* The number of units needed is ceil(DECNUMDIGITS/DECDPUN)         */
+  #define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
+
+  /* The data structure... */
+  typedef struct {
+    int32_t digits;      /* Count of digits in the coefficient; >0    */
+    int32_t exponent;    /* Unadjusted exponent, unbiased, in         */
+                         /* range: -1999999997 through 999999999      */
+    uint8_t bits;        /* Indicator bits (see above)                */
+                         /* Coefficient, from least significant unit  */
+    decNumberUnit lsu[DECNUMUNITS];
+    } decNumber;
+
+  /* Notes:                                                           */
+  /* 1. If digits is > DECDPUN then there will one or more            */
+  /*    decNumberUnits immediately following the first element of lsu.*/
+  /*    These contain the remaining (more significant) digits of the  */
+  /*    number, and may be in the lsu array, or may be guaranteed by  */
+  /*    some other mechanism (such as being contained in another      */
+  /*    structure, or being overlaid on dynamically allocated         */
+  /*    storage).                                                     */
+  /*                                                                  */
+  /*    Each integer of the coefficient (except potentially the last) */
+  /*    contains DECDPUN digits (e.g., a value in the range 0 through */
+  /*    99999999 if DECDPUN is 8, or 0 through 999 if DECDPUN is 3).  */
+  /*                                                                  */
+  /* 2. A decNumber converted to a string may need up to digits+14    */
+  /*    characters.  The worst cases (non-exponential and exponential */
+  /*    formats) are -0.00000{9...}# and -9.{9...}E+999999999#        */
+  /*    (where # is '\0')                                             */
+
+
+  /* ---------------------------------------------------------------- */
+  /* decNumber public functions and macros                            */
+  /* ---------------------------------------------------------------- */
+  /* Conversions                                                      */
+  decNumber * decNumberFromInt32(decNumber *, int32_t);
+  decNumber * decNumberFromUInt32(decNumber *, uint32_t);
+  decNumber * decNumberFromString(decNumber *, const char *, decContext *);
+  char      * decNumberToString(const decNumber *, char *);
+  char      * decNumberToEngString(const decNumber *, char *);
+  uint32_t    decNumberToUInt32(const decNumber *, decContext *);
+  int32_t     decNumberToInt32(const decNumber *, decContext *);
+  uint8_t   * decNumberGetBCD(const decNumber *, uint8_t *);
+  decNumber * decNumberSetBCD(decNumber *, const uint8_t *, uint32_t);
+
+  /* Operators and elementary functions                               */
+  decNumber * decNumberAbs(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberAdd(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberAnd(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberCompare(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberCompareSignal(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberCompareTotal(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberCompareTotalMag(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberDivide(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberDivideInteger(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberExp(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberFMA(decNumber *, const decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberInvert(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberLn(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberLogB(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberLog10(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberMax(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberMaxMag(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberMin(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberMinMag(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberMinus(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberMultiply(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberNormalize(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberOr(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberPlus(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberPower(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberQuantize(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberReduce(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberRemainder(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberRemainderNear(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberRescale(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberRotate(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberSameQuantum(decNumber *, const decNumber *, const decNumber *);
+  decNumber * decNumberScaleB(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberShift(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberSquareRoot(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberSubtract(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberToIntegralExact(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberToIntegralValue(decNumber *, const decNumber *, decContext *);
+  decNumber * decNumberXor(decNumber *, const decNumber *, const decNumber *, decContext *);
+
+  /* Utilities                                                        */
+  enum decClass decNumberClass(const decNumber *, decContext *);
+  const char * decNumberClassToString(enum decClass);
+  decNumber  * decNumberCopy(decNumber *, const decNumber *);
+  decNumber  * decNumberCopyAbs(decNumber *, const decNumber *);
+  decNumber  * decNumberCopyNegate(decNumber *, const decNumber *);
+  decNumber  * decNumberCopySign(decNumber *, const decNumber *, const decNumber *);
+  decNumber  * decNumberNextMinus(decNumber *, const decNumber *, decContext *);
+  decNumber  * decNumberNextPlus(decNumber *, const decNumber *, decContext *);
+  decNumber  * decNumberNextToward(decNumber *, const decNumber *, const decNumber *, decContext *);
+  decNumber  * decNumberTrim(decNumber *);
+  const char * decNumberVersion(void);
+  decNumber  * decNumberZero(decNumber *);
+
+  /* Functions for testing decNumbers (normality depends on context)  */
+  int32_t decNumberIsNormal(const decNumber *, decContext *);
+  int32_t decNumberIsSubnormal(const decNumber *, decContext *);
+
+  /* Macros for testing decNumber *dn                                 */
+  #define decNumberIsCanonical(dn) (1)  /* All decNumbers are saintly */
+  #define decNumberIsFinite(dn)    (((dn)->bits&DECSPECIAL)==0)
+  #define decNumberIsInfinite(dn)  (((dn)->bits&DECINF)!=0)
+  #define decNumberIsNaN(dn)       (((dn)->bits&(DECNAN|DECSNAN))!=0)
+  #define decNumberIsNegative(dn)  (((dn)->bits&DECNEG)!=0)
+  #define decNumberIsQNaN(dn)      (((dn)->bits&(DECNAN))!=0)
+  #define decNumberIsSNaN(dn)      (((dn)->bits&(DECSNAN))!=0)
+  #define decNumberIsSpecial(dn)   (((dn)->bits&DECSPECIAL)!=0)
+  #define decNumberIsZero(dn)      (*(dn)->lsu==0 \
+                                    && (dn)->digits==1 \
+                                    && (((dn)->bits&DECSPECIAL)==0))
+  #define decNumberRadix(dn)       (10)
+
+#endif
@@ -0,0 +1,757 @@
+/* ------------------------------------------------------------------ */
+/* decNumber package local type, tuning, and macro definitions        */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This header file is included by all modules in the decNumber       */
+/* library, and contains local type definitions, tuning parameters,   */
+/* etc.  It should not need to be used by application programs.       */
+/* decNumber.h or one of decDouble (etc.) must be included first.     */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECNUMBERLOC)
+  #define DECNUMBERLOC
+  #define DECVERSION    "decNumber 3.68" /* Package Version [16 max.] */
+  #define DECNLAUTHOR   "Mike Cowlishaw"              /* Who to blame */
+
+  #include <stdlib.h>         /* for abs                              */
+  #include <string.h>         /* for memset, strcpy                   */
+
+  /* Conditional code flag -- set this to match hardware platform     */
+  #if !defined(DECLITEND)
+  #define DECLITEND 1         /* 1=little-endian, 0=big-endian        */
+  #endif
+
+  /* Conditional code flag -- set this to 1 for best performance      */
+  #if !defined(DECUSE64)
+  #define DECUSE64  1         /* 1=use int64s, 0=int32 & smaller only */
+  #endif
+
+  /* Conditional code flag -- set this to 0 to exclude printf calls   */
+  #if !defined(DECPRINT)
+  #define DECPRINT  1         /* 1=allow printf calls; 0=no printf    */
+  #endif
+
+  /* Conditional check flags -- set these to 0 for best performance   */
+  #if !defined(DECCHECK)
+  #define DECCHECK  0         /* 1 to enable robust checking          */
+  #endif
+  #if !defined(DECALLOC)
+  #define DECALLOC  0         /* 1 to enable memory accounting        */
+  #endif
+  #if !defined(DECTRACE)
+  #define DECTRACE  0         /* 1 to trace certain internals, etc.   */
+  #endif
+
+  /* Tuning parameter for decNumber (arbitrary precision) module      */
+  #if !defined(DECBUFFER)
+  #define DECBUFFER 36        /* Size basis for local buffers.  This  */
+                              /* should be a common maximum precision */
+                              /* rounded up to a multiple of 4; must  */
+                              /* be zero or positive.                 */
+  #endif
+
+
+  /* ---------------------------------------------------------------- */
+  /* Check parameter dependencies                                     */
+  /* ---------------------------------------------------------------- */
+  #if DECCHECK & !DECPRINT
+    #error DECCHECK needs DECPRINT to be useful
+  #endif
+  #if DECALLOC & !DECPRINT
+    #error DECALLOC needs DECPRINT to be useful
+  #endif
+  #if DECTRACE & !DECPRINT
+    #error DECTRACE needs DECPRINT to be useful
+  #endif
+
+  /* ---------------------------------------------------------------- */
+  /* Definitions for all modules (general-purpose)                    */
+  /* ---------------------------------------------------------------- */
+
+  /* Local names for common types -- for safety, decNumber modules do */
+  /* not use int or long directly.                                    */
+  #define Flag   uint8_t
+  #define Byte   int8_t
+  #define uByte  uint8_t
+  #define Short  int16_t
+  #define uShort uint16_t
+  #define Int    int32_t
+  #define uInt   uint32_t
+  #define Unit   decNumberUnit
+  #if DECUSE64
+  #define Long   int64_t
+  #define uLong  uint64_t
+  #endif
+
+  /* Development-use definitions                                      */
+  typedef long int LI;        /* for printf arguments only            */
+  #define DECNOINT  0         /* 1 to check no internal use of 'int'  */
+                              /*   or stdint types                    */
+  #if DECNOINT
+    /* if these interfere with your C includes, do not set DECNOINT   */
+    #define int     ?         /* enable to ensure that plain C 'int'  */
+    #define long    ??        /* .. or 'long' types are not used      */
+  #endif
+
+  /* Shared lookup tables                                             */
+  extern const uByte  DECSTICKYTAB[10]; /* re-round digits if sticky  */
+  extern const uInt   DECPOWERS[10];    /* powers of ten table        */
+  /* The following are included from decDPD.h                         */
+  extern const uShort DPD2BIN[1024];    /* DPD -> 0-999               */
+  extern const uShort BIN2DPD[1000];    /* 0-999 -> DPD               */
+  extern const uInt   DPD2BINK[1024];   /* DPD -> 0-999000            */
+  extern const uInt   DPD2BINM[1024];   /* DPD -> 0-999000000         */
+  extern const uByte  DPD2BCD8[4096];   /* DPD -> ddd + len           */
+  extern const uByte  BIN2BCD8[4000];   /* 0-999 -> ddd + len         */
+  extern const uShort BCD2DPD[2458];    /* 0-0x999 -> DPD (0x999=2457)*/
+
+  /* LONGMUL32HI -- set w=(u*v)>>32, where w, u, and v are uInts      */
+  /* (that is, sets w to be the high-order word of the 64-bit result; */
+  /* the low-order word is simply u*v.)                               */
+  /* This version is derived from Knuth via Hacker's Delight;         */
+  /* it seems to optimize better than some others tried               */
+  #define LONGMUL32HI(w, u, v) {             \
+    uInt u0, u1, v0, v1, w0, w1, w2, t;      \
+    u0=u & 0xffff; u1=u>>16;                 \
+    v0=v & 0xffff; v1=v>>16;                 \
+    w0=u0*v0;                                \
+    t=u1*v0 + (w0>>16);                      \
+    w1=t & 0xffff; w2=t>>16;                 \
+    w1=u0*v1 + w1;                           \
+    (w)=u1*v1 + w2 + (w1>>16);}
+
+  /* ROUNDUP -- round an integer up to a multiple of n                */
+  #define ROUNDUP(i, n) ((((i)+(n)-1)/n)*n)
+  #define ROUNDUP4(i)   (((i)+3)&~3)    /* special for n=4            */
+
+  /* ROUNDDOWN -- round an integer down to a multiple of n            */
+  #define ROUNDDOWN(i, n) (((i)/n)*n)
+  #define ROUNDDOWN4(i)   ((i)&~3)      /* special for n=4            */
+
+  /* References to multi-byte sequences under different sizes; these  */
+  /* require locally declared variables, but do not violate strict    */
+  /* aliasing or alignment (as did the UINTAT simple cast to uInt).   */
+  /* Variables needed are uswork, uiwork, etc. [so do not use at same */
+  /* level in an expression, e.g., UBTOUI(x)==UBTOUI(y) may fail].    */
+
+  /* Return a uInt, etc., from bytes starting at a char* or uByte*    */
+  #define UBTOUS(b)  (memcpy((void *)&uswork, b, 2), uswork)
+  #define UBTOUI(b)  (memcpy((void *)&uiwork, b, 4), uiwork)
+
+  /* Store a uInt, etc., into bytes starting at a char* or uByte*.    */
+  /* Returns i, evaluated, for convenience; has to use uiwork because */
+  /* i may be an expression.                                          */
+  #define UBFROMUS(b, i)  (uswork=(i), memcpy(b, (void *)&uswork, 2), uswork)
+  #define UBFROMUI(b, i)  (uiwork=(i), memcpy(b, (void *)&uiwork, 4), uiwork)
+
+  /* X10 and X100 -- multiply integer i by 10 or 100                  */
+  /* [shifts are usually faster than multiply; could be conditional]  */
+  #define X10(i)  (((i)<<1)+((i)<<3))
+  #define X100(i) (((i)<<2)+((i)<<5)+((i)<<6))
+
+  /* MAXI and MINI -- general max & min (not in ANSI) for integers    */
+  #define MAXI(x,y) ((x)<(y)?(y):(x))
+  #define MINI(x,y) ((x)>(y)?(y):(x))
+
+  /* Useful constants                                                 */
+  #define BILLION      1000000000            /* 10**9                 */
+  /* CHARMASK: 0x30303030 for ASCII/UTF8; 0xF0F0F0F0 for EBCDIC       */
+  #define CHARMASK ((((((((uInt)'0')<<8)+'0')<<8)+'0')<<8)+'0')
+
+
+  /* ---------------------------------------------------------------- */
+  /* Definitions for arbitrary-precision modules (only valid after     */
+  /* decNumber.h has been included)                                   */
+  /* ---------------------------------------------------------------- */
+
+  /* Limits and constants                                             */
+  #define DECNUMMAXP 999999999  /* maximum precision code can handle  */
+  #define DECNUMMAXE 999999999  /* maximum adjusted exponent ditto    */
+  #define DECNUMMINE -999999999 /* minimum adjusted exponent ditto    */
+  #if (DECNUMMAXP != DEC_MAX_DIGITS)
+    #error Maximum digits mismatch
+  #endif
+  #if (DECNUMMAXE != DEC_MAX_EMAX)
+    #error Maximum exponent mismatch
+  #endif
+  #if (DECNUMMINE != DEC_MIN_EMIN)
+    #error Minimum exponent mismatch
+  #endif
+
+  /* Set DECDPUNMAX -- the maximum integer that fits in DECDPUN       */
+  /* digits, and D2UTABLE -- the initializer for the D2U table        */
+  #if   DECDPUN==1
+    #define DECDPUNMAX 9
+    #define D2UTABLE {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,  \
+                      18,19,20,21,22,23,24,25,26,27,28,29,30,31,32, \
+                      33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, \
+                      48,49}
+  #elif DECDPUN==2
+    #define DECDPUNMAX 99
+    #define D2UTABLE {0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,  \
+                      11,11,12,12,13,13,14,14,15,15,16,16,17,17,18, \
+                      18,19,19,20,20,21,21,22,22,23,23,24,24,25}
+  #elif DECDPUN==3
+    #define DECDPUNMAX 999
+    #define D2UTABLE {0,1,1,1,2,2,2,3,3,3,4,4,4,5,5,5,6,6,6,7,7,7,  \
+                      8,8,8,9,9,9,10,10,10,11,11,11,12,12,12,13,13, \
+                      13,14,14,14,15,15,15,16,16,16,17}
+  #elif DECDPUN==4
+    #define DECDPUNMAX 9999
+    #define D2UTABLE {0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,  \
+                      6,6,6,7,7,7,7,8,8,8,8,9,9,9,9,10,10,10,10,11, \
+                      11,11,11,12,12,12,12,13}
+  #elif DECDPUN==5
+    #define DECDPUNMAX 99999
+    #define D2UTABLE {0,1,1,1,1,1,2,2,2,2,2,3,3,3,3,3,4,4,4,4,4,5,  \
+                      5,5,5,5,6,6,6,6,6,7,7,7,7,7,8,8,8,8,8,9,9,9,  \
+                      9,9,10,10,10,10}
+  #elif DECDPUN==6
+    #define DECDPUNMAX 999999
+    #define D2UTABLE {0,1,1,1,1,1,1,2,2,2,2,2,2,3,3,3,3,3,3,4,4,4,  \
+                      4,4,4,5,5,5,5,5,5,6,6,6,6,6,6,7,7,7,7,7,7,8,  \
+                      8,8,8,8,8,9}
+  #elif DECDPUN==7
+    #define DECDPUNMAX 9999999
+    #define D2UTABLE {0,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,3,3,3,3,3,3,  \
+                      4,4,4,4,4,4,4,5,5,5,5,5,5,5,6,6,6,6,6,6,6,7,  \
+                      7,7,7,7,7,7}
+  #elif DECDPUN==8
+    #define DECDPUNMAX 99999999
+    #define D2UTABLE {0,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,3,3,3,3,3,  \
+                      3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,6,6,6,  \
+                      6,6,6,6,6,7}
+  #elif DECDPUN==9
+    #define DECDPUNMAX 999999999
+    #define D2UTABLE {0,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,3,3,3,  \
+                      3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,  \
+                      5,5,6,6,6,6}
+  #elif defined(DECDPUN)
+    #error DECDPUN must be in the range 1-9
+  #endif
+
+  /* ----- Shared data (in decNumber.c) ----- */
+  /* Public lookup table used by the D2U macro (see below)            */
+  #define DECMAXD2U 49
+  extern const uByte d2utable[DECMAXD2U+1];
+
+  /* ----- Macros ----- */
+  /* ISZERO -- return true if decNumber dn is a zero                  */
+  /* [performance-critical in some situations]                        */
+  #define ISZERO(dn) decNumberIsZero(dn)     /* now just a local name */
+
+  /* D2U -- return the number of Units needed to hold d digits        */
+  /* (runtime version, with table lookaside for small d)              */
+  #if DECDPUN==8
+    #define D2U(d) ((unsigned)((d)<=DECMAXD2U?d2utable[d]:((d)+7)>>3))
+  #elif DECDPUN==4
+    #define D2U(d) ((unsigned)((d)<=DECMAXD2U?d2utable[d]:((d)+3)>>2))
+  #else
+    #define D2U(d) ((d)<=DECMAXD2U?d2utable[d]:((d)+DECDPUN-1)/DECDPUN)
+  #endif
+  /* SD2U -- static D2U macro (for compile-time calculation)          */
+  #define SD2U(d) (((d)+DECDPUN-1)/DECDPUN)
+
+  /* MSUDIGITS -- returns digits in msu, from digits, calculated      */
+  /* using D2U                                                        */
+  #define MSUDIGITS(d) ((d)-(D2U(d)-1)*DECDPUN)
+
+  /* D2N -- return the number of decNumber structs that would be      */
+  /* needed to contain that number of digits (and the initial         */
+  /* decNumber struct) safely.  Note that one Unit is included in the */
+  /* initial structure.  Used for allocating space that is aligned on */
+  /* a decNumber struct boundary. */
+  #define D2N(d) \
+    ((((SD2U(d)-1)*sizeof(Unit))+sizeof(decNumber)*2-1)/sizeof(decNumber))
+
+  /* TODIGIT -- macro to remove the leading digit from the unsigned   */
+  /* integer u at column cut (counting from the right, LSD=0) and     */
+  /* place it as an ASCII character into the character pointed to by  */
+  /* c.  Note that cut must be <= 9, and the maximum value for u is   */
+  /* 2,000,000,000 (as is needed for negative exponents of            */
+  /* subnormals).  The unsigned integer pow is used as a temporary    */
+  /* variable. */
+  #define TODIGIT(u, cut, c, pow) {       \
+    *(c)='0';                             \
+    pow=DECPOWERS[cut]*2;                 \
+    if ((u)>pow) {                        \
+      pow*=4;                             \
+      if ((u)>=pow) {(u)-=pow; *(c)+=8;}  \
+      pow/=2;                             \
+      if ((u)>=pow) {(u)-=pow; *(c)+=4;}  \
+      pow/=2;                             \
+      }                                   \
+    if ((u)>=pow) {(u)-=pow; *(c)+=2;}    \
+    pow/=2;                               \
+    if ((u)>=pow) {(u)-=pow; *(c)+=1;}    \
+    }
+
+  /* ---------------------------------------------------------------- */
+  /* Definitions for fixed-precision modules (only valid after        */
+  /* decSingle.h, decDouble.h, or decQuad.h has been included)        */
+  /* ---------------------------------------------------------------- */
+
+  /* bcdnum -- a structure describing a format-independent finite     */
+  /* number, whose coefficient is a string of bcd8 uBytes             */
+  typedef struct {
+    uByte   *msd;             /* -> most significant digit            */
+    uByte   *lsd;             /* -> least ditto                       */
+    uInt     sign;            /* 0=positive, DECFLOAT_Sign=negative   */
+    Int      exponent;        /* Unadjusted signed exponent (q), or   */
+                              /* DECFLOAT_NaN etc. for a special      */
+    } bcdnum;
+
+  /* Test if exponent or bcdnum exponent must be a special, etc.      */
+  #define EXPISSPECIAL(exp) ((exp)>=DECFLOAT_MinSp)
+  #define EXPISINF(exp) (exp==DECFLOAT_Inf)
+  #define EXPISNAN(exp) (exp==DECFLOAT_qNaN || exp==DECFLOAT_sNaN)
+  #define NUMISSPECIAL(num) (EXPISSPECIAL((num)->exponent))
+
+  /* Refer to a 32-bit word or byte in a decFloat (df) by big-endian  */
+  /* (array) notation (the 0 word or byte contains the sign bit),     */
+  /* automatically adjusting for endianness; similarly address a word */
+  /* in the next-wider format (decFloatWider, or dfw)                 */
+  #define DECWORDS  (DECBYTES/4)
+  #define DECWWORDS (DECWBYTES/4)
+  #if DECLITEND
+    #define DFBYTE(df, off)   ((df)->bytes[DECBYTES-1-(off)])
+    #define DFWORD(df, off)   ((df)->words[DECWORDS-1-(off)])
+    #define DFWWORD(dfw, off) ((dfw)->words[DECWWORDS-1-(off)])
+  #else
+    #define DFBYTE(df, off)   ((df)->bytes[off])
+    #define DFWORD(df, off)   ((df)->words[off])
+    #define DFWWORD(dfw, off) ((dfw)->words[off])
+  #endif
+
+  /* Tests for sign or specials, directly on DECFLOATs                */
+  #define DFISSIGNED(df)  ((DFWORD(df, 0)&0x80000000)!=0)
+  #define DFISSPECIAL(df) ((DFWORD(df, 0)&0x78000000)==0x78000000)
+  #define DFISINF(df)     ((DFWORD(df, 0)&0x7c000000)==0x78000000)
+  #define DFISNAN(df)     ((DFWORD(df, 0)&0x7c000000)==0x7c000000)
+  #define DFISQNAN(df)    ((DFWORD(df, 0)&0x7e000000)==0x7c000000)
+  #define DFISSNAN(df)    ((DFWORD(df, 0)&0x7e000000)==0x7e000000)
+
+  /* Shared lookup tables                                             */
+  extern const uInt   DECCOMBMSD[64];   /* Combination field -> MSD   */
+  extern const uInt   DECCOMBFROM[48];  /* exp+msd -> Combination     */
+
+  /* Private generic (utility) routine                                */
+  #if DECCHECK || DECTRACE
+    extern void decShowNum(const bcdnum *, const char *);
+  #endif
+
+  /* Format-dependent macros and constants                            */
+  #if defined(DECPMAX)
+
+    /* Useful constants                                               */
+    #define DECPMAX9  (ROUNDUP(DECPMAX, 9)/9)  /* 'Pmax' in 10**9s    */
+    /* Top words for a zero                                           */
+    #define SINGLEZERO   0x22500000
+    #define DOUBLEZERO   0x22380000
+    #define QUADZERO     0x22080000
+    /* [ZEROWORD is defined to be one of these in the DFISZERO macro] */
+
+    /* Format-dependent common tests:                                 */
+    /*   DFISZERO   -- test for (any) zero                            */
+    /*   DFISCCZERO -- test for coefficient continuation being zero   */
+    /*   DFISCC01   -- test for coefficient contains only 0s and 1s   */
+    /*   DFISINT    -- test for finite and exponent q=0               */
+    /*   DFISUINT01 -- test for sign=0, finite, exponent q=0, and     */
+    /*                 MSD=0 or 1                                     */
+    /*   ZEROWORD is also defined here.                               */
+    /*                                                                */
+    /* In DFISZERO the first test checks the least-significant word   */
+    /* (most likely to be non-zero); the penultimate tests MSD and    */
+    /* DPDs in the signword, and the final test excludes specials and */
+    /* MSD>7.  DFISINT similarly has to allow for the two forms of    */
+    /* MSD codes.  DFISUINT01 only has to allow for one form of MSD   */
+    /* code.                                                          */
+    #if DECPMAX==7
+      #define ZEROWORD SINGLEZERO
+      /* [test macros not needed except for Zero]                     */
+      #define DFISZERO(df)  ((DFWORD(df, 0)&0x1c0fffff)==0         \
+                          && (DFWORD(df, 0)&0x60000000)!=0x60000000)
+    #elif DECPMAX==16
+      #define ZEROWORD DOUBLEZERO
+      #define DFISZERO(df)  ((DFWORD(df, 1)==0                     \
+                          && (DFWORD(df, 0)&0x1c03ffff)==0         \
+                          && (DFWORD(df, 0)&0x60000000)!=0x60000000))
+      #define DFISINT(df) ((DFWORD(df, 0)&0x63fc0000)==0x22380000  \
+                         ||(DFWORD(df, 0)&0x7bfc0000)==0x6a380000)
+      #define DFISUINT01(df) ((DFWORD(df, 0)&0xfbfc0000)==0x22380000)
+      #define DFISCCZERO(df) (DFWORD(df, 1)==0                     \
+                          && (DFWORD(df, 0)&0x0003ffff)==0)
+      #define DFISCC01(df)  ((DFWORD(df, 0)&~0xfffc9124)==0        \
+                          && (DFWORD(df, 1)&~0x49124491)==0)
+    #elif DECPMAX==34
+      #define ZEROWORD QUADZERO
+      #define DFISZERO(df)  ((DFWORD(df, 3)==0                     \
+                          &&  DFWORD(df, 2)==0                     \
+                          &&  DFWORD(df, 1)==0                     \
+                          && (DFWORD(df, 0)&0x1c003fff)==0         \
+                          && (DFWORD(df, 0)&0x60000000)!=0x60000000))
+      #define DFISINT(df) ((DFWORD(df, 0)&0x63ffc000)==0x22080000  \
+                         ||(DFWORD(df, 0)&0x7bffc000)==0x6a080000)
+      #define DFISUINT01(df) ((DFWORD(df, 0)&0xfbffc000)==0x22080000)
+      #define DFISCCZERO(df) (DFWORD(df, 3)==0                     \
+                          &&  DFWORD(df, 2)==0                     \
+                          &&  DFWORD(df, 1)==0                     \
+                          && (DFWORD(df, 0)&0x00003fff)==0)
+
+      #define DFISCC01(df)   ((DFWORD(df, 0)&~0xffffc912)==0       \
+                          &&  (DFWORD(df, 1)&~0x44912449)==0       \
+                          &&  (DFWORD(df, 2)&~0x12449124)==0       \
+                          &&  (DFWORD(df, 3)&~0x49124491)==0)
+    #endif
+
+    /* Macros to test if a certain 10 bits of a uInt or pair of uInts */
+    /* are a canonical declet [higher or lower bits are ignored].     */
+    /* declet is at offset 0 (from the right) in a uInt:              */
+    #define CANONDPD(dpd) (((dpd)&0x300)==0 || ((dpd)&0x6e)!=0x6e)
+    /* declet is at offset k (a multiple of 2) in a uInt:             */
+    #define CANONDPDOFF(dpd, k) (((dpd)&(0x300<<(k)))==0            \
+      || ((dpd)&(((uInt)0x6e)<<(k)))!=(((uInt)0x6e)<<(k)))
+    /* declet is at offset k (a multiple of 2) in a pair of uInts:    */
+    /* [the top 2 bits will always be in the more-significant uInt]   */
+    #define CANONDPDTWO(hi, lo, k) (((hi)&(0x300>>(32-(k))))==0     \
+      || ((hi)&(0x6e>>(32-(k))))!=(0x6e>>(32-(k)))                  \
+      || ((lo)&(((uInt)0x6e)<<(k)))!=(((uInt)0x6e)<<(k)))
+
+    /* Macro to test whether a full-length (length DECPMAX) BCD8      */
+    /* coefficient, starting at uByte u, is all zeros                 */
+    /* Test just the LSWord first, then the remainder as a sequence   */
+    /* of tests in order to avoid same-level use of UBTOUI            */
+    #if DECPMAX==7
+      #define ISCOEFFZERO(u) (                                      \
+           UBTOUI((u)+DECPMAX-4)==0                                 \
+        && UBTOUS((u)+DECPMAX-6)==0                                 \
+        && *(u)==0)
+    #elif DECPMAX==16
+      #define ISCOEFFZERO(u) (                                      \
+           UBTOUI((u)+DECPMAX-4)==0                                 \
+        && UBTOUI((u)+DECPMAX-8)==0                                 \
+        && UBTOUI((u)+DECPMAX-12)==0                                \
+        && UBTOUI(u)==0)
+    #elif DECPMAX==34
+      #define ISCOEFFZERO(u) (                                      \
+           UBTOUI((u)+DECPMAX-4)==0                                 \
+        && UBTOUI((u)+DECPMAX-8)==0                                 \
+        && UBTOUI((u)+DECPMAX-12)==0                                \
+        && UBTOUI((u)+DECPMAX-16)==0                                \
+        && UBTOUI((u)+DECPMAX-20)==0                                \
+        && UBTOUI((u)+DECPMAX-24)==0                                \
+        && UBTOUI((u)+DECPMAX-28)==0                                \
+        && UBTOUI((u)+DECPMAX-32)==0                                \
+        && UBTOUS(u)==0)
+    #endif
+
+    /* Macros and masks for the sign, exponent continuation, and MSD  */
+    /* Get the sign as DECFLOAT_Sign or 0                             */
+    #define GETSIGN(df) (DFWORD(df, 0)&0x80000000)
+    /* Get the exponent continuation from a decFloat *df as an Int    */
+    #define GETECON(df) ((Int)((DFWORD((df), 0)&0x03ffffff)>>(32-6-DECECONL)))
+    /* Ditto, from the next-wider format                              */
+    #define GETWECON(df) ((Int)((DFWWORD((df), 0)&0x03ffffff)>>(32-6-DECWECONL)))
+    /* Get the biased exponent similarly                              */
+    #define GETEXP(df)  ((Int)(DECCOMBEXP[DFWORD((df), 0)>>26]+GETECON(df)))
+    /* Get the unbiased exponent similarly                            */
+    #define GETEXPUN(df) ((Int)GETEXP(df)-DECBIAS)
+    /* Get the MSD similarly (as uInt)                                */
+    #define GETMSD(df)   (DECCOMBMSD[DFWORD((df), 0)>>26])
+
+    /* Compile-time computes of the exponent continuation field masks */
+    /* full exponent continuation field:                              */
+    #define ECONMASK ((0x03ffffff>>(32-6-DECECONL))<<(32-6-DECECONL))
+    /* same, not including its first digit (the qNaN/sNaN selector):  */
+    #define ECONNANMASK ((0x01ffffff>>(32-6-DECECONL))<<(32-6-DECECONL))
+
+    /* Macros to decode the coefficient in a finite decFloat *df into */
+    /* a BCD string (uByte *bcdin) of length DECPMAX uBytes.          */
+
+    /* In-line sequence to convert least significant 10 bits of uInt  */
+    /* dpd to three BCD8 digits starting at uByte u.  Note that an    */
+    /* extra byte is written to the right of the three digits because */
+    /* four bytes are moved at a time for speed; the alternative      */
+    /* macro moves exactly three bytes (usually slower).              */
+    #define dpd2bcd8(u, dpd)  memcpy(u, &DPD2BCD8[((dpd)&0x3ff)*4], 4)
+    #define dpd2bcd83(u, dpd) memcpy(u, &DPD2BCD8[((dpd)&0x3ff)*4], 3)
+
+    /* Decode the declets.  After extracting each one, it is decoded  */
+    /* to BCD8 using a table lookup (also used for variable-length    */
+    /* decode).  Each DPD decode is 3 bytes BCD8 plus a one-byte      */
+    /* length which is not used, here).  Fixed-length 4-byte moves    */
+    /* are fast, however, almost everywhere, and so are used except   */
+    /* for the final three bytes (to avoid overrun).  The code below  */
+    /* is 36 instructions for Doubles and about 70 for Quads, even    */
+    /* on IA32.                                                       */
+
+    /* Two macros are defined for each format:                        */
+    /*   GETCOEFF extracts the coefficient of the current format      */
+    /*   GETWCOEFF extracts the coefficient of the next-wider format. */
+    /* The latter is a copy of the next-wider GETCOEFF using DFWWORD. */
+
+    #if DECPMAX==7
+    #define GETCOEFF(df, bcd) {                          \
+      uInt sourhi=DFWORD(df, 0);                         \
+      *(bcd)=(uByte)DECCOMBMSD[sourhi>>26];              \
+      dpd2bcd8(bcd+1, sourhi>>10);                       \
+      dpd2bcd83(bcd+4, sourhi);}
+    #define GETWCOEFF(df, bcd) {                         \
+      uInt sourhi=DFWWORD(df, 0);                        \
+      uInt sourlo=DFWWORD(df, 1);                        \
+      *(bcd)=(uByte)DECCOMBMSD[sourhi>>26];              \
+      dpd2bcd8(bcd+1, sourhi>>8);                        \
+      dpd2bcd8(bcd+4, (sourhi<<2) | (sourlo>>30));       \
+      dpd2bcd8(bcd+7, sourlo>>20);                       \
+      dpd2bcd8(bcd+10, sourlo>>10);                      \
+      dpd2bcd83(bcd+13, sourlo);}
+
+    #elif DECPMAX==16
+    #define GETCOEFF(df, bcd) {                          \
+      uInt sourhi=DFWORD(df, 0);                         \
+      uInt sourlo=DFWORD(df, 1);                         \
+      *(bcd)=(uByte)DECCOMBMSD[sourhi>>26];              \
+      dpd2bcd8(bcd+1, sourhi>>8);                        \
+      dpd2bcd8(bcd+4, (sourhi<<2) | (sourlo>>30));       \
+      dpd2bcd8(bcd+7, sourlo>>20);                       \
+      dpd2bcd8(bcd+10, sourlo>>10);                      \
+      dpd2bcd83(bcd+13, sourlo);}
+    #define GETWCOEFF(df, bcd) {                         \
+      uInt sourhi=DFWWORD(df, 0);                        \
+      uInt sourmh=DFWWORD(df, 1);                        \
+      uInt sourml=DFWWORD(df, 2);                        \
+      uInt sourlo=DFWWORD(df, 3);                        \
+      *(bcd)=(uByte)DECCOMBMSD[sourhi>>26];              \
+      dpd2bcd8(bcd+1, sourhi>>4);                        \
+      dpd2bcd8(bcd+4, ((sourhi)<<6) | (sourmh>>26));     \
+      dpd2bcd8(bcd+7, sourmh>>16);                       \
+      dpd2bcd8(bcd+10, sourmh>>6);                       \
+      dpd2bcd8(bcd+13, ((sourmh)<<4) | (sourml>>28));    \
+      dpd2bcd8(bcd+16, sourml>>18);                      \
+      dpd2bcd8(bcd+19, sourml>>8);                       \
+      dpd2bcd8(bcd+22, ((sourml)<<2) | (sourlo>>30));    \
+      dpd2bcd8(bcd+25, sourlo>>20);                      \
+      dpd2bcd8(bcd+28, sourlo>>10);                      \
+      dpd2bcd83(bcd+31, sourlo);}
+
+    #elif DECPMAX==34
+    #define GETCOEFF(df, bcd) {                          \
+      uInt sourhi=DFWORD(df, 0);                         \
+      uInt sourmh=DFWORD(df, 1);                         \
+      uInt sourml=DFWORD(df, 2);                         \
+      uInt sourlo=DFWORD(df, 3);                         \
+      *(bcd)=(uByte)DECCOMBMSD[sourhi>>26];              \
+      dpd2bcd8(bcd+1, sourhi>>4);                        \
+      dpd2bcd8(bcd+4, ((sourhi)<<6) | (sourmh>>26));     \
+      dpd2bcd8(bcd+7, sourmh>>16);                       \
+      dpd2bcd8(bcd+10, sourmh>>6);                       \
+      dpd2bcd8(bcd+13, ((sourmh)<<4) | (sourml>>28));    \
+      dpd2bcd8(bcd+16, sourml>>18);                      \
+      dpd2bcd8(bcd+19, sourml>>8);                       \
+      dpd2bcd8(bcd+22, ((sourml)<<2) | (sourlo>>30));    \
+      dpd2bcd8(bcd+25, sourlo>>20);                      \
+      dpd2bcd8(bcd+28, sourlo>>10);                      \
+      dpd2bcd83(bcd+31, sourlo);}
+
+      #define GETWCOEFF(df, bcd) {??} /* [should never be used]       */
+    #endif
+
+    /* Macros to decode the coefficient in a finite decFloat *df into */
+    /* a base-billion uInt array, with the least-significant          */
+    /* 0-999999999 'digit' at offset 0.                               */
+
+    /* Decode the declets.  After extracting each one, it is decoded  */
+    /* to binary using a table lookup.  Three tables are used; one    */
+    /* the usual DPD to binary, the other two pre-multiplied by 1000  */
+    /* and 1000000 to avoid multiplication during decode.  These      */
+    /* tables can also be used for multiplying up the MSD as the DPD  */
+    /* code for 0 through 9 is the identity.                          */
+    #define DPD2BIN0 DPD2BIN         /* for prettier code             */
+
+    #if DECPMAX==7
+    #define GETCOEFFBILL(df, buf) {                           \
+      uInt sourhi=DFWORD(df, 0);                              \
+      (buf)[0]=DPD2BIN0[sourhi&0x3ff]                         \
+              +DPD2BINK[(sourhi>>10)&0x3ff]                   \
+              +DPD2BINM[DECCOMBMSD[sourhi>>26]];}
+
+    #elif DECPMAX==16
+    #define GETCOEFFBILL(df, buf) {                           \
+      uInt sourhi, sourlo;                                    \
+      sourlo=DFWORD(df, 1);                                   \
+      (buf)[0]=DPD2BIN0[sourlo&0x3ff]                         \
+              +DPD2BINK[(sourlo>>10)&0x3ff]                   \
+              +DPD2BINM[(sourlo>>20)&0x3ff];                  \
+      sourhi=DFWORD(df, 0);                                   \
+      (buf)[1]=DPD2BIN0[((sourhi<<2) | (sourlo>>30))&0x3ff]   \
+              +DPD2BINK[(sourhi>>8)&0x3ff]                    \
+              +DPD2BINM[DECCOMBMSD[sourhi>>26]];}
+
+    #elif DECPMAX==34
+    #define GETCOEFFBILL(df, buf) {                           \
+      uInt sourhi, sourmh, sourml, sourlo;                    \
+      sourlo=DFWORD(df, 3);                                   \
+      (buf)[0]=DPD2BIN0[sourlo&0x3ff]                         \
+              +DPD2BINK[(sourlo>>10)&0x3ff]                   \
+              +DPD2BINM[(sourlo>>20)&0x3ff];                  \
+      sourml=DFWORD(df, 2);                                   \
+      (buf)[1]=DPD2BIN0[((sourml<<2) | (sourlo>>30))&0x3ff]   \
+              +DPD2BINK[(sourml>>8)&0x3ff]                    \
+              +DPD2BINM[(sourml>>18)&0x3ff];                  \
+      sourmh=DFWORD(df, 1);                                   \
+      (buf)[2]=DPD2BIN0[((sourmh<<4) | (sourml>>28))&0x3ff]   \
+              +DPD2BINK[(sourmh>>6)&0x3ff]                    \
+              +DPD2BINM[(sourmh>>16)&0x3ff];                  \
+      sourhi=DFWORD(df, 0);                                   \
+      (buf)[3]=DPD2BIN0[((sourhi<<6) | (sourmh>>26))&0x3ff]   \
+              +DPD2BINK[(sourhi>>4)&0x3ff]                    \
+              +DPD2BINM[DECCOMBMSD[sourhi>>26]];}
+
+    #endif
+
+    /* Macros to decode the coefficient in a finite decFloat *df into */
+    /* a base-thousand uInt array (of size DECLETS+1, to allow for    */
+    /* the MSD), with the least-significant 0-999 'digit' at offset 0.*/
+
+    /* Decode the declets.  After extracting each one, it is decoded  */
+    /* to binary using a table lookup.                                */
+    #if DECPMAX==7
+    #define GETCOEFFTHOU(df, buf) {                           \
+      uInt sourhi=DFWORD(df, 0);                              \
+      (buf)[0]=DPD2BIN[sourhi&0x3ff];                         \
+      (buf)[1]=DPD2BIN[(sourhi>>10)&0x3ff];                   \
+      (buf)[2]=DECCOMBMSD[sourhi>>26];}
+
+    #elif DECPMAX==16
+    #define GETCOEFFTHOU(df, buf) {                           \
+      uInt sourhi, sourlo;                                    \
+      sourlo=DFWORD(df, 1);                                   \
+      (buf)[0]=DPD2BIN[sourlo&0x3ff];                         \
+      (buf)[1]=DPD2BIN[(sourlo>>10)&0x3ff];                   \
+      (buf)[2]=DPD2BIN[(sourlo>>20)&0x3ff];                   \
+      sourhi=DFWORD(df, 0);                                   \
+      (buf)[3]=DPD2BIN[((sourhi<<2) | (sourlo>>30))&0x3ff];   \
+      (buf)[4]=DPD2BIN[(sourhi>>8)&0x3ff];                    \
+      (buf)[5]=DECCOMBMSD[sourhi>>26];}
+
+    #elif DECPMAX==34
+    #define GETCOEFFTHOU(df, buf) {                           \
+      uInt sourhi, sourmh, sourml, sourlo;                    \
+      sourlo=DFWORD(df, 3);                                   \
+      (buf)[0]=DPD2BIN[sourlo&0x3ff];                         \
+      (buf)[1]=DPD2BIN[(sourlo>>10)&0x3ff];                   \
+      (buf)[2]=DPD2BIN[(sourlo>>20)&0x3ff];                   \
+      sourml=DFWORD(df, 2);                                   \
+      (buf)[3]=DPD2BIN[((sourml<<2) | (sourlo>>30))&0x3ff];   \
+      (buf)[4]=DPD2BIN[(sourml>>8)&0x3ff];                    \
+      (buf)[5]=DPD2BIN[(sourml>>18)&0x3ff];                   \
+      sourmh=DFWORD(df, 1);                                   \
+      (buf)[6]=DPD2BIN[((sourmh<<4) | (sourml>>28))&0x3ff];   \
+      (buf)[7]=DPD2BIN[(sourmh>>6)&0x3ff];                    \
+      (buf)[8]=DPD2BIN[(sourmh>>16)&0x3ff];                   \
+      sourhi=DFWORD(df, 0);                                   \
+      (buf)[9]=DPD2BIN[((sourhi<<6) | (sourmh>>26))&0x3ff];   \
+      (buf)[10]=DPD2BIN[(sourhi>>4)&0x3ff];                   \
+      (buf)[11]=DECCOMBMSD[sourhi>>26];}
+    #endif
+
+
+    /* Macros to decode the coefficient in a finite decFloat *df and  */
+    /* add to a base-thousand uInt array (as for GETCOEFFTHOU).       */
+    /* After the addition then most significant 'digit' in the array  */
+    /* might have a value larger then 10 (with a maximum of 19).      */
+    #if DECPMAX==7
+    #define ADDCOEFFTHOU(df, buf) {                           \
+      uInt sourhi=DFWORD(df, 0);                              \
+      (buf)[0]+=DPD2BIN[sourhi&0x3ff];                        \
+      if (buf[0]>999) {buf[0]-=1000; buf[1]++;}               \
+      (buf)[1]+=DPD2BIN[(sourhi>>10)&0x3ff];                  \
+      if (buf[1]>999) {buf[1]-=1000; buf[2]++;}               \
+      (buf)[2]+=DECCOMBMSD[sourhi>>26];}
+
+    #elif DECPMAX==16
+    #define ADDCOEFFTHOU(df, buf) {                           \
+      uInt sourhi, sourlo;                                    \
+      sourlo=DFWORD(df, 1);                                   \
+      (buf)[0]+=DPD2BIN[sourlo&0x3ff];                        \
+      if (buf[0]>999) {buf[0]-=1000; buf[1]++;}               \
+      (buf)[1]+=DPD2BIN[(sourlo>>10)&0x3ff];                  \
+      if (buf[1]>999) {buf[1]-=1000; buf[2]++;}               \
+      (buf)[2]+=DPD2BIN[(sourlo>>20)&0x3ff];                  \
+      if (buf[2]>999) {buf[2]-=1000; buf[3]++;}               \
+      sourhi=DFWORD(df, 0);                                   \
+      (buf)[3]+=DPD2BIN[((sourhi<<2) | (sourlo>>30))&0x3ff];  \
+      if (buf[3]>999) {buf[3]-=1000; buf[4]++;}               \
+      (buf)[4]+=DPD2BIN[(sourhi>>8)&0x3ff];                   \
+      if (buf[4]>999) {buf[4]-=1000; buf[5]++;}               \
+      (buf)[5]+=DECCOMBMSD[sourhi>>26];}
+
+    #elif DECPMAX==34
+    #define ADDCOEFFTHOU(df, buf) {                           \
+      uInt sourhi, sourmh, sourml, sourlo;                    \
+      sourlo=DFWORD(df, 3);                                   \
+      (buf)[0]+=DPD2BIN[sourlo&0x3ff];                        \
+      if (buf[0]>999) {buf[0]-=1000; buf[1]++;}               \
+      (buf)[1]+=DPD2BIN[(sourlo>>10)&0x3ff];                  \
+      if (buf[1]>999) {buf[1]-=1000; buf[2]++;}               \
+      (buf)[2]+=DPD2BIN[(sourlo>>20)&0x3ff];                  \
+      if (buf[2]>999) {buf[2]-=1000; buf[3]++;}               \
+      sourml=DFWORD(df, 2);                                   \
+      (buf)[3]+=DPD2BIN[((sourml<<2) | (sourlo>>30))&0x3ff];  \
+      if (buf[3]>999) {buf[3]-=1000; buf[4]++;}               \
+      (buf)[4]+=DPD2BIN[(sourml>>8)&0x3ff];                   \
+      if (buf[4]>999) {buf[4]-=1000; buf[5]++;}               \
+      (buf)[5]+=DPD2BIN[(sourml>>18)&0x3ff];                  \
+      if (buf[5]>999) {buf[5]-=1000; buf[6]++;}               \
+      sourmh=DFWORD(df, 1);                                   \
+      (buf)[6]+=DPD2BIN[((sourmh<<4) | (sourml>>28))&0x3ff];  \
+      if (buf[6]>999) {buf[6]-=1000; buf[7]++;}               \
+      (buf)[7]+=DPD2BIN[(sourmh>>6)&0x3ff];                   \
+      if (buf[7]>999) {buf[7]-=1000; buf[8]++;}               \
+      (buf)[8]+=DPD2BIN[(sourmh>>16)&0x3ff];                  \
+      if (buf[8]>999) {buf[8]-=1000; buf[9]++;}               \
+      sourhi=DFWORD(df, 0);                                   \
+      (buf)[9]+=DPD2BIN[((sourhi<<6) | (sourmh>>26))&0x3ff];  \
+      if (buf[9]>999) {buf[9]-=1000; buf[10]++;}              \
+      (buf)[10]+=DPD2BIN[(sourhi>>4)&0x3ff];                  \
+      if (buf[10]>999) {buf[10]-=1000; buf[11]++;}            \
+      (buf)[11]+=DECCOMBMSD[sourhi>>26];}
+    #endif
+
+
+    /* Set a decFloat to the maximum positive finite number (Nmax)    */
+    #if DECPMAX==7
+    #define DFSETNMAX(df)            \
+      {DFWORD(df, 0)=0x77f3fcff;}
+    #elif DECPMAX==16
+    #define DFSETNMAX(df)            \
+      {DFWORD(df, 0)=0x77fcff3f;     \
+       DFWORD(df, 1)=0xcff3fcff;}
+    #elif DECPMAX==34
+    #define DFSETNMAX(df)            \
+      {DFWORD(df, 0)=0x77ffcff3;     \
+       DFWORD(df, 1)=0xfcff3fcf;     \
+       DFWORD(df, 2)=0xf3fcff3f;     \
+       DFWORD(df, 3)=0xcff3fcff;}
+    #endif
+
+  /* [end of format-dependent macros and constants]                   */
+  #endif
+
+#else
+  #error decNumberLocal included more than once
+#endif
@@ -0,0 +1,220 @@
+/* ------------------------------------------------------------------ */
+/* Packed Decimal conversion module                                   */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2002.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises the routines for Packed Decimal format       */
+/* numbers.  Conversions are supplied to and from decNumber, which in */
+/* turn supports:                                                     */
+/*   conversions to and from string                                   */
+/*   arithmetic routines                                              */
+/*   utilities.                                                       */
+/* Conversions from decNumber to and from densely packed decimal      */
+/* formats are provided by the decimal32 through decimal128 modules.  */
+/* ------------------------------------------------------------------ */
+
+#include <string.h>           // for NULL
+#include "decNumber.h"        // base number library
+#include "decPacked.h"        // packed decimal
+#include "decNumberLocal.h"   // decNumber local types, etc.
+
+/* ------------------------------------------------------------------ */
+/* decPackedFromNumber -- convert decNumber to BCD Packed Decimal     */
+/*                                                                    */
+/*   bcd    is the BCD bytes                                          */
+/*   length is the length of the BCD array                            */
+/*   scale  is the scale result                                       */
+/*   dn     is the decNumber                                          */
+/*   returns bcd, or NULL if error                                    */
+/*                                                                    */
+/* The number is converted to a BCD packed decimal byte array,        */
+/* right aligned in the bcd array, whose length is indicated by the   */
+/* second parameter.  The final 4-bit nibble in the array will be a   */
+/* sign nibble, C (1100) for + and D (1101) for -.  Unused bytes and  */
+/* nibbles to the left of the number are set to 0.                    */
+/*                                                                    */
+/* scale is set to the scale of the number (this is the exponent,     */
+/* negated).  To force the number to a specified scale, first use the */
+/* decNumberRescale routine, which will round and change the exponent */
+/* as necessary.                                                      */
+/*                                                                    */
+/* If there is an error (that is, the decNumber has too many digits   */
+/* to fit in length bytes, or it is a NaN or Infinity), NULL is       */
+/* returned and the bcd and scale results are unchanged.  Otherwise   */
+/* bcd is returned.                                                   */
+/* ------------------------------------------------------------------ */
+uByte * decPackedFromNumber(uByte *bcd, Int length, Int *scale,
+                            const decNumber *dn) {
+  const Unit *up=dn->lsu;     // Unit array pointer
+  uByte obyte, *out;          // current output byte, and where it goes
+  Int indigs=dn->digits;      // digits processed
+  uInt cut=DECDPUN;           // downcounter per Unit
+  uInt u=*up;                 // work
+  uInt nib;                   // ..
+  #if DECDPUN<=4
+  uInt temp;                  // ..
+  #endif
+
+  if (dn->digits>length*2-1                  // too long ..
+   ||(dn->bits & DECSPECIAL)) return NULL;   // .. or special -- hopeless
+
+  if (dn->bits&DECNEG) obyte=DECPMINUS;      // set the sign ..
+   else                obyte=DECPPLUS;
+  *scale=-dn->exponent;                      // .. and scale
+
+  // loop from lowest (rightmost) byte
+  out=bcd+length-1;                          // -> final byte
+  for (; out>=bcd; out--) {
+    if (indigs>0) {
+      if (cut==0) {
+        up++;
+        u=*up;
+        cut=DECDPUN;
+        }
+      #if DECDPUN<=4
+        temp=(u*6554)>>16;         // fast /10
+        nib=u-X10(temp);
+        u=temp;
+      #else
+        nib=u%10;                  // cannot use *6554 trick :-(
+        u=u/10;
+      #endif
+      obyte|=(nib<<4);
+      indigs--;
+      cut--;
+      }
+    *out=obyte;
+    obyte=0;                       // assume 0
+    if (indigs>0) {
+      if (cut==0) {
+        up++;
+        u=*up;
+        cut=DECDPUN;
+        }
+      #if DECDPUN<=4
+        temp=(u*6554)>>16;         // as above
+        obyte=(uByte)(u-X10(temp));
+        u=temp;
+      #else
+        obyte=(uByte)(u%10);
+        u=u/10;
+      #endif
+      indigs--;
+      cut--;
+      }
+    } // loop
+
+  return bcd;
+  } // decPackedFromNumber
+
+/* ------------------------------------------------------------------ */
+/* decPackedToNumber -- convert BCD Packed Decimal to a decNumber     */
+/*                                                                    */
+/*   bcd    is the BCD bytes                                          */
+/*   length is the length of the BCD array                            */
+/*   scale  is the scale associated with the BCD integer              */
+/*   dn     is the decNumber [with space for length*2 digits]         */
+/*   returns dn, or NULL if error                                     */
+/*                                                                    */
+/* The BCD packed decimal byte array, together with an associated     */
+/* scale, is converted to a decNumber.  The BCD array is assumed full */
+/* of digits, and must be ended by a 4-bit sign nibble in the least   */
+/* significant four bits of the final byte.                           */
+/*                                                                    */
+/* The scale is used (negated) as the exponent of the decNumber.      */
+/* Note that zeros may have a sign and/or a scale.                    */
+/*                                                                    */
+/* The decNumber structure is assumed to have sufficient space to     */
+/* hold the converted number (that is, up to length*2-1 digits), so   */
+/* no error is possible unless the adjusted exponent is out of range, */
+/* no sign nibble was found, or a sign nibble was found before the    */
+/* final nibble.  In these error cases, NULL is returned and the      */
+/* decNumber will be 0.                                               */
+/* ------------------------------------------------------------------ */
+decNumber * decPackedToNumber(const uByte *bcd, Int length,
+                              const Int *scale, decNumber *dn) {
+  const uByte *last=bcd+length-1;  // -> last byte
+  const uByte *first;              // -> first non-zero byte
+  uInt  nib;                       // work nibble
+  Unit  *up=dn->lsu;               // output pointer
+  Int   digits;                    // digits count
+  Int   cut=0;                     // phase of output
+
+  decNumberZero(dn);               // default result
+  last=&bcd[length-1];
+  nib=*last & 0x0f;                // get the sign
+  if (nib==DECPMINUS || nib==DECPMINUSALT) dn->bits=DECNEG;
+   else if (nib<=9) return NULL;   // not a sign nibble
+
+  // skip leading zero bytes [final byte is always non-zero, due to sign]
+  for (first=bcd; *first==0;) first++;
+  digits=(last-first)*2+1;              // calculate digits ..
+  if ((*first & 0xf0)==0) digits--;     // adjust for leading zero nibble
+  if (digits!=0) dn->digits=digits;     // count of actual digits [if 0,
+                                        // leave as 1]
+
+  // check the adjusted exponent; note that scale could be unbounded
+  dn->exponent=-*scale;                 // set the exponent
+  if (*scale>=0) {                      // usual case
+    if ((dn->digits-*scale-1)<-DECNUMMAXE) {      // underflow
+      decNumberZero(dn);
+      return NULL;}
+    }
+   else { // -ve scale; +ve exponent
+    // need to be careful to avoid wrap, here, also BADINT case
+    if ((*scale<-DECNUMMAXE)            // overflow even without digits
+         || ((dn->digits-*scale-1)>DECNUMMAXE)) { // overflow
+      decNumberZero(dn);
+      return NULL;}
+    }
+  if (digits==0) return dn;             // result was zero
+
+  // copy the digits to the number's units, starting at the lsu
+  // [unrolled]
+  for (;;) {                            // forever
+    // left nibble first
+    nib=(unsigned)(*last & 0xf0)>>4;
+    // got a digit, in nib
+    if (nib>9) {decNumberZero(dn); return NULL;}
+
+    if (cut==0) *up=(Unit)nib;
+     else *up=(Unit)(*up+nib*DECPOWERS[cut]);
+    digits--;
+    if (digits==0) break;               // got them all
+    cut++;
+    if (cut==DECDPUN) {
+      up++;
+      cut=0;
+      }
+    last--;                             // ready for next
+    nib=*last & 0x0f;                   // get right nibble
+    if (nib>9) {decNumberZero(dn); return NULL;}
+
+    // got a digit, in nib
+    if (cut==0) *up=(Unit)nib;
+     else *up=(Unit)(*up+nib*DECPOWERS[cut]);
+    digits--;
+    if (digits==0) break;               // got them all
+    cut++;
+    if (cut==DECDPUN) {
+      up++;
+      cut=0;
+      }
+    } // forever
+
+  return dn;
+  } // decPackedToNumber
+
@@ -0,0 +1,52 @@
+/* ------------------------------------------------------------------ */
+/* Packed Decimal conversion module header                            */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2005.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECPACKED)
+  #define DECPACKED
+  #define DECPNAME     "decPacked"                      /* Short name */
+  #define DECPFULLNAME "Packed Decimal conversions"   /* Verbose name */
+  #define DECPAUTHOR   "Mike Cowlishaw"               /* Who to blame */
+
+  #define DECPACKED_DefP 32             /* default precision          */
+
+  #ifndef  DECNUMDIGITS
+    #define DECNUMDIGITS DECPACKED_DefP /* size if not already defined*/
+  #endif
+  #include "decNumber.h"                /* context and number library */
+
+  /* Sign nibble constants                                            */
+  #if !defined(DECPPLUSALT)
+    #define DECPPLUSALT  0x0A /* alternate plus  nibble               */
+    #define DECPMINUSALT 0x0B /* alternate minus nibble               */
+    #define DECPPLUS     0x0C /* preferred plus  nibble               */
+    #define DECPMINUS    0x0D /* preferred minus nibble               */
+    #define DECPPLUSALT2 0x0E /* alternate plus  nibble               */
+    #define DECPUNSIGNED 0x0F /* alternate plus  nibble (unsigned)    */
+  #endif
+
+  /* ---------------------------------------------------------------- */
+  /* decPacked public routines                                        */
+  /* ---------------------------------------------------------------- */
+  /* Conversions                                                      */
+  uint8_t * decPackedFromNumber(uint8_t *, int32_t, int32_t *,
+                                const decNumber *);
+  decNumber * decPackedToNumber(const uint8_t *, int32_t, const int32_t *,
+                                decNumber *);
+
+#endif
@@ -0,0 +1,135 @@
+/* ------------------------------------------------------------------ */
+/* decQuad.c -- decQuad operations module                             */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is included in the package as decNumber.pdf.  This   */
+/* document is also available in HTML, together with specifications,  */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises decQuad operations (including conversions)   */
+/* ------------------------------------------------------------------ */
+
+
+/* Constant mappings for shared code */
+#define DECPMAX     DECQUAD_Pmax
+#define DECEMIN     DECQUAD_Emin
+#define DECEMAX     DECQUAD_Emax
+#define DECEMAXD    DECQUAD_EmaxD
+#define DECBYTES    DECQUAD_Bytes
+#define DECSTRING   DECQUAD_String
+#define DECECONL    DECQUAD_EconL
+#define DECBIAS     DECQUAD_Bias
+#define DECLETS     DECQUAD_Declets
+#define DECQTINY   (-DECQUAD_Bias)
+
+/* Type and function mappings for shared code */
+#define decFloat                   decQuad        // Type name
+
+// Utilities and conversions (binary results, extractors, etc.)
+#define decFloatFromBCD            decQuadFromBCD
+#define decFloatFromInt32          decQuadFromInt32
+#define decFloatFromPacked         decQuadFromPacked
+#define decFloatFromPackedChecked  decQuadFromPackedChecked
+#define decFloatFromString         decQuadFromString
+#define decFloatFromUInt32         decQuadFromUInt32
+#define decFloatFromWider          decQuadFromWider
+#define decFloatGetCoefficient     decQuadGetCoefficient
+#define decFloatGetExponent        decQuadGetExponent
+#define decFloatSetCoefficient     decQuadSetCoefficient
+#define decFloatSetExponent        decQuadSetExponent
+#define decFloatShow               decQuadShow
+#define decFloatToBCD              decQuadToBCD
+#define decFloatToEngString        decQuadToEngString
+#define decFloatToInt32            decQuadToInt32
+#define decFloatToInt32Exact       decQuadToInt32Exact
+#define decFloatToPacked           decQuadToPacked
+#define decFloatToString           decQuadToString
+#define decFloatToUInt32           decQuadToUInt32
+#define decFloatToUInt32Exact      decQuadToUInt32Exact
+#define decFloatToWider            decQuadToWider
+#define decFloatZero               decQuadZero
+
+// Computational (result is a decFloat)
+#define decFloatAbs                decQuadAbs
+#define decFloatAdd                decQuadAdd
+#define decFloatAnd                decQuadAnd
+#define decFloatDivide             decQuadDivide
+#define decFloatDivideInteger      decQuadDivideInteger
+#define decFloatFMA                decQuadFMA
+#define decFloatInvert             decQuadInvert
+#define decFloatLogB               decQuadLogB
+#define decFloatMax                decQuadMax
+#define decFloatMaxMag             decQuadMaxMag
+#define decFloatMin                decQuadMin
+#define decFloatMinMag             decQuadMinMag
+#define decFloatMinus              decQuadMinus
+#define decFloatMultiply           decQuadMultiply
+#define decFloatNextMinus          decQuadNextMinus
+#define decFloatNextPlus           decQuadNextPlus
+#define decFloatNextToward         decQuadNextToward
+#define decFloatOr                 decQuadOr
+#define decFloatPlus               decQuadPlus
+#define decFloatQuantize           decQuadQuantize
+#define decFloatReduce             decQuadReduce
+#define decFloatRemainder          decQuadRemainder
+#define decFloatRemainderNear      decQuadRemainderNear
+#define decFloatRotate             decQuadRotate
+#define decFloatScaleB             decQuadScaleB
+#define decFloatShift              decQuadShift
+#define decFloatSubtract           decQuadSubtract
+#define decFloatToIntegralValue    decQuadToIntegralValue
+#define decFloatToIntegralExact    decQuadToIntegralExact
+#define decFloatXor                decQuadXor
+
+// Comparisons
+#define decFloatCompare            decQuadCompare
+#define decFloatCompareSignal      decQuadCompareSignal
+#define decFloatCompareTotal       decQuadCompareTotal
+#define decFloatCompareTotalMag    decQuadCompareTotalMag
+
+// Copies
+#define decFloatCanonical          decQuadCanonical
+#define decFloatCopy               decQuadCopy
+#define decFloatCopyAbs            decQuadCopyAbs
+#define decFloatCopyNegate         decQuadCopyNegate
+#define decFloatCopySign           decQuadCopySign
+
+// Non-computational
+#define decFloatClass              decQuadClass
+#define decFloatClassString        decQuadClassString
+#define decFloatDigits             decQuadDigits
+#define decFloatIsCanonical        decQuadIsCanonical
+#define decFloatIsFinite           decQuadIsFinite
+#define decFloatIsInfinite         decQuadIsInfinite
+#define decFloatIsInteger          decQuadIsInteger
+#define decFloatIsLogical          decQuadIsLogical
+#define decFloatIsNaN              decQuadIsNaN
+#define decFloatIsNegative         decQuadIsNegative
+#define decFloatIsNormal           decQuadIsNormal
+#define decFloatIsPositive         decQuadIsPositive
+#define decFloatIsSignaling        decQuadIsSignaling
+#define decFloatIsSignalling       decQuadIsSignalling
+#define decFloatIsSigned           decQuadIsSigned
+#define decFloatIsSubnormal        decQuadIsSubnormal
+#define decFloatIsZero             decQuadIsZero
+#define decFloatRadix              decQuadRadix
+#define decFloatSameQuantum        decQuadSameQuantum
+#define decFloatVersion            decQuadVersion
+
+/* And now the code itself */
+#include "decContext.h"       // public includes
+#include "decQuad.h"          // ..
+#include "decNumberLocal.h"   // local includes (need DECPMAX)
+#include "decCommon.c"        // non-arithmetic decFloat routines
+#include "decBasic.c"         // basic formats routines
+
@@ -0,0 +1,177 @@
+/* ------------------------------------------------------------------ */
+/* decQuad.h -- Decimal 128-bit format module header                  */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2010.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is included in the package as decNumber.pdf.  This   */
+/* document is also available in HTML, together with specifications,  */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This include file is always included by decSingle and decDouble,   */
+/* and therefore also holds useful constants used by all three.       */
+
+#if !defined(DECQUAD)
+  #define DECQUAD
+
+  #define DECQUADNAME         "decimalQuad"           /* Short name   */
+  #define DECQUADTITLE        "Decimal 128-bit datum" /* Verbose name */
+  #define DECQUADAUTHOR       "Mike Cowlishaw"        /* Who to blame */
+
+  /* parameters for decQuads */
+  #define DECQUAD_Bytes    16      /* length                          */
+  #define DECQUAD_Pmax     34      /* maximum precision (digits)      */
+  #define DECQUAD_Emin  -6143      /* minimum adjusted exponent       */
+  #define DECQUAD_Emax   6144      /* maximum adjusted exponent       */
+  #define DECQUAD_EmaxD     4      /* maximum exponent digits         */
+  #define DECQUAD_Bias   6176      /* bias for the exponent           */
+  #define DECQUAD_String   43      /* maximum string length, +1       */
+  #define DECQUAD_EconL    12      /* exponent continuation length    */
+  #define DECQUAD_Declets  11      /* count of declets                */
+  /* highest biased exponent (Elimit-1) */
+  #define DECQUAD_Ehigh (DECQUAD_Emax + DECQUAD_Bias - (DECQUAD_Pmax-1))
+
+  /* Required include                                                 */
+  #include "decContext.h"
+
+  /* The decQuad decimal 128-bit type, accessible by all sizes */
+  typedef union {
+    uint8_t   bytes[DECQUAD_Bytes];     /* fields: 1, 5, 12, 110 bits */
+    uint16_t shorts[DECQUAD_Bytes/2];
+    uint32_t  words[DECQUAD_Bytes/4];
+    #if DECUSE64
+    uint64_t  longs[DECQUAD_Bytes/8];
+    #endif
+    } decQuad;
+
+  /* ---------------------------------------------------------------- */
+  /* Shared constants                                                 */
+  /* ---------------------------------------------------------------- */
+
+  /* sign and special values [top 32-bits; last two bits are don't-care
+     for Infinity on input, last bit don't-care for NaNs] */
+  #define DECFLOAT_Sign  0x80000000     /* 1 00000 00 Sign */
+  #define DECFLOAT_NaN   0x7c000000     /* 0 11111 00 NaN generic */
+  #define DECFLOAT_qNaN  0x7c000000     /* 0 11111 00 qNaN */
+  #define DECFLOAT_sNaN  0x7e000000     /* 0 11111 10 sNaN */
+  #define DECFLOAT_Inf   0x78000000     /* 0 11110 00 Infinity */
+  #define DECFLOAT_MinSp 0x78000000     /* minimum special value */
+                                        /* [specials are all >=MinSp] */
+  /* Sign nibble constants                                            */
+  #if !defined(DECPPLUSALT)
+    #define DECPPLUSALT  0x0A /* alternate plus  nibble               */
+    #define DECPMINUSALT 0x0B /* alternate minus nibble               */
+    #define DECPPLUS     0x0C /* preferred plus  nibble               */
+    #define DECPMINUS    0x0D /* preferred minus nibble               */
+    #define DECPPLUSALT2 0x0E /* alternate plus  nibble               */
+    #define DECPUNSIGNED 0x0F /* alternate plus  nibble (unsigned)    */
+  #endif
+
+  /* ---------------------------------------------------------------- */
+  /* Routines -- implemented as decFloat routines in common files     */
+  /* ---------------------------------------------------------------- */
+
+  /* Utilities and conversions, extractors, etc.) */
+  extern decQuad * decQuadFromBCD(decQuad *, int32_t, const uint8_t *, int32_t);
+  extern decQuad * decQuadFromInt32(decQuad *, int32_t);
+  extern decQuad * decQuadFromPacked(decQuad *, int32_t, const uint8_t *);
+  extern decQuad * decQuadFromPackedChecked(decQuad *, int32_t, const uint8_t *);
+  extern decQuad * decQuadFromString(decQuad *, const char *, decContext *);
+  extern decQuad * decQuadFromUInt32(decQuad *, uint32_t);
+  extern int32_t   decQuadGetCoefficient(const decQuad *, uint8_t *);
+  extern int32_t   decQuadGetExponent(const decQuad *);
+  extern decQuad * decQuadSetCoefficient(decQuad *, const uint8_t *, int32_t);
+  extern decQuad * decQuadSetExponent(decQuad *, decContext *, int32_t);
+  extern void      decQuadShow(const decQuad *, const char *);
+  extern int32_t   decQuadToBCD(const decQuad *, int32_t *, uint8_t *);
+  extern char    * decQuadToEngString(const decQuad *, char *);
+  extern int32_t   decQuadToInt32(const decQuad *, decContext *, enum rounding);
+  extern int32_t   decQuadToInt32Exact(const decQuad *, decContext *, enum rounding);
+  extern int32_t   decQuadToPacked(const decQuad *, int32_t *, uint8_t *);
+  extern char    * decQuadToString(const decQuad *, char *);
+  extern uint32_t  decQuadToUInt32(const decQuad *, decContext *, enum rounding);
+  extern uint32_t  decQuadToUInt32Exact(const decQuad *, decContext *, enum rounding);
+  extern decQuad * decQuadZero(decQuad *);
+
+  /* Computational (result is a decQuad) */
+  extern decQuad * decQuadAbs(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadAdd(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadAnd(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadDivide(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadDivideInteger(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadFMA(decQuad *, const decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadInvert(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadLogB(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadMax(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadMaxMag(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadMin(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadMinMag(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadMinus(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadMultiply(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadNextMinus(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadNextPlus(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadNextToward(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadOr(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadPlus(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadQuantize(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadReduce(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadRemainder(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadRemainderNear(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadRotate(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadScaleB(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadShift(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadSubtract(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadToIntegralValue(decQuad *, const decQuad *, decContext *, enum rounding);
+  extern decQuad * decQuadToIntegralExact(decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadXor(decQuad *, const decQuad *, const decQuad *, decContext *);
+
+  /* Comparisons */
+  extern decQuad * decQuadCompare(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadCompareSignal(decQuad *, const decQuad *, const decQuad *, decContext *);
+  extern decQuad * decQuadCompareTotal(decQuad *, const decQuad *, const decQuad *);
+  extern decQuad * decQuadCompareTotalMag(decQuad *, const decQuad *, const decQuad *);
+
+  /* Copies */
+  extern decQuad * decQuadCanonical(decQuad *, const decQuad *);
+  extern decQuad * decQuadCopy(decQuad *, const decQuad *);
+  extern decQuad * decQuadCopyAbs(decQuad *, const decQuad *);
+  extern decQuad * decQuadCopyNegate(decQuad *, const decQuad *);
+  extern decQuad * decQuadCopySign(decQuad *, const decQuad *, const decQuad *);
+
+  /* Non-computational */
+  extern enum decClass decQuadClass(const decQuad *);
+  extern const char *  decQuadClassString(const decQuad *);
+  extern uint32_t      decQuadDigits(const decQuad *);
+  extern uint32_t      decQuadIsCanonical(const decQuad *);
+  extern uint32_t      decQuadIsFinite(const decQuad *);
+  extern uint32_t      decQuadIsInteger(const decQuad *);
+  extern uint32_t      decQuadIsLogical(const decQuad *);
+  extern uint32_t      decQuadIsInfinite(const decQuad *);
+  extern uint32_t      decQuadIsNaN(const decQuad *);
+  extern uint32_t      decQuadIsNegative(const decQuad *);
+  extern uint32_t      decQuadIsNormal(const decQuad *);
+  extern uint32_t      decQuadIsPositive(const decQuad *);
+  extern uint32_t      decQuadIsSignaling(const decQuad *);
+  extern uint32_t      decQuadIsSignalling(const decQuad *);
+  extern uint32_t      decQuadIsSigned(const decQuad *);
+  extern uint32_t      decQuadIsSubnormal(const decQuad *);
+  extern uint32_t      decQuadIsZero(const decQuad *);
+  extern uint32_t      decQuadRadix(const decQuad *);
+  extern uint32_t      decQuadSameQuantum(const decQuad *, const decQuad *);
+  extern const char *  decQuadVersion(void);
+
+  /* decNumber conversions; these are implemented as macros so as not  */
+  /* to force a dependency on decimal128 and decNumber in decQuad.     */
+  /* decQuadFromNumber returns a decimal128 * to avoid warnings.       */
+  #define decQuadToNumber(dq, dn) decimal128ToNumber((decimal128 *)(dq), dn)
+  #define decQuadFromNumber(dq, dn, set) decimal128FromNumber((decimal128 *)(dq), dn, set)
+
+#endif
@@ -0,0 +1,71 @@
+/* ------------------------------------------------------------------ */
+/* decSingle.c -- decSingle operations module                         */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2008.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is included in the package as decNumber.pdf.  This   */
+/* document is also available in HTML, together with specifications,  */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises decSingle operations (including conversions) */
+/* ------------------------------------------------------------------ */
+
+#include "decContext.h"       // public includes
+#include "decSingle.h"        // public includes
+
+/* Constant mappings for shared code */
+#define DECPMAX     DECSINGLE_Pmax
+#define DECEMIN     DECSINGLE_Emin
+#define DECEMAX     DECSINGLE_Emax
+#define DECEMAXD    DECSINGLE_EmaxD
+#define DECBYTES    DECSINGLE_Bytes
+#define DECSTRING   DECSINGLE_String
+#define DECECONL    DECSINGLE_EconL
+#define DECBIAS     DECSINGLE_Bias
+#define DECLETS     DECSINGLE_Declets
+#define DECQTINY    (-DECSINGLE_Bias)
+// parameters of next-wider format
+#define DECWBYTES   DECDOUBLE_Bytes
+#define DECWPMAX    DECDOUBLE_Pmax
+#define DECWECONL   DECDOUBLE_EconL
+#define DECWBIAS    DECDOUBLE_Bias
+
+/* Type and function mappings for shared code */
+#define decFloat                   decSingle      // Type name
+#define decFloatWider              decDouble      // Type name
+
+// Utility (binary results, extractors, etc.)
+#define decFloatFromBCD            decSingleFromBCD
+#define decFloatFromPacked         decSingleFromPacked
+#define decFloatFromPackedChecked  decSingleFromPackedChecked
+#define decFloatFromString         decSingleFromString
+#define decFloatFromWider          decSingleFromWider
+#define decFloatGetCoefficient     decSingleGetCoefficient
+#define decFloatGetExponent        decSingleGetExponent
+#define decFloatSetCoefficient     decSingleSetCoefficient
+#define decFloatSetExponent        decSingleSetExponent
+#define decFloatShow               decSingleShow
+#define decFloatToBCD              decSingleToBCD
+#define decFloatToEngString        decSingleToEngString
+#define decFloatToPacked           decSingleToPacked
+#define decFloatToString           decSingleToString
+#define decFloatToWider            decSingleToWider
+#define decFloatZero               decSingleZero
+
+// Non-computational
+#define decFloatRadix              decSingleRadix
+#define decFloatVersion            decSingleVersion
+
+#include "decNumberLocal.h"   // local includes (need DECPMAX)
+#include "decCommon.c"        // non-basic decFloat routines
+// [Do not include decBasic.c for decimal32]
+
@@ -0,0 +1,86 @@
+/* ------------------------------------------------------------------ */
+/* decSingle.h -- Decimal 32-bit format module header                 */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2008.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is included in the package as decNumber.pdf.  This   */
+/* document is also available in HTML, together with specifications,  */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECSINGLE)
+  #define DECSINGLE
+
+  #define DECSINGLENAME       "decSingle"             /* Short name   */
+  #define DECSINGLETITLE      "Decimal 32-bit datum"  /* Verbose name */
+  #define DECSINGLEAUTHOR     "Mike Cowlishaw"        /* Who to blame */
+
+  /* parameters for decSingles */
+  #define DECSINGLE_Bytes    4     /* length                          */
+  #define DECSINGLE_Pmax     7     /* maximum precision (digits)      */
+  #define DECSINGLE_Emin   -95     /* minimum adjusted exponent       */
+  #define DECSINGLE_Emax    96     /* maximum adjusted exponent       */
+  #define DECSINGLE_EmaxD    3     /* maximum exponent digits         */
+  #define DECSINGLE_Bias   101     /* bias for the exponent           */
+  #define DECSINGLE_String  16     /* maximum string length, +1       */
+  #define DECSINGLE_EconL    6     /* exponent continuation length    */
+  #define DECSINGLE_Declets  2     /* count of declets                */
+  /* highest biased exponent (Elimit-1) */
+  #define DECSINGLE_Ehigh (DECSINGLE_Emax + DECSINGLE_Bias - (DECSINGLE_Pmax-1))
+
+  /* Required includes                                                */
+  #include "decContext.h"
+  #include "decQuad.h"
+  #include "decDouble.h"
+
+  /* The decSingle decimal 32-bit type, accessible by all sizes */
+  typedef union {
+    uint8_t   bytes[DECSINGLE_Bytes];   /* fields: 1, 5, 6, 20 bits */
+    uint16_t shorts[DECSINGLE_Bytes/2];
+    uint32_t  words[DECSINGLE_Bytes/4];
+    } decSingle;
+
+  /* ---------------------------------------------------------------- */
+  /* Routines -- implemented as decFloat routines in common files     */
+  /* ---------------------------------------------------------------- */
+
+  /* Utilities (binary argument(s) or result, extractors, etc.) */
+  extern decSingle * decSingleFromBCD(decSingle *, int32_t, const uint8_t *, int32_t);
+  extern decSingle * decSingleFromPacked(decSingle *, int32_t, const uint8_t *);
+  extern decSingle * decSingleFromPackedChecked(decSingle *, int32_t, const uint8_t *);
+  extern decSingle * decSingleFromString(decSingle *, const char *, decContext *);
+  extern decSingle * decSingleFromWider(decSingle *, const decDouble *, decContext *);
+  extern int32_t     decSingleGetCoefficient(const decSingle *, uint8_t *);
+  extern int32_t     decSingleGetExponent(const decSingle *);
+  extern decSingle * decSingleSetCoefficient(decSingle *, const uint8_t *, int32_t);
+  extern decSingle * decSingleSetExponent(decSingle *, decContext *, int32_t);
+  extern void        decSingleShow(const decSingle *, const char *);
+  extern int32_t     decSingleToBCD(const decSingle *, int32_t *, uint8_t *);
+  extern char      * decSingleToEngString(const decSingle *, char *);
+  extern int32_t     decSingleToPacked(const decSingle *, int32_t *, uint8_t *);
+  extern char      * decSingleToString(const decSingle *, char *);
+  extern decDouble * decSingleToWider(const decSingle *, decDouble *);
+  extern decSingle * decSingleZero(decSingle *);
+
+  /* (No Arithmetic routines for decSingle) */
+
+  /* Non-computational */
+  extern uint32_t     decSingleRadix(const decSingle *);
+  extern const char * decSingleVersion(void);
+
+  /* decNumber conversions; these are implemented as macros so as not  */
+  /* to force a dependency on decimal32 and decNumber in decSingle.    */
+  /* decSingleFromNumber returns a decimal32 * to avoid warnings.      */
+  #define decSingleToNumber(dq, dn) decimal32ToNumber((decimal32 *)(dq), dn)
+  #define decSingleFromNumber(dq, dn, set) decimal32FromNumber((decimal32 *)(dq), dn, set)
+
+#endif
@@ -0,0 +1,553 @@
+/* ------------------------------------------------------------------ */
+/* Decimal 128-bit format module                                      */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2008.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises the routines for decimal128 format numbers.  */
+/* Conversions are supplied to and from decNumber and String.         */
+/*                                                                    */
+/* This is used when decNumber provides operations, either for all    */
+/* operations or as a proxy between decNumber and decSingle.          */
+/*                                                                    */
+/* Error handling is the same as decNumber (qv.).                     */
+/* ------------------------------------------------------------------ */
+#include <string.h>           // [for memset/memcpy]
+#include <stdio.h>            // [for printf]
+
+#define  DECNUMDIGITS 34      // make decNumbers with space for 34
+#include "decNumber.h"        // base number library
+#include "decNumberLocal.h"   // decNumber local types, etc.
+#include "decimal128.h"       // our primary include
+
+/* Utility routines and tables [in decimal64.c] */
+// DPD2BIN and the reverse are renamed to prevent link-time conflict
+// if decQuad is also built in the same executable
+#define DPD2BIN DPD2BINx
+#define BIN2DPD BIN2DPDx
+extern const uInt   COMBEXP[32], COMBMSD[32];
+extern const uShort DPD2BIN[1024];
+extern const uShort BIN2DPD[1000];      // [not used]
+extern const uByte  BIN2CHAR[4001];
+
+extern void decDigitsFromDPD(decNumber *, const uInt *, Int);
+extern void decDigitsToDPD(const decNumber *, uInt *, Int);
+
+#if DECTRACE || DECCHECK
+void decimal128Show(const decimal128 *);          // for debug
+extern void decNumberShow(const decNumber *);     // ..
+#endif
+
+/* Useful macro */
+// Clear a structure (e.g., a decNumber)
+#define DEC_clear(d) memset(d, 0, sizeof(*d))
+
+/* ------------------------------------------------------------------ */
+/* decimal128FromNumber -- convert decNumber to decimal128            */
+/*                                                                    */
+/*   ds is the target decimal128                                      */
+/*   dn is the source number (assumed valid)                          */
+/*   set is the context, used only for reporting errors               */
+/*                                                                    */
+/* The set argument is used only for status reporting and for the     */
+/* rounding mode (used if the coefficient is more than DECIMAL128_Pmax*/
+/* digits or an overflow is detected).  If the exponent is out of the */
+/* valid range then Overflow or Underflow will be raised.             */
+/* After Underflow a subnormal result is possible.                    */
+/*                                                                    */
+/* DEC_Clamped is set if the number has to be 'folded down' to fit,   */
+/* by reducing its exponent and multiplying the coefficient by a      */
+/* power of ten, or if the exponent on a zero had to be clamped.      */
+/* ------------------------------------------------------------------ */
+decimal128 * decimal128FromNumber(decimal128 *d128, const decNumber *dn,
+                                  decContext *set) {
+  uInt status=0;                   // status accumulator
+  Int ae;                          // adjusted exponent
+  decNumber  dw;                   // work
+  decContext dc;                   // ..
+  uInt comb, exp;                  // ..
+  uInt uiwork;                     // for macros
+  uInt targar[4]={0,0,0,0};        // target 128-bit
+  #define targhi targar[3]         // name the word with the sign
+  #define targmh targar[2]         // name the words
+  #define targml targar[1]         // ..
+  #define targlo targar[0]         // ..
+
+  // If the number has too many digits, or the exponent could be
+  // out of range then reduce the number under the appropriate
+  // constraints.  This could push the number to Infinity or zero,
+  // so this check and rounding must be done before generating the
+  // decimal128]
+  ae=dn->exponent+dn->digits-1;              // [0 if special]
+  if (dn->digits>DECIMAL128_Pmax             // too many digits
+   || ae>DECIMAL128_Emax                     // likely overflow
+   || ae<DECIMAL128_Emin) {                  // likely underflow
+    decContextDefault(&dc, DEC_INIT_DECIMAL128); // [no traps]
+    dc.round=set->round;                     // use supplied rounding
+    decNumberPlus(&dw, dn, &dc);             // (round and check)
+    // [this changes -0 to 0, so enforce the sign...]
+    dw.bits|=dn->bits&DECNEG;
+    status=dc.status;                        // save status
+    dn=&dw;                                  // use the work number
+    } // maybe out of range
+
+  if (dn->bits&DECSPECIAL) {                      // a special value
+    if (dn->bits&DECINF) targhi=DECIMAL_Inf<<24;
+     else {                                       // sNaN or qNaN
+      if ((*dn->lsu!=0 || dn->digits>1)           // non-zero coefficient
+       && (dn->digits<DECIMAL128_Pmax)) {         // coefficient fits
+        decDigitsToDPD(dn, targar, 0);
+        }
+      if (dn->bits&DECNAN) targhi|=DECIMAL_NaN<<24;
+       else targhi|=DECIMAL_sNaN<<24;
+      } // a NaN
+    } // special
+
+   else { // is finite
+    if (decNumberIsZero(dn)) {               // is a zero
+      // set and clamp exponent
+      if (dn->exponent<-DECIMAL128_Bias) {
+        exp=0;                               // low clamp
+        status|=DEC_Clamped;
+        }
+       else {
+        exp=dn->exponent+DECIMAL128_Bias;    // bias exponent
+        if (exp>DECIMAL128_Ehigh) {          // top clamp
+          exp=DECIMAL128_Ehigh;
+          status|=DEC_Clamped;
+          }
+        }
+      comb=(exp>>9) & 0x18;             // msd=0, exp top 2 bits ..
+      }
+     else {                             // non-zero finite number
+      uInt msd;                         // work
+      Int pad=0;                        // coefficient pad digits
+
+      // the dn is known to fit, but it may need to be padded
+      exp=(uInt)(dn->exponent+DECIMAL128_Bias);    // bias exponent
+      if (exp>DECIMAL128_Ehigh) {                  // fold-down case
+        pad=exp-DECIMAL128_Ehigh;
+        exp=DECIMAL128_Ehigh;                      // [to maximum]
+        status|=DEC_Clamped;
+        }
+
+      // [fastpath for common case is not a win, here]
+      decDigitsToDPD(dn, targar, pad);
+      // save and clear the top digit
+      msd=targhi>>14;
+      targhi&=0x00003fff;
+
+      // create the combination field
+      if (msd>=8) comb=0x18 | ((exp>>11) & 0x06) | (msd & 0x01);
+             else comb=((exp>>9) & 0x18) | msd;
+      }
+    targhi|=comb<<26;              // add combination field ..
+    targhi|=(exp&0xfff)<<14;       // .. and exponent continuation
+    } // finite
+
+  if (dn->bits&DECNEG) targhi|=0x80000000; // add sign bit
+
+  // now write to storage; this is endian
+  if (DECLITEND) {
+    // lo -> hi
+    UBFROMUI(d128->bytes,    targlo);
+    UBFROMUI(d128->bytes+4,  targml);
+    UBFROMUI(d128->bytes+8,  targmh);
+    UBFROMUI(d128->bytes+12, targhi);
+    }
+   else {
+    // hi -> lo
+    UBFROMUI(d128->bytes,    targhi);
+    UBFROMUI(d128->bytes+4,  targmh);
+    UBFROMUI(d128->bytes+8,  targml);
+    UBFROMUI(d128->bytes+12, targlo);
+    }
+
+  if (status!=0) decContextSetStatus(set, status); // pass on status
+  // decimal128Show(d128);
+  return d128;
+  } // decimal128FromNumber
+
+/* ------------------------------------------------------------------ */
+/* decimal128ToNumber -- convert decimal128 to decNumber              */
+/*   d128 is the source decimal128                                    */
+/*   dn is the target number, with appropriate space                  */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decNumber * decimal128ToNumber(const decimal128 *d128, decNumber *dn) {
+  uInt msd;                        // coefficient MSD
+  uInt exp;                        // exponent top two bits
+  uInt comb;                       // combination field
+  Int  need;                       // work
+  uInt uiwork;                     // for macros
+  uInt sourar[4];                  // source 128-bit
+  #define sourhi sourar[3]         // name the word with the sign
+  #define sourmh sourar[2]         // and the mid-high word
+  #define sourml sourar[1]         // and the mod-low word
+  #define sourlo sourar[0]         // and the lowest word
+
+  // load source from storage; this is endian
+  if (DECLITEND) {
+    sourlo=UBTOUI(d128->bytes   ); // directly load the low int
+    sourml=UBTOUI(d128->bytes+4 ); // then the mid-low
+    sourmh=UBTOUI(d128->bytes+8 ); // then the mid-high
+    sourhi=UBTOUI(d128->bytes+12); // then the high int
+    }
+   else {
+    sourhi=UBTOUI(d128->bytes   ); // directly load the high int
+    sourmh=UBTOUI(d128->bytes+4 ); // then the mid-high
+    sourml=UBTOUI(d128->bytes+8 ); // then the mid-low
+    sourlo=UBTOUI(d128->bytes+12); // then the low int
+    }
+
+  comb=(sourhi>>26)&0x1f;          // combination field
+
+  decNumberZero(dn);               // clean number
+  if (sourhi&0x80000000) dn->bits=DECNEG; // set sign if negative
+
+  msd=COMBMSD[comb];               // decode the combination field
+  exp=COMBEXP[comb];               // ..
+
+  if (exp==3) {                    // is a special
+    if (msd==0) {
+      dn->bits|=DECINF;
+      return dn;                   // no coefficient needed
+      }
+    else if (sourhi&0x02000000) dn->bits|=DECSNAN;
+    else dn->bits|=DECNAN;
+    msd=0;                         // no top digit
+    }
+   else {                          // is a finite number
+    dn->exponent=(exp<<12)+((sourhi>>14)&0xfff)-DECIMAL128_Bias; // unbiased
+    }
+
+  // get the coefficient
+  sourhi&=0x00003fff;              // clean coefficient continuation
+  if (msd) {                       // non-zero msd
+    sourhi|=msd<<14;               // prefix to coefficient
+    need=12;                       // process 12 declets
+    }
+   else { // msd=0
+    if (sourhi) need=11;           // declets to process
+     else if (sourmh) need=10;
+     else if (sourml) need=7;
+     else if (sourlo) need=4;
+     else return dn;               // easy: coefficient is 0
+    } //msd=0
+
+  decDigitsFromDPD(dn, sourar, need);   // process declets
+  // decNumberShow(dn);
+  return dn;
+  } // decimal128ToNumber
+
+/* ------------------------------------------------------------------ */
+/* to-scientific-string -- conversion to numeric string               */
+/* to-engineering-string -- conversion to numeric string              */
+/*                                                                    */
+/*   decimal128ToString(d128, string);                                */
+/*   decimal128ToEngString(d128, string);                             */
+/*                                                                    */
+/*  d128 is the decimal128 format number to convert                   */
+/*  string is the string where the result will be laid out            */
+/*                                                                    */
+/*  string must be at least 24 characters                             */
+/*                                                                    */
+/*  No error is possible, and no status can be set.                   */
+/* ------------------------------------------------------------------ */
+char * decimal128ToEngString(const decimal128 *d128, char *string){
+  decNumber dn;                         // work
+  decimal128ToNumber(d128, &dn);
+  decNumberToEngString(&dn, string);
+  return string;
+  } // decimal128ToEngString
+
+char * decimal128ToString(const decimal128 *d128, char *string){
+  uInt msd;                        // coefficient MSD
+  Int  exp;                        // exponent top two bits or full
+  uInt comb;                       // combination field
+  char *cstart;                    // coefficient start
+  char *c;                         // output pointer in string
+  const uByte *u;                  // work
+  char *s, *t;                     // .. (source, target)
+  Int  dpd;                        // ..
+  Int  pre, e;                     // ..
+  uInt uiwork;                     // for macros
+
+  uInt sourar[4];                  // source 128-bit
+  #define sourhi sourar[3]         // name the word with the sign
+  #define sourmh sourar[2]         // and the mid-high word
+  #define sourml sourar[1]         // and the mod-low word
+  #define sourlo sourar[0]         // and the lowest word
+
+  // load source from storage; this is endian
+  if (DECLITEND) {
+    sourlo=UBTOUI(d128->bytes   ); // directly load the low int
+    sourml=UBTOUI(d128->bytes+4 ); // then the mid-low
+    sourmh=UBTOUI(d128->bytes+8 ); // then the mid-high
+    sourhi=UBTOUI(d128->bytes+12); // then the high int
+    }
+   else {
+    sourhi=UBTOUI(d128->bytes   ); // directly load the high int
+    sourmh=UBTOUI(d128->bytes+4 ); // then the mid-high
+    sourml=UBTOUI(d128->bytes+8 ); // then the mid-low
+    sourlo=UBTOUI(d128->bytes+12); // then the low int
+    }
+
+  c=string;                        // where result will go
+  if (((Int)sourhi)<0) *c++='-';   // handle sign
+
+  comb=(sourhi>>26)&0x1f;          // combination field
+  msd=COMBMSD[comb];               // decode the combination field
+  exp=COMBEXP[comb];               // ..
+
+  if (exp==3) {
+    if (msd==0) {                  // infinity
+      strcpy(c,   "Inf");
+      strcpy(c+3, "inity");
+      return string;               // easy
+      }
+    if (sourhi&0x02000000) *c++='s'; // sNaN
+    strcpy(c, "NaN");              // complete word
+    c+=3;                          // step past
+    if (sourlo==0 && sourml==0 && sourmh==0
+     && (sourhi&0x0003ffff)==0) return string; // zero payload
+    // otherwise drop through to add integer; set correct exp
+    exp=0; msd=0;                  // setup for following code
+    }
+   else exp=(exp<<12)+((sourhi>>14)&0xfff)-DECIMAL128_Bias; // unbiased
+
+  // convert 34 digits of significand to characters
+  cstart=c;                        // save start of coefficient
+  if (msd) *c++='0'+(char)msd;     // non-zero most significant digit
+
+  // Now decode the declets.  After extracting each one, it is
+  // decoded to binary and then to a 4-char sequence by table lookup;
+  // the 4-chars are a 1-char length (significant digits, except 000
+  // has length 0).  This allows us to left-align the first declet
+  // with non-zero content, then remaining ones are full 3-char
+  // length.  We use fixed-length memcpys because variable-length
+  // causes a subroutine call in GCC.  (These are length 4 for speed
+  // and are safe because the array has an extra terminator byte.)
+  #define dpd2char u=&BIN2CHAR[DPD2BIN[dpd]*4];                   \
+                   if (c!=cstart) {memcpy(c, u+1, 4); c+=3;}      \
+                    else if (*u)  {memcpy(c, u+4-*u, 4); c+=*u;}
+  dpd=(sourhi>>4)&0x3ff;                     // declet 1
+  dpd2char;
+  dpd=((sourhi&0xf)<<6) | (sourmh>>26);      // declet 2
+  dpd2char;
+  dpd=(sourmh>>16)&0x3ff;                    // declet 3
+  dpd2char;
+  dpd=(sourmh>>6)&0x3ff;                     // declet 4
+  dpd2char;
+  dpd=((sourmh&0x3f)<<4) | (sourml>>28);     // declet 5
+  dpd2char;
+  dpd=(sourml>>18)&0x3ff;                    // declet 6
+  dpd2char;
+  dpd=(sourml>>8)&0x3ff;                     // declet 7
+  dpd2char;
+  dpd=((sourml&0xff)<<2) | (sourlo>>30);     // declet 8
+  dpd2char;
+  dpd=(sourlo>>20)&0x3ff;                    // declet 9
+  dpd2char;
+  dpd=(sourlo>>10)&0x3ff;                    // declet 10
+  dpd2char;
+  dpd=(sourlo)&0x3ff;                        // declet 11
+  dpd2char;
+
+  if (c==cstart) *c++='0';         // all zeros -- make 0
+
+  if (exp==0) {                    // integer or NaN case -- easy
+    *c='\0';                       // terminate
+    return string;
+    }
+
+  /* non-0 exponent */
+  e=0;                             // assume no E
+  pre=c-cstart+exp;
+  // [here, pre-exp is the digits count (==1 for zero)]
+  if (exp>0 || pre<-5) {           // need exponential form
+    e=pre-1;                       // calculate E value
+    pre=1;                         // assume one digit before '.'
+    } // exponential form
+
+  /* modify the coefficient, adding 0s, '.', and E+nn as needed */
+  s=c-1;                           // source (LSD)
+  if (pre>0) {                     // ddd.ddd (plain), perhaps with E
+    char *dotat=cstart+pre;
+    if (dotat<c) {                 // if embedded dot needed...
+      t=c;                              // target
+      for (; s>=dotat; s--, t--) *t=*s; // open the gap; leave t at gap
+      *t='.';                           // insert the dot
+      c++;                              // length increased by one
+      }
+
+    // finally add the E-part, if needed; it will never be 0, and has
+    // a maximum length of 4 digits
+    if (e!=0) {
+      *c++='E';                    // starts with E
+      *c++='+';                    // assume positive
+      if (e<0) {
+        *(c-1)='-';                // oops, need '-'
+        e=-e;                      // uInt, please
+        }
+      if (e<1000) {                // 3 (or fewer) digits case
+        u=&BIN2CHAR[e*4];          // -> length byte
+        memcpy(c, u+4-*u, 4);      // copy fixed 4 characters [is safe]
+        c+=*u;                     // bump pointer appropriately
+        }
+       else {                      // 4-digits
+        Int thou=((e>>3)*1049)>>17; // e/1000
+        Int rem=e-(1000*thou);      // e%1000
+        *c++='0'+(char)thou;
+        u=&BIN2CHAR[rem*4];        // -> length byte
+        memcpy(c, u+1, 4);         // copy fixed 3+1 characters [is safe]
+        c+=3;                      // bump pointer, always 3 digits
+        }
+      }
+    *c='\0';                       // add terminator
+    //printf("res %s\n", string);
+    return string;
+    } // pre>0
+
+  /* -5<=pre<=0: here for plain 0.ddd or 0.000ddd forms (can never have E) */
+  t=c+1-pre;
+  *(t+1)='\0';                          // can add terminator now
+  for (; s>=cstart; s--, t--) *t=*s;    // shift whole coefficient right
+  c=cstart;
+  *c++='0';                             // always starts with 0.
+  *c++='.';
+  for (; pre<0; pre++) *c++='0';        // add any 0's after '.'
+  //printf("res %s\n", string);
+  return string;
+  } // decimal128ToString
+
+/* ------------------------------------------------------------------ */
+/* to-number -- conversion from numeric string                        */
+/*                                                                    */
+/*   decimal128FromString(result, string, set);                       */
+/*                                                                    */
+/*  result  is the decimal128 format number which gets the result of  */
+/*          the conversion                                            */
+/*  *string is the character string which should contain a valid      */
+/*          number (which may be a special value)                     */
+/*  set     is the context                                            */
+/*                                                                    */
+/* The context is supplied to this routine is used for error handling */
+/* (setting of status and traps) and for the rounding mode, only.     */
+/* If an error occurs, the result will be a valid decimal128 NaN.     */
+/* ------------------------------------------------------------------ */
+decimal128 * decimal128FromString(decimal128 *result, const char *string,
+                                  decContext *set) {
+  decContext dc;                             // work
+  decNumber dn;                              // ..
+
+  decContextDefault(&dc, DEC_INIT_DECIMAL128); // no traps, please
+  dc.round=set->round;                         // use supplied rounding
+
+  decNumberFromString(&dn, string, &dc);     // will round if needed
+  decimal128FromNumber(result, &dn, &dc);
+  if (dc.status!=0) {                        // something happened
+    decContextSetStatus(set, dc.status);     // .. pass it on
+    }
+  return result;
+  } // decimal128FromString
+
+/* ------------------------------------------------------------------ */
+/* decimal128IsCanonical -- test whether encoding is canonical        */
+/*   d128 is the source decimal128                                    */
+/*   returns 1 if the encoding of d128 is canonical, 0 otherwise      */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decimal128IsCanonical(const decimal128 *d128) {
+  decNumber dn;                         // work
+  decimal128 canon;                      // ..
+  decContext dc;                        // ..
+  decContextDefault(&dc, DEC_INIT_DECIMAL128);
+  decimal128ToNumber(d128, &dn);
+  decimal128FromNumber(&canon, &dn, &dc);// canon will now be canonical
+  return memcmp(d128, &canon, DECIMAL128_Bytes)==0;
+  } // decimal128IsCanonical
+
+/* ------------------------------------------------------------------ */
+/* decimal128Canonical -- copy an encoding, ensuring it is canonical  */
+/*   d128 is the source decimal128                                    */
+/*   result is the target (may be the same decimal128)                */
+/*   returns result                                                   */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decimal128 * decimal128Canonical(decimal128 *result, const decimal128 *d128) {
+  decNumber dn;                         // work
+  decContext dc;                        // ..
+  decContextDefault(&dc, DEC_INIT_DECIMAL128);
+  decimal128ToNumber(d128, &dn);
+  decimal128FromNumber(result, &dn, &dc);// result will now be canonical
+  return result;
+  } // decimal128Canonical
+
+#if DECTRACE || DECCHECK
+/* Macros for accessing decimal128 fields.  These assume the argument
+   is a reference (pointer) to the decimal128 structure, and the
+   decimal128 is in network byte order (big-endian) */
+// Get sign
+#define decimal128Sign(d)       ((unsigned)(d)->bytes[0]>>7)
+
+// Get combination field
+#define decimal128Comb(d)       (((d)->bytes[0] & 0x7c)>>2)
+
+// Get exponent continuation [does not remove bias]
+#define decimal128ExpCon(d)     ((((d)->bytes[0] & 0x03)<<10)         \
+                              | ((unsigned)(d)->bytes[1]<<2)          \
+                              | ((unsigned)(d)->bytes[2]>>6))
+
+// Set sign [this assumes sign previously 0]
+#define decimal128SetSign(d, b) {                                     \
+  (d)->bytes[0]|=((unsigned)(b)<<7);}
+
+// Set exponent continuation [does not apply bias]
+// This assumes range has been checked and exponent previously 0;
+// type of exponent must be unsigned
+#define decimal128SetExpCon(d, e) {                                   \
+  (d)->bytes[0]|=(uByte)((e)>>10);                                    \
+  (d)->bytes[1] =(uByte)(((e)&0x3fc)>>2);                             \
+  (d)->bytes[2]|=(uByte)(((e)&0x03)<<6);}
+
+/* ------------------------------------------------------------------ */
+/* decimal128Show -- display a decimal128 in hexadecimal [debug aid]  */
+/*   d128 -- the number to show                                       */
+/* ------------------------------------------------------------------ */
+// Also shows sign/cob/expconfields extracted
+void decimal128Show(const decimal128 *d128) {
+  char buf[DECIMAL128_Bytes*2+1];
+  Int i, j=0;
+
+  if (DECLITEND) {
+    for (i=0; i<DECIMAL128_Bytes; i++, j+=2) {
+      sprintf(&buf[j], "%02x", d128->bytes[15-i]);
+      }
+    printf(" D128> %s [S:%d Cb:%02x Ec:%02x] LittleEndian\n", buf,
+           d128->bytes[15]>>7, (d128->bytes[15]>>2)&0x1f,
+           ((d128->bytes[15]&0x3)<<10)|(d128->bytes[14]<<2)|
+           (d128->bytes[13]>>6));
+    }
+   else {
+    for (i=0; i<DECIMAL128_Bytes; i++, j+=2) {
+      sprintf(&buf[j], "%02x", d128->bytes[i]);
+      }
+    printf(" D128> %s [S:%d Cb:%02x Ec:%02x] BigEndian\n", buf,
+           decimal128Sign(d128), decimal128Comb(d128),
+           decimal128ExpCon(d128));
+    }
+  } // decimal128Show
+#endif
@@ -0,0 +1,81 @@
+/* ------------------------------------------------------------------ */
+/* Decimal 128-bit format module header                               */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2005.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECIMAL128)
+  #define DECIMAL128
+  #define DEC128NAME     "decimal128"                 /* Short name   */
+  #define DEC128FULLNAME "Decimal 128-bit Number"     /* Verbose name */
+  #define DEC128AUTHOR   "Mike Cowlishaw"             /* Who to blame */
+
+  /* parameters for decimal128s */
+  #define DECIMAL128_Bytes  16          /* length                     */
+  #define DECIMAL128_Pmax   34          /* maximum precision (digits) */
+  #define DECIMAL128_Emax   6144        /* maximum adjusted exponent  */
+  #define DECIMAL128_Emin  -6143        /* minimum adjusted exponent  */
+  #define DECIMAL128_Bias   6176        /* bias for the exponent      */
+  #define DECIMAL128_String 43          /* maximum string length, +1  */
+  #define DECIMAL128_EconL  12          /* exp. continuation length   */
+  /* highest biased exponent (Elimit-1)                               */
+  #define DECIMAL128_Ehigh  (DECIMAL128_Emax+DECIMAL128_Bias-DECIMAL128_Pmax+1)
+
+  /* check enough digits, if pre-defined                              */
+  #if defined(DECNUMDIGITS)
+    #if (DECNUMDIGITS<DECIMAL128_Pmax)
+      #error decimal128.h needs pre-defined DECNUMDIGITS>=34 for safe use
+    #endif
+  #endif
+
+  #ifndef DECNUMDIGITS
+    #define DECNUMDIGITS DECIMAL128_Pmax /* size if not already defined*/
+  #endif
+  #ifndef DECNUMBER
+    #include "decNumber.h"              /* context and number library */
+  #endif
+
+  /* Decimal 128-bit type, accessible by bytes                        */
+  typedef struct {
+    uint8_t bytes[DECIMAL128_Bytes]; /* decimal128: 1, 5, 12, 110 bits*/
+    } decimal128;
+
+  /* special values [top byte excluding sign bit; last two bits are   */
+  /* don't-care for Infinity on input, last bit don't-care for NaN]   */
+  #if !defined(DECIMAL_NaN)
+    #define DECIMAL_NaN     0x7c        /* 0 11111 00 NaN             */
+    #define DECIMAL_sNaN    0x7e        /* 0 11111 10 sNaN            */
+    #define DECIMAL_Inf     0x78        /* 0 11110 00 Infinity        */
+  #endif
+
+  /* ---------------------------------------------------------------- */
+  /* Routines                                                         */
+  /* ---------------------------------------------------------------- */
+  /* String conversions                                               */
+  decimal128 * decimal128FromString(decimal128 *, const char *, decContext *);
+  char * decimal128ToString(const decimal128 *, char *);
+  char * decimal128ToEngString(const decimal128 *, char *);
+
+  /* decNumber conversions                                            */
+  decimal128 * decimal128FromNumber(decimal128 *, const decNumber *,
+                                    decContext *);
+  decNumber * decimal128ToNumber(const decimal128 *, decNumber *);
+
+  /* Format-dependent utilities                                       */
+  uint32_t    decimal128IsCanonical(const decimal128 *);
+  decimal128 * decimal128Canonical(decimal128 *, const decimal128 *);
+
+#endif
@@ -0,0 +1,476 @@
+/* ------------------------------------------------------------------ */
+/* Decimal 32-bit format module                                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2008.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises the routines for decimal32 format numbers.   */
+/* Conversions are supplied to and from decNumber and String.         */
+/*                                                                    */
+/* This is used when decNumber provides operations, either for all    */
+/* operations or as a proxy between decNumber and decSingle.          */
+/*                                                                    */
+/* Error handling is the same as decNumber (qv.).                     */
+/* ------------------------------------------------------------------ */
+#include <string.h>           // [for memset/memcpy]
+#include <stdio.h>            // [for printf]
+
+#define  DECNUMDIGITS  7      // make decNumbers with space for 7
+#include "decNumber.h"        // base number library
+#include "decNumberLocal.h"   // decNumber local types, etc.
+#include "decimal32.h"        // our primary include
+
+/* Utility tables and routines [in decimal64.c] */
+// DPD2BIN and the reverse are renamed to prevent link-time conflict
+// if decQuad is also built in the same executable
+#define DPD2BIN DPD2BINx
+#define BIN2DPD BIN2DPDx
+extern const uInt   COMBEXP[32], COMBMSD[32];
+extern const uShort DPD2BIN[1024];
+extern const uShort BIN2DPD[1000];
+extern const uByte  BIN2CHAR[4001];
+
+extern void decDigitsToDPD(const decNumber *, uInt *, Int);
+extern void decDigitsFromDPD(decNumber *, const uInt *, Int);
+
+#if DECTRACE || DECCHECK
+void decimal32Show(const decimal32 *);            // for debug
+extern void decNumberShow(const decNumber *);     // ..
+#endif
+
+/* Useful macro */
+// Clear a structure (e.g., a decNumber)
+#define DEC_clear(d) memset(d, 0, sizeof(*d))
+
+/* ------------------------------------------------------------------ */
+/* decimal32FromNumber -- convert decNumber to decimal32              */
+/*                                                                    */
+/*   ds is the target decimal32                                       */
+/*   dn is the source number (assumed valid)                          */
+/*   set is the context, used only for reporting errors               */
+/*                                                                    */
+/* The set argument is used only for status reporting and for the     */
+/* rounding mode (used if the coefficient is more than DECIMAL32_Pmax */
+/* digits or an overflow is detected).  If the exponent is out of the */
+/* valid range then Overflow or Underflow will be raised.             */
+/* After Underflow a subnormal result is possible.                    */
+/*                                                                    */
+/* DEC_Clamped is set if the number has to be 'folded down' to fit,   */
+/* by reducing its exponent and multiplying the coefficient by a      */
+/* power of ten, or if the exponent on a zero had to be clamped.      */
+/* ------------------------------------------------------------------ */
+decimal32 * decimal32FromNumber(decimal32 *d32, const decNumber *dn,
+                              decContext *set) {
+  uInt status=0;                   // status accumulator
+  Int ae;                          // adjusted exponent
+  decNumber  dw;                   // work
+  decContext dc;                   // ..
+  uInt comb, exp;                  // ..
+  uInt uiwork;                     // for macros
+  uInt targ=0;                     // target 32-bit
+
+  // If the number has too many digits, or the exponent could be
+  // out of range then reduce the number under the appropriate
+  // constraints.  This could push the number to Infinity or zero,
+  // so this check and rounding must be done before generating the
+  // decimal32]
+  ae=dn->exponent+dn->digits-1;              // [0 if special]
+  if (dn->digits>DECIMAL32_Pmax              // too many digits
+   || ae>DECIMAL32_Emax                      // likely overflow
+   || ae<DECIMAL32_Emin) {                   // likely underflow
+    decContextDefault(&dc, DEC_INIT_DECIMAL32); // [no traps]
+    dc.round=set->round;                     // use supplied rounding
+    decNumberPlus(&dw, dn, &dc);             // (round and check)
+    // [this changes -0 to 0, so enforce the sign...]
+    dw.bits|=dn->bits&DECNEG;
+    status=dc.status;                        // save status
+    dn=&dw;                                  // use the work number
+    } // maybe out of range
+
+  if (dn->bits&DECSPECIAL) {                      // a special value
+    if (dn->bits&DECINF) targ=DECIMAL_Inf<<24;
+     else {                                       // sNaN or qNaN
+      if ((*dn->lsu!=0 || dn->digits>1)           // non-zero coefficient
+       && (dn->digits<DECIMAL32_Pmax)) {          // coefficient fits
+        decDigitsToDPD(dn, &targ, 0);
+        }
+      if (dn->bits&DECNAN) targ|=DECIMAL_NaN<<24;
+       else targ|=DECIMAL_sNaN<<24;
+      } // a NaN
+    } // special
+
+   else { // is finite
+    if (decNumberIsZero(dn)) {               // is a zero
+      // set and clamp exponent
+      if (dn->exponent<-DECIMAL32_Bias) {
+        exp=0;                               // low clamp
+        status|=DEC_Clamped;
+        }
+       else {
+        exp=dn->exponent+DECIMAL32_Bias;     // bias exponent
+        if (exp>DECIMAL32_Ehigh) {           // top clamp
+          exp=DECIMAL32_Ehigh;
+          status|=DEC_Clamped;
+          }
+        }
+      comb=(exp>>3) & 0x18;             // msd=0, exp top 2 bits ..
+      }
+     else {                             // non-zero finite number
+      uInt msd;                         // work
+      Int pad=0;                        // coefficient pad digits
+
+      // the dn is known to fit, but it may need to be padded
+      exp=(uInt)(dn->exponent+DECIMAL32_Bias);    // bias exponent
+      if (exp>DECIMAL32_Ehigh) {                  // fold-down case
+        pad=exp-DECIMAL32_Ehigh;
+        exp=DECIMAL32_Ehigh;                      // [to maximum]
+        status|=DEC_Clamped;
+        }
+
+      // fastpath common case
+      if (DECDPUN==3 && pad==0) {
+        targ=BIN2DPD[dn->lsu[0]];
+        if (dn->digits>3) targ|=(uInt)(BIN2DPD[dn->lsu[1]])<<10;
+        msd=(dn->digits==7 ? dn->lsu[2] : 0);
+        }
+       else { // general case
+        decDigitsToDPD(dn, &targ, pad);
+        // save and clear the top digit
+        msd=targ>>20;
+        targ&=0x000fffff;
+        }
+
+      // create the combination field
+      if (msd>=8) comb=0x18 | ((exp>>5) & 0x06) | (msd & 0x01);
+             else comb=((exp>>3) & 0x18) | msd;
+      }
+    targ|=comb<<26;                // add combination field ..
+    targ|=(exp&0x3f)<<20;          // .. and exponent continuation
+    } // finite
+
+  if (dn->bits&DECNEG) targ|=0x80000000;  // add sign bit
+
+  // now write to storage; this is endian
+  UBFROMUI(d32->bytes, targ);      // directly store the int
+
+  if (status!=0) decContextSetStatus(set, status); // pass on status
+  // decimal32Show(d32);
+  return d32;
+  } // decimal32FromNumber
+
+/* ------------------------------------------------------------------ */
+/* decimal32ToNumber -- convert decimal32 to decNumber                */
+/*   d32 is the source decimal32                                      */
+/*   dn is the target number, with appropriate space                  */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decNumber * decimal32ToNumber(const decimal32 *d32, decNumber *dn) {
+  uInt msd;                        // coefficient MSD
+  uInt exp;                        // exponent top two bits
+  uInt comb;                       // combination field
+  uInt sour;                       // source 32-bit
+  uInt uiwork;                     // for macros
+
+  // load source from storage; this is endian
+  sour=UBTOUI(d32->bytes);         // directly load the int
+
+  comb=(sour>>26)&0x1f;            // combination field
+
+  decNumberZero(dn);               // clean number
+  if (sour&0x80000000) dn->bits=DECNEG; // set sign if negative
+
+  msd=COMBMSD[comb];               // decode the combination field
+  exp=COMBEXP[comb];               // ..
+
+  if (exp==3) {                    // is a special
+    if (msd==0) {
+      dn->bits|=DECINF;
+      return dn;                   // no coefficient needed
+      }
+    else if (sour&0x02000000) dn->bits|=DECSNAN;
+    else dn->bits|=DECNAN;
+    msd=0;                         // no top digit
+    }
+   else {                          // is a finite number
+    dn->exponent=(exp<<6)+((sour>>20)&0x3f)-DECIMAL32_Bias; // unbiased
+    }
+
+  // get the coefficient
+  sour&=0x000fffff;                // clean coefficient continuation
+  if (msd) {                       // non-zero msd
+    sour|=msd<<20;                 // prefix to coefficient
+    decDigitsFromDPD(dn, &sour, 3); // process 3 declets
+    return dn;
+    }
+  // msd=0
+  if (!sour) return dn;            // easy: coefficient is 0
+  if (sour&0x000ffc00)             // need 2 declets?
+    decDigitsFromDPD(dn, &sour, 2); // process 2 declets
+   else
+    decDigitsFromDPD(dn, &sour, 1); // process 1 declet
+  return dn;
+  } // decimal32ToNumber
+
+/* ------------------------------------------------------------------ */
+/* to-scientific-string -- conversion to numeric string               */
+/* to-engineering-string -- conversion to numeric string              */
+/*                                                                    */
+/*   decimal32ToString(d32, string);                                  */
+/*   decimal32ToEngString(d32, string);                               */
+/*                                                                    */
+/*  d32 is the decimal32 format number to convert                     */
+/*  string is the string where the result will be laid out            */
+/*                                                                    */
+/*  string must be at least 24 characters                             */
+/*                                                                    */
+/*  No error is possible, and no status can be set.                   */
+/* ------------------------------------------------------------------ */
+char * decimal32ToEngString(const decimal32 *d32, char *string){
+  decNumber dn;                         // work
+  decimal32ToNumber(d32, &dn);
+  decNumberToEngString(&dn, string);
+  return string;
+  } // decimal32ToEngString
+
+char * decimal32ToString(const decimal32 *d32, char *string){
+  uInt msd;                        // coefficient MSD
+  Int  exp;                        // exponent top two bits or full
+  uInt comb;                       // combination field
+  char *cstart;                    // coefficient start
+  char *c;                         // output pointer in string
+  const uByte *u;                  // work
+  char *s, *t;                     // .. (source, target)
+  Int  dpd;                        // ..
+  Int  pre, e;                     // ..
+  uInt uiwork;                     // for macros
+  uInt sour;                       // source 32-bit
+
+  // load source from storage; this is endian
+  sour=UBTOUI(d32->bytes);         // directly load the int
+
+  c=string;                        // where result will go
+  if (((Int)sour)<0) *c++='-';     // handle sign
+
+  comb=(sour>>26)&0x1f;            // combination field
+  msd=COMBMSD[comb];               // decode the combination field
+  exp=COMBEXP[comb];               // ..
+
+  if (exp==3) {
+    if (msd==0) {                  // infinity
+      strcpy(c,   "Inf");
+      strcpy(c+3, "inity");
+      return string;               // easy
+      }
+    if (sour&0x02000000) *c++='s'; // sNaN
+    strcpy(c, "NaN");              // complete word
+    c+=3;                          // step past
+    if ((sour&0x000fffff)==0) return string; // zero payload
+    // otherwise drop through to add integer; set correct exp
+    exp=0; msd=0;                  // setup for following code
+    }
+   else exp=(exp<<6)+((sour>>20)&0x3f)-DECIMAL32_Bias; // unbiased
+
+  // convert 7 digits of significand to characters
+  cstart=c;                        // save start of coefficient
+  if (msd) *c++='0'+(char)msd;     // non-zero most significant digit
+
+  // Now decode the declets.  After extracting each one, it is
+  // decoded to binary and then to a 4-char sequence by table lookup;
+  // the 4-chars are a 1-char length (significant digits, except 000
+  // has length 0).  This allows us to left-align the first declet
+  // with non-zero content, then remaining ones are full 3-char
+  // length.  We use fixed-length memcpys because variable-length
+  // causes a subroutine call in GCC.  (These are length 4 for speed
+  // and are safe because the array has an extra terminator byte.)
+  #define dpd2char u=&BIN2CHAR[DPD2BIN[dpd]*4];                   \
+                   if (c!=cstart) {memcpy(c, u+1, 4); c+=3;}      \
+                    else if (*u)  {memcpy(c, u+4-*u, 4); c+=*u;}
+
+  dpd=(sour>>10)&0x3ff;            // declet 1
+  dpd2char;
+  dpd=(sour)&0x3ff;                // declet 2
+  dpd2char;
+
+  if (c==cstart) *c++='0';         // all zeros -- make 0
+
+  if (exp==0) {                    // integer or NaN case -- easy
+    *c='\0';                       // terminate
+    return string;
+    }
+
+  /* non-0 exponent */
+  e=0;                             // assume no E
+  pre=c-cstart+exp;
+  // [here, pre-exp is the digits count (==1 for zero)]
+  if (exp>0 || pre<-5) {           // need exponential form
+    e=pre-1;                       // calculate E value
+    pre=1;                         // assume one digit before '.'
+    } // exponential form
+
+  /* modify the coefficient, adding 0s, '.', and E+nn as needed */
+  s=c-1;                           // source (LSD)
+  if (pre>0) {                     // ddd.ddd (plain), perhaps with E
+    char *dotat=cstart+pre;
+    if (dotat<c) {                 // if embedded dot needed...
+      t=c;                              // target
+      for (; s>=dotat; s--, t--) *t=*s; // open the gap; leave t at gap
+      *t='.';                           // insert the dot
+      c++;                              // length increased by one
+      }
+
+    // finally add the E-part, if needed; it will never be 0, and has
+    // a maximum length of 3 digits (E-101 case)
+    if (e!=0) {
+      *c++='E';                    // starts with E
+      *c++='+';                    // assume positive
+      if (e<0) {
+        *(c-1)='-';                // oops, need '-'
+        e=-e;                      // uInt, please
+        }
+      u=&BIN2CHAR[e*4];            // -> length byte
+      memcpy(c, u+4-*u, 4);        // copy fixed 4 characters [is safe]
+      c+=*u;                       // bump pointer appropriately
+      }
+    *c='\0';                       // add terminator
+    //printf("res %s\n", string);
+    return string;
+    } // pre>0
+
+  /* -5<=pre<=0: here for plain 0.ddd or 0.000ddd forms (can never have E) */
+  t=c+1-pre;
+  *(t+1)='\0';                          // can add terminator now
+  for (; s>=cstart; s--, t--) *t=*s;    // shift whole coefficient right
+  c=cstart;
+  *c++='0';                             // always starts with 0.
+  *c++='.';
+  for (; pre<0; pre++) *c++='0';        // add any 0's after '.'
+  //printf("res %s\n", string);
+  return string;
+  } // decimal32ToString
+
+/* ------------------------------------------------------------------ */
+/* to-number -- conversion from numeric string                        */
+/*                                                                    */
+/*   decimal32FromString(result, string, set);                        */
+/*                                                                    */
+/*  result  is the decimal32 format number which gets the result of   */
+/*          the conversion                                            */
+/*  *string is the character string which should contain a valid      */
+/*          number (which may be a special value)                     */
+/*  set     is the context                                            */
+/*                                                                    */
+/* The context is supplied to this routine is used for error handling */
+/* (setting of status and traps) and for the rounding mode, only.     */
+/* If an error occurs, the result will be a valid decimal32 NaN.      */
+/* ------------------------------------------------------------------ */
+decimal32 * decimal32FromString(decimal32 *result, const char *string,
+                                decContext *set) {
+  decContext dc;                             // work
+  decNumber dn;                              // ..
+
+  decContextDefault(&dc, DEC_INIT_DECIMAL32); // no traps, please
+  dc.round=set->round;                        // use supplied rounding
+
+  decNumberFromString(&dn, string, &dc);     // will round if needed
+  decimal32FromNumber(result, &dn, &dc);
+  if (dc.status!=0) {                        // something happened
+    decContextSetStatus(set, dc.status);     // .. pass it on
+    }
+  return result;
+  } // decimal32FromString
+
+/* ------------------------------------------------------------------ */
+/* decimal32IsCanonical -- test whether encoding is canonical         */
+/*   d32 is the source decimal32                                      */
+/*   returns 1 if the encoding of d32 is canonical, 0 otherwise       */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decimal32IsCanonical(const decimal32 *d32) {
+  decNumber dn;                         // work
+  decimal32 canon;                      // ..
+  decContext dc;                        // ..
+  decContextDefault(&dc, DEC_INIT_DECIMAL32);
+  decimal32ToNumber(d32, &dn);
+  decimal32FromNumber(&canon, &dn, &dc);// canon will now be canonical
+  return memcmp(d32, &canon, DECIMAL32_Bytes)==0;
+  } // decimal32IsCanonical
+
+/* ------------------------------------------------------------------ */
+/* decimal32Canonical -- copy an encoding, ensuring it is canonical   */
+/*   d32 is the source decimal32                                      */
+/*   result is the target (may be the same decimal32)                 */
+/*   returns result                                                   */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decimal32 * decimal32Canonical(decimal32 *result, const decimal32 *d32) {
+  decNumber dn;                         // work
+  decContext dc;                        // ..
+  decContextDefault(&dc, DEC_INIT_DECIMAL32);
+  decimal32ToNumber(d32, &dn);
+  decimal32FromNumber(result, &dn, &dc);// result will now be canonical
+  return result;
+  } // decimal32Canonical
+
+#if DECTRACE || DECCHECK
+/* Macros for accessing decimal32 fields.  These assume the argument
+   is a reference (pointer) to the decimal32 structure, and the
+   decimal32 is in network byte order (big-endian) */
+// Get sign
+#define decimal32Sign(d)       ((unsigned)(d)->bytes[0]>>7)
+
+// Get combination field
+#define decimal32Comb(d)       (((d)->bytes[0] & 0x7c)>>2)
+
+// Get exponent continuation [does not remove bias]
+#define decimal32ExpCon(d)     ((((d)->bytes[0] & 0x03)<<4)           \
+                             | ((unsigned)(d)->bytes[1]>>4))
+
+// Set sign [this assumes sign previously 0]
+#define decimal32SetSign(d, b) {                                      \
+  (d)->bytes[0]|=((unsigned)(b)<<7);}
+
+// Set exponent continuation [does not apply bias]
+// This assumes range has been checked and exponent previously 0;
+// type of exponent must be unsigned
+#define decimal32SetExpCon(d, e) {                                    \
+  (d)->bytes[0]|=(uByte)((e)>>4);                                     \
+  (d)->bytes[1]|=(uByte)(((e)&0x0F)<<4);}
+
+/* ------------------------------------------------------------------ */
+/* decimal32Show -- display a decimal32 in hexadecimal [debug aid]    */
+/*   d32 -- the number to show                                        */
+/* ------------------------------------------------------------------ */
+// Also shows sign/cob/expconfields extracted - valid bigendian only
+void decimal32Show(const decimal32 *d32) {
+  char buf[DECIMAL32_Bytes*2+1];
+  Int i, j=0;
+
+  if (DECLITEND) {
+    for (i=0; i<DECIMAL32_Bytes; i++, j+=2) {
+      sprintf(&buf[j], "%02x", d32->bytes[3-i]);
+      }
+    printf(" D32> %s [S:%d Cb:%02x Ec:%02x] LittleEndian\n", buf,
+           d32->bytes[3]>>7, (d32->bytes[3]>>2)&0x1f,
+           ((d32->bytes[3]&0x3)<<4)| (d32->bytes[2]>>4));
+    }
+   else {
+    for (i=0; i<DECIMAL32_Bytes; i++, j+=2) {
+      sprintf(&buf[j], "%02x", d32->bytes[i]);
+      }
+    printf(" D32> %s [S:%d Cb:%02x Ec:%02x] BigEndian\n", buf,
+           decimal32Sign(d32), decimal32Comb(d32), decimal32ExpCon(d32));
+    }
+  } // decimal32Show
+#endif
@@ -0,0 +1,81 @@
+/* ------------------------------------------------------------------ */
+/* Decimal 32-bit format module header                                */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2006.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECIMAL32)
+  #define DECIMAL32
+  #define DEC32NAME     "decimal32"                   /* Short name   */
+  #define DEC32FULLNAME "Decimal 32-bit Number"       /* Verbose name */
+  #define DEC32AUTHOR   "Mike Cowlishaw"              /* Who to blame */
+
+  /* parameters for decimal32s */
+  #define DECIMAL32_Bytes  4            /* length                     */
+  #define DECIMAL32_Pmax   7            /* maximum precision (digits) */
+  #define DECIMAL32_Emax   96           /* maximum adjusted exponent  */
+  #define DECIMAL32_Emin  -95           /* minimum adjusted exponent  */
+  #define DECIMAL32_Bias   101          /* bias for the exponent      */
+  #define DECIMAL32_String 15           /* maximum string length, +1  */
+  #define DECIMAL32_EconL  6            /* exp. continuation length   */
+  /* highest biased exponent (Elimit-1)                               */
+  #define DECIMAL32_Ehigh  (DECIMAL32_Emax+DECIMAL32_Bias-DECIMAL32_Pmax+1)
+
+  /* check enough digits, if pre-defined                              */
+  #if defined(DECNUMDIGITS)
+    #if (DECNUMDIGITS<DECIMAL32_Pmax)
+      #error decimal32.h needs pre-defined DECNUMDIGITS>=7 for safe use
+    #endif
+  #endif
+
+  #ifndef DECNUMDIGITS
+    #define DECNUMDIGITS DECIMAL32_Pmax /* size if not already defined*/
+  #endif
+  #ifndef DECNUMBER
+    #include "decNumber.h"              /* context and number library */
+  #endif
+
+  /* Decimal 32-bit type, accessible by bytes */
+  typedef struct {
+    uint8_t bytes[DECIMAL32_Bytes];     /* decimal32: 1, 5, 6, 20 bits*/
+    } decimal32;
+
+  /* special values [top byte excluding sign bit; last two bits are   */
+  /* don't-care for Infinity on input, last bit don't-care for NaN]   */
+  #if !defined(DECIMAL_NaN)
+    #define DECIMAL_NaN     0x7c        /* 0 11111 00 NaN             */
+    #define DECIMAL_sNaN    0x7e        /* 0 11111 10 sNaN            */
+    #define DECIMAL_Inf     0x78        /* 0 11110 00 Infinity        */
+  #endif
+
+  /* ---------------------------------------------------------------- */
+  /* Routines                                                         */
+  /* ---------------------------------------------------------------- */
+  /* String conversions                                               */
+  decimal32 * decimal32FromString(decimal32 *, const char *, decContext *);
+  char * decimal32ToString(const decimal32 *, char *);
+  char * decimal32ToEngString(const decimal32 *, char *);
+
+  /* decNumber conversions                                            */
+  decimal32 * decimal32FromNumber(decimal32 *, const decNumber *,
+                                  decContext *);
+  decNumber * decimal32ToNumber(const decimal32 *, decNumber *);
+
+  /* Format-dependent utilities                                       */
+  uint32_t    decimal32IsCanonical(const decimal32 *);
+  decimal32 * decimal32Canonical(decimal32 *, const decimal32 *);
+
+#endif
@@ -0,0 +1,839 @@
+/* ------------------------------------------------------------------ */
+/* Decimal 64-bit format module                                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2009.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+/* This module comprises the routines for decimal64 format numbers.   */
+/* Conversions are supplied to and from decNumber and String.         */
+/*                                                                    */
+/* This is used when decNumber provides operations, either for all    */
+/* operations or as a proxy between decNumber and decSingle.          */
+/*                                                                    */
+/* Error handling is the same as decNumber (qv.).                     */
+/* ------------------------------------------------------------------ */
+#include <string.h>           // [for memset/memcpy]
+#include <stdio.h>            // [for printf]
+
+#define  DECNUMDIGITS 16      // make decNumbers with space for 16
+#include "decNumber.h"        // base number library
+#include "decNumberLocal.h"   // decNumber local types, etc.
+#include "decimal64.h"        // our primary include
+
+/* Utility routines and tables [in decimal64.c]; externs for C++ */
+// DPD2BIN and the reverse are renamed to prevent link-time conflict
+// if decQuad is also built in the same executable
+#define DPD2BIN DPD2BINx
+#define BIN2DPD BIN2DPDx
+extern const uInt COMBEXP[32], COMBMSD[32];
+extern const uShort DPD2BIN[1024];
+extern const uShort BIN2DPD[1000];
+extern const uByte  BIN2CHAR[4001];
+
+extern void decDigitsFromDPD(decNumber *, const uInt *, Int);
+extern void decDigitsToDPD(const decNumber *, uInt *, Int);
+
+#if DECTRACE || DECCHECK
+void decimal64Show(const decimal64 *);            // for debug
+extern void decNumberShow(const decNumber *);     // ..
+#endif
+
+/* Useful macro */
+// Clear a structure (e.g., a decNumber)
+#define DEC_clear(d) memset(d, 0, sizeof(*d))
+
+/* define and include the tables to use for conversions */
+#define DEC_BIN2CHAR 1
+#define DEC_DPD2BIN  1
+#define DEC_BIN2DPD  1             // used for all sizes
+#include "decDPD.h"                // lookup tables
+
+/* ------------------------------------------------------------------ */
+/* decimal64FromNumber -- convert decNumber to decimal64              */
+/*                                                                    */
+/*   ds is the target decimal64                                       */
+/*   dn is the source number (assumed valid)                          */
+/*   set is the context, used only for reporting errors               */
+/*                                                                    */
+/* The set argument is used only for status reporting and for the     */
+/* rounding mode (used if the coefficient is more than DECIMAL64_Pmax */
+/* digits or an overflow is detected).  If the exponent is out of the */
+/* valid range then Overflow or Underflow will be raised.             */
+/* After Underflow a subnormal result is possible.                    */
+/*                                                                    */
+/* DEC_Clamped is set if the number has to be 'folded down' to fit,   */
+/* by reducing its exponent and multiplying the coefficient by a      */
+/* power of ten, or if the exponent on a zero had to be clamped.      */
+/* ------------------------------------------------------------------ */
+decimal64 * decimal64FromNumber(decimal64 *d64, const decNumber *dn,
+                                decContext *set) {
+  uInt status=0;                   // status accumulator
+  Int ae;                          // adjusted exponent
+  decNumber  dw;                   // work
+  decContext dc;                   // ..
+  uInt comb, exp;                  // ..
+  uInt uiwork;                     // for macros
+  uInt targar[2]={0, 0};           // target 64-bit
+  #define targhi targar[1]         // name the word with the sign
+  #define targlo targar[0]         // and the other
+
+  // If the number has too many digits, or the exponent could be
+  // out of range then reduce the number under the appropriate
+  // constraints.  This could push the number to Infinity or zero,
+  // so this check and rounding must be done before generating the
+  // decimal64]
+  ae=dn->exponent+dn->digits-1;              // [0 if special]
+  if (dn->digits>DECIMAL64_Pmax              // too many digits
+   || ae>DECIMAL64_Emax                      // likely overflow
+   || ae<DECIMAL64_Emin) {                   // likely underflow
+    decContextDefault(&dc, DEC_INIT_DECIMAL64); // [no traps]
+    dc.round=set->round;                     // use supplied rounding
+    decNumberPlus(&dw, dn, &dc);             // (round and check)
+    // [this changes -0 to 0, so enforce the sign...]
+    dw.bits|=dn->bits&DECNEG;
+    status=dc.status;                        // save status
+    dn=&dw;                                  // use the work number
+    } // maybe out of range
+
+  if (dn->bits&DECSPECIAL) {                      // a special value
+    if (dn->bits&DECINF) targhi=DECIMAL_Inf<<24;
+     else {                                       // sNaN or qNaN
+      if ((*dn->lsu!=0 || dn->digits>1)           // non-zero coefficient
+       && (dn->digits<DECIMAL64_Pmax)) {          // coefficient fits
+        decDigitsToDPD(dn, targar, 0);
+        }
+      if (dn->bits&DECNAN) targhi|=DECIMAL_NaN<<24;
+       else targhi|=DECIMAL_sNaN<<24;
+      } // a NaN
+    } // special
+
+   else { // is finite
+    if (decNumberIsZero(dn)) {               // is a zero
+      // set and clamp exponent
+      if (dn->exponent<-DECIMAL64_Bias) {
+        exp=0;                               // low clamp
+        status|=DEC_Clamped;
+        }
+       else {
+        exp=dn->exponent+DECIMAL64_Bias;     // bias exponent
+        if (exp>DECIMAL64_Ehigh) {           // top clamp
+          exp=DECIMAL64_Ehigh;
+          status|=DEC_Clamped;
+          }
+        }
+      comb=(exp>>5) & 0x18;             // msd=0, exp top 2 bits ..
+      }
+     else {                             // non-zero finite number
+      uInt msd;                         // work
+      Int pad=0;                        // coefficient pad digits
+
+      // the dn is known to fit, but it may need to be padded
+      exp=(uInt)(dn->exponent+DECIMAL64_Bias);    // bias exponent
+      if (exp>DECIMAL64_Ehigh) {                  // fold-down case
+        pad=exp-DECIMAL64_Ehigh;
+        exp=DECIMAL64_Ehigh;                      // [to maximum]
+        status|=DEC_Clamped;
+        }
+
+      // fastpath common case
+      if (DECDPUN==3 && pad==0) {
+        uInt dpd[6]={0,0,0,0,0,0};
+        uInt i;
+        Int d=dn->digits;
+        for (i=0; d>0; i++, d-=3) dpd[i]=BIN2DPD[dn->lsu[i]];
+        targlo =dpd[0];
+        targlo|=dpd[1]<<10;
+        targlo|=dpd[2]<<20;
+        if (dn->digits>6) {
+          targlo|=dpd[3]<<30;
+          targhi =dpd[3]>>2;
+          targhi|=dpd[4]<<8;
+          }
+        msd=dpd[5];                // [did not really need conversion]
+        }
+       else { // general case
+        decDigitsToDPD(dn, targar, pad);
+        // save and clear the top digit
+        msd=targhi>>18;
+        targhi&=0x0003ffff;
+        }
+
+      // create the combination field
+      if (msd>=8) comb=0x18 | ((exp>>7) & 0x06) | (msd & 0x01);
+             else comb=((exp>>5) & 0x18) | msd;
+      }
+    targhi|=comb<<26;              // add combination field ..
+    targhi|=(exp&0xff)<<18;        // .. and exponent continuation
+    } // finite
+
+  if (dn->bits&DECNEG) targhi|=0x80000000; // add sign bit
+
+  // now write to storage; this is now always endian
+  if (DECLITEND) {
+    // lo int then hi
+    UBFROMUI(d64->bytes,   targar[0]);
+    UBFROMUI(d64->bytes+4, targar[1]);
+    }
+   else {
+    // hi int then lo
+    UBFROMUI(d64->bytes,   targar[1]);
+    UBFROMUI(d64->bytes+4, targar[0]);
+    }
+
+  if (status!=0) decContextSetStatus(set, status); // pass on status
+  // decimal64Show(d64);
+  return d64;
+  } // decimal64FromNumber
+
+/* ------------------------------------------------------------------ */
+/* decimal64ToNumber -- convert decimal64 to decNumber                */
+/*   d64 is the source decimal64                                      */
+/*   dn is the target number, with appropriate space                  */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decNumber * decimal64ToNumber(const decimal64 *d64, decNumber *dn) {
+  uInt msd;                        // coefficient MSD
+  uInt exp;                        // exponent top two bits
+  uInt comb;                       // combination field
+  Int  need;                       // work
+  uInt uiwork;                     // for macros
+  uInt sourar[2];                  // source 64-bit
+  #define sourhi sourar[1]         // name the word with the sign
+  #define sourlo sourar[0]         // and the lower word
+
+  // load source from storage; this is endian
+  if (DECLITEND) {
+    sourlo=UBTOUI(d64->bytes  );   // directly load the low int
+    sourhi=UBTOUI(d64->bytes+4);   // then the high int
+    }
+   else {
+    sourhi=UBTOUI(d64->bytes  );   // directly load the high int
+    sourlo=UBTOUI(d64->bytes+4);   // then the low int
+    }
+
+  comb=(sourhi>>26)&0x1f;          // combination field
+
+  decNumberZero(dn);               // clean number
+  if (sourhi&0x80000000) dn->bits=DECNEG; // set sign if negative
+
+  msd=COMBMSD[comb];               // decode the combination field
+  exp=COMBEXP[comb];               // ..
+
+  if (exp==3) {                    // is a special
+    if (msd==0) {
+      dn->bits|=DECINF;
+      return dn;                   // no coefficient needed
+      }
+    else if (sourhi&0x02000000) dn->bits|=DECSNAN;
+    else dn->bits|=DECNAN;
+    msd=0;                         // no top digit
+    }
+   else {                          // is a finite number
+    dn->exponent=(exp<<8)+((sourhi>>18)&0xff)-DECIMAL64_Bias; // unbiased
+    }
+
+  // get the coefficient
+  sourhi&=0x0003ffff;              // clean coefficient continuation
+  if (msd) {                       // non-zero msd
+    sourhi|=msd<<18;               // prefix to coefficient
+    need=6;                        // process 6 declets
+    }
+   else { // msd=0
+    if (!sourhi) {                 // top word 0
+      if (!sourlo) return dn;      // easy: coefficient is 0
+      need=3;                      // process at least 3 declets
+      if (sourlo&0xc0000000) need++; // process 4 declets
+      // [could reduce some more, here]
+      }
+     else {                        // some bits in top word, msd=0
+      need=4;                      // process at least 4 declets
+      if (sourhi&0x0003ff00) need++; // top declet!=0, process 5
+      }
+    } //msd=0
+
+  decDigitsFromDPD(dn, sourar, need);   // process declets
+  return dn;
+  } // decimal64ToNumber
+
+
+/* ------------------------------------------------------------------ */
+/* to-scientific-string -- conversion to numeric string               */
+/* to-engineering-string -- conversion to numeric string              */
+/*                                                                    */
+/*   decimal64ToString(d64, string);                                  */
+/*   decimal64ToEngString(d64, string);                               */
+/*                                                                    */
+/*  d64 is the decimal64 format number to convert                     */
+/*  string is the string where the result will be laid out            */
+/*                                                                    */
+/*  string must be at least 24 characters                             */
+/*                                                                    */
+/*  No error is possible, and no status can be set.                   */
+/* ------------------------------------------------------------------ */
+char * decimal64ToEngString(const decimal64 *d64, char *string){
+  decNumber dn;                         // work
+  decimal64ToNumber(d64, &dn);
+  decNumberToEngString(&dn, string);
+  return string;
+  } // decimal64ToEngString
+
+char * decimal64ToString(const decimal64 *d64, char *string){
+  uInt msd;                        // coefficient MSD
+  Int  exp;                        // exponent top two bits or full
+  uInt comb;                       // combination field
+  char *cstart;                    // coefficient start
+  char *c;                         // output pointer in string
+  const uByte *u;                  // work
+  char *s, *t;                     // .. (source, target)
+  Int  dpd;                        // ..
+  Int  pre, e;                     // ..
+  uInt uiwork;                     // for macros
+
+  uInt sourar[2];                  // source 64-bit
+  #define sourhi sourar[1]         // name the word with the sign
+  #define sourlo sourar[0]         // and the lower word
+
+  // load source from storage; this is endian
+  if (DECLITEND) {
+    sourlo=UBTOUI(d64->bytes  );   // directly load the low int
+    sourhi=UBTOUI(d64->bytes+4);   // then the high int
+    }
+   else {
+    sourhi=UBTOUI(d64->bytes  );   // directly load the high int
+    sourlo=UBTOUI(d64->bytes+4);   // then the low int
+    }
+
+  c=string;                        // where result will go
+  if (((Int)sourhi)<0) *c++='-';   // handle sign
+
+  comb=(sourhi>>26)&0x1f;          // combination field
+  msd=COMBMSD[comb];               // decode the combination field
+  exp=COMBEXP[comb];               // ..
+
+  if (exp==3) {
+    if (msd==0) {                  // infinity
+      strcpy(c,   "Inf");
+      strcpy(c+3, "inity");
+      return string;               // easy
+      }
+    if (sourhi&0x02000000) *c++='s'; // sNaN
+    strcpy(c, "NaN");              // complete word
+    c+=3;                          // step past
+    if (sourlo==0 && (sourhi&0x0003ffff)==0) return string; // zero payload
+    // otherwise drop through to add integer; set correct exp
+    exp=0; msd=0;                  // setup for following code
+    }
+   else exp=(exp<<8)+((sourhi>>18)&0xff)-DECIMAL64_Bias;
+
+  // convert 16 digits of significand to characters
+  cstart=c;                        // save start of coefficient
+  if (msd) *c++='0'+(char)msd;     // non-zero most significant digit
+
+  // Now decode the declets.  After extracting each one, it is
+  // decoded to binary and then to a 4-char sequence by table lookup;
+  // the 4-chars are a 1-char length (significant digits, except 000
+  // has length 0).  This allows us to left-align the first declet
+  // with non-zero content, then remaining ones are full 3-char
+  // length.  We use fixed-length memcpys because variable-length
+  // causes a subroutine call in GCC.  (These are length 4 for speed
+  // and are safe because the array has an extra terminator byte.)
+  #define dpd2char u=&BIN2CHAR[DPD2BIN[dpd]*4];                   \
+                   if (c!=cstart) {memcpy(c, u+1, 4); c+=3;}      \
+                    else if (*u)  {memcpy(c, u+4-*u, 4); c+=*u;}
+
+  dpd=(sourhi>>8)&0x3ff;                     // declet 1
+  dpd2char;
+  dpd=((sourhi&0xff)<<2) | (sourlo>>30);     // declet 2
+  dpd2char;
+  dpd=(sourlo>>20)&0x3ff;                    // declet 3
+  dpd2char;
+  dpd=(sourlo>>10)&0x3ff;                    // declet 4
+  dpd2char;
+  dpd=(sourlo)&0x3ff;                        // declet 5
+  dpd2char;
+
+  if (c==cstart) *c++='0';         // all zeros -- make 0
+
+  if (exp==0) {                    // integer or NaN case -- easy
+    *c='\0';                       // terminate
+    return string;
+    }
+
+  /* non-0 exponent */
+  e=0;                             // assume no E
+  pre=c-cstart+exp;
+  // [here, pre-exp is the digits count (==1 for zero)]
+  if (exp>0 || pre<-5) {           // need exponential form
+    e=pre-1;                       // calculate E value
+    pre=1;                         // assume one digit before '.'
+    } // exponential form
+
+  /* modify the coefficient, adding 0s, '.', and E+nn as needed */
+  s=c-1;                           // source (LSD)
+  if (pre>0) {                     // ddd.ddd (plain), perhaps with E
+    char *dotat=cstart+pre;
+    if (dotat<c) {                 // if embedded dot needed...
+      t=c;                              // target
+      for (; s>=dotat; s--, t--) *t=*s; // open the gap; leave t at gap
+      *t='.';                           // insert the dot
+      c++;                              // length increased by one
+      }
+
+    // finally add the E-part, if needed; it will never be 0, and has
+    // a maximum length of 3 digits
+    if (e!=0) {
+      *c++='E';                    // starts with E
+      *c++='+';                    // assume positive
+      if (e<0) {
+        *(c-1)='-';                // oops, need '-'
+        e=-e;                      // uInt, please
+        }
+      u=&BIN2CHAR[e*4];            // -> length byte
+      memcpy(c, u+4-*u, 4);        // copy fixed 4 characters [is safe]
+      c+=*u;                       // bump pointer appropriately
+      }
+    *c='\0';                       // add terminator
+    //printf("res %s\n", string);
+    return string;
+    } // pre>0
+
+  /* -5<=pre<=0: here for plain 0.ddd or 0.000ddd forms (can never have E) */
+  t=c+1-pre;
+  *(t+1)='\0';                          // can add terminator now
+  for (; s>=cstart; s--, t--) *t=*s;    // shift whole coefficient right
+  c=cstart;
+  *c++='0';                             // always starts with 0.
+  *c++='.';
+  for (; pre<0; pre++) *c++='0';        // add any 0's after '.'
+  //printf("res %s\n", string);
+  return string;
+  } // decimal64ToString
+
+/* ------------------------------------------------------------------ */
+/* to-number -- conversion from numeric string                        */
+/*                                                                    */
+/*   decimal64FromString(result, string, set);                        */
+/*                                                                    */
+/*  result  is the decimal64 format number which gets the result of   */
+/*          the conversion                                            */
+/*  *string is the character string which should contain a valid      */
+/*          number (which may be a special value)                     */
+/*  set     is the context                                            */
+/*                                                                    */
+/* The context is supplied to this routine is used for error handling */
+/* (setting of status and traps) and for the rounding mode, only.     */
+/* If an error occurs, the result will be a valid decimal64 NaN.      */
+/* ------------------------------------------------------------------ */
+decimal64 * decimal64FromString(decimal64 *result, const char *string,
+                                decContext *set) {
+  decContext dc;                             // work
+  decNumber dn;                              // ..
+
+  decContextDefault(&dc, DEC_INIT_DECIMAL64); // no traps, please
+  dc.round=set->round;                        // use supplied rounding
+
+  decNumberFromString(&dn, string, &dc);     // will round if needed
+
+  decimal64FromNumber(result, &dn, &dc);
+  if (dc.status!=0) {                        // something happened
+    decContextSetStatus(set, dc.status);     // .. pass it on
+    }
+  return result;
+  } // decimal64FromString
+
+/* ------------------------------------------------------------------ */
+/* decimal64IsCanonical -- test whether encoding is canonical         */
+/*   d64 is the source decimal64                                      */
+/*   returns 1 if the encoding of d64 is canonical, 0 otherwise       */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+uInt decimal64IsCanonical(const decimal64 *d64) {
+  decNumber dn;                         // work
+  decimal64 canon;                      // ..
+  decContext dc;                        // ..
+  decContextDefault(&dc, DEC_INIT_DECIMAL64);
+  decimal64ToNumber(d64, &dn);
+  decimal64FromNumber(&canon, &dn, &dc);// canon will now be canonical
+  return memcmp(d64, &canon, DECIMAL64_Bytes)==0;
+  } // decimal64IsCanonical
+
+/* ------------------------------------------------------------------ */
+/* decimal64Canonical -- copy an encoding, ensuring it is canonical   */
+/*   d64 is the source decimal64                                      */
+/*   result is the target (may be the same decimal64)                 */
+/*   returns result                                                   */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+decimal64 * decimal64Canonical(decimal64 *result, const decimal64 *d64) {
+  decNumber dn;                         // work
+  decContext dc;                        // ..
+  decContextDefault(&dc, DEC_INIT_DECIMAL64);
+  decimal64ToNumber(d64, &dn);
+  decimal64FromNumber(result, &dn, &dc);// result will now be canonical
+  return result;
+  } // decimal64Canonical
+
+#if DECTRACE || DECCHECK
+/* Macros for accessing decimal64 fields.  These assume the
+   argument is a reference (pointer) to the decimal64 structure,
+   and the decimal64 is in network byte order (big-endian) */
+// Get sign
+#define decimal64Sign(d)       ((unsigned)(d)->bytes[0]>>7)
+
+// Get combination field
+#define decimal64Comb(d)       (((d)->bytes[0] & 0x7c)>>2)
+
+// Get exponent continuation [does not remove bias]
+#define decimal64ExpCon(d)     ((((d)->bytes[0] & 0x03)<<6)           \
+                             | ((unsigned)(d)->bytes[1]>>2))
+
+// Set sign [this assumes sign previously 0]
+#define decimal64SetSign(d, b) {                                      \
+  (d)->bytes[0]|=((unsigned)(b)<<7);}
+
+// Set exponent continuation [does not apply bias]
+// This assumes range has been checked and exponent previously 0;
+// type of exponent must be unsigned
+#define decimal64SetExpCon(d, e) {                                    \
+  (d)->bytes[0]|=(uByte)((e)>>6);                                     \
+  (d)->bytes[1]|=(uByte)(((e)&0x3F)<<2);}
+
+/* ------------------------------------------------------------------ */
+/* decimal64Show -- display a decimal64 in hexadecimal [debug aid]    */
+/*   d64 -- the number to show                                        */
+/* ------------------------------------------------------------------ */
+// Also shows sign/cob/expconfields extracted
+void decimal64Show(const decimal64 *d64) {
+  char buf[DECIMAL64_Bytes*2+1];
+  Int i, j=0;
+
+  if (DECLITEND) {
+    for (i=0; i<DECIMAL64_Bytes; i++, j+=2) {
+      sprintf(&buf[j], "%02x", d64->bytes[7-i]);
+      }
+    printf(" D64> %s [S:%d Cb:%02x Ec:%02x] LittleEndian\n", buf,
+           d64->bytes[7]>>7, (d64->bytes[7]>>2)&0x1f,
+           ((d64->bytes[7]&0x3)<<6)| (d64->bytes[6]>>2));
+    }
+   else { // big-endian
+    for (i=0; i<DECIMAL64_Bytes; i++, j+=2) {
+      sprintf(&buf[j], "%02x", d64->bytes[i]);
+      }
+    printf(" D64> %s [S:%d Cb:%02x Ec:%02x] BigEndian\n", buf,
+           decimal64Sign(d64), decimal64Comb(d64), decimal64ExpCon(d64));
+    }
+  } // decimal64Show
+#endif
+
+/* ================================================================== */
+/* Shared utility routines and tables                                 */
+/* ================================================================== */
+// define and include the conversion tables to use for shared code
+#if DECDPUN==3
+  #define DEC_DPD2BIN 1
+#else
+  #define DEC_DPD2BCD 1
+#endif
+#include "decDPD.h"           // lookup tables
+
+// The maximum number of decNumberUnits needed for a working copy of
+// the units array is the ceiling of digits/DECDPUN, where digits is
+// the maximum number of digits in any of the formats for which this
+// is used.  decimal128.h must not be included in this module, so, as
+// a very special case, that number is defined as a literal here.
+#define DECMAX754   34
+#define DECMAXUNITS ((DECMAX754+DECDPUN-1)/DECDPUN)
+
+/* ------------------------------------------------------------------ */
+/* Combination field lookup tables (uInts to save measurable work)    */
+/*                                                                    */
+/*      COMBEXP - 2-bit most-significant-bits of exponent             */
+/*                [11 if an Infinity or NaN]                          */
+/*      COMBMSD - 4-bit most-significant-digit                        */
+/*                [0=Infinity, 1=NaN if COMBEXP=11]                   */
+/*                                                                    */
+/* Both are indexed by the 5-bit combination field (0-31)             */
+/* ------------------------------------------------------------------ */
+const uInt COMBEXP[32]={0, 0, 0, 0, 0, 0, 0, 0,
+                        1, 1, 1, 1, 1, 1, 1, 1,
+                        2, 2, 2, 2, 2, 2, 2, 2,
+                        0, 0, 1, 1, 2, 2, 3, 3};
+const uInt COMBMSD[32]={0, 1, 2, 3, 4, 5, 6, 7,
+                        0, 1, 2, 3, 4, 5, 6, 7,
+                        0, 1, 2, 3, 4, 5, 6, 7,
+                        8, 9, 8, 9, 8, 9, 0, 1};
+
+/* ------------------------------------------------------------------ */
+/* decDigitsToDPD -- pack coefficient into DPD form                   */
+/*                                                                    */
+/*   dn   is the source number (assumed valid, max DECMAX754 digits)  */
+/*   targ is 1, 2, or 4-element uInt array, which the caller must     */
+/*        have cleared to zeros                                       */
+/*   shift is the number of 0 digits to add on the right (normally 0) */
+/*                                                                    */
+/* The coefficient must be known small enough to fit.  The full       */
+/* coefficient is copied, including the leading 'odd' digit.  This    */
+/* digit is retrieved and packed into the combination field by the    */
+/* caller.                                                            */
+/*                                                                    */
+/* The target uInts are altered only as necessary to receive the      */
+/* digits of the decNumber.  When more than one uInt is needed, they  */
+/* are filled from left to right (that is, the uInt at offset 0 will  */
+/* end up with the least-significant digits).                         */
+/*                                                                    */
+/* shift is used for 'fold-down' padding.                             */
+/*                                                                    */
+/* No error is possible.                                              */
+/* ------------------------------------------------------------------ */
+#if DECDPUN<=4
+// Constant multipliers for divide-by-power-of five using reciprocal
+// multiply, after removing powers of 2 by shifting, and final shift
+// of 17 [we only need up to **4]
+static const uInt multies[]={131073, 26215, 5243, 1049, 210};
+// QUOT10 -- macro to return the quotient of unit u divided by 10**n
+#define QUOT10(u, n) ((((uInt)(u)>>(n))*multies[n])>>17)
+#endif
+void decDigitsToDPD(const decNumber *dn, uInt *targ, Int shift) {
+  Int  cut;                   // work
+  Int  n;                     // output bunch counter
+  Int  digits=dn->digits;     // digit countdown
+  uInt dpd;                   // densely packed decimal value
+  uInt bin;                   // binary value 0-999
+  uInt *uout=targ;            // -> current output uInt
+  uInt  uoff=0;               // -> current output offset [from right]
+  const Unit *inu=dn->lsu;    // -> current input unit
+  Unit  uar[DECMAXUNITS];     // working copy of units, iff shifted
+  #if DECDPUN!=3              // not fast path
+    Unit in;                  // current unit
+  #endif
+
+  if (shift!=0) {             // shift towards most significant required
+    // shift the units array to the left by pad digits and copy
+    // [this code is a special case of decShiftToMost, which could
+    // be used instead if exposed and the array were copied first]
+    const Unit *source;                 // ..
+    Unit  *target, *first;              // ..
+    uInt  next=0;                       // work
+
+    source=dn->lsu+D2U(digits)-1;       // where msu comes from
+    target=uar+D2U(digits)-1+D2U(shift);// where upper part of first cut goes
+    cut=DECDPUN-MSUDIGITS(shift);       // where to slice
+    if (cut==0) {                       // unit-boundary case
+      for (; source>=dn->lsu; source--, target--) *target=*source;
+      }
+     else {
+      first=uar+D2U(digits+shift)-1;    // where msu will end up
+      for (; source>=dn->lsu; source--, target--) {
+        // split the source Unit and accumulate remainder for next
+        #if DECDPUN<=4
+          uInt quot=QUOT10(*source, cut);
+          uInt rem=*source-quot*DECPOWERS[cut];
+          next+=quot;
+        #else
+          uInt rem=*source%DECPOWERS[cut];
+          next+=*source/DECPOWERS[cut];
+        #endif
+        if (target<=first) *target=(Unit)next; // write to target iff valid
+        next=rem*DECPOWERS[DECDPUN-cut];       // save remainder for next Unit
+        }
+      } // shift-move
+    // propagate remainder to one below and clear the rest
+    for (; target>=uar; target--) {
+      *target=(Unit)next;
+      next=0;
+      }
+    digits+=shift;                 // add count (shift) of zeros added
+    inu=uar;                       // use units in working array
+    }
+
+  /* now densely pack the coefficient into DPD declets */
+
+  #if DECDPUN!=3                   // not fast path
+    in=*inu;                       // current unit
+    cut=0;                         // at lowest digit
+    bin=0;                         // [keep compiler quiet]
+  #endif
+
+  for(n=0; digits>0; n++) {        // each output bunch
+    #if DECDPUN==3                 // fast path, 3-at-a-time
+      bin=*inu;                    // 3 digits ready for convert
+      digits-=3;                   // [may go negative]
+      inu++;                       // may need another
+
+    #else                          // must collect digit-by-digit
+      Unit dig;                    // current digit
+      Int j;                       // digit-in-declet count
+      for (j=0; j<3; j++) {
+        #if DECDPUN<=4
+          Unit temp=(Unit)((uInt)(in*6554)>>16);
+          dig=(Unit)(in-X10(temp));
+          in=temp;
+        #else
+          dig=in%10;
+          in=in/10;
+        #endif
+        if (j==0) bin=dig;
+         else if (j==1)  bin+=X10(dig);
+         else /* j==2 */ bin+=X100(dig);
+        digits--;
+        if (digits==0) break;      // [also protects *inu below]
+        cut++;
+        if (cut==DECDPUN) {inu++; in=*inu; cut=0;}
+        }
+    #endif
+    // here there are 3 digits in bin, or have used all input digits
+
+    dpd=BIN2DPD[bin];
+
+    // write declet to uInt array
+    *uout|=dpd<<uoff;
+    uoff+=10;
+    if (uoff<32) continue;         // no uInt boundary cross
+    uout++;
+    uoff-=32;
+    *uout|=dpd>>(10-uoff);         // collect top bits
+    } // n declets
+  return;
+  } // decDigitsToDPD
+
+/* ------------------------------------------------------------------ */
+/* decDigitsFromDPD -- unpack a format's coefficient                  */
+/*                                                                    */
+/*   dn is the target number, with 7, 16, or 34-digit space.          */
+/*   sour is a 1, 2, or 4-element uInt array containing only declets  */
+/*   declets is the number of (right-aligned) declets in sour to      */
+/*     be processed.  This may be 1 more than the obvious number in   */
+/*     a format, as any top digit is prefixed to the coefficient      */
+/*     continuation field.  It also may be as small as 1, as the      */
+/*     caller may pre-process leading zero declets.                   */
+/*                                                                    */
+/* When doing the 'extra declet' case care is taken to avoid writing  */
+/* extra digits when there are leading zeros, as these could overflow */
+/* the units array when DECDPUN is not 3.                             */
+/*                                                                    */
+/* The target uInts are used only as necessary to process declets     */
+/* declets into the decNumber.  When more than one uInt is needed,    */
+/* they are used from left to right (that is, the uInt at offset 0    */
+/* provides the least-significant digits).                            */
+/*                                                                    */
+/* dn->digits is set, but not the sign or exponent.                   */
+/* No error is possible [the redundant 888 codes are allowed].        */
+/* ------------------------------------------------------------------ */
+void decDigitsFromDPD(decNumber *dn, const uInt *sour, Int declets) {
+
+  uInt  dpd;                       // collector for 10 bits
+  Int   n;                         // counter
+  Unit  *uout=dn->lsu;             // -> current output unit
+  Unit  *last=uout;                // will be unit containing msd
+  const uInt *uin=sour;            // -> current input uInt
+  uInt  uoff=0;                    // -> current input offset [from right]
+
+  #if DECDPUN!=3
+  uInt  bcd;                       // BCD result
+  uInt  nibble;                    // work
+  Unit  out=0;                     // accumulator
+  Int   cut=0;                     // power of ten in current unit
+  #endif
+  #if DECDPUN>4
+  uInt const *pow;                 // work
+  #endif
+
+  // Expand the densely-packed integer, right to left
+  for (n=declets-1; n>=0; n--) {   // count down declets of 10 bits
+    dpd=*uin>>uoff;
+    uoff+=10;
+    if (uoff>32) {                 // crossed uInt boundary
+      uin++;
+      uoff-=32;                    // [if using this code for wider, check this]
+      dpd|=*uin<<(10-uoff);        // get waiting bits
+      }
+    dpd&=0x3ff;                    // clear uninteresting bits
+
+  #if DECDPUN==3
+    if (dpd==0) *uout=0;
+     else {
+      *uout=DPD2BIN[dpd];          // convert 10 bits to binary 0-999
+      last=uout;                   // record most significant unit
+      }
+    uout++;
+    } // n
+
+  #else // DECDPUN!=3
+    if (dpd==0) {                  // fastpath [e.g., leading zeros]
+      // write out three 0 digits (nibbles); out may have digit(s)
+      cut++;
+      if (cut==DECDPUN) {*uout=out; if (out) {last=uout; out=0;} uout++; cut=0;}
+      if (n==0) break;             // [as below, works even if MSD=0]
+      cut++;
+      if (cut==DECDPUN) {*uout=out; if (out) {last=uout; out=0;} uout++; cut=0;}
+      cut++;
+      if (cut==DECDPUN) {*uout=out; if (out) {last=uout; out=0;} uout++; cut=0;}
+      continue;
+      }
+
+    bcd=DPD2BCD[dpd];              // convert 10 bits to 12 bits BCD
+
+    // now accumulate the 3 BCD nibbles into units
+    nibble=bcd & 0x00f;
+    if (nibble) out=(Unit)(out+nibble*DECPOWERS[cut]);
+    cut++;
+    if (cut==DECDPUN) {*uout=out; if (out) {last=uout; out=0;} uout++; cut=0;}
+    bcd>>=4;
+
+    // if this is the last declet and the remaining nibbles in bcd
+    // are 00 then process no more nibbles, because this could be
+    // the 'odd' MSD declet and writing any more Units would then
+    // overflow the unit array
+    if (n==0 && !bcd) break;
+
+    nibble=bcd & 0x00f;
+    if (nibble) out=(Unit)(out+nibble*DECPOWERS[cut]);
+    cut++;
+    if (cut==DECDPUN) {*uout=out; if (out) {last=uout; out=0;} uout++; cut=0;}
+    bcd>>=4;
+
+    nibble=bcd & 0x00f;
+    if (nibble) out=(Unit)(out+nibble*DECPOWERS[cut]);
+    cut++;
+    if (cut==DECDPUN) {*uout=out; if (out) {last=uout; out=0;} uout++; cut=0;}
+    } // n
+  if (cut!=0) {                         // some more left over
+    *uout=out;                          // write out final unit
+    if (out) last=uout;                 // and note if non-zero
+    }
+  #endif
+
+  // here, last points to the most significant unit with digits;
+  // inspect it to get the final digits count -- this is essentially
+  // the same code as decGetDigits in decNumber.c
+  dn->digits=(last-dn->lsu)*DECDPUN+1;  // floor of digits, plus
+                                        // must be at least 1 digit
+  #if DECDPUN>1
+  if (*last<10) return;                 // common odd digit or 0
+  dn->digits++;                         // must be 2 at least
+  #if DECDPUN>2
+  if (*last<100) return;                // 10-99
+  dn->digits++;                         // must be 3 at least
+  #if DECDPUN>3
+  if (*last<1000) return;               // 100-999
+  dn->digits++;                         // must be 4 at least
+  #if DECDPUN>4
+  for (pow=&DECPOWERS[4]; *last>=*pow; pow++) dn->digits++;
+  #endif
+  #endif
+  #endif
+  #endif
+  return;
+  } //decDigitsFromDPD
@@ -0,0 +1,83 @@
+/* ------------------------------------------------------------------ */
+/* Decimal 64-bit format module header                                */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2000, 2005.  All rights reserved.   */
+/*                                                                    */
+/* This software is made available under the terms of the             */
+/* ICU License -- ICU 1.8.1 and later.                                */
+/*                                                                    */
+/* The description and User's Guide ("The decNumber C Library") for   */
+/* this software is called decNumber.pdf.  This document is           */
+/* available, together with arithmetic and format specifications,     */
+/* testcases, and Web links, on the General Decimal Arithmetic page.  */
+/*                                                                    */
+/* Please send comments, suggestions, and corrections to the author:  */
+/*   mfc@uk.ibm.com                                                   */
+/*   Mike Cowlishaw, IBM Fellow                                       */
+/*   IBM UK, PO Box 31, Birmingham Road, Warwick CV34 5JL, UK         */
+/* ------------------------------------------------------------------ */
+
+#if !defined(DECIMAL64)
+  #define DECIMAL64
+  #define DEC64NAME     "decimal64"                   /* Short name   */
+  #define DEC64FULLNAME "Decimal 64-bit Number"       /* Verbose name */
+  #define DEC64AUTHOR   "Mike Cowlishaw"              /* Who to blame */
+
+
+  /* parameters for decimal64s                                        */
+  #define DECIMAL64_Bytes  8            /* length                     */
+  #define DECIMAL64_Pmax   16           /* maximum precision (digits) */
+  #define DECIMAL64_Emax   384          /* maximum adjusted exponent  */
+  #define DECIMAL64_Emin  -383          /* minimum adjusted exponent  */
+  #define DECIMAL64_Bias   398          /* bias for the exponent      */
+  #define DECIMAL64_String 24           /* maximum string length, +1  */
+  #define DECIMAL64_EconL  8            /* exp. continuation length   */
+  /* highest biased exponent (Elimit-1)                               */
+  #define DECIMAL64_Ehigh  (DECIMAL64_Emax+DECIMAL64_Bias-DECIMAL64_Pmax+1)
+
+  /* check enough digits, if pre-defined                              */
+  #if defined(DECNUMDIGITS)
+    #if (DECNUMDIGITS<DECIMAL64_Pmax)
+      #error decimal64.h needs pre-defined DECNUMDIGITS>=16 for safe use
+    #endif
+  #endif
+
+
+  #ifndef DECNUMDIGITS
+    #define DECNUMDIGITS DECIMAL64_Pmax /* size if not already defined*/
+  #endif
+  #ifndef DECNUMBER
+    #include "decNumber.h"              /* context and number library */
+  #endif
+
+  /* Decimal 64-bit type, accessible by bytes                         */
+  typedef struct {
+    uint8_t bytes[DECIMAL64_Bytes];     /* decimal64: 1, 5, 8, 50 bits*/
+    } decimal64;
+
+  /* special values [top byte excluding sign bit; last two bits are   */
+  /* don't-care for Infinity on input, last bit don't-care for NaN]   */
+  #if !defined(DECIMAL_NaN)
+    #define DECIMAL_NaN     0x7c        /* 0 11111 00 NaN             */
+    #define DECIMAL_sNaN    0x7e        /* 0 11111 10 sNaN            */
+    #define DECIMAL_Inf     0x78        /* 0 11110 00 Infinity        */
+  #endif
+
+  /* ---------------------------------------------------------------- */
+  /* Routines                                                         */
+  /* ---------------------------------------------------------------- */
+  /* String conversions                                               */
+  decimal64 * decimal64FromString(decimal64 *, const char *, decContext *);
+  char * decimal64ToString(const decimal64 *, char *);
+  char * decimal64ToEngString(const decimal64 *, char *);
+
+  /* decNumber conversions                                            */
+  decimal64 * decimal64FromNumber(decimal64 *, const decNumber *,
+                                  decContext *);
+  decNumber * decimal64ToNumber(const decimal64 *, decNumber *);
+
+  /* Format-dependent utilities                                       */
+  uint32_t    decimal64IsCanonical(const decimal64 *);
+  decimal64 * decimal64Canonical(decimal64 *, const decimal64 *);
+
+#endif
@@ -0,0 +1,38 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001, 2007.  All rights reserved.   */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example1.c -- convert the first two argument words to decNumber,
+// add them together, and display the result
+
+#define  DECNUMDIGITS 34           // work with up to 34 digits
+#include "decNumber.h"             // base number library
+#include <stdio.h>                 // for printf
+
+int main(int argc, char *argv[]) {
+  decNumber a, b;                  // working numbers
+  decContext set;                  // working context
+  char string[DECNUMDIGITS+14];    // conversion buffer
+
+  decContextTestEndian(0);         // warn if DECLITEND is wrong
+
+  if (argc<3) {                    // not enough words
+    printf("Please supply two numbers to add.\n");
+    return 1;
+    }
+  decContextDefault(&set, DEC_INIT_BASE); // initialize
+  set.traps=0;                     // no traps, thank you
+  set.digits=DECNUMDIGITS;         // set precision
+
+  decNumberFromString(&a, argv[1], &set);
+  decNumberFromString(&b, argv[2], &set);
+
+  decNumberAdd(&a, &a, &b, &set);            // a=a+b
+  decNumberToString(&a, string);
+
+  printf("%s + %s => %s\n", argv[1], argv[2], string);
+  return 0;
+  } // main
@@ -0,0 +1,52 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001.  All rights reserved.         */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example2.c -- calculate compound interest
+// Arguments are investment, rate (%), and years
+
+#define  DECNUMDIGITS 38           // work with up to 38 digits
+#include "decNumber.h"             // base number library
+#include <stdio.h>                 // for printf
+
+int main(int argc, char *argv[]) {
+  int need=3;
+  if (argc<need+1) {               // not enough words
+    printf("Please supply %d number(s).\n", need);
+    return 1;
+    }
+
+  { // excerpt for User's Guide starts here--------------------------|
+  decNumber one, mtwo, hundred;                   // constants
+  decNumber start, rate, years;                   // parameters
+  decNumber total;                                // result
+  decContext set;                                 // working context
+  char string[DECNUMDIGITS+14];                   // conversion buffer
+
+  decContextDefault(&set, DEC_INIT_BASE);         // initialize
+  set.traps=0;                                    // no traps
+  set.digits=25;                                  // precision 25
+  decNumberFromString(&one,       "1", &set);     // set constants
+  decNumberFromString(&mtwo,     "-2", &set);
+  decNumberFromString(&hundred, "100", &set);
+
+  decNumberFromString(&start, argv[1], &set);     // parameter words
+  decNumberFromString(&rate,  argv[2], &set);
+  decNumberFromString(&years, argv[3], &set);
+
+  decNumberDivide(&rate, &rate, &hundred, &set);  // rate=rate/100
+  decNumberAdd(&rate, &rate, &one, &set);         // rate=rate+1
+  decNumberPower(&rate, &rate, &years, &set);     // rate=rate^years
+  decNumberMultiply(&total, &rate, &start, &set); // total=rate*start
+  decNumberRescale(&total, &total, &mtwo, &set);  // two digits please
+
+  decNumberToString(&total, string);
+  printf("%s at %s%% for %s years => %s\n",
+         argv[1], argv[2], argv[3], string);
+
+  } //---------------------------------------------------------------|
+  return 0;
+  } // main
@@ -0,0 +1,64 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001.  All rights reserved.         */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example3.c -- calculate compound interest, passive checking
+// Arguments are investment, rate (%), and years
+
+#define  DECNUMDIGITS 38           // work with up to 38 digits
+#include "decNumber.h"             // base number library
+#include <stdio.h>                 // for printf
+
+int main(int argc, char *argv[]) {
+  int need=3;
+  if (argc<need+1) {               // not enough words
+    printf("Please supply %d number(s).\n", need);
+    return 1;
+    }
+
+  { // start of Example 2 segment
+  decNumber one, mtwo, hundred;                   // constants
+  decNumber start, rate, years;                   // parameters
+  decNumber total;                                // result
+  decContext set;                                 // working context
+  char string[DECNUMDIGITS+14];                   // conversion buffer
+
+  decContextDefault(&set, DEC_INIT_BASE);         // initialize
+  set.traps=0;                                    // no traps
+  set.digits=25;                                  // precision 25
+  decNumberFromString(&one,       "1", &set);     // set constants
+  decNumberFromString(&mtwo,     "-2", &set);
+  decNumberFromString(&hundred, "100", &set);
+
+// [snip...
+  decNumberFromString(&start, argv[1], &set);     // parameter words
+  decNumberFromString(&rate,  argv[2], &set);
+  decNumberFromString(&years, argv[3], &set);
+  if (set.status & DEC_Errors) {
+    printf("An input argument word was invalid [%s]\n",
+           decContextStatusToString(&set));
+    return 1;
+    }
+  decNumberDivide(&rate, &rate, &hundred, &set);  // rate=rate/100
+  decNumberAdd(&rate, &rate, &one, &set);         // rate=rate+1
+  decNumberPower(&rate, &rate, &years, &set);     // rate=rate^years
+  decNumberMultiply(&total, &rate, &start, &set); // total=rate*start
+  decNumberRescale(&total, &total, &mtwo, &set);  // two digits please
+  if (set.status & DEC_Errors) {
+    set.status &= DEC_Errors;                     // keep only errors
+    printf("Result could not be calculated [%s]\n",
+           decContextStatusToString(&set));
+    return 1;
+    }
+// ...snip]
+
+  decNumberToString(&total, string);
+  printf("%s at %s%% for %s years => %s\n",
+         argv[1], argv[2], argv[3], string);
+
+  } //---------------------------------------------------------------|
+  return 0;
+  } // main
@@ -0,0 +1,61 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001.  All rights reserved.         */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example4.c -- add two numbers, active error handling
+// Arguments are two numbers
+
+#define  DECNUMDIGITS 38           // work with up to 38 digits
+#include "decNumber.h"             // base number library
+#include <stdio.h>                 // for printf
+
+// [snip...
+#include <signal.h>                // signal handling
+#include <setjmp.h>                // setjmp/longjmp
+
+jmp_buf preserve;                  // stack snapshot
+
+void signalHandler(int);           // prototype for GCC
+void signalHandler(int sig) {
+  signal(SIGFPE, signalHandler);   // re-enable
+  longjmp(preserve, sig);          // branch to preserved point
+  }
+// ...snip]
+int main(int argc, char *argv[]) {
+  decNumber a, b;                  // working numbers
+  decContext set;                  // working context
+  char string[DECNUMDIGITS+14];    // conversion buffer
+  int value;                       // work variable
+
+  if (argc<3) {                    // not enough words
+    printf("Please supply two numbers to add.\n");
+    return 1;
+    }
+  decContextDefault(&set, DEC_INIT_BASE);    // initialize
+
+// [snip...
+  signal(SIGFPE, signalHandler);   // set up signal handler
+  value=setjmp(preserve);          // preserve and test environment
+  if (value) {                     // (non-0 after longjmp)
+    set.status &= DEC_Errors;      // keep only errors
+    printf("Signal trapped [%s].\n", decContextStatusToString(&set));
+    return 1;
+    }
+// ...snip]
+
+// [change from Example 1, here]
+  // leave traps enabled
+  set.digits=DECNUMDIGITS;         // set precision
+
+  decNumberFromString(&a, argv[1], &set);
+  decNumberFromString(&b, argv[2], &set);
+
+  decNumberAdd(&a, &a, &b, &set);            // A=A+B
+  decNumberToString(&a, string);
+
+  printf("%s + %s => %s\n", argv[1], argv[2], string);
+  return 0;
+  } // main
@@ -0,0 +1,36 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001, 2007.  All rights reserved.   */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example5.c -- decimal64 conversions
+
+#include "decimal64.h"             // decimal64 and decNumber library
+#include <stdio.h>                 // for (s)printf
+
+int main(int argc, char *argv[]) {
+  decimal64 a;                     // working decimal64 number
+  decNumber d;                     // working number
+  decContext set;                  // working context
+  char string[DECIMAL64_String];   // number->string buffer
+  char hexes[25];                  // decimal64->hex buffer
+  int i;                           // counter
+
+  if (argc<2) {                    // not enough words
+    printf("Please supply a number.\n");
+    return 1;
+    }
+  decContextDefault(&set, DEC_INIT_DECIMAL64); // initialize
+
+  decimal64FromString(&a, argv[1], &set);
+  // lay out the decimal64 as eight hexadecimal pairs
+  for (i=0; i<8; i++) {
+    sprintf(&hexes[i*3], "%02x ", a.bytes[i]);
+    }
+  decimal64ToNumber(&a, &d);
+  decNumberToString(&d, string);
+  printf("%s => %s=> %s\n", argv[1], hexes, string);
+  return 0;
+  } // main
@@ -0,0 +1,61 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001.  All rights reserved.         */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example6.c -- calculate compound interest, using Packed Decimal
+// Values are investment, rate (%), and years
+
+#include "decPacked.h"             // base number library
+#include <stdio.h>                 // for printf
+
+int main(int argc, char *argv[]) {
+  { // excerpt for User's Guide starts here--------------------------|
+  decNumber one, mtwo, hundred;                   // constants
+  decNumber start, rate, years;                   // parameters
+  decNumber total;                                // result
+  decContext set;                                 // working context
+
+  uint8_t startpack[]={0x01, 0x00, 0x00, 0x0C};   // investment=100000
+  int32_t startscale=0;
+  uint8_t ratepack[]={0x06, 0x5C};                // rate=6.5%
+  int32_t ratescale=1;
+  uint8_t yearspack[]={0x02, 0x0C};               // years=20
+  int32_t yearsscale=0;
+  uint8_t respack[16];                            // result, packed
+  int32_t resscale;                               // ..
+  char  hexes[49];                                // for packed->hex
+  int   i;                                        // counter
+
+  if (argc<0) printf("%s", argv[1]);              // noop for warning
+
+  decContextDefault(&set, DEC_INIT_BASE);         // initialize
+  set.traps=0;                                    // no traps
+  set.digits=25;                                  // precision 25
+  decNumberFromString(&one,       "1", &set);     // set constants
+  decNumberFromString(&mtwo,     "-2", &set);
+  decNumberFromString(&hundred, "100", &set);
+
+  decPackedToNumber(startpack, sizeof(startpack), &startscale, &start);
+  decPackedToNumber(ratepack,  sizeof(ratepack),  &ratescale,  &rate);
+  decPackedToNumber(yearspack, sizeof(yearspack), &yearsscale, &years);
+
+  decNumberDivide(&rate, &rate, &hundred, &set);  // rate=rate/100
+  decNumberAdd(&rate, &rate, &one, &set);         // rate=rate+1
+  decNumberPower(&rate, &rate, &years, &set);     // rate=rate^years
+  decNumberMultiply(&total, &rate, &start, &set); // total=rate*start
+  decNumberRescale(&total, &total, &mtwo, &set);  // two digits please
+
+  decPackedFromNumber(respack, sizeof(respack), &resscale, &total);
+
+  // lay out the total as sixteen hexadecimal pairs
+  for (i=0; i<16; i++) {
+    sprintf(&hexes[i*3], "%02x ", respack[i]);
+    }
+  printf("Result: %s (scale=%ld)\n", hexes, (long int)resscale);
+
+  } //---------------------------------------------------------------|
+  return 0;
+  } // main
@@ -0,0 +1,35 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001, 2008.  All rights reserved.   */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example7.c -- using decQuad to add two numbers together
+
+// compile: example7.c decContext.c decQuad.c
+
+#include "decQuad.h"               // decQuad library
+#include <stdio.h>                 // for printf
+
+int main(int argc, char *argv[]) {
+  decQuad a, b;                    // working decQuads
+  decContext set;                  // working context
+  char string[DECQUAD_String];     // number->string buffer
+
+  decContextTestEndian(0);         // warn if DECLITEND is wrong
+
+  if (argc<3) {                    // not enough words
+    printf("Please supply two numbers to add.\n");
+    return 1;
+    }
+  decContextDefault(&set, DEC_INIT_DECQUAD); // initialize
+
+  decQuadFromString(&a, argv[1], &set);
+  decQuadFromString(&b, argv[2], &set);
+  decQuadAdd(&a, &a, &b, &set);    // a=a+b
+  decQuadToString(&a, string);
+
+  printf("%s + %s => %s\n", argv[1], argv[2], string);
+  return 0;
+  } // main
@@ -0,0 +1,39 @@
+/* ------------------------------------------------------------------ */
+/* Decimal Number Library Demonstration program                       */
+/* ------------------------------------------------------------------ */
+/* Copyright (c) IBM Corporation, 2001, 2007.  All rights reserved.   */
+/* ----------------------------------------------------------------+- */
+/*                                                 right margin -->|  */
+
+// example8.c -- using decQuad with the decNumber module
+
+// compile: example8.c decContext.c decQuad.c
+//     and: decNumber.c decimal128.c decimal64.c
+
+#include "decQuad.h"               // decQuad library
+#include "decimal128.h"            // interface to decNumber
+#include <stdio.h>                 // for printf
+
+int main(int argc, char *argv[]) {
+  decQuad a;                       // working decQuad
+  decNumber numa, numb;            // working decNumbers
+  decContext set;                  // working context
+  char string[DECQUAD_String];     // number->string buffer
+
+  if (argc<3) {                    // not enough words
+    printf("Please supply two numbers for power(2*a, b).\n");
+    return 1;
+    }
+  decContextDefault(&set, DEC_INIT_DECQUAD); // initialize
+
+  decQuadFromString(&a, argv[1], &set);      // get a
+  decQuadAdd(&a, &a, &a, &set);              // double a
+  decQuadToNumber(&a, &numa);                // convert to decNumber
+  decNumberFromString(&numb, argv[2], &set);
+  decNumberPower(&numa, &numa, &numb, &set); // numa=numa**numb
+  decQuadFromNumber(&a, &numa, &set);        // back via a Quad
+  decQuadToString(&a, string);               // ..
+
+  printf("power(2*%s, %s) => %s\n", argv[1], argv[2], string);
+  return 0;
+  } // main
@@ -0,0 +1,81 @@
+This is the readme.txt for the decNumber package.  It includes
+instructions for compiling and testing the package; please read them.
+---------------------------------------------------------------------
+
+decNumber is distributed in two forms; as a complete package from
+the International Components for Unicode (ICU) site (under an as-is
+license), or as a collection of Open Source files from the GCC source
+repository (under the GPL license).
+
+If you are using the GCC files, you can obtain the documentation, the
+example files mentioned below, and this readme from the General
+Decimal Arithmetic web page -- http://speleotrove.com/decimal/ (the
+URL for the open source files is also linked from there).
+
+
+The ICU package
+---------------
+
+The ICU package includes the files:
+
+  *  readme.txt (this file)
+
+  *  ICU-license.html
+
+  *  decNumber.pdf (documentation)
+
+  *  The .c and .h file for each module in the package (see the
+     decNumber documentation), together with other included files.
+
+  *  The .c files for each of the examples (example1.c through
+     example8.c).
+
+The ICU package is made available under the terms of the ICU License
+(ICU 1.8.1 and later) included in the package as ICU-license.html.
+Your use of that package indicates your acceptance of the terms and
+conditions of that Agreement.
+
+
+To use and check decNumber
+--------------------------
+
+  Please read the appropriate license and documentation before using
+  this package.  If you are upgrading an existing use of decNumber
+  (with version <= 3.37) please read the Changes Appendix for later
+  versions -- you may need to change the DECLITEND flag.
+
+  1. Compile and link example1.c, decNumber.c, and decContext.c
+     For instance, use:
+
+       gcc -o example1 example1.c decNumber.c decContext.c
+
+     Note: If your compiler does not provide stdint.h or if your C
+     compiler does not handle line comments (// ...), then see the
+     User's Guide section in the documentation for further information
+     (including a sample minimal stdint.h).
+
+     The use of compiler optimization is strongly recommended (e.g.,
+     -O3 for GCC or /O2 for Visual Studio).
+
+  2. Run example1 with two numeric arguments, for example:
+
+       example1 1.23 1.27
+
+     this should display:
+
+       1.23 + 1.27 => 2.50
+
+  3. Similarly, try the other examples, at will.
+
+     Examples 2->4 require three files to be compiled, like Example 1.
+
+     Example 5 requires decimal64.c in addition to the core modules.
+
+     Example 6 requires decPacked.c in addition to the core modules.
+
+     Example 7 requires only example7.c decContext.c and decQuad.c
+
+     Example 8 requires example8.c, decContext.c, and decQuad.c, plus
+               decNumber.c, decimal128.c, and decimal64.c (the latter
+               for shared tables and code)
+
@@ -292,7 +292,7 @@ uint16_t* stack_restore(jq_state *jq){
    assert(path_len >= 0);
    jq->path = jv_array_slice(jq->path, 0, path_len);
  } else {
-    assert(path_len == 0);
+    fork->path_len = 0;
  }
  jv_free(jq->value_at_path);
  jq->value_at_path = fork->value_at_path;
@@ -509,21 +509,25 @@ jv jq_next(jq_state *jq) {
      uint16_t v = *pc++;
      jv* var = frame_local_var(jq, v, level);
      jv max = stack_pop(jq);
-      if (raising) goto do_backtrack;
+      if (raising) {
+        jv_free(max);
+        goto do_backtrack;
+      } 
      if (jv_get_kind(*var) != JV_KIND_NUMBER ||
          jv_get_kind(max) != JV_KIND_NUMBER) {
        set_error(jq, jv_invalid_with_msg(jv_string_fmt("Range bounds must be numeric")));
        jv_free(max);
        goto do_backtrack;
-      } else if (jv_number_value(jv_copy(*var)) >= jv_number_value(jv_copy(max))) {
+      } else if (jv_number_value(*var) >= jv_number_value(max)) {
        /* finished iterating */
+        jv_free(max);
        goto do_backtrack;
      } else {
-        jv curr = jv_copy(*var);
+        jv curr = *var;
        *var = jv_number(jv_number_value(*var) + 1);

        struct stack_pos spos = stack_get_pos(jq);
-        stack_push(jq, jv_copy(max));
+        stack_push(jq, max);
        stack_save(jq, pc - 3, spos);

        stack_push(jq, curr);
@@ -538,8 +542,8 @@ jv jq_next(jq_state *jq) {
      jv* var = frame_local_var(jq, v, level);
      if (jq->debug_trace_enabled) {
        printf("V%d = ", v);
-        jv_dump(jv_copy(*var), 0);
-        printf(" (%d)\n", jv_get_refcnt(*var));
+        jv_dump(jv_copy(*var), JV_PRINT_REFCOUNT);
+        printf("\n");
      }
      jv_free(stack_pop(jq));
      stack_push(jq, jv_copy(*var));
@@ -553,11 +557,15 @@ jv jq_next(jq_state *jq) {
      jv* var = frame_local_var(jq, v, level);
      if (jq->debug_trace_enabled) {
        printf("V%d = ", v);
-        jv_dump(jv_copy(*var), 0);
-        printf(" (%d)\n", jv_get_refcnt(*var));
+        jv_dump(jv_copy(*var), JV_PRINT_REFCOUNT);
+        printf("\n");
      }
      jv_free(stack_popn(jq));
+
+      // This `stack_push()` invalidates the `var` reference, so
      stack_push(jq, *var);
+      // we have to re-resolve `var` before we can set it to null
+      var = frame_local_var(jq, v, level);
      *var = jv_null();
      break;
    }
@@ -1010,6 +1018,9 @@ jq_state *jq_init(void) {
  jq->attrs = jv_object();
  jq->path = jv_null();
  jq->value_at_path = jv_null();
+
+  jq->nomem_handler = NULL;
+  jq->nomem_handler_data = NULL;
  return jq;
 }

@@ -6,20 +6,32 @@
 #include "jq.h"

 static void jv_test();
-static void run_jq_tests(jv, int, FILE *);
+static void run_jq_tests(jv, int, FILE *, int, int);


 int jq_testsuite(jv libdirs, int verbose, int argc, char* argv[]) {
  FILE *testdata = stdin;
+  int skip = -1;
+  int take = -1;
  jv_test();
  if (argc > 0) {
-    testdata = fopen(argv[0], "r");
-    if (!testdata) {
-      perror("fopen");
-      exit(1);
+    for(int i = 0; i < argc; i++) {
+      if (!strcmp(argv[i], "--skip")) {
+        skip = atoi(argv[i+1]);
+        i++;
+      } else if (!strcmp(argv[i], "--take")) {
+        take = atoi(argv[i+1]);
+        i++;
+      } else {
+        testdata = fopen(argv[i], "r");
+        if (!testdata) {
+          perror("fopen");
+          exit(1);
+        }
+      }
    }
  }
-  run_jq_tests(libdirs, verbose, testdata);
+  run_jq_tests(libdirs, verbose, testdata, skip, take);
  return 0;
 }

@@ -53,7 +65,7 @@ static void test_err_cb(void *data, jv e) {
  jv_free(e);
 }

-static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata) {
+static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int take) {
  char prog[4096];
  char buf[4096];
  struct err_data err_msg;
@@ -63,6 +75,9 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata) {
  int check_msg = 0;
  jq_state *jq = NULL;

+  int tests_to_skip = skip > 0 ? skip : 0;
+  int tests_to_take = take;
+
  jq = jq_init();
  assert(jq);
  if (jv_get_kind(lib_dirs) == JV_KIND_NULL)
@@ -80,9 +95,37 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata) {
      continue;
    }
    if (prog[strlen(prog)-1] == '\n') prog[strlen(prog)-1] = 0;
-    printf("Testing '%s' at line number %u\n", prog, lineno);
+
+    if (skip > 0) {
+      skip--;
+
+      // skip past test data
+      while (fgets(buf, sizeof(buf), testdata)) {
+        lineno++;
+        if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n'))
+          break;
+      }
+      
+      must_fail = 0;
+      check_msg = 0;
+
+      continue;
+    } else if (skip == 0) {
+      printf("Skipped %d tests\n", tests_to_skip);
+      skip = -1;
+    }
+
+    if (take > 0) {
+      take--;
+    } else if (take == 0) {
+      printf("Hit the number of tests limit (%d), breaking\n", tests_to_take);
+      take = -1;
+      break;
+    }
+
    int pass = 1;
    tests++;
+    printf("Test #%d: '%s' at line number %u\n", tests + tests_to_skip, prog, lineno);
    int compiled = jq_compile(jq, prog);

    if (must_fail) {
@@ -179,7 +222,21 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata) {
    passed+=pass;
  }
  jq_teardown(&jq);
-  printf("%d of %d tests passed (%d malformed)\n", passed,tests,invalid);
+
+  int total_skipped = tests_to_skip;
+
+  if (skip > 0) {
+    total_skipped = tests_to_skip - skip;
+  }
+
+  printf("%d of %d tests passed (%d malformed, %d skipped)\n", 
+    passed, tests, invalid, total_skipped);
+
+  if (skip > 0) {
+    printf("WARN: skipped past the end of file, exiting with status 2\n");
+    exit(2);
+  }
+
  if (passed != tests) exit(1);
 }

@@ -54,16 +54,19 @@ jv jv_invalid_with_msg(jv);
 jv jv_invalid_get_msg(jv);
 int jv_invalid_has_msg(jv);

-
 jv jv_null(void);
 jv jv_true(void);
 jv jv_false(void);
 jv jv_bool(int);

 jv jv_number(double);
+jv jv_number_with_literal(const char*);
 double jv_number_value(jv);
 int jv_is_integer(jv);

+int jv_number_has_literal(jv n);
+const char* jv_number_get_literal(jv);
+
 jv jv_array(void);
 jv jv_array_sized(int);
 int jv_array_length(jv);
@@ -37,7 +37,7 @@ static void memory_exhausted() {
  if (nomem_handler.handler)
    nomem_handler.handler(nomem_handler.data); // Maybe handler() will longjmp() to safety
  // Or not
-  fprintf(stderr, "error: cannot allocate memory\n");
+  fprintf(stderr, "jq: error: cannot allocate memory\n");
  abort();
 }
 #else /* USE_TLS */
@@ -59,16 +59,16 @@ static void tsd_fini(void) {

 static void tsd_init(void) {
  if (pthread_key_create(&nomem_handler_key, NULL) != 0) {
-    fprintf(stderr, "error: cannot create thread specific key");
+    fprintf(stderr, "jq: error: cannot create thread specific key");
    abort();
  }
  if (atexit(tsd_fini) != 0) {
-    fprintf(stderr, "error: cannot set an exit handler");
+    fprintf(stderr, "jq: error: cannot set an exit handler");
    abort();
  }
  struct nomem_handler *nomem_handler = calloc(1, sizeof(struct nomem_handler));
  if (pthread_setspecific(nomem_handler_key, nomem_handler) != 0) {
-    fprintf(stderr, "error: cannot set thread specific data");
+    fprintf(stderr, "jq: error: cannot set thread specific data");
    abort();
  }
 }
@@ -80,7 +80,7 @@ void jv_nomem_handler(jv_nomem_handler_f handler, void *data) {
  nomem_handler = pthread_getspecific(nomem_handler_key);
  if (nomem_handler == NULL) {
    handler(data);
-    fprintf(stderr, "error: cannot allocate memory\n");
+    fprintf(stderr, "jq: error: cannot allocate memory\n");
    abort();
  }
  nomem_handler->handler = handler;
@@ -95,7 +95,7 @@ static void memory_exhausted() {
  if (nomem_handler)
    nomem_handler->handler(nomem_handler->data); // Maybe handler() will longjmp() to safety
  // Or not
-  fprintf(stderr, "error: cannot allocate memory\n");
+  fprintf(stderr, "jq: error: cannot allocate memory\n");
  abort();
 }

@@ -110,7 +110,7 @@ void jv_nomem_handler(jv_nomem_handler_f handler, void *data) {
 }

 static void memory_exhausted() {
-  fprintf(stderr, "error: cannot allocate memory\n");
+  fprintf(stderr, "jq: error: cannot allocate memory\n");
  abort();
 }

@@ -165,15 +165,3 @@ void* jv_mem_realloc(void* p, size_t sz) {
  }
  return p;
 }
-
-#ifndef NDEBUG
-volatile char jv_mem_uninitialised;
-__attribute__((constructor)) void jv_mem_uninit_setup(){
-  // ignore warning that this reads uninitialized memory - that's the point!
-#ifndef __clang_analyzer__
-  char* p = malloc(1);
-  jv_mem_uninitialised = *p;
-  free(p);
-#endif
-}
-#endif
@@ -4,17 +4,6 @@
 #include <stddef.h>
 #include "jv.h"

-#ifndef NDEBUG
-extern volatile char jv_mem_uninitialised;
-#endif
-
-static void jv_mem_invalidate(void* mem, size_t n) {
-#ifndef NDEBUG
-  char* m = mem;
-  while (n--) *m++ ^= jv_mem_uninitialised ^ jv_mem_uninitialised;
-#endif
-}
-
 void* jv_mem_alloc(size_t);
 void* jv_mem_alloc_unguarded(size_t);
 void* jv_mem_calloc(size_t, size_t);
@@ -2,6 +2,16 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "jv_alloc.h"
+#include "jv_type_private.h"
+
+// making this static verbose function here
+// until we introduce a less confusing naming scheme
+// of jv_* API with regards to the memory management
+static double jv_number_get_value_and_consume(jv number) {
+  double value = jv_number_value(number);
+  jv_free(number);
+  return value;
+}

 static int parse_slice(jv j, jv slice, int* pstart, int* pend) {
  // Array slices
@@ -32,6 +42,8 @@ static int parse_slice(jv j, jv slice, int* pstart, int* pend) {
  } else {
    double dstart = jv_number_value(start_jv);
    double dend = jv_number_value(end_jv);
+    jv_free(start_jv);
+    jv_free(end_jv);
    if (dstart < 0) dstart += len;
    if (dend < 0) dend += len;
    if (dstart < 0) dstart = 0;
@@ -69,6 +81,7 @@ jv jv_get(jv t, jv k) {
        jv_free(v);
        v = jv_null();
      }
+      jv_free(k);
    } else {
      jv_free(t);
      jv_free(k);
@@ -135,6 +148,7 @@ jv jv_set(jv t, jv k, jv v) {
             (jv_get_kind(t) == JV_KIND_ARRAY || isnull)) {
    if (isnull) t = jv_array();
    t = jv_array_set(t, (int)jv_number_value(k), v);
+    jv_free(k);
  } else if (jv_get_kind(k) == JV_KIND_OBJECT &&
             (jv_get_kind(t) == JV_KIND_ARRAY || isnull)) {
    if (isnull) t = jv_array();
@@ -202,6 +216,7 @@ jv jv_has(jv t, jv k) {
             jv_get_kind(k) == JV_KIND_NUMBER) {
    jv elem = jv_array_get(t, (int)jv_number_value(k));
    ret = jv_bool(jv_is_valid(elem));
+    jv_free(k);
    jv_free(elem);
  } else {
    ret = jv_invalid_with_msg(jv_string_fmt("Cannot check whether %s has a %s key",
@@ -240,6 +255,7 @@ static jv jv_dels(jv t, jv keys) {
          ends = jv_array_append(ends, jv_number(end));
        } else {
          jv_free(new_array);
+          jv_free(key);
          new_array = jv_invalid_with_msg(jv_string_fmt("Start and end indices of an array slice must be numbers"));
          goto arr_out;
        }
@@ -258,7 +274,7 @@ static jv jv_dels(jv t, jv keys) {
    jv_array_foreach(t, i, elem) {
      int del = 0;
      while (neg_idx < jv_array_length(jv_copy(neg_keys))) {
-        int delidx = len + (int)jv_number_value(jv_array_get(jv_copy(neg_keys), neg_idx));
+        int delidx = len + (int)jv_number_get_value_and_consume(jv_array_get(jv_copy(neg_keys), neg_idx));
        if (i == delidx) {
          del = 1;
        }
@@ -268,7 +284,7 @@ static jv jv_dels(jv t, jv keys) {
        neg_idx++;
      }
      while (nonneg_idx < jv_array_length(jv_copy(nonneg_keys))) {
-        int delidx = (int)jv_number_value(jv_array_get(jv_copy(nonneg_keys), nonneg_idx));
+        int delidx = (int)jv_number_get_value_and_consume(jv_array_get(jv_copy(nonneg_keys), nonneg_idx));
        if (i == delidx) {
          del = 1;
        }
@@ -278,8 +294,8 @@ static jv jv_dels(jv t, jv keys) {
        nonneg_idx++;
      }
      for (int sidx=0; !del && sidx<jv_array_length(jv_copy(starts)); sidx++) {
-        if ((int)jv_number_value(jv_array_get(jv_copy(starts), sidx)) <= i &&
-            i < (int)jv_number_value(jv_array_get(jv_copy(ends), sidx))) {
+        if ((int)jv_number_get_value_and_consume(jv_array_get(jv_copy(starts), sidx)) <= i &&
+            i < (int)jv_number_get_value_and_consume(jv_array_get(jv_copy(ends), sidx))) {
          del = 1;
        }
      }
@@ -335,8 +351,36 @@ jv jv_setpath(jv root, jv path, jv value) {
  }
  jv pathcurr = jv_array_get(jv_copy(path), 0);
  jv pathrest = jv_array_slice(path, 1, jv_array_length(jv_copy(path)));
-  return jv_set(root, pathcurr,
-                jv_setpath(jv_get(jv_copy(root), jv_copy(pathcurr)), pathrest, value));
+
+  /*
+   * We need to be careful not to make extra copies since that leads to
+   * quadratic behavior (e.g., when growing large data structures in a
+   * reduction with `setpath/2`, i.e., with `|=`.
+   */
+  if (jv_get_kind(pathcurr) == JV_KIND_OBJECT) {
+    // Assignment to slice -- dunno yet how to avoid the extra copy
+    return jv_set(root, pathcurr,
+                  jv_setpath(jv_get(jv_copy(root), jv_copy(pathcurr)), pathrest, value));
+  }
+
+  jv subroot = jv_get(jv_copy(root), jv_copy(pathcurr));
+  if (!jv_is_valid(subroot)) {
+    jv_free(pathcurr);
+    jv_free(pathrest);
+    jv_free(value);
+    return subroot;
+  }
+
+  // To avoid the extra copy we drop the reference from `root` by setting that
+  // to null first.
+  root = jv_set(root, jv_copy(pathcurr), jv_null());
+  if (!jv_is_valid(root)) {
+    jv_free(pathcurr);
+    jv_free(pathrest);
+    jv_free(value);
+    return root;
+  }
+  return jv_set(root, pathcurr, jv_setpath(subroot, pathrest, value));
 }

 jv jv_getpath(jv root, jv path) {
@@ -511,14 +555,13 @@ int jv_cmp(jv a, jv b) {
    break;

  case JV_KIND_NUMBER: {
-    double da = jv_number_value(a), db = jv_number_value(b);
-
-    // handle NaN as though it were null
-    if (da != da) r = jv_cmp(jv_null(), jv_number(db));
-    else if (db != db) r = jv_cmp(jv_number(da), jv_null());
-    else if (da < db) r = -1;
-    else if (da == db) r = 0;
-    else r = 1;
+    if (jvp_number_is_nan(a)) {
+      r = jv_cmp(jv_null(), jv_copy(b));
+    } else if (jvp_number_is_nan(b)) {
+      r = jv_cmp(jv_copy(a), jv_null());
+    } else {
+      r = jvp_number_cmp(a, b);
+    }
    break;
  }