Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement GMT themes (sets of GMT defaults) #3344

Merged
merged 206 commits into from
Mar 12, 2021
Merged
Show file tree
Hide file tree
Changes from 137 commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
c3a1307
Add new GMT_THEME default setting
PaulWessel May 16, 2020
07af5ab
Update names
PaulWessel May 17, 2020
1df55ec
Create darkmode.conf
PaulWessel May 17, 2020
f05bb23
Wrap up theme machinery
PaulWessel May 17, 2020
0def46e
Update gmt.conf.rst
PaulWessel May 17, 2020
611a61b
Update darkmode.conf
PaulWessel May 17, 2020
cbd49f9
Play with modern.conf
PaulWessel May 17, 2020
4551f91
Trial modern.conf
PaulWessel May 17, 2020
01feca1
Address comments
PaulWessel May 17, 2020
cdb9030
use AvantGarde font
PaulWessel May 17, 2020
e9bff3e
Bold titles
PaulWessel May 18, 2020
511f552
Update modern.conf
PaulWessel May 18, 2020
8b2a6b3
Update modern.conf
PaulWessel May 18, 2020
6ad3637
Merge branch 'master' into gmt-themes
PaulWessel Jun 8, 2020
64c0c62
Merge branch 'master' into gmt-themes
PaulWessel Jun 9, 2020
8d41cab
Implement auto scaling
PaulWessel Jun 9, 2020
3f4c3a3
Update modern.conf
PaulWessel Jun 9, 2020
6f10284
Update gmt_plot.c
PaulWessel Jun 9, 2020
b58d03f
Update gmt_map.c
PaulWessel Jun 9, 2020
1f2948a
smaller offsets
PaulWessel Jun 9, 2020
a625c0e
Merge branch 'master' into gmt-themes
PaulWessel Jun 9, 2020
bac858c
Merge branch 'master' into gmt-themes
PaulWessel Jun 10, 2020
a6be58f
Merge branch 'master' into gmt-themes
PaulWessel Jun 10, 2020
e2d3ccb
Merge branch 'master' into gmt-themes
PaulWessel Jun 10, 2020
30076a8
Let modern have modern defaults
PaulWessel Jun 11, 2020
919fef0
Update modern.conf
PaulWessel Jun 11, 2020
2d2292d
Updates
PaulWessel Jun 11, 2020
2e027ac
Leave gridlines black and lines with butt cap
PaulWessel Jun 11, 2020
10c9d39
Update inverse and darkmode to be modern
PaulWessel Jun 11, 2020
1ab5906
Merge branch 'master' into gmt-themes
PaulWessel Jun 12, 2020
0a021c4
Merge branch 'master' into gmt-themes
PaulWessel Jun 12, 2020
ffe84e5
Merge branch 'master' into gmt-themes
PaulWessel Jun 12, 2020
7c46728
Merge branch 'master' into gmt-themes
PaulWessel Jun 13, 2020
47a982b
Move the auto-font-size function to gmt_init.c
PaulWessel Jun 13, 2020
09661e3
Allow --PAR-value overrides for auto scaling
PaulWessel Jun 13, 2020
d8d3cd4
Merge branch 'master' into gmt-themes
PaulWessel Jun 13, 2020
b0042eb
Update gmt_init.c
PaulWessel Jun 13, 2020
946a0b0
Improve scripts in general
PaulWessel Jun 13, 2020
06025aa
Update scripts and fix internals
PaulWessel Jun 14, 2020
aedb084
Eliminate unneeded gmt set calls
PaulWessel Jun 14, 2020
e815443
Merge branch 'master' into gmt-themes
PaulWessel Jun 14, 2020
6bc2bca
Update gmt_init.c
PaulWessel Jun 14, 2020
38cc749
Update gmt_init.c
PaulWessel Jun 14, 2020
89cd1ff
Use auto <--> NaN in gmt.conf parsing
PaulWessel Jun 15, 2020
e4c24c9
Update gmt_init.c
PaulWessel Jun 15, 2020
4891b97
Use NaN for undefined font size as well
PaulWessel Jun 15, 2020
495f251
Eliminate unneeded MAP_AUTO_SCALE
PaulWessel Jun 15, 2020
5beab25
Update docs
PaulWessel Jun 15, 2020
07028a8
Update subplot.c
PaulWessel Jun 15, 2020
28f3dc5
Update psscale.c
PaulWessel Jun 15, 2020
94c46b3
update undefined defaults at end of GMT_Parse_Common
PaulWessel Jun 15, 2020
26fcdce
Merge branch 'master' into gmt-themes
PaulWessel Jun 16, 2020
117f9e6
Merge branch 'master' into gmt-themes
PaulWessel Jun 16, 2020
45fbdc9
Merge branch 'master' into gmt-themes
PaulWessel Jun 16, 2020
b52e985
Merge branch 'master' into gmt-themes
PaulWessel Jun 16, 2020
0f0364f
Fix subplot with WrStZ defaults under modern
PaulWessel Jun 17, 2020
e49cb23
Merge branch 'master' into gmt-themes
PaulWessel Jun 17, 2020
46f45b6
Merge branch 'master' into gmt-themes
PaulWessel Jun 17, 2020
ec2c3ac
Let MAP_ANNOT_MIN_SPACING join the auto-scaled items
PaulWessel Jun 17, 2020
c22b2d2
Do not let gmtset expand auto to anything
PaulWessel Jun 18, 2020
34ac6bf
Merge branch 'master' into gmt-themes
PaulWessel Jun 19, 2020
b6059ff
Merge branch 'master' into gmt-themes
PaulWessel Jun 19, 2020
e7c399e
Fix vector shape init
PaulWessel Jun 19, 2020
9fdad46
protect sides in psscale.
PaulWessel Jun 20, 2020
73caced
Update gmt_init.c
PaulWessel Jun 20, 2020
1d6483c
Fix pstext to initialize default font
PaulWessel Jun 20, 2020
a973ac6
Merge branch 'master' into gmt-themes
PaulWessel Jun 20, 2020
c75890d
Forgot to update the theme in gmtinit_conf_modern_override (#3508)
PaulWessel Jun 20, 2020
3fbf791
Merge branch 'master' into gmt-themes
PaulWessel Jun 21, 2020
f5509b9
Merge branch 'master' into gmt-themes
PaulWessel Jun 21, 2020
0ec026d
Lengthen ticks and slightly increase font size
PaulWessel Jun 22, 2020
2a2996e
Fix multiple addition of frame width
PaulWessel Jun 22, 2020
d4d934b
Merge branch 'master' into gmt-themes
PaulWessel Jun 22, 2020
e7354cc
Merge branch 'master' into gmt-themes
PaulWessel Jun 23, 2020
5580651
Merge branch 'master' into gmt-themes
PaulWessel Jun 27, 2020
d16a458
Merge branch 'master' into gmt-themes
PaulWessel Jun 28, 2020
de284d6
Update gmt_init.c
PaulWessel Jun 28, 2020
899b4aa
Merge branch 'master' into gmt-themes
PaulWessel Jun 30, 2020
bc0b648
Merge branch 'master' into gmt-themes
PaulWessel Jul 2, 2020
8bf9065
Merge branch 'master' into gmt-themes
PaulWessel Jul 27, 2020
9dfc08a
Merge branch 'master' into gmt-themes
PaulWessel Aug 5, 2020
5cf6ccd
Merge branch 'master' into gmt-themes
PaulWessel Aug 6, 2020
111cfa2
Merge branch 'master' into gmt-themes
PaulWessel Aug 7, 2020
949405d
Merge branch 'master' into gmt-themes
PaulWessel Aug 8, 2020
40e8998
Merge branch 'master' into gmt-themes
PaulWessel Aug 23, 2020
3c08a11
Merge branch 'master' into gmt-themes
PaulWessel Sep 20, 2020
4e0905e
Merge branch 'master' into gmt-themes
PaulWessel Oct 22, 2020
3a59e40
Merge branch 'master' into gmt-themes
PaulWessel Oct 23, 2020
32f41f8
Merge branch 'master' into gmt-themes
PaulWessel Oct 23, 2020
c3a85cb
Merge branch 'master' into gmt-themes
PaulWessel Oct 23, 2020
3b89ca9
Merge branch 'master' into gmt-themes
PaulWessel Oct 27, 2020
f47bef1
Update gmt_init.c
PaulWessel Oct 27, 2020
1e6f44c
Merge branch 'master' into gmt-themes
PaulWessel Nov 2, 2020
a5c5079
Merge branch 'master' into gmt-themes
PaulWessel Nov 9, 2020
d174641
Merge branch 'master' into gmt-themes
PaulWessel Nov 19, 2020
fb5dd69
Merge branch 'master' into gmt-themes
PaulWessel Nov 21, 2020
14f5232
Merge branch 'master' into gmt-themes
PaulWessel Nov 24, 2020
0dcbf8a
Merge branch 'master' into gmt-themes
PaulWessel Nov 24, 2020
518f0f0
Update inverse.conf
PaulWessel Nov 24, 2020
6411258
Merge branch 'master' into gmt-themes
PaulWessel Nov 29, 2020
b2caeb7
Merge branch 'master' into gmt-themes
PaulWessel Nov 29, 2020
d9ec934
Merge branch 'master' into gmt-themes
PaulWessel Nov 30, 2020
037a305
Merge branch 'master' into gmt-themes
PaulWessel Dec 17, 2020
fdf1278
Update gmt_init.c
PaulWessel Dec 17, 2020
17d28db
Merge branch 'master' into gmt-themes
PaulWessel Dec 18, 2020
90fe9b3
Fix auto setting for MAP_FRAME_WIDTH
Dec 19, 2020
4f94c6c
Merge branch 'master' into gmt-themes
PaulWessel Dec 19, 2020
8c11d96
Merge branch 'master' into gmt-themes
PaulWessel Dec 20, 2020
1ab298d
Merge branch 'master' into gmt-themes
PaulWessel Dec 21, 2020
21645b9
Update modern theme and add minimal theme (#4596)
Dec 22, 2020
abd1574
Merge branch 'master' into gmt-themes
PaulWessel Dec 23, 2020
24dee4e
Merge branch 'master' into gmt-themes
PaulWessel Dec 23, 2020
d16d038
Merge branch 'master' into gmt-themes
PaulWessel Dec 24, 2020
762263d
Merge branch 'master' into gmt-themes
PaulWessel Dec 25, 2020
9eff498
Merge branch 'master' into gmt-themes
PaulWessel Dec 26, 2020
f178119
Merge branch 'master' into gmt-themes
PaulWessel Dec 26, 2020
fb202a4
Merge branch 'master' into gmt-themes
PaulWessel Dec 27, 2020
4cef503
Merge branch 'master' into gmt-themes
PaulWessel Dec 27, 2020
a4adf9d
Merge branch 'master' into gmt-themes
PaulWessel Dec 27, 2020
07d3cf7
Merge branch 'master' into gmt-themes
PaulWessel Dec 28, 2020
36c7f48
Merge branch 'master' into gmt-themes
PaulWessel Dec 29, 2020
44231d2
Remove unfinished themes darkmode, inverse, movie
PaulWessel Dec 30, 2020
f407415
Update doc/rst/source/gmt.conf.rst
PaulWessel Jan 2, 2021
fc1c770
Update src/gmt_init.c
PaulWessel Jan 2, 2021
9b6c1c7
Merge branch 'master' into gmt-themes
PaulWessel Jan 3, 2021
212ca8f
Merge branch 'master' into gmt-themes
PaulWessel Jan 4, 2021
dc202e6
Merge branch 'master' into gmt-themes
PaulWessel Jan 6, 2021
35201fc
Merge branch 'master' into gmt-themes
PaulWessel Jan 8, 2021
947c0d1
Merge branch 'master' into gmt-themes
PaulWessel Jan 9, 2021
c9b0e50
Merge branch 'master' into gmt-themes
PaulWessel Jan 10, 2021
94f52ca
Merge branch 'master' into gmt-themes
PaulWessel Jan 12, 2021
49d9db2
Merge branch 'master' into gmt-themes
PaulWessel Jan 17, 2021
338ecfc
Merge branch 'master' into gmt-themes
PaulWessel Jan 17, 2021
e293b84
Merge branch 'master' into gmt-themes
PaulWessel Jan 17, 2021
4dd8bbe
Merge branch 'master' into gmt-themes
PaulWessel Jan 18, 2021
c8edc3d
Update doc/rst/source/cookbook/features.rst
Jan 20, 2021
a303ef7
Update doc/examples/ex41/ex41.sh
Jan 20, 2021
a02d297
Merge branch 'master' into gmt-themes
PaulWessel Jan 24, 2021
6f469ca
Merge branch 'master' into gmt-themes
PaulWessel Jan 24, 2021
2236a6b
Merge branch 'master' into gmt-themes
PaulWessel Jan 25, 2021
c1b22e6
Remove MAP_ANNOT_MIN_SPACING auto-scaling (#4704)
Jan 25, 2021
9b20b76
Update doc/scripts/GMT_TM.sh
Jan 25, 2021
e9f3081
Merge branch 'master' into gmt-themes
PaulWessel Jan 26, 2021
53350c5
Add auto-scaling for new subtitle font as well
PaulWessel Jan 28, 2021
899f9c1
Merge branch 'master' into gmt-themes
PaulWessel Jan 29, 2021
8014b27
Testing a GMT_THEME off solution (#4710)
PaulWessel Jan 29, 2021
73e2263
Themes autoaxes (#4715)
PaulWessel Jan 29, 2021
e974773
Subplot axes (#4720)
PaulWessel Jan 30, 2021
c42796f
Fix delayed get_scale calls
PaulWessel Jan 30, 2021
003a1ef
Update pslegend.c
PaulWessel Jan 30, 2021
8099be7
Update pslegend.c
PaulWessel Jan 30, 2021
3c0a6e9
Update psscale.c
PaulWessel Jan 30, 2021
6e8eace
Update pslegend.c
PaulWessel Jan 30, 2021
133d5bc
Update GMT_legend.sh
PaulWessel Jan 30, 2021
ab72c23
Use geometric mean of plot dimensions for reference, and delete temp …
PaulWessel Jan 30, 2021
6f88783
Allow testing of classic only via -DNO_THEMES
PaulWessel Jan 30, 2021
db0e920
Update gmt_map.c
PaulWessel Jan 30, 2021
0a8804d
Merge branch 'master' into gmt-themes
PaulWessel Jan 31, 2021
c70b5b6
Merge branch 'master' into gmt-themes
PaulWessel Jan 31, 2021
3214e29
Update documentation for gmt themes (#4717)
Jan 31, 2021
a4443bf
Update auto-scaling docs for unknown dimensions
Jan 31, 2021
f3ccd17
Merge branch 'master' into gmt-themes
PaulWessel Jan 31, 2021
76bfed5
Resolve conflicts and merge branch 'master' into 'gmt-themes'
Feb 2, 2021
dc32c0c
Update doc/scripts/GMT_dir_rose.sh
Feb 2, 2021
3800137
Remove trailing whitespace
Feb 2, 2021
5f70e10
Handle gmt set GMT_THEME classic in a modern session (#4726)
PaulWessel Feb 2, 2021
6c2d2ac
Merge branch 'master' into gmt-themes
Feb 13, 2021
95b45d2
Merge branch 'master' into gmt-themes
PaulWessel Feb 16, 2021
13d77c0
Update GMT_legend.sh test
Feb 17, 2021
9d294db
Add NO_THEMES definition to template
Feb 17, 2021
4b69b1f
Update GMT_Defaults_1b.sh test
Feb 17, 2021
aefbe53
Update position for anim02.sh
Feb 17, 2021
faaceff
Update TMcontours.sh test
Feb 17, 2021
e6c94d9
Init frame_width before using it to init tick length
PaulWessel Feb 18, 2021
baf362d
Merge branch 'master' into gmt-themes
PaulWessel Feb 18, 2021
bcfc284
Merge branch 'master' into gmt-themes
Feb 23, 2021
79508c9
Merge branch 'master' into gmt-themes
PaulWessel Feb 25, 2021
45c6f12
Merge branch 'master' into gmt-themes
Feb 25, 2021
b191f1a
Add auto scaling for MAP_ANNOT_MIN_SPACING
Feb 25, 2021
d166928
Auto for MAP_POLAR_CAP (#4854)
PaulWessel Feb 25, 2021
768ac07
Merge branch 'master' into gmt-themes
Mar 3, 2021
6da815a
Setup map before histogram autolegend
Mar 3, 2021
3da13b3
Explore separate MAP_ANNOT_OBLIQUE settings for oblique and other pro…
PaulWessel Mar 3, 2021
35ca192
Merge branch 'master' into gmt-themes
PaulWessel Mar 3, 2021
2bb7a65
Update gmt_init.c
PaulWessel Mar 3, 2021
3954726
Merge branch 'master' into gmt-themes
Mar 4, 2021
e9e7395
Update subplot tests
Mar 4, 2021
59b2530
Merge branch 'master' into gmt-themes
Mar 10, 2021
e5c59b8
Change warnings to debug messages
Mar 10, 2021
a365d5c
Improve spacing for anim05.sh
Mar 11, 2021
163ef48
Use consistent font size for ex49.sh
Mar 11, 2021
90b8cf9
Merge branch 'master' into gmt-themes
Mar 11, 2021
6f9f1a9
Update share/themes based on gmt_init.c
Mar 11, 2021
c736688
Update gmt.conf.rst
Mar 11, 2021
f5b246d
Update gmt-themes docs
Mar 11, 2021
99b7aea
Update PS files for -B scripts
Mar 11, 2021
89b86a7
Add cookbook theme
Mar 11, 2021
d983865
Set GMT_THEME=cookbook for doc/scripts
Mar 11, 2021
5f9df7a
Update PostScript tests
Mar 11, 2021
b91426a
Update failing test
Mar 11, 2021
dfb512e
Update failing test
Mar 11, 2021
d3bee32
Update postscript files
Mar 11, 2021
fe36b36
Update failing tests
Mar 12, 2021
6bfbe61
Update GMT_cycle_1.sh
Mar 12, 2021
92076d7
Update symbol_orientation PS files
PaulWessel Mar 12, 2021
548d1e6
Update ps for ex23 and ex49
PaulWessel Mar 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions doc/examples/ex01/ex01.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
# GMT EXAMPLE 01
#
# Purpose: Make two contour maps based on the data in the file osu91a1f_16.nc
# GMT modules: set, subplot, grdcontour, coast
# GMT modules: subplot, grdcontour, coast
#
gmt begin ex01
gmt set MAP_GRID_CROSS_SIZE_PRIMARY 0 FONT_ANNOT_PRIMARY 10p
gmt subplot begin 2x1 -A -M0.5c -Blrtb -Bafg -T"Low Order Geoid" -Fs16c/0 -Rg -JH16c
gmt coast -JH? -Glightbrown -Slightblue -c0,0
gmt grdcontour @osu91a1f_16.nc -C10 -A50+f7p -Gd10c -Ln -Wcthinnest,- -Wathin,- -T+d8p/2p+l
Expand Down
4 changes: 2 additions & 2 deletions doc/examples/ex02/ex02.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ gmt begin ex02
gmt subplot set 0,0 -Ce3c
gmt grd2cpt @HI_topo_02.nc -Crelief -Z
gmt grdimage @HI_topo_02.nc -I+a0
gmt colorbar -DJRM+o1.5c/0+mc -I0.3 -Bx2+lTOPO -By+lkm
gmt colorbar -DJRM+o1c/0+mc -I0.3 -Bx2+lTOPO -By+lkm

gmt subplot set 1,0 -Ce3c
gmt makecpt -Crainbow -T-2/14/2
gmt grdimage @HI_geoid_02.nc
gmt colorbar -DJRM+o1.5c/0+e+mc -Bx2+lGEOID -By+lm
gmt colorbar -DJRM+o1c/0+e+mc -Bx2+lGEOID -By+lm
gmt subplot end
gmt end show
2 changes: 1 addition & 1 deletion doc/examples/ex09/ex09.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ gmt begin ex09
gmt plot @ridge_09.txt -Wthicker
gmt plot @fz_09.txt -Wthinner,-
# Take label from segment header and plot near coordinates of last record of each track
gmt convert -El @tracks_09.txt | gmt text -F+f10p,Helvetica-Bold+a50+jRM+h -D-4p
gmt convert -El @tracks_09.txt | gmt text -F+f10p,Helvetica-Bold+a50+jRM+h -D-4p -Ghoneydew
gmt end show
1 change: 0 additions & 1 deletion doc/examples/ex16/ex16.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# Unix progs: rm
#
gmt begin ex16
gmt set FONT_ANNOT_PRIMARY 9p FONT_TITLE 18p,Times-Roman
gmt subplot begin 2x2 -M0.1c -Fs8c/0 -R0/6.5/-0.2/6.5 -Jx1c -SCb -SRl+t -Bwesn -T"Gridding of Data"
gmt surface @Table_5_11.txt -I0.2 -Graws0.nc
gmt contour @Table_5_11.txt -C@ex_16.cpt -I -B+t"contour (triangulate)" -c0,0
Expand Down
8 changes: 4 additions & 4 deletions doc/examples/ex19/ex19.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ gmt begin ex19
gmt grdimage lon.nc -Clon.cpt -nl
gmt coast -Q
gmt coast -Dc -A5000 -Wthinnest
echo "0 20 16TH INTERNATIONAL" | gmt text -F+f32p,Helvetica-Bold,red=thinner
echo "0 20 17TH INTERNATIONAL" | gmt text -F+f32p,Helvetica-Bold,red=thinner
echo "0 -10 GMT CONFERENCE" | gmt text -F+f32p,Helvetica-Bold,red=thinner
echo "0 -30 Honolulu, Hawaii, April 1, 2020" | gmt text -F+f18p,Helvetica-Bold,green=thinnest
echo "0 -30 Honolulu, Hawaii, April 1, 2021" | gmt text -F+f18p,Helvetica-Bold,green=thinnest
# Then show example of color patterns and placing a PostScript image
gmt coast -Dc -A5000 -Gp86+fred+byellow+r100 -Sp@circuit.png+r100 -c1,0
echo "0 30 SILLY USES OF" | gmt text -F+f32p,Helvetica-Bold,lightgreen=thinner
Expand All @@ -30,9 +30,9 @@ gmt begin ex19
gmt grdimage lat.nc -Clat.cpt -nl
gmt coast -Q
gmt coast -Dc -A5000 -Wthinnest
echo "0 20 16TH INTERNATIONAL" | gmt text -F+f32p,Helvetica-Bold,red=thinner
echo "0 20 17TH INTERNATIONAL" | gmt text -F+f32p,Helvetica-Bold,red=thinner
echo "0 -10 GMT CONFERENCE" | gmt text -F+f32p,Helvetica-Bold,red=thinner
echo "0 -30 Honolulu, Hawaii, April 1, 2020" | gmt text -F+f18p,Helvetica-Bold,green=thinnest
echo "0 -30 Honolulu, Hawaii, April 1, 2021" | gmt text -F+f18p,Helvetica-Bold,green=thinnest
gmt subplot end
gmt end show
rm -f lat.nc lon.nc lat.cpt lon.cpt
6 changes: 2 additions & 4 deletions doc/examples/ex22/ex22.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
# GMT EXAMPLE 22
#
# Purpose: Automatic map of last month of world-wide seismicity
# GMT modules: set, coast, plot, legend
# GMT modules: coast, plot, legend
# Unix progs: cat, sed, awk, wget|curl
#
gmt begin ex22
gmt set FONT_ANNOT_PRIMARY 10p FONT_TITLE 18p FORMAT_GEO_MAP ddd:mm:ssF

# Get the data (-s silently) from USGS using the curl
# Hardwired here to the month of October, 2017
# SITE="https://earthquake.usgs.gov/fdsnws/event/1/query.csv"
Expand Down Expand Up @@ -81,7 +79,7 @@ gmt begin ex22

# OK, now we can actually run gmt legend. We center the legend below the map.
# Trial and error shows that 1.7i is a good legend height:
gmt legend -DJBC+o0/1c+w18c/4.2c -F+p+glightyellow neis.legend
gmt legend -DJBC+o0/1c+w18c/4.2c -F+p+glightyellow neis.legend --FONT_ANNOT_PRIMARY=10p,Helvetica

rm neis.legend usgs_quakes_22.txt
gmt end show
2 changes: 1 addition & 1 deletion doc/examples/ex34/ex34.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# GMT modules: set, coast, makecpt, grdimage, subplot
#
gmt begin ex34
gmt set FORMAT_GEO_MAP dddF FONT_HEADING 24p
gmt set FONT_HEADING 24p
gmt makecpt -Cglobe -T-5000/5000
gmt subplot begin 2x1 -Fs11c/0 -M0.1c -JM11c -R-6/20/35/52 -SRl -SCb -Bwesn -T"Franco-Italian Union, 2042-45"
gmt coast -EFR,IT+gP300/8 -Glightgray -c1,0
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/ex37/ex37.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gmt begin ex37
# Prefix of two .nc files
G=grav.V18.par.surf.1km.sq
T=mb.par.surf.1km.sq
gmt set FONT_TITLE 14p GMT_FFT kiss
gmt set GMT_FFT kiss

gmt grdinfo @$T.nc -Ib > bbox
scl=1.4e-5
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/ex41/ex41.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# GMT modules: set, coast, legend, plot, makecpt
#
gmt begin ex41
gmt set FONT_ANNOT_PRIMARY 12p FONT_LABEL 12p
gmt set FONT_ANNOT_PRIMARY 12p,Helvetica FONT_LABEL 12p,Helvetica
gmt makecpt -Cred,orange,yellow,green,bisque,cyan,magenta,white,gray -T1/10/1 -N
gmt coast -R130W/50W/8N/56N -JM14c -Glightgray -Sazure1 -A1000 -Wfaint
gmt coast -EUS+glightyellow+pfaint -ECU+glightred+pfaint -EMX+glightgreen+pfaint -ECA+glightblue+pfaint
Expand Down
16 changes: 8 additions & 8 deletions doc/examples/ex42/ex42.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
# GMT EXAMPLE 42
#
# Purpose: Illustrate Antarctica and stereographic projection
# GMT modules: makecpt, grdimage, coast, legend, colorbar, text, plot
# GMT modules: makecpt, grdimage, coast, legend, colorbar, set, text, plot
# Unix progs: [curl grdconvert]
#
gmt begin ex42
gmt set FONT_ANNOT_PRIMARY 12p FONT_LABEL 12p PROJ_ELLIPSOID WGS-84 FORMAT_GEO_MAP dddF
gmt set PROJ_ELLIPSOID WGS-84
# Data obtained via website and converted to netCDF thus:
# curl http://www.antarctica.ac.uk//bas_research/data/access/bedmap/download/bedelev.asc.gz
# gunzip bedelev.asc.gz
# grdconvert bedelev.asc BEDMAP_elevation.nc=ns -V
gmt makecpt -Cearth -T-7000/4000
gmt grdimage @BEDMAP_elevation.nc -Jx1:60000000 -Q
gmt coast -R-180/180/-90/-60 -Js0/-90/-71/1:60000000 -Bafg -Di -W0.25p
gmt colorbar -DJRM+w6.5c/0.5c+o1.5c/0+mc -F+p+i -Bxa1000+lELEVATION -By+lm
gmt colorbar -DJRM+w6.5c/0.5c+o1c/0+mc -F+p+i -Bxa1000+lELEVATION -By+lm
# GSHHG
gmt coast -Glightblue -Sroyalblue2 -X5c -Y12c
gmt coast -Glightbrown -A+ag -Bafg
gmt legend -DjLM+w4c+jRM+o1c/0 -F+p+i <<- EOF
H 18p,Times-Roman Legend
gmt legend -DjLM+w3.5c+jRM+o1c/0 -F+p+i <<- EOF
H 12 Legend
D 0.25c 1p
S 0.4c s 0.5c blue 0.25p 0.75c Ocean
S 0.4c s 0.5c lightblue 0.25p 0.75c Ice front
S 0.4c s 0.5c lightbrown 0.25p 0.75c Grounding line
S 0.4c s 0.3c blue 0.25p 0.75c Ocean
S 0.4c s 0.3c lightblue 0.25p 0.75c Ice front
S 0.4c s 0.3c lightbrown 0.25p 0.75c Grounding line
EOF
# Fancy line
gmt plot -R0/19/0/25 -Jx1c -B0 -W2p -X-6c -Y-13.5c <<- EOF
Expand Down
1 change: 0 additions & 1 deletion doc/examples/ex50/ex50.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

gmt begin ex50
# Left column have all the PDFs
gmt set FONT_ANNOT_PRIMARY 10p,Helvetica,black
# Binomial distribution
gmt math -T0/8/1 0.25 8 T BPDF = p.txt
gmt plot -R-0.6/8.6/0/0.35 -JX7.5c/1.25c -Glightgreen p.txt -Sb0.8u -W0.5p -BWS -Bxa1 -Byaf
Expand Down
56 changes: 56 additions & 0 deletions doc/rst/source/cookbook/features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,62 @@ placed in a separate parameter file:
scenarios into separate ``gmt.conf`` files will minimize headaches associated with
micro-editing of illustrations.

Automatic GMT settings
~~~~~~~~~~~~~~~~~~~~~~

In modern mode (as well as in classic when **GMT_THEME** is set to *modern*), a series of
dimensions for items affecting plots are set to *auto*. This flag signals that suitable
dimensions will be automatically computed when the plot dimensions are known. The items
affected by this mechanism are:

================================== ===============================================
:term:`FONT_LOGO` Logo font [8p,Helvetica]
:term:`FONT_ANNOT_PRIMARY` Primary annotation font [10p,AvantGarde-Book]
:term:`FONT_ANNOT_SECONDARY` Secondary annotation font [12p,AvantGarde-Book]
:term:`FONT_LABEL` Axis label font [14p,AvantGarde-Book]
:term:`FONT_TAG` Tag/labeling font [18p,AvantGarde-Book]
:term:`FONT_TITLE` Plot title font [22p,AvantGarde-Demi]
:term:`FONT_HEADING` Subplot heading font [28p,AvantGarde-Demi]
:term:`MAP_ANNOT_MIN_SPACING` Minimum spacing between annotations [36p]
:term:`MAP_ANNOT_OFFSET_PRIMARY` Primary annotation offset from axis [3p]
:term:`MAP_ANNOT_OFFSET_SECONDARY` Secondary annotation offset from axis [3p]
:term:`MAP_FRAME_WIDTH` Width of fancy frame [3p]
:term:`MAP_HEADING_OFFSET` Heading offset from subplot [16p]
:term:`MAP_LABEL_OFFSET` Label offset from annotations [6p]
:term:`MAP_TICK_LENGTH_PRIMARY` Length of primary tick marks [3p/1.5p]
:term:`MAP_TICK_LENGTH_SECONDARY` Length of secondary tick marks [12p/3p]
:term:`MAP_TITLE_OFFSET` Title offset from plot [12p]
:term:`MAP_FRAME_PEN` Pen width of plain frame [thicker]
:term:`MAP_TICK_PEN_PRIMARY` Pen width of primary tick marks [thinner]
:term:`MAP_TICK_PEN_SECONDARY` Pen width of secondary tick marks [thinner]
:term:`MAP_GRID_PEN_PRIMARY` Pen width of primary gridline [default]
:term:`MAP_GRID_PEN_SECONDARY` Pen width of secondary gridline [thinner]
================================== ===============================================

The fonts and reference dimensions listed in brackets are the values you get for a plot
that has a maximum dimension of exactly 25 cm. Larger and smaller illustrations
will see a linear magnification or attenuation of these dimensions. The primary
annotation font size will be computed as::

size = (2/15) * (map_size_in_cm - 10) + 8 [in points]

and all other items will have their reference sizes scaled by *scale = size / 10*.
If you do nothing then all of the above dimensions will be automatically set
based on your plot dimensions. However, you are free to override any of them
using the methods described in the next section. **Note**: The particular scaling
relationship is experimental in 6.1 and we reserve the right to adjust it pending
further experimentation and user feedback.

A few default settings items have different values as well but are not subject
to any scaling:

========================== =========================================
:term:`FORMAT_GEO_MAP` Geographic annotation format [ddd:mm:ssF]
:term:`MAP_FRAME_AXES` Axes selection and draw mode [WrStZ]
:term:`MAP_FRAME_TYPE` Style of geographic map frame [plain]
:term:`MAP_VECTOR_SHAPE` Vector head shape parameter [0.5]
========================== =========================================

Changing GMT defaults
~~~~~~~~~~~~~~~~~~~~~

Expand Down
9 changes: 8 additions & 1 deletion doc/rst/source/gmt.conf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,13 @@ GMT Miscellaneous Parameters
Sets the upper limit on the number of cores any multi-threaded module might
use (whether **-x** is selected or not) [0, i.e., as many as are available].

**GMT_THEME**
Override GMT default settings with those of the selected theme. Choose from
*classic* [Default for classic mode], *modern* [Default for modern mode],
and *minimal*. You can also create and use your own themes by compiling
files of desired settings and place them in your GMT user themes directory
(usually ~/.gmt/themes) and name them *theme*.conf.

**GMT_TRIANGULATE**
Determines if we use the **Watson** [Default] or **Shewchuk**
algorithm (if configured during installation) for triangulation.
Expand Down Expand Up @@ -592,7 +599,7 @@ MAP Parameters
**MAP_ANNOT_MIN_SPACING**
If an annotation would be plotted less than this minimum distance
from its closest neighbor, the annotation is not plotted (this may
occur for certain oblique projections.) [0p]
occur for certain oblique or polar projections.) [32p]

**MAP_ANNOT_OBLIQUE**
This argument is a comma-separated list of up to seven keywords:
Expand Down
2 changes: 1 addition & 1 deletion doc/scripts/GMT_API_use.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ EOF
EOF
gmt text -F+f12p+jCM -Gwhite -W0.25p -C50% << EOF
-2.8 0.75 FILES OR STDIN
+2.8 0.75 FILES OR STDIN
+2.8 0.75 FILES OR STDOUT
EOF
gmt text -F+f12p+jCM -Glightblue -W0.25p -C50% << EOF
-2.8 0.0 STREAMS, FILE DESCRIPTORS
Expand Down
2 changes: 1 addition & 1 deletion doc/scripts/GMT_TM.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
gmt coast -R0/360/-80/80 -JT330/-45/10c -Ba30g -BWSne -Dc -A2000 -Slightblue -G0 -ps GMT_TM
gmt coast -R0/360/-80/80 -JT330/-45/10c -Ba30g -BWSne -Dc -A2000 -Slightblue -G0 -ps GMT_TM --MAP_ANNOT_OBLIQUE=2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use keywords for MAP_ANNOT_OBLIQUE.

maxrjones marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions doc/scripts/GMT_atan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gmt begin GMT_atan
gmt grd2xyz -Z tt.t.nc > tt.d
gmt histogram tt.d -R-0.75/0.75/0/20 -JX1.5i/1i -Bx0.5 -By5f5 -BWSne -W0.01 -Gblack -Z1

gmt text -F+f9p+jLB << EOF
gmt text -F+f9p,Helvetica+jLB << EOF
-0.7 17 Raw
-0.7 15 slopes
EOF
Expand All @@ -25,7 +25,7 @@ EOF
gmt grdgradient -A45 @tut_relief.nc -Nt -fg -Gtt.tt.nc
gmt grd2xyz -Z tt.tt.nc > tt.d
gmt histogram tt.d -R-0.75/0.75/0/5 -Bx0.5 -By2f1 -BWSne -W0.01 -Gblack -X1.85i -Z1
gmt text -F+f9p+jLB << EOF
gmt text -F+f9p,Helvetica+jLB << EOF
-0.7 4.3 tan@+-1@+
-0.7 3.7 transformed
EOF
Expand Down
4 changes: 2 additions & 2 deletions doc/scripts/GMT_dir_rose.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# Showing map directional roses
gmt begin GMT_dir_rose
gmt set FONT_LABEL 10p FONT_TITLE 12p MAP_ANNOT_OBLIQUE lon_horizontal,lat_parallel MAP_TITLE_OFFSET 5p \
MAP_FRAME_WIDTH 3p FORMAT_GEO_MAP dddF FONT_ANNOT_PRIMARY 10p
gmt set MAP_AUTO_SCALE off MAP_FRAME_TYPE fancy FONT_LABEL 10p FONT_TITLE 12p MAP_TITLE_OFFSET 5p \
gmt set FONT_LABEL 10p FONT_TITLE 12p MAP_ANNOT_OBLIQUE lon_horizontal,lat_parallel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double check lines 4 and 5.

# left: Fancy kind = 1
gmt basemap -R-5/5/-5/5 -Jm0.15i -Ba5f -BWSne+gazure1 -Tdg0/0+w1i+jCM -X1i
# middle: Fancy kind = 3
Expand Down
4 changes: 1 addition & 3 deletions doc/scripts/GMT_legend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# Testing gmt legend capabilities for tables with colors

gmt begin GMT_legend
gmt set FONT_ANNOT_PRIMARY 12p FONT_LABEL 12p

cat <<EOF > table.txt
#G 0.04i
H 24 Times-Roman Eight Largest Cities in North America
Expand Down Expand Up @@ -103,6 +101,6 @@ cat << EOF > t.cpt
7 magenta
8 white
EOF
gmt legend -Dx0/0+w5.6i+jBL+l1.2 -C0.05i -F+p+gsnow1 -B0 table.txt --FONT_ANNOT_PRIMARY=12p --FONT_LABEL=12p
gmt legend -Dx0/0+w5.6i+jBL+l1.2 -C0.05i -F+p+gsnow1 -B0 table.txt --FONT_ANNOT_PRIMARY=12p,Helvetica
rm -f table.txt t.cpt
gmt end show
2 changes: 1 addition & 1 deletion doc/scripts/GMT_tut_4.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
gmt begin GMT_tut_4
gmt coast -R-130/-70/24/52 -JB-100/35/33/45/6i -B -B+t"Conic Projection" -N1/thickest -N2/thinnest -A500 -Ggray -Wthinnest
gmt coast -R-130/-70/24/52 -JB-100/35/33/45/6i -B -B+t"Conic Projection" -N1/thicker -N2/thinnest -A500 -Ggray -Wthinnest
gmt end show
4 changes: 1 addition & 3 deletions doc/scripts/GMT_utm_zones.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
# Makes a plot of the global UTM zone grid including the exceptions near Norway/Spitsbergen
#
gmt begin GMT_utm_zones
gmt set MAP_FRAME_TYPE plain FORMAT_GEO_MAP dddF MAP_TITLE_OFFSET 0.25i MAP_ANNOT_OFFSET_PRIMARY 0.15i FONT_TITLE 24p FONT_ANNOT_PRIMARY 10p PS_MEDIA 11ix8.5i

gmt coast -Rd -JQ9i -Groyalblue -Sazure -Dl -A2000 -Bx60f6 -By0 -BwsNe
gmt coast -Rd -JQ9i -Groyalblue -Sazure -Dl -A2000 -Bx60f6 -By0 -BwsNe --MAP_ANNOT_OFFSET_PRIMARY=0.15i
cat << EOF > tt.z.d
> Do S pole zone
-180 -80
Expand Down
2 changes: 1 addition & 1 deletion share/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# share/CMakeLists.txt
#

set (_gmt_share_dirs cpt custom localization mgd77 mgg spotter x2sys)
set (_gmt_share_dirs cpt custom localization mgd77 mgg spotter themes x2sys)
PaulWessel marked this conversation as resolved.
Show resolved Hide resolved

# install target for data
install (DIRECTORY ${_gmt_share_dirs}
Expand Down
32 changes: 32 additions & 0 deletions share/themes/minimal.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# Defaults file for minimal theme
#
# FONT Parameters
#
FONT_ANNOT_PRIMARY = auto,AvantGarde-Book,black
FONT_ANNOT_SECONDARY = auto,AvantGarde-Book,black
FONT_HEADING = auto,AvantGarde-Book,black
FONT_LABEL = auto,AvantGarde-Book,black
FONT_LOGO = auto,Helvetica,black
FONT_TAG = auto,AvantGarde-Book,black
FONT_TITLE = auto,AvantGarde-Book,black
#
# FORMAT Parameters
#
FORMAT_GEO_MAP = ddd:mm:ssF
#
# MAP Parameters
#
MAP_FRAME_AXES = WrStZ
MAP_ANNOT_MIN_SPACING = auto
MAP_ANNOT_OFFSET_PRIMARY = auto
MAP_ANNOT_OFFSET_SECONDARY = auto
MAP_FRAME_TYPE = plain
MAP_HEADING_OFFSET = auto
MAP_LABEL_OFFSET = auto
MAP_TICK_LENGTH_PRIMARY = auto
MAP_TICK_LENGTH_SECONDARY = auto
MAP_TITLE_OFFSET = auto
MAP_VECTOR_SHAPE = auto
MAP_GRID_PEN_PRIMARY = thinner,lightgrey
MAP_GRID_PEN_SECONDARY = thinnest,lightgrey
31 changes: 31 additions & 0 deletions share/themes/modern.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# Defaults file for modern theme (under classic)
#
# FONT Parameters
#
FONT_ANNOT_PRIMARY = auto,Helvetica,black
FONT_ANNOT_SECONDARY = auto,Helvetica,black
FONT_HEADING = auto,Helvetica-Bold,black
FONT_LABEL = auto,Helvetica,black
FONT_LOGO = auto,Helvetica,black
FONT_TAG = auto,Helvetica,black
FONT_TITLE = auto,Helvetica-Bold,black
#
# FORMAT Parameters
#
FORMAT_GEO_MAP = ddd:mm:ssF
#
# MAP Parameters
#
MAP_FRAME_AXES = WrStZ
MAP_ANNOT_MIN_SPACING = auto
MAP_ANNOT_OFFSET_PRIMARY = auto
MAP_ANNOT_OFFSET_SECONDARY = auto
MAP_FRAME_TYPE = fancy
MAP_FRAME_WIDTH = auto
MAP_HEADING_OFFSET = auto
MAP_LABEL_OFFSET = auto
MAP_TICK_LENGTH_PRIMARY = auto
MAP_TICK_LENGTH_SECONDARY = auto
MAP_TITLE_OFFSET = auto
MAP_VECTOR_SHAPE = auto
Loading