Fri Apr 26 10:20:34 2013 UTC ()
Update jq to version 1.2.  This is the version which should have been added
in the first place, but I somehow missed it.

Unfortunately there is no changelog, just a git history, with no indication
of which are the important changes.  However a lot of bugfixes are included.

The main pkgsrc change in 1.2 is that there is now a manual page.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/devel/jq/DESCR
diff -r1.1 -r1.2 pkgsrc/devel/jq/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/jq/PLIST
diff -r1.1 -r1.2 pkgsrc/devel/jq/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/devel/jq/patches/patch-jq.1
diff -r0 -r1.1 pkgsrc/devel/jq/patches/patch-jv__utf8__tables.gen.h

cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/DESCR (expand / switch to unified diff)

--- pkgsrc/devel/jq/DESCR 2013/04/25 09:10:26 1.1
+++ pkgsrc/devel/jq/DESCR 2013/04/26 10:20:34 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1jq is a lightweight and flexible command-line JSON processor. 1jq is a lightweight and flexible command-line JSON processor.
2 2
3jq is like sed for JSON data â you can use it to slice and filter and 3jq is like sed for JSON data - you can use it to slice and filter and
4map and transform structured data with the same ease that sed, awk, grep 4map and transform structured data with the same ease that sed, awk, grep
5and friends let you play with text. 5and friends let you play with text.

cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/jq/Makefile 2013/04/25 09:10:26 1.1
+++ pkgsrc/devel/jq/Makefile 2013/04/26 10:20:34 1.2
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: Makefile,v 1.1 2013/04/25 09:10:26 jperkin Exp $ 1# $NetBSD: Makefile,v 1.2 2013/04/26 10:20:34 jperkin Exp $
2 2
3DISTNAME= jq-1.1 3DISTNAME= jq-1.2
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= -https://github.com/stedolan/jq/tarball/${DISTNAME}/ 5MASTER_SITES= -https://github.com/stedolan/jq/tarball/${DISTNAME}/
6 6
7MAINTAINER= jperkin@joyent.com 7MAINTAINER= jperkin@joyent.com
8HOMEPAGE= http://github.com/stedolan/jq/ 8HOMEPAGE= http://github.com/stedolan/jq/
9COMMENT= Command-line JSON processor 9COMMENT= Command-line JSON processor
10LICENSE= mit 10LICENSE= mit
11 11
12FETCH_USING= curl 12FETCH_USING= curl
13 13
14WRKSRC= ${WRKDIR}/stedolan-jq-bf61e95 14WRKSRC= ${WRKDIR}/stedolan-jq-1e8c524
15 15
16USE_LANGUAGES= c99 16USE_LANGUAGES= c99
17USE_TOOLS+= gmake 17USE_TOOLS+= bison flex gmake
18 18
19NO_CONFIGURE= yes 19NO_CONFIGURE= yes
20 20
 21CFLAGS.SunOS+= -D_XPG6
 22
21.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/jq/PLIST 2013/04/25 09:10:26 1.1
+++ pkgsrc/devel/jq/PLIST 2013/04/26 10:20:34 1.2
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
1@comment $NetBSD: PLIST,v 1.1 2013/04/25 09:10:26 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/04/26 10:20:34 jperkin Exp $
2bin/jq 2bin/jq
 3man/man1/jq.1

cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jq/distinfo 2013/04/25 09:10:26 1.1
+++ pkgsrc/devel/jq/distinfo 2013/04/26 10:20:34 1.2
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.1 2013/04/25 09:10:26 jperkin Exp $ 1$NetBSD: distinfo,v 1.2 2013/04/26 10:20:34 jperkin Exp $
2 2
3SHA1 (jq-1.1.tar.gz) = a0b170faae0e79c2fcd3a9117ae109572cb9f443 3SHA1 (jq-1.2.tar.gz) = 30bd7861acdfa9e1bb13d87b563eeb218c97e3a3
4RMD160 (jq-1.1.tar.gz) = a43eb7e0b50db18708998a1538bfa81d59d8e64d 4RMD160 (jq-1.2.tar.gz) = 44df3e85f538a28d47aaa8b9bd9fd9cb2d1f558e
5Size (jq-1.1.tar.gz) = 432144 bytes 5Size (jq-1.2.tar.gz) = 180303 bytes
6SHA1 (patch-Makefile) = 41e1adee783b10b526e8a4d2a8614d4b9cfe9942 6SHA1 (patch-Makefile) = 6d828402c996ded50c2b76778356635293e0ef46
 7SHA1 (patch-jq.1) = 3c93df8d998ad81cf244a9e9a08f83665d94c12a
 8SHA1 (patch-jv__utf8__tables.gen.h) = c854e81aaa83aff8e9741690109f5e8c4c25bfbe

cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/jq/patches/Attic/patch-Makefile 2013/04/25 09:10:26 1.1
+++ pkgsrc/devel/jq/patches/Attic/patch-Makefile 2013/04/26 10:20:34 1.2
@@ -1,22 +1,31 @@ @@ -1,22 +1,31 @@
1$NetBSD: patch-Makefile,v 1.1 2013/04/25 09:10:26 jperkin Exp $ 1$NetBSD: patch-Makefile,v 1.2 2013/04/26 10:20:34 jperkin Exp $
2 2
3pkgsrc-ify. 3pkgsrc-ify.
4 4
5--- Makefile.orig 2012-10-21 22:26:31.000000000 +0000 5--- Makefile.orig 2012-12-20 12:26:15.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -1,4 +1,3 @@ 7@@ -1,5 +1,5 @@
8-CC=gcc -Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function 8-CC=gcc
9 prefix=/usr/local 9-CFLAGS=-Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function $(EXTRA_CFLAGS)
 10+#CC=gcc
 11+#CFLAGS=-Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function $(EXTRA_CFLAGS)
10  12
11 .PHONY: all clean releasedep tarball install uninstall test releasetag 13 prefix=/usr/local
12@@ -51,8 +50,8 @@ docs/content/2.download/source/jq.tgz: j 14 mandir=$(prefix)/share/man
13 tarball: docs/content/2.download/source/jq.tgz 15@@ -80,11 +80,11 @@ tarball: docs/content/2.download/source/
 16 jq.1: docs/content/3.manual/manual.yml
 17 ( cd docs; rake manpage; ) > $@
14  18
15 install: jq 19-install: jq jq.1
16- install -d -m 0755 $(prefix)/bin 20- install -d -m 0755 $(prefix)/bin
17- install -m 0755 jq $(prefix)/bin 21- install -m 0755 jq $(prefix)/bin
 22- install -d -m 0755 $(mandir)/man1
 23- install -m 0755 jq.1 $(mandir)/man1
 24+install: jq
18+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/bin 25+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/bin
19+ ${BSD_INSTALL_PROGRAM} jq $(DESTDIR)$(PREFIX)/bin/jq 26+ ${BSD_INSTALL_PROGRAM} jq $(DESTDIR)$(PREFIX)/bin
 27+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
 28+ ${BSD_INSTALL_MAN} jq.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
20  29
21 uninstall: 30 uninstall:
22 test -d $(prefix)/bin && \ 31 rm -vf $(prefix)/bin/jq

File Added: pkgsrc/devel/jq/patches/Attic/patch-jq.1
$NetBSD: patch-jq.1,v 1.1 2013/04/26 10:20:34 jperkin Exp $

Pre-generate manual page to avoid Ruby dependencies.

--- /dev/null	2013-04-25 17:04:21.000000000 +0000
+++ jq.1
@@ -0,0 +1,1137 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "JQ" "1" "April 2013" "" ""
+.
+.SH "NAME"
+\fBjq\fR \- Command\-line JSON processor
+.
+.SH "SYNOPSIS"
+\fBjq\fR [\fIoptions\fR\.\.\.] \fIfilter\fR [\fIfiles\fR\.\.\.]
+.
+.P
+\fBjq\fR can transform JSON in various ways, by selecting, iterating, reducing and otherwise mangling JSON documents\. For instance, running the command \fBjq \'map(\.price) | add\'\fR will take an array of JSON objects as input and return the sum of their "price" fields\.
+.
+.P
+By default, \fBjq\fR reads a stream of JSON objects (whitespace separated) from \fBstdin\fR\. 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 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\.
+.
+.P
+Filters can be combined in various ways \- you can pipe the output of one filter into another filter, or collect the output of a filter into an array\.
+.
+.P
+Some filters produce multiple results, for instance there\'s one that produces all the elements of its input array\. Piping that filter into a second runs the second filter for each element of the array\. Generally, things that would be done with loops and iteration in other languages are just done by gluing filters together in jq\.
+.
+.P
+It\'s important to remember that every filter has an input and an output\. Even literals like "hello" or 42 are filters \- they take an input but always produce the same literal as output\. Operations that combine two filters, like addition, generally feed the same input to both and combine the results\. So, you can implement an averaging filter as \fBadd / length\fR \- feeding the input array both to the \fBadd\fR filter and the \fBlength\fR filter and dividing the results\.
+.
+.P
+But that\'s getting ahead of ourselves\. :) Let\'s start with something simpler:
+.
+.SH "INVOKING JQ"
+jq filters run on a stream of JSON data\. The input to jq is parsed as a sequence of whitespace\-separated JSON values which are passed through the provided filter one at a time\. The output(s) of the filter are written to standard out, again as a sequence of whitespace\-separated JSON data\.
+.
+.P
+You can affect how jq reads and writes its input and output using some command\-line options:
+.
+.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\.
+.
+.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\.
+.
+.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\.
+.
+.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\.
+.
+.TP
+\fB\-\-colour\-output\fR / \fB\-C\fR and \fB\-\-monochrome\-output\fR / \fB\-M\fR:
+.
+.IP
+By default, jq outputs colored JSON if writing to a terminal\. You can force it to produce color even if writing to a pipe or a file using \fB\-C\fR, and disable color with \fB\-M\fR\.
+.
+.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\.
+.
+.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\.
+.
+.SH "BASIC FILTERS"
+nil
+.
+.SS "\."
+The absolute simplest (and least interesting) filter is \fB\.\fR\. This is a filter that takes its input and produces it unchanged as output\.
+.
+.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\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.\'
+   "Hello, world!"
+=> "Hello, world!"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "\.foo"
+The simplest \fIuseful\fR filter is \.foo\. When given a JSON object (aka dictionary or hash) as input, it produces the value at the key "foo", or null if there\e\'s none present\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.foo\'
+   {"foo": 42, "bar": "less interesting data"}
+=> 42
+
+jq \'\.foo\'
+   {"notfoo": true, "alsonotfoo": false}
+=> null
+.
+.fi
+.
+.IP "" 0
+.
+.SS "\.[foo]"
+You can also look up fields of an object using syntax like \fB\.["foo"]\fR (\.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\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[0]\'
+   [{"name":"JSON", "good":true}, {"name":"XML", "good":false}]
+=> {"name":"JSON", "good":true}
+
+jq \'\.[2]\'
+   [{"name":"JSON", "good":true}, {"name":"XML", "good":false}]
+=> null
+.
+.fi
+.
+.IP "" 0
+.
+.SS "\.[]"
+If you use the \fB\.[foo]\fR syntax, but omit the index entirely, it will return \fIall\fR of the elements of an array\. Running \fB\.[]\fR with the input \fB[1,2,3]\fR will produce the numbers as three seperate results, rather than as a single array\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[]\'
+   [{"name":"JSON", "good":true}, {"name":"XML", "good":false}]
+=> {"name":"JSON", "good":true}, {"name":"XML", "good":false}
+
+jq \'\.[]\'
+   []
+=>
+.
+.fi
+.
+.IP "" 0
+.
+.SS ","
+If two filters are separated by a comma, then the input will be fed into both and there will be multiple outputs: first, all of the outputs produced by the left expression, and then all of the outputs produced by the right\. For instance, filter \fB\.foo, \.bar\fR, produces both the "foo" fields and "bar" fields as separate outputs\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.foo, \.bar\'
+   {"foo": 42, "bar": "something else", "baz": true}
+=> 42, "something else"
+
+jq \'\.user, \.projects[]\'
+   {"user":"stedolan", "projects": ["jq", "wikiflow"]}
+=> "stedolan", "jq", "wikiflow"
+
+jq \'\.[4,2]\'
+   ["a","b","c","d","e"]
+=> "e", "c"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "|"
+The | operator combines two filters by feeding the output(s) of the one on the left into the input of the one on the right\. It\e\'s pretty much the same as the Unix shell\e\'s pipe, if you\e\'re used to that\.
+.
+.P
+If the one on the left produces multiple results, the one on the right will be run for each of those results\. So, the expression \fB\.[] | \.foo\fR retrieves the "foo" field of each element of the input array\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[] | \.name\'
+   [{"name":"JSON", "good":true}, {"name":"XML", "good":false}]
+=> "JSON", "XML"
+.
+.fi
+.
+.IP "" 0
+.
+.SH "TYPES AND VALUES"
+jq supports the same set of datatypes as JSON \- numbers, strings, booleans, arrays, objects (which in JSON\-speak are hashes with only string keys), and "null"\.
+.
+.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\.
+.
+.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\. 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)
+.
+.P
+Once you understand the "," operator, you can look at jq\e\'s array syntax in a different light: the expression [1,2,3] is not using a built\-in syntax for comma\-separated arrays, but is instead applying the \fB[]\fR operator (collect results) to the expression 1,2,3 (which produces three different results)\.
+.
+.P
+If you have a filter \fBX\fR that produces four results, then the expression \fB[X]\fR will produce a single result, an array of four elements\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'[\.user, \.projects[]]\'
+   {"user":"stedolan", "projects": ["jq", "wikiflow"]}
+=> ["stedolan", "jq", "wikiflow"]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "Objects \- {}"
+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 "sensible" (all alphabetic characters), then the quotes can be left off\. The value can be any expression (although you may need to wrap it in parentheses if it\e\'s a complicated one), which gets applied to the {} expression\e\'s input (remember, all filters have an input and an output)\.
+.
+.IP "" 4
+.
+.nf
+
+{foo: \.bar}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+will produce the JSON object \fB{"foo": 42}\fR if given the JSON object \fB{"bar":42, "baz":43}\fR\. You can use this to select particular fields of an object: if the input is an object with "user", "title", "id", and "content" fields and you just want "user" and "title", you can write
+.
+.IP "" 4
+.
+.nf
+
+{user: \.user, title: \.title}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Because that\e\'s so common, there\e\'s a shortcut syntax: \fB{user, title}\fR\.
+.
+.P
+If one of the expressions produces multiple results, multiple dictionaries will be produced\. If the input\e\'s
+.
+.IP "" 4
+.
+.nf
+
+{"user":"stedolan","titles":["JQ Primer", "More JQ"]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+then the expression
+.
+.IP "" 4
+.
+.nf
+
+{user, title: \.titles[]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+will produce two outputs:
+.
+.IP "" 4
+.
+.nf
+
+{"user":"stedolan", "title": "JQ Primer"}
+{"user":"stedolan", "title": "More JQ"}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Putting parentheses around the key means it will be evaluated as an expression\. With the same input as above,
+.
+.IP "" 4
+.
+.nf
+
+{(\.user): \.titles}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+produces
+.
+.IP "" 4
+.
+.nf
+
+{"stedolan": ["JQ Primer", "More JQ"]}
+
+jq \'{user, title: \.titles[]}\'
+   {"user":"stedolan","titles":["JQ Primer", "More JQ"]}
+=> {"user":"stedolan", "title": "JQ Primer"}, {"user":"stedolan", "title": "More JQ"}
+
+jq \'{(\.user): \.titles}\'
+   {"user":"stedolan","titles":["JQ Primer", "More JQ"]}
+=> {"stedolan": ["JQ Primer", "More JQ"]}
+.
+.fi
+.
+.IP "" 0
+.
+.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\.
+.
+.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:
+.
+.IP "\(bu" 4
+\fBNumbers\fR are added by normal arithmetic\.
+.
+.IP "\(bu" 4
+\fBArrays\fR are added by being concatenated into a larger array\.
+.
+.IP "\(bu" 4
+\fBStrings\fR are added by being joined into a larger string\.
+.
+.IP "\(bu" 4
+\fBObjects\fR 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 \fB+\fR wins\.
+.
+.IP
+jq \'\.a + 1\' {"a": 7} => 8
+.
+.IP
+jq \'\.a + \.b\' {"a": [1,2], "b": [3,4]} => [1,2,3,4]
+.
+.IP
+jq \'{a: 1} + {b: 2} + {c: 3} + {a: 42}\' null => {"a": 42, "b": 2, "c": 3}
+.
+.IP "" 0
+.
+.SS "Subtraction \- \-"
+As well as normal arithmetic subtraction on numbers, the \fB\-\fR operator can be used on arrays to remove all occurences of the second array\'s elements from the first array\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'4 \- \.a\'
+   {"a":3}
+=> 1
+
+jq \'\. \- ["xml", "yaml"]\'
+   ["xml", "yaml", "json"]
+=> ["json"]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "Multiplication, division \- * and /"
+These operators only work on numbers, and do the expected\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'10 / \. * 3\'
+   5
+=> 6
+.
+.fi
+.
+.IP "" 0
+.
+.SS "length"
+The builtin function \fBlength\fR gets the length of various different types of value:
+.
+.IP "\(bu" 4
+The length of a \fBstring\fR is the number of Unicode codepoints it contains (which will be the same as its JSON\-encoded length in bytes if it\'s pure ASCII)\.
+.
+.IP "\(bu" 4
+The length of an \fBarray\fR is the number of elements\.
+.
+.IP "\(bu" 4
+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 "" 0
+.
+.SS "keys"
+The builtin function \fBkeys\fR, when given an object, returns its keys in an array\.
+.
+.P
+The keys are sorted "alphabetically", by unicode codepoint order\. This is not an order that makes particular sense in any particular language, but you can count on it being the same for any two objects with the same set of keys, regardless of locale settings\.
+.
+.P
+When \fBkeys\fR is given an array, it returns the valid indices for that array: the integers from 0 to length\-1\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'keys\'
+   {"abc": 1, "abcd": 2, "Foo": 3}
+=> ["Foo", "abc", "abcd"]
+
+jq \'keys\'
+   [42,3,35]
+=> [0,1,2]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "select"
+The function \fBselect(foo)\fR produces its input unchanged if \fBfoo\fR returns true for that input, and produces no output otherwise\.
+.
+.P
+It\'s useful for filtering lists: \fB[1,2,3] | map(select(\. >= 2))\fR will give you \fB[3]\fR\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'map(select(\. >= 2))\'
+   [1,5,3,0,7]
+=> [5,3,7]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "empty"
+\fBempty\fR returns no results\. None at all\. Not even \fBnull\fR\.
+.
+.P
+It\'s useful on occasion\. You\'ll know if you need it :)
+.
+.IP "" 4
+.
+.nf
+
+jq \'1, empty, 2\'
+   null
+=> 1, 2
+
+jq \'[1,2,empty,3]\'
+   null
+=> [1,2,3]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "map(x)"
+For any filter \fBx\fR, \fBmap(x)\fR will run that filter for each element of the input array, and produce the outputs a new array\. \fBmap(\.+1)\fR will increment each element of an array of numbers\.
+.
+.P
+\fBmap(x)\fR is equivalent to \fB[\.[] | x]\fR\. In fact, this is how it\'s defined\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'map(\.+1)\'
+   [1,2,3]
+=> [2,3,4]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "add"
+The filter \fBadd\fR takes as input an array, and produces as output the elements of the array added together\. This might mean summed, concatenated or merged depending on the types of the elements of the input array \- the rules are the same as those for the \fB+\fR operator (described above)\.
+.
+.P
+If the input is an empty array, \fBadd\fR returns \fBnull\fR\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'add\'
+   ["a","b","c"]
+=> "abc"
+
+jq \'add\'
+   [1, 2, 3]
+=> 6
+
+jq \'add\'
+   []
+=> null
+.
+.fi
+.
+.IP "" 0
+.
+.SS "tonumber"
+The \fBtonumber\fR function parses its input as a number\. It will convert correctly\-formatted strings to their numeric equivalent, leave numbers alone, and give an error on all other input\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[] | tonumber\'
+   [1, "1"]
+=> 1, 1
+.
+.fi
+.
+.IP "" 0
+.
+.SS "tostring"
+The \fBtostring\fR function prints its input as a string\. Strings are left unchanged, and all other values are JSON\-encoded\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[] | tostring\'
+   [1, "1", [1]]
+=> "1", "1", "[1]"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "sort, sort_by"
+The \fBsort\fR functions sorts its input, which must be an array\. Values are sorted in the following order:
+.
+.IP "\(bu" 4
+\fBnull\fR
+.
+.IP "\(bu" 4
+\fBfalse\fR
+.
+.IP "\(bu" 4
+\fBtrue\fR
+.
+.IP "\(bu" 4
+numbers
+.
+.IP "\(bu" 4
+strings, in alphabetical order (by unicode codepoint value)
+.
+.IP "\(bu" 4
+arrays, in lexical order
+.
+.IP "\(bu" 4
+objects
+.
+.IP "" 0
+.
+.P
+The ordering for objects is a little complex: first they\'re compared by comparing their sets of keys (as arrays in sorted order), and if their keys are equal then the values are compared key by key\.
+.
+.P
+\fBsort_by\fR may be used to sort by a particular field of an object, or by applying any jq filter\. \fBsort_by(foo)\fR compares two elements by comparing the result of \fBfoo\fR on each element\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'sort\'
+   [8,3,null,6]
+=> [null,3,6,8]
+
+jq \'sort_by(\.foo)\'
+   [{"foo":4, "bar":10}, {"foo":3, "bar":100}, {"foo":2, "bar":1}]
+=> [{"foo":2, "bar":1}, {"foo":3, "bar":100}, {"foo":4, "bar":10}]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "group_by"
+\fBgroup_by(\.foo)\fR takes as input an array, groups the elements having the same \fB\.foo\fR field into separate arrays, and produces all of these arrays as elements of a larger array, sorted by the value of the \fB\.foo\fR field\.
+.
+.P
+Any jq expression, not just a field access, may be used in place of \fB\.foo\fR\. The sorting order is the same as described in the \fBsort\fR function above\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'group_by(\.foo)\'
+   [{"foo":1, "bar":10}, {"foo":3, "bar":100}, {"foo":1, "bar":1}]
+=> [[{"foo":1, "bar":10}, {"foo":1, "bar":1}], [{"foo":3, "bar":100}]]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "min, max, min_by, max_by"
+Find the minimum or maximum element of the input array\. The \fB_by\fR versions allow you to specify a particular field or property to examine, e\.g\. \fBmin_by(\.foo)\fR finds the object with the smallest \fBfoo\fR field\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'min\'
+   [5,4,2,7]
+=> 2
+
+jq \'max_by(\.foo)\'
+   [{"foo":1, "bar":14}, {"foo":2, "bar":3}]
+=> {"foo":2, "bar":3}
+.
+.fi
+.
+.IP "" 0
+.
+.SS "unique"
+The \fBunique\fR function takes as input an array and produces an array of the same elements, in sorted order, with duplicates removed\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'unique\'
+   [1,2,5,3,5,3,1,3]
+=> [1,2,3,5]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "contains"
+The filter \fBcontains(b)\fR will produce true if b is completely contained within the input\. A string B is contained in a string A if B is a substring of A\. An array B is contained in an array A is all elements in B are contained in any element in A\. An object B is contained in object A if all of the values in B are contained in the value in A with the same key\. All other types are assumed to be contained in each other if they are equal\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'contains("bar")\'
+   "foobar"
+=> true
+
+jq \'contains(["baz", "bar"])\'
+   ["foobar", "foobaz", "blarp"]
+=> true
+
+jq \'contains(["bazzzzz", "bar"])\'
+   ["foobar", "foobaz", "blarp"]
+=> false
+
+jq \'contains({foo: 12, bar: [{barp: 12}]})\'
+   {"foo": 12, "bar":[1,2,{"barp":12, "blip":13}]}
+=> true
+
+jq \'contains({foo: 12, bar: [{barp: 15}]})\'
+   {"foo": 12, "bar":[1,2,{"barp":12, "blip":13}]}
+=> false
+.
+.fi
+.
+.IP "" 0
+.
+.SS "String interpolation \- \e(foo)"
+Inside a string, you can put an expression inside parens after a backslash\. Whatever the expression returns will be interpolated into the string\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'"The input was \e(\.), which is one less than \e(\.+1)"\'
+   42
+=> "The input was 42, which is one less than 43"
+.
+.fi
+.
+.IP "" 0
+.
+.SH "CONDITIONALS AND COMPARISONS"
+nil
+.
+.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\.
+.
+.P
+!= is "not equal", and \'a != b\' returns the opposite value of \'a == b\'
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[] == 1\'
+   [1, 1\.0, "1", "banana"]
+=> true, true, false, false
+.
+.fi
+.
+.IP "" 0
+.
+.SS "if\-then\-else"
+\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 \'if (\.name | count) > 0 then A else B end\' instead\.
+.
+.P
+If the condition A produces multiple results, it is considered "true" if any of those results is not false or null\. If it produces zero results, it\'s considered false\.
+.
+.P
+More cases can be added to an if using \fBelif A then B\fR syntax\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'if \. == 0 then
+.
+.fi
+.
+.IP "" 0
+.
+.P
+"zero" elif \. == 1 then "one" else "many" end\'
+.
+.IP "" 4
+.
+.nf
+
+   2
+=> "many"
+.
+.fi
+.
+.IP "" 0
+.
+.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)\.
+.
+.P
+The ordering is the same as that described for \fBsort\fR, above\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\. < 5\'
+   2
+=> true
+.
+.fi
+.
+.IP "" 0
+.
+.SS "and/or/not"
+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"\.
+.
+.P
+If an operand of one of these operators produces multiple results, the operator itself will produce a result for each input\.
+.
+.P
+\fBnot\fR is in fact a builtin function rather than an operator, so it is called as a filter to which things can be piped rather than with special syntax, as in \fB\.foo and \.bar | not\fR\.
+.
+.P
+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\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'42 and "a string"\'
+   null
+=> true
+
+jq \'(true, false) or false\'
+   null
+=> true, false
+
+jq \'(true, false) and (true, false)\'
+   null
+=> true, false, false, false
+
+jq \'[true, false | not]\'
+   null
+=> [false, true]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "Alternative operator \- //"
+A filter of the form \fBa // b\fR produces the same results as \fBa\fR, if \fBa\fR produces results other than \fBfalse\fR and \fBnull\fR\. Otherwise, \fBa // b\fR produces the same results as \fBb\fR\.
+.
+.P
+This is useful for providing defaults: \fB\.foo // 1\fR will evaluate to \fB1\fR if there\'s no \fB\.foo\fR element in the input\. It\'s similar to how \fBor\fR is sometimes used in Python (jq\'s \fBor\fR operator is reserved for strictly Boolean operations)\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.foo // 42\'
+   {"foo": 19}
+=> 19
+
+jq \'\.foo // 42\'
+   {}
+=> 42
+.
+.fi
+.
+.IP "" 0
+.
+.SH "VARIABLES AND FUNCTIONS"
+Variables are an absolute necessity in most programming languages, but they\'re relegated to an "advanced feature" in jq\.
+.
+.P
+In most languages, variables are the only means of passing around data\. If you calculate a value, and you want to use it more than once, you\'ll need to store it in a variable\. To pass a value to another part of the program, you\'ll need that part of the program to define a variable (as a function parameter, object member, or whatever) in which to place the data\.
+.
+.P
+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 \fBmap\fR and \fBfind\fR are in fact written in jq)\.
+.
+.SS "Variables"
+In jq, all filters have an input and an output, so manual plumbing is not necessary to pass a value from one part of a program to the next\. Many expressions, for instance \fBa + b\fR, pass their input to two distinct subexpressions (here \fBa\fR and \fBb\fR are both passed the same input), so variables aren\'t usually necessary in order to use a value twice\.
+.
+.P
+For instance, calculating the average value of an array of numbers requires a few variables in most languages \- at least one to hold the array, perhaps one for each element or for a loop counter\. In jq, it\'s simply \fBadd / length\fR \- the \fBsum\fR expression is given the array and produces its sum, and the \fBcount\fR expression is given the array and produces its length\.
+.
+.P
+So, there\'s generally a cleaner way to solve most problems in jq that defining variables\. Still, sometimes they do make things easier, so jq lets you define variables using \fBexpression as $variable\fR\. All variable names start with \fB$\fR\. Here\'s a slightly uglier version of the array\-averaging example:
+.
+.IP "" 4
+.
+.nf
+
+length as $array_length | add / $array_length
+.
+.fi
+.
+.IP "" 0
+.
+.P
+We\'ll need a more complicated problem to find a situation where using variables actually makes our lives easier\.
+.
+.P
+Suppose we have an array of blog posts, with "author" and "title" fields, and another object which is used to map author usernames to real names\. Our input looks like:
+.
+.IP "" 4
+.
+.nf
+
+{"posts": [{"title": "Frist psot", "author": "anon"},
+           {"title": "A well\-written article", "author": "person1"}],
+ "realnames": {"anon": "Anonymous Coward",
+               "person1": "Person McPherson"}}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+We want to produce the posts with the author field containing a real name, as in:
+.
+.IP "" 4
+.
+.nf
+
+{"title": "Frist psot", "author": "Anonymous Coward"}
+{"title": "A well\-written article", "author": "Person McPherson"}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+We use a variable, $names, to store the realnames object, so that we can refer to it later when looking up author usernames:
+.
+.IP "" 4
+.
+.nf
+
+\&\.realnames as $names | \.posts[] | {title, author: $names[\.author]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The expression "foo as $x" runs foo, puts the result in $x, and returns the original input\. Apart from the side\-effect of binding the variable, it has the same effect as "\."\.
+.
+.P
+Variables are scoped over the rest of the expression that defines them, so
+.
+.IP "" 4
+.
+.nf
+
+\&\.realnames as $names | (\.posts[] | {title, author: $names[\.author]})
+.
+.fi
+.
+.IP "" 0
+.
+.P
+will work, but
+.
+.IP "" 4
+.
+.nf
+
+(\.realnames as $names | \.posts[]) | {title, author: $names[\.author]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+won\'t\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.bar as $x | \.foo | \. + $x\'
+   {"foo":10, "bar":200}
+=> 210
+.
+.fi
+.
+.IP "" 0
+.
+.SS "Defining Functions"
+You can give a filter a name using "def" syntax:
+.
+.IP "" 4
+.
+.nf
+
+def increment: \. + 1;
+.
+.fi
+.
+.IP "" 0
+.
+.P
+From then on, \fBincrement\fR is usable as a filter just like a builtin function (in fact, this is how some of the builtins are defined)\. A function may take arguments:
+.
+.IP "" 4
+.
+.nf
+
+def map(f): [\.[] | f];
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Arguments are passed as filters, not as values\. The same argument may be referenced multiple times with different inputs (here \fBf\fR is run for each element of the input array)\. Arguments to a function work more like callbacks than like value arguments\.
+.
+.P
+If you want the value\-argument behaviour for defining simple functions, you can just use a variable:
+.
+.IP "" 4
+.
+.nf
+
+def addvalue(f): f as $value | map(, + $value);
+.
+.fi
+.
+.IP "" 0
+.
+.P
+With that definition, \fBaddvalue(\.foo)\fR will add the current input\'s \fB\.foo\fR field to each element of the array\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'def addvalue(f): \. + [f]; map(addvalue(\.[0]))\'
+   [[1,2],[10,20]]
+=> [[1,2,1], [10,20,10]]
+
+jq \'def addvalue(f): f as $x | map(\. + $x); addvalue(\.[0])\'
+   [[1,2],[10,20]]
+=> [[1,2,1,2], [10,20,1,2]]
+.
+.fi
+.
+.IP "" 0
+.
+.SH "ASSIGNMENT"
+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 just 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)\.
+.
+.SS "="
+The filter \fB\.foo = 1\fR will take as input an object and produce as output an object with the "foo" field set to 1\. There is no notion of "modifying" or "changing" something in jq \- all jq values are immutable\. For instance,
+.
+.P
+\&\.foo = \.bar | \.foo\.baz = 1
+.
+.P
+will not have the side\-effect of setting \.bar\.baz to be set 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 "the same object"\. They can be equal, or not equal, but if we change one of them in no circumstances will the other change behind our backs\.
+.
+.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\.
+.
+.SS "|="
+As well as the assignment operator \'=\', jq provides the "update" operator \'|=\', which takes a filter on the right\-hand side and works out the new value for the property being assigned to by running the old value through this expression\. For instance, \.foo |= \.+1 will build an object with the "foo" field set to the input\'s "foo" plus 1\.
+.
+.P
+This example should show the difference between \'=\' and \'|=\':
+.
+.P
+Provide input \'{"a": {"b": 10}, "b": 20}\' to the programs:
+.
+.P
+\&\.a = \.b \.a |= \.b
+.
+.P
+The former will set the "a" field of the input to the "b" field of the input, and produce the output {"a": 20}\. The latter will set the "a" field of the input to the "a" field\'s "b" field, producing {"a": 10}\.
+.
+.SS "+=, \-=, *=, /=, //="
+jq has a few operators of the form \fBa op= b\fR, which are all equivalent to \fBa |= \. op b\fR\. So, \fB+= 1\fR can be used to increment values\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.foo += 1\'
+   {"foo": 42}
+=> {"foo": 43}
+.
+.fi
+.
+.IP "" 0
+.
+.SS "Complex assignments"
+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 the left hand side, and it\'s no surprise that array accesses work just as well:
+.
+.IP "" 4
+.
+.nf
+
+\&\.posts[0]\.title = "JQ Manual"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+What may come as a surprise is that the expression on the left may produce multiple results, referring to different points in the input document:
+.
+.IP "" 4
+.
+.nf
+
+\&\.posts[]\.comments |= \. + ["this is great"]
+.
+.fi
+.
+.IP "" 0
+.
+.P
+That example appends the string "this is great" to the "comments" array of each post in the input (where the input is an object with a field "posts" which is an array of posts)\.
+.
+.P
+When jq encounters an assignment like \'a = b\', it records the "path" taken to select a part of the input document while executing a\. This path is then used to find which part of the input to change while executing the assignment\. Any filter may be used on the left\-hand side of an equals \- whichever paths it selects from the input will be where the assignment is performed\.
+.
+.P
+This is a very powerful operation\. Suppose we wanted to add a comment to blog posts, using the same "blog" input above\. This time, we only want to comment on the posts written by "stedolan"\. We can find those posts using the "select" function described earlier:
+.
+.IP "" 4
+.
+.nf
+
+\&\.posts[] | select(\.author == "stedolan")
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The paths provided by this operation point to each of the posts that "stedolan" wrote, and we can comment on each of them in the same way that we did before:
+.
+.IP "" 4
+.
+.nf
+
+(\.posts[] | select(\.author == "stedolan") | \.comments) |=
+    \. + ["terrible\."]
+.
+.fi
+.
+.IP "" 0
+.
+.SH "BUGS"
+Presumably\. Report them or discuss them at:
+.
+.IP "" 4
+.
+.nf
+
+https://github\.com/stedolan/jq/issues
+.
+.fi
+.
+.IP "" 0
+.
+.SH "AUTHOR"
+Stephen Dolan \fB<mu@netsoc\.tcd\.ie>\fR

File Added: pkgsrc/devel/jq/patches/Attic/patch-jv__utf8__tables.gen.h
$NetBSD: patch-jv__utf8__tables.gen.h,v 1.1 2013/04/26 10:20:34 jperkin Exp $

Pre-generate file to avoid Python dependency.

--- /dev/null	2013-04-25 16:10:18.000000000 +0000
+++ jv_utf8_tables.gen.h
@@ -0,0 +1,35 @@
+#define UTF8_CONTINUATION_BYTE ((unsigned char)255)
+static const unsigned char utf8_coding_length[] =
+ {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+  0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+  0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+  0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const unsigned char utf8_coding_bits[] =
+ {0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+  0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+  0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+  0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+  0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+  0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+  0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};