Handle gmt set GMT_THEME classic in a modern session (#4726)

* Handle gmt set GMT_THEME classic in a modern session Since modern defaults have been set, this PR will flag all the defaults that differ between classic and modern themes so they are updated. * Update src/gmt_init.c Co-authored-by: Meghan Jones <[email protected]>
GenericMappingTools · Feb 2, 2021 · 5f70e10 · 5f70e10
1 parent 3800137
commit 5f70e10
Showing 1 changed file with 29 additions and 2 deletions.
diff --git a/src/gmt_init.c b/src/gmt_init.c
@@ -3096,8 +3096,8 @@ void gmt_reload_history (struct GMT_CTRL *GMT) {
 }
 
 void gmt_reload_settings (struct GMT_CTRL *GMT) {
-	gmt_conf_SI(GMT);				/* Get the original system defaults */
-	(void)gmt_getdefaults (GMT, NULL);	/* Overload user defaults */
+	gmt_conf_SI(GMT);				/* Get the original system defaults for SI */
+	(void)gmt_getdefaults (GMT, NULL);	/* Overload with any user defaults from initial gmt.conf */
 }
 
 /*! . */
@@ -6325,6 +6325,33 @@ GMT_LOCAL void gmtinit_conf_classic (struct GMT_CTRL *GMT) {
 
 	if (!strncmp (GMT_DEF_UNITS, "US", 2U))
 		gmtinit_conf_classic_US (GMT);	/* Override with US settings */
+
+	if (GMT->current.setting.run_mode == GMT_MODERN) {	/* Means we switch to classic in a modern mode setssion */
+		GMT_keyword_updated[GMTCASE_FONT_ANNOT_PRIMARY] = true;
+		GMT_keyword_updated[GMTCASE_FONT_ANNOT_SECONDARY] = true;
+		GMT_keyword_updated[GMTCASE_FONT_LABEL] = true;
+		GMT_keyword_updated[GMTCASE_FONT_HEADING] = true;
+		GMT_keyword_updated[GMTCASE_FONT_TAG] = true;
+		GMT_keyword_updated[GMTCASE_FONT_TITLE] = true;
+		GMT_keyword_updated[GMTCASE_FONT_SUBTITLE] = true;
+		GMT_keyword_updated[GMTCASE_FONT_LOGO] = true;
+		GMT_keyword_updated[GMTCASE_FORMAT_GEO_MAP] = true;
+		GMT_keyword_updated[GMTCASE_MAP_ANNOT_OFFSET_PRIMARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_ANNOT_OFFSET_SECONDARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_FRAME_AXES] = true;
+		GMT_keyword_updated[GMTCASE_MAP_LABEL_OFFSET] = true;
+		GMT_keyword_updated[GMTCASE_MAP_TITLE_OFFSET] = true;
+		GMT_keyword_updated[GMTCASE_MAP_HEADING_OFFSET] = true;
+		GMT_keyword_updated[GMTCASE_MAP_TICK_LENGTH_PRIMARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_TICK_LENGTH_SECONDARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_FRAME_WIDTH] = true;
+		GMT_keyword_updated[GMTCASE_MAP_FRAME_PEN] = true;
+		GMT_keyword_updated[GMTCASE_MAP_TICK_PEN_PRIMARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_TICK_PEN_SECONDARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_GRID_PEN_PRIMARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_GRID_PEN_SECONDARY] = true;
+		GMT_keyword_updated[GMTCASE_MAP_VECTOR_SHAPE] = true;
+	}
 }
 
 /*! . */