diff --git a/c/cli/mlrcli.c b/c/cli/mlrcli.c
index a6980593c..ed1389440 100644
--- a/c/cli/mlrcli.c
+++ b/c/cli/mlrcli.c
@@ -743,9 +743,9 @@ static void main_usage_format_conversion_keystroke_saver_options(FILE* o, char*
fprintf(o, " --j2c --j2t --j2d --j2n --j2x --j2p --j2m\n");
fprintf(o, " --x2c --x2t --x2d --x2n --x2j --x2p --x2m\n");
fprintf(o, " --p2c --p2t --p2d --p2n --p2j --p2x --p2m\n");
- fprintf(o, "The letters c t d n j x p m refer to formats CSV with LF, TSV with LF, DKVP,\n");
- fprintf(o, "NIDX, JSON, XTAB, PPRINT, and markdown, respectively. Note that markdown format\n");
- fprintf(o, "is available for output only.\n");
+ fprintf(o, "The letters c t d n j x p m refer to formats CSV, TSV, DKVP, NIDX, JSON, XTAB,\n");
+ fprintf(o, "PPRINT, and markdown, respectively. Note that markdown format is available for\n");
+ fprintf(o, "output only.\n");
}
static void main_usage_compressed_data_options(FILE* o, char* argv0) {
diff --git a/doc/10-min.html b/doc/10-min.html
index 2787df262..8b58f5857 100644
--- a/doc/10-min.html
+++ b/doc/10-min.html
@@ -267,7 +267,7 @@ purple square 0 91 72.3735 8.2430
-mlr head and mlr tail count records. The CSV
+mlr head and mlr tail count records rather than lines. The CSV
header is included either way:
@@ -445,6 +445,9 @@ $ mlr --icsv --ojson put '$ratio = $quantity/$rate; $shape = toupper($shape)' ex
+
+ JSON output with vertical-formatting flags:
+
@@ -472,9 +475,10 @@ $ mlr --icsv --ojson --jvstack --jlistwrap tail -n 2 example.csv
Use then to pipe commands together. Also, the
--g option for many Miller commands is for group-by: here,
-head -n 1 -g shape outputs the first record for each distinct
-value of the shape field.
+-g option for many Miller commands is for group-by: here, head -n
+1 -g shape outputs the first record for each distinct value of the
+shape field. This means we’re finding the record with highest
+index field for each distinct shape field:
diff --git a/doc/content-for-10-min.html b/doc/content-for-10-min.html
index 1353bda51..c4056d5ce 100644
--- a/doc/content-for-10-min.html
+++ b/doc/content-for-10-min.html
@@ -20,7 +20,7 @@ POKI_RUN_COMMAND{{mlr --csv cat example.csv}}HERE
POKI_RUN_COMMAND{{mlr --icsv --opprint cat example.csv}}HERE
-mlr head and mlr tail count records. The CSV
+mlr head and mlr tail count records rather than lines. The CSV
header is included either way:
POKI_RUN_COMMAND{{mlr --csv head -n 4 example.csv}}HERE
@@ -55,12 +55,16 @@ POKI_RUN_COMMAND{{mlr --icsv --opprint put '$ratio = $quantity / $rate; $color_s
JSON output:
POKI_RUN_COMMAND{{mlr --icsv --ojson put '$ratio = $quantity/$rate; $shape = toupper($shape)' example.csv}}HERE
+
+ JSON output with vertical-formatting flags:
+
POKI_RUN_COMMAND{{mlr --icsv --ojson --jvstack --jlistwrap tail -n 2 example.csv}}HERE
Use then to pipe commands together. Also, the
--g option for many Miller commands is for group-by: here,
-head -n 1 -g shape outputs the first record for each distinct
-value of the shape field.
+-g option for many Miller commands is for group-by: here, head -n
+1 -g shape outputs the first record for each distinct value of the
+shape field. This means we’re finding the record with highest
+index field for each distinct shape field:
POKI_RUN_COMMAND{{mlr --icsv --opprint sort -f shape -nr index then head -n 1 -g shape example.csv}}HERE
diff --git a/doc/content-for-file-formats.html b/doc/content-for-file-formats.html
index 030f2ee1d..9fa0ddff2 100644
--- a/doc/content-for-file-formats.html
+++ b/doc/content-for-file-formats.html
@@ -56,15 +56,12 @@ of platform.
CSV supports
RFC-4180)-style double-quoting, including the ability to have commas and/or
-CR-LF line-endings contained within an input field; CSV-lite does not.
-
-Default record separator for CSV is CR-LF; default record separator for
-CSV-lite is LF.
+LF/CRLF line-endings contained within an input field; CSV-lite does not.
CSV does not allow heterogeneous data; CSV-lite does (see also here).
-The CSV-lite input-reading code is more efficient than the CSV
+The CSV-lite input-reading code is fractionally more efficient than the CSV
input-reader.
@@ -220,9 +217,9 @@ truly powerful, JSON-specific tool.
JSON non-streaming
-The JSON parser does not return until all input is parsed: in particular
-this means that, unlike for other file formats, Miller does not (at present)
-handle JSON files in tail -f contexts.
+The JSON parser Miller uses does not return until all input is parsed: in
+particular this means that, unlike for other file formats, Miller does not (at
+present) handle JSON files in tail -f contexts.
diff --git a/doc/cookbook2.html b/doc/cookbook2.html
index 0eaee594c..f6e11ae5f 100644
--- a/doc/cookbook2.html
+++ b/doc/cookbook2.html
@@ -567,11 +567,11 @@ begin {
@iwidth = 100;
@maxits = 100;
@levelstep = 5;
- @chars = "@X*o-.";
+ @chars = "@X*o-."; # Palette of characters to print to the screen.
@verbose = false;
@do_julia = false;
- @jr = 0.0;
- @ji = 0.0;
+ @jr = 0.0; # Real part of Julia point, if any
+ @ji = 0.0; # Imaginary part of Julia point, if any
}
# Here, we can override defaults from an input file (if any). In Miller's
@@ -614,7 +614,8 @@ end {
}
}
-# Function to approximate membership in the Mandelbrot set for a given point in the
+# This is a function to approximate membership in the Mandelbrot set (or Julia
+# set for a given Julia point if do_julia == true) for a given point in the
# complex plane.
func get_point_plot(pr, pi, maxits, do_julia, jr, ji) {
num zr = 0.0;
diff --git a/doc/file-formats.html b/doc/file-formats.html
index e6b43c32e..163ba9da3 100644
--- a/doc/file-formats.html
+++ b/doc/file-formats.html
@@ -326,15 +326,12 @@ of platform.
CSV supports
RFC-4180)-style double-quoting, including the ability to have commas and/or
-CR-LF line-endings contained within an input field; CSV-lite does not.
-
-Default record separator for CSV is CR-LF; default record separator for
-CSV-lite is LF.
+LF/CRLF line-endings contained within an input field; CSV-lite does not.
CSV does not allow heterogeneous data; CSV-lite does (see also here).
-The CSV-lite input-reading code is more efficient than the CSV
+The CSV-lite input-reading code is fractionally more efficient than the CSV
input-reader.
@@ -683,9 +680,9 @@ truly powerful, JSON-specific tool.
JSON non-streaming
-The JSON parser does not return until all input is parsed: in particular
-this means that, unlike for other file formats, Miller does not (at present)
-handle JSON files in tail -f contexts.
+The JSON parser Miller uses does not return until all input is parsed: in
+particular this means that, unlike for other file formats, Miller does not (at
+present) handle JSON files in tail -f contexts.
PPRINT: Pretty-printed tabular
@@ -866,9 +863,9 @@ As keystroke-savers for format-conversion you may use the following:
--j2c --j2t --j2d --j2n --j2x --j2p --j2m
--x2c --x2t --x2d --x2n --x2j --x2p --x2m
--p2c --p2t --p2d --p2n --p2j --p2x --p2m
-The letters c t d n j x p m refer to formats CSV with LF, TSV with LF, DKVP,
-NIDX, JSON, XTAB, PPRINT, and markdown, respectively. Note that markdown format
-is available for output only.
+The letters c t d n j x p m refer to formats CSV, TSV, DKVP, NIDX, JSON, XTAB,
+PPRINT, and markdown, respectively. Note that markdown format is available for
+output only.
@@ -880,7 +877,7 @@ is available for output only.
- Default line endings (--irs and --ors) are auto
+ Default line endings (--irs and --ors) are 'auto'
which means autodetect from the input file format, as
long as the input file(s) have lines ending in either LF (also known as
linefeed, '\n', 0x0a, Unix-style) or CRLF (also known as
diff --git a/doc/manpage.html b/doc/manpage.html
index fd04ebb8d..f7610aeef 100644
--- a/doc/manpage.html
+++ b/doc/manpage.html
@@ -389,9 +389,9 @@ OPTIONS
--j2c --j2t --j2d --j2n --j2x --j2p --j2m
--x2c --x2t --x2d --x2n --x2j --x2p --x2m
--p2c --p2t --p2d --p2n --p2j --p2x --p2m
- The letters c t d n j x p m refer to formats CSV with LF, TSV with LF, DKVP,
- NIDX, JSON, XTAB, PPRINT, and markdown, respectively. Note that markdown format
- is available for output only.
+ The letters c t d n j x p m refer to formats CSV, TSV, DKVP, NIDX, JSON, XTAB,
+ PPRINT, and markdown, respectively. Note that markdown format is available for
+ output only.
COMPRESSED I/O
--prepipe {command} This allows Miller to handle compressed inputs. You can do
diff --git a/doc/manpage.txt b/doc/manpage.txt
index 4e4b41fb9..8a74cc89e 100644
--- a/doc/manpage.txt
+++ b/doc/manpage.txt
@@ -196,9 +196,9 @@ OPTIONS
--j2c --j2t --j2d --j2n --j2x --j2p --j2m
--x2c --x2t --x2d --x2n --x2j --x2p --x2m
--p2c --p2t --p2d --p2n --p2j --p2x --p2m
- The letters c t d n j x p m refer to formats CSV with LF, TSV with LF, DKVP,
- NIDX, JSON, XTAB, PPRINT, and markdown, respectively. Note that markdown format
- is available for output only.
+ The letters c t d n j x p m refer to formats CSV, TSV, DKVP, NIDX, JSON, XTAB,
+ PPRINT, and markdown, respectively. Note that markdown format is available for
+ output only.
COMPRESSED I/O
--prepipe {command} This allows Miller to handle compressed inputs. You can do
diff --git a/doc/mlr.1 b/doc/mlr.1
index 1e93bdd1f..dccb4a6a6 100644
--- a/doc/mlr.1
+++ b/doc/mlr.1
@@ -257,9 +257,9 @@ As keystroke-savers for format-conversion you may use the following:
--j2c --j2t --j2d --j2n --j2x --j2p --j2m
--x2c --x2t --x2d --x2n --x2j --x2p --x2m
--p2c --p2t --p2d --p2n --p2j --p2x --p2m
-The letters c t d n j x p m refer to formats CSV with LF, TSV with LF, DKVP,
-NIDX, JSON, XTAB, PPRINT, and markdown, respectively. Note that markdown format
-is available for output only.
+The letters c t d n j x p m refer to formats CSV, TSV, DKVP, NIDX, JSON, XTAB,
+PPRINT, and markdown, respectively. Note that markdown format is available for
+output only.
.fi
.if n \{\
.RE
diff --git a/doc/reference.html b/doc/reference.html
index fd0ff44fd..c6d8c49d7 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -499,9 +499,9 @@ As keystroke-savers for format-conversion you may use the following:
--j2c --j2t --j2d --j2n --j2x --j2p --j2m
--x2c --x2t --x2d --x2n --x2j --x2p --x2m
--p2c --p2t --p2d --p2n --p2j --p2x --p2m
-The letters c t d n j x p m refer to formats CSV with LF, TSV with LF, DKVP,
-NIDX, JSON, XTAB, PPRINT, and markdown, respectively. Note that markdown format
-is available for output only.
+The letters c t d n j x p m refer to formats CSV, TSV, DKVP, NIDX, JSON, XTAB,
+PPRINT, and markdown, respectively. Note that markdown format is available for
+output only.
Compressed-data options:
--prepipe {command} This allows Miller to handle compressed inputs. You can do