diff --git a/src/longopt/grdedit_inc.h b/src/longopt/grdedit_inc.h index 82c520846e8..64d84c03a69 100644 --- a/src/longopt/grdedit_inc.h +++ b/src/longopt/grdedit_inc.h @@ -30,10 +30,10 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { "b,c,n,p", "both,current,none,previous", "", "", GMT_TP_STANDARD }, - { 0, 'D', "header|metadata", + { 0, 'D', "meta|metadata", "", "", "c,d,n,o,r,s,t,v,x,y,z", - "cpt,dname,invalid,offset,remark,scale,title,varname,xname,yname,zname", + "cpt,dname,invalid,offset,remark,scale,title,varname,xname,yname,zname", GMT_TP_STANDARD }, { 0, 'E', "transform", "a,e,h,l,r,t,v", "hvflip,xyswap,hflip,rot90ccw,rot90cw,transpose,vflip", @@ -46,7 +46,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { GMT_TP_STANDARD }, { 0, 'N', "nodes|replace", "", "", "", "", GMT_TP_STANDARD }, { 0, 'S', "lonshift_region", "", "", "", "", GMT_TP_STANDARD }, - { 0, 'T', "toggle_registration|toggle", "", "", "", "", GMT_TP_STANDARD }, + { 0, 'T', "toggle|toggle_registration", "", "", "", "", GMT_TP_STANDARD }, { 0, '\0', "", "", "", "", "", 0 } /* End of list marked with empty option and strings */ }; #endif /* !GRDEDIT_INC_H */ diff --git a/src/longopt/greenspline_inc.h b/src/longopt/greenspline_inc.h index 184660b9c51..f961982ab39 100644 --- a/src/longopt/greenspline_inc.h +++ b/src/longopt/greenspline_inc.h @@ -33,7 +33,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { "n,r,v", "largest,ratio,variance", "c,f,i,n", "cumulative,file,incremental,no_surface", GMT_TP_STANDARD }, - { 0, 'D', "metadata|mode", + { 0, 'D', "meta|metadata", "", "", "c,d,n,o,r,s,t,v,x,y,z", "cpt|cmap,dname,invalid,offset,remark,scale,title,varname,xname,yname,zname", diff --git a/test/batch/batch-l2s.sh b/test/batch/batch-l2s.sh index c06874828ec..34ce65cd020 100755 --- a/test/batch/batch-l2s.sh +++ b/test/batch/batch-l2s.sh @@ -14,7 +14,7 @@ cat << EOF > $a --l2stranstest -Qs --l2stranstest -Sbpre.sh -Sfpost.sh --l2stranstest -T6 -T50/100/5+n ---l2stranstest -T/some/timefile+p7+s12 +--l2stranstest -Ttimefile+p7+s12 --l2stranstest -T9+w -T"6+wmy string" -T2+W --l2stranstest -W --l2stranstest -Z @@ -26,7 +26,7 @@ gmt $m $l2s --include --onemaster --prefix >> $b gmt $m $l2s --debug=noexec >> $b gmt $m $l2s --optscript=preflight:pre.sh --optscript=postflight:post.sh >> $b gmt $m $l2s --njobs=6 --minmax=50/100/5+njobs >> $b -gmt $m $l2s --timefile=/some/timefile+tagwidth:7+multisys:12 >> $b +gmt $m $l2s --timefile=timefile+tagwidth:7+multisys:12 >> $b gmt $m $l2s --njobs=9+words --njobs=6+words:'my string' --njobs=2+tabwords >> $b gmt $m $l2s --tmpdir >> $b gmt $m $l2s --erasescripts >> $b diff --git a/test/blockmean/blockmean-l2s.sh b/test/blockmean/blockmean-l2s.sh index 6f9e95ccbad..ac00b713e11 100755 --- a/test/blockmean/blockmean-l2s.sh +++ b/test/blockmean/blockmean-l2s.sh @@ -13,7 +13,7 @@ cat << EOF > $a --l2stranstest -Ahs --l2stranstest -C --l2stranstest -E+p -E+P ---l2stranstest -G/some/file.grd +--l2stranstest -Gfile.grd --l2stranstest -Sm -Sn -Ss -Sw --l2stranstest -Wi -Wo+s EOF @@ -23,7 +23,7 @@ gmt $m $l2s --fields=mean,stddev,low,high,weight >> $b gmt $m $l2s --fields=high,stddev >> $b gmt $m $l2s --center >> $b gmt $m $l2s --extend+weighted --extend+simple >> $b -gmt $m $l2s --outgrid=/some/file.grd >> $b +gmt $m $l2s --outgrid=file.grd >> $b gmt $m $l2s --statistic=mean --statistic=count --statistic=sum --statistic=weight >> $b gmt $m $l2s --weights=in --weights=out+sigma >> $b diff --git a/test/blockmedian/blockmedian-l2s.sh b/test/blockmedian/blockmedian-l2s.sh index e1eb8bc1854..252d398ce51 100755 --- a/test/blockmedian/blockmedian-l2s.sh +++ b/test/blockmedian/blockmedian-l2s.sh @@ -13,7 +13,7 @@ cat << EOF > $a --l2stranstest -C --l2stranstest -E -Eb --l2stranstest -Er+l -Es+h ---l2stranstest -G/some/file.grd +--l2stranstest -Gfile.grd --l2stranstest -Q --l2stranstest -T0.8 --l2stranstest -Wi -Wo+s @@ -24,7 +24,7 @@ gmt $m $l2s --fields=zslq25q75hw >> $b gmt $m $l2s --center >> $b gmt $m $l2s --extend --extend=boxwhisker >> $b gmt $m $l2s --extend=record+lower --extend=source+higher >> $b -gmt $m $l2s --outgrid=/some/file.grd >> $b +gmt $m $l2s --outgrid=file.grd >> $b gmt $m $l2s --quick >> $b gmt $m $l2s --quantile=0.8 >> $b gmt $m $l2s --weights=in --weights=out+sigma >> $b diff --git a/test/blockmode/blockmode-l2s.sh b/test/blockmode/blockmode-l2s.sh index f24f79883e0..9f679891d8a 100755 --- a/test/blockmode/blockmode-l2s.sh +++ b/test/blockmode/blockmode-l2s.sh @@ -14,7 +14,7 @@ cat << EOF > $a --l2stranstest -C --l2stranstest -D+a -D40+c -D+h -D+l --l2stranstest -E -Er+l -Es+h ---l2stranstest -G/some/file.grd +--l2stranstest -Gfile.grd --l2stranstest -Q --l2stranstest -Wi -Wo+s EOF @@ -25,7 +25,7 @@ gmt $m $l2s --fields=l1_scale,high,weight >> $b gmt $m $l2s --center >> $b gmt $m $l2s --histogram+average --histogram=40+center --histogram+high --histogram+low >> $b gmt $m $l2s --extend --extend=record+lower --extend=source+higher >> $b -gmt $m $l2s --outgrid=/some/file.grd >> $b +gmt $m $l2s --outgrid=file.grd >> $b gmt $m $l2s --quick >> $b gmt $m $l2s --weights=in --weights=out+sigma >> $b diff --git a/test/filter1d/filter1d-l2s.sh b/test/filter1d/filter1d-l2s.sh index c3b65310c45..e012e729561 100755 --- a/test/filter1d/filter1d-l2s.sh +++ b/test/filter1d/filter1d-l2s.sh @@ -21,7 +21,7 @@ cat << EOF > $a --l2stranstest -Fu100 -FU100 --l2stranstest -L15 -N3 -N5 --l2stranstest -Q0.4 -S0.99 ---l2stranstest -T10/100/5+a -T/some/file +--l2stranstest -T10/100/5+a -Tfile --l2stranstest -T5+e -T5+i -T5+n EOF @@ -38,7 +38,7 @@ gmt $m $l2s --filter=minall:100 --filter=minpos:100 >> $b gmt $m $l2s --filter=maxall:100 --filter=maxneg:100 >> $b gmt $m $l2s --gap_width=15 --time_col=3 --time_column=5 >> $b gmt $m $l2s --quality=0.4 --symmetry=0.99 >> $b -gmt $m $l2s --range=10/100/5+array --range=/some/file >> $b +gmt $m $l2s --range=10/100/5+array --range=file >> $b gmt $m $l2s --series=5+exact --series=5+inverse --series=5+number >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/gmt2kml/gmt2kml-l2s.sh b/test/gmt2kml/gmt2kml-l2s.sh index 7d288b36468..644e0028baf 100755 --- a/test/gmt2kml/gmt2kml-l2s.sh +++ b/test/gmt2kml/gmt2kml-l2s.sh @@ -11,8 +11,8 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Aa25 -Ag --l2stranstest -Asx1.5 ---l2stranstest -C/some/file.cpt -C/some/file.cpt ---l2stranstest -D/some/file.dscpt +--l2stranstest -Cfile.cpt -Cfile.cpt +--l2stranstest -Dfile.dscpt --l2stranstest -E+e+s --l2stranstest -Fe -Fs -Ft --l2stranstest -Fl -Fp -Fw @@ -25,7 +25,7 @@ cat << EOF > $a --l2stranstest -O --l2stranstest -Qa23 -Qi10 -Qs0.5 --l2stranstest -Sc2 -Sn3 ---l2stranstest -TmyTitle/some/folder +--l2stranstest -TmyTitlefolder --l2stranstest -W2 -W+c -W+cl -W+cf --l2stranstest -Z+a10/20 -Z+f3/5 --l2stranstest -Z+l2/3 -Z+o+v @@ -34,8 +34,8 @@ EOF # module-specific longopts gmt $m $l2s --altitude_mode=absolute:25 --altitude_mode=relative_surface >> $b gmt $m $l2s --altitude_mode=relative_floor:x1.5 >> $b -gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b -gmt $m $l2s --description=/some/file.dscpt >> $b +gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b +gmt $m $l2s --description=file.dscpt >> $b gmt $m $l2s --line_render+extrude+connect >> $b gmt $m $l2s --feature=event --feature_type=symbol --feature=timespan >> $b gmt $m $l2s --feature=line --feature=polygon --feature=wiggle >> $b @@ -48,7 +48,7 @@ gmt $m $l2s --name=text --feature_name=5 --name="Some %d format string" >> $b gmt $m $l2s --overlay >> $b gmt $m $l2s --wiggle=azimuth:23 --wiggle=fixed:10 --wiggle=scale:0.5 >> $b gmt $m $l2s --scale=icon:2 --scale=label:3 >> $b -gmt $m $l2s --title=myTitle/some/folder >> $b +gmt $m $l2s --title=myTitlefolder >> $b gmt $m $l2s --pen=2 --pen+color --pen+color:l --pen+color:f >> $b gmt $m $l2s --attributes+altitude:10/20 --attrib+fade:3/5 >> $b gmt $m $l2s --attrib+detail:2/3 --attrib+open+invisible >> $b diff --git a/test/gmtconvert/gmtconvert-l2s.sh b/test/gmtconvert/gmtconvert-l2s.sh index 9e6c37862e4..936c596c035 100755 --- a/test/gmtconvert/gmtconvert-l2s.sh +++ b/test/gmtconvert/gmtconvert-l2s.sh @@ -19,10 +19,10 @@ cat << EOF > $a --l2stranstest -Irs --l2stranstest -L -L --l2stranstest -N2+a -N1+d ---l2stranstest -Q2,3:1:6 -Q+f/some/file +--l2stranstest -Q2,3:1:6 -Q+ffile --l2stranstest -Q~3,4:2:12 ---l2stranstest -S"some string+f/this/file+e" ---l2stranstest -S"~some other string+f/your/file" +--l2stranstest -S"some string+fthis/file+e" +--l2stranstest -S"~some other string+fyour/file" --l2stranstest -Thd~3,4:2:12 -Th --l2stranstest -W+n --l2stranstest -Z @@ -39,10 +39,10 @@ gmt $m $l2s --invert=tables,segments,records >> $b gmt $m $l2s --reverse=records,segments >> $b gmt $m $l2s --segment_headers --list_only >> $b gmt $m $l2s --sort=2+ascend --sort=1+descend >> $b -gmt $m $l2s --segments=2,3:1:6 --segments+file:/some/file >> $b +gmt $m $l2s --segments=2,3:1:6 --segments+file:file >> $b gmt $m $l2s --segments=~3,4:2:12 >> $b -gmt $m $l2s --select_header='some string'+file:/this/file+exact >> $b -gmt $m $l2s --select_hdr=~'some other string'+file:/your/file >> $b +gmt $m $l2s --select_header='some string'+file:this/file+exact >> $b +gmt $m $l2s --select_hdr=~'some other string'+file:your/file >> $b gmt $m $l2s --suppress=headers,duplicates:~3,4:2:12 --skip=headers >> $b gmt $m $l2s --word2num+nonans >> $b gmt $m $l2s --transpose >> $b diff --git a/test/gmtget/gmtget-l2s.sh b/test/gmtget/gmtget-l2s.sh index bf043c34149..fe096fb4987 100755 --- a/test/gmtget/gmtget-l2s.sh +++ b/test/gmtget/gmtget-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Ddata=earth -Dcache ---l2stranstest -G/some/gmt.conf +--l2stranstest -Gsome/gmt.conf --l2stranstest -I1m --l2stranstest -L --l2stranstest -N @@ -19,7 +19,7 @@ EOF # module-specific longopts gmt $m $l2s --data=data=earth --dataset=cache >> $b -gmt $m $l2s --gmtconf=/some/gmt.conf >> $b +gmt $m $l2s --gmtconf=some/gmt.conf >> $b gmt $m $l2s --increment=1m >> $b gmt $m $l2s --lines >> $b gmt $m $l2s --no_convert >> $b diff --git a/test/gmtmath/gmtmath-l2s.sh b/test/gmtmath/gmtmath-l2s.sh index 5f254f7b521..ebf7d3d2af2 100755 --- a/test/gmtmath/gmtmath-l2s.sh +++ b/test/gmtmath/gmtmath-l2s.sh @@ -9,8 +9,8 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -A/some/file+e -A/some/file+r ---l2stranstest -A/some/file+s -A/some/file+w +--l2stranstest -Afile+e -Afile+r +--l2stranstest -Afile+s -Afile+w --l2stranstest -C -C1,3-5,7 -Cx -Cy --l2stranstest -C0 -Ca -Cr --l2stranstest -E1e-8 @@ -21,12 +21,12 @@ cat << EOF > $a --l2stranstest -S -Sf -Sl --l2stranstest -T10/20/0.5+b -T10/20/0.5+l --l2stranstest -T10/20/0.5+i -T10/20/0.5+n ---l2stranstest -T/some/file +--l2stranstest -Tfile EOF # module-specific longopts -gmt $m $l2s --init=/some/file+evaluate --matrix=/some/file+no_left >> $b -gmt $m $l2s --init=/some/file+sigma --init=/some/file+weights >> $b +gmt $m $l2s --init=file+evaluate --matrix=file+no_left >> $b +gmt $m $l2s --init=file+sigma --init=file+weights >> $b gmt $m $l2s --columns --columns=1,3-5,7 --columns=x --columns=y >> $b gmt $m $l2s --columns=0 --columns=a --columns=r >> $b gmt $m $l2s --eigen=1e-8 >> $b @@ -37,6 +37,6 @@ gmt $m $l2s --quick=inch --quick=point --quick=none >> $b gmt $m $l2s --output --output=first --output=last >> $b gmt $m $l2s --range=10/20/0.5+log2 --range=10/20/0.5+log10 >> $b gmt $m $l2s --series=10/20/0.5+inverse --series=10/20/0.5+number >> $b -gmt $m $l2s --series=/some/file >> $b +gmt $m $l2s --series=file >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/gmtregress/gmtregress-l2s.sh b/test/gmtregress/gmtregress-l2s.sh index 3eb2e2d74a1..e064cafa97f 100755 --- a/test/gmtregress/gmtregress-l2s.sh +++ b/test/gmtregress/gmtregress-l2s.sh @@ -19,7 +19,7 @@ cat << EOF > $a --l2stranstest -Nr -Nw -Nw --l2stranstest -S -Sr --l2stranstest -T5/100/2+i -T5+n ---l2stranstest -T/some/file +--l2stranstest -Tfile --l2stranstest -Wwxyr --l2stranstest -Wry --l2stranstest -Z+5 -Z-5 @@ -36,7 +36,7 @@ gmt $m $l2s --norm=mean_absolute --norm=mean_squared --norm=lms >> $b gmt $m $l2s --norm=LMS --norm=rms --norm=RMS >> $b gmt $m $l2s --skip_outliers --restrict_outliers=reverse >> $b gmt $m $l2s --range=5/100/2+inverse --range=5+number >> $b -gmt $m $l2s --series=/some/file >> $b +gmt $m $l2s --series=file >> $b gmt $m $l2s --weighted=weights,sigmax,sigmay,correlations >> $b gmt $m $l2s --weighted=correlations,sigmay >> $b gmt $m $l2s --limit=+5 --limit=-5 >> $b diff --git a/test/gmtselect/gmtselect-l2s.sh b/test/gmtselect/gmtselect-l2s.sh index a0e9e9823b2..0af8a744878 100755 --- a/test/gmtselect/gmtselect-l2s.sh +++ b/test/gmtselect/gmtselect-l2s.sh @@ -11,15 +11,15 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A10/1/2+ags+l+p20 --l2stranstest -A100+aiS+r ---l2stranstest -C/some/sortof/file+d6 -C20/10 +--l2stranstest -Csortof/file+d6 -C20/10 --l2stranstest -Df -Dh -Di --l2stranstest -Dl+f -Dc --l2stranstest -Efn ---l2stranstest -F/some/file ---l2stranstest -G/some/mask.grd +--l2stranstest -Ffile +--l2stranstest -Gmask.grd --l2stranstest -Icfglrsz --l2stranstest -Ilc ---l2stranstest -L/some/file+d3+p +--l2stranstest -Lfile+d3+p --l2stranstest -Nk/s/k/s/k -Nk/s --l2stranstest -Z10/20+a+c6 -Z10/20+hk+i EOF @@ -27,15 +27,15 @@ EOF # module-specific longopts gmt $m $l2s --min_area=10/1/2+antarctica:gs+lakes+percent:20 >> $b gmt $m $l2s --area=100+antarctica:iS+river_lakes >> $b -gmt $m $l2s --distance=/some/sortof/file+distance:6 --dist2pt=20/10 >> $b +gmt $m $l2s --distance=sortof/file+distance:6 --dist2pt=20/10 >> $b gmt $m $l2s --resolution=full --resolution=high --resolution=intermediate >> $b gmt $m $l2s --resolution=low+lower --resolution=crude >> $b gmt $m $l2s --boundary=fn >> $b -gmt $m $l2s --polygon=/some/file >> $b -gmt $m $l2s --gridmask=/some/mask.grd >> $b +gmt $m $l2s --polygon=file >> $b +gmt $m $l2s --gridmask=mask.grd >> $b gmt $m $l2s --reverse=circle,polygons,zero,line,rectangle,gridmask,zrange >> $b gmt $m $l2s --invert=line,circle >> $b -gmt $m $l2s --dist2line=/some/file+distance:3+project >> $b +gmt $m $l2s --dist2line=file+distance:3+project >> $b gmt $m $l2s --mask=k/s/k/s/k --maskvalues=k/s >> $b gmt $m $l2s --in_range=10/20+any+column:6 --in_range=10/20+header:k+invert >> $b diff --git a/test/gmtset/gmtset-l2s.sh b/test/gmtset/gmtset-l2s.sh index 9322a13cd82..4d86d80b174 100755 --- a/test/gmtset/gmtset-l2s.sh +++ b/test/gmtset/gmtset-l2s.sh @@ -12,13 +12,13 @@ cat << EOF > $a --l2stranstest -C --l2stranstest -Du -Ds --l2stranstest -Du -Ds ---l2stranstest -G/some/file -G/other/file +--l2stranstest -Gfile -Gother_file EOF # module-specific longopts gmt $m $l2s --convert >> $b gmt $m $l2s --defaults=us --defaults=si >> $b gmt $m $l2s --defaults=US --defaults=SI >> $b -gmt $m $l2s --gmtconf=/some/file --defaultsfile=/other/file >> $b +gmt $m $l2s --gmtconf=file --defaultsfile=other_file >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/gmtspatial/gmtspatial-l2s.sh b/test/gmtspatial/gmtspatial-l2s.sh index 7853fee7040..a068ffb8da5 100755 --- a/test/gmtspatial/gmtspatial-l2s.sh +++ b/test/gmtspatial/gmtspatial-l2s.sh @@ -12,14 +12,14 @@ cat << EOF > $a --l2stranstest -Aa1m -A --l2stranstest -C --l2stranstest -D+a+c0.02+C0.01+d1 ---l2stranstest -D+f/a/file+p+s2 +--l2stranstest -D+fa/file+p+s2 --l2stranstest -E+p -E+p --l2stranstest -E+n -E+n --l2stranstest -Fl --l2stranstest -Ie -Ii --l2stranstest -L2/1e-8/1e-8 ---l2stranstest -N/p/file+a+i+p6 ---l2stranstest -N/p/file+r+z +--l2stranstest -Np/file+a+i+p6 +--l2stranstest -Np/file+r+z --l2stranstest -Qk+c1/2+h+l -Qm+p --l2stranstest -Qm+sa --l2stranstest -Sb2 -Sh -Sh @@ -33,14 +33,14 @@ EOF gmt $m $l2s --nn=min_dist:1m --nearest_neighbor >> $b gmt $m $l2s --clip >> $b gmt $m $l2s --duplicates+amax+cmax:0.02+cmin:0.01+dmax:1 >> $b -gmt $m $l2s --duplicates+file:/a/file+perpendicular+factor:2 >> $b +gmt $m $l2s --duplicates+file:a/file+perpendicular+factor:2 >> $b gmt $m $l2s --handedness+positive --handedness+counterclockwise >> $b gmt $m $l2s --handedness+negative --handedness+clockwise >> $b gmt $m $l2s --force_polygons=lines >> $b gmt $m $l2s --intersections=external --intersections=internal >> $b gmt $m $l2s --no_tile_lines=2/1e-8/1e-8 >> $b -gmt $m $l2s --in_polygons=/p/file+all+individual+start:6 >> $b -gmt $m $l2s --in_polygons=/p/file+report+addcolumn >> $b +gmt $m $l2s --in_polygons=p/file+all+individual+start:6 >> $b +gmt $m $l2s --in_polygons=p/file+report+addcolumn >> $b gmt $m $l2s --centroid=k+range:1/2+header+lines --area=m+close >> $b gmt $m $l2s --length=m+sort:a >> $b gmt $m $l2s --spatial=buffer:2 --spatial=hole --spatial=holes >> $b diff --git a/test/grd2cpt/grd2cpt-l2s.sh b/test/grd2cpt/grd2cpt-l2s.sh index c070c2071ac..ef9747a6838 100755 --- a/test/grd2cpt/grd2cpt-l2s.sh +++ b/test/grd2cpt/grd2cpt-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A50+a ---l2stranstest -C/some/file.cpt -C/some/file.cpt +--l2stranstest -Cfile.cpt -Cfile.cpt --l2stranstest -Di -Do --l2stranstest -E4+c+f --l2stranstest -Fc -Fg -Fh+kD @@ -31,7 +31,7 @@ EOF # module-specific longopts gmt $m $l2s --alpha=50+all >> $b -gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b +gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b gmt $m $l2s --bg=in --background=out >> $b gmt $m $l2s --nlevels=4+cumulative+file >> $b gmt $m $l2s --format=cmyk --color_model=gray --format=hsv+key:D >> $b diff --git a/test/grd2kml/grd2kml-l2s.sh b/test/grd2kml/grd2kml-l2s.sh index 6401a310b3c..fd65e8376c8 100755 --- a/test/grd2kml/grd2kml-l2s.sh +++ b/test/grd2kml/grd2kml-l2s.sh @@ -10,33 +10,33 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Aa100 -Ag -As ---l2stranstest -Csomecpt+h2+uin+s/some/file +--l2stranstest -Csomecpt+h2+uin+sfile --l2stranstest -C+Uin+i5 --l2stranstest -Ehttp://some.place.org/x.html --l2stranstest -Fb -Fc --l2stranstest -Fg -Fm --l2stranstest -H1.5 ---l2stranstest -I/my/illfile -I6+d +--l2stranstest -Imy/illfile -I6+d --l2stranstest -I+a90 -I6+m2+n3 --l2stranstest -L16 -L64 --l2stranstest -S2 -S3 -S4 --l2stranstest -TMyTitle ---l2stranstest -Wthin,red -W/file+s5/0.2 +--l2stranstest -Wthin,red -Wfile+s5/0.2 EOF # module-specific longopts gmt $m $l2s --mode=absolute:100 --mode=ground --mode=seafloor >> $b -gmt $m $l2s --cpt=somecpt+hinge:2+fromunit:in+file:/some/file >> $b +gmt $m $l2s --cpt=somecpt+hinge:2+fromunit:in+file:file >> $b gmt $m $l2s --cmap+tounit:in+zinc:5 >> $b gmt $m $l2s --url=http://some.place.org/x.html >> $b gmt $m $l2s --filter=boxcar --filter=cosarch >> $b gmt $m $l2s --filter=gaussian --filter=median >> $b gmt $m $l2s --subpixel=1.5 >> $b -gmt $m $l2s --illumination=/my/illfile --intensity=6+default >> $b +gmt $m $l2s --illumination=my/illfile --intensity=6+default >> $b gmt $m $l2s --shading+azimuth:90 --shading=6+ambient:2+nargs:3 >> $b gmt $m $l2s --tilesize=16 --tile_size=64 >> $b gmt $m $l2s --extra=2 --extralayers=3 --extra_layers=4 >> $b gmt $m $l2s --title=MyTitle >> $b -gmt $m $l2s --pen=thin,red --contours=/file+scale:5/0.2 >> $b +gmt $m $l2s --pen=thin,red --contours=file+scale:5/0.2 >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/grd2xyz/grd2xyz-l2s.sh b/test/grd2xyz/grd2xyz-l2s.sh index 044747fddb5..e1597406e7e 100755 --- a/test/grd2xyz/grd2xyz-l2s.sh +++ b/test/grd2xyz/grd2xyz-l2s.sh @@ -9,7 +9,7 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -C/some/file.cpt -C/some/file.cpt +--l2stranstest -Cfile.cpt -Cfile.cpt --l2stranstest -Ff -Ff -Fi --l2stranstest -Lc -Lc --l2stranstest -Lr -Lx -Ly @@ -30,7 +30,7 @@ cat << EOF > $a EOF # module-specific longopts -gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b +gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b gmt $m $l2s --rowcol=one --row_col=fortran --rowcol=indexz >> $b gmt $m $l2s --single=col --hvline=column >> $b gmt $m $l2s --array=row --single=x --single=y >> $b diff --git a/test/grdbarb/grdbarb-l2s.sh b/test/grdbarb/grdbarb-l2s.sh index 35fe50497d9..29c531abb0f 100755 --- a/test/grdbarb/grdbarb-l2s.sh +++ b/test/grdbarb/grdbarb-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A ---l2stranstest -C/some/file -C/some/other/file +--l2stranstest -Cfile -Cother/file --l2stranstest -Gred --l2stranstest -I2/3 -Ix4/5 --l2stranstest -N @@ -23,7 +23,7 @@ EOF # module-specific longopts gmt $m $l2s --polar >> $b -gmt $m $l2s --cpt=/some/file --cmap=/some/other/file >> $b +gmt $m $l2s --cpt=file --cmap=other/file >> $b gmt $m $l2s --fill=red >> $b gmt $m $l2s --increment=2/3 --inc=xmult:4/5 >> $b gmt $m $l2s --noclip >> $b diff --git a/test/grdblend/grdblend-l2s.sh b/test/grdblend/grdblend-l2s.sh index f93487cfb91..312e384f109 100755 --- a/test/grdblend/grdblend-l2s.sh +++ b/test/grdblend/grdblend-l2s.sh @@ -11,7 +11,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Cf -Cl+n --l2stranstest -Co -Cu+p ---l2stranstest -G/My/Big/File.grd +--l2stranstest -GMy/Big/File.grd --l2stranstest -I0.1m+e/100+n --l2stranstest -Q -Q --l2stranstest -W -Wz @@ -21,7 +21,7 @@ EOF # module-specific longopts gmt $m $l2s --clobber=first --clobber=low+negative >> $b gmt $m $l2s --clobber=last --clobber=high+positive >> $b -gmt $m $l2s --outgrid=/My/Big/File.grd >> $b +gmt $m $l2s --outgrid=My/Big/File.grd >> $b gmt $m $l2s --increment=0.1m+exact/100+number >> $b gmt $m $l2s --no_header --headless >> $b gmt $m $l2s --no_blend --weights=wzsum >> $b diff --git a/test/grdcontour/grdcontour-l2s.sh b/test/grdcontour/grdcontour-l2s.sh index 48d94a252e4..8bc20563789 100755 --- a/test/grdcontour/grdcontour-l2s.sh +++ b/test/grdcontour/grdcontour-l2s.sh @@ -16,17 +16,17 @@ cat << EOF > $a --l2stranstest -A1+N10/20+o+p0.5p,red --l2stranstest -A1+r20+t/L/file+um --l2stranstest -A1+v+w6+x+=xyz ---l2stranstest -C/some/file.cpt -C20,25,40,45 +--l2stranstest -Cfile.cpt -C20,25,40,45 --l2stranstest -D%6.2f --l2stranstest -Fl -Fr --l2stranstest -Gd2p ---l2stranstest -GD1 -Gf/some/file +--l2stranstest -GD1 -Gffile --l2stranstest -Gn6 -Gl1/2,3/4 --l2stranstest -GL1/2,3/4 --l2stranstest -Gx/x/file -GX/X/file --l2stranstest -L1000/2000 -Ln -LN --l2stranstest -Lp -LP ---l2stranstest -N/some/file.cpt +--l2stranstest -Nfile.cpt --l2stranstest -Q+z -Q20 -Q500m --l2stranstest -S2 -S5 --l2stranstest -Th+a -Tl+d5/10+lLH @@ -43,17 +43,17 @@ gmt $m $l2s --annot=1+opaque:red+nolines+justify:TL+nudge:1/2 >> $b gmt $m $l2s --annot=1+xynudge:10/20+round+outline:0.5p,red >> $b gmt $m $l2s --annot=1+minradius:20+labelfile:/L/file+unit:m >> $b gmt $m $l2s --annot=1+curved+npoints:6+add+prefix:xyz >> $b -gmt $m $l2s --contours=/some/file.cpt --interval=20,25,40,45 >> $b +gmt $m $l2s --contours=file.cpt --interval=20,25,40,45 >> $b gmt $m $l2s --dump='%6.2f' >> $b gmt $m $l2s --force=left --force=right >> $b gmt $m $l2s --label_placement=plotdist:2p >> $b -gmt $m $l2s --labels=mapdist:1 --labels=matchlocs:/some/file >> $b +gmt $m $l2s --labels=mapdist:1 --labels=matchlocs:file >> $b gmt $m $l2s --labels=nlabels:6 --labels=lines:1/2,3/4 >> $b gmt $m $l2s --labels=gcircles:1/2,3/4 >> $b gmt $m $l2s --labels=xlines:/x/file --labels=xgcircles:/X/file >> $b gmt $m $l2s --range=1000/2000 --limit=negative --limit=zeronegative >> $b gmt $m $l2s --limit=positive --limit=zeropositive >> $b -gmt $m $l2s --fill=/some/file.cpt >> $b +gmt $m $l2s --fill=file.cpt >> $b gmt $m $l2s --cut+nozero --minpoints=20 --minlength=500m >> $b gmt $m $l2s --smooth=2 --resample=5 >> $b gmt $m $l2s --ticks=highs+all --ticks=lows+gap:5/10+labels:LH >> $b diff --git a/test/grdconvert/grdconvert-l2s.sh b/test/grdconvert/grdconvert-l2s.sh index 6a040063a9b..bf835a4d9c9 100755 --- a/test/grdconvert/grdconvert-l2s.sh +++ b/test/grdconvert/grdconvert-l2s.sh @@ -11,8 +11,8 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Cb -Cc --l2stranstest -Cn -Cp ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -N --l2stranstest -Z+o3 -Z+s2 EOF @@ -20,8 +20,8 @@ EOF # module-specific longopts gmt $m $l2s --cmdhist=both --command_history=current >> $b gmt $m $l2s --cmdhist=none --command_history=previous >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --no_header >> $b gmt $m $l2s --modify+offset:3 --scale+scale:2 >> $b diff --git a/test/grdcut/grdcut-l2s.sh b/test/grdcut/grdcut-l2s.sh index f6d1925190f..d82a83b7c7d 100755 --- a/test/grdcut/grdcut-l2s.sh +++ b/test/grdcut/grdcut-l2s.sh @@ -12,8 +12,8 @@ cat << EOF > $a --l2stranstest -D+t --l2stranstest -Ex50 -Ey10 --l2stranstest -F+i+c ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -N-999 --l2stranstest -S100/20/5+n --l2stranstest -Z1000/2000+n @@ -25,8 +25,8 @@ EOF gmt $m $l2s --dryrun+trailer >> $b gmt $m $l2s --extract=x:50 --extract=y:10 >> $b gmt $m $l2s --clip+invert+crop >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --extend=-999 >> $b gmt $m $l2s --circ_subregion=100/20/5+set_nan >> $b gmt $m $l2s --zrange=1000/2000+exclude_nan >> $b diff --git a/test/grdedit/grdedit-l2s.sh b/test/grdedit/grdedit-l2s.sh index 7d5d4139d12..9ea7e643d66 100755 --- a/test/grdedit/grdedit-l2s.sh +++ b/test/grdedit/grdedit-l2s.sh @@ -12,8 +12,8 @@ cat << EOF > $a --l2stranstest -A --l2stranstest -Cb -Cc --l2stranstest -Cn -Cp ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gsome/file.grd=nf+d2+n-99 +--l2stranstest -Gother/file.grd=nf+o6+s1.5 --l2stranstest -D+c/some.cpt+dsillydata+n-99 --l2stranstest -D"+c-+o1+rSmart Grid" --l2stranstest -D"+s2+tBest Grid Ever+vmyvar" @@ -23,7 +23,7 @@ cat << EOF > $a --l2stranstest -Et -Ev --l2stranstest -L -L+n --l2stranstest -L+p ---l2stranstest -N/some/table -N/other/file +--l2stranstest -Nsome/table -Nother/file --l2stranstest -S --l2stranstest -T -T EOF @@ -32,18 +32,18 @@ EOF gmt $m $l2s --adjust_inc >> $b gmt $m $l2s --cmdhist=both --command_history=current >> $b gmt $m $l2s --cmdhist=none --command_history=previous >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b -gmt $m $l2s --header+cpt:/some.cpt+dname:sillydata+invalid:-99 >> $b +gmt $m $l2s --outgrid=some/file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --metadata+cpt:/some.cpt+dname:sillydata+invalid:-99 >> $b gmt $m $l2s --metadata+cpt:-+offset:1+remark:'Smart Grid' >> $b -gmt $m $l2s --header+scale:2+title:"Best Grid Ever"+varname:myvar >> $b -gmt $m $l2s --netcdf+xname:Dr.X+yname:Dr.Y+zname:Dr.Z >> $b +gmt $m $l2s --metadata+scale:2+title:"Best Grid Ever"+varname:myvar >> $b +gmt $m $l2s --metadata+xname:Dr.X+yname:Dr.Y+zname:Dr.Z >> $b gmt $m $l2s --transform=hvflip --transform=xyswap --transform=hflip >> $b gmt $m $l2s --transform=rot90ccw --transform=rot90cw >> $b gmt $m $l2s --transform=transpose --transform=vflip >> $b gmt $m $l2s --lonshift_numrange --lonshift_numrange+negative >> $b gmt $m $l2s --lonshift_numrange+positive >> $b -gmt $m $l2s --nodes=/some/table --replace=/other/file >> $b +gmt $m $l2s --nodes=some/table --replace=other/file >> $b gmt $m $l2s --lonshift_region >> $b gmt $m $l2s --toggle_registration --toggle >> $b diff --git a/test/grdfft/grdfft-l2s.sh b/test/grdfft/grdfft-l2s.sh index e329624d9d4..1e1498aeb9b 100755 --- a/test/grdfft/grdfft-l2s.sh +++ b/test/grdfft/grdfft-l2s.sh @@ -15,8 +15,8 @@ cat << EOF > $a --l2stranstest -Er+n --l2stranstest -Ex+wk -Ey --l2stranstest -Fr1/2/3/4 -Fx10/20 -Fy4/8/1 ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I4 -Ig --l2stranstest -N10/20+d -Na+a --l2stranstest -Nf+a+e @@ -34,8 +34,8 @@ gmt $m $l2s --differentiate=5 --dfdz >> $b gmt $m $l2s --power_spectrum=radial+normalize >> $b gmt $m $l2s --power_spectrum=x+wavelength:k --power_spectrum=y >> $b gmt $m $l2s --filter=isotropic:1/2/3/4 --filter=x:10/20 --filter=y:4/8/1 >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --integrate=4 --integrate=gravity >> $b gmt $m $l2s --dimensions=10/20+detrend --inquire=accurate+remove_mean >> $b gmt $m $l2s --dimensions=actual+remove_mean+edge_point >> $b diff --git a/test/grdfill/grdfill-l2s.sh b/test/grdfill/grdfill-l2s.sh index ccac57d458b..ee8caa04360 100755 --- a/test/grdfill/grdfill-l2s.sh +++ b/test/grdfill/grdfill-l2s.sh @@ -11,8 +11,8 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Ac666 -Ag/my/grid.grd --l2stranstest -An3 -As0.8 ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -Lp --l2stranstest -N -N EOF @@ -20,8 +20,8 @@ EOF # module-specific longopts gmt $m $l2s --mode=constant:666 --mode=grid:/my/grid.grd >> $b gmt $m $l2s --mode=neighbor:3 --mode=spline:0.8 >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --list=polygons >> $b gmt $m $l2s --hole_value --hole >> $b diff --git a/test/grdgdal/grdgdal-l2s.sh b/test/grdgdal/grdgdal-l2s.sh index 5a46f83c1b5..8c56729a9e9 100755 --- a/test/grdgdal/grdgdal-l2s.sh +++ b/test/grdgdal/grdgdal-l2s.sh @@ -10,20 +10,20 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Adem+mhillside ---l2stranstest -Acolor-relief+c/some/file.cpt ---l2stranstest -Acolor-relief+c/other/file.cpt ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Acolor-relief+cfile.cpt +--l2stranstest -Acolor-relief+cother_file.cpt +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -F"--welldone --withcheese" --l2stranstest -M+r -M+w -M+r+w EOF # module-specific longopts gmt $m $l2s --gdal_program=dem+method:hillside >> $b -gmt $m $l2s --gdal_program=color-relief+cpt:/some/file.cpt >> $b -gmt $m $l2s --gdal_program=color-relief+cmap:/other/file.cpt >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --gdal_program=color-relief+cpt:file.cpt >> $b +gmt $m $l2s --gdal_program=color-relief+cmap:other_file.cpt >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --gdal_options="--welldone --withcheese" >> $b gmt $m $l2s --gdal_io+read --gdal_io+write --gdal_io+read+write >> $b diff --git a/test/grdgradient/grdgradient-l2s.sh b/test/grdgradient/grdgradient-l2s.sh index 8c2307e1814..55532f5e4fe 100755 --- a/test/grdgradient/grdgradient-l2s.sh +++ b/test/grdgradient/grdgradient-l2s.sh @@ -14,13 +14,13 @@ cat << EOF > $a --l2stranstest -Dna --l2stranstest -Em+a0.8 -Es+d0.3 --l2stranstest -Ep+p0.8+s20 ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -Ne+a0.2+s4 --l2stranstest -Nt+o1 ---l2stranstest -Qc+f/This/file -Qr+f/This/file ---l2stranstest -QR+f/That/file ---l2stranstest -S/a/b/cfile -S/d/e/ffile +--l2stranstest -Qc+fThis/file -Qr+fThis/file +--l2stranstest -QR+fThat/file +--l2stranstest -Sa/b/cfile -Sd/e/ffile EOF # module-specific longopts @@ -29,12 +29,12 @@ gmt $m $l2s --direction=aspect,conventional,add90,report >> $b gmt $m $l2s --find_dir=add90,aspect >> $b gmt $m $l2s --radiance=m+ambient:0.8 --lambert=simple+diffuse:0.3 >> $b gmt $m $l2s --radiance=peucker+specular:0.8+shine:20 >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --normalize=laplace+ambient:0.2+sigma:4 >> $b gmt $m $l2s --norm=cauchy+offset:1 >> $b -gmt $m $l2s --tiles=save+file:/This/file --save_stats=use+file:/This/file >> $b -gmt $m $l2s --tiles=usedelete+file:/That/file >> $b -gmt $m $l2s --slope_file=/a/b/cfile --slopegrid=/d/e/ffile >> $b +gmt $m $l2s --tiles=save+file:This/file --save_stats=use+file:This/file >> $b +gmt $m $l2s --tiles=usedelete+file:That/file >> $b +gmt $m $l2s --slope_file=a/b/cfile --slopegrid=d/e/ffile >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/grdhisteq/grdhisteq-l2s.sh b/test/grdhisteq/grdhisteq-l2s.sh index d0dcc21e39f..c15e69ae132 100755 --- a/test/grdhisteq/grdhisteq-l2s.sh +++ b/test/grdhisteq/grdhisteq-l2s.sh @@ -10,18 +10,18 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -C64 ---l2stranstest -D/some/file ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Dfile +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -N --l2stranstest -Q EOF # module-specific longopts gmt $m $l2s --ncells=64 >> $b -gmt $m $l2s --dump=/some/file >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --dump=file >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --gaussian >> $b gmt $m $l2s --quadratic >> $b diff --git a/test/grdimage/grdimage-l2s.sh b/test/grdimage/grdimage-l2s.sh index 5b62cee6cb1..4ab0bed268b 100755 --- a/test/grdimage/grdimage-l2s.sh +++ b/test/grdimage/grdimage-l2s.sh @@ -9,12 +9,12 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -C/myfile.cpt+h12 -C/myfile.cpt+i10 +--l2stranstest -Cmyfile.cpt+h12 -Cmyfile.cpt+i10 --l2stranstest -Csomefile.cpt+ue -Csomefile.cpt+UM --l2stranstest -D -Dr --l2stranstest -Ei -E300 --l2stranstest -GSkyBlue+b -Ggray+f ---l2stranstest -I/somefile -I+d +--l2stranstest -Isomefile -I+d --l2stranstest -I+a10+m0+nt1 --l2stranstest -M --l2stranstest -N @@ -22,12 +22,12 @@ cat << EOF > $a EOF # module-specific longopts -gmt $m $l2s --cpt=/myfile.cpt+hinge:12 --cpt=/myfile.cpt+zinc:10 >> $b +gmt $m $l2s --cpt=myfile.cpt+hinge:12 --cpt=myfile.cpt+zinc:10 >> $b gmt $m $l2s --cpt=somefile.cpt+fromunit:e --cpt=somefile.cpt+tounit:M >> $b gmt $m $l2s --inimage --inimage=region >> $b gmt $m $l2s --dpi=psdeviceres --dpi=300 >> $b gmt $m $l2s --bitcolor=SkyBlue+background --bitcolor=gray+foreground >> $b -gmt $m $l2s --intensity=/somefile --intensity+default >> $b +gmt $m $l2s --intensity=somefile --intensity+default >> $b gmt $m $l2s --intensity+azimuth:10+ambient:0+intensity:t1 >> $b gmt $m $l2s --monochrome >> $b gmt $m $l2s --noclip >> $b diff --git a/test/grdinterpolate/grdinterpolate-l2s.sh b/test/grdinterpolate/grdinterpolate-l2s.sh index 000a14acf27..7d8db7f30e0 100755 --- a/test/grdinterpolate/grdinterpolate-l2s.sh +++ b/test/grdinterpolate/grdinterpolate-l2s.sh @@ -9,7 +9,7 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -G/some/file.grd +--l2stranstest -Gfile.grd --l2stranstest -D+xsomexnm[km]+ysomeynm[cm]+zsomeznm[nm]+dsomednm[km] --l2stranstest -D+c-+s2+o100+n-999 --l2stranstest -D"+tTitle+rThis is a remark+vsomevar" @@ -18,12 +18,12 @@ cat << EOF > $a --l2stranstest -Fl -Fa+d1 --l2stranstest -Fc -Fn+d2 --l2stranstest -S2/3+hsomehdr ---l2stranstest -T100/200/10+i -T10+n -T/some/file +--l2stranstest -T100/200/10+i -T10+n -Tfile --l2stranstest -Z -Z100/200/10+i -Z10+n EOF # module-specific longopts -gmt $m $l2s --outgrid=/some/file.grd >> $b +gmt $m $l2s --outgrid=file.grd >> $b gmt $m $l2s --netcdf+xname:somexnm[km]+yname:someynm[cm]+zname:someznm[nm]+dname:somednm[km] >> $b gmt $m $l2s --netCDF+cpt:-+scale:2+offset:100+invalid:-999 >> $b gmt $m $l2s --ncheader+title:Title+remark:'This is a remark'+varname:somevar >> $b @@ -32,7 +32,7 @@ gmt $m $l2s --crosssection=1/2/3/4,5/6/7/8+origin:6+parallel+radius:7+rhumb >> $ gmt $m $l2s --interptype=linear --interptype=akima+derivative:1 >> $b gmt $m $l2s --interptype=cubic --interptype=none+derivative:2 >> $b gmt $m $l2s --pointseries=2/3+header:somehdr >> $b -gmt $m $l2s --inc=100/200/10+inverse --inc=10+numcoords --range=/some/file >> $b +gmt $m $l2s --inc=100/200/10+inverse --inc=10+numcoords --range=file >> $b gmt $m $l2s --levels --levels=100/200/10+inverse --levels=10+numcoords >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/grdlandmask/grdlandmask-l2s.sh b/test/grdlandmask/grdlandmask-l2s.sh index f3ef82d1567..3c57db2f774 100755 --- a/test/grdlandmask/grdlandmask-l2s.sh +++ b/test/grdlandmask/grdlandmask-l2s.sh @@ -16,8 +16,8 @@ cat << EOF > $a --l2stranstest -Di -Dl --l2stranstest -Dc -Da --l2stranstest -E1/2/3/4 -E6 ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10+n --l2stranstest -N1/0/1/0/1 EOF @@ -30,8 +30,8 @@ gmt $m $l2s --resolution=full+lower --resolution=high >> $b gmt $m $l2s --resolution=intermediate --resolution=low >> $b gmt $m $l2s --resolution=crude --resolution=auto >> $b gmt $m $l2s --bordervalues=1/2/3/4 --border=6 >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10+number >> $b gmt $m $l2s --maskvalues=1/0/1/0/1 >> $b diff --git a/test/grdmask/grdmask-l2s.sh b/test/grdmask/grdmask-l2s.sh index 2be1412192f..acc4f33b830 100755 --- a/test/grdmask/grdmask-l2s.sh +++ b/test/grdmask/grdmask-l2s.sh @@ -12,8 +12,8 @@ cat << EOF > $a --l2stranstest -Am -Ap --l2stranstest -Ax -Ay --l2stranstest -Cf -Cl -Co -Cu ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10+n --l2stranstest -Nz1/2/NaN -NZ3/4/5 --l2stranstest -Np5 -NP100 @@ -24,8 +24,8 @@ EOF gmt $m $l2s --straightlines=meridian --steps=parallel >> $b gmt $m $l2s --straightlines=x --straightlines=y >> $b gmt $m $l2s --clobber=first --clobber=low --clobber=last --clobber=high >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10+number >> $b gmt $m $l2s --out_edge_in=zin:1/2/NaN --out_edge_in=zinedge:3/4/5 >> $b gmt $m $l2s --out_edge_in=id:5 --out_edge_in=idedge:100 >> $b diff --git a/test/grdmath/grdmath-l2s.sh b/test/grdmath/grdmath-l2s.sh index 0f6c1ca8118..6c8bafa9128 100755 --- a/test/grdmath/grdmath-l2s.sh +++ b/test/grdmath/grdmath-l2s.sh @@ -12,7 +12,7 @@ cat << EOF > $a --l2stranstest -A1000/2/4+ag+l --l2stranstest -A100+ai+p75 --l2stranstest -A75+r ---l2stranstest -C/some/file.cpt -C/another/file.cpt +--l2stranstest -Cfile.cpt -Canother_file.cpt --l2stranstest -Df+f -Dh --l2stranstest -Di -Dl --l2stranstest -Dc -Da @@ -26,7 +26,7 @@ EOF gmt $m $l2s --min_area=1000/2/4+antarctica:g+regular_lakes >> $b gmt $m $l2s --area=100+antarctica:i+min_polygon:75 >> $b gmt $m $l2s --area_thresh=75+river_lakes >> $b -gmt $m $l2s --cpt=/some/file.cpt --cmap=/another/file.cpt >> $b +gmt $m $l2s --cpt=file.cpt --cmap=another_file.cpt >> $b gmt $m $l2s --resolution=full+lower --resolution=high >> $b gmt $m $l2s --resolution=intermediate --resolution=low >> $b gmt $m $l2s --resolution=crude --resolution=auto >> $b diff --git a/test/grdmix/grdmix-l2s.sh b/test/grdmix/grdmix-l2s.sh index 77cdcfba22b..cb084e10a2f 100755 --- a/test/grdmix/grdmix-l2s.sh +++ b/test/grdmix/grdmix-l2s.sh @@ -12,8 +12,8 @@ cat << EOF > $a --l2stranstest -A --l2stranstest -C --l2stranstest -D ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I --l2stranstest -M --l2stranstest -Ni2 -No @@ -25,8 +25,8 @@ EOF gmt $m $l2s --alpha >> $b gmt $m $l2s --construct >> $b gmt $m $l2s --deconstruct >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --intensity >> $b gmt $m $l2s --monochrome >> $b gmt $m $l2s --normalize=in:2 --normalize=out >> $b diff --git a/test/grdpaste/grdpaste-l2s.sh b/test/grdpaste/grdpaste-l2s.sh index c19425840d8..c342109d489 100755 --- a/test/grdpaste/grdpaste-l2s.sh +++ b/test/grdpaste/grdpaste-l2s.sh @@ -9,14 +9,14 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -S EOF # module-specific longopts -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --info >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/grdproject/grdproject-l2s.sh b/test/grdproject/grdproject-l2s.sh index 82d6e8ec06a..3c3938be4eb 100755 --- a/test/grdproject/grdproject-l2s.sh +++ b/test/grdproject/grdproject-l2s.sh @@ -16,8 +16,8 @@ cat << EOF > $a --l2stranstest -Fc -Fi -Fp --l2stranstest -Fe -Ff -Fk --l2stranstest -FM -Fn -Fu ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I --l2stranstest -Mc -Mi -Mp EOF @@ -30,8 +30,8 @@ gmt $m $l2s --dpi=300 >> $b gmt $m $l2s --one2one_scale=c --one2one=i --one2one=p >> $b gmt $m $l2s --one2one=e --one2one=f --one2one=k >> $b gmt $m $l2s --one2one=M --one2one=n --one2one=u >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --inverse >> $b gmt $m $l2s --projected_unit=c --unit=i --unit=p >> $b diff --git a/test/grdsample/grdsample-l2s.sh b/test/grdsample/grdsample-l2s.sh index 87586bc3e47..bcaad2d8373 100755 --- a/test/grdsample/grdsample-l2s.sh +++ b/test/grdsample/grdsample-l2s.sh @@ -9,16 +9,16 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I12.5+e/10+n --l2stranstest -I12.5+e -I12+n/10.2+e --l2stranstest -T -T EOF # module-specific longopts -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=12.5+exact/10+number >> $b gmt $m $l2s --inc=12.5+exact --spacing=12+number/10.2+exact >> $b gmt $m $l2s --toggle_registration --toggle >> $b diff --git a/test/grdselect/grdselect-l2s.sh b/test/grdselect/grdselect-l2s.sh index 142ff82d1b7..fdcaffd531a 100755 --- a/test/grdselect/grdselect-l2s.sh +++ b/test/grdselect/grdselect-l2s.sh @@ -10,14 +10,14 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Ai+il -Au+ih ---l2stranstest -C/some/file +--l2stranstest -Cfile --l2stranstest -D12 -D10/2 --l2stranstest -Eb ---l2stranstest -F/my/file+i -F/your/file+o +--l2stranstest -Fmy/file+i -Fyour/file+o --l2stranstest -G --l2stranstest -ICDFLNRWZr --l2stranstest -ILC ---l2stranstest -L/which/file +--l2stranstest -Lwhich/file --l2stranstest -M --l2stranstest -Nl10 -Nh100 --l2stranstest -W100/250 @@ -26,14 +26,14 @@ EOF # module-specific longopts gmt $m $l2s --area=intersection+increment:l --area=union+inc:h >> $b -gmt $m $l2s --pointfile=/some/file >> $b +gmt $m $l2s --pointfile=file >> $b gmt $m $l2s --increment=12 --inc=10/2 >> $b gmt $m $l2s --tabs=polygon >> $b -gmt $m $l2s --polygonfile=/my/file+in --polygonfile=/your/file+out >> $b +gmt $m $l2s --polygonfile=my/file+in --polygonfile=your/file+out >> $b gmt $m $l2s --force_remote >> $b gmt $m $l2s --invert=points,increment,polygons,lines,nans,region,range,zrange,registration >> $b gmt $m $l2s --reverse=lines,points >> $b -gmt $m $l2s --linefile=/which/file >> $b +gmt $m $l2s --linefile=which/file >> $b gmt $m $l2s --margins >> $b gmt $m $l2s --nans=lower:10 --nans=higher:100 >> $b gmt $m $l2s --range=100/250 >> $b diff --git a/test/grdtrack/grdtrack-l2s.sh b/test/grdtrack/grdtrack-l2s.sh index 261cbd68c57..05a078db13a 100755 --- a/test/grdtrack/grdtrack-l2s.sh +++ b/test/grdtrack/grdtrack-l2s.sh @@ -14,12 +14,12 @@ cat << EOF > $a --l2stranstest -C27/3+a -C27/3/1.5+v --l2stranstest -C30/5+d -C30/5/2+f12 --l2stranstest -C30/5+l -C30/5+r ---l2stranstest -DMyFile -D/some/other/file +--l2stranstest -DMyFile -Dsome_other/file --l2stranstest -E25/10+a-7+c -ELB+d --l2stranstest -ECM+g+i0.5 -ERT,LB+l4 --l2stranstest -E3/2+n5000+o6 -ERT+r3.5 --l2stranstest -F+b+n -F+r+z12 ---l2stranstest -G/My/Big/File.grd -G+lsomeListfile.txt +--l2stranstest -GMy/Big/File.grd -G+lsomeListfile.txt --l2stranstest -N --l2stranstest -Sa+a -Sm+d -Sp --l2stranstest -Sl+r -SL+ssavefile @@ -34,12 +34,12 @@ gmt $m $l2s --resample=equidistant+rhumb --resample=exactfit >> $b gmt $m $l2s --crossprofile=27/3+alternate --crossprofile=27/3/1.5+wesn >> $b gmt $m $l2s --crossprofile=30/5+deviant --crossprofile=30/5/2+fixed:12 >> $b gmt $m $l2s --crossprofile=30/5+left --crossprofile=30/5+right >> $b -gmt $m $l2s --linefile=MyFile --dfile=/some/other/file >> $b +gmt $m $l2s --linefile=MyFile --dfile=some_other/file >> $b gmt $m $l2s --profile=25/10+azimuth:-7+connect --profile=LB+distance >> $b gmt $m $l2s --profile=CM+degrees+incr:0.5 --profile=RT,LB+length:4 >> $b gmt $m $l2s --profile=3/2+npoints:5000+origin:6 --profile=RT+radius:3.5 >> $b gmt $m $l2s --critical+balance+negative --critical+rms+zvalue:12 >> $b -gmt $m $l2s --outgrid=/My/Big/File.grd --outgrid+list:someListfile.txt >> $b +gmt $m $l2s --outgrid=My/Big/File.grd --outgrid+list:someListfile.txt >> $b gmt $m $l2s --noskip >> $b gmt $m $l2s --stack=average+values --stack=median+deviations --stack=mode >> $b gmt $m $l2s --stack=lower+residuals --stack=lowerpos+save:savefile >> $b diff --git a/test/grdtrend/grdtrend-l2s.sh b/test/grdtrend/grdtrend-l2s.sh index 7859ddf8d3d..9adfc7da8d1 100755 --- a/test/grdtrend/grdtrend-l2s.sh +++ b/test/grdtrend/grdtrend-l2s.sh @@ -9,16 +9,16 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -D/no/diff.nc +--l2stranstest -Dno/diff.nc --l2stranstest -N3+r -N2+x -N2+y ---l2stranstest -T/new/trend.nc ---l2stranstest -W/too/many/weights.nc+s +--l2stranstest -Tnew/trend.nc +--l2stranstest -Wtoo/many/weights.nc+s EOF # module-specific longopts -gmt $m $l2s --diff=/no/diff.nc >> $b +gmt $m $l2s --diff=no/diff.nc >> $b gmt $m $l2s --model=3+robust --model=2+x --model=2+y >> $b -gmt $m $l2s --trend=/new/trend.nc >> $b -gmt $m $l2s --weights=/too/many/weights.nc+sigma >> $b +gmt $m $l2s --trend=new/trend.nc >> $b +gmt $m $l2s --weights=too/many/weights.nc+sigma >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/grdvector/grdvector-l2s.sh b/test/grdvector/grdvector-l2s.sh index 9f1c172d38f..e0896e45d05 100755 --- a/test/grdvector/grdvector-l2s.sh +++ b/test/grdvector/grdvector-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A ---l2stranstest -C/some/file.cpt -C/some/file.cpt +--l2stranstest -Cfile.cpt -Cfile.cpt --l2stranstest -Gblue --l2stranstest -I20/30 -Ix3/4 -I4/5 --l2stranstest -N @@ -27,7 +27,7 @@ EOF # module-specific longopts gmt $m $l2s --polar >> $b -gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b +gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b gmt $m $l2s --fill=blue >> $b gmt $m $l2s --increment=20/30 --inc=multiples:3/4 --spacing=4/5 >> $b gmt $m $l2s --noclip >> $b diff --git a/test/grdview/grdview-l2s.sh b/test/grdview/grdview-l2s.sh index b86c68ab29a..508362b0250 100755 --- a/test/grdview/grdview-l2s.sh +++ b/test/grdview/grdview-l2s.sh @@ -9,9 +9,9 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -C/some/file.cpt -C/some/file.cpt ---l2stranstest -G/this/file.grd -G/that/file.grd ---l2stranstest -I/lighting/file+a +--l2stranstest -Cfile.cpt -Cfile.cpt +--l2stranstest -Gthis/file.grd -Gthat/file.grd +--l2stranstest -Ilighting/file+a --l2stranstest -I+d -I6+m6+nsome.args --l2stranstest -N200+ggreen --l2stranstest -Qm+m -Qmx+m @@ -21,9 +21,9 @@ cat << EOF > $a EOF # module-specific longopts -gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b -gmt $m $l2s --drapegrid=/this/file.grd --drape=/that/file.grd >> $b -gmt $m $l2s --illumination=/lighting/file+azimuth >> $b +gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b +gmt $m $l2s --drapegrid=this/file.grd --drape=that/file.grd >> $b +gmt $m $l2s --illumination=lighting/file+azimuth >> $b gmt $m $l2s --shading+default --intensity=6+ambient:6+args:some.args >> $b gmt $m $l2s --plane=200+color:green >> $b gmt $m $l2s --plottype=m+monochrome --surftype=mx+mono >> $b diff --git a/test/greenspline/greenspline-l2s.sh b/test/greenspline/greenspline-l2s.sh index 4dcb60ffc10..2db009b0616 100755 --- a/test/greenspline/greenspline-l2s.sh +++ b/test/greenspline/greenspline-l2s.sh @@ -9,47 +9,47 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -A/some/file+f0 ---l2stranstest -Cn10+c+f/some/file +--l2stranstest -Afile+f0 +--l2stranstest -Cn10+c+ffile --l2stranstest -Cr6+i --l2stranstest -Cv0.5+n ---l2stranstest -D+cmycpt -D+cmycpt +--l2stranstest -D+cmycpt --l2stranstest -D+dbaddata+n-999+o5 --l2stranstest -D"+rsilly comment+s2+tBig News" --l2stranstest -D+vDataset+xMrX+yMsY+zZeebo ---l2stranstest -E/some/file+r/report/file ---l2stranstest -G/some/file.grd +--l2stranstest -Efile+rreport/file +--l2stranstest -Gfile.grd --l2stranstest -I4 -I2/3 -I1/2/3 --l2stranstest -L -Lt -Lr ---l2stranstest -N/node/file +--l2stranstest -Nnode/file --l2stranstest -Q -Q12 -Q4/5/6 --l2stranstest -Sc -Sl+e0.1 --l2stranstest -Sp -Sq200+n20 --l2stranstest -Sr200/10 -St500/3 ---l2stranstest -T/this/mask.grd -T/that/mask.grd +--l2stranstest -Tthis/mask.grd -Tthat/mask.grd --l2stranstest -W -Ww --l2stranstest -Z3 -Z5 EOF # module-specific longopts -gmt $m $l2s --gradient=/some/file+format:0 >> $b -gmt $m $l2s --approx_fit=largest:10+cumulative+file:/some/file >> $b +gmt $m $l2s --gradient=file+format:0 >> $b +gmt $m $l2s --approx_fit=largest:10+cumulative+file:file >> $b gmt $m $l2s --approx_fit=ratio:6+incremental >> $b gmt $m $l2s --approximate=variance:0.5+no_surface >> $b -gmt $m $l2s --metadata+cpt:mycpt --ncdata+cmap:mycpt >> $b +gmt $m $l2s --metadata+cpt:mycpt >> $b gmt $m $l2s --metadata+dname:baddata+invalid:-999+offset:5 >> $b gmt $m $l2s --metadata+remark:'silly comment'+scale:2+title:'Big News' >> $b gmt $m $l2s --metadata+varname:Dataset+xname:MrX+yname:MsY+zname:Zeebo >> $b -gmt $m $l2s --misfit=/some/file+report:/report/file >> $b -gmt $m $l2s --outgrid=/some/file.grd >> $b +gmt $m $l2s --misfit=file+report:report/file >> $b +gmt $m $l2s --outgrid=file.grd >> $b gmt $m $l2s --inc=4 --increment=2/3 --spacing=1/2/3 >> $b gmt $m $l2s --leave_trend --detrend=leastsquares --detrend=residuals >> $b -gmt $m $l2s --nodes=/node/file >> $b +gmt $m $l2s --nodes=node/file >> $b gmt $m $l2s --derivative --dir_derivative=12 --vector=4/5/6 >> $b gmt $m $l2s --splines=min_scurvature --splines=linear+error:0.1 >> $b gmt $m $l2s --splines=min_pcurvature --splines=ctensionA:200+npoints:20 >> $b gmt $m $l2s --splines=rtension:200/10 --splines=ctensionB:500/3 >> $b -gmt $m $l2s --maskgrid=/this/mask.grd --mask=/that/mask.grd >> $b +gmt $m $l2s --maskgrid=this/mask.grd --mask=that/mask.grd >> $b gmt $m $l2s --uncertainties --uncertainties=weights >> $b gmt $m $l2s --distmode=3 --mode=5 >> $b diff --git a/test/makecpt/makecpt-l2s.sh b/test/makecpt/makecpt-l2s.sh index cabf40a820a..7b60354b293 100755 --- a/test/makecpt/makecpt-l2s.sh +++ b/test/makecpt/makecpt-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A50+a ---l2stranstest -C/some/file.cpt -C/some/file.cpt +--l2stranstest -Cfile.cpt -Cfile.cpt --l2stranstest -Di -Do --l2stranstest -E4 --l2stranstest -Fc -Fg -Fh+kD @@ -32,7 +32,7 @@ EOF # module-specific longopts gmt $m $l2s --alpha=50+all >> $b -gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b +gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b gmt $m $l2s --bg=in --background=out >> $b gmt $m $l2s --nlevels=4 >> $b gmt $m $l2s --format=cmyk --color_model=gray --format=hsv+key:D >> $b diff --git a/test/movie/movie-l2s.sh b/test/movie/movie-l2s.sh index d7b720ea851..74542eeab56 100755 --- a/test/movie/movie-l2s.sh +++ b/test/movie/movie-l2s.sh @@ -12,10 +12,10 @@ cat << EOF > $a --l2stranstest -C4320p --l2stranstest -Nstarwars --l2stranstest -T25 -T0/100/5+n ---l2stranstest -T/my/timefile+p4 -T250+s100 +--l2stranstest -Tmy/timefile+p4 -T250+s100 --l2stranstest -T"10+w :;-" --l2stranstest -T10+W ---l2stranstest -A/some/audio/file.mp3+e +--l2stranstest -Asome/audio/file.mp3+e --l2stranstest -D32 --l2stranstest -Esomescript+d8s+f3s+ggreen --l2stranstest -Esomescript+fi6+fo4s @@ -23,7 +23,7 @@ cat << EOF > $a --l2stranstest -Fwebm+s5 -Fpng+t+v --l2stranstest -G25/125/77+p2p --l2stranstest -H3 ---l2stranstest -I/include/file.txt +--l2stranstest -Iinclude/file.txt --l2stranstest -K+fi4+gwhite+pi -K+fo8s+po --l2stranstest -Le+s0.5+c1p/2p+ggreen+p2p --l2stranstest -LsSomeString+fhelvetica+gred+hgray @@ -35,7 +35,7 @@ cat << EOF > $a --l2stranstest -Pf+jTR+o2/1+s2 -Pe+t%s+w3 --l2stranstest -Q -Qs --l2stranstest -Sbbgscript.sh -Sffgscript.sh ---l2stranstest -W/some/directory +--l2stranstest -Wsome/directory --l2stranstest -Z -Zs EOF @@ -43,10 +43,10 @@ EOF gmt $m $l2s --canvas=4320p >> $b gmt $m $l2s --name=starwars >> $b gmt $m $l2s --frames=25 --frames=0/100/5+nframes >> $b -gmt $m $l2s --frames=/my/timefile+tagwidth:4 --frames=250+first:100 >> $b +gmt $m $l2s --frames=my/timefile+tagwidth:4 --frames=250+first:100 >> $b gmt $m $l2s --frames=10+wordsepall:' :;-' >> $b gmt $m $l2s --frames=10+wordseptab >> $b -gmt $m $l2s --audio=/some/audio/file.mp3+exact >> $b +gmt $m $l2s --audio=some/audio/file.mp3+exact >> $b gmt $m $l2s --displayrate=32 >> $b gmt $m $l2s --title=somescript+duration:8s+fadetime:3s+fadecolor:green >> $b gmt $m $l2s --title=somescript+fadetime:i6+fadetime:o4s >> $b @@ -54,7 +54,7 @@ gmt $m $l2s --format=gif+loop:7 --format=mp4+encode:someopts >> $b gmt $m $l2s --format=webm+stride:5 --format=png+transparent+view >> $b gmt $m $l2s --fill=25/125/77+pen:2p >> $b gmt $m $l2s --subpixel=3 >> $b -gmt $m $l2s --include=/include/file.txt >> $b +gmt $m $l2s --include=include/file.txt >> $b gmt $m $l2s --fade+length:i4+color:white+preserve:i --fade+length:o8s+preserve:o >> $b gmt $m $l2s --label=e+scale:0.5+clearance:1p/2p+fill:green+pen:2p >> $b gmt $m $l2s --label=sSomeString+font:helvetica+fill:red+shade:gray >> $b @@ -67,7 +67,7 @@ gmt $m $l2s --progress=arrow+mfill:red+sfill:green --progress=line+mpen:2p+spen: gmt $m $l2s --progress=axis+justify:TR+offset:2/1+scale:2 --progress=gauge+format:'%s'+width:3 >> $b gmt $m $l2s --debug --debug=scripts >> $b gmt $m $l2s --static=bg:bgscript.sh --static=fg:fgscript.sh >> $b -gmt $m $l2s --workdir=/some/directory >> $b +gmt $m $l2s --workdir=some/directory >> $b gmt $m $l2s --delete --delete=scripts >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/psbarb/psbarb-l2s.sh b/test/psbarb/psbarb-l2s.sh index 40218967d2b..0f87757a86c 100755 --- a/test/psbarb/psbarb-l2s.sh +++ b/test/psbarb/psbarb-l2s.sh @@ -9,7 +9,7 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -C/some/file -C/some/other/file +--l2stranstest -Cfile -Cother/file --l2stranstest -D1/2/3 --l2stranstest -Gred --l2stranstest -I0.5 -I0.8 @@ -22,7 +22,7 @@ cat << EOF > $a EOF # module-specific longopts -gmt $m $l2s --cpt=/some/file --cmap=/some/other/file >> $b +gmt $m $l2s --cpt=file --cmap=other/file >> $b gmt $m $l2s --offset=1/2/3 >> $b gmt $m $l2s --fill=red >> $b gmt $m $l2s --intensity=0.5 --illumination=0.8 >> $b diff --git a/test/psbasemap/psbasemap-l2s.sh b/test/psbasemap/psbasemap-l2s.sh index bcbec5d923e..5c6bf29623b 100755 --- a/test/psbasemap/psbasemap-l2s.sh +++ b/test/psbasemap/psbasemap-l2s.sh @@ -12,7 +12,7 @@ cat << EOF > $a --l2stranstest -A --l2stranstest -D10/20/2/3+r+ui --l2stranstest -Dg1/-0.5+w7 ---l2stranstest -DjBR+jLT+s/some/file +--l2stranstest -DjBR+jLT+sfile --l2stranstest -DJBR+o1/2+t --l2stranstest -Dn0/0 -Dx5/5 --l2stranstest -Fd+c0.1/0.2+gOldLace @@ -30,7 +30,7 @@ EOF gmt $m $l2s --polygon >> $b gmt $m $l2s --inset=10/20/2/3+corners+units:i >> $b gmt $m $l2s --inset_box=mapcoords:1/-0.5+width:7 >> $b -gmt $m $l2s --inset=inside:BR+janchor:LT+outfile:/some/file >> $b +gmt $m $l2s --inset=inside:BR+janchor:LT+outfile:file >> $b gmt $m $l2s --inset=outside:BR+offset:1/2+translate >> $b gmt $m $l2s --inset=boxcoords:0/0 --inset=plotcoords:5/5 >> $b gmt $m $l2s --box=inset+clearance:0.1/0.2+fill:OldLace >> $b diff --git a/test/pscontour/pscontour-l2s.sh b/test/pscontour/pscontour-l2s.sh index a514db73fbb..4570caed8dc 100755 --- a/test/pscontour/pscontour-l2s.sh +++ b/test/pscontour/pscontour-l2s.sh @@ -12,15 +12,15 @@ cat << EOF > $a --l2stranstest -An -A1+an+c1/2+d --l2stranstest -A5+e+fHelvetica+gred+i --l2stranstest -A2+jRT+n0.1/0.2+o ---l2stranstest -A1+p1p,blue+r2+t/some/file +--l2stranstest -A1+p1p,blue+r2+tfile --l2stranstest -A2+uz+v+w3 --l2stranstest -A3+xf,l+=MeFirst ---l2stranstest -C/some/nice.cpt -C/contour/file +--l2stranstest -Cnice.cpt -Ccontour/file --l2stranstest -C100 --l2stranstest -D ---l2stranstest -E/index/file+b +--l2stranstest -Eindex/file+b --l2stranstest -Gd5 -GD50 ---l2stranstest -Gf/some/file -GlLB +--l2stranstest -Gffile -GlLB --l2stranstest -GLRT --l2stranstest -Gn20 -GN10 --l2stranstest -Gx/this/sfile -GX/that/cfile @@ -37,15 +37,15 @@ EOF gmt $m $l2s --annotation=none --annot=1+angle:n+clearance:1/2+debug >> $b gmt $m $l2s --annot=5+delay+font:Helvetica+fill:red+nolines >> $b gmt $m $l2s --annot=2+justify:RT+nudge:0.1/0.2+rounded >> $b -gmt $m $l2s --annot=1+pen:1p,blue+minradius:2+labelfile:/some/file >> $b +gmt $m $l2s --annot=1+pen:1p,blue+minradius:2+labelfile:file >> $b gmt $m $l2s --annot=2+unit:z+curved+npoints:3 >> $b gmt $m $l2s --annot=3+firstlast:f,l+prefix:MeFirst >> $b -gmt $m $l2s --contours=/some/nice.cpt --levels=/contour/file >> $b +gmt $m $l2s --contours=nice.cpt --levels=contour/file >> $b gmt $m $l2s --contours=100 >> $b gmt $m $l2s --dump >> $b -gmt $m $l2s --index=/index/file+binary >> $b +gmt $m $l2s --index=index/file+binary >> $b gmt $m $l2s --labels=plotdist:5 --label_placement=mapdist:50 >> $b -gmt $m $l2s --labels=locfile:/some/file --labels=segments:LB >> $b +gmt $m $l2s --labels=locfile:file --labels=segments:LB >> $b gmt $m $l2s --labels=circles:RT >> $b gmt $m $l2s --labels=nlabels:20 --labels=linestart:10 >> $b gmt $m $l2s --labels=segmentfile:/this/sfile --labels=circlefile:/that/cfile >> $b diff --git a/test/psconvert/psconvert-l2s.sh b/test/psconvert/psconvert-l2s.sh index 9f033c4cbdb..c062b1d16d3 100755 --- a/test/psconvert/psconvert-l2s.sh +++ b/test/psconvert/psconvert-l2s.sh @@ -11,13 +11,13 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A+r -A+u --l2stranstest -Cspooky ---l2stranstest -D/this/dir -D/that/dir +--l2stranstest -Dthis/dir -Dthat/dir --l2stranstest -E1000 --l2stranstest -Fshortname -Flongname -Fprefix ---l2stranstest -G/a/bc -G/d/e/f +--l2stranstest -Ga/bc -Gd/e/f --l2stranstest -H3 --l2stranstest -I+m1/2/3/4+sm400+S10 ---l2stranstest -L/my/psfilelist -L/your/psfilelist +--l2stranstest -Lmy/psfilelist -Lyour/psfilelist --l2stranstest -Mbbg.ps -Mbbg.ps --l2stranstest -Mffg.ps -Mffg.ps --l2stranstest -N+f50+ggreen+kblue @@ -37,13 +37,13 @@ EOF # module-specific longopts gmt $m $l2s --adjust+round --crop+no_timestamp >> $b gmt $m $l2s --gs_option=spooky >> $b -gmt $m $l2s --outdir=/this/dir --out_dir=/that/dir >> $b +gmt $m $l2s --outdir=this/dir --out_dir=that/dir >> $b gmt $m $l2s --dpi=1000 >> $b gmt $m $l2s --outfile=shortname --out_name=longname --prefix=prefix >> $b -gmt $m $l2s --gs_path=/a/bc --ghost_path=/d/e/f >> $b +gmt $m $l2s --gs_path=a/bc --ghost_path=d/e/f >> $b gmt $m $l2s --scale=3 >> $b gmt $m $l2s --resize+margins:1/2/3/4+size:m400+scale:10 >> $b -gmt $m $l2s --listfile=/my/psfilelist --list_file=/your/psfilelist >> $b +gmt $m $l2s --listfile=my/psfilelist --list_file=your/psfilelist >> $b gmt $m $l2s --pslayer=bg:bg.ps --pslayer=background:bg.ps >> $b gmt $m $l2s --pslayer=fg:fg.ps --pslayer=foreground:fg.ps >> $b gmt $m $l2s --bgcolor+fade:50+bg:green+fadecolor:blue >> $b @@ -56,7 +56,7 @@ gmt $m $l2s --format=pdf --format=multipdf --format=jpeg --format=png >> $b gmt $m $l2s --format=transpng --format=ppm --format=tiff+monochrome >> $b gmt $m $l2s --world_file+altitude:G+nocrop+fade:0.5/0.8+gdal >> $b gmt $m $l2s --world_file+no_crop+kml+lod:1/2+layer:Thick >> $b -gmt $m $l2s --esri+folder:/dir+doc:MyDoc+url:http://worldly.com/x.html >> $b +gmt $m $l2s --world_file+folder:/dir+doc:MyDoc+url:http://worldly.com/x.html >> $b gmt $m $l2s --remove_infile --del_input_ps >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/pshistogram/pshistogram-l2s.sh b/test/pshistogram/pshistogram-l2s.sh index 05d34fa444d..1c303e086ad 100755 --- a/test/pshistogram/pshistogram-l2s.sh +++ b/test/pshistogram/pshistogram-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A ---l2stranstest -C/this/file -C/that/file+b +--l2stranstest -Cthis/file -Cthat/file+b --l2stranstest -D+b+fTimes+o2p+r --l2stranstest -E1i -E8p+o2p --l2stranstest -F @@ -24,7 +24,7 @@ cat << EOF > $a --l2stranstest -Qr --l2stranstest -S --l2stranstest -T100/500/10+n -T90/20/30+i ---l2stranstest -T/some/file +--l2stranstest -Tfile --l2stranstest -W2p,red --l2stranstest -Z0 -Z1 -Z2+w --l2stranstest -Z3 -Z4 -Z5 @@ -32,7 +32,7 @@ EOF # module-specific longopts gmt $m $l2s --horizontal >> $b -gmt $m $l2s --cpt=/this/file --cmap=/that/file+bin >> $b +gmt $m $l2s --cpt=this/file --cmap=that/file+bin >> $b gmt $m $l2s --annotate+beneath+font:Times+offest:2p+rotate >> $b gmt $m $l2s --barwidth=1i --width=8p+offset:2p >> $b gmt $m $l2s --center >> $b @@ -46,7 +46,7 @@ gmt $m $l2s --distribution=LMSscale --distribution=lmsscale+pen:3p >> $b gmt $m $l2s --cumulative=reverse >> $b gmt $m $l2s --stairs >> $b gmt $m $l2s --range=100/500/10+number --bin=90/20/30+inverse >> $b -gmt $m $l2s --series=/some/file >> $b +gmt $m $l2s --series=file >> $b gmt $m $l2s --pen=2p,red >> $b gmt $m $l2s --histtype=counts --kind=freq --kind=logcount+weights >> $b gmt $m $l2s --kind=logfreq --kind=log10count --kind=log10freq >> $b diff --git a/test/pslegend/pslegend-l2s.sh b/test/pslegend/pslegend-l2s.sh index 88185e88dcd..8463d58f295 100755 --- a/test/pslegend/pslegend-l2s.sh +++ b/test/pslegend/pslegend-l2s.sh @@ -18,7 +18,7 @@ cat << EOF > $a --l2stranstest -F+p2p+r1p+s1/2/gray --l2stranstest -Mh -Me --l2stranstest -S4 ---l2stranstest -T/my/secrets -T/your/secrets +--l2stranstest -Tmy/secrets -Tyour/secrets EOF # module-specific longopts @@ -31,6 +31,6 @@ gmt $m $l2s --box+clearance:10+fill:red+inner:4p/black >> $b gmt $m $l2s --box+pen:2p+radius:1p+shade:1/2/gray >> $b gmt $m $l2s --source=hidden --source=explicit >> $b gmt $m $l2s --scale=4 >> $b -gmt $m $l2s --hidden_file=/my/secrets --leg_file=/your/secrets >> $b +gmt $m $l2s --hidden_file=my/secrets --leg_file=your/secrets >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/psmask/psmask-l2s.sh b/test/psmask/psmask-l2s.sh index bb0537e53e9..50788f7e0f3 100755 --- a/test/psmask/psmask-l2s.sh +++ b/test/psmask/psmask-l2s.sh @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -C ---l2stranstest -D/some/file +--l2stranstest -Dfile --l2stranstest -Fl -Fl --l2stranstest -Gblack --l2stranstest -I4 -I2/3 -I1/2/3 @@ -23,7 +23,7 @@ EOF # module-specific longopts gmt $m $l2s --endclip >> $b -gmt $m $l2s --dump=/some/file >> $b +gmt $m $l2s --dump=file >> $b gmt $m $l2s --forceclip=left --oriented=right >> $b gmt $m $l2s --fill=black >> $b gmt $m $l2s --inc=4 --increment=2/3 --spacing=1/2/3 >> $b diff --git a/test/psrose/psrose-l2s.sh b/test/psrose/psrose-l2s.sh index 0e80115ba4c..fdce3d29fca 100755 --- a/test/psrose/psrose-l2s.sh +++ b/test/psrose/psrose-l2s.sh @@ -10,9 +10,9 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A20+r ---l2stranstest -C/some/file -C/some/other/file +--l2stranstest -Cfile -Cother/file --l2stranstest -D ---l2stranstest -Em+w/some/file +--l2stranstest -Em+wfile --l2stranstest -F --l2stranstest -Gred -Gp25+bgreen+fgray --l2stranstest -GP3+bwhite+fred+r300 @@ -37,9 +37,9 @@ EOF # module-specific longopts gmt $m $l2s --sector=20+rose >> $b -gmt $m $l2s --cpt=/some/file --cmap=/some/other/file >> $b +gmt $m $l2s --cpt=file --cmap=other/file >> $b gmt $m $l2s --shift >> $b -gmt $m $l2s --vectors=mean+modefile:/some/file >> $b +gmt $m $l2s --vectors=mean+modefile:file >> $b gmt $m $l2s --no_scale >> $b gmt $m $l2s --fill=red --fill=bit:25+bg:green+foreground:gray >> $b gmt $m $l2s --fill=bitreverse:3+background:white+fg:red+dpi:300 >> $b diff --git a/test/psscale/psscale-l2s.sh b/test/psscale/psscale-l2s.sh index 9bea11ad2c6..1f3519ce351 100755 --- a/test/psscale/psscale-l2s.sh +++ b/test/psscale/psscale-l2s.sh @@ -9,7 +9,7 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -C/some/file -C/some/other/file +--l2stranstest -Cfile -Cother/file --l2stranstest -D10/20/2/3+w200/100+eb6+h --l2stranstest -Dg1/-0.5+v+n+r --l2stranstest -DjBR+jLT+maclu @@ -26,11 +26,11 @@ cat << EOF > $a --l2stranstest -S+a20+c+r+s --l2stranstest -S+n+xmylabel+ysomeunit --l2stranstest -W10 ---l2stranstest -Z/bar/widths/file -Z/some/z/file +--l2stranstest -Zbar/widths/file -Zz/file EOF # module-specific longopts -gmt $m $l2s --cpt=/some/file --cmap=/some/other/file >> $b +gmt $m $l2s --cpt=file --cmap=other/file >> $b gmt $m $l2s --position=10/20/2/3+size:200/100+triangles:b6+horizontal >> $b gmt $m $l2s --position=mapcoords:1/-0.5+vertical+nan+reverse >> $b gmt $m $l2s --position=inside:BR+janchor:LT+move_annot:aclu >> $b @@ -47,6 +47,6 @@ gmt $m $l2s --log >> $b gmt $m $l2s --appearance+angle:20+custom+minmax+nolines >> $b gmt $m $l2s --appearance+numeric+barlabel:mylabel+barunit:someunit >> $b gmt $m $l2s --scale=10 >> $b -gmt $m $l2s --barwidths=/bar/widths/file --zfile=/some/z/file >> $b +gmt $m $l2s --barwidths=bar/widths/file --zfile=z/file >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/psternary/psternary-l2s.sh b/test/psternary/psternary-l2s.sh index 77d3705fe21..1be99efaa8c 100755 --- a/test/psternary/psternary-l2s.sh +++ b/test/psternary/psternary-l2s.sh @@ -9,7 +9,7 @@ b=$m-l2s-b.txt rm -f $a $b ; touch $b cat << EOF > $a ---l2stranstest -C/some/file -C/some/other/file -Jz1i +--l2stranstest -Cfile -Cother/file -Jz1i --l2stranstest -Gred -Gp25+bgreen+fgray -Jz1i --l2stranstest -GP3+bwhite+fred+r300 -Jz1i --l2stranstest -L1/2/3 -L4/-/- -Jz1i @@ -43,7 +43,7 @@ EOF # offer any longoption equivalent for -M (e.g., --dump) or this pre-scan # will fail to locate that equivalent and incorrectly append -Jz1i #gmt $m $l2s --dump >> $b -gmt $m $l2s --cpt=/some/file --cmap=/some/other/file >> $b +gmt $m $l2s --cpt=file --cmap=other/file >> $b gmt $m $l2s --fill=red --fill=bit:25+bg:green+foreground:gray >> $b gmt $m $l2s --fill=bitreverse:3+background:white+fg:red+dpi:300 >> $b gmt $m $l2s --labels=1/2/3 --vertex_labels=4/-/- >> $b diff --git a/test/psxy/psxy-l2s.sh b/test/psxy/psxy-l2s.sh index b06aa5a7837..6bb02b2f6dc 100755 --- a/test/psxy/psxy-l2s.sh +++ b/test/psxy/psxy-l2s.sh @@ -26,7 +26,7 @@ cat << EOF > $a --l2stranstest -L+d+xr+yt -L+D+x6+y7 --l2stranstest -Nc -Nr --l2stranstest -T ---l2stranstest -Z99 -Z/my/polygon/file.txt +--l2stranstest -Z99 -Zmy/polygon/file.txt EOF # module-specific longopts @@ -47,6 +47,6 @@ gmt $m $l2s --polygon+bounds+xanchor:l+yanchor:b+pen:1p,blue >> $b gmt $m $l2s --polygon+symdev+xanchor:r+yanchor:t --polygon+asymdev+xanchor:6+yanchor:7 >> $b gmt $m $l2s --noclip=clipnorepeat --noclip=repeatnoclip >> $b gmt $m $l2s --ignoreinfiles >> $b -gmt $m $l2s --zvalue=99 --level=/my/polygon/file.txt >> $b +gmt $m $l2s --zvalue=99 --level=my/polygon/file.txt >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/psxyz/psxyz-l2s.sh b/test/psxyz/psxyz-l2s.sh index d857ba6b663..43c0f7caf3b 100755 --- a/test/psxyz/psxyz-l2s.sh +++ b/test/psxyz/psxyz-l2s.sh @@ -26,7 +26,7 @@ cat << EOF > $a --l2stranstest -W2p,red+cl+o1p -W1p+s --l2stranstest -W2p+v -W2p+z --l2stranstest -Z99+t ---l2stranstest -Z/my/polygon/file.txt+T +--l2stranstest -Zmy/polygon/file.txt+T EOF # module-specific longopts @@ -47,6 +47,6 @@ gmt $m $l2s --nosort --no_sort >> $b gmt $m $l2s --pen=2p,red+color:l+offset:1p --pen=1p+spline >> $b gmt $m $l2s --pen=2p+vector --pen=2p+zvalues >> $b gmt $m $l2s --zvalue=99+transparency >> $b -gmt $m $l2s --level=/my/polygon/file.txt+twocols >> $b +gmt $m $l2s --level=my/polygon/file.txt+twocols >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/sample1d/sample1d-l2s.sh b/test/sample1d/sample1d-l2s.sh index e638c12449f..88c4ee1f940 100755 --- a/test/sample1d/sample1d-l2s.sh +++ b/test/sample1d/sample1d-l2s.sh @@ -11,13 +11,13 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -Af -Ap -Am --l2stranstest -Ar+l -AR+d ---l2stranstest -Csomecpt+h2+uin+s/some/file +--l2stranstest -Csomecpt+h2+uin+sfile --l2stranstest -C+Uin+i5 --l2stranstest -E --l2stranstest -Fl -Fe -Fa+d1 --l2stranstest -Fc -Fs -Fn --l2stranstest -N1 -N2 -N3 ---l2stranstest -T100/200/10+i -T10+n -T/some/file +--l2stranstest -T100/200/10+i -T10+n -Tfile --l2stranstest -T10/20/1+a+u --l2stranstest -W1 EOF @@ -25,13 +25,13 @@ EOF # module-specific longopts gmt $m $l2s --resample=keeporig --resample=pmfollow --resample=mpfollow >> $b gmt $m $l2s --resample=equidistant+rhumb --resample=exactfit+delete >> $b -gmt $m $l2s --cpt=somecpt+hinge:2+fromunit:in+file:/some/file >> $b +gmt $m $l2s --cpt=somecpt+hinge:2+fromunit:in+file:file >> $b gmt $m $l2s --cmap+tounit:in+zinc:5 >> $b gmt $m $l2s --keeptext >> $b gmt $m $l2s --interptype=linear --interp=step --interp=akima+derivative:1 >> $b gmt $m $l2s --interptype=cubic --interptype=smooth --interptype=none >> $b gmt $m $l2s --time_column=1 --time_col=2 --timecol=3 >> $b -gmt $m $l2s --inc=100/200/10+inverse --inc=10+numcoords --range=/some/file >> $b +gmt $m $l2s --inc=100/200/10+inverse --inc=10+numcoords --range=file >> $b gmt $m $l2s --inc=10/20/1+paste+unique >> $b gmt $m $l2s --weights=1 >> $b diff --git a/test/sph2grd/sph2grd-l2s.sh b/test/sph2grd/sph2grd-l2s.sh index 8fa59bbd514..4a83843c51a 100755 --- a/test/sph2grd/sph2grd-l2s.sh +++ b/test/sph2grd/sph2grd-l2s.sh @@ -13,8 +13,8 @@ cat << EOF > $a --l2stranstest -E --l2stranstest -F-/-/50/75 -Fk1/2/3/4 --l2stranstest -Fk1/2/3/4 ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10 -I2 -I1/2+n --l2stranstest -Ng -Nm -Ns --l2stranstest -Q @@ -25,8 +25,8 @@ gmt $m $l2s --derive=gravity --derive=geoid >> $b gmt $m $l2s --ellipsoid >> $b gmt $m $l2s --filter=-/-/50/75 --filter=km:1/2/3/4 >> $b gmt $m $l2s --filter=kilometers:1/2/3/4 >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10 --spacing=2 --inc=1/2+number >> $b gmt $m $l2s --normalize=geodesy --normalize=math --normalize=schmidt >> $b gmt $m $l2s --phaseconv >> $b diff --git a/test/sphdistance/sphdistance-l2s.sh b/test/sphdistance/sphdistance-l2s.sh index a02eade85d6..b8d7e8d320f 100755 --- a/test/sphdistance/sphdistance-l2s.sh +++ b/test/sphdistance/sphdistance-l2s.sh @@ -12,23 +12,23 @@ cat << EOF > $a --l2stranstest -C -C --l2stranstest -D --l2stranstest -Ed1 -En -Ez ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10 -I2 -I1/2+n --l2stranstest -Ld -Le ---l2stranstest -N/my/nodes -N/your/nodes ---l2stranstest -Q/some/file.txt +--l2stranstest -Nmy/nodes -Nyour/nodes +--l2stranstest -Qfile.txt EOF # module-specific longopts gmt $m $l2s --save_mem --single_form >> $b gmt $m $l2s --skipdup >> $b gmt $m $l2s --quantity=distance:1 --quantity=polygon --quantity=zvalue >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10 --spacing=2 --inc=1/2+number >> $b gmt $m $l2s --unit=d --dist_unit=e >> $b -gmt $m $l2s --nodes=/my/nodes --node_table=/your/nodes >> $b -gmt $m $l2s --voronoi=/some/file.txt >> $b +gmt $m $l2s --nodes=my/nodes --node_table=your/nodes >> $b +gmt $m $l2s --voronoi=file.txt >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/sphinterpolate/sphinterpolate-l2s.sh b/test/sphinterpolate/sphinterpolate-l2s.sh index dcffd8fc4dc..33b87a57712 100755 --- a/test/sphinterpolate/sphinterpolate-l2s.sh +++ b/test/sphinterpolate/sphinterpolate-l2s.sh @@ -10,8 +10,8 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -D99 ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10 -I2 -I1/2+n --l2stranstest -Qg -Ql --l2stranstest -Qp -Qs @@ -21,8 +21,8 @@ EOF # module-specific longopts gmt $m $l2s --skipdup=99 >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10 --spacing=2 --inc=1/2+number >> $b gmt $m $l2s --tension=global --tension=local >> $b gmt $m $l2s --tension=piecewise --tension=smooth >> $b diff --git a/test/sphtriangulate/sphtriangulate-l2s.sh b/test/sphtriangulate/sphtriangulate-l2s.sh index 1f9cfb3d473..5292332df06 100755 --- a/test/sphtriangulate/sphtriangulate-l2s.sh +++ b/test/sphtriangulate/sphtriangulate-l2s.sh @@ -13,7 +13,7 @@ cat << EOF > $a --l2stranstest -C -C --l2stranstest -D --l2stranstest -Ld ---l2stranstest -N/my/nodes +--l2stranstest -Nmy/nodes --l2stranstest -Qd -Qv --l2stranstest -T EOF @@ -23,7 +23,7 @@ gmt $m $l2s --area >> $b gmt $m $l2s --save_mem --single_form >> $b gmt $m $l2s --skipdup >> $b gmt $m $l2s --unit=d >> $b -gmt $m $l2s --nodes=/my/nodes >> $b +gmt $m $l2s --nodes=my/nodes >> $b gmt $m $l2s --output=delaunay --output=voronoi >> $b gmt $m $l2s --arcs >> $b diff --git a/test/surface/surface-l2s.sh b/test/surface/surface-l2s.sh index 60730916f46..a13465ca179 100755 --- a/test/surface/surface-l2s.sh +++ b/test/surface/surface-l2s.sh @@ -12,14 +12,14 @@ cat << EOF > $a --l2stranstest -I0.1m+e/100+n --l2stranstest -A0.6 -Am --l2stranstest -C5 -C99.99% ---l2stranstest -D/some/file+z1000 +--l2stranstest -Dfile+z1000 --l2stranstest -Lld -Lusomefile.grd --l2stranstest -M20c -M99.99 --l2stranstest -N25 --l2stranstest -Q -Qr --l2stranstest -S25m --l2stranstest -Tb0.5 -Ti0.1 ---l2stranstest -W/a/b/c/mylog.txt +--l2stranstest -Wa/b/c/mylog.txt --l2stranstest -Z1.1234 EOF @@ -29,14 +29,14 @@ gmt $m $l2s --increment=0.1m+exact/100+number >> $b # module-specific longopts gmt $m $l2s --aspect=0.6 --aspect=middle >> $b gmt $m $l2s --convergence=5 --convergence=99.99% >> $b -gmt $m $l2s --breakline=/some/file+zvalue:1000 >> $b +gmt $m $l2s --breakline=file+zvalue:1000 >> $b gmt $m $l2s --limit=lower:d --limit=upper:somefile.grd >> $b gmt $m $l2s --maskradius=20c --mask=99.99 >> $b gmt $m $l2s --maxiterations=25 >> $b gmt $m $l2s --quicksize --quicksize=region >> $b gmt $m $l2s --searchradius=25m >> $b gmt $m $l2s --tension=boundary:0.5 --tension=interior:0.1 >> $b -gmt $m $l2s --logfile=/a/b/c/mylog.txt >> $b +gmt $m $l2s --logfile=a/b/c/mylog.txt >> $b gmt $m $l2s --relax=1.1234 >> $b diff $a $b --strip-trailing-cr > fail diff --git a/test/triangulate/triangulate-l2s.sh b/test/triangulate/triangulate-l2s.sh index 64707c3d829..f6c52d17472 100755 --- a/test/triangulate/triangulate-l2s.sh +++ b/test/triangulate/triangulate-l2s.sh @@ -10,13 +10,13 @@ rm -f $a $b ; touch $b cat << EOF > $a --l2stranstest -A ---l2stranstest -C/some/slopefile +--l2stranstest -Cslopefile --l2stranstest -Dx -Dy --l2stranstest -E ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10 -I2 -I1/2+n ---l2stranstest -L/my/index+b +--l2stranstest -Lmy/index+b --l2stranstest -M -M --l2stranstest -N --l2stranstest -Qn @@ -27,13 +27,13 @@ EOF # module-specific longopts gmt $m $l2s --area >> $b -gmt $m $l2s --slope_grid=/some/slopefile >> $b +gmt $m $l2s --slope_grid=slopefile >> $b gmt $m $l2s --derivatives=x --derivatives=y >> $b gmt $m $l2s --empty >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10 --spacing=2 --inc=1/2+number >> $b -gmt $m $l2s --index=/my/index+binary >> $b +gmt $m $l2s --index=my/index+binary >> $b gmt $m $l2s --network --network >> $b gmt $m $l2s --ids >> $b gmt $m $l2s --voronoi=polygon >> $b diff --git a/test/xyz2grd/xyz2grd-l2s.sh b/test/xyz2grd/xyz2grd-l2s.sh index 30774eb6f24..bab7fc77c4b 100755 --- a/test/xyz2grd/xyz2grd-l2s.sh +++ b/test/xyz2grd/xyz2grd-l2s.sh @@ -17,8 +17,8 @@ cat << EOF > $a --l2stranstest -D"+c-+o1+rSmart Grid" --l2stranstest -D"+s2+tBest Grid Ever+vmyvar" --l2stranstest -D+xDr.X+yDr.Y+zDr.Z ---l2stranstest -G/some/file.grd=nf+d2+n-99 ---l2stranstest -G/other/file.grd=nf+o6+s1.5 +--l2stranstest -Gfile.grd=nf+d2+n-99 +--l2stranstest -Gother_file.grd=nf+o6+s1.5 --l2stranstest -I5+e/10 -I2 -I1/2+n --l2stranstest -S -S --l2stranstest -ZTLax @@ -44,8 +44,8 @@ gmt $m $l2s --netcdf+cpt:/some.cpt+dname:sillydata+invalid:-99 >> $b gmt $m $l2s --netCDF+cpt:-+offset:1+remark:'Smart Grid' >> $b gmt $m $l2s --ncheader+scale:2+title:"Best Grid Ever"+varname:myvar >> $b gmt $m $l2s --netcdf+xname:Dr.X+yname:Dr.Y+zname:Dr.Z >> $b -gmt $m $l2s --outgrid=/some/file.grd=nf+divide:2+nan:-99 >> $b -gmt $m $l2s --outgrid=/other/file.grd=nf+offset:6+scale:1.5 >> $b +gmt $m $l2s --outgrid=file.grd=nf+divide:2+nan:-99 >> $b +gmt $m $l2s --outgrid=other_file.grd=nf+offset:6+scale:1.5 >> $b gmt $m $l2s --increment=5+exact/10 --spacing=2 --inc=1/2+number >> $b gmt $m $l2s --swap --byteswap >> $b gmt $m $l2s --onecol=top,left,ascii,noxmax >> $b