Skip to content

Commit 27bd597

Browse files
seismanseisman
authored
Ensure consistent long-name options for embellishments placement
1 parent df3760b commit 27bd597

File tree

16 files changed

+29
-29
lines changed

16 files changed

+29
-29
lines changed

‎src/longopt/gmtlogo_inc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2626
short_modifiers, long_modifiers,
2727
transproc_mask */
2828
{ 0, 'D', "position",
29-
"g,j,J,n,x", "user|map,justify,mirror,normalize,plot",
30-
"w,h,j,o", "width,height,justify,offset",
29+
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
30+
"w,h,j,o", "width,height,anchor,offset",
3131
GMT_TP_STANDARD },
3232
{ 0, 'F', "border|box",
3333
"", "",

‎src/longopt/inset_inc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2828
{ 0, 'C', "clearance", "", "", "", "", GMT_TP_STANDARD },
2929
{ 0, 'D', "rectangle|inset_box|position",
3030
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
31-
"r,u,w,j,o", "corners,units,width,janchor,anchoroffset",
31+
"r,u,w,j,o", "corners,units,width,anchor,offset",
3232
GMT_TP_STANDARD },
3333
{ 0, 'F', "inset_frame|box",
3434
"", "",

‎src/longopt/psbasemap_inc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2828
{ 0, 'A', "polygon", "", "", "", "", GMT_TP_STANDARD },
2929
{ 0, 'D', "inset|inset_box",
3030
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
31-
"r,s,t,u,w,j,o", "corners,outfile,translate,units,width,janchor,offset",
31+
"r,s,t,u,w,j,o", "corners,outfile,translate,units,width,anchor,offset",
3232
GMT_TP_STANDARD },
3333
{ 0, 'F', "box",
3434
"d,l,t", "inset,scale,rose",
3535
"c,g,i,p,r,s", "clearance,fill,inner,pen,radius,shade",
3636
GMT_TP_STANDARD },
3737
{ 0, 'L', "mapscale|map_scale",
3838
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
39-
"w,a,c,f,j,l,o,u,v", "length,align,loc,fancy,janchor,label,anchoroffset,units,vertical",
39+
"w,a,c,f,j,l,o,u,v", "length,align,loc,fancy,anchor,label,offset,units,vertical",
4040
GMT_TP_STANDARD },
4141
/* -Td and -Tm not doable because they have inconsistent short modifiers? */
4242
{ 0, '\0', "", "", "", "", "", 0 } /* End of list marked with empty option and strings */

‎src/longopt/pscoast_inc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { /* Local options for this m
5050
GMT_TP_STANDARD },
5151
{ 0, 'L', "mapscale",
5252
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
53-
"w,a,c,f,j,l,o,u,v", "length,align,loc,fancy,janchor,label,anchoroffset,units,vertical",
53+
"w,a,c,f,j,l,o,u,v", "length,align,loc,fancy,anchor,label,offset,units,vertical",
5454
GMT_TP_STANDARD },
5555
{ 0, 'M', "dump", "", "", "", "", GMT_TP_STANDARD },
5656
{ 0, 'N', "borders", "", "", "", "", GMT_TP_STANDARD },

‎src/longopt/psimage_inc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2727
transproc_mask */
2828
{ 0, 'D', "position",
2929
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
30-
"r,w,j,n,o", "dpi,width,janchor,replicate,anchoroffset",
30+
"r,w,j,n,o", "dpi,width,anchor,replicate,offset",
3131
GMT_TP_STANDARD },
3232
{ 0, 'F', "box",
3333
"", "",

‎src/longopt/pslegend_inc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2828
{ 0, 'C', "clearance", "", "", "", "", GMT_TP_STANDARD },
2929
{ 0, 'D', "position",
3030
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
31-
"w,j,l,o", "width,janchor,spacing,anchoroffset",
31+
"w,j,l,o", "width,anchor,spacing,offset",
3232
GMT_TP_STANDARD },
3333
{ 0, 'F', "box",
3434
"", "",

‎src/longopt/psscale_inc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2828
GMT_C_CPT_KW,
2929
{ 0, 'D', "position",
3030
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
31-
"w,e,h,v,j,m,n,o,r", "size,triangles,horizontal,vertical,janchor,move_annot,nan,anchoroffset,reverse",
31+
"w,e,h,v,j,m,n,o,r", "size,triangles,horizontal,vertical,anchor,move_annot,nan,offset,reverse",
3232
GMT_TP_STANDARD },
3333
{ 0, 'F', "box",
3434
"", "",

‎src/longopt/pswiggle_inc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { /* Local options for this m
2929
{ 0, 'C', "center", "", "", "", "", GMT_TP_STANDARD },
3030
{ 0, 'D', "scalebar",
3131
"g,j,J,n,x", "mapcoords,inside,outside,boxcoords,plotcoords",
32-
"w,j,a,o,l", "length,janchor,side,anchoroffset,label",
32+
"w,j,a,o,l", "length,anchor,side,offset,label",
3333
GMT_TP_STANDARD },
3434
{ 0, 'F', "panel",
3535
"", "",

‎test/gmtlogo/gmtlogo-l2s.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ cat << EOF > $a
1919
EOF
2020

2121
# module-specific longopts
22-
gmt $m $l2s --position=user:10/20+width:5 --position=map:1/2+height:2 >> $b
23-
gmt $m $l2s --position=justify:TR+justify:BL --position=mirror:TR >> $b
24-
gmt $m $l2s --position=normalize:0.5/0.4+offset:1/2 >> $b
25-
gmt $m $l2s --position=plot:3/4+justify:BL >> $b
22+
gmt $m $l2s --position=mapcoords:10/20+width:5 --position=mapcoords:1/2+height:2 >> $b
23+
gmt $m $l2s --position=inside:TR+anchor:BL --position=outside:TR >> $b
24+
gmt $m $l2s --position=boxcoords:0.5/0.4+offset:1/2 >> $b
25+
gmt $m $l2s --position=plotcoords:3/4+anchor:BL >> $b
2626
gmt $m $l2s --border+clearance:0.1 --box+fill:red --box+inner:1 >> $b
2727
gmt $m $l2s --border+pen:2p --border+radius:0.5 --box+shade:1/1/green >> $b
2828
gmt $m $l2s --label=standard --style=none --style=url >> $b

‎test/inset/inset-l2s.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ gmt begin
2626
gmt $m $l2s --clearance=w25 >> $b
2727
gmt $m $l2s --rectangle=10/20/2/3+corners+units:i >> $b
2828
gmt $m $l2s --inset_box=mapcoords:1/-0.5+width:7 >> $b
29-
gmt $m $l2s --position=inside:BR+janchor:LT >> $b
30-
gmt $m $l2s --rectangle=outside:BR+anchoroffset:1/2 >> $b
29+
gmt $m $l2s --position=inside:BR+anchor:LT >> $b
30+
gmt $m $l2s --rectangle=outside:BR+offset:1/2 >> $b
3131
gmt $m $l2s --rectangle=boxcoords:0/0 --rectangle=plotcoords:5/5 >> $b
3232
gmt $m $l2s --inset_frame+clearance:10+fill:red+inner:4p/black >> $b
3333
gmt $m $l2s --box+pen:2p+radius:1p+shade:1/2/gray >> $b

0 commit comments

Comments
 (0)