From 0134b92f7d5bb25036d4d66d92185d1ba4d1480a Mon Sep 17 00:00:00 2001 From: G Dutton <35460590+gdttn@users.noreply.github.com> Date: Wed, 11 Sep 2019 14:12:41 +0100 Subject: [PATCH 1/2] Align the format-conversion usage table correctly In the mlr usage information (and therefor man page, etc.) the gap for the "notional" --c2c conversion was missing, causing the table to be misaligned and a little harder to read. This fixes the alignment by adding the appropriate number of space characters. --- c/cli/mlrcli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c/cli/mlrcli.c b/c/cli/mlrcli.c index cbc40facb..30a1adf80 100644 --- a/c/cli/mlrcli.c +++ b/c/cli/mlrcli.c @@ -881,7 +881,7 @@ static void main_usage_comments_in_data(FILE* o, char* argv0) { static void main_usage_format_conversion_keystroke_saver_options(FILE* o, char* argv0) { fprintf(o, "As keystroke-savers for format-conversion you may use the following:\n"); - fprintf(o, " --c2t --c2d --c2n --c2j --c2x --c2p --c2m\n"); + fprintf(o, " --c2t --c2d --c2n --c2j --c2x --c2p --c2m\n"); fprintf(o, " --t2c --t2d --t2n --t2j --t2x --t2p --t2m\n"); fprintf(o, " --d2c --d2t --d2n --d2j --d2x --d2p --d2m\n"); fprintf(o, " --n2c --n2t --n2d --n2j --n2x --n2p --n2m\n"); From b7345d60f206fe7133755fdf77b5f47622d61936 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 12 Sep 2019 09:44:43 -0400 Subject: [PATCH 2/2] docgen from https://github.com/johnkerl/miller/pull/267 --- doc/cookbook.html | 2 +- doc/data-examples.html | 2 +- doc/data-sharing.html | 44 ++++++++++++++++++++-------------------- doc/file-formats.html | 2 +- doc/manpage.html | 2 +- doc/manpage.txt | 2 +- doc/mlr.1 | 2 +- doc/reference-dsl.html | 2 +- doc/reference-verbs.html | 4 ++-- doc/reference.html | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/doc/cookbook.html b/doc/cookbook.html index b40848908..9bbebce17 100644 --- a/doc/cookbook.html +++ b/doc/cookbook.html @@ -918,7 +918,7 @@ date,qoh 
 $ wc -l data/miss-date.csv
-1372 data/miss-date.csv
+    1372 data/miss-date.csv

diff --git a/doc/data-examples.html b/doc/data-examples.html index 9143bba28..1631f8f37 100644 --- a/doc/data-examples.html +++ b/doc/data-examples.html @@ -333,7 +333,7 @@ St. Johns - - - 

 $ wc -l data/colored-shapes.dkvp
-10078 data/colored-shapes.dkvp
+   10078 data/colored-shapes.dkvp

diff --git a/doc/data-sharing.html b/doc/data-sharing.html index 881dcd678..39f6a5aa6 100644 --- a/doc/data-sharing.html +++ b/doc/data-sharing.html @@ -329,11 +329,11 @@ Run as-is: 

 $ python polyglot-dkvp-io/example.py < data/small
-a=pan,b=pan,i=1,y=0.726802862743,ab=panpan,iy=1.72680286274,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=eks,b=pan,i=2,y=0.522151108333,ab=ekspan,iy=2.52215110833,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=wye,b=wye,i=3,y=0.338318525517,ab=wyewye,iy=3.33831852552,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=eks,b=wye,i=4,y=0.134188743284,ab=ekswye,iy=4.13418874328,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=wye,b=pan,i=5,y=0.863624469903,ab=wyepan,iy=5.8636244699,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=pan,b=pan,i=1,y=0.7268028627434533,ab=panpan,iy=1.7268028627434533,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=eks,b=pan,i=2,y=0.5221511083334797,ab=ekspan,iy=2.5221511083334796,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=wye,b=wye,i=3,y=0.33831852551664776,ab=wyewye,iy=3.3383185255166477,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=eks,b=wye,i=4,y=0.13418874328430463,ab=ekswye,iy=4.134188743284304,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=wye,b=pan,i=5,y=0.8636244699032729,ab=wyepan,iy=5.863624469903273,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float

@@ -344,12 +344,12 @@ Run as-is, then pipe to Miller for pretty-printing: 

 $ python polyglot-dkvp-io/example.py < data/small | mlr --opprint cat
-a   b   i y              ab     iy            ta  tb  ti  ty    tab tiy
-pan pan 1 0.726802862743 panpan 1.72680286274 str str int float str float
-eks pan 2 0.522151108333 ekspan 2.52215110833 str str int float str float
-wye wye 3 0.338318525517 wyewye 3.33831852552 str str int float str float
-eks wye 4 0.134188743284 ekswye 4.13418874328 str str int float str float
-wye pan 5 0.863624469903 wyepan 5.8636244699  str str int float str float
+a   b   i y                   ab     iy                 ta  tb  ti  ty    tab tiy
+pan pan 1 0.7268028627434533  panpan 1.7268028627434533 str str int float str float
+eks pan 2 0.5221511083334797  ekspan 2.5221511083334796 str str int float str float
+wye wye 3 0.33831852551664776 wyewye 3.3383185255166477 str str int float str float
+eks wye 4 0.13418874328430463 ekswye 4.134188743284304  str str int float str float
+wye pan 5 0.8636244699032729  wyepan 5.863624469903273  str str int float str float

@@ -461,11 +461,11 @@ Run as-is: 

 $ ruby -I./polyglot-dkvp-io polyglot-dkvp-io/example.rb data/small
-a=pan,b=pan,i=1,y=0.7268028627434533,ab=panpan,iy=1.7268028627434533,ta=String,tb=String,ti=Integer,ty=Float,tab=String,tiy=Float
-a=eks,b=pan,i=2,y=0.5221511083334797,ab=ekspan,iy=2.5221511083334796,ta=String,tb=String,ti=Integer,ty=Float,tab=String,tiy=Float
-a=wye,b=wye,i=3,y=0.33831852551664776,ab=wyewye,iy=3.3383185255166477,ta=String,tb=String,ti=Integer,ty=Float,tab=String,tiy=Float
-a=eks,b=wye,i=4,y=0.13418874328430463,ab=ekswye,iy=4.134188743284304,ta=String,tb=String,ti=Integer,ty=Float,tab=String,tiy=Float
-a=wye,b=pan,i=5,y=0.8636244699032729,ab=wyepan,iy=5.863624469903273,ta=String,tb=String,ti=Integer,ty=Float,tab=String,tiy=Float
+a=pan,b=pan,i=1,y=0.7268028627434533,ab=panpan,iy=1.7268028627434533,ta=String,tb=String,ti=Fixnum,ty=Float,tab=String,tiy=Float
+a=eks,b=pan,i=2,y=0.5221511083334797,ab=ekspan,iy=2.5221511083334796,ta=String,tb=String,ti=Fixnum,ty=Float,tab=String,tiy=Float
+a=wye,b=wye,i=3,y=0.33831852551664776,ab=wyewye,iy=3.3383185255166477,ta=String,tb=String,ti=Fixnum,ty=Float,tab=String,tiy=Float
+a=eks,b=wye,i=4,y=0.13418874328430463,ab=ekswye,iy=4.134188743284304,ta=String,tb=String,ti=Fixnum,ty=Float,tab=String,tiy=Float
+a=wye,b=pan,i=5,y=0.8636244699032729,ab=wyepan,iy=5.863624469903273,ta=String,tb=String,ti=Fixnum,ty=Float,tab=String,tiy=Float

@@ -476,12 +476,12 @@ Run as-is, then pipe to Miller for pretty-printing: 

 $ ruby -I./polyglot-dkvp-io polyglot-dkvp-io/example.rb data/small | mlr --opprint cat
-a   b   i y                   ab     iy                 ta     tb     ti      ty    tab    tiy
-pan pan 1 0.7268028627434533  panpan 1.7268028627434533 String String Integer Float String Float
-eks pan 2 0.5221511083334797  ekspan 2.5221511083334796 String String Integer Float String Float
-wye wye 3 0.33831852551664776 wyewye 3.3383185255166477 String String Integer Float String Float
-eks wye 4 0.13418874328430463 ekswye 4.134188743284304  String String Integer Float String Float
-wye pan 5 0.8636244699032729  wyepan 5.863624469903273  String String Integer Float String Float
+a   b   i y                   ab     iy                 ta     tb     ti     ty    tab    tiy
+pan pan 1 0.7268028627434533  panpan 1.7268028627434533 String String Fixnum Float String Float
+eks pan 2 0.5221511083334797  ekspan 2.5221511083334796 String String Fixnum Float String Float
+wye wye 3 0.33831852551664776 wyewye 3.3383185255166477 String String Fixnum Float String Float
+eks wye 4 0.13418874328430463 ekswye 4.134188743284304  String String Fixnum Float String Float
+wye pan 5 0.8636244699032729  wyepan 5.863624469903273  String String Fixnum Float String Float

diff --git a/doc/file-formats.html b/doc/file-formats.html index 70299594b..481cd99c2 100644 --- a/doc/file-formats.html +++ b/doc/file-formats.html @@ -981,7 +981,7 @@ For a complete list: 

 $ mlr --usage-format-conversion-keystroke-saver-options
 As keystroke-savers for format-conversion you may use the following:
-  --c2t --c2d --c2n --c2j --c2x --c2p --c2m
+        --c2t --c2d --c2n --c2j --c2x --c2p --c2m
   --t2c       --t2d --t2n --t2j --t2x --t2p --t2m
   --d2c --d2t       --d2n --d2j --d2x --d2p --d2m
   --n2c --n2t --n2d       --n2j --n2x --n2p --n2m
diff --git a/doc/manpage.html b/doc/manpage.html
index 79d1954dc..b46a56292 100644
--- a/doc/manpage.html
+++ b/doc/manpage.html
@@ -444,7 +444,7 @@ OPTIONS
 
    FORMAT-CONVERSION KEYSTROKE-SAVERS
        As keystroke-savers for format-conversion you may use the following:
-	 --c2t --c2d --c2n --c2j --c2x --c2p --c2m
+	       --c2t --c2d --c2n --c2j --c2x --c2p --c2m
 	 --t2c	     --t2d --t2n --t2j --t2x --t2p --t2m
 	 --d2c --d2t	   --d2n --d2j --d2x --d2p --d2m
 	 --n2c --n2t --n2d	 --n2j --n2x --n2p --n2m
diff --git a/doc/manpage.txt b/doc/manpage.txt
index d166dd067..a285fb1f1 100644
--- a/doc/manpage.txt
+++ b/doc/manpage.txt
@@ -250,7 +250,7 @@ OPTIONS
 
    FORMAT-CONVERSION KEYSTROKE-SAVERS
        As keystroke-savers for format-conversion you may use the following:
-	 --c2t --c2d --c2n --c2j --c2x --c2p --c2m
+	       --c2t --c2d --c2n --c2j --c2x --c2p --c2m
 	 --t2c	     --t2d --t2n --t2j --t2x --t2p --t2m
 	 --d2c --d2t	   --d2n --d2j --d2x --d2p --d2m
 	 --n2c --n2t --n2d	 --n2j --n2x --n2p --n2m
diff --git a/doc/mlr.1 b/doc/mlr.1
index 274a7c031..2ef6f4a88 100644
--- a/doc/mlr.1
+++ b/doc/mlr.1
@@ -317,7 +317,7 @@ Notes:
 .\}
 .nf
 As keystroke-savers for format-conversion you may use the following:
-  --c2t --c2d --c2n --c2j --c2x --c2p --c2m
+        --c2t --c2d --c2n --c2j --c2x --c2p --c2m
   --t2c       --t2d --t2n --t2j --t2x --t2p --t2m
   --d2c --d2t       --d2n --d2j --d2x --d2p --d2m
   --n2c --n2t --n2d       --n2j --n2x --n2p --n2m
diff --git a/doc/reference-dsl.html b/doc/reference-dsl.html
index abfdf6f65..558d043b9 100644
--- a/doc/reference-dsl.html
+++ b/doc/reference-dsl.html
@@ -2149,7 +2149,7 @@ subsequent assignments are done unconditionally:
 
 $ mlr put '$x > 0.0; $y = log10($x); $z = sqrt($y)' data/put-gating-example-1.dkvp
 x=-1,y=nan,z=nan
-x=0,y=-inf,z=-nan
+x=0,y=-inf,z=nan
 x=1,y=0.000000,z=0.000000
 x=2,y=0.301030,z=0.548662
 x=3,y=0.477121,z=0.690740
diff --git a/doc/reference-verbs.html b/doc/reference-verbs.html
index 28b61b625..860e3a94a 100644
--- a/doc/reference-verbs.html
+++ b/doc/reference-verbs.html
@@ -4083,7 +4083,7 @@ Options:
 

 
 $ wc -l data/colored-shapes.dkvp
-10078 data/colored-shapes.dkvp
+   10078 data/colored-shapes.dkvp
 

 

 

@@ -4255,7 +4255,7 @@ color=purple,shape=square,flag=0
 

 
 $ wc -l data/repeats.dkvp
-57 data/repeats.dkvp
+      57 data/repeats.dkvp
 

 

 

diff --git a/doc/reference.html b/doc/reference.html
index 597fd075c..1867b4123 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -1576,7 +1576,7 @@ Notes:
 
 Format-conversion keystroke-saver options, for input, output, or both:
 As keystroke-savers for format-conversion you may use the following:
-  --c2t --c2d --c2n --c2j --c2x --c2p --c2m
+        --c2t --c2d --c2n --c2j --c2x --c2p --c2m
   --t2c       --t2d --t2n --t2j --t2x --t2p --t2m
   --d2c --d2t       --d2n --d2j --d2x --d2p --d2m
   --n2c --n2t --n2d       --n2j --n2x --n2p --n2m