-
Notifications
You must be signed in to change notification settings - Fork 365
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
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 07af5ab
Update names
PaulWessel 1df55ec
Create darkmode.conf
PaulWessel f05bb23
Wrap up theme machinery
PaulWessel 0def46e
Update gmt.conf.rst
PaulWessel 611a61b
Update darkmode.conf
PaulWessel cbd49f9
Play with modern.conf
PaulWessel 4551f91
Trial modern.conf
PaulWessel 01feca1
Address comments
PaulWessel cdb9030
use AvantGarde font
PaulWessel e9bff3e
Bold titles
PaulWessel 511f552
Update modern.conf
PaulWessel 8b2a6b3
Update modern.conf
PaulWessel 6ad3637
Merge branch 'master' into gmt-themes
PaulWessel 64c0c62
Merge branch 'master' into gmt-themes
PaulWessel 8d41cab
Implement auto scaling
PaulWessel 3f4c3a3
Update modern.conf
PaulWessel 6f10284
Update gmt_plot.c
PaulWessel b58d03f
Update gmt_map.c
PaulWessel 1f2948a
smaller offsets
PaulWessel a625c0e
Merge branch 'master' into gmt-themes
PaulWessel bac858c
Merge branch 'master' into gmt-themes
PaulWessel a6be58f
Merge branch 'master' into gmt-themes
PaulWessel e2d3ccb
Merge branch 'master' into gmt-themes
PaulWessel 30076a8
Let modern have modern defaults
PaulWessel 919fef0
Update modern.conf
PaulWessel 2d2292d
Updates
PaulWessel 2e027ac
Leave gridlines black and lines with butt cap
PaulWessel 10c9d39
Update inverse and darkmode to be modern
PaulWessel 1ab5906
Merge branch 'master' into gmt-themes
PaulWessel 0a021c4
Merge branch 'master' into gmt-themes
PaulWessel ffe84e5
Merge branch 'master' into gmt-themes
PaulWessel 7c46728
Merge branch 'master' into gmt-themes
PaulWessel 47a982b
Move the auto-font-size function to gmt_init.c
PaulWessel 09661e3
Allow --PAR-value overrides for auto scaling
PaulWessel d8d3cd4
Merge branch 'master' into gmt-themes
PaulWessel b0042eb
Update gmt_init.c
PaulWessel 946a0b0
Improve scripts in general
PaulWessel 06025aa
Update scripts and fix internals
PaulWessel aedb084
Eliminate unneeded gmt set calls
PaulWessel e815443
Merge branch 'master' into gmt-themes
PaulWessel 6bc2bca
Update gmt_init.c
PaulWessel 38cc749
Update gmt_init.c
PaulWessel 89cd1ff
Use auto <--> NaN in gmt.conf parsing
PaulWessel e4c24c9
Update gmt_init.c
PaulWessel 4891b97
Use NaN for undefined font size as well
PaulWessel 495f251
Eliminate unneeded MAP_AUTO_SCALE
PaulWessel 5beab25
Update docs
PaulWessel 07028a8
Update subplot.c
PaulWessel 28f3dc5
Update psscale.c
PaulWessel 94c46b3
update undefined defaults at end of GMT_Parse_Common
PaulWessel 26fcdce
Merge branch 'master' into gmt-themes
PaulWessel 117f9e6
Merge branch 'master' into gmt-themes
PaulWessel 45fbdc9
Merge branch 'master' into gmt-themes
PaulWessel b52e985
Merge branch 'master' into gmt-themes
PaulWessel 0f0364f
Fix subplot with WrStZ defaults under modern
PaulWessel e49cb23
Merge branch 'master' into gmt-themes
PaulWessel 46f45b6
Merge branch 'master' into gmt-themes
PaulWessel ec2c3ac
Let MAP_ANNOT_MIN_SPACING join the auto-scaled items
PaulWessel c22b2d2
Do not let gmtset expand auto to anything
PaulWessel 34ac6bf
Merge branch 'master' into gmt-themes
PaulWessel b6059ff
Merge branch 'master' into gmt-themes
PaulWessel e7c399e
Fix vector shape init
PaulWessel 9fdad46
protect sides in psscale.
PaulWessel 73caced
Update gmt_init.c
PaulWessel 1d6483c
Fix pstext to initialize default font
PaulWessel a973ac6
Merge branch 'master' into gmt-themes
PaulWessel c75890d
Forgot to update the theme in gmtinit_conf_modern_override (#3508)
PaulWessel 3fbf791
Merge branch 'master' into gmt-themes
PaulWessel f5509b9
Merge branch 'master' into gmt-themes
PaulWessel 0ec026d
Lengthen ticks and slightly increase font size
PaulWessel 2a2996e
Fix multiple addition of frame width
PaulWessel d4d934b
Merge branch 'master' into gmt-themes
PaulWessel e7354cc
Merge branch 'master' into gmt-themes
PaulWessel 5580651
Merge branch 'master' into gmt-themes
PaulWessel d16a458
Merge branch 'master' into gmt-themes
PaulWessel de284d6
Update gmt_init.c
PaulWessel 899b4aa
Merge branch 'master' into gmt-themes
PaulWessel bc0b648
Merge branch 'master' into gmt-themes
PaulWessel 8bf9065
Merge branch 'master' into gmt-themes
PaulWessel 9dfc08a
Merge branch 'master' into gmt-themes
PaulWessel 5cf6ccd
Merge branch 'master' into gmt-themes
PaulWessel 111cfa2
Merge branch 'master' into gmt-themes
PaulWessel 949405d
Merge branch 'master' into gmt-themes
PaulWessel 40e8998
Merge branch 'master' into gmt-themes
PaulWessel 3c08a11
Merge branch 'master' into gmt-themes
PaulWessel 4e0905e
Merge branch 'master' into gmt-themes
PaulWessel 3a59e40
Merge branch 'master' into gmt-themes
PaulWessel 32f41f8
Merge branch 'master' into gmt-themes
PaulWessel c3a85cb
Merge branch 'master' into gmt-themes
PaulWessel 3b89ca9
Merge branch 'master' into gmt-themes
PaulWessel f47bef1
Update gmt_init.c
PaulWessel 1e6f44c
Merge branch 'master' into gmt-themes
PaulWessel a5c5079
Merge branch 'master' into gmt-themes
PaulWessel d174641
Merge branch 'master' into gmt-themes
PaulWessel fb5dd69
Merge branch 'master' into gmt-themes
PaulWessel 14f5232
Merge branch 'master' into gmt-themes
PaulWessel 0dcbf8a
Merge branch 'master' into gmt-themes
PaulWessel 518f0f0
Update inverse.conf
PaulWessel 6411258
Merge branch 'master' into gmt-themes
PaulWessel b2caeb7
Merge branch 'master' into gmt-themes
PaulWessel d9ec934
Merge branch 'master' into gmt-themes
PaulWessel 037a305
Merge branch 'master' into gmt-themes
PaulWessel fdf1278
Update gmt_init.c
PaulWessel 17d28db
Merge branch 'master' into gmt-themes
PaulWessel 90fe9b3
Fix auto setting for MAP_FRAME_WIDTH
4f94c6c
Merge branch 'master' into gmt-themes
PaulWessel 8c11d96
Merge branch 'master' into gmt-themes
PaulWessel 1ab298d
Merge branch 'master' into gmt-themes
PaulWessel 21645b9
Update modern theme and add minimal theme (#4596)
abd1574
Merge branch 'master' into gmt-themes
PaulWessel 24dee4e
Merge branch 'master' into gmt-themes
PaulWessel d16d038
Merge branch 'master' into gmt-themes
PaulWessel 762263d
Merge branch 'master' into gmt-themes
PaulWessel 9eff498
Merge branch 'master' into gmt-themes
PaulWessel f178119
Merge branch 'master' into gmt-themes
PaulWessel fb202a4
Merge branch 'master' into gmt-themes
PaulWessel 4cef503
Merge branch 'master' into gmt-themes
PaulWessel a4adf9d
Merge branch 'master' into gmt-themes
PaulWessel 07d3cf7
Merge branch 'master' into gmt-themes
PaulWessel 36c7f48
Merge branch 'master' into gmt-themes
PaulWessel 44231d2
Remove unfinished themes darkmode, inverse, movie
PaulWessel f407415
Update doc/rst/source/gmt.conf.rst
PaulWessel fc1c770
Update src/gmt_init.c
PaulWessel 9b6c1c7
Merge branch 'master' into gmt-themes
PaulWessel 212ca8f
Merge branch 'master' into gmt-themes
PaulWessel dc202e6
Merge branch 'master' into gmt-themes
PaulWessel 35201fc
Merge branch 'master' into gmt-themes
PaulWessel 947c0d1
Merge branch 'master' into gmt-themes
PaulWessel c9b0e50
Merge branch 'master' into gmt-themes
PaulWessel 94f52ca
Merge branch 'master' into gmt-themes
PaulWessel 49d9db2
Merge branch 'master' into gmt-themes
PaulWessel 338ecfc
Merge branch 'master' into gmt-themes
PaulWessel e293b84
Merge branch 'master' into gmt-themes
PaulWessel 4dd8bbe
Merge branch 'master' into gmt-themes
PaulWessel c8edc3d
Update doc/rst/source/cookbook/features.rst
a303ef7
Update doc/examples/ex41/ex41.sh
a02d297
Merge branch 'master' into gmt-themes
PaulWessel 6f469ca
Merge branch 'master' into gmt-themes
PaulWessel 2236a6b
Merge branch 'master' into gmt-themes
PaulWessel c1b22e6
Remove MAP_ANNOT_MIN_SPACING auto-scaling (#4704)
9b20b76
Update doc/scripts/GMT_TM.sh
e9f3081
Merge branch 'master' into gmt-themes
PaulWessel 53350c5
Add auto-scaling for new subtitle font as well
PaulWessel 899f9c1
Merge branch 'master' into gmt-themes
PaulWessel 8014b27
Testing a GMT_THEME off solution (#4710)
PaulWessel 73e2263
Themes autoaxes (#4715)
PaulWessel e974773
Subplot axes (#4720)
PaulWessel c42796f
Fix delayed get_scale calls
PaulWessel 003a1ef
Update pslegend.c
PaulWessel 8099be7
Update pslegend.c
PaulWessel 3c0a6e9
Update psscale.c
PaulWessel 6e8eace
Update pslegend.c
PaulWessel 133d5bc
Update GMT_legend.sh
PaulWessel ab72c23
Use geometric mean of plot dimensions for reference, and delete temp …
PaulWessel 6f88783
Allow testing of classic only via -DNO_THEMES
PaulWessel db0e920
Update gmt_map.c
PaulWessel 0a8804d
Merge branch 'master' into gmt-themes
PaulWessel c70b5b6
Merge branch 'master' into gmt-themes
PaulWessel 3214e29
Update documentation for gmt themes (#4717)
a4443bf
Update auto-scaling docs for unknown dimensions
f3ccd17
Merge branch 'master' into gmt-themes
PaulWessel 76bfed5
Resolve conflicts and merge branch 'master' into 'gmt-themes'
dc32c0c
Update doc/scripts/GMT_dir_rose.sh
3800137
Remove trailing whitespace
5f70e10
Handle gmt set GMT_THEME classic in a modern session (#4726)
PaulWessel 6c2d2ac
Merge branch 'master' into gmt-themes
95b45d2
Merge branch 'master' into gmt-themes
PaulWessel 13d77c0
Update GMT_legend.sh test
9d294db
Add NO_THEMES definition to template
4b69b1f
Update GMT_Defaults_1b.sh test
aefbe53
Update position for anim02.sh
faaceff
Update TMcontours.sh test
e6c94d9
Init frame_width before using it to init tick length
PaulWessel baf362d
Merge branch 'master' into gmt-themes
PaulWessel bcfc284
Merge branch 'master' into gmt-themes
79508c9
Merge branch 'master' into gmt-themes
PaulWessel 45c6f12
Merge branch 'master' into gmt-themes
b191f1a
Add auto scaling for MAP_ANNOT_MIN_SPACING
d166928
Auto for MAP_POLAR_CAP (#4854)
PaulWessel 768ac07
Merge branch 'master' into gmt-themes
6da815a
Setup map before histogram autolegend
3da13b3
Explore separate MAP_ANNOT_OBLIQUE settings for oblique and other pro…
PaulWessel 35ca192
Merge branch 'master' into gmt-themes
PaulWessel 2bb7a65
Update gmt_init.c
PaulWessel 3954726
Merge branch 'master' into gmt-themes
e9e7395
Update subplot tests
59b2530
Merge branch 'master' into gmt-themes
e5c59b8
Change warnings to debug messages
a365d5c
Improve spacing for anim05.sh
163ef48
Use consistent font size for ex49.sh
90b8cf9
Merge branch 'master' into gmt-themes
6f9f1a9
Update share/themes based on gmt_init.c
c736688
Update gmt.conf.rst
f5b246d
Update gmt-themes docs
99b7aea
Update PS files for -B scripts
89b86a7
Add cookbook theme
d983865
Set GMT_THEME=cookbook for doc/scripts
5f9df7a
Update PostScript tests
b91426a
Update failing test
dfb512e
Update failing test
d3bee32
Update postscript files
fe36b36
Update failing tests
6bfbe61
Update GMT_cycle_1.sh
92076d7
Update symbol_orientation PS files
PaulWessel 548d1e6
Update ps for ex23 and ex49
PaulWessel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
maxrjones marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.