From 690c5b00ba4c3f539cd312f11c4cb163f72ce9bd Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Wed, 26 May 2021 12:02:56 -0400 Subject: [PATCH 1/4] Use non-scaled pen default for +p --- src/gmt_support.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gmt_support.c b/src/gmt_support.c index 00458fdfd83..7c4c2b6be04 100644 --- a/src/gmt_support.c +++ b/src/gmt_support.c @@ -13539,7 +13539,7 @@ int gmt_getpanel (struct GMT_CTRL *GMT, char option, char *text, struct GMT_MAP_ P->radius = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_RADIUS; /* 6 pt */ gmt_init_fill (GMT, &P->fill, -1.0, -1.0, -1.0); /* Default is no fill unless specified */ gmt_init_fill (GMT, &P->sfill, gmt_M_is255 (127), gmt_M_is255 (127), gmt_M_is255 (127)); /* Default if gray shade is used */ - P->pen1 = GMT->current.setting.map_frame_pen; /* Heavier pen for main outline */ + gmt_getpen (GMT, "thicker,black", &P->pen1 ); /* Heavier pen for main outline */ P->pen2 = GMT->current.setting.map_default_pen; /* Thinner pen for optional inner outline */ P->debug_pen = GMT->current.setting.map_default_pen; /* Thinner pen for optional inner outline */ P->gap = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_GAP; /* Default is 2p */ From 52737040e70b43a00648b733920af0703e23c240 Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Wed, 26 May 2021 12:05:06 -0400 Subject: [PATCH 2/4] Fix typo --- src/gmt_support.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gmt_support.c b/src/gmt_support.c index 7c4c2b6be04..04bfaae029e 100644 --- a/src/gmt_support.c +++ b/src/gmt_support.c @@ -13539,7 +13539,7 @@ int gmt_getpanel (struct GMT_CTRL *GMT, char option, char *text, struct GMT_MAP_ P->radius = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_RADIUS; /* 6 pt */ gmt_init_fill (GMT, &P->fill, -1.0, -1.0, -1.0); /* Default is no fill unless specified */ gmt_init_fill (GMT, &P->sfill, gmt_M_is255 (127), gmt_M_is255 (127), gmt_M_is255 (127)); /* Default if gray shade is used */ - gmt_getpen (GMT, "thicker,black", &P->pen1 ); /* Heavier pen for main outline */ + gmt_getpen (GMT, "thicker,black", &P->pen1); /* Heavier pen for main outline */ P->pen2 = GMT->current.setting.map_default_pen; /* Thinner pen for optional inner outline */ P->debug_pen = GMT->current.setting.map_default_pen; /* Thinner pen for optional inner outline */ P->gap = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_GAP; /* Default is 2p */ From eb9390f39b91ba8789d1f258f6afa00974a05789 Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Wed, 26 May 2021 13:20:14 -0400 Subject: [PATCH 3/4] Add (void) before gmt_getpen --- src/gmt_support.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gmt_support.c b/src/gmt_support.c index 04bfaae029e..bc800c511eb 100644 --- a/src/gmt_support.c +++ b/src/gmt_support.c @@ -13539,7 +13539,7 @@ int gmt_getpanel (struct GMT_CTRL *GMT, char option, char *text, struct GMT_MAP_ P->radius = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_RADIUS; /* 6 pt */ gmt_init_fill (GMT, &P->fill, -1.0, -1.0, -1.0); /* Default is no fill unless specified */ gmt_init_fill (GMT, &P->sfill, gmt_M_is255 (127), gmt_M_is255 (127), gmt_M_is255 (127)); /* Default if gray shade is used */ - gmt_getpen (GMT, "thicker,black", &P->pen1); /* Heavier pen for main outline */ + (void) gmt_getpen (GMT, "thicker,black", &P->pen1); /* Heavier pen for main outline */ P->pen2 = GMT->current.setting.map_default_pen; /* Thinner pen for optional inner outline */ P->debug_pen = GMT->current.setting.map_default_pen; /* Thinner pen for optional inner outline */ P->gap = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_GAP; /* Default is 2p */ From c85818b3eb5ddecced400c271f90515e96138f61 Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Wed, 26 May 2021 14:39:16 -0400 Subject: [PATCH 4/4] Update PostScript files --- doc/examples/ex22/ex22.ps | Bin 182051 -> 182130 bytes doc/examples/ex31/ex31.ps | Bin 554170 -> 554276 bytes doc/examples/ex41/ex41.ps | Bin 1774722 -> 1774717 bytes doc/examples/ex42/ex42.ps | Bin 2606426 -> 2606422 bytes doc/scripts/GMT_legend.ps | Bin 33879 -> 33874 bytes doc/scripts/GMT_mag_rose.ps | Bin 41090 -> 41148 bytes doc/scripts/GMT_mapscale.ps | Bin 25472 -> 25501 bytes doc/scripts/GMT_seislegend.ps | Bin 23437 -> 23432 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/examples/ex22/ex22.ps b/doc/examples/ex22/ex22.ps index c8286dfd85319958a253a1ee0f06779a550a66be..b08d13766ed4d6abcdde79431a5e3c1e7e2d989f 100644 GIT binary patch delta 253 zcmZ47$Ni~~dqRd#YLca~r9oP}k%5t+o`I>Jk=ewmHsSEp6b0YJN(Cb`1w#`nLqjVQ z^UcDHrD65@0l_};jvj^z23$rahNcPz3cd;&mIfPwH5GD;6r#AG?Ba5T+zKvB3ljxP za}$sf6H|l|2pghA*U->J!N}Co0;I@b1I!c<3t@(dk&!XP5YY{OFeN}!fNZd$$@jx0 p1wb~#1h`UC)21I3W0YzZjA$2(VB9Vk!6f6xWMsNsZywWE4FDTpMMwYu delta 172 zcmey=$Gy0ZdqRegS(1TeQnE$7k%5t+o`JERq4C73HsRpJ5(VGHA_YTZ1w#ufV?!$g zqs_vMrD5SlCWfX81`56k8kPndf;AO#ixi@`EGQgO*E#R(ZgsY#Z`mIi6@Mg~TPdIqL?MrIQmI)%eiQxtp?D;12)6bwzQ3=OSJ zEH=w9UI^#X4+!>&cl0n+Fqr&0LV;Vu*wjx`p}1Tjw_-9^q$0P5i2e?%%wpTxu@+3XwD?iAt`Vkf$=`Y25#^*qr!u__nNML7R1ODwa(Dr>B>LBS?l gY_r2Id+gJr&jE)Vam)#)g>ZuR(>1pEzJgr+06I}6;s5{u delta 173 zcmWl|OAf(60D$2PZ%ve%v3|#JJ{Jvg`|?M8X_!pVaqKzLGQyAtRxb@FZsUr z`22{kk?H%ZS-1(u>us_-E?wnnM@<~9Z>NK?i1zk8Ol+-fJq@%DJTH~vBE^4>c}f;o nWQk=~SY?fMHrQl~ZFbnD!5;e@a7dG*ObYA$6e|0?tW^B~p2H`N diff --git a/doc/examples/ex42/ex42.ps b/doc/examples/ex42/ex42.ps index 714dad52cc54b1e1fccc9eb4a1c0a81e7544f045..dbada5f69f14b00b2dc16f3e9f9dde1c018a2b3a 100644 GIT binary patch delta 231 zcmWm1I}X8c0Knn2-lZP(e%G^G)Bb4_t{@hRn1mp%z$7t9Oq{?41X~jaF*uE%;Tyj1 z`6hjE*=pa2o*TX(NU9a@}5<8 K;@#iIL-_$ujWRX> delta 235 zcmWl|ISv6)0D$2<+c5ThXY3W3hmdgv(a7{NLP9GPvFy=#RX|)&Y&2~TQ>Rs8&1{q?Q5k?tfoCzkGVwxFdnPZ*>7FlAM8Y`@_#yT6eBAVl;&`;*8X`8Rs MR28~?f43g$58VVaR{#J2 diff --git a/doc/scripts/GMT_legend.ps b/doc/scripts/GMT_legend.ps index bb2b7efd6ca6236f3b9fd095aae53b1d44e89224..804c9480c01cc9f4ae4ea5b4ca08c722e5ecdba5 100644 GIT binary patch delta 74 zcmccK!E~vEX+nljYLca~r9oP}k%5t+o`I>Jk=ewC3Zd}S6b0YJN(Cb`1w#`n15+#G e&0LHXVO&P03gKLCfn5HElO2O4HZKm}q5}XzNfn&{ delta 67 zcmccA!F0WYX+nmCrDc+NVrrspN@h_>WxSDrk)fV}v7Vvf#HtFRkc?6V-^3yXLqi2a XGb;m2E2GUUj1^&w2Ak``ujl{(>sS=~ diff --git a/doc/scripts/GMT_mag_rose.ps b/doc/scripts/GMT_mag_rose.ps index 7cab1eff1fb6a4ac8cb906634e5dcef85444994b..65818d3b1450e51e012d17ebe55f479e7c92a04a 100644 GIT binary patch delta 178 zcmZoV$h7Am(}WD6)Few|OM|p{BLgEtJp)rcBeRJOmBQhvDGI)cl?p~?3Wg?D2BucV z7Mpn(t)rCn1A=|x9X$*c47fB54K@U8DioJ1O*G(^SYUQi$S$vWv?Vax1t}Qq#DM LOgG<(TE+nY4D27o delta 66 zcmbPxoU!3JJk=ewC3gPh76b0YJN(Cb`1w#`n15+y# Tqs`om=YyDxOgG;S-oy?7XDJgA delta 80 zcmeC!&e*%1aYBZKrDc+NVrrspN@h_>WxSDrk)fV}v7Vvf#HtG6kc?6V-^3yXLqi2a kGb;m2D-*NLtc>S_I1LoSx!eM|{0%3^2a9k18a$aD0QVvoV*mgE