Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-21 02:23:20 +00:00
Code Issues Projects Releases Wiki Activity

--omd doc/man

Browse source
This commit is contained in:
John Kerl 2016-06-30 22:10:17 -04:00
parent 710f8c6bf9
commit d75e318cc1
6 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
c/cli/mlrcli.c
View file

@ -114,8 +114,6 @@ lhmss_t* get_default_rses() {
char* env_default = getenv("MLR_CSV_DEFAULT_RS");
if (env_default != NULL && !streq(env_default, ""))
csv_rs = cli_sep_from_arg(env_default);
else
lhmss_put(singleton_default_rses, "csv", "\r\n", NO_FREE);
lhmss_put(singleton_default_rses, "csv", csv_rs, NO_FREE);
lhmss_put(singleton_default_rses, "csvlite", "\n", NO_FREE);
@ -297,8 +295,8 @@ static void main_usage_data_format_examples(FILE* o, char* argv0) {
fprintf(o,
" DKVP: delimited key-value pairs (Miller default format)\n"
" +---------------------+\n"
" | apple=1,bat=2,cog=3 | Record 1: \"apple\" => \"1\", \"bat\" => \"2\", \"cog\" => \"3\"\n"
" | dish=7,egg=8,flint | Record 2: \"dish\" => \"7\", \"egg\" => \"8\", \"3\" => \"flint\"\n"
" | apple=1,bat=2,cog=3 | Record 1: \"apple\" => \"1\", \"bat\" => \"2\", \"cog\" => \"3\"\n"
" | dish=7,egg=8,flint | Record 2: \"dish\" => \"7\", \"egg\" => \"8\", \"3\" => \"flint\"\n"
" +---------------------+\n"
"\n"
" NIDX: implicitly numerically indexed (Unix-toolkit style)\n"
@ -345,7 +343,15 @@ static void main_usage_data_format_examples(FILE* o, char* argv0) {
" | |\n"
" | dish 7 | Record 2: \"dish\" => \"7\", \"egg\" => \"8\"\n"
" | egg 8 |\n"
" +---------------------+\n");
" +---------------------+\n"
"\n"
" Markdown tabular (supported for output only):\n"
" +-----------------------+\n"
" | | apple | bat | cog | |\n"
" | | --- | --- | --- | |\n"
" | | 1 | 2 | 3 | | Record 1: \"apple => \"1\", \"bat\" => \"2\", \"cog\" => \"3\"\n"
" | | 4 | 5 | 6 | | Record 2: \"apple\" => \"4\", \"bat\" => \"5\", \"cog\" => \"6\"\n"
" +-----------------------+\n");
}
static void main_usage_data_format_options(FILE* o, char* argv0) {

1
c/reg_test/run
View file

@ -2,6 +2,7 @@
# ================================================================
set -e
export MLR_CSV_DEFAULT_RS= # In case set in user's shell
# For building with autoconf:
# * in-directory build:

7
c/todo.txt
View file

@ -16,12 +16,6 @@ TOP OF LIST:
- my bashrc x 2
- clear @ top of regtest
* markdown format
- mld
? input
k output
k UT
* cookbook:
- neaten-valgrind
- headerless csv (i/o) choices
@ -51,6 +45,7 @@ TOP OF LIST:
- new/modified cookbook entries
----------------------------------------------------------------
? --imd?
? double-quote-aware (non-lite) nidx & dkvp options?
? comma-number -- using locale?

12
doc/file-formats.html
View file

@ -162,8 +162,8 @@ Miller commands were run with pretty-print-tabular output format.
$ mlr --usage-data-format-examples
DKVP: delimited key-value pairs (Miller default format)
+---------------------+
| apple=1,bat=2,cog=3 | Record 1: "apple" => "1", "bat" => "2", "cog" => "3"
| dish=7,egg=8,flint | Record 2: "dish" => "7", "egg" => "8", "3" => "flint"
| apple=1,bat=2,cog=3 | Record 1: "apple" => "1", "bat" => "2", "cog" => "3"
| dish=7,egg=8,flint | Record 2: "dish" => "7", "egg" => "8", "3" => "flint"
+---------------------+
NIDX: implicitly numerically indexed (Unix-toolkit style)
@ -211,6 +211,14 @@ $ mlr --usage-data-format-examples
| dish 7 | Record 2: "dish" => "7", "egg" => "8"
| egg 8 |
+---------------------+
Markdown tabular (supported for output only):
+-----------------------+
| | apple | bat | cog | |
| | --- | --- | --- | |
| | 1 | 2 | 3 | | Record 1: "apple => "1", "bat" => "2", "cog" => "3"
| | 4 | 5 | 6 | | Record 2: "apple" => "4", "bat" => "5", "cog" => "6"
+-----------------------+
</pre>
</div>
<p/>

16
doc/mlr.1
View file

@ -2,12 +2,12 @@
.\" Title: mlr
.\" Author: [see the "AUTHOR" section]
.\" Generator: ./mkman.rb
.\" Date: 2016-06-30
.\" Date: 2016-07-01
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
.TH "MILLER" "1" "2016-06-30" "\ \&" "\ \&"
.TH "MILLER" "1" "2016-07-01" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Portability definitions
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -74,8 +74,8 @@ mlr --from infile.dat put -f analyze.mlr
.nf
DKVP: delimited key-value pairs (Miller default format)
+---------------------+
| apple=1,bat=2,cog=3 | Record 1: "apple" => "1", "bat" => "2", "cog" => "3"
| dish=7,egg=8,flint | Record 2: "dish" => "7", "egg" => "8", "3" => "flint"
| apple=1,bat=2,cog=3 | Record 1: "apple" => "1", "bat" => "2", "cog" => "3"
| dish=7,egg=8,flint | Record 2: "dish" => "7", "egg" => "8", "3" => "flint"
+---------------------+
NIDX: implicitly numerically indexed (Unix-toolkit style)
@ -123,6 +123,14 @@ mlr --from infile.dat put -f analyze.mlr
| dish 7 | Record 2: "dish" => "7", "egg" => "8"
| egg 8 |
+---------------------+
Markdown tabular (supported for output only):
+-----------------------+
| | apple | bat | cog | |
| | --- | --- | --- | |
| | 1 | 2 | 3 | | Record 1: "apple => "1", "bat" => "2", "cog" => "3"
| | 4 | 5 | 6 | | Record 2: "apple" => "4", "bat" => "5", "cog" => "6"
+-----------------------+
.fi
.if n \{\
.RE

12
doc/reference.html
View file

@ -335,8 +335,8 @@ Command-line-syntax examples:
Data-format examples:
DKVP: delimited key-value pairs (Miller default format)
+---------------------+
| apple=1,bat=2,cog=3 | Record 1: "apple" =&gt; "1", "bat" =&gt; "2", "cog" =&gt; "3"
| dish=7,egg=8,flint | Record 2: "dish" =&gt; "7", "egg" =&gt; "8", "3" =&gt; "flint"
| apple=1,bat=2,cog=3 | Record 1: "apple" =&gt; "1", "bat" =&gt; "2", "cog" =&gt; "3"
| dish=7,egg=8,flint | Record 2: "dish" =&gt; "7", "egg" =&gt; "8", "3" =&gt; "flint"
+---------------------+
NIDX: implicitly numerically indexed (Unix-toolkit style)
@ -385,6 +385,14 @@ Data-format examples:
| egg 8 |
+---------------------+
Markdown tabular (supported for output only):
+-----------------------+
| | apple | bat | cog | |
| | --- | --- | --- | |
| | 1 | 2 | 3 | | Record 1: "apple =&gt; "1", "bat" =&gt; "2", "cog" =&gt; "3"
| | 4 | 5 | 6 | | Record 2: "apple" =&gt; "4", "bat" =&gt; "5", "cog" =&gt; "6"
+-----------------------+
Help options:
-h or --help Show this message.
--version Show the software version.