bring back -o option

diff --git a/cmd/gvmap/gvmap.1 b/cmd/gvmap/gvmap.1
index e8c041b3c7e9338d836f4183a03c13e809ced930..8f8cafcac6d3d91c7eb7d64bd37af7e6c421d4c5 100644 (file)
--- a/cmd/gvmap/gvmap.1
+++ b/cmd/gvmap/gvmap.1
@@ -81,20 +81,14 @@ The real number v specified the depth of the sea and lake shores in points. If 0
 .BI \-O  
 Do NOT do color assignment optimization that maximizes color difference between neighboring countries
 .TP
+.BI \-o <file> 
+Put output in <file>. Default output is stdout
+.TP
 .BI \-v 
 Verbose mode.
 .TP
 .BI \-z " c" 
 Specified the polygon line color. Default is black.
-
-
-
-.BI \-s " d" 
-The real number d specifies the depth of the shore in points. If 0, the depth is selected automatically. By default d = 0.
-.TP
-.BI \-v
-Set verbose mode.
-
 .SH EXAMPLES
 .PP
 Given a graph foo.gv, one way to generate a layout and highlight the clusters 

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index 3dc69b8de019ef58988e69d29c3362e8be7559ba..2cbc64a8d25a74c55c39ede60d1b2813510e1c72 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -158,6 +158,7 @@ static char* usestr =
     -k   - increase randomesss of boundary\n\
     -r k - number of random points k used to define sea and lake boundaries. If 0, auto assigned. (0)\n\
     -s v - depth of the sea and lake shores in points. If 0, auto assigned. (0)\n\
+    -o <file> - put output in <file> (stdout)\n\
     -O   - do NOT do color assignment optimization that maximizes color difference between neighboring countries\n\
     -v   - verbose\n\
     -z c - polygon line color (black)\n";
@@ -170,7 +171,6 @@ static char* usestr =
        1 : all points\n\
        2 : label points\n\
        3 : random/artificial points\n\
-    -o <file> - put output in <file> (stdout)\n\
     -h k - number of artificial points added maintain bridge between endpoints (0)\n\
     -l s - specify label\n\
     -m v - bounding box margin. If 0, auto assigned (0)\n\