From a850e75dc079f3351294f0fb29de76b06acb5949 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 11:48:18 -1000
Subject: [PATCH 01/31] Enable -l<label> auto-legend in plot

When plotting plain symbols with known size and color/pen we can automatically build a legend file via -l in plot.  Only applies to modern mode.  Not documented yet.
---
 src/gmt_common.h     |  4 --
 src/gmt_init.c       | 87 +++++++++++++++++++++++---------------------
 src/gmt_prototypes.h |  2 +-
 src/psxy.c           | 23 +++++++++++-
 4 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/gmt_common.h b/src/gmt_common.h
index 1813f89531f..8aa07fce31a 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -185,10 +185,6 @@ struct GMT_COMMON {
 		enum GMT_enum_mdist mode;	/* Defaults to GMT_GREATCIRCLE */
 		char string[GMT_LEN8];
 	} j;
-	struct l {	/* -l<label> */
-		bool active;
-		char label[GMT_LEN128];
-	} l;
 	struct n {	/* -n[b|c|l|n][+a][+b<BC>][+c][+t<threshold>] */
 		bool active;
 		bool antialias;		/* Defaults to true, if supported */
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 00d9bf4fa85..76a224ef2e1 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -8064,16 +8064,6 @@ int gmt_parse_j_option (struct GMT_CTRL *GMT, char *arg) {
 	return (err);
 }
 
-int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
-	if (GMT->current.setting.run_mode == GMT_CLASSIC) {	/* Not in modern mode */
-		GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-l is only allowed in modern mode\n");
-		return GMT_PARSE_ERROR;
-	}
-	if (arg == NULL || arg[0] == '\0') return GMT_PARSE_ERROR;	/* Must supply the label arg */
-	strncpy (GMT->common.l.label, arg, GMT_LEN128-1);
-	return (GMT_NOERROR);
-}
-
 /*! Routine will decode the -[<col>|<colrange>|t,... arguments or just -on */
 int gmt_parse_o_option (struct GMT_CTRL *GMT, char *arg) {
 
@@ -14778,11 +14768,6 @@ int gmt_parse_common_options (struct GMT_CTRL *GMT, char *list, char option, cha
 			GMT->common.j.active = true;
 			break;
 
-		case 'l':
-			error += (GMT_more_than_once (GMT, GMT->common.l.active) || gmt_parse_l_option (GMT, item));
-			GMT->common.l.active = true;
-			break;
-
 		case 'M':	/* Backwards compatibility */
 		case 'm':
 			if (gmt_M_compat_check (GMT, 4)) {
@@ -15877,41 +15862,61 @@ int gmt_truncate_file (struct GMTAPI_CTRL *API, char *file, size_t size) {
 	return GMT_NOERROR;
 }
 
+GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file) {
+	char panel[GMT_LEN16] = {""};
+	int fig, subplot, inset;
+
+	file[0] = '\0';	/* Initialize the path */
+	gmtlib_get_cpt_level (API, &fig, &subplot, panel, &inset);	/* Determine current plot item */
+	/* Set the correct output file name given the CPT level */
+	if (inset)	/* Only one inset may be active at any given time */
+		snprintf (file, PATH_MAX, "%s/gmt.inset.legend", API->gwf_dir);
+	else if (subplot & GMT_SUBPLOT_ACTIVE) {	/* Either subplot master or a panel-specific legend */
+		if (subplot & GMT_PANEL_NOTSET)	/* Master for all subplot panels */
+			snprintf (file, PATH_MAX, "%s/gmt.%d.subplot.legend", API->gwf_dir, fig);
+		else	/* CPT for just this subplot */
+			snprintf (file, PATH_MAX, "%s/gmt.%d.panel.%s.legend", API->gwf_dir, fig, panel);
+	}
+	else if (fig)	/* Limited to one figure only */
+		snprintf (file, PATH_MAX, "%s/gmt.%d.legend", API->gwf_dir, fig);
+	else
+		snprintf (file, PATH_MAX, "%s/gmt.legend", API->gwf_dir);
+}
+
+
 int gmt_legend_file (struct GMTAPI_CTRL *API, char *file) {
-	/* Under modern mode, determines the name for the legend file for the current plot,
-	 * then returns 0 if file does not already exist and 1 if it does.
-	 * Returns -1 if under classic mode. */
-	unsigned int fig;
-	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return GMT_NOTSET;	/* This is a modern mode only feature */
-	/* Get figure number */
-	fig = gmt_get_current_figure (API);
-	sprintf (file, "%s/gmt_%d.legend", API->gwf_dir, fig);
-	if (access (file, R_OK)) return 0;	/* No such file yet */
-	return 1;	/* Found it */
+	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return 0;	/* Only available in modern mode */
+	set_legend_filename (API, file);
+	return (access (file, R_OK) == 0);
 }
 
-int gmt_add_legend_item (struct GMTAPI_CTRL *API, char *symbol, char *size, struct GMT_FILL *fill, struct GMT_PEN *pen, char *label) {
-	/* Add another entry to the legends file for automatic legend building */
+void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, char *label) {
 	char file[PATH_MAX] = {""};
 	FILE *fp = NULL;
 
-	if (gmt_legend_file (API, file) == GMT_NOTSET) return GMT_NOERROR;	/* This is a modern mode only feature */
-	if ((fp = fopen (file, "r")) == NULL) {	/* Does not exist yet, create */
-		if ((fp = fopen (file, "w")) == NULL) {	/* Could not create, WTF */
-			GMT_Report (API, GMT_MSG_NORMAL, "Failed to create file %s\n", file);
-			return GMT_ERROR_ON_FOPEN;
+	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
+
+	set_legend_filename (API, file);
+
+	/* OK, do we append or create? */
+	
+	if (access (file, R_OK)) {	/* Must create this legend file */
+		if ((fp = fopen (file, "w")) == NULL) {
+			GMT_Report (API, GMT_MSG_NORMAL, "Unable to create current legend file %s !\n", file);
+			return;
 		}
-		fprintf (fp, "# Automatically created entries for input to legend\n");
-		fprintf (fp, "# S <dx1> <symbol> <size> <fill> <pen> <dx2> <label>\n");
+		fprintf (fp, "# Auto-generated legend information file\n");
+	}
+	else if ((fp = fopen (file, "a")) == NULL) {	/* Append to existing file */
+		GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to current legend file %s !\n", file);
+		return;
 	}
-	/* Add the new entry */
-	fprintf (fp, "S - %s %s ", symbol, size);
-	(fill) ? fprintf (fp, "%s ", gmtlib_putfill (API->GMT, fill)) : fprintf (fp, "- ");
-	(pen)  ? fprintf (fp, "%s ", gmt_putpen (API->GMT, pen))      : fprintf (fp, "- ");
-	fprintf (fp, "- %s\n", label);
+	GMT_Report (API, GMT_MSG_DEBUG, "Add record to current legend file%s\n", file);
+	if (S->symbol == GMT_SYMBOL_LINE)	/* Line for legend entry */
+		fprintf (fp, "S - - 1c - %s - %s\n", gmt_putpen (API->GMT, pen), label);
+	else
+		fprintf (fp, "S - %c %gi %s %s - %s\n", S->symbol, S->size_x, (do_fill) ? gmtlib_putfill (API->GMT, fill) : "-", (do_line) ? gmt_putpen (API->GMT, pen) : "-", label);
 	fclose (fp);
-	
-	return GMT_NOERROR;
 }
 
 /*! . */
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index b3d5d776f94..3ada676513b 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -343,7 +343,7 @@ EXTERN_MSC bool gmt_consider_current_cpt (struct GMTAPI_CTRL *API, bool *active,
 EXTERN_MSC double *gmt_list_to_array (struct GMT_CTRL *GMT, char *list, unsigned int type, uint64_t *n);
 EXTERN_MSC int gmt_getfonttype (struct GMT_CTRL *GMT, char *name);
 EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file);
-EXTERN_MSC int gmt_add_legend_item (struct GMTAPI_CTRL *API, char *symbol, char *size, struct GMT_FILL *fill, struct GMT_PEN *pen, char *label);
+EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, char *label);
 EXTERN_MSC unsigned int gmt_parse_array (struct GMT_CTRL *GMT, char option, char *argument, struct GMT_ARRAY *T, unsigned int flags, unsigned int tcol);
 EXTERN_MSC unsigned int gmt_create_array (struct GMT_CTRL *GMT, char option, struct GMT_ARRAY *T, double *min, double *max);
 EXTERN_MSC void gmt_free_array (struct GMT_CTRL *GMT, struct GMT_ARRAY *T);
diff --git a/src/psxy.c b/src/psxy.c
index b16f444e03d..9e6489cd5bb 100644
--- a/src/psxy.c
+++ b/src/psxy.c
@@ -98,6 +98,10 @@ struct PSXY_CTRL {
 		unsigned int mode;	/* 1 for line, 2 for fill, 3 for both */
 		double value;
 	} Z;
+	struct PSXY_l {	/* -l[<label>] */
+		bool active;
+		char *label;
+	} l;
 };
 
 #define EBAR_CAP_WIDTH		7.0	/* Error bar cap width */
@@ -143,6 +147,7 @@ GMT_LOCAL void Free_Ctrl (struct GMT_CTRL *GMT, struct PSXY_CTRL *C) {	/* Deallo
 	gmt_M_str_free (C->C.file);
 	gmt_M_str_free (C->S.arg);
 	gmt_freepen (GMT, &C->W.pen);
+	gmt_M_str_free (C->l.label);
 	gmt_M_free (GMT, C);
 }
 
@@ -802,6 +807,12 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct PSXY_CTRL *Ctrl, struct GMT_OP
 				n_errors += gmt_verify_expectations (GMT, ztype, gmt_scanf_arg (GMT, &opt->arg[j], ztype, false, &Ctrl->Z.value), &opt->arg[j]);
 				break;
 
+			case 'l':	/* Set legend label for this plot item */
+				Ctrl->l.active = true;
+				if (Ctrl->l.label) gmt_M_str_free (Ctrl->l.label);	/* In case given more than once by mistake */
+				if (opt->arg[0]) Ctrl->l.label = strdup (opt->arg);
+				break;
+
 			default:	/* Report bad options */
 				n_errors += gmt_default_error (GMT, opt->option);
 				break;
@@ -1148,8 +1159,13 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 
 		if (S.read_symbol_cmd)	/* Must prepare for a rough ride */
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
-		else
+		else { /* Fixed symbol type throughout */
 			GMT_Set_Columns (API, GMT_IN, n_needed, GMT_COL_FIX);
+			if (Ctrl->l.active && !S.read_size && !get_rgb) {
+				/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
+				gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), Ctrl->l.label);
+			}
+		}
 		/* Determine if we need to worry about repeating periodic symbols */
 		if ((Ctrl->N.mode == PSXY_CLIP_REPEAT || Ctrl->N.mode == PSXY_NO_CLIP_REPEAT) && gmt_M_360_range (GMT->common.R.wesn[XLO], GMT->common.R.wesn[XHI]) && gmt_M_is_geographic (GMT, GMT_IN)) {
 			/* Only do this for projection where west and east are split into two separate repeating boundaries */
@@ -1815,6 +1831,11 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 		}
 		if (GMT->current.io.OGR && (GMT->current.io.OGR->geometry == GMT_IS_POLYGON || GMT->current.io.OGR->geometry == GMT_IS_MULTIPOLYGON)) polygon = true;
 
+		if (Ctrl->l.active && S.symbol == GMT_SYMBOL_LINE && !polygon) {
+			/* For specified line, width, color we can do an auto-legend entry under modern mode */
+			gmt_add_legend_item (API, &S, false, NULL, Ctrl->W.active, &(Ctrl->W.pen), Ctrl->l.label);
+		}
+
 		if (Ctrl->W.cpt_effect && Ctrl->W.pen.cptmode & 2) polygon = true;
 		for (tbl = 0; tbl < D->n_tables; tbl++) {
 			if (D->table[tbl]->n_headers && S.G.label_type == GMT_LABEL_IS_HEADER)	/* Get potential label from first header */

From 5ff57d214a479fba98c5fe696b26355b2183c6a2 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 12:27:49 -1000
Subject: [PATCH 02/31] Determine symbol sizes and have a default

If only lines are plotted with no symbol size then default to 0.5 cm.
---
 src/gmt_init.c | 2 +-
 src/pslegend.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index 76a224ef2e1..9063e25af81 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -15913,7 +15913,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	}
 	GMT_Report (API, GMT_MSG_DEBUG, "Add record to current legend file%s\n", file);
 	if (S->symbol == GMT_SYMBOL_LINE)	/* Line for legend entry */
-		fprintf (fp, "S - - 1c - %s - %s\n", gmt_putpen (API->GMT, pen), label);
+		fprintf (fp, "S - - - - %s - %s\n", gmt_putpen (API->GMT, pen), label);
 	else
 		fprintf (fp, "S - %c %gi %s %s - %s\n", S->symbol, S->size_x, (do_fill) ? gmtlib_putfill (API->GMT, fill) : "-", (do_line) ? gmt_putpen (API->GMT, pen) : "-", label);
 	fclose (fp);
diff --git a/src/pslegend.c b/src/pslegend.c
index d00ea3a8d31..a5f5e3b3a6e 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -789,6 +789,9 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 	flush_paragraph = false;
 	gap = Ctrl->C.off[GMT_Y];	/* This gets reset to 0 once we finish the first printable row */
 
+	if (def_size == 0.0)	/* No sizes specified in input file; default to 0.5 cm */
+		def_size = 0.196850393701;	/* In inches */
+
 	/* Tech, note: Using GMT->current.setting.io_seg_marker[GMT_IN] instead of GMT_OUT when writing data records as segment records
 	 * since these will become input to psxy and psxy will use the GMT_IN marker to identify these as header records. */
 
@@ -1226,6 +1229,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							off_tt = gmt_M_to_inch (GMT, txt_b);
 						d_off = 0.5 * (Ctrl->D.spacing - FONT_HEIGHT_PRIMARY) * GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;	/* To center the text */
 						row_base_y += half_line_spacing;	/* Move to center of box */
+						if (symbol[0] == '-' && !strcmp (size, "-")) sprintf (size, "%gi", def_size);	/* If no size given then we must pick what we learned above */
 						if (symbol[0] == 'f') {	/* Front is different, must plot as a line segment */
 							double length, tlen, gap;
 							int n = sscanf (size, "%[^/]/%[^/]/%s", A, B, C);

From 2e27f2674f536fdb2c09cd00ebcd0d1951d1739c Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 14:57:20 -1000
Subject: [PATCH 03/31] Add documentation and test

---
 doc/rst/source/common_SYN_OPTs.rst_ |   2 +
 doc/rst/source/explain_-l.rst_      |   2 +
 doc/rst/source/explain_-l_full.rst_ |  12 +++
 doc/rst/source/gmt.rst              |   2 +
 doc/rst/source/plot.rst             |   1 +
 doc/rst/source/plot_common.rst_     |   3 +
 doc/rst/source/std_opts.rst         | 120 ++++++++++++++--------------
 src/gmt_api.c                       |   2 +-
 src/gmt_common.h                    |  11 +++
 src/gmt_init.c                      |  64 +++++++++++++--
 src/gmt_prototypes.h                |   2 +-
 src/gmt_synopsis.h                  |   1 +
 src/psxy.c                          |  27 ++-----
 test/pslegend/autolegend.ps         | Bin 0 -> 28102 bytes
 test/pslegend/autolegend.sh         |   7 ++
 15 files changed, 170 insertions(+), 86 deletions(-)
 create mode 100644 doc/rst/source/explain_-l.rst_
 create mode 100644 doc/rst/source/explain_-l_full.rst_
 create mode 100644 test/pslegend/autolegend.ps
 create mode 100755 test/pslegend/autolegend.sh

diff --git a/doc/rst/source/common_SYN_OPTs.rst_ b/doc/rst/source/common_SYN_OPTs.rst_
index b8063573d65..9d31c816264 100644
--- a/doc/rst/source/common_SYN_OPTs.rst_
+++ b/doc/rst/source/common_SYN_OPTs.rst_
@@ -42,6 +42,8 @@
 
 .. |SYN_OPT-j| replace:: **-j**\ :ref:`flags <-j_full>`
 
+.. |SYN_OPT-l| replace:: **-l**\ :ref:`flags <-l_full>`
+
 .. |SYN_OPT-n| replace:: **-n**\ :ref:`flags <-n_full>`
 
 .. |SYN_OPT-o| replace:: **-o**\ :ref:`flags <-ocols_full>`
diff --git a/doc/rst/source/explain_-l.rst_ b/doc/rst/source/explain_-l.rst_
new file mode 100644
index 00000000000..56a6819c7ca
--- /dev/null
+++ b/doc/rst/source/explain_-l.rst_
@@ -0,0 +1,2 @@
+**-l**\ [*label*]\ [**+n**\ *ncols*][**+s**\ *size*\ ][**+t**\ *title*\ ] :ref:`(more ...) <-l_full>`
+    Add a legend entry for the plotted feature. |Add_-l|
diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
new file mode 100644
index 00000000000..38e61a2d361
--- /dev/null
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -0,0 +1,12 @@
+.. _-l_full:
+
+**-l**\ [*label*]\ [**+n**\ *ncols*][**+s**\ *size*\ ][**+t**\ *title*\ ]
+    Add a map legend entry to the session legend information file for the
+    current plot.  Optionally append a text *label* to describe the entry.
+    Several modifiers allow further changes to the legend (to be built
+    when :doc:`legend` is called): Use **+n** to change the number of columns
+    used to set the following legend items [1], use **+s** to override the size of the
+    current symbol for the legend or set a length if plotting a line or contour [same as plotted],
+    and use **+t** to add a legend title with a horizontal line separating
+    the title from the rest of the legend [no title and line].  The line will
+    use the pen specified by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
diff --git a/doc/rst/source/gmt.rst b/doc/rst/source/gmt.rst
index 26178a003d2..88a64383ea1 100644
--- a/doc/rst/source/gmt.rst
+++ b/doc/rst/source/gmt.rst
@@ -225,6 +225,8 @@ programs. No space between the option flag and the associated arguments.
 .. |Add_-j| unicode:: 0x20 .. just an invisible code
 .. include:: explain_distcalc_full.rst_
 
+.. include:: explain_-l_full.rst_
+
 .. include:: explain_-n_full.rst_
 
 .. include:: explain_-ocols_full.rst_
diff --git a/doc/rst/source/plot.rst b/doc/rst/source/plot.rst
index 52901b50b0c..e57d67fe2b0 100644
--- a/doc/rst/source/plot.rst
+++ b/doc/rst/source/plot.rst
@@ -40,6 +40,7 @@ Synopsis
 [ |SYN_OPT-g| ]
 [ |SYN_OPT-h| ]
 [ |SYN_OPT-i| ]
+[ |SYN_OPT-l| ]
 [ |SYN_OPT-p| ]
 [ |SYN_OPT-t| ]
 [ |SYN_OPT-:| ]
diff --git a/doc/rst/source/plot_common.rst_ b/doc/rst/source/plot_common.rst_
index b0733f6e997..a6b5d7aa9b3 100644
--- a/doc/rst/source/plot_common.rst_
+++ b/doc/rst/source/plot_common.rst_
@@ -219,6 +219,9 @@ Optional Arguments
 
 .. include:: explain_-icols.rst_
 
+.. |Add_-l| unicode:: 0x20 .. just an invisible code
+.. include:: explain_-l.rst_
+
 .. include:: explain_colon.rst_
 
 .. |Add_perspective| unicode:: 0x20 .. just an invisible code
diff --git a/doc/rst/source/std_opts.rst b/doc/rst/source/std_opts.rst
index a662e8d287b..285324d5d1e 100644
--- a/doc/rst/source/std_opts.rst
+++ b/doc/rst/source/std_opts.rst
@@ -2,63 +2,65 @@
 Common Options
 ##############
 
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-|         **STANDARDIZED COMMAND LINE OPTIONS**                                                                                                 |
-+====================================================================+==========================================================================+
-| **-B**\ *information*                                              | Specify map frame and axes parameters :ref:`(...) <-B_full>`             |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-J**\ *parameters*                                               | Select map projection :ref:`(...) <-J_full>`                             |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-R**\ *west/east/south/north*\ [*/zmin/zmax*][**+r**]            | Specify Region of interest :ref:`(...) <-R_full>`                        |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-U**\ [*label*][**+c**][**+j**\ *just*\ ][**+o**\ *dx*/*dy*\ ]   | Plot time-stamp on plot :ref:`(...) <-U_full>`                           |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-V**\ [*verbosity*]                                              | Run in verbose mode :ref:`(...) <-V_full>`                               |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-X**\ [**a**\ \|\ **c**\ \|\ **r**]\ *off*\ [**u**]              | Shift plot origin in *x*-direction :ref:`(...) <-XY_full>`               |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-Y**\ [**a**\ \|\ **c**\ \|\ **r**]\ *off*\ [**u**]              | Shift plot origin in *y*-direction :ref:`(...) <-XY_full>`               |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-a**\ *name=col,...*                                             | Associates aspatial data with columns :ref:`(...) <-aspatial_full>`      |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-bi**\ [*ncols*][*type*][**w**\ ][\ **+l**\ \|\ **b**]           | Select binary input :ref:`(...) <-bi_full>`                              |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-bo**\ [*ncols*][*type*][**w**\ ][\ **+l**\ \|\ **b**]           | Select binary output :ref:`(...) <-bo_full>`                             |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-c**\ [*row*\ ,\ *col*\ \|\ *index*\ ]                           | Advance plot focus to selected (or next) subplot panel                   |
-|                                                                    | :ref:`(...) <-c_full>`                                                   |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-d**\ [**i**\ \|\ **o**]\ *nodata*                               | Replace columns with *nodata* with NaN :ref:`(...) <-d_full>`            |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-e**\ [**~**]\ *"pattern"* **\| -e**\ [**~**]/\ *regexp*/[**i**] | Filter data records that match the given pattern :ref:`(...) <-e_full>`  |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-f**\ [**i**\ \|\ **o**]\ *colinfo*                              | Set formatting of ASCII input or output :ref:`(...) <-f_full>`           |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-g**\ [**+**]\ **x**\ \|\ **X**\ \|\ **y**\ \|\                  |                                                                          |
-| **Y**\ \|\ **d**\ \|\ **D**\ *gap*\ [**u**][**+n**\ \|\ **p**]     | Segment data by detecting gaps :ref:`(...) <-g_full>`                    |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-h**\ [**i**\ \|\ **o**][*n\_headers*]                           | ASCII [*I*\ \|\ *O*] tables have header record[s] :ref:`(...) <-h_full>` |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-i**\ *columns*                                                  | Selection of input columns :ref:`(...) <-icols_full>`                    |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-je**\ \|\ **f**\ \|\ **g**                                      | Mode of spherical distance calculation :ref:`(...) <-j_full>`            |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-n**\ [*type*][**+a**][\ **+b**\ *BC*]                           |                                                                          |
-| [\ **+c**\ ][\ **+t**\ *threshold*]                                | Set grid interpolation mode :ref:`(...) <-n_full>`                       |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-o**\ *columns*                                                  | Selection of output columns :ref:`(...) <-ocols_full>`                   |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-p**\ *azim*\ [/*elev*\ [/*zlevel*]][\ **+w**\ *lon0/lat0*\      |                                                                          |
-| [/*z0*]][\ **+v**\ *x0/y0*]                                        | Control 3-D perspective view :ref:`(...) <perspective_full>`             |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-r**\ [**g**\ \|\ **p**\ ]                                       | Sets grid registration :ref:`(...) <nodereg_full>`                       |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-s**\ [*cols*\ ][\ **+a**\ \|\ **+r**]                           | Control treatment of NaN records :ref:`(...) <-s_full>`                  |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-t**\ *transparency*                                             | Set layer transparency :ref:`(...) <-t_full>`                            |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-x**\ [[-]\ *n*]                                                 | Set number of cores in multi-threaded modules :ref:`(...) <core_full>`   |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-:**\ [**i**\ \|\ **o**]                                         | Expect *y*/*x* input rather than *x*/*y* :ref:`(...) <colon_full>`       |
-+--------------------------------------------------------------------+--------------------------------------------------------------------------+
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+|         **STANDARDIZED COMMAND LINE OPTIONS**                                                                                                       |
++==========================================================================+==========================================================================+
+| **-B**\ *information*                                                    | Specify map frame and axes parameters :ref:`(...) <-B_full>`             |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-J**\ *parameters*                                                     | Select map projection :ref:`(...) <-J_full>`                             |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-R**\ *west/east/south/north*\ [*/zmin/zmax*][**+r**]                  | Specify Region of interest :ref:`(...) <-R_full>`                        |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-U**\ [*label*][**+c**][**+j**\ *just*\ ][**+o**\ *dx*/*dy*\ ]         | Plot time-stamp on plot :ref:`(...) <-U_full>`                           |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-V**\ [*verbosity*]                                                    | Run in verbose mode :ref:`(...) <-V_full>`                               |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-X**\ [**a**\ \|\ **c**\ \|\ **r**]\ *off*\ [**u**]                    | Shift plot origin in *x*-direction :ref:`(...) <-XY_full>`               |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-Y**\ [**a**\ \|\ **c**\ \|\ **r**]\ *off*\ [**u**]                    | Shift plot origin in *y*-direction :ref:`(...) <-XY_full>`               |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-a**\ *name=col,...*                                                   | Associates aspatial data with columns :ref:`(...) <-aspatial_full>`      |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-bi**\ [*ncols*][*type*][**w**\ ][\ **+l**\ \|\ **b**]                 | Select binary input :ref:`(...) <-bi_full>`                              |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-bo**\ [*ncols*][*type*][**w**\ ][\ **+l**\ \|\ **b**]                 | Select binary output :ref:`(...) <-bo_full>`                             |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-c**\ [*row*\ ,\ *col*\ \|\ *index*\ ]                                 | Advance plot focus to selected (or next) subplot panel                   |
+|                                                                          | :ref:`(...) <-c_full>`                                                   |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-d**\ [**i**\ \|\ **o**]\ *nodata*                                     | Replace columns with *nodata* with NaN :ref:`(...) <-d_full>`            |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-e**\ [**~**]\ *"pattern"* **\| -e**\ [**~**]/\ *regexp*/[**i**]       | Filter data records that match the given pattern :ref:`(...) <-e_full>`  |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-f**\ [**i**\ \|\ **o**]\ *colinfo*                                    | Set formatting of ASCII input or output :ref:`(...) <-f_full>`           |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-g**\ [**+**]\ **x**\ \|\ **X**\ \|\ **y**\ \|\                        |                                                                          |
+| **Y**\ \|\ **d**\ \|\ **D**\ *gap*\ [**u**][**+n**\ \|\ **p**]           | Segment data by detecting gaps :ref:`(...) <-g_full>`                    |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-h**\ [**i**\ \|\ **o**][*n\_headers*]                                 | ASCII [*I*\ \|\ *O*] tables have header record[s] :ref:`(...) <-h_full>` |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-i**\ *columns*                                                        | Selection of input columns :ref:`(...) <-icols_full>`                    |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-je**\ \|\ **f**\ \|\ **g**                                            | Mode of spherical distance calculation :ref:`(...) <-j_full>`            |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-l**\ [*label*]\ [**+n**\ *cols*][**+s**\ *size*\ ][**+t**\ *title*\ ] | Add item to plot legend :ref:`(...) <-l_full>`                           |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-n**\ [*type*][**+a**][\ **+b**\ *BC*]                                 |                                                                          |
+| [\ **+c**\ ][\ **+t**\ *threshold*]                                      | Set grid interpolation mode :ref:`(...) <-n_full>`                       |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-o**\ *columns*                                                        | Selection of output columns :ref:`(...) <-ocols_full>`                   |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-p**\ *azim*\ [/*elev*\ [/*zlevel*]][\ **+w**\ *lon0/lat0*\            |                                                                          |
+| [/*z0*]][\ **+v**\ *x0/y0*]                                              | Control 3-D perspective view :ref:`(...) <perspective_full>`             |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-r**\ [**g**\ \|\ **p**\ ]                                             | Sets grid registration :ref:`(...) <nodereg_full>`                       |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-s**\ [*cols*\ ][\ **+a**\ \|\ **+r**]                                 | Control treatment of NaN records :ref:`(...) <-s_full>`                  |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-t**\ *transparency*                                                   | Set layer transparency :ref:`(...) <-t_full>`                            |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-x**\ [[-]\ *n*]                                                       | Set number of cores in multi-threaded modules :ref:`(...) <core_full>`   |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
+| **-:**\ [**i**\ \|\ **o**]                                               | Expect *y*/*x* input rather than *x*/*y* :ref:`(...) <colon_full>`       |
++--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 
diff --git a/src/gmt_api.c b/src/gmt_api.c
index bdd612b5604..a4e510be6f7 100644
--- a/src/gmt_api.c
+++ b/src/gmt_api.c
@@ -11010,7 +11010,7 @@ int GMT_Option (void *V_API, const char *options) {
 				break;
 			case 'd':	/* Nodata flag -d, -di, -do */
 				if (p[1] == 'i') arg[k++] = 'k';
-				else if (p[1] == 'o') arg[k++] = 'l';
+				else if (p[1] == 'o') arg[k++] = 'm';
 				else arg[k++] = 'd';
 				break;
 			case 'j':	/* Spherical distance calculation mode */
diff --git a/src/gmt_common.h b/src/gmt_common.h
index 8aa07fce31a..6ad76439863 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -54,6 +54,13 @@ enum GMT_enum_gaps {GMT_NEGGAP_IN_COL = 0,	/* Check if previous minus current co
 #define GSET	2	/* Index into R.active[] for -r */
 #define FSET	3	/* Index into R.active[] for "got -R -I -r from a grid file" */
 
+struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
+	char label[GMT_LEN128];	/* The label to go with the symbol */
+	char title[GMT_LEN128];	/* Title for the whole legend */
+	double size;		/* Override symbol size or set length of a line */
+	unsigned int ncols;	/* How many columns to use for symbols */
+};
+
 /*! Structure with all information given via the common GMT command-line options -R -J .. */
 struct GMT_COMMON {
 	struct synopsis {	/* \0 (zero) or ^ */
@@ -185,6 +192,10 @@ struct GMT_COMMON {
 		enum GMT_enum_mdist mode;	/* Defaults to GMT_GREATCIRCLE */
 		char string[GMT_LEN8];
 	} j;
+	struct l {	/* -l[<label>][+s<size>][+t<title>][+n<ncols>][+d<gap>/<pen>] */
+		bool active;
+		struct GMT_LEGEND_ITEM item;
+	} l;
 	struct n {	/* -n[b|c|l|n][+a][+b<BC>][+c][+t<threshold>] */
 		bool active;
 		bool antialias;		/* Defaults to true, if supported */
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 9063e25af81..c7370d68ca3 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -6529,7 +6529,13 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 			gmt_message (GMT, "\t-di Replace any <nodata> in input data with NaN.\n");
 			break;
 
-		case 'l':	/* -do option to tell GMT the relationship between NaN and a nan-proxy for output */
+		case 'l':	/* -l option to set up auto-legend items*/
+
+			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.\n");
+			gmt_message (GMT, "\t   Optionally, append +n<cols>, +s<size>, +t<title>.\n");
+			break;
+
+		case 'm':	/* -do option to tell GMT the relationship between NaN and a nan-proxy for output */
 
 			gmt_message (GMT, "\t-do Replace any NaNs in output data with <nodata>.\n");
 			break;
@@ -7491,6 +7497,7 @@ int gmt_default_error (struct GMT_CTRL *GMT, char option) {
 		case 'h': error += GMT->common.h.active == false; break;
 		case 'i': error += GMT->common.i.active == false; break;
 		case 'j': error += GMT->common.j.active == false; break;
+		case 'l': error += GMT->common.l.active == false; break;
 		case 'n': error += GMT->common.n.active == false; break;
 		case 'o': error += GMT->common.o.active == false; break;
 		case 'Z':
@@ -8064,6 +8071,33 @@ int gmt_parse_j_option (struct GMT_CTRL *GMT, char *arg) {
 	return (err);
 }
 
+/*! Parse the legend-building option -l */
+int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
+	char *c = NULL;
+	if (GMT->current.setting.run_mode == GMT_CLASSIC) {     /* Not in modern mode */
+		GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-l is only allowed in modern mode\n");
+		return GMT_PARSE_ERROR;
+	}
+	if (arg == NULL || arg[0] == '\0') return GMT_PARSE_ERROR;      /* Must supply the label arg */
+
+	if ((c = gmt_first_modifier (GMT, arg, "dnst"))) {	/* Got modifiers */
+		unsigned int pos = 0, n_errors = 0;
+		char txt[GMT_LEN128] = {""};
+		while (gmt_getmodopt (GMT, 'l', c, "dnst", &pos, txt, &n_errors) && n_errors == 0) {
+			switch (txt[0]) {
+				case 't': strncpy (GMT->common.l.item.title, &txt[1], GMT_LEN128-1);	break;	/* Legend title */
+				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);	break;	/* Number of columns */
+				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Symbol size or line length */
+				default: break;	/* These are caught in gmt_getmodopt so break is just for Coverity */
+			}
+		}
+		c[0] = '\0';	/* Chop'em off */
+	}
+	if (arg[0]) strncpy (GMT->common.l.item.label, arg, GMT_LEN128-1);
+	if (c) c[0] = '+';	/* Restore */
+	return (GMT_NOERROR);
+}
+
 /*! Routine will decode the -[<col>|<colrange>|t,... arguments or just -on */
 int gmt_parse_o_option (struct GMT_CTRL *GMT, char *arg) {
 
@@ -14502,7 +14536,7 @@ GMT_LOCAL int parse_proj4 (struct GMT_CTRL *GMT, char *item, char *dest) {
 #endif
 
 /*! gmt_parse_common_options interprets the command line for the common, unique options
- * -B, -J, -K, -O, -P, -R, -U, -V, -X, -Y, -b, -c, -f, -g, -h, -i, -j, -n, -o, -p, -r, -s, -t, -:, -- and -^.
+ * -B, -J, -K, -O, -P, -R, -U, -V, -X, -Y, -b, -c, -f, -g, -h, -i, -j, -l, -n, -o, -p, -r, -s, -t, -:, -- and -^.
  * The list passes all of these that we should consider.
  * The API will also consider -I for grid increments.
  */
@@ -14768,6 +14802,11 @@ int gmt_parse_common_options (struct GMT_CTRL *GMT, char *list, char option, cha
 			GMT->common.j.active = true;
 			break;
 
+		case 'l':
+			error += (GMT_more_than_once (GMT, GMT->common.l.active) || gmt_parse_l_option (GMT, item));
+			GMT->common.l.active = true;
+			break;
+
 		case 'M':	/* Backwards compatibility */
 		case 'm':
 			if (gmt_M_compat_check (GMT, 4)) {
@@ -15890,11 +15929,13 @@ int gmt_legend_file (struct GMTAPI_CTRL *API, char *file) {
 	return (access (file, R_OK) == 0);
 }
 
-void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, char *label) {
+void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item) {
 	char file[PATH_MAX] = {""};
+	double size;
 	FILE *fp = NULL;
 
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
+	if (item == NULL) return;	/* Nothing given */
 
 	set_legend_filename (API, file);
 
@@ -15906,16 +15947,27 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			return;
 		}
 		fprintf (fp, "# Auto-generated legend information file\n");
+		if (item->title[0]) {	/* Want to place a legend title */
+			fprintf (fp, "H %s %s\n", gmt_putfont (API->GMT, &API->GMT->current.setting.font_label), item->title);
+			fprintf (fp, "D 0 %s\n", gmt_putpen (API->GMT, &API->GMT->current.setting.map_default_pen));
+		}
 	}
 	else if ((fp = fopen (file, "a")) == NULL) {	/* Append to existing file */
 		GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to current legend file %s !\n", file);
 		return;
 	}
 	GMT_Report (API, GMT_MSG_DEBUG, "Add record to current legend file%s\n", file);
-	if (S->symbol == GMT_SYMBOL_LINE)	/* Line for legend entry */
-		fprintf (fp, "S - - - - %s - %s\n", gmt_putpen (API->GMT, pen), label);
+	if (item->ncols > 0)	/* Specified a different number of columns */
+		fprintf (fp, "N %d\n", item->ncols);
+	size = (item->size > 0.0) ? item->size : S->size_x;
+	if (S->symbol == GMT_SYMBOL_LINE) {	/* Line for legend entry */
+		if (size > 0.0)	/* Got a line length in inches */
+			fprintf (fp, "S - - %gi - %s - %s\n", size, gmt_putpen (API->GMT, pen), item->label);
+		else	/* Punt to the legend module */
+			fprintf (fp, "S - - - - %s - %s\n", gmt_putpen (API->GMT, pen), item->label);
+	}
 	else
-		fprintf (fp, "S - %c %gi %s %s - %s\n", S->symbol, S->size_x, (do_fill) ? gmtlib_putfill (API->GMT, fill) : "-", (do_line) ? gmt_putpen (API->GMT, pen) : "-", label);
+		fprintf (fp, "S - %c %gi %s %s - %s\n", S->symbol, size, (do_fill) ? gmtlib_putfill (API->GMT, fill) : "-", (do_line) ? gmt_putpen (API->GMT, pen) : "-", item->label);
 	fclose (fp);
 }
 
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index 3ada676513b..c1ec1587db4 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -343,7 +343,7 @@ EXTERN_MSC bool gmt_consider_current_cpt (struct GMTAPI_CTRL *API, bool *active,
 EXTERN_MSC double *gmt_list_to_array (struct GMT_CTRL *GMT, char *list, unsigned int type, uint64_t *n);
 EXTERN_MSC int gmt_getfonttype (struct GMT_CTRL *GMT, char *name);
 EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file);
-EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, char *label);
+EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item);
 EXTERN_MSC unsigned int gmt_parse_array (struct GMT_CTRL *GMT, char option, char *argument, struct GMT_ARRAY *T, unsigned int flags, unsigned int tcol);
 EXTERN_MSC unsigned int gmt_create_array (struct GMT_CTRL *GMT, char option, struct GMT_ARRAY *T, double *min, double *max);
 EXTERN_MSC void gmt_free_array (struct GMT_CTRL *GMT, struct GMT_ARRAY *T);
diff --git a/src/gmt_synopsis.h b/src/gmt_synopsis.h
index 781a6ffe453..9fac9ccf974 100644
--- a/src/gmt_synopsis.h
+++ b/src/gmt_synopsis.h
@@ -113,6 +113,7 @@
 #define GMT_h_OPT	"-h[i|o][<nrecs>][+c][+d][+r<remark>][+t<title>]"
 #define GMT_i_OPT	"-i<cols>[+l][+s<scale>][+o<offset>][,...][,t[<word>]]"
 #define GMT_j_OPT	"-je|f|g"
+#define GMT_l_OPT	"-l<label>[<mods>]"
 #define GMT_n_OPT	"-n[b|c|l|n][+a][+b<BC>][+c][+t<threshold>]"
 #define GMT_o_OPT	"-o<cols>[,...][t[<word>]]"
 #define GMT_p_OPT	"-p[x|y|z]<azim>[/<elev>[/<zlevel>]][+w<lon0>/<lat0>[/<z0>][+v<x0>/<y0>]"
diff --git a/src/psxy.c b/src/psxy.c
index 9e6489cd5bb..14f31ef1bd5 100644
--- a/src/psxy.c
+++ b/src/psxy.c
@@ -30,7 +30,7 @@
 #define THIS_MODULE_PURPOSE	"Plot lines, polygons, and symbols on maps"
 #define THIS_MODULE_KEYS	"<D{,CC(,T-<,>X},S?(=2"
 #define THIS_MODULE_NEEDS	"Jd"
-#define THIS_MODULE_OPTIONS "-:>BJKOPRUVXYabdefghipt" GMT_OPT("HMmc")
+#define THIS_MODULE_OPTIONS "-:>BJKOPRUVXYabdefghilpt" GMT_OPT("HMmc")
 
 /* Control structure for psxy */
 
@@ -98,10 +98,6 @@ struct PSXY_CTRL {
 		unsigned int mode;	/* 1 for line, 2 for fill, 3 for both */
 		double value;
 	} Z;
-	struct PSXY_l {	/* -l[<label>] */
-		bool active;
-		char *label;
-	} l;
 };
 
 #define EBAR_CAP_WIDTH		7.0	/* Error bar cap width */
@@ -147,7 +143,6 @@ GMT_LOCAL void Free_Ctrl (struct GMT_CTRL *GMT, struct PSXY_CTRL *C) {	/* Deallo
 	gmt_M_str_free (C->C.file);
 	gmt_M_str_free (C->S.arg);
 	gmt_freepen (GMT, &C->W.pen);
-	gmt_M_str_free (C->l.label);
 	gmt_M_free (GMT, C);
 }
 
@@ -397,8 +392,8 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL *API, int level) {
 		GMT_Message (API, GMT_TIME_NONE, "\t[-S[<symbol>][<size>[unit]]] [-T] [%s] [%s] [-W[<pen>][<attr>]]\n\t[%s] [%s] [-Z[l|f]<val>] [%s]\n", GMT_U_OPT, GMT_V_OPT, GMT_X_OPT, GMT_Y_OPT, GMT_a_OPT);
 	else
 		GMT_Message (API, GMT_TIME_NONE, "\t[-S[<symbol>][<size>[unit]]] [%s] [%s] [-W[<pen>][<attr>]]\n\t[%s] [%s] [-Z[l|f]<val>] [%s]\n", GMT_U_OPT, GMT_V_OPT, GMT_X_OPT, GMT_Y_OPT, GMT_a_OPT);
-	GMT_Message (API, GMT_TIME_NONE, "\t[%s] %s[%s] [%s]\n\t[%s] [%s] [%s]\n\t[%s] [%s]\n\t[%s] [%s] [%s]\n\n", GMT_bi_OPT, API->c_OPT, GMT_di_OPT, GMT_e_OPT, \
-		GMT_f_OPT, GMT_g_OPT, GMT_h_OPT, GMT_i_OPT, GMT_p_OPT, GMT_tv_OPT, GMT_colon_OPT, GMT_PAR_OPT);
+	GMT_Message (API, GMT_TIME_NONE, "\t[%s] %s[%s] [%s]\n\t[%s] [%s] [%s]\n\t[%s] [%s] [%s]\n\t[%s] [%s] [%s]\n\n", GMT_bi_OPT, API->c_OPT, GMT_di_OPT, GMT_e_OPT, \
+		GMT_f_OPT, GMT_g_OPT, GMT_h_OPT, GMT_i_OPT, GMT_l_OPT, GMT_p_OPT, GMT_tv_OPT, GMT_colon_OPT, GMT_PAR_OPT);
 
 	if (level == GMT_SYNOPSIS) return (GMT_MODULE_SYNOPSIS);
 
@@ -535,7 +530,7 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL *API, int level) {
 	GMT_Message (API, GMT_TIME_NONE, "\t   Append l for just pen color or f for fill color [Default sets both].\n");
 	GMT_Option (API, "a,bi");
 	if (gmt_M_showusage (API)) GMT_Message (API, GMT_TIME_NONE, "\t   Default is the required number of columns.\n");
-	GMT_Option (API, "c,di,e,f,g,h,i,p,t");
+	GMT_Option (API, "c,di,e,f,g,h,i,l,p,t");
 	GMT_Message (API, GMT_TIME_NONE, "\t   For plotting symbols with variable transparency read from file, give no value.\n");
 	GMT_Option (API, ":,.");
 
@@ -807,12 +802,6 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct PSXY_CTRL *Ctrl, struct GMT_OP
 				n_errors += gmt_verify_expectations (GMT, ztype, gmt_scanf_arg (GMT, &opt->arg[j], ztype, false, &Ctrl->Z.value), &opt->arg[j]);
 				break;
 
-			case 'l':	/* Set legend label for this plot item */
-				Ctrl->l.active = true;
-				if (Ctrl->l.label) gmt_M_str_free (Ctrl->l.label);	/* In case given more than once by mistake */
-				if (opt->arg[0]) Ctrl->l.label = strdup (opt->arg);
-				break;
-
 			default:	/* Report bad options */
 				n_errors += gmt_default_error (GMT, opt->option);
 				break;
@@ -1161,9 +1150,9 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
 		else { /* Fixed symbol type throughout */
 			GMT_Set_Columns (API, GMT_IN, n_needed, GMT_COL_FIX);
-			if (Ctrl->l.active && !S.read_size && !get_rgb) {
+			if (GMT->common.l.active && !S.read_size && !get_rgb) {
 				/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
-				gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), Ctrl->l.label);
+				gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
 			}
 		}
 		/* Determine if we need to worry about repeating periodic symbols */
@@ -1831,9 +1820,9 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 		}
 		if (GMT->current.io.OGR && (GMT->current.io.OGR->geometry == GMT_IS_POLYGON || GMT->current.io.OGR->geometry == GMT_IS_MULTIPOLYGON)) polygon = true;
 
-		if (Ctrl->l.active && S.symbol == GMT_SYMBOL_LINE && !polygon) {
+		if (GMT->common.l.active && S.symbol == GMT_SYMBOL_LINE && !polygon) {
 			/* For specified line, width, color we can do an auto-legend entry under modern mode */
-			gmt_add_legend_item (API, &S, false, NULL, Ctrl->W.active, &(Ctrl->W.pen), Ctrl->l.label);
+			gmt_add_legend_item (API, &S, false, NULL, Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
 		}
 
 		if (Ctrl->W.cpt_effect && Ctrl->W.pen.cptmode & 2) polygon = true;
diff --git a/test/pslegend/autolegend.ps b/test/pslegend/autolegend.ps
new file mode 100644
index 0000000000000000000000000000000000000000..68395535c855d33618a5b906c833cedd3b9fd2b2
GIT binary patch
literal 28102
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
K6J$6&X#6j@kGTr~

literal 0
HcmV?d00001

diff --git a/test/pslegend/autolegend.sh b/test/pslegend/autolegend.sh
new file mode 100755
index 00000000000..f36cc2c1c82
--- /dev/null
+++ b/test/pslegend/autolegend.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+gmt begin autolegend ps
+  gmt plot -R0/7.2/3/7.2 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+t"LEGEND"
+  gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"
+  gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
+  gmt legend -DjTR+w1.15i+o0.1i -F+p1p
+gmt end show

From 4a0c7844ab6eada14e21033ecb2c67c93861677d Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 16:33:53 -1000
Subject: [PATCH 04/31] Improve -l further

Enable vertical lines, gaps, and font selection.
---
 doc/rst/source/explain_-l_full.rst_ | 11 +++--
 src/gmt_common.h                    |  4 ++
 src/gmt_constants.h                 |  5 ++
 src/gmt_init.c                      | 76 +++++++++++++++++++++++------
 test/pslegend/autolegend.sh         |  2 +-
 5 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index 38e61a2d361..7a739e374b5 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,12 +1,13 @@
 .. _-l_full:
 
-**-l**\ [*label*]\ [**+n**\ *ncols*][**+s**\ *size*\ ][**+t**\ *title*\ ]
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+n**\ *cols*][**+s**\ *size*\ ][**+t**\ *title*\ ][**+v**\ [*pen*]]
     Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
-    when :doc:`legend` is called): Use **+n** to change the number of columns
+    when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
+    legend entry is placed [no line], use **+f** to set the font to use for title or labels,
+    use **+g** to add some vertical space [0], use **+n** to change the number of columns
     used to set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
-    and use **+t** to add a legend title with a horizontal line separating
-    the title from the rest of the legend [no title and line].  The line will
-    use the pen specified by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
+    use **+t** to add a legend title [no title], and use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
+    previous to current horizontal line [no vertical line].  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
diff --git a/src/gmt_common.h b/src/gmt_common.h
index 6ad76439863..c9de1c6ebbc 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -57,7 +57,11 @@ enum GMT_enum_gaps {GMT_NEGGAP_IN_COL = 0,	/* Check if previous minus current co
 struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
 	char label[GMT_LEN128];	/* The label to go with the symbol */
 	char title[GMT_LEN128];	/* Title for the whole legend */
+	char font[GMT_LEN32];	/* Fontsize to use */
+	char pen[2][GMT_LEN32];	/* Pens to use with +d and +v */
+	int draw;		/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
 	double size;		/* Override symbol size or set length of a line */
+	double gap;		/* Move this much down before placing symbol entry */
 	unsigned int ncols;	/* How many columns to use for symbols */
 };
 
diff --git a/src/gmt_constants.h b/src/gmt_constants.h
index fd5f2911565..8603c81e947 100644
--- a/src/gmt_constants.h
+++ b/src/gmt_constants.h
@@ -279,6 +279,11 @@ enum GMT_enum_index {
 enum GMT_enum_download {
 	GMT_NO_DOWNLOAD = 0, GMT_YES_DOWNLOAD = 1};
 
+/*! Various mode for auto-legend pens */
+enum GMT_enum_autolegend {
+	GMT_LEGEND_PEN_D  = 0, GMT_LEGEND_PEN_V  = 1,
+	GMT_LEGEND_DRAW_D = 1, GMT_LEGEND_DRAW_V = 2};
+
 /*! Various mode for axes */
 enum GMT_enum_oblique {
 	GMT_OBL_ANNOT_LON_X_LAT_Y    =  0,
diff --git a/src/gmt_init.c b/src/gmt_init.c
index c7370d68ca3..5587265c4db 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -6531,8 +6531,8 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 
 		case 'l':	/* -l option to set up auto-legend items*/
 
-			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.\n");
-			gmt_message (GMT, "\t   Optionally, append +n<cols>, +s<size>, +t<title>.\n");
+			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.  Optionally, append any\n");
+			gmt_message (GMT, "\t   of +d<pen>, +f<font>, +g<gap, +n<cols>, +s<size>, +t<title>, and +v[<pen>].\n");
 			break;
 
 		case 'm':	/* -do option to tell GMT the relationship between NaN and a nan-proxy for output */
@@ -8075,19 +8075,30 @@ int gmt_parse_j_option (struct GMT_CTRL *GMT, char *arg) {
 int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 	char *c = NULL;
 	if (GMT->current.setting.run_mode == GMT_CLASSIC) {     /* Not in modern mode */
-		GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-l is only allowed in modern mode\n");
+		GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-l is only recognized in modern mode\n");
 		return GMT_PARSE_ERROR;
 	}
-	if (arg == NULL || arg[0] == '\0') return GMT_PARSE_ERROR;      /* Must supply the label arg */
+	if (arg == NULL) return GMT_PARSE_ERROR;		/* Must supply the label arg */
+	gmt_M_memset (&(GMT->common.l.item), 1, struct GMT_LEGEND_ITEM);	/* Initialize */
 
-	if ((c = gmt_first_modifier (GMT, arg, "dnst"))) {	/* Got modifiers */
+	if ((c = gmt_first_modifier (GMT, arg, "dfgnstv"))) {	/* Got modifiers */
 		unsigned int pos = 0, n_errors = 0;
 		char txt[GMT_LEN128] = {""};
-		while (gmt_getmodopt (GMT, 'l', c, "dnst", &pos, txt, &n_errors) && n_errors == 0) {
+		while (gmt_getmodopt (GMT, 'l', c, "dfgnstv", &pos, txt, &n_errors) && n_errors == 0) {
 			switch (txt[0]) {
-				case 't': strncpy (GMT->common.l.item.title, &txt[1], GMT_LEN128-1);	break;	/* Legend title */
-				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);	break;	/* Number of columns */
+				case 'd': /* Draw horizontal line */
+					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_D;
+					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_D], &txt[1], GMT_LEN32-1);
+					break;
+				case 'f': strncpy (GMT->common.l.item.font, &txt[1], GMT_LEN32-1);	break;	/* Font to use for this -l setting */
+				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Gap before next item */
+				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);			break;	/* Number of columns */
 				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Symbol size or line length */
+				case 't': strncpy (GMT->common.l.item.title, &txt[1], GMT_LEN128-1);	break;	/* Legend title */
+				case 'v': /* Draw vertical line(s) */
+					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_V;
+					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_V], &txt[1], GMT_LEN32-1);
+					break;
 				default: break;	/* These are caught in gmt_getmodopt so break is just for Coverity */
 			}
 		}
@@ -15929,15 +15940,30 @@ int gmt_legend_file (struct GMTAPI_CTRL *API, char *file) {
 	return (access (file, R_OK) == 0);
 }
 
+GMT_LOCAL void draw_legend_line (struct GMTAPI_CTRL *API, FILE *fp, struct GMT_LEGEND_ITEM *item, unsigned int code) {
+	if (item->draw & code) {	/* Want to draw a line */
+		char *type = "DV";
+		code--;	/* Make 1 and 2 become 0 and 1 for index use */
+		if (item->pen[code][0])
+			fprintf (fp, "%c %s\n", type[code], item->pen[code]);
+		else
+			fprintf (fp, "%c %s\n", type[code], gmt_putpen (API->GMT, &API->GMT->current.setting.map_default_pen));
+	}
+}
+
 void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item) {
+	/* Adds a new entry to the auto-legend information file hidden in the session directory */
 	char file[PATH_MAX] = {""};
+	bool gap_done = false;
 	double size;
 	FILE *fp = NULL;
 
+	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+n<cols>][+s<size>][+t<title>] */
+	
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
 
-	set_legend_filename (API, file);
+	set_legend_filename (API, file);	/* Get the legend filename given current scope */
 
 	/* OK, do we append or create? */
 	
@@ -15947,18 +15973,33 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			return;
 		}
 		fprintf (fp, "# Auto-generated legend information file\n");
-		if (item->title[0]) {	/* Want to place a legend title */
-			fprintf (fp, "H %s %s\n", gmt_putfont (API->GMT, &API->GMT->current.setting.font_label), item->title);
-			fprintf (fp, "D 0 %s\n", gmt_putpen (API->GMT, &API->GMT->current.setting.map_default_pen));
+		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
+			fprintf (fp, "G %gi\n", item->gap);
+			gap_done = true;	/* So we dont do it again below */
+		}
+		if (item->title[0]) {	/* Want to place a centered legend title */
+			if (item->font[0])	/* Use given font */
+				fprintf (fp, "H %s %s\n", item->font, item->title);
+			else	/* Default to FONT_TITLE setting */
+				fprintf (fp, "H - %s\n", item->title);
 		}
 	}
-	else if ((fp = fopen (file, "a")) == NULL) {	/* Append to existing file */
-		GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to current legend file %s !\n", file);
+	else if ((fp = fopen (file, "a")) == NULL) {	/* Append to an existing file */
+		GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to existing current legend file %s !\n", file);
 		return;
 	}
 	GMT_Report (API, GMT_MSG_DEBUG, "Add record to current legend file%s\n", file);
+	if (!gap_done && !gmt_M_is_zero (item->gap))	/* Always place a gap first, if requested, and not already done before title */
+		fprintf (fp, "G %gi\n", item->gap);
+	/* Horizontal lines are normally drawn before the symbol placement */
+	if ((item->draw & GMT_LEGEND_DRAW_D) && ((item->draw & GMT_LEGEND_DRAW_V) == 0 || item->pen[GMT_LEGEND_PEN_V][0] == '\0'))
+		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_D);	/* Draw horizontal line, if requested, before symbol */
 	if (item->ncols > 0)	/* Specified a different number of columns */
 		fprintf (fp, "N %d\n", item->ncols);
+	if (((item->draw & GMT_LEGEND_DRAW_V) && item->pen[GMT_LEGEND_PEN_V][0] == '\0'))	/* Initialize the vertical line setting */
+		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_V);
+	
+	/* Place the symbol command */
 	size = (item->size > 0.0) ? item->size : S->size_x;
 	if (S->symbol == GMT_SYMBOL_LINE) {	/* Line for legend entry */
 		if (size > 0.0)	/* Got a line length in inches */
@@ -15966,8 +16007,13 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 		else	/* Punt to the legend module */
 			fprintf (fp, "S - - - - %s - %s\n", gmt_putpen (API->GMT, pen), item->label);
 	}
-	else
+	else	/* Regular symbol */
 		fprintf (fp, "S - %c %gi %s %s - %s\n", S->symbol, size, (do_fill) ? gmtlib_putfill (API->GMT, fill) : "-", (do_line) ? gmt_putpen (API->GMT, pen) : "-", item->label);
+	
+	if (item->draw & GMT_LEGEND_DRAW_V && item->pen[GMT_LEGEND_PEN_V][0]) {	/* Must end with horizontal, then vertical line */
+		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_D);		/* Draw horizontal line, if requested, after last symbol */
+		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_V);
+	}
 	fclose (fp);
 }
 
diff --git a/test/pslegend/autolegend.sh b/test/pslegend/autolegend.sh
index f36cc2c1c82..9c96a14af7d 100755
--- a/test/pslegend/autolegend.sh
+++ b/test/pslegend/autolegend.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 gmt begin autolegend ps
-  gmt plot -R0/7.2/3/7.2 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+t"LEGEND"
+  gmt plot -R0/7.2/3/7.2 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+t"LEGEND"+f16p+d
   gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"
   gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
   gmt legend -DjTR+w1.15i+o0.1i -F+p1p

From db9d5d9d3bbb8499c345b2704d67024f328edcf5 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 17:26:24 -1000
Subject: [PATCH 05/31] use +h for header, not +t

Must match uppercase codes in pslegend. Also add to cookbook.
---
 doc/rst/source/cookbook/options.rst | 30 ++++++++++++++++++++++++++++-
 doc/rst/source/explain_-l.rst_      |  4 ++--
 doc/rst/source/explain_-l_full.rst_ |  8 ++++----
 doc/rst/source/legend.rst           | 10 ++++++++++
 doc/rst/source/std_opts.rst         |  3 ++-
 src/gmt_common.h                    | 16 +++++++--------
 src/gmt_init.c                      | 18 ++++++++---------
 test/pslegend/autolegend.sh         |  2 +-
 8 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/doc/rst/source/cookbook/options.rst b/doc/rst/source/cookbook/options.rst
index 49afa72c9c0..bebc9249b80 100644
--- a/doc/rst/source/cookbook/options.rst
+++ b/doc/rst/source/cookbook/options.rst
@@ -2,7 +2,7 @@ Standardized command line options
 =================================
 
 Most of the programs take many of the same arguments such as those related
-to setting the data region, the map projection, etc. The 24 switches in
+to setting the data region, the map projection, etc. The switches in
 Table :ref:`switches <tbl-switches>` have the same meaning in all the programs (although
 some programs may not use all of them). These options will be described
 here as well as in the manual pages, as is vital that you understand how
@@ -45,6 +45,8 @@ importance (some are used a lot more than others).
 +----------+--------------------------------------------------------------------+
 | **-j**   | Specify how spherical distances should be computed                 |
 +----------+--------------------------------------------------------------------+
+| **-l**   | Add a legend entry for the symbol or line being plotted            |
++----------+--------------------------------------------------------------------+
 | **-n**   | Specify grid interpolation settings                                |
 +----------+--------------------------------------------------------------------+
 | **-o**   | Specify which output columns to write                              |
@@ -1023,6 +1025,32 @@ slightly different meaning. Now, the *n_recs* argument is taken to mean
 how many *bytes* should be skipped (on input) or padded with the space
 character (on output).
 
+.. _option_-l:
+
+Setting automatic legend entries: The **-l** option
+---------------------------------------------------
+
+Map or plot legends are created by :doc:`legend` and normally this module
+will read a *specfile* that outlines how the legend should look.  You can
+make very detailed and complicated legends by mixing a variety of items,
+such as symbol, free text, colorbars, scales, images, and more.  Yet, for
+the vast majority of plots displaying symbols or lines a simple legend will suffice.
+The **-l** option is used to automatically build the *specfile* as we plot
+the various layers that will make up our illustration.  Apart from setting
+the label string that goes with the current symbol or line, you can select
+from a series of modifiers that mirror the effect of control codes normally
+added to the *specfile* by hand.  For instance, a simple plot with two
+symbols can obtain a legend by using this option and modifiers::
+
+   gmt begin fruit
+     gmt plot -R0/7.2/3/7.2 -Jx2c @Table_5_11.txt -Sc0.35c -Glightgreen -Wfaint -lApples+h"LEGEND"+f16p+d
+     gmt plot @Table_5_11.txt -St0.35c -Gorange -B -BWStr -lOranges
+     gmt legend -DjTR+w3c+o0.25c -F+p1p+ggray95+s
+   gmt end show
+
+As the script shows, when no *specfile* is given to :doc:`legend` then we
+look for the automatically generated on in the session directory.
+
 .. _option_-i:
 
 Input columns selection: The **-i** option
diff --git a/doc/rst/source/explain_-l.rst_ b/doc/rst/source/explain_-l.rst_
index 56a6819c7ca..89961c3f188 100644
--- a/doc/rst/source/explain_-l.rst_
+++ b/doc/rst/source/explain_-l.rst_
@@ -1,2 +1,2 @@
-**-l**\ [*label*]\ [**+n**\ *ncols*][**+s**\ *size*\ ][**+t**\ *title*\ ] :ref:`(more ...) <-l_full>`
-    Add a legend entry for the plotted feature. |Add_-l|
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]] :ref:`(more ...) <-l_full>`
+    Add a legend entry for the symbol or line being plotted. |Add_-l|
diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index 7a739e374b5..093c1bed077 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,13 +1,13 @@
 .. _-l_full:
 
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+n**\ *cols*][**+s**\ *size*\ ][**+t**\ *title*\ ][**+v**\ [*pen*]]
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]]
     Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
     when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
     legend entry is placed [no line], use **+f** to set the font to use for title or labels,
-    use **+g** to add some vertical space [0], use **+n** to change the number of columns
-    used to set the following legend items [1], use **+s** to override the size of the
+    use **+g** to add some vertical space [0], use **+h** to add a legend header [no header],
+    use **+n** to change the number of columns used to set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
-    use **+t** to add a legend title [no title], and use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
+    and use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
     previous to current horizontal line [no vertical line].  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
diff --git a/doc/rst/source/legend.rst b/doc/rst/source/legend.rst
index ab8c3e5e2fa..24f162cb031 100644
--- a/doc/rst/source/legend.rst
+++ b/doc/rst/source/legend.rst
@@ -77,6 +77,16 @@ specifications, use
      T so we may have to adjust the box height to get the right size box.
      EOF
 
+Auto-legends
+------------
+
+In modern mode, some modules can access the **-l** option and build the legend
+*specfile* from individual entries per command.  The **-l** option takes a
+label and allows optional modifiers **+d**, **+g**, **+n**, **+h**, and **+v**
+that follows the corresponding uppercase legend codes discussed above.  In addition,
+there is **+f** to set current font and **+s** to set the symbol size (or line length)
+to use for the current entry.
+
 See Also
 --------
 
diff --git a/doc/rst/source/std_opts.rst b/doc/rst/source/std_opts.rst
index 285324d5d1e..7a23bd4b5fe 100644
--- a/doc/rst/source/std_opts.rst
+++ b/doc/rst/source/std_opts.rst
@@ -43,7 +43,8 @@ Common Options
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-je**\ \|\ **f**\ \|\ **g**                                            | Mode of spherical distance calculation :ref:`(...) <-j_full>`            |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-l**\ [*label*]\ [**+n**\ *cols*][**+s**\ *size*\ ][**+t**\ *title*\ ] | Add item to plot legend :ref:`(...) <-l_full>`                           |
+| **-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*]\       | Add an item to the automatic plot legend :ref:`(...) <-l_full>`          |
+| [**+h**\ *header*\ ][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]]  |                                                                          |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-n**\ [*type*][**+a**][\ **+b**\ *BC*]                                 |                                                                          |
 | [\ **+c**\ ][\ **+t**\ *threshold*]                                      | Set grid interpolation mode :ref:`(...) <-n_full>`                       |
diff --git a/src/gmt_common.h b/src/gmt_common.h
index c9de1c6ebbc..347dfd9ad5f 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -55,14 +55,14 @@ enum GMT_enum_gaps {GMT_NEGGAP_IN_COL = 0,	/* Check if previous minus current co
 #define FSET	3	/* Index into R.active[] for "got -R -I -r from a grid file" */
 
 struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
-	char label[GMT_LEN128];	/* The label to go with the symbol */
-	char title[GMT_LEN128];	/* Title for the whole legend */
-	char font[GMT_LEN32];	/* Fontsize to use */
-	char pen[2][GMT_LEN32];	/* Pens to use with +d and +v */
-	int draw;		/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
-	double size;		/* Override symbol size or set length of a line */
-	double gap;		/* Move this much down before placing symbol entry */
-	unsigned int ncols;	/* How many columns to use for symbols */
+	char label[GMT_LEN128];		/* The label to go with the symbol */
+	char header[GMT_LEN128];	/* Header for the whole legend */
+	char font[GMT_LEN32];		/* Fontsize to use */
+	char pen[2][GMT_LEN32];		/* Pens to use with +d and +v */
+	int draw;			/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
+	double size;			/* Override symbol size or set length of a line */
+	double gap;			/* Move this much down before placing symbol entry */
+	unsigned int ncols;		/* How many columns to use for symbols */
 };
 
 /*! Structure with all information given via the common GMT command-line options -R -J .. */
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 5587265c4db..62dfc8ff897 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -6532,7 +6532,7 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 		case 'l':	/* -l option to set up auto-legend items*/
 
 			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.  Optionally, append any\n");
-			gmt_message (GMT, "\t   of +d<pen>, +f<font>, +g<gap, +n<cols>, +s<size>, +t<title>, and +v[<pen>].\n");
+			gmt_message (GMT, "\t   of +d<pen>, +f<font>, +g<gap>, +h<header>, +n<cols>, +s<size>, and +v[<pen>].\n");
 			break;
 
 		case 'm':	/* -do option to tell GMT the relationship between NaN and a nan-proxy for output */
@@ -8081,20 +8081,20 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 	if (arg == NULL) return GMT_PARSE_ERROR;		/* Must supply the label arg */
 	gmt_M_memset (&(GMT->common.l.item), 1, struct GMT_LEGEND_ITEM);	/* Initialize */
 
-	if ((c = gmt_first_modifier (GMT, arg, "dfgnstv"))) {	/* Got modifiers */
+	if ((c = gmt_first_modifier (GMT, arg, "dfghnsv"))) {	/* Got modifiers */
 		unsigned int pos = 0, n_errors = 0;
 		char txt[GMT_LEN128] = {""};
-		while (gmt_getmodopt (GMT, 'l', c, "dfgnstv", &pos, txt, &n_errors) && n_errors == 0) {
+		while (gmt_getmodopt (GMT, 'l', c, "dfghnsv", &pos, txt, &n_errors) && n_errors == 0) {
 			switch (txt[0]) {
 				case 'd': /* Draw horizontal line */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_D;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_D], &txt[1], GMT_LEN32-1);
 					break;
-				case 'f': strncpy (GMT->common.l.item.font, &txt[1], GMT_LEN32-1);	break;	/* Font to use for this -l setting */
+				case 'f': strncpy (GMT->common.l.item.font, &txt[1], GMT_LEN32-1);	break;	/* Font to use for this -l entry */
 				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Gap before next item */
+				case 'h': strncpy (GMT->common.l.item.header, &txt[1], GMT_LEN128-1);	break;	/* Legend header */
 				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);			break;	/* Number of columns */
 				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Symbol size or line length */
-				case 't': strncpy (GMT->common.l.item.title, &txt[1], GMT_LEN128-1);	break;	/* Legend title */
 				case 'v': /* Draw vertical line(s) */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_V;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_V], &txt[1], GMT_LEN32-1);
@@ -15958,7 +15958,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	double size;
 	FILE *fp = NULL;
 
-	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+n<cols>][+s<size>][+t<title>] */
+	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+n<cols>][+s<size>][+v[<pen>]] */
 	
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
@@ -15977,11 +15977,11 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			fprintf (fp, "G %gi\n", item->gap);
 			gap_done = true;	/* So we dont do it again below */
 		}
-		if (item->title[0]) {	/* Want to place a centered legend title */
+		if (item->header[0]) {	/* Want to place a centered legend header */
 			if (item->font[0])	/* Use given font */
-				fprintf (fp, "H %s %s\n", item->font, item->title);
+				fprintf (fp, "H %s %s\n", item->font, item->header);
 			else	/* Default to FONT_TITLE setting */
-				fprintf (fp, "H - %s\n", item->title);
+				fprintf (fp, "H - %s\n", item->header);
 		}
 	}
 	else if ((fp = fopen (file, "a")) == NULL) {	/* Append to an existing file */
diff --git a/test/pslegend/autolegend.sh b/test/pslegend/autolegend.sh
index 9c96a14af7d..098734c2ed9 100755
--- a/test/pslegend/autolegend.sh
+++ b/test/pslegend/autolegend.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 gmt begin autolegend ps
-  gmt plot -R0/7.2/3/7.2 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+t"LEGEND"+f16p+d
+  gmt plot -R0/7.2/3/7.2 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+h"LEGEND"+f16p+d
   gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"
   gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
   gmt legend -DjTR+w1.15i+o0.1i -F+p1p

From e773a5597ead0007aa5c697769b02b015523bc50 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 17:36:15 -1000
Subject: [PATCH 06/31] Add doc example

Add doc script showing autolegend and add to cookbook.
---
 doc/rst/source/cookbook/options.rst |  12 +++++++++++-
 doc/scripts/CMakeLists.txt          |   2 +-
 doc/scripts/GMT_autolegend.ps       | Bin 0 -> 24696 bytes
 doc/scripts/GMT_autolegend.sh       |   6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 doc/scripts/GMT_autolegend.ps
 create mode 100755 doc/scripts/GMT_autolegend.sh

diff --git a/doc/rst/source/cookbook/options.rst b/doc/rst/source/cookbook/options.rst
index bebc9249b80..90d41d568a9 100644
--- a/doc/rst/source/cookbook/options.rst
+++ b/doc/rst/source/cookbook/options.rst
@@ -1040,7 +1040,8 @@ the various layers that will make up our illustration.  Apart from setting
 the label string that goes with the current symbol or line, you can select
 from a series of modifiers that mirror the effect of control codes normally
 added to the *specfile* by hand.  For instance, a simple plot with two
-symbols can obtain a legend by using this option and modifiers::
+symbols can obtain a legend by using this option and modifiers and is shown
+in Figure :ref:`Auto Legend <auto_legend>`::
 
    gmt begin fruit
      gmt plot -R0/7.2/3/7.2 -Jx2c @Table_5_11.txt -Sc0.35c -Glightgreen -Wfaint -lApples+h"LEGEND"+f16p+d
@@ -1051,6 +1052,15 @@ symbols can obtain a legend by using this option and modifiers::
 As the script shows, when no *specfile* is given to :doc:`legend` then we
 look for the automatically generated on in the session directory.
 
+.. _auto_legend:
+
+.. figure:: /_images/GMT_autolegend.*
+   :width: 500 px
+   :align: center
+
+   Each of the two :doc:`plot` commands use **-l** to add a symbol to the
+   auto legend; the first also sets a legend header of given size and draws a horizontal line.
+
 .. _option_-i:
 
 Input columns selection: The **-i** option
diff --git a/doc/scripts/CMakeLists.txt b/doc/scripts/CMakeLists.txt
index 409057ff803..84fd5f8e851 100644
--- a/doc/scripts/CMakeLists.txt
+++ b/doc/scripts/CMakeLists.txt
@@ -52,7 +52,7 @@ set (_scr_other GMT_-B_geo_1.sh GMT_-B_geo_2.sh GMT_-B_linear.sh GMT_-B_log.sh
 	GMT_API_flow.sh GMT_pstext_clearance.sh GMT_pstext_justify.sh GMT_registration.sh GMT_obl_nz.sh
 	GMT_utm_zones.sh GMT_volcano.sh GMT_panel.sh GMT_mapscale.sh GMT_inset.sh GMT_linearrow.sh
 	GMT_dir_rose.sh GMT_images.sh GMT_colorbar.sh GMT_cyclic.sh GMT_legend.sh GMT_mag_rose.sh
-	GMT_hinge.sh GMT_CPTscale.sh GMT_SRTM.sh GMT_vertscale.sh GMT_fatline.sh
+	GMT_hinge.sh GMT_CPTscale.sh GMT_SRTM.sh GMT_vertscale.sh GMT_fatline.sh GMT_autolegend.sh
 	psevents_intensity.sh psevents_size.sh psevents_transparency.sh)
 
 # Scripts that are only used for testing, figures are not in the documentation
diff --git a/doc/scripts/GMT_autolegend.ps b/doc/scripts/GMT_autolegend.ps
new file mode 100644
index 0000000000000000000000000000000000000000..672f60486d20920550fd23ea365895f73d6bb029
GIT binary patch
literal 24696
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
F{{rm4>Bj&7

literal 0
HcmV?d00001

diff --git a/doc/scripts/GMT_autolegend.sh b/doc/scripts/GMT_autolegend.sh
new file mode 100755
index 00000000000..c3338603487
--- /dev/null
+++ b/doc/scripts/GMT_autolegend.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+gmt begin GMT_autolegend ps
+  gmt plot -R0/7.2/3/7.2 -Jx2c @Table_5_11.txt -Sc0.35c -Glightgreen -Wfaint -lApples+h"LEGEND"+f16p+d
+  gmt plot @Table_5_11.txt -St0.35c -Gorange -B -BWStr -lOranges
+  gmt legend -DjTR+w3c+o0.25c -F+p1p+ggray95+s
+gmt end show

From e444614b4bd1add62176b015835cc9aaff432d82 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 5 Oct 2019 18:02:18 -1000
Subject: [PATCH 07/31] Let ex 3 and 7 use auto-legend

These were perfect examples of using -l to generate legend data. Slight differences required an update to the two PS files.
---
 doc/examples/ex03/ex03.ps       | Bin 59170 -> 59249 bytes
 doc/examples/ex03/ex03.sh       |  11 ++++-------
 doc/examples/ex07/ex07.ps       | Bin 113878 -> 113968 bytes
 doc/examples/ex07/ex07.sh       |   6 ++----
 doc/rst/source/gallery/ex03.rst |  17 ++++-------------
 src/psxy.c                      |   2 +-
 6 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/doc/examples/ex03/ex03.ps b/doc/examples/ex03/ex03.ps
index d6ed8167eae136d43deed2415183526ec2087e6a..dff50c5522c69433bdaa3c7f76a2d3d7d6e4ccf4 100644
GIT binary patch
delta 176
zcmZ2<j``y`<_V=jspjU!iKeFUMh1qKdWHsi2Bs6+D}@qE6#SD*6ckJq49%@fEv-yU
zHw!TudaH+LWR|3Q7W)?@7M7+eloSC8J3EEq)RKb4^wgBpvdrXEg<6Ho&3Zm^EG#*}
z8JU|s1EgKKa)J{}Qgd>EdN(Ic?c-*&ocwWt6r<&4o`pLZ6^xB66pYO*6?_$pjExoC
Z47oIb`U*4^l5!NHxPX$IpDwa>0RV5}H_QM4

delta 120
zcmex(j(O2J<_V=jCgv$dMk!|TMh1qKdImsbII+D_s5DO@IJH1Q!BD}_!phLl%E)Z9
z5Tl{@=6WAamd*VE60Vy!PwnAmw3zI$P>RuFbM(TUj0z@3<_gAUmI}TKM#jbpZiZYM
W!5NtanhHrd3Q=4@$;~E<ZCwDm3?pm+

diff --git a/doc/examples/ex03/ex03.sh b/doc/examples/ex03/ex03.sh
index bd10f545885..57b74dd1644 100755
--- a/doc/examples/ex03/ex03.sh
+++ b/doc/examples/ex03/ex03.sh
@@ -42,16 +42,13 @@ gmt begin ex03
   # Now to do the cross-spectra, assuming that the ship is the input and the sat is the output
   # data, we do this:
   gmt convert -A samp_ship.pg samp_sat.pg -o1,3 | gmt spectrum1d -S256 -D1 -W -C -T
-  # Time to plot spectra
+  # Time to plot spectra, use -l to build a legend
   gmt set FONT_TAG 18p,Helvetica-Bold
   gmt subplot begin 2x1 -M0.1i -SCb+l"Wavelength (km)" -T"Ship and Satellite Gravity" -Fs4i/3.75i -A+jTR+o0.1i -BWeSn+g240/255/240 -X2i -Y1.5i
     gmt subplot set 0,0 -A"Input Power"
-    gmt plot spectrum.xpower -JX-?l/?l -Bxa1f3p -Bya1f3p+l"Power (mGal@+2@+km)" -Gred -ST0.07i -R1/1000/0.1/10000 -Ey+p0.5p
-    gmt plot spectrum.ypower -Gblue -Sc0.07i -Ey+p0.5p
-    gmt legend -DjBL+w1.2i+o0.25i -F+gwhite+pthicker --FONT_ANNOT_PRIMARY=14p,Helvetica-Bold <<- EOF
-	S 0.1i T 0.07i red  - 0.3i Ship
-	S 0.1i c 0.07i blue - 0.3i Satellite
-	EOF
+    gmt plot spectrum.xpower -JX-?l/?l -Bxa1f3p -Bya1f3p+l"Power (mGal@+2@+km)" -Gred -ST0.07i -R1/1000/0.1/10000 -Ey+p0.5p -lShip
+    gmt plot spectrum.ypower -Gblue -Sc0.07i -Ey+p0.5p -lSatellite
+    gmt legend -DjBL+w1.2i+o0.25i -F+gwhite+pthicker --FONT_ANNOT_PRIMARY=14p,Helvetica-Bold
     gmt subplot set 1,0 -A"Coherency@+2@+"
     gmt plot spectrum.coh -JX-?l/? -Bxa1f3p -Bya0.25f0.05+l"Coherency@+2@+" -R1/1000/0/1 -Sc0.07i -Gpurple -Ey+p0.5p
   gmt subplot end
diff --git a/doc/examples/ex07/ex07.ps b/doc/examples/ex07/ex07.ps
index 18935c3d26bad85c823fdcd54a12bf68e0b79643..879215168a048d104644cbfb6cf204e4c670b030 100644
GIT binary patch
delta 269
zcmccilWoH<wh3i|=H|wUrl#>m28Nb;h6Z{DrW4yMg@Y4I6#SD*6ckJq3@xk-46O{z
zHVZQvd8>zKWR|3Q7W)?@7M7+eloSC8J3EEq)RKb4^wgBpvdrXEg<6Ho$p$`;SPF9T
zOEwGo-gqXZuAAc-?5yCLSX7cxSelrfTC80Rw8|n=ef#{KjIxZ|Sxp(4>$h`lVQgY#
zwlFlC-oKSmoZZC0K*7++VEWpvjFK8qj)8)av5`V>5toHRIG3@dIgo2?3{nM?nC`HX
y(Q3QKHbzNCZZl(u>SV6a>48m*ZrdkqXG~;dHZrxG{%r@N5y+<P+B+FnGXnsI$WX5U

delta 222
zcmdn+i|yJ^wh3i|X{m-5hUW1`28Nb;2IhK3W)s^hh24rW6}(Dw6pYLij0~*|EUiq9
zHVZQvc~5TiIlDR7_xiK#vz9Z;Fm6vYWn`{r)Z3oCg|V42%G}b(K*7|)*i<2etJ+Y(
zu~xw?n9Ib>7-)=%fr6niP}a!UNFlh0%g|gQoXahc%ij>YyaiC&*wS3V$kf~zq;b2$
tHpXa1CJXcJbGI{YU}QEiGM^r>lhKF=Y^5&5&guMH7~QsC*~u8g3;^P*JZJy_

diff --git a/doc/examples/ex07/ex07.sh b/doc/examples/ex07/ex07.sh
index dd20892747a..0128dc7a485 100755
--- a/doc/examples/ex07/ex07.sh
+++ b/doc/examples/ex07/ex07.sh
@@ -7,12 +7,10 @@
 gmt begin ex07
 	gmt coast -R-50/0/-10/20 -JM9i -Slightblue -GP26+r300+ftan+bdarkbrown -Dl -Wthinnest -B --FORMAT_GEO_MAP=dddF
 	gmt plot @fz_07.txt -Wthinner,-
-	gmt plot @quakes_07.txt -h1 -Sci -i0,1,2+s0.01 -Gred -Wthinnest
+	gmt plot @quakes_07.txt -h1 -Sci -i0,1,2+s0.01 -Gred -Wthinnest -l"ISC Earthquakes"+s0.08i
 	gmt plot @isochron_07.txt -Wthin,blue
 	gmt plot @ridge_07.txt -Wthicker,orange
-	gmt legend -DjTR+w2.2i+o0.2i -F+pthick+ithinner+gwhite --FONT_ANNOT_PRIMARY=18p,Times-Italic <<- EOF
-	S 0.1i c 0.08i red thinnest 0.3i ISC Earthquakes
-	EOF
+	gmt legend -DjTR+w2i+o0.2i -F+pthick+ithinner+gwhite --FONT_ANNOT_PRIMARY=18p,Times-Italic
 	gmt text -F+f30,Helvetica-Bold,white=thin <<- END
 	-43 -5 SOUTH
 	-43 -8 AMERICA
diff --git a/doc/rst/source/gallery/ex03.rst b/doc/rst/source/gallery/ex03.rst
index dbdfd772b59..d097208c3e6 100644
--- a/doc/rst/source/gallery/ex03.rst
+++ b/doc/rst/source/gallery/ex03.rst
@@ -6,8 +6,7 @@
 In this example we will show how to use the GMT programs
 :doc:`fitcircle </fitcircle>`, :doc:`project </project>`,
 :doc:`sample1d </sample1d>`, :doc:`spectrum1d </spectrum1d>`,
-:doc:`plot </plot>`, and
-:doc:`text </text>`. Suppose you have (lon, lat,
+and :doc:`plot </plot>`. Suppose you have (lon, lat,
 gravity) along a satellite track in a file called ``sat.xyg``, and (lon, lat,
 gravity) along a ship track in a file called ``ship.xyg``. You want to make a
 cross-spectral analysis of these data. First, you will have to get the
@@ -21,19 +20,11 @@ ranges are in the projected coordinate. The
 :doc:`gmtinfo </gmtinfo>` utility will report the minimum
 and maximum values for multi-column ASCII tables. Use this information
 to select the range of the projected distance coordinate they have in
-common. The script prompts you for that information after reporting the
-values. We decide to make a file of equidistant sampling points spaced 1
-km apart from -1167 to +1169, and use the UNIX utility **awk** to
-accomplish this step. We can then resample the projected data, and carry
+common. The script computes the common range. We can then resample the projected data, and carry
 out the cross-spectral calculations, assuming that the ship is the input
-and the satellite is the output data. There are several intermediate
-steps that produce helpful plots showing the effect of the various
-processing steps (``example_03[a-f].ps``), while the final plot ``example_03.ps`` shows the ship and sat power
+and the satellite is the output data. The final plot ``example_03.ps`` shows the ship and sat power
 in one diagram and the coherency on another diagram, both on the same
-page. Note the extended use of :doc:`text </text>`
-and :doc:`plot </plot>` to put labels and legends
-directly on the plots. For that purpose we often use **-Jx**\ 1i and
-specify positions in inches directly. Thus, the complete automated script reads:
+page, with an auto-generated legend. Thus, the complete automated script reads:
 
 .. literalinclude:: /_verbatim/ex03.txt
    :language: bash
diff --git a/src/psxy.c b/src/psxy.c
index 14f31ef1bd5..f567fa70be4 100644
--- a/src/psxy.c
+++ b/src/psxy.c
@@ -1150,7 +1150,7 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
 		else { /* Fixed symbol type throughout */
 			GMT_Set_Columns (API, GMT_IN, n_needed, GMT_COL_FIX);
-			if (GMT->common.l.active && !S.read_size && !get_rgb) {
+			if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.size > 0.0)) {
 				/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
 				gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
 			}

From 06dfc260d311b9c33244f73e5799ba0271eafe94 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Mon, 7 Oct 2019 12:07:04 -1000
Subject: [PATCH 08/31] Add support for auto-legend if legend not called

Now, when legend is called and there is no input file and a hidden legend file is found, we use it and then delete it.  THus, when gmt inset end, gmt subplot end, or gmt end come along and find a legend file it means legend was not called explicitly.  If so, we add a call to legend with a few default settings.
---
 src/gmt_init.c       | 72 ++++++++++++++++++++++++++++++++++++++++++--
 src/gmt_prototypes.h |  1 +
 src/inset.c          | 15 +++++++--
 src/pslegend.c       |  5 +++
 src/subplot.c        | 13 +++++++-
 5 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index 62dfc8ff897..368bd221a69 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -12603,6 +12603,8 @@ struct GMT_CTRL *gmt_init_module (struct GMTAPI_CTRL *API, const char *lib_name,
 
 	if (options && !strncmp (mod_name, "pscoast", 7U) && (E = GMT_Find_Option (API, 'E', *options)) && (opt = GMT_Find_Option (API, 'M', *options))) /* No need for RJ */
 		required = "";
+	if (options && strstr (mod_name, "legend") && (opt = GMT_Find_Option (API, 'D', *options)) && strchr ("jJg", opt->arg[0])) /* Must turn jr into JR */
+		required = "JR";
 
 	if (options && gmt_M_compat_check (GMT, 5) && !strncmp (mod_name, "pscoast", 7U) && (E = GMT_Find_Option (API, 'E', *options)) && (opt = GMT_Find_Option (API, 'R', *options)) == NULL) {
 		/* Running pscoast -E without -R: Must make sure any the region-information in -E is added as args to new -R.
@@ -12755,8 +12757,19 @@ struct GMT_CTRL *gmt_init_module (struct GMTAPI_CTRL *API, const char *lib_name,
 
 			if (GMT->hidden.func_level == GMT_CONTROLLER && subplot_status & GMT_SUBPLOT_ACTIVE) {	/* Explore -c setting */
 				int row = 0, col = 0;
-				double gap[4];
+				double gap[4], legend_width = 0.0;
+				char legend_justification[4] = {""};
 				if ((opt = GMT_Find_Option (API, 'c', *options))) {	/* Got -c<row,col> for subplot so must update current gmt.panel */
+					if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+						char cmd[GMT_LEN64] = {""};
+						int error;
+						/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
+						snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+						if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
+							GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current subplot figure\n");
+							return NULL;
+						}
+					}
 					gmt_subplot_gaps (API, fig, gap);	/* First see if there were subplot-wide -Cgaps settings in effect */
 					if (opt->arg[0] && strchr (opt->arg,',')) {	/* Gave a comma-separate argument so presumably this is our row,col */
 						sscanf (opt->arg, "%d,%d", &row, &col);
@@ -15617,16 +15630,22 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 	 * convert the hidden PostScript figures to selected graphics.
 	 * If show is not NULL then we display them via gmt docs */
 
-	char cmd[GMT_BUFSIZ] = {""}, fmt[GMT_LEN16] = {""}, option[GMT_LEN256] = {""}, p[GMT_LEN256] = {""}, mark;
+	char cmd[GMT_BUFSIZ] = {""}, fmt[GMT_LEN16] = {""}, option[GMT_LEN256] = {""}, p[GMT_LEN256] = {""}, legend_justification[4] = {""}, mark;
 	struct GMT_FIGURE *fig = NULL;
 	bool not_PS;
-	int error, k, f, nf, n_figs, gcode[GMT_LEN16];
+	int error, k, f, nf, n_figs, n_orig, gcode[GMT_LEN16];
 	unsigned int pos = 0;
+	double legend_width = 0.0;
 
  	if (API->gwf_dir == NULL) {
 		GMT_Report (API, GMT_MSG_NORMAL, "No workflow directory set\n");
 		return GMT_NOT_A_VALID_DIRECTORY;
 	}
+	
+	if ((n_orig = gmtlib_read_figures (API->GMT, 0, NULL)) == GMT_NOTSET) {
+		GMT_Report (API, GMT_MSG_NORMAL, "Unable to open gmt.figures for reading\n");
+		return GMT_ERROR_ON_FOPEN;
+	}
 	if ((n_figs = gmtlib_read_figures (API->GMT, 2, &fig)) == GMT_NOTSET) {	/* Auto-insert the hidden gmt_0.ps- file which may not have been used */
 		GMT_Report (API, GMT_MSG_NORMAL, "Unable to open gmt.figures for reading\n");
 		return GMT_ERROR_ON_FOPEN;
@@ -15650,6 +15669,24 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 					continue;
 				}
 			}
+			if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+				if (n_orig) {	/* Specified figs via gmt figure so must switch to the current figure and update the history */
+					if ((error = GMT_Call_Module (API, "figure", GMT_MODULE_CMD, fig[k].prefix))) {
+						GMT_Report (API, GMT_MSG_NORMAL, "Failed to switch to figure%s\n", fig[k].prefix);
+						gmt_M_free (API->GMT, fig);
+						return error;
+					}
+					gmtinit_get_history (API->GMT);	/* Make sure we have the latest history for this figure */
+				}
+				/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
+				snprintf (cmd, GMT_BUFSIZ, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+				if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
+					GMT_Report (API, GMT_MSG_NORMAL, "Failed to place auto-legend on figure %s\n", fig[k].prefix);
+					gmt_M_free (API->GMT, fig);
+					return error;
+				}
+			}
+
 			/* Here the file exists and we can call psconvert. Note we still pass *.ps- even if *.ps+ was found since psconvert will do the same check */
 			gmt_filename_set (fig[k].prefix);
 			snprintf (cmd, GMT_BUFSIZ, "'%s/gmt_%d.ps-' -T%c -F%s", API->gwf_dir, fig[k].ID, fmt[f], fig[k].prefix);
@@ -15973,6 +16010,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			return;
 		}
 		fprintf (fp, "# Auto-generated legend information file\n");
+		fprintf (fp, "# LEGEND_JUSTIFICATION: TR\n");
 		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
 			fprintf (fp, "G %gi\n", item->gap);
 			gap_done = true;	/* So we dont do it again below */
@@ -16017,6 +16055,34 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	fclose (fp);
 }
 
+bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, char justification[]) {
+	/* Determine if there is a hidden legend file that has not been placed */
+	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""};
+	size_t L, N_max = 0;
+	double W, W_max = 0.0;
+	FILE *fp = NULL;
+
+	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return false;	/* This is a modern mode only feature */
+	if (!gmt_legend_file (API, file)) return false;			/* There is no legend file in the scope */
+	if ((fp = fopen (file, "r")) == NULL) {	/* Unable to open for reading */
+		GMT_Report (API, GMT_MSG_NORMAL, "Failed to open file %s for reading\n", file);
+		return false;
+	}
+	strcpy (justification, "TR");	/* Default legend placement */
+	while (fgets (file, PATH_MAX, fp)) {	/* Recycle the array file to read the records here */
+		if (strstr (file, "# LEGEND_JUSTIFICATION:"))	/* Need to override the default justification */
+			sscanf (&file[2], "%*s %s\n", justification);
+		if (file[0] != 'S') continue;	/* Only examine symbol requests */
+		sscanf (file, "%*s %*s %*s %s %*s %*s %*s %[^\n]\n", size, label);
+		if ((L = strlen (label)) > N_max) N_max = L;
+		if (size[0] != '-' && (W = gmt_M_to_inch (API->GMT, size)) > W_max) W_max = W;
+	}
+	fclose (fp);
+	/* Best estimate of legend box width from longest string in the labels */
+	*width = 3.0 * W_max + N_max * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
+	return true;
+}
+
 /*! . */
 int gmt_manage_workflow (struct GMTAPI_CTRL *API, unsigned int mode, char *text) {
 	/* Manage the GMT workflow.  Mode can take the following values:
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index c1ec1587db4..85cdba85c71 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -344,6 +344,7 @@ EXTERN_MSC double *gmt_list_to_array (struct GMT_CTRL *GMT, char *list, unsigned
 EXTERN_MSC int gmt_getfonttype (struct GMT_CTRL *GMT, char *name);
 EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file);
 EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item);
+EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, char justification[]);
 EXTERN_MSC unsigned int gmt_parse_array (struct GMT_CTRL *GMT, char option, char *argument, struct GMT_ARRAY *T, unsigned int flags, unsigned int tcol);
 EXTERN_MSC unsigned int gmt_create_array (struct GMT_CTRL *GMT, char option, struct GMT_ARRAY *T, double *min, double *max);
 EXTERN_MSC void gmt_free_array (struct GMT_CTRL *GMT, struct GMT_ARRAY *T);
diff --git a/src/inset.c b/src/inset.c
index 914f26dafe3..1d9c37d40e4 100644
--- a/src/inset.c
+++ b/src/inset.c
@@ -297,8 +297,19 @@ int GMT_inset (void *V_API, int mode, void *args) {
 	else {	/* INSET_END */
 		/* Here we need to finish the inset with a grestore and restate the original -R -J in the history file,
 		 * and finally remove the inset information file */
-		char tag[GMT_LEN16] = {""};
-			
+		char tag[GMT_LEN16] = {""}, legend_justification[4] = {""};
+		double legend_width = 0.0;
+
+		if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+			char cmd[GMT_LEN64] = {""};
+			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
+			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+			if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
+				GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current inset figure\n");
+				Return (error);
+			}
+		}
+
 		PSL_command (PSL, "U %% End inset\n");	/* Restore graphics state to what it was before the map inset */
 
 		/* Remove the inset history file */
diff --git a/src/pslegend.c b/src/pslegend.c
index a5f5e3b3a6e..d0320872354 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -1713,5 +1713,10 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		}
 	}
 
+	if (legend_file[0] && gmt_remove_file (GMT, legend_file)) {
+		GMT_Report (API, GMT_MSG_NORMAL, "Failed to delete current legend file %s\n", legend_file);
+		Return (API->error);
+	}
+	
 	Return (GMT_NOERROR);
 }
diff --git a/src/subplot.c b/src/subplot.c
index 97fe2a18f41..45e95592315 100644
--- a/src/subplot.c
+++ b/src/subplot.c
@@ -1183,8 +1183,19 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		gmt_M_free (GMT, Ly);
 	}
 	else if (Ctrl->In.mode == SUBPLOT_SET) {	/* SUBPLOT_SET */
-		double gap[4];
+		char legend_justification[4] = {""};
+		double gap[4], legend_width = 0.0;
 		
+		if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+			char cmd[GMT_LEN64] = {""};
+			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
+			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+			if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
+				GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current subplot figure\n");
+				Return (error);
+			}
+		}
+
 		/* Update the previous plot width and height to that of the entire subplot instead of just last subplot */
 		gmt_subplot_gaps (API, fig, gap);	/* First see if there were subplot-wide -Cgaps settings in effect */
 		if (Ctrl->In.col == INT_MAX || Ctrl->In.next) {	/* Auto-determine which subplot */

From ec12019c07705d8f8ba0900a5e1c687196b5d213 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Mon, 7 Oct 2019 12:16:08 -1000
Subject: [PATCH 09/31] Also check subplot end

Must check for auto-legend when subplot end comes.
---
 src/subplot.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/subplot.c b/src/subplot.c
index 45e95592315..869fd81fb5a 100644
--- a/src/subplot.c
+++ b/src/subplot.c
@@ -1208,9 +1208,21 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 	else {	/* SUBPLOT_END */
 		int k, id;
 		char *wmode[2] = {"w","a"}, vfile[GMT_STR16] = {""}, Rtxt[GMT_LEN64] = {""}, tag[GMT_LEN16] = {""};
+		char legend_justification[4] = {""};
+		double legend_width = 0.0;
 		FILE *fp = NULL;
 		struct GMT_SUBPLOT *P = NULL;
 		
+		if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+			char cmd[GMT_LEN64] = {""};
+			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
+			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+			if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
+				GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current subplot figure\n");
+				Return (error);
+			}
+		}
+
 		/* Update the previous plot width and height to that of the entire subplot instead of just last subplot */
 		if ((P = gmt_subplot_info (API, fig)) == NULL) {
 			GMT_Report (GMT->parent, GMT_MSG_NORMAL, "No subplot information file!\n");

From 9b53e8f4d4d0501e19abbc3f3d84d09725dd31e3 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Mon, 7 Oct 2019 17:50:39 -1000
Subject: [PATCH 10/31] Add +j and update code and description

The +j controls palcement of legend [TR].
---
 doc/rst/source/explain_-l.rst_      |  2 +-
 doc/rst/source/explain_-l_full.rst_ |  4 +++-
 src/gmt_common.h                    |  1 +
 src/gmt_init.c                      | 11 +++++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/rst/source/explain_-l.rst_ b/doc/rst/source/explain_-l.rst_
index 89961c3f188..64cda88ee6d 100644
--- a/doc/rst/source/explain_-l.rst_
+++ b/doc/rst/source/explain_-l.rst_
@@ -1,2 +1,2 @@
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]] :ref:`(more ...) <-l_full>`
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]] :ref:`(more ...) <-l_full>`
     Add a legend entry for the symbol or line being plotted. |Add_-l|
diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index 093c1bed077..04c368a13a3 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,13 +1,15 @@
 .. _-l_full:
 
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]]
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]]
     Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
     when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
     legend entry is placed [no line], use **+f** to set the font to use for title or labels,
     use **+g** to add some vertical space [0], use **+h** to add a legend header [no header],
+    **+j** to set placement of the legend [TR],
     use **+n** to change the number of columns used to set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
     and use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
     previous to current horizontal line [no vertical line].  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
+    Note that **+h** and **+j** will only take effect if given on the very first **-l** option for a plot.
diff --git a/src/gmt_common.h b/src/gmt_common.h
index 347dfd9ad5f..9dd92aca661 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -60,6 +60,7 @@ struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
 	char font[GMT_LEN32];		/* Fontsize to use */
 	char pen[2][GMT_LEN32];		/* Pens to use with +d and +v */
 	int draw;			/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
+	int just;			/* Legend placement [TR] */
 	double size;			/* Override symbol size or set length of a line */
 	double gap;			/* Move this much down before placing symbol entry */
 	unsigned int ncols;		/* How many columns to use for symbols */
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 4e9b80b3af8..cf550397753 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -6532,7 +6532,7 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 		case 'l':	/* -l option to set up auto-legend items*/
 
 			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.  Optionally, append any\n");
-			gmt_message (GMT, "\t   of +d<pen>, +f<font>, +g<gap>, +h<header>, +n<cols>, +s<size>, and +v[<pen>].\n");
+			gmt_message (GMT, "\t   of +d<pen>, +f<font>, +g<gap>, +h<header>, +j<just>, +n<cols>, +s<size>, and +v[<pen>].\n");
 			break;
 
 		case 'm':	/* -do option to tell GMT the relationship between NaN and a nan-proxy for output */
@@ -8081,10 +8081,10 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 	if (arg == NULL) return GMT_PARSE_ERROR;		/* Must supply the label arg */
 	gmt_M_memset (&(GMT->common.l.item), 1, struct GMT_LEGEND_ITEM);	/* Initialize */
 
-	if ((c = gmt_first_modifier (GMT, arg, "dfghnsv"))) {	/* Got modifiers */
+	if ((c = gmt_first_modifier (GMT, arg, "dfghjnsv"))) {	/* Got modifiers */
 		unsigned int pos = 0, n_errors = 0;
 		char txt[GMT_LEN128] = {""};
-		while (gmt_getmodopt (GMT, 'l', c, "dfghnsv", &pos, txt, &n_errors) && n_errors == 0) {
+		while (gmt_getmodopt (GMT, 'l', c, "dfghjnsv", &pos, txt, &n_errors) && n_errors == 0) {
 			switch (txt[0]) {
 				case 'd': /* Draw horizontal line */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_D;
@@ -8093,6 +8093,7 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 				case 'f': strncpy (GMT->common.l.item.font, &txt[1], GMT_LEN32-1);	break;	/* Font to use for this -l entry */
 				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Gap before next item */
 				case 'h': strncpy (GMT->common.l.item.header, &txt[1], GMT_LEN128-1);	break;	/* Legend header */
+				case 'j': GMT->common.l.item.just = gmt_just_decode (GMT, &txt[1], PSL_TR);	break;	/* legend placement */
 				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);			break;	/* Number of columns */
 				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Symbol size or line length */
 				case 'v': /* Draw vertical line(s) */
@@ -16005,12 +16006,14 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	/* OK, do we append or create? */
 	
 	if (access (file, R_OK)) {	/* Must create this legend file */
+		char justcode[4] = {""};
 		if ((fp = fopen (file, "w")) == NULL) {
 			GMT_Report (API, GMT_MSG_NORMAL, "Unable to create current legend file %s !\n", file);
 			return;
 		}
+		gmt_just_to_code (API->GMT, item->just, justcode);
 		fprintf (fp, "# Auto-generated legend information file\n");
-		fprintf (fp, "# LEGEND_JUSTIFICATION: TR\n");
+		fprintf (fp, "# LEGEND_JUSTIFICATION: %s\n", justcode);
 		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
 			fprintf (fp, "G %gi\n", item->gap);
 			gap_done = true;	/* So we dont do it again below */

From 2dccdbe56693fc7f71ebdd651242d6fd700d11e5 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Mon, 7 Oct 2019 17:55:04 -1000
Subject: [PATCH 11/31] Update legend.rst

descript the defaults
---
 doc/rst/source/legend.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/rst/source/legend.rst b/doc/rst/source/legend.rst
index 24f162cb031..cf3c8ba8819 100644
--- a/doc/rst/source/legend.rst
+++ b/doc/rst/source/legend.rst
@@ -82,10 +82,12 @@ Auto-legends
 
 In modern mode, some modules can access the **-l** option and build the legend
 *specfile* from individual entries per command.  The **-l** option takes a
-label and allows optional modifiers **+d**, **+g**, **+n**, **+h**, and **+v**
+label and allows optional modifiers **+d**, **+g**, **+n**, **+h**, **+j**, and **+v**
 that follows the corresponding uppercase legend codes discussed above.  In addition,
 there is **+f** to set current font and **+s** to set the symbol size (or line length)
-to use for the current entry.
+to use for the current entry.  Some defaults are hardwired: We draw a white panel with
+a 1 point outline offset from the justification point (**+j**) by 0.2 cm.  To use
+different settings you must call **legend** explicitly instead.
 
 See Also
 --------

From 281acec07632dd57be10df362b672ad3f846b6b6 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 08:37:24 -1000
Subject: [PATCH 12/31] Add +llength and +sscale to -l option

Necessitated a new -Sscale option in pslegend.
---
 doc/rst/source/legend.rst         |  2 +
 doc/rst/source/legend_common.rst_ | 10 ++++
 src/gmt_common.h                  |  3 +-
 src/gmt_init.c                    | 32 ++++++-----
 src/gmt_prototypes.h              |  2 +-
 src/inset.c                       |  6 +-
 src/pslegend.c                    | 92 ++++++++++++++++++-------------
 src/psxy.c                        |  2 +-
 src/psxyz.c                       |  9 +++
 src/subplot.c                     | 12 ++--
 10 files changed, 107 insertions(+), 63 deletions(-)

diff --git a/doc/rst/source/legend.rst b/doc/rst/source/legend.rst
index cf3c8ba8819..1d0f2012525 100644
--- a/doc/rst/source/legend.rst
+++ b/doc/rst/source/legend.rst
@@ -20,6 +20,8 @@ Synopsis
 [ |-F|\ *box* ]
 [ |-J|\ *parameters* ]
 [ |SYN_OPT-R| ]
+[ |-S|\ *scale* ]
+[ |-T|\ *file* ]
 [ |SYN_OPT-U| ]
 [ |SYN_OPT-V| ]
 [ |SYN_OPT-X| ]
diff --git a/doc/rst/source/legend_common.rst_ b/doc/rst/source/legend_common.rst_
index 49addeb2ed7..39b213edc4d 100644
--- a/doc/rst/source/legend_common.rst_
+++ b/doc/rst/source/legend_common.rst_
@@ -72,6 +72,16 @@ Optional Arguments
 .. |Add_-R| unicode:: 0x20 .. just an invisible code
 .. include:: explain_-R.rst_
 
+.. _-S:
+
+**-S**\ *scale*
+    Scale all symbol sizes by a common *scale* [1].
+
+.. _-T:
+
+**-T**\ *file*
+    Modern mode only: Write hidden legend specification file to *file*.
+
 .. _-U:
 
 .. include:: explain_-U.rst_
diff --git a/src/gmt_common.h b/src/gmt_common.h
index 9dd92aca661..6b1c6d7eb22 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -61,7 +61,8 @@ struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
 	char pen[2][GMT_LEN32];		/* Pens to use with +d and +v */
 	int draw;			/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
 	int just;			/* Legend placement [TR] */
-	double size;			/* Override symbol size or set length of a line */
+	double scale;			/* Scale all given sizes, including +llength of a line */
+	double length;			/* Set length of a line segment */
 	double gap;			/* Move this much down before placing symbol entry */
 	unsigned int ncols;		/* How many columns to use for symbols */
 };
diff --git a/src/gmt_init.c b/src/gmt_init.c
index cf550397753..d07d6f57f1a 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -8081,10 +8081,10 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 	if (arg == NULL) return GMT_PARSE_ERROR;		/* Must supply the label arg */
 	gmt_M_memset (&(GMT->common.l.item), 1, struct GMT_LEGEND_ITEM);	/* Initialize */
 
-	if ((c = gmt_first_modifier (GMT, arg, "dfghjnsv"))) {	/* Got modifiers */
+	if ((c = gmt_first_modifier (GMT, arg, "dfghjlnsv"))) {	/* Got modifiers */
 		unsigned int pos = 0, n_errors = 0;
 		char txt[GMT_LEN128] = {""};
-		while (gmt_getmodopt (GMT, 'l', c, "dfghjnsv", &pos, txt, &n_errors) && n_errors == 0) {
+		while (gmt_getmodopt (GMT, 'l', c, "dfghjlnsv", &pos, txt, &n_errors) && n_errors == 0) {
 			switch (txt[0]) {
 				case 'd': /* Draw horizontal line */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_D;
@@ -8094,8 +8094,9 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Gap before next item */
 				case 'h': strncpy (GMT->common.l.item.header, &txt[1], GMT_LEN128-1);	break;	/* Legend header */
 				case 'j': GMT->common.l.item.just = gmt_just_decode (GMT, &txt[1], PSL_TR);	break;	/* legend placement */
+				case 'l': GMT->common.l.item.length = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Line length */
 				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);			break;	/* Number of columns */
-				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Symbol size or line length */
+				case 's': GMT->common.l.item.scale = atof (&txt[1]);			break;	/* Scale all symbols */
 				case 'v': /* Draw vertical line(s) */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_V;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_V], &txt[1], GMT_LEN32-1);
@@ -12758,14 +12759,14 @@ struct GMT_CTRL *gmt_init_module (struct GMTAPI_CTRL *API, const char *lib_name,
 
 			if (GMT->hidden.func_level == GMT_CONTROLLER && subplot_status & GMT_SUBPLOT_ACTIVE) {	/* Explore -c setting */
 				int row = 0, col = 0;
-				double gap[4], legend_width = 0.0;
+				double gap[4], legend_width = 0.0, legend_scale = 1.0;
 				char legend_justification[4] = {""};
 				if ((opt = GMT_Find_Option (API, 'c', *options))) {	/* Got -c<row,col> for subplot so must update current gmt.panel */
-					if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+					if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 						char cmd[GMT_LEN64] = {""};
 						int error;
 						/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
-						snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+						snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
 						if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
 							GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current subplot figure\n");
 							return NULL;
@@ -15636,7 +15637,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 	bool not_PS;
 	int error, k, f, nf, n_figs, n_orig, gcode[GMT_LEN16];
 	unsigned int pos = 0;
-	double legend_width = 0.0;
+	double legend_width = 0.0, legend_scale = 1.0;
 
  	if (API->gwf_dir == NULL) {
 		GMT_Report (API, GMT_MSG_NORMAL, "No workflow directory set\n");
@@ -15670,7 +15671,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 					continue;
 				}
 			}
-			if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+			if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 				if (n_orig) {	/* Specified figs via gmt figure so must switch to the current figure and update the history */
 					if ((error = GMT_Call_Module (API, "figure", GMT_MODULE_CMD, fig[k].prefix))) {
 						GMT_Report (API, GMT_MSG_NORMAL, "Failed to switch to figure%s\n", fig[k].prefix);
@@ -15680,7 +15681,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 					gmtinit_get_history (API->GMT);	/* Make sure we have the latest history for this figure */
 				}
 				/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
-				snprintf (cmd, GMT_BUFSIZ, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+				snprintf (cmd, GMT_BUFSIZ, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
 				if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
 					GMT_Report (API, GMT_MSG_NORMAL, "Failed to place auto-legend on figure %s\n", fig[k].prefix);
 					gmt_M_free (API->GMT, fig);
@@ -15996,7 +15997,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	double size;
 	FILE *fp = NULL;
 
-	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+n<cols>][+s<size>][+v[<pen>]] */
+	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+l<length>][+n<cols>][+s<scale>][+v[<pen>]] */
 	
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
@@ -16011,9 +16012,11 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			GMT_Report (API, GMT_MSG_NORMAL, "Unable to create current legend file %s !\n", file);
 			return;
 		}
+		if (item->scale == 0.0) item->scale = 1.0;
 		gmt_just_to_code (API->GMT, item->just, justcode);
 		fprintf (fp, "# Auto-generated legend information file\n");
 		fprintf (fp, "# LEGEND_JUSTIFICATION: %s\n", justcode);
+		fprintf (fp, "# LEGEND_SCALING: %g\n", item->scale);
 		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
 			fprintf (fp, "G %gi\n", item->gap);
 			gap_done = true;	/* So we dont do it again below */
@@ -16041,7 +16044,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_V);
 	
 	/* Place the symbol command */
-	size = (item->size > 0.0) ? item->size : S->size_x;
+	size = (item->length > 0.0) ? item->length : S->size_x;
 	if (S->symbol == GMT_SYMBOL_LINE) {	/* Line for legend entry */
 		if (size > 0.0)	/* Got a line length in inches */
 			fprintf (fp, "S - - %gi - %s - %s\n", size, gmt_putpen (API->GMT, pen), item->label);
@@ -16058,13 +16061,14 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	fclose (fp);
 }
 
-bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, char justification[]) {
+bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]) {
 	/* Determine if there is a hidden legend file that has not been placed */
 	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""};
 	size_t L, N_max = 0;
 	double W, W_max = 0.0;
 	FILE *fp = NULL;
 
+	*scale = 1.0;	/* Default scaling */
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return false;	/* This is a modern mode only feature */
 	if (!gmt_legend_file (API, file)) return false;			/* There is no legend file in the scope */
 	if ((fp = fopen (file, "r")) == NULL) {	/* Unable to open for reading */
@@ -16075,6 +16079,8 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, char justifica
 	while (fgets (file, PATH_MAX, fp)) {	/* Recycle the array file to read the records here */
 		if (strstr (file, "# LEGEND_JUSTIFICATION:"))	/* Need to override the default justification */
 			sscanf (&file[2], "%*s %s\n", justification);
+		else if (strstr (file, "# LEGEND_SCALING:"))	/* Need to override the default justification */
+			sscanf (&file[2], "%*s %lf\n", scale);
 		if (file[0] != 'S') continue;	/* Only examine symbol requests */
 		sscanf (file, "%*s %*s %*s %s %*s %*s %*s %[^\n]\n", size, label);
 		if ((L = strlen (label)) > N_max) N_max = L;
@@ -16082,7 +16088,7 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, char justifica
 	}
 	fclose (fp);
 	/* Best estimate of legend box width from longest string in the labels */
-	*width = 3.0 * W_max + N_max * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
+	*width = 3.0 * (*scale) * W_max + N_max * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
 	return true;
 }
 
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index 5eab9fac355..c9bf8147d4d 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -344,7 +344,7 @@ EXTERN_MSC double *gmt_list_to_array (struct GMT_CTRL *GMT, char *list, unsigned
 EXTERN_MSC int gmt_getfonttype (struct GMT_CTRL *GMT, char *name);
 EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file);
 EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item);
-EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, char justification[]);
+EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]);
 EXTERN_MSC unsigned int gmt_parse_array (struct GMT_CTRL *GMT, char option, char *argument, struct GMT_ARRAY *T, unsigned int flags, unsigned int tcol);
 EXTERN_MSC unsigned int gmt_create_array (struct GMT_CTRL *GMT, char option, struct GMT_ARRAY *T, double *min, double *max);
 EXTERN_MSC void gmt_free_array (struct GMT_CTRL *GMT, struct GMT_ARRAY *T);
diff --git a/src/inset.c b/src/inset.c
index ed10688e3bf..052de048f2d 100644
--- a/src/inset.c
+++ b/src/inset.c
@@ -312,12 +312,12 @@ int GMT_inset (void *V_API, int mode, void *args) {
 		 * and finally remove the inset information file */
 
 		char tag[GMT_LEN16] = {""}, legend_justification[4] = {""};
-		double legend_width = 0.0;
+		double legend_width = 0.0, legend_scale = 1.0;
 
-		if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
-			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
 			if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
 				GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current inset figure\n");
 				Return (error);
diff --git a/src/pslegend.c b/src/pslegend.c
index d0320872354..394aa934951 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -50,10 +50,14 @@ struct PSLEGEND_CTRL {
 		bool debug;			/* If true we draw guide lines */
 		struct GMT_MAP_PANEL *panel;
 	} F;
-	struct PSLEGND_S {	/* -S<legendfile> */
+	struct PSLEGND_S {	/* -S<scale> */
 		bool active;
-		char *file;
+		double scale;
 	} S;
+	struct PSLEGND_T {	/* -T<legendfile> */
+		bool active;
+		char *file;
+	} T;
 #ifdef DEBUG
 	struct PSLEGND_DEBUG {	/* -; */
 		bool active;
@@ -70,6 +74,7 @@ GMT_LOCAL void *New_Ctrl (struct GMT_CTRL *GMT) {	/* Allocate and initialize a n
 
 	C->C.off[GMT_X] = C->C.off[GMT_Y] = GMT->session.u2u[GMT_PT][GMT_INCH] * GMT_FRAME_CLEARANCE;	/* 4 pt */
 	C->D.spacing = 1.1;
+	C->S.scale = 1.0;	/* Full given size of symbols */
 	return (C);
 }
 
@@ -77,7 +82,7 @@ GMT_LOCAL void Free_Ctrl (struct GMT_CTRL *GMT, struct PSLEGEND_CTRL *C) {	/* De
 	if (!C) return;
 	gmt_free_refpoint (GMT, &C->D.refpoint);
 	gmt_M_free (GMT, C->F.panel);
-	gmt_M_str_free (C->S.file);
+	gmt_M_str_free (C->T.file);
 	gmt_M_free (GMT, C);
 }
 
@@ -88,8 +93,11 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL *API, int level) {
 	if (level == GMT_MODULE_PURPOSE) return (GMT_NOERROR);
 	GMT_Message (API, GMT_TIME_NONE, "usage: %s [<specfile>] -D%s+w<width>[/<height>][+l<spacing>]%s [%s]\n", name, GMT_XYANCHOR, GMT_OFFSET, GMT_B_OPT);
 	GMT_Message (API, GMT_TIME_NONE, "\t[-C<dx>[/<dy>]] [-F%s]\n", GMT_PANEL);
-	GMT_Message (API, GMT_TIME_NONE, "\t[%s] %s%s%s[%s]\n", GMT_J_OPT, API->K_OPT, API->O_OPT, API->P_OPT, GMT_Rgeo_OPT);
-	GMT_Message (API, GMT_TIME_NONE, "\t[%s] [%s] [%s]\n\t[%s]\n\t%s[%s] [%s] [%s]\n\n", GMT_U_OPT, GMT_V_OPT, GMT_X_OPT, GMT_Y_OPT, API->c_OPT, GMT_p_OPT, GMT_t_OPT, GMT_PAR_OPT);
+	GMT_Message (API, GMT_TIME_NONE, "\t[%s] %s%s%s[%s] [-S<scale>]\n", GMT_J_OPT, API->K_OPT, API->O_OPT, API->P_OPT, GMT_Rgeo_OPT);
+	if (API->GMT->current.setting.run_mode == GMT_MODERN)
+		GMT_Message (API, GMT_TIME_NONE, "\t[-T<file>] [%s] [%s] [%s]\n\t[%s]\n\t%s[%s] [%s] [%s]\n\n", GMT_U_OPT, GMT_V_OPT, GMT_X_OPT, GMT_Y_OPT, API->c_OPT, GMT_p_OPT, GMT_t_OPT, GMT_PAR_OPT);
+	else
+		GMT_Message (API, GMT_TIME_NONE, "\t[%s] [%s] [%s]\n\t[%s]\n\t%s[%s] [%s] [%s]\n\n", GMT_U_OPT, GMT_V_OPT, GMT_X_OPT, GMT_Y_OPT, API->c_OPT, GMT_p_OPT, GMT_t_OPT, GMT_PAR_OPT);
 	GMT_Message (API, GMT_TIME_NONE, "\tReads legend layout specification from <specfile> [or stdin].\n");
 	GMT_Message (API, GMT_TIME_NONE, "\t(See manual page for more information and <specfile> format).\n\n");
 
@@ -108,6 +116,9 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL *API, int level) {
 	gmt_mappanel_syntax (API->GMT, 'F', "Specify a rectangular panel behind the legend", 2);
 	GMT_Option (API, "J-,K");
 	GMT_Option (API, "O,P,R");
+	GMT_Message (API, GMT_TIME_NONE, "\t-S Scale all symbol sizes by <scale> [1].\n");
+	if (API->GMT->current.setting.run_mode == GMT_MODERN)
+		GMT_Message (API, GMT_TIME_NONE, "\t-T Write hidden legend specfile to <file>.\n");
 	GMT_Option (API, "U,V,X,c,p,t,.");
 
 	return (GMT_MODULE_USAGE);
@@ -245,17 +256,21 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct PSLEGEND_CTRL *Ctrl, struct GM
 				else
 					n_errors += gmt_default_error (GMT, opt->option);
 				break;
-			case 'L':			/* Sets linespacing in units of fontsize [1.1] */
+			case 'L':	/* Sets linespacing in units of fontsize [1.1] */
 				GMT_Report (GMT->parent, GMT_MSG_COMPAT, "Option -L is deprecated; -D...+l%s was set instead, use this in the future.\n", opt->arg);
 				Ctrl->D.spacing = atof (opt->arg);
 				break;
 
-			case 'S':	/* Sets legendfile for saving the hidden file */
-				Ctrl->S.active = true;
+			case 'S':	/* Sets common symbol scale factor [1] */
+				Ctrl->S.scale = atof (opt->arg);
+				break;
+
+			case 'T':	/* Sets legendfile for saving the hidden file */
+				Ctrl->T.active = true;
 				if (opt->arg[0])
-					Ctrl->S.file = strdup (opt->arg);
+					Ctrl->T.file = strdup (opt->arg);
 				else {
-					GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Option -S requires a filename\n");
+					GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Option -T requires a filename\n");
 					n_errors++;
 				}
 				break;
@@ -276,6 +291,7 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct PSLEGEND_CTRL *Ctrl, struct GM
 
 	n_errors += gmt_M_check_condition (GMT, Ctrl->C.off[GMT_X] < 0.0 || Ctrl->C.off[GMT_Y] < 0.0, "Syntax error -C option: clearances cannot be negative!\n");
 	n_errors += gmt_M_check_condition (GMT, !Ctrl->D.active, "Syntax error: The -D option is required!\n");
+	n_errors += gmt_M_check_condition (GMT, Ctrl->S.scale <= 0.0, "Syntax error: The -S option cannot set a zero scale!\n");
 
 	if (!Ctrl->D.refpoint) return (GMT_PARSE_ERROR);	/* Need to exit because next ones to not apply */
 
@@ -491,7 +507,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		if ((In = GMT_Read_Data (API, GMT_IS_DATASET, GMT_IS_FILE, GMT_IS_TEXT, GMT_READ_NORMAL, NULL, legend_file, NULL)) == NULL) {
 			Return (API->error);
 		}
-		if (Ctrl->S.active && GMT_Write_Data (API, GMT_IS_DATASET, GMT_IS_FILE, GMT_IS_TEXT, 0, NULL, Ctrl->S.file, In) != GMT_NOERROR) {
+		if (Ctrl->T.active && GMT_Write_Data (API, GMT_IS_DATASET, GMT_IS_FILE, GMT_IS_TEXT, 0, NULL, Ctrl->T.file, In) != GMT_NOERROR) {
 			Return (API->error);
 		}
 	}
@@ -666,7 +682,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 						column_number++;
 						sscanf (line, "%*s %*s %*s %s", size);
 						/* Find the largest symbol size specified */
-						x = gmt_M_to_inch (GMT, size);
+						x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 						if (x > def_size) def_size = x;
 						break;
 
@@ -1235,16 +1251,16 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							int n = sscanf (size, "%[^/]/%[^/]/%s", A, B, C);
 
 							if (n == 3) {	/* Got line length, tickgap, and ticklength */
-								length = gmt_M_to_inch (GMT, A);	/* The length of the line */
-								tlen = gmt_M_to_inch (GMT, C);	/* The length of the tick */
+								length = Ctrl->S.scale * gmt_M_to_inch (GMT, A);	/* The length of the line */
+								tlen = Ctrl->S.scale * gmt_M_to_inch (GMT, C);	/* The length of the tick */
 							}
 							else if (n == 2 && B[0] != '-') {	/* Got line length and tickgap only */
-								length = gmt_M_to_inch (GMT, A);	/* The length of the line */
-								gap = gmt_M_to_inch (GMT, B);	/* The tick gap */
+								length = Ctrl->S.scale * gmt_M_to_inch (GMT, A);	/* The length of the line */
+								gap = Ctrl->S.scale * gmt_M_to_inch (GMT, B);	/* The tick gap */
 								tlen = 0.3 * gap;		/* The default length of the tick is 30% of gap */
 							}
 							else {	/* Got line length, select defaults for other things */
-								length = gmt_M_to_inch (GMT, A);	/* The length of the line */
+								length = Ctrl->S.scale * gmt_M_to_inch (GMT, A);	/* The length of the line */
 								strcpy (B, "-1");		/* One centered tick */
 								tlen = 0.3 * length;		/* The default length of the tick is 30% of length */
 							}
@@ -1274,7 +1290,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							}
 						}
 						else if (symbol[0] == 'q' || symbol[0] == '~') {	/* Quoted and decorated line is different, must plot as a line segment */
-							double length = gmt_M_to_inch (GMT, size);	/* The length of the line */;
+							double length = Ctrl->S.scale * gmt_M_to_inch (GMT, size);	/* The length of the line */;
 
 							if ((D[QLINE] = get_dataset_pointer (API, D[QLINE], GMT_IS_LINE, 64U, 2U, 2U, false)) == NULL) return (API->error);
 							x = 0.5 * length;
@@ -1309,11 +1325,11 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 								if (strchr (size, ',')) {	/* We got dir,major,minor instead of just size; parse and use */
 									sscanf (size, "%[^,],%[^,],%s", A, B, C);
 									az1 = atof (A);
-									x = gmt_M_to_inch (GMT, B);
-									y = gmt_M_to_inch (GMT, C);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, B);
+									y = Ctrl->S.scale * gmt_M_to_inch (GMT, C);
 								}
 								else {	/* Ellipse needs more arguments; we use minor = 0.65*major, az = 0 */
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 									az1 = 0.0;
 									y = 0.65 * x;
 								}
@@ -1325,11 +1341,11 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 								if (strchr (size, ',')) {	/* We got dir,w,h instead of just size; parse and use */
 									sscanf (size, "%[^,],%[^,],%s", A, B, C);
 									az1 = atof (A);
-									x = gmt_M_to_inch (GMT, B);
-									y = gmt_M_to_inch (GMT, C);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, B);
+									y = Ctrl->S.scale * gmt_M_to_inch (GMT, C);
 								}
 								else {	/* Rotated rectangle needs more arguments; we use height = 0.65*width, az = 30 */
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 									y = 0.65 * x;
 									az1 = 30.0;
 								}
@@ -1342,11 +1358,11 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 								if (strchr (size, ',')) {	/* We got dir,length combined as one argument */
 									sscanf (size, "%[^,],%s", A, B);
 									az1 = atof (A);
-									x = gmt_M_to_inch (GMT, B);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, B);
 								}
 								else {	/* No dir given, default to horizontal */
 									az1 = 0.0;
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 								}
 								if (strchr (size, '/') && gmt_M_compat_check (GMT, 4))  {	/* The necessary arguments was supplied via GMT4 size arguments */
 									i = 0;
@@ -1381,11 +1397,11 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							else if (symbol[0] == 'r') {	/* Rectangle  */
 								if (strchr (size, ',')) {	/* We got w,h */
 									sscanf (size, "%[^,],%s", A, B);
-									x = gmt_M_to_inch (GMT, A);
-									y = gmt_M_to_inch (GMT, B);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, A);
+									y = Ctrl->S.scale * gmt_M_to_inch (GMT, B);
 								}
 								else {	/* Rectangle also need more args, we use h = 0.65*w */
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 									y = 0.65 * x;
 								}
 								S[SYM]->data[2][0] = x;
@@ -1394,12 +1410,12 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							else if (symbol[0] == 'R') {	/* Rounded rectangle  */
 								if (strchr (size, ',')) {	/* We got w,h,r */
 									sscanf (size, "%[^,],%[^,],%s", A, B, C);
-									x = gmt_M_to_inch (GMT, A);
-									y = gmt_M_to_inch (GMT, B);
-									r = gmt_M_to_inch (GMT, C);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, A);
+									y = Ctrl->S.scale * gmt_M_to_inch (GMT, B);
+									r = Ctrl->S.scale * gmt_M_to_inch (GMT, C);
 								}
 								else {	/* Rounded rectangle also need more args, we use h = 0.65*w and r = 0.1*w */
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 									y = 0.65 * x;
 									r = 0.1 * x;
 								}
@@ -1410,12 +1426,12 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							else if (symbol[0] == 'm') {	/* Math angle  */
 								if (strchr (size, ',')) {	/* We got r,az1,az2 */
 									sscanf (size, "%[^,],%[^,],%s", A, B, C);
-									x = gmt_M_to_inch (GMT, A);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, A);
 									az1 = atof (B);
 									az2 = atof (C);
 								}
 								else {	/* Math angle need more args, we set fixed az1,az22 as 10 45 */
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 									az1 = 10;	az2 = 45;
 								}
 								/* We want to center the arc around its mid-point */
@@ -1438,10 +1454,10 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 									sscanf (size, "%[^,],%[^,],%s", A, B, C);
 									az1 = atof (A);
 									az2 = atof (B);
-									x = gmt_M_to_inch (GMT, C);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, C);
 								}
 								else {
-									x = gmt_M_to_inch (GMT, size);
+									x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 									az1 = -30;	az2 = 30;
 								}
 								/* We want to center the wedge around its mid-point */
@@ -1453,7 +1469,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 								S[SYM]->data[4][0] = az2;
 							}
 							else {
-								x = gmt_M_to_inch (GMT, size);
+								x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
 								S[SYM]->data[2][0] = x;
 							}
 							/* Place pen and fill colors in segment header */
diff --git a/src/psxy.c b/src/psxy.c
index f567fa70be4..9f62f239100 100644
--- a/src/psxy.c
+++ b/src/psxy.c
@@ -1150,7 +1150,7 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
 		else { /* Fixed symbol type throughout */
 			GMT_Set_Columns (API, GMT_IN, n_needed, GMT_COL_FIX);
-			if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.size > 0.0)) {
+			if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.length > 0.0)) {
 				/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
 				gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
 			}
diff --git a/src/psxyz.c b/src/psxyz.c
index 9b4ddb088ec..848ef17f189 100644
--- a/src/psxyz.c
+++ b/src/psxyz.c
@@ -885,6 +885,10 @@ int GMT_psxyz (void *V_API, int mode, void *args) {
 		if (!read_symbol) API->object[API->current_item[GMT_IN]]->n_expected_fields = n_needed;
 		if (S.read_symbol_cmd)	/* Must prepare for a rough ride */
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
+		else if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.length > 0.0)) {
+			/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
+			gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
+		}
 		n = 0;
 		do {	/* Keep returning records until we reach EOF */
 			if ((In = GMT_Get_Record (API, GMT_READ_DATA, NULL)) == NULL) {	/* Read next record, get NULL if special case */
@@ -1580,6 +1584,11 @@ int GMT_psxyz (void *V_API, int mode, void *args) {
 			Return (GMT_DIM_TOO_SMALL);
 		}
 
+		if (GMT->common.l.active && S.symbol == GMT_SYMBOL_LINE && !polygon) {
+			/* For specified line, width, color we can do an auto-legend entry under modern mode */
+			gmt_add_legend_item (API, &S, false, NULL, Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
+		}
+		
 		for (tbl = 0; tbl < D->n_tables; tbl++) {
 			if (D->table[tbl]->n_headers && S.G.label_type == GMT_LABEL_IS_HEADER) gmt_extract_label (GMT, &D->table[tbl]->header[0][1], S.G.label, NULL);	/* Set first header as potential label */
 
diff --git a/src/subplot.c b/src/subplot.c
index 869fd81fb5a..9dab5295e41 100644
--- a/src/subplot.c
+++ b/src/subplot.c
@@ -1184,12 +1184,12 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 	}
 	else if (Ctrl->In.mode == SUBPLOT_SET) {	/* SUBPLOT_SET */
 		char legend_justification[4] = {""};
-		double gap[4], legend_width = 0.0;
+		double gap[4], legend_width = 0.0, legend_scale = 1.0;
 		
-		if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
-			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
 			if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
 				GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current subplot figure\n");
 				Return (error);
@@ -1209,14 +1209,14 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		int k, id;
 		char *wmode[2] = {"w","a"}, vfile[GMT_STR16] = {""}, Rtxt[GMT_LEN64] = {""}, tag[GMT_LEN16] = {""};
 		char legend_justification[4] = {""};
-		double legend_width = 0.0;
+		double legend_width = 0.0, legend_scale = 1.0;
 		FILE *fp = NULL;
 		struct GMT_SUBPLOT *P = NULL;
 		
-		if (gmt_get_legend_info (API, &legend_width, legend_justification)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
-			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite", legend_justification, legend_width);
+			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
 			if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
 				GMT_Report (API, GMT_MSG_NORMAL, "Failed to place legend on current subplot figure\n");
 				Return (error);

From 24bf047b8018379ef8b224e50c4a344a9695a3d5 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 11:09:07 -1000
Subject: [PATCH 13/31] Working on two figures with legends

Fixed a SEGV crash in just to code.
---
 src/gmt_init.c       | 20 +++++++++++---------
 src/gmt_prototypes.h |  4 ++--
 src/inset.c          |  2 +-
 src/pslegend.c       |  3 ++-
 src/subplot.c        |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index d07d6f57f1a..36e620f881f 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -12762,7 +12762,7 @@ struct GMT_CTRL *gmt_init_module (struct GMTAPI_CTRL *API, const char *lib_name,
 				double gap[4], legend_width = 0.0, legend_scale = 1.0;
 				char legend_justification[4] = {""};
 				if ((opt = GMT_Find_Option (API, 'c', *options))) {	/* Got -c<row,col> for subplot so must update current gmt.panel */
-					if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
+					if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
 						char cmd[GMT_LEN64] = {""};
 						int error;
 						/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
@@ -15671,7 +15671,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 					continue;
 				}
 			}
-			if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
+			if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, fig[k].ID)) {	/* Unplaced legend file */
 				if (n_orig) {	/* Specified figs via gmt figure so must switch to the current figure and update the history */
 					if ((error = GMT_Call_Module (API, "figure", GMT_MODULE_CMD, fig[k].prefix))) {
 						GMT_Report (API, GMT_MSG_NORMAL, "Failed to switch to figure%s\n", fig[k].prefix);
@@ -15951,12 +15951,13 @@ int gmt_truncate_file (struct GMTAPI_CTRL *API, char *file, size_t size) {
 	return GMT_NOERROR;
 }
 
-GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file) {
+GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file, int fix_fig) {
 	char panel[GMT_LEN16] = {""};
 	int fig, subplot, inset;
 
 	file[0] = '\0';	/* Initialize the path */
 	gmtlib_get_cpt_level (API, &fig, &subplot, panel, &inset);	/* Determine current plot item */
+	if (fix_fig >= 0) fig = fix_fig;	/* Override figure number */
 	/* Set the correct output file name given the CPT level */
 	if (inset)	/* Only one inset may be active at any given time */
 		snprintf (file, PATH_MAX, "%s/gmt.inset.legend", API->gwf_dir);
@@ -15973,9 +15974,9 @@ GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file) {
 }
 
 
-int gmt_legend_file (struct GMTAPI_CTRL *API, char *file) {
+int gmt_legend_file (struct GMTAPI_CTRL *API, char *file, int set_fig) {
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return 0;	/* Only available in modern mode */
-	set_legend_filename (API, file);
+	set_legend_filename (API, file, set_fig);
 	return (access (file, R_OK) == 0);
 }
 
@@ -16002,7 +16003,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
 
-	set_legend_filename (API, file);	/* Get the legend filename given current scope */
+	set_legend_filename (API, file, GMT_NOTSET);	/* Get the legend filename given current scope */
 
 	/* OK, do we append or create? */
 	
@@ -16012,7 +16013,8 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			GMT_Report (API, GMT_MSG_NORMAL, "Unable to create current legend file %s !\n", file);
 			return;
 		}
-		if (item->scale == 0.0) item->scale = 1.0;
+		if (item->scale == 0.0) item->scale = 1.0;	/* Default scaling */
+		if (item->just == 0) item->just = PSL_TR;	/* Default justification */
 		gmt_just_to_code (API->GMT, item->just, justcode);
 		fprintf (fp, "# Auto-generated legend information file\n");
 		fprintf (fp, "# LEGEND_JUSTIFICATION: %s\n", justcode);
@@ -16061,7 +16063,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	fclose (fp);
 }
 
-bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]) {
+bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[], int set_fig) {
 	/* Determine if there is a hidden legend file that has not been placed */
 	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""};
 	size_t L, N_max = 0;
@@ -16070,7 +16072,7 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 
 	*scale = 1.0;	/* Default scaling */
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return false;	/* This is a modern mode only feature */
-	if (!gmt_legend_file (API, file)) return false;			/* There is no legend file in the scope */
+	if (!gmt_legend_file (API, file, set_fig)) return false;			/* There is no legend file in the scope */
 	if ((fp = fopen (file, "r")) == NULL) {	/* Unable to open for reading */
 		GMT_Report (API, GMT_MSG_NORMAL, "Failed to open file %s for reading\n", file);
 		return false;
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index c9bf8147d4d..8d0c16236de 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -342,9 +342,9 @@ EXTERN_MSC void gmt_save_current_cpt (struct GMT_CTRL *GMT, struct GMT_PALETTE *
 EXTERN_MSC bool gmt_consider_current_cpt (struct GMTAPI_CTRL *API, bool *active, char **arg);
 EXTERN_MSC double *gmt_list_to_array (struct GMT_CTRL *GMT, char *list, unsigned int type, uint64_t *n);
 EXTERN_MSC int gmt_getfonttype (struct GMT_CTRL *GMT, char *name);
-EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file);
+EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file, int set_fig);
 EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item);
-EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]);
+EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[], int set_fig);
 EXTERN_MSC unsigned int gmt_parse_array (struct GMT_CTRL *GMT, char option, char *argument, struct GMT_ARRAY *T, unsigned int flags, unsigned int tcol);
 EXTERN_MSC unsigned int gmt_create_array (struct GMT_CTRL *GMT, char option, struct GMT_ARRAY *T, double *min, double *max);
 EXTERN_MSC void gmt_free_array (struct GMT_CTRL *GMT, struct GMT_ARRAY *T);
diff --git a/src/inset.c b/src/inset.c
index 052de048f2d..3fc5ef34f95 100644
--- a/src/inset.c
+++ b/src/inset.c
@@ -314,7 +314,7 @@ int GMT_inset (void *V_API, int mode, void *args) {
 		char tag[GMT_LEN16] = {""}, legend_justification[4] = {""};
 		double legend_width = 0.0, legend_scale = 1.0;
 
-		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
diff --git a/src/pslegend.c b/src/pslegend.c
index 394aa934951..a2ceb56fde6 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -503,7 +503,8 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		GMT->current.setting.io_seg_marker[GMT_IN] = '#';
 	}
 
-	if (gmt_legend_file (API, legend_file) == 1) {	/* Running modern mode and we have a hidden legend file to read */
+	if (gmt_legend_file (API, legend_file, GMT_NOTSET) == 1) {	/* Running modern mode and we have a hidden legend file to read */
+		GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Processing hidden legend specfile %s\n", legend_file);
 		if ((In = GMT_Read_Data (API, GMT_IS_DATASET, GMT_IS_FILE, GMT_IS_TEXT, GMT_READ_NORMAL, NULL, legend_file, NULL)) == NULL) {
 			Return (API->error);
 		}
diff --git a/src/subplot.c b/src/subplot.c
index 9dab5295e41..8957a31ee4e 100644
--- a/src/subplot.c
+++ b/src/subplot.c
@@ -1186,7 +1186,7 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		char legend_justification[4] = {""};
 		double gap[4], legend_width = 0.0, legend_scale = 1.0;
 		
-		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
@@ -1213,7 +1213,7 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		FILE *fp = NULL;
 		struct GMT_SUBPLOT *P = NULL;
 		
-		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);

From 7172a806aebcf300612bfa2300abb4f60915bb69 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 11:46:56 -1000
Subject: [PATCH 14/31] Call figure in the loop to set current figure

---
 src/gmt_init.c        | 33 ++++++++++++++++-----------------
 src/gmt_prototypes.h  |  4 ++--
 src/inset.c           |  2 +-
 src/postscriptlight.c |  1 -
 src/pslegend.c        |  8 +++++++-
 src/subplot.c         |  4 ++--
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index 36e620f881f..908f5f488de 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -12762,7 +12762,7 @@ struct GMT_CTRL *gmt_init_module (struct GMTAPI_CTRL *API, const char *lib_name,
 				double gap[4], legend_width = 0.0, legend_scale = 1.0;
 				char legend_justification[4] = {""};
 				if ((opt = GMT_Find_Option (API, 'c', *options))) {	/* Got -c<row,col> for subplot so must update current gmt.panel */
-					if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
+					if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 						char cmd[GMT_LEN64] = {""};
 						int error;
 						/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
@@ -15660,6 +15660,14 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 		GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Processing GMT figure #%d [%s %s %s]\n", fig[k].ID, fig[k].prefix, fig[k].formats, fig[k].options);
 		/* Go through the format list and build array for -T arguments */
 		nf = get_graphics_formats (API->GMT, fig[k].formats, fmt, gcode);
+		if (n_orig && k) {	/* Specified one or more figs via gmt figure so must switch to the current figure and update the history */
+			if ((error = GMT_Call_Module (API, "figure", GMT_MODULE_CMD, fig[k].prefix))) {
+				GMT_Report (API, GMT_MSG_NORMAL, "Failed to switch to figure%s\n", fig[k].prefix);
+				gmt_M_free (API->GMT, fig);
+				return error;
+			}
+			gmtinit_get_history (API->GMT);	/* Make sure we have the latest history for this figure */
+		}
 		for (f = 0; f < nf; f++) {	/* Loop over all desired output formats */
 			mark = '-';	/* This is the last char in extension for a half-baked GMT PostScript file */
 			snprintf (cmd, GMT_BUFSIZ, "%s/gmt_%d.ps%c", API->gwf_dir, fig[k].ID, mark);	/* Check if the file exists */
@@ -15671,15 +15679,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 					continue;
 				}
 			}
-			if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, fig[k].ID)) {	/* Unplaced legend file */
-				if (n_orig) {	/* Specified figs via gmt figure so must switch to the current figure and update the history */
-					if ((error = GMT_Call_Module (API, "figure", GMT_MODULE_CMD, fig[k].prefix))) {
-						GMT_Report (API, GMT_MSG_NORMAL, "Failed to switch to figure%s\n", fig[k].prefix);
-						gmt_M_free (API->GMT, fig);
-						return error;
-					}
-					gmtinit_get_history (API->GMT);	/* Make sure we have the latest history for this figure */
-				}
+			if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 				/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 				snprintf (cmd, GMT_BUFSIZ, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
 				if ((error = GMT_Call_Module (API, "legend", GMT_MODULE_CMD, cmd))) {
@@ -15951,13 +15951,12 @@ int gmt_truncate_file (struct GMTAPI_CTRL *API, char *file, size_t size) {
 	return GMT_NOERROR;
 }
 
-GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file, int fix_fig) {
+GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file) {
 	char panel[GMT_LEN16] = {""};
 	int fig, subplot, inset;
 
 	file[0] = '\0';	/* Initialize the path */
 	gmtlib_get_cpt_level (API, &fig, &subplot, panel, &inset);	/* Determine current plot item */
-	if (fix_fig >= 0) fig = fix_fig;	/* Override figure number */
 	/* Set the correct output file name given the CPT level */
 	if (inset)	/* Only one inset may be active at any given time */
 		snprintf (file, PATH_MAX, "%s/gmt.inset.legend", API->gwf_dir);
@@ -15974,9 +15973,9 @@ GMT_LOCAL void set_legend_filename (struct GMTAPI_CTRL *API, char *file, int fix
 }
 
 
-int gmt_legend_file (struct GMTAPI_CTRL *API, char *file, int set_fig) {
+int gmt_legend_file (struct GMTAPI_CTRL *API, char *file) {
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return 0;	/* Only available in modern mode */
-	set_legend_filename (API, file, set_fig);
+	set_legend_filename (API, file);
 	return (access (file, R_OK) == 0);
 }
 
@@ -16003,7 +16002,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
 
-	set_legend_filename (API, file, GMT_NOTSET);	/* Get the legend filename given current scope */
+	set_legend_filename (API, file);	/* Get the legend filename given current scope */
 
 	/* OK, do we append or create? */
 	
@@ -16063,7 +16062,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	fclose (fp);
 }
 
-bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[], int set_fig) {
+bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]) {
 	/* Determine if there is a hidden legend file that has not been placed */
 	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""};
 	size_t L, N_max = 0;
@@ -16072,7 +16071,7 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 
 	*scale = 1.0;	/* Default scaling */
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return false;	/* This is a modern mode only feature */
-	if (!gmt_legend_file (API, file, set_fig)) return false;			/* There is no legend file in the scope */
+	if (!gmt_legend_file (API, file)) return false;			/* There is no legend file in the scope */
 	if ((fp = fopen (file, "r")) == NULL) {	/* Unable to open for reading */
 		GMT_Report (API, GMT_MSG_NORMAL, "Failed to open file %s for reading\n", file);
 		return false;
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index 8d0c16236de..c9bf8147d4d 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -342,9 +342,9 @@ EXTERN_MSC void gmt_save_current_cpt (struct GMT_CTRL *GMT, struct GMT_PALETTE *
 EXTERN_MSC bool gmt_consider_current_cpt (struct GMTAPI_CTRL *API, bool *active, char **arg);
 EXTERN_MSC double *gmt_list_to_array (struct GMT_CTRL *GMT, char *list, unsigned int type, uint64_t *n);
 EXTERN_MSC int gmt_getfonttype (struct GMT_CTRL *GMT, char *name);
-EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file, int set_fig);
+EXTERN_MSC int gmt_legend_file (struct GMTAPI_CTRL *API, char *file);
 EXTERN_MSC void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do_fill, struct GMT_FILL *fill, bool do_line, struct GMT_PEN *pen, struct GMT_LEGEND_ITEM *item);
-EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[], int set_fig);
+EXTERN_MSC bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]);
 EXTERN_MSC unsigned int gmt_parse_array (struct GMT_CTRL *GMT, char option, char *argument, struct GMT_ARRAY *T, unsigned int flags, unsigned int tcol);
 EXTERN_MSC unsigned int gmt_create_array (struct GMT_CTRL *GMT, char option, struct GMT_ARRAY *T, double *min, double *max);
 EXTERN_MSC void gmt_free_array (struct GMT_CTRL *GMT, struct GMT_ARRAY *T);
diff --git a/src/inset.c b/src/inset.c
index 3fc5ef34f95..052de048f2d 100644
--- a/src/inset.c
+++ b/src/inset.c
@@ -314,7 +314,7 @@ int GMT_inset (void *V_API, int mode, void *args) {
 		char tag[GMT_LEN16] = {""}, legend_justification[4] = {""};
 		double legend_width = 0.0, legend_scale = 1.0;
 
-		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
diff --git a/src/postscriptlight.c b/src/postscriptlight.c
index ac323a2f5f6..1ae67f5ffb7 100644
--- a/src/postscriptlight.c
+++ b/src/postscriptlight.c
@@ -4304,7 +4304,6 @@ int PSL_beginplot (struct PSL_CTRL *PSL, FILE *fp, int orientation, int overlay,
 	PSL->internal.call_level++;	/* Becomes 1 for first module calling it, 2 if that module calls for plotting, etc */
 	if (PSL->internal.call_level == 1)
 		PSL->internal.fp = (fp == NULL) ? stdout : fp;	/* For higher levels we reuse existing file pointer */
-
 	PSL->internal.overlay = overlay;
 	memcpy (PSL->init.page_size, page_size, 2 * sizeof(double));
 
diff --git a/src/pslegend.c b/src/pslegend.c
index a2ceb56fde6..e7cbf560b6e 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -457,6 +457,8 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 	double v_line_ver_offset = 0.0, height, az1, az2, m_az, row_height, scl, aspect, xy_offset[2], C_rgb[4] = {0.0, 0.0, 0.0, 0.0};
 	double half_line_spacing, quarter_line_spacing, one_line_spacing, v_line_y_start = 0.0, d_off, def_size = 0.0, shrink[4] = {0.0, 0.0, 0.0, 0.0};
 	double sum_width, h, gap, d_line_after_gap = 0.0, d_line_last_y0 = 0.0, col_width[PSLEGEND_MAX_COLS], x_off_col[PSLEGEND_MAX_COLS];
+	
+	FILE *psl_fp = NULL;
 
 	struct imageinfo header;
 	struct PSLEGEND_CTRL *Ctrl = NULL;
@@ -503,7 +505,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		GMT->current.setting.io_seg_marker[GMT_IN] = '#';
 	}
 
-	if (gmt_legend_file (API, legend_file, GMT_NOTSET) == 1) {	/* Running modern mode and we have a hidden legend file to read */
+	if (gmt_legend_file (API, legend_file) == 1) {	/* Running modern mode and we have a hidden legend file to read */
 		GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Processing hidden legend specfile %s\n", legend_file);
 		if ((In = GMT_Read_Data (API, GMT_IS_DATASET, GMT_IS_FILE, GMT_IS_TEXT, GMT_READ_NORMAL, NULL, legend_file, NULL)) == NULL) {
 			Return (API->error);
@@ -747,6 +749,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		Return (GMT_PROJECTION_ERROR);
 
 	if ((PSL = gmt_plotinit (GMT, options)) == NULL) Return (GMT_RUNTIME_ERROR);
+	psl_fp = PSL->internal.fp;	/* Just in case we loose it */
 	gmt_plane_perspective (GMT, GMT->current.proj.z_project.view_plane, GMT->current.proj.z_level);
 
 	gmt_plotcanvas (GMT);	/* Fill canvas if requested */
@@ -1701,6 +1704,9 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		}
 #endif
 	}
+	
+	//if (PSL->internal.fp == NULL) PSL->internal.fp = psl_fp;
+	
 	PSL_setorigin (PSL, shrink[XLO], shrink[YLO], 0.0, PSL_FWD);	/* Undo any damage for adjustments due to subplot set -C */
 
 	PSL_setorigin (PSL, -x_orig, -y_orig, 0.0, PSL_INV);	/* Reset */
diff --git a/src/subplot.c b/src/subplot.c
index 8957a31ee4e..9dab5295e41 100644
--- a/src/subplot.c
+++ b/src/subplot.c
@@ -1186,7 +1186,7 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		char legend_justification[4] = {""};
 		double gap[4], legend_width = 0.0, legend_scale = 1.0;
 		
-		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);
@@ -1213,7 +1213,7 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		FILE *fp = NULL;
 		struct GMT_SUBPLOT *P = NULL;
 		
-		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification, GMT_NOTSET)) {	/* Unplaced legend file */
+		if (gmt_get_legend_info (API, &legend_width, &legend_scale, legend_justification)) {	/* Unplaced legend file */
 			char cmd[GMT_LEN64] = {""};
 			/* Default to white legend with 1p frame offset 0.2 cm from selected justification point [TR] */
 			snprintf (cmd, GMT_LEN64, "-Dj%s+w%gi+o0.2c -F+p1p+gwhite -S%g", legend_justification, legend_width, legend_scale);

From 65f3a03548552060cdd4aaa673485d7703ca35b0 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 12:15:36 -1000
Subject: [PATCH 15/31] Update pslegend.c

---
 src/pslegend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pslegend.c b/src/pslegend.c
index e7cbf560b6e..9e059117869 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -1705,7 +1705,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 #endif
 	}
 	
-	//if (PSL->internal.fp == NULL) PSL->internal.fp = psl_fp;
+	if (PSL->internal.fp == NULL) PSL->internal.fp = psl_fp;
 	
 	PSL_setorigin (PSL, shrink[XLO], shrink[YLO], 0.0, PSL_FWD);	/* Undo any damage for adjustments due to subplot set -C */
 

From 56fe3d2ed7a3aa99a9449385c223ebcabc9a6c27 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 13:22:26 -1000
Subject: [PATCH 16/31] Add new tests and PS

---
 test/modern/insetlegend.ps  | Bin 0 -> 28395 bytes
 test/modern/insetlegend.sh  |  10 ++++++++++
 test/modern/onefiglegend.ps | Bin 0 -> 28057 bytes
 test/modern/sublegend.ps    | Bin 0 -> 36936 bytes
 test/modern/sublegend.sh    |  12 ++++++++++++
 test/modern/twofiglegend.ps | Bin 0 -> 27927 bytes
 test/modern/twofiglegend.sh |  12 ++++++++++++
 7 files changed, 34 insertions(+)
 create mode 100644 test/modern/insetlegend.ps
 create mode 100755 test/modern/insetlegend.sh
 create mode 100644 test/modern/onefiglegend.ps
 create mode 100644 test/modern/sublegend.ps
 create mode 100755 test/modern/sublegend.sh
 create mode 100644 test/modern/twofiglegend.ps
 create mode 100755 test/modern/twofiglegend.sh

diff --git a/test/modern/insetlegend.ps b/test/modern/insetlegend.ps
new file mode 100644
index 0000000000000000000000000000000000000000..952bc3aac826c1a186b8e9fe52ddc3540af3f7a9
GIT binary patch
literal 28395
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
E11MOE?*IS*

literal 0
HcmV?d00001

diff --git a/test/modern/insetlegend.sh b/test/modern/insetlegend.sh
new file mode 100755
index 00000000000..66294581ec6
--- /dev/null
+++ b/test/modern/insetlegend.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Test that the auto-legend works in a map inset
+gmt begin insetlegend ps
+  gmt psbasemap -R0/7/3/7 -Jx1i -B0 -B+t"Inset with plot and legend" -Xc
+  gmt inset begin -DjTR+w4i/2.5i+o0.1i -M1c -F+p1p,red
+    gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL+s0.5
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l1c
+    gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
+  gmt inset end
+gmt end show
diff --git a/test/modern/onefiglegend.ps b/test/modern/onefiglegend.ps
new file mode 100644
index 0000000000000000000000000000000000000000..d59f56ae52f1531190fb552cb1b97b0dfe1546a5
GIT binary patch
literal 28057
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
MU)%&4P7fRZ3y43m;{X5v

literal 0
HcmV?d00001

diff --git a/test/modern/sublegend.ps b/test/modern/sublegend.ps
new file mode 100644
index 0000000000000000000000000000000000000000..2fa054e17dddf4e9293fdd8db33d322631567f5a
GIT binary patch
literal 36936
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

literal 0
HcmV?d00001

diff --git a/test/modern/sublegend.sh b/test/modern/sublegend.sh
new file mode 100755
index 00000000000..8e077cabb10
--- /dev/null
+++ b/test/modern/sublegend.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Test that the auto-legend works in subplots
+gmt begin sublegend ps
+  gmt subplot begin 2x1 -Fs7i/3i -T"Subplots with legends" -X0.7i
+    gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d -c0
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l0.2i
+    gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
+    gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL -c1
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l0.2i
+    gmt plot @Table_5_11.txt -St0.15i -Gred -lRed
+  gmt subplot end
+gmt end show
diff --git a/test/modern/twofiglegend.ps b/test/modern/twofiglegend.ps
new file mode 100644
index 0000000000000000000000000000000000000000..edac1e40e3a22f03f904c9ba809d000697ccde6d
GIT binary patch
literal 27927
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
D5BP@I

literal 0
HcmV?d00001

diff --git a/test/modern/twofiglegend.sh b/test/modern/twofiglegend.sh
new file mode 100755
index 00000000000..ac80069d9e0
--- /dev/null
+++ b/test/modern/twofiglegend.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Test that the auto-legend works in a map inset
+gmt begin
+  gmt figure onefiglegend ps
+    gmt plot -R0/7/3/7 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"
+    gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
+  gmt figure twofiglegend ps
+    gmt plot -R0/7/3/7 -Jx1i -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"
+    gmt plot @Table_5_11.txt -St0.15i -Gred -lRed
+gmt end show

From 60dc0d7bb415a23867981c4986c7beafa718806b Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 15:45:00 -1000
Subject: [PATCH 17/31] Reset history after inset

---
 src/gmt_init.c              |  11 +++++++++--
 src/gmt_prototypes.h        |   1 +
 src/inset.c                 |   1 +
 src/pslegend.c              |  10 +++-------
 test/modern/insetlegend.ps  | Bin 28395 -> 28389 bytes
 test/modern/onefiglegend.ps | Bin 28057 -> 28052 bytes
 test/modern/sublegend.ps    | Bin 36936 -> 36928 bytes
 test/modern/twofiglegend.ps | Bin 27927 -> 27923 bytes
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index 908f5f488de..031e4d33718 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -2570,7 +2570,7 @@ void gmt_history_tag (struct GMTAPI_CTRL *API, char *tag) {
 }
 
 /*! . */
-GMT_LOCAL int gmtinit_get_history (struct GMT_CTRL *GMT) {
+int gmtinit_get_history (struct GMT_CTRL *GMT) {
 	int id;
 	size_t len = strlen ("BEGIN GMT " GMT_PACKAGE_VERSION);
 	bool done = false, process = false;
@@ -2671,7 +2671,6 @@ GMT_LOCAL int gmtinit_put_history (struct GMT_CTRL *GMT) {
 			GMT->current.setting.history = GMT->current.setting.history_orig;
 		return (GMT_NOERROR); /* gmt.history mechanism has been disabled */
 	}
-
 	/* This is called once per GMT Session by gmt_end via GMT_Destroy_Session.
 	 * It writes out the known shorthands to the gmt.history file
 	 */
@@ -2725,12 +2724,20 @@ GMT_LOCAL int gmtinit_put_history (struct GMT_CTRL *GMT) {
 	return (GMT_NOERROR);
 }
 
+
+/*! . */
 GMT_LOCAL void gmtinit_reset_history (struct GMT_CTRL *GMT) { 
 	for (int id = 0; id < GMT_N_UNIQUE; id++) {
 		if (GMT->init.history[id]) gmt_M_str_free (GMT->init.history[id]);
 	}
 }
 
+/*! . */
+void gmt_reload_history (struct GMT_CTRL *GMT) { 
+	gmtinit_reset_history (GMT);	/* First remove our memory */
+	gmtinit_get_history (GMT);	/* Get the latest history for current scope */
+}
+
 /*! . */
 GMT_LOCAL void gmtinit_free_plot_array (struct GMT_CTRL *GMT) {
 	if (GMT->current.plot.n_alloc) {
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index c9bf8147d4d..6ff57ea6d74 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -41,6 +41,7 @@ EXTERN_MSC char *gmt_strdup (struct GMT_CTRL *GMT, const char *s);
 
 /* gmt_init.c: */
 
+EXTERN_MSC void gmt_reload_history (struct GMT_CTRL *GMT);
 EXTERN_MSC void gmt_history_tag (struct GMTAPI_CTRL *API, char *tag);
 EXTERN_MSC void gmt_subplot_gaps (struct GMTAPI_CTRL *API, int fig, double *gap);
 EXTERN_MSC int gmt_get_option_id (int start, char *this_option);
diff --git a/src/inset.c b/src/inset.c
index 052de048f2d..f76067290ad 100644
--- a/src/inset.c
+++ b/src/inset.c
@@ -334,6 +334,7 @@ int GMT_inset (void *V_API, int mode, void *args) {
 		/* Remove the inset information file */
 		gmt_remove_file (GMT, file);
 		GMT_Report (API, GMT_MSG_DEBUG, "inset: Removed inset file\n");
+		gmt_reload_history (API->GMT);
 	}
 	
 	gmt_plotend (GMT);
diff --git a/src/pslegend.c b/src/pslegend.c
index bda8813d802..ddab9def3ed 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -459,8 +459,6 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 	double half_line_spacing, quarter_line_spacing, one_line_spacing, v_line_y_start = 0.0, d_off, def_size = 0.0, shrink[4] = {0.0, 0.0, 0.0, 0.0};
 	double sum_width, h, gap, d_line_after_gap = 0.0, d_line_last_y0 = 0.0, col_width[PSLEGEND_MAX_COLS], x_off_col[PSLEGEND_MAX_COLS];
 	
-	FILE *psl_fp = NULL;
-
 	struct imageinfo header;
 	struct PSLEGEND_CTRL *Ctrl = NULL;
 	struct GMT_CTRL *GMT = NULL, *GMT_cpy = NULL;
@@ -688,7 +686,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 						column_number++;
 						sscanf (line, "%*s %*s %*s %s", size);
 						/* Find the largest symbol size specified */
-						x = Ctrl->S.scale * gmt_M_to_inch (GMT, size);
+						x = gmt_M_to_inch (GMT, size);
 						if (x > def_size) def_size = x;
 						break;
 
@@ -752,7 +750,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 		Return (GMT_PROJECTION_ERROR);
 
 	if ((PSL = gmt_plotinit (GMT, options)) == NULL) Return (GMT_RUNTIME_ERROR);
-	psl_fp = PSL->internal.fp;	/* Just in case we loose it */
+
 	gmt_plane_perspective (GMT, GMT->current.proj.z_project.view_plane, GMT->current.proj.z_level);
 
 	gmt_plotcanvas (GMT);	/* Fill canvas if requested */
@@ -813,7 +811,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 	gap = Ctrl->C.off[GMT_Y];	/* This gets reset to 0 once we finish the first printable row */
 
 	if (def_size == 0.0)	/* No sizes specified in input file; default to 0.5 cm */
-		def_size = 0.196850393701;	/* In inches */
+		def_size = 0.5 / 2.54;	/* In inches */
 
 	/* Tech, note: Using GMT->current.setting.io_seg_marker[GMT_IN] instead of GMT_OUT when writing data records as segment records
 	 * since these will become input to plot, and plot will use the GMT_IN marker to identify these as header records. */
@@ -1708,8 +1706,6 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 #endif
 	}
 	
-	if (PSL->internal.fp == NULL) PSL->internal.fp = psl_fp;
-	
 	PSL_setorigin (PSL, shrink[XLO], shrink[YLO], 0.0, PSL_FWD);	/* Undo any damage for adjustments due to subplot set -C */
 
 	PSL_setorigin (PSL, -x_orig, -y_orig, 0.0, PSL_INV);	/* Reset */
diff --git a/test/modern/insetlegend.ps b/test/modern/insetlegend.ps
index 952bc3aac826c1a186b8e9fe52ddc3540af3f7a9..0fd40d9a1ded32affcbc80805bb93d04f4035d87 100644
GIT binary patch
delta 1297
zcmZ8h&ubGw6eg&}U4Kzcnu3R>VyQo{(==jj@RCYEYuZ?A4<4jUc3w6^XLr(>owg}L
zP9k^^%X$%d@#4u_{s8|0@!;7WJt<iH3w*oDcB2U-^Jd<A-}k=xc7GmbejH}rUb%Uv
zI9Hfon6sy*9`Gli7p3tT_uWOgTQ1Dv7td#A@q<bG%h%2o7wBD9D&AsT1)cpD?@pCU
z<>GuVm-%-7^jbiDMimQ>F8qEJv=qRWp(+5SEfR;?v_WyHFjSO*N7W`ScVxQXp^gc_
zvPg$<P@p-M?uDPTx$wrQ8fkUfE%19EMwc?-uZu5Nn?fq?+oTe3!J?}B4lphRwMaE+
zVO-OK>S(c&WYm+znnRWJ@#twwD(vwrLJq%P8t>91rJ>{|_zjADo#V!iY<CoQTY*Iw
zxHzLt7~keGJj9?vy4<0{mzW|F0v`8`Ml{dFKO*35(XoghW7$Od(4wMg;bJ9GEear&
zMkch{!svcGqQK=E1qNmjoeUK82bw_w44UDW>_oSzs1tA;mvkVSxi1_pG{pNhag0*n
zJ4k8E$N+`+T>*oDHH3gBPU9LB7d#oHVVwA1IFP5wV<fzuZgQ)D{)q2`QP%~9=lumD
zSS0oabHE=ARB^a+jMo&fi-%NESJ8IMA`OEi0(*#PgX$r!|3(p+rD5&^b|3_A$NoZG
zl+0)}uSF`U@3su+NHivQB99^ZHdrCa)~;5QdC+|>4smRbYDzi$m@VYM8_Zix+g8Ja
zvFY&r*qO<C+{PyLw8|p&G_xLF&R@T`-Uqe_9i-FY^hy=+X<8!{YXZ81`=|&FKjo*V
zY=S<GxMTCgj`gSvb3LjZBQQDqo}cVmgvXia$7DhpmC0d5IRuvUWsxPc<`ywYp-F3O
zVuorG3Nq@9Ch$=AhQR0C<dSxkfvz<A@4X&BdwZn+nhFnUuO^DKbND(!Yun`UT5Y3E
rUD)Voz6XV32~T>J<)ahF@1kCL6;2*UVR?0__h<cK{@<N9-t){~?C`lX

delta 1303
zcmY+EL2DC16vqkL$}Un{s!g#VQ7BZZZfe?Uixg4`G&MD9E$FFCc3*af&d#JWJGJo=
z5mfMGSr0vU_XFhW7x1WO3tl`4>czWnH<@fqF1z#o@Av-i&CLEd$^AUZy}L5Mw6avV
zy?E1}o!y|1K&=bSJ<9!cakyG2;veHTiugm((bn9VQmMGoC@mkod_S^KT3uY~&g8z1
zS=H@&jYO0$#DCBIE;Te`5LuQ3jM0{&%5ow}JP3*0!^O}eDoCQd|InmXd~M?GNJzO>
z-A@ynxm+P0oqT00mq@{Fr(TJ}3;8=W#d?`dN!*AEZaKcDOrc#Y*o-V^J550LU|mu_
zh-^p1-zKN4%m7*-qd;gyxMw;0T14PASc53Y-g-b2>tj3-F;I%eb5phXG?o_cWlHpc
zrCsnSW28??;}9QD72@TIvH0`(e8<&N0(aY%(*}+S4Jr13H;A+x1!-Tl<57^1PR<pr
zc3RzXg!Gz#L!umgCLJ;e6GKVoO!(9#j0=1Y+N~fZOYo_Rkc3@^#7$@Eb-<SZShvNr
zN=J^{^Gqm>L!kmqL;=RLSK{g@k%v0TA(Hr#v;urg<em#WEnsJT3qF*Mo<pKs%?75g
zr>;#)9QHMlh`{zZ1cWvF2KvkK_|(Nt*?1_sRJuBBGB~uHazvSzI4ft<D)%>`T*39b
z{jIQ_3VJ?Bq!mM|43jDuplXy=qpZ5|_o?$w5E3P)_P(iFH_EzE)`yw(fi8oGnnkq5
z+IXVPN!*DG`Kz6$2Jtu$GC31I$Pf=_gDKld2A-NHMn#4T;l1mPfn<e9e+(q)*&U1l
zcfLmgLxPkPf5?xckoLmym;B|9?LgWtH*{fgg~=7eF2q2Wx$x)#^#CuQX;vGCHVi$?
z&{^tO+bHm!O5S}veRgrQ_o<4HYi};CtSsCrc+j++2ivvX7V%-Xt>|+oEG!mFrS96+
gpHo90rL}Og`{Lou>Hn7Qb${(_<g=yjTKF;d4;$9BTL1t6

diff --git a/test/modern/onefiglegend.ps b/test/modern/onefiglegend.ps
index d59f56ae52f1531190fb552cb1b97b0dfe1546a5..3efcd4b43c369ec81a729c8ddb888e5c399ab4c6 100644
GIT binary patch
delta 1279
zcmZ8h&ubGw6efbjU94K^4-uhJELE(XCJ}8*FR27-ZH-txw3jm3dD$I0*-2-1Y9m5U
zMetI~3PtF}lYc<|2=87z^wg6F5B>|j-RyLu2_*0BeDA&Qee<zjP79w;3!m;hcw8zM
zpDdK!si_tI3iPrxA>*OHEcX|SbNI#c**W|m=xF`kaA|?gvr6e9<0|SLy+6EIsVtTj
zde;g+u3XxPXvnBy@$ajDR-!-w>>8>fP}(7Bs!badmkLuw8MLU{!SJojpLeKdB5)ki
zVH^}_uH)g6k3&JH9YEMS8CfmFzpfv2n?focx}+L$!4mjW4;UAMI;0i_n6GI;brQU=
zh`J3nJgQ`fN3R2^u*aqyxoJl_WXocxt!gN_17U+AchBqEVV-Pv6!(M3Aq;$6*d>hb
z@stvzM1=IYM@1+RA}pyE4~<3!EtCF;h_^+@Az?bqB{GD7il&nUnSyD2F4H`bmRDOC
z-ET(}_*|pfz#O9O0#Sd-StP)q8Gj$0>^2qkB90P}4kSAC#l%2E`rIX+Q3^s2DeW2=
z;Vp!|fGlARA)txd_yz@smW=W=1^$<2@-%rm39qbc^#(LcdPj`<J}5lz2ROkYsZp2*
zVYX1!<H|Fwrht7sq>B2AwgZPW43dc40iq462e|&5C1lEj+%t9{1aG6+(zz&^(dcA{
zR5M4!BjY#YnbFm|HOn2{=Of|VbveEG>u7NdTG?*3+*Gyrczk-sA<vNdUSisM+RY{P
zyci$m1@(A*;{MVb3#S>J4#KN7Y((=KsaO-x5IjT?X#8zrddeke&1|A|U_B{AY>R5o
z2n5GJCvJBg!c!z#&@M_7qH=Je92jQ%vcv^ibB7pPX!07Dn1LEgK_;E?-diYjL!k6#
z%(km$^3vqLcW~qKqoMw5Dn4HOFj<-_<Le0B?2?xoYujz=!*)mWcTg-<@T9l2esbab
VUDP|PZ{0f2;<Nhm-l1>{e*xh%uWJAR

delta 1275
zcmYjRL2uJA7*){*N<d5#qnj9L12k<2F?V!hbeE|^l_+c!7?T*{;>K=b&9O5(9_y)q
zgpjzv6fQ{oiypYZKj6f5KLUONU(&c~dvU(+<-PYk+xdE0`gU6Sa^v<|ZEgPk>RoqX
z;URlY^_Db(FyU{><Bj<W{Gq>GfggZQc9zantCd>2dhg`@=kb-=Ms>YkF8#UaG<RFu
zIA&rc`8V;m+BTfi*l`f$oJE>x2gM2#8e(+-#gJefq+O9OI?PEHCqIpcOc>q&G5M%e
znomlXKJ>JQl@u;&H2_Yq?^88gkT!SFw&nw_j>2Bdq;QaL7}qcWSm?wK+RZ57tzlg;
zKZso<DHQh!ql#t@Us)ixoRLda97v<FAjz-GGuH-;hepN})N>vpV@|bZ$<6Ziv#gh?
zx3Q)UQeXsRJW3en*g-`fnt>5MRwm@wfKlm7K@U>!U}ha*k2=ZEskxqKl%m4xI;cwp
zAlgbEP|?Q9L7HY`yQmn%lTkPG2Aqm?D5S~+$fW^r8m4yBV7T;|hq;ij4!Tj0F)Qjb
z9YZ9<K_T|C@JWyQil%8r+~{nNU_akTZ6d0e1QT%p{o)aOCQjj@N#DT=`wB+^EK@k~
zsK^A|A{7|CcpE&2SbK&KP2b5}+mQr4G*|%zj3;P-c_%lJmy`45E4{k)Q1_VfOxWS{
z*g^G}agsW#7irb=Evh%5{vh8d7d621Q3`EXrp72!qabKnWYZ#>UUFKVdI=<Pdd#0#
z)s{uJEV4Dq*&5;s^3d>@MZ61Fz@EyzWOn*iux}||1X87E0<J~~=d{hWi_*X|^Vp*B
zs1RJ#K@7MM!g&lho!J}4K$ExAi%?+$#^m?(_17+<*<8ZXNGm6;oE(*tLtG(8*byTX
zE}@;u<O0hx<yi-r0@<~ka1)j2zni(RdUo*1N|No5W3}4KdNQ|D9$T$ctNq%}_cJ5k
TqD}s|zw~tCYEkNM^1af3tJ<YT

diff --git a/test/modern/sublegend.ps b/test/modern/sublegend.ps
index 2fa054e17dddf4e9293fdd8db33d322631567f5a..04294a24c935b7c41f70a03be8fb627a08cd877f 100644
GIT binary patch
delta 1397
zcmZ8h&ubGw6s8r$S+r8E)`QS0lqzZ`Y5dU^5uygPR99L()Qe1ZUUrAh?rdjvv=Jc}
zrQk)&;=zk}^_+jeqh7uFCwLJ51>bHm&DI2x_h#OE-#6cUyWhWzfBQ22;lkw`^~Kqn
z%ZuLJ+<mbQ=8m!n7fE<W?X1k!@QeEkHT+=F-ouN>>&tA3H|kfp&{=oy_1@t|W2L^_
zKRNbu;^;=k63#Tw|D5=HKZ`WLwq-g4Z3rz>V^h#VX-qZa5Hr1n;Y&4I@3O#VKnU$}
z0UC@j`H9JQN1|>TLDK&`xjL5rKKZuSkxGliqs>f6UX<SrfD0)Zp{*>!e9cH^ir|r}
z@LjMGFs%~YdJ-v(Gd3OMrh_E(nX6&0tF6@*ByEP=gP`ZY0+n{P2&0Tp4j~@cqg=cY
zB_$|{NEM2J$wXm^bfjXDSc42=TmHyQq_RtBQi6F@B@i*$Aw@7$u#ER*TB6GFN~JY}
zaa2Pn45|&BP~#4e4Gy`01UPi^A5$~Ej%Gn7Py*V8LWhBv7#JwmJsMc8AqkMuwpAJ4
zLJ~?CCcG^rbnrBxMZqCf*(faw|4WDRbVP}SSJrcS1Dd70BhJDQH0}=qL?E;@3J)L|
z9;g`z9oV=dVFx#vW}#+jL}=S0iOj1IZ8KBhdN3=<tX8=X*@2WIMYEN-D48|rWI~%G
zM{HX#g=k#8EPRLPFM#A%rq(uF?mXzo5DzhOVwG}alaOf}OJ)&Yg?P1FMRDOpk3u|@
zqBTNn<)6;XUm^6t0E<w+1oEg~o$HSp{QT_nrCU#3IUAO<YI(DTplsBmH17cVM<l2j
z%fC*~&mkK(!gq%Ci#Du{nF*}K;{4b2`5vL7tVG8;4OsCosw$$YfVsK6FpV*SQ0p4)
zsK=wW(&H$oVlvt!#+zwNyeWIyjcX2-XT^Vi_w2E2M+R@T{L|X*Oue><Z!a{zM;~vj
zJx^H(&$~vvg4uclclx&<{vO+Zb@glhpYi=HulcL}bUi(HaHXLp4jo)c*VSbHF}|J8
W?oQ=Pe7^ts%{}j6$*K3($Nm9jZP`Nr

delta 1370
zcmY*ZO=}xR7)EZAGTRU2HkD1%5V>GzFzv{Z)y4?~lpv^$U4flK(+0w5XS6$Hc4jlP
z<3=YzzXCa!m?4MU0{IC`59y(84uzh2=)FH6_xymqyV}vJyO-JbectDN-jCToo-O_L
zZ0Yew8@=sb`^whkV14}ye!$EPWhLb@x}hFiZFk@W|EC>z0Cckd@tfUlXM5EB?Bx5C
z)0@4kz03J(<DYk1JBPzPl5x4Yad#j?RS>kl4cv0G=bFv;+;Q{Joo{Yb=eN2eD+J3B
z!b}LB8g3BIG@&dZ`W_e)N=#gMWpx;H<Ss2gI-PK7P5xqex6x?3H{SngYC@uw4DfIO
za7v<x>G^?<1j2hp%(%vygc(;7;mC4fKp;pMX9ypb6c9DHYaYc}fE5GdZOWNurNVDK
zP<YNXU^<JHHAGVP`v<ERW{mf(${1v?c&N$*GlskM*4{?xE3=P?VF+sw0%<}<xex^5
z+RxmRR{M-eNyw1<?d-*AXticCoFF`55@JSL-D7e@G{T0JwFS6V8>)0t3P4zCI%d#1
zE+Ju2rC>>+si<D4h=)W-1?PB@#wD|65jPpsO%YB=Saz6BS)^Ifl2lkz4g!Yuoia9M
znkx{I#o(_$NocbIp4cLWXcB3X#&9g)G-R?&5Y(kBxeyJS6JkOu=Au6-Rr``8yKjjG
z3Mfyqn22#DpfbC6TIZ&Huc04u9ol3p*aL+785gur)~~zOujbGnfc<7QjQ|fo^HBjE
zc&5Q3)1W5U@yH#I+zH*kt+QVPNmlIgmp<#zBZnS2T;v?iaW#2jMaEMxfj#%D_m#V_
za%p<oQ{0M`E_MR;KY?W&2@~L=;iY)uQDiX@T-R9}NS%mOZ6HO>;k*qn`56=QOsr&b
zPgj}%<TJPXdu8oTfLU3t^z6#VDj%yBRj4_xRzdj@rwlHjFV<EGI;*Yo2-_Mt@tklA
zwakB5eS7Q7?0@E->^(fSy}kLlTib7)+Uj(>`L+F54K)8zxwV7c{Al=msW#<n2fuz;
of4Y~)&-0(vFaJlpSay$->+T}G=5`-W^VdKAiRzI2<?*!fALXpaGXMYp

diff --git a/test/modern/twofiglegend.ps b/test/modern/twofiglegend.ps
index edac1e40e3a22f03f904c9ba809d000697ccde6d..78af1589a7016f35a125241f55281ad180fc65ee 100644
GIT binary patch
delta 1261
zcmZ8h&ubGw6sCg3U94K^4-uqMELE(XCJ}8*FR27-X^mJt)JvJ{yxko-+1bwQ)JBAy
zir_`d9(wVhC;x!_5#GHBy^9AA{tLd{>~y0EB=7Bf@4fGR^RXwVBkAeL$6NOvR%?|<
z%Qbg)cAY;5y(Ue>coeM3!<EV+e(`)^5kCkz-nuhZU8YN{UcJw_O1j5yKb)`ESE|eX
zD<j`8UD!@&#HeEF@5_JIlTZQd8>$je+97$WO$>@lg{h(pI#lgp_*$0FyVNrYI1cGD
z4hl5a>Dc)D(Xbnb5cNNeZ;YhBt{(M#Ar+5Y(nz>q8T_#aj0-^>(o90kH?^QT3!Yj;
z%LdyXRWib(7ok+xW5<r%u_GPw%3`RkYAd-1QJW%n&+FM?o{YPS2Vvq61_3VY62=dB
zP6=`%LI&KUB9aIZmQ;sFMk9lc$$vz`W6^a;ln-->j3A`Kce0>RFptk<S|ZZ&iiOdG
zc0@tIHL4BFA=)mG43=C#0u220+r&)ISJX>5N<g}h=`auz0}c6emv}}gh&-gUZ)AeE
z5CsB?gtdhLAGZk%3Jx8alxYt9FD>Npc|HlRtY`HGG)sO*j0OQHJRbx&!6CU(m<Lg@
zP{ZTOGaX;RAs$ji14ZM|A#H;s5_gDbo9ZF1|7IDP+A#Nm9SFf=G+RCwB{LeG?2ty`
zh;)4FdOAO`al2``qx%9RT)M8LmwuV3OhTvFty!9?nVw9|%{$}?Qa{K{+seDSq*WH<
z!?K{2PEFrkeQDvefYV`kqlt}ZStAwm0S&<;6oIB+r{`u}g4Qf1S_ihWGQ@VM_KZMq
z`eXWL&mlZVq6O`uG$Sg9C(5B=wlB+Epfz`hv4y6rafunKu@q$18SlM=Qnv+4ZzgTK
zMj<cF{`*JQE<P9?yr$BV&37}^#Tvej(9JG+w!OI<(*Sn6n!kZcwT>tK)veFx&fZ1+
IpRL-BzpcEeM*si-

delta 1256
zcmYjRL2uJA7*!DiB_Pnm=q9FV12heUn7egjbhi#wqNt;Sfy59O*LD+Yj-A=@SWg8c
zgv14=9Julydf)>8fD^}Y;upYA;7eLJZ7<IEy}b9nXFKU>>C0*9^Nl;3waumb8|(h^
z@<aZVnH^;%<uce&$J<L4_(OlS0zUwq?A|(GtyXHC>b;Y9pQhGo+tsZ>x%BIj*W7Ej
zaKhzU`tS1JYR3w}63;_S2p$`5Jd|imS%mcg6eEgFn04i7(dAycGW~HX;?kPIx9LZv
z(o$Nw^1g2f)=K)Q-2gbnLBRBQK|8`jEhC0pU5!b?mGn?xxiByQSm-7m+RG{6t#MuR
zAWVFu7!>y@XPV^>Upk<0oUzYz5-Mx3r0I{Va|=VpL#q-7>LVVi62Xk&>CJNMN#4uV
zJJ>J}X)ppZgi$U8_E6D>W@u%AwT%R}U{nQ4vV#mfoY};fFfaW+v)CtAYbHt0Lp>$|
z(b4LF$qv>YGAtk4N5vpS#l74caBA9RkSdoTmjxhLl-bRK5h~yW3#nio_Tn&S)-2#A
zfk>!_B24n|X`cm}WogC2ntYF7KVK_jW2U(R6G;gD;t>;@Wbnvl?_iAsjpGoO8JrR(
za{<3d1qLtP2G0>T#EP-$ySZyOl4OS#YoLJfBnz?Vjtq>->4oyOe%*Pf6RwGkx`G{h
zsGe{^GiUW8t@>z->J6wr7;Th~8sPaTgEkyfW0I*+5HuaK>5xs5{w~kF0Fop-=8v6f
z+acQy*`DNVk8uTgWJSVb(Ss}CPUZ7-e)e{_?<k&yN@r&Ru0{msv?Gj<vcPlm*rD*G
z5M0z@47d=&qZn{DGa1Lg(l@g!P~k(y^ylpLS3Y9-T+-1fC#Rg8nv_#xTp>sK5vL3;
zp_|H%1XkzD^B%GVvgbJACTcl&J9ly8-0+i?rmYWWYqhnlbaA(QcB4|Q4r;q!&lKOH
J!Jqc}!heUIpT__I


From da551b0e93f2d34577d8ef539b15970394102da6 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 17:09:24 -1000
Subject: [PATCH 18/31] Update the docs

After adding +xscale.
---
 doc/rst/source/explain_-l.rst_      |  2 +-
 doc/rst/source/explain_-l_full.rst_ |  9 +++--
 doc/rst/source/std_opts.rst         |  3 +-
 src/gmt_common.h                    |  3 +-
 src/gmt_init.c                      | 58 ++++++++++++++++++-----------
 5 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/doc/rst/source/explain_-l.rst_ b/doc/rst/source/explain_-l.rst_
index 64cda88ee6d..1a02a971c2f 100644
--- a/doc/rst/source/explain_-l.rst_
+++ b/doc/rst/source/explain_-l.rst_
@@ -1,2 +1,2 @@
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]] :ref:`(more ...) <-l_full>`
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ] :ref:`(more ...) <-l_full>`
     Add a legend entry for the symbol or line being plotted. |Add_-l|
diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index 04c368a13a3..2f252bbff61 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,6 +1,6 @@
 .. _-l_full:
 
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]]
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]
     Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
@@ -10,6 +10,7 @@
     **+j** to set placement of the legend [TR],
     use **+n** to change the number of columns used to set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
-    and use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
-    previous to current horizontal line [no vertical line].  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
-    Note that **+h** and **+j** will only take effect if given on the very first **-l** option for a plot.
+    use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
+    previous to current horizontal line [no vertical line], and use **+x**\ *scale* to resize all symbol
+    and length sizes in the legend.  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
+    Note that **+h**, **+j**, and **+x** will only take effect if given on the very first **-l** option for a plot.
diff --git a/doc/rst/source/std_opts.rst b/doc/rst/source/std_opts.rst
index 7a23bd4b5fe..8c4bb5a6449 100644
--- a/doc/rst/source/std_opts.rst
+++ b/doc/rst/source/std_opts.rst
@@ -44,7 +44,8 @@ Common Options
 | **-je**\ \|\ **f**\ \|\ **g**                                            | Mode of spherical distance calculation :ref:`(...) <-j_full>`            |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*]\       | Add an item to the automatic plot legend :ref:`(...) <-l_full>`          |
-| [**+h**\ *header*\ ][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]]  |                                                                          |
+| [**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*]\                    |                                                                          |
+| [**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]                   |                                                                          |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-n**\ [*type*][**+a**][\ **+b**\ *BC*]                                 |                                                                          |
 | [\ **+c**\ ][\ **+t**\ *threshold*]                                      | Set grid interpolation mode :ref:`(...) <-n_full>`                       |
diff --git a/src/gmt_common.h b/src/gmt_common.h
index 6b1c6d7eb22..f4b127bbdc6 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -61,7 +61,8 @@ struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
 	char pen[2][GMT_LEN32];		/* Pens to use with +d and +v */
 	int draw;			/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
 	int just;			/* Legend placement [TR] */
-	double scale;			/* Scale all given sizes, including +llength of a line */
+	double scale;			/* Fixed symbol size when otherwise cannot set it */
+	double size;			/* Scale all given sizes, including +llength of a line */
 	double length;			/* Set length of a line segment */
 	double gap;			/* Move this much down before placing symbol entry */
 	unsigned int ncols;		/* How many columns to use for symbols */
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 031e4d33718..4317390dc65 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -6538,8 +6538,8 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 
 		case 'l':	/* -l option to set up auto-legend items*/
 
-			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.  Optionally, append any\n");
-			gmt_message (GMT, "\t   of +d<pen>, +f<font>, +g<gap>, +h<header>, +j<just>, +n<cols>, +s<size>, and +v[<pen>].\n");
+			gmt_message (GMT, "\t-l Add symbol or line to the legend; append label string.  Optionally, append any of\n");
+			gmt_message (GMT, "\t   +d<pen>, +f<font>, +g<gap>, +h<header>, +j<just>, +n<cols>, +s<size>, +v[<pen>], and +x<scale>.\n");
 			break;
 
 		case 'm':	/* -do option to tell GMT the relationship between NaN and a nan-proxy for output */
@@ -8078,6 +8078,8 @@ int gmt_parse_j_option (struct GMT_CTRL *GMT, char *arg) {
 	return (err);
 }
 
+#define GMT_OPTION_L_MODIFIERS "dfghjlnsvx"	/* All the modifiers available to -l */
+
 /*! Parse the legend-building option -l */
 int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 	char *c = NULL;
@@ -8088,26 +8090,27 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 	if (arg == NULL) return GMT_PARSE_ERROR;		/* Must supply the label arg */
 	gmt_M_memset (&(GMT->common.l.item), 1, struct GMT_LEGEND_ITEM);	/* Initialize */
 
-	if ((c = gmt_first_modifier (GMT, arg, "dfghjlnsv"))) {	/* Got modifiers */
+	if ((c = gmt_first_modifier (GMT, arg, GMT_OPTION_L_MODIFIERS))) {	/* Got modifiers */
 		unsigned int pos = 0, n_errors = 0;
 		char txt[GMT_LEN128] = {""};
-		while (gmt_getmodopt (GMT, 'l', c, "dfghjlnsv", &pos, txt, &n_errors) && n_errors == 0) {
+		while (gmt_getmodopt (GMT, 'l', c, GMT_OPTION_L_MODIFIERS, &pos, txt, &n_errors) && n_errors == 0) {
 			switch (txt[0]) {
 				case 'd': /* Draw horizontal line */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_D;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_D], &txt[1], GMT_LEN32-1);
 					break;
-				case 'f': strncpy (GMT->common.l.item.font, &txt[1], GMT_LEN32-1);	break;	/* Font to use for this -l entry */
-				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Gap before next item */
-				case 'h': strncpy (GMT->common.l.item.header, &txt[1], GMT_LEN128-1);	break;	/* Legend header */
+				case 'f': strncpy (GMT->common.l.item.font, &txt[1], GMT_LEN32-1);		break;	/* Font to use for this -l entry */
+				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Gap before next item */
+				case 'h': strncpy (GMT->common.l.item.header, &txt[1], GMT_LEN128-1);		break;	/* Legend header */
 				case 'j': GMT->common.l.item.just = gmt_just_decode (GMT, &txt[1], PSL_TR);	break;	/* legend placement */
-				case 'l': GMT->common.l.item.length = gmt_M_to_inch (GMT, &txt[1]);	break;	/* Line length */
-				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);			break;	/* Number of columns */
-				case 's': GMT->common.l.item.scale = atof (&txt[1]);			break;	/* Scale all symbols */
+				case 'l': GMT->common.l.item.length = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Line length */
+				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);				break;	/* Number of columns */
+				case 's': GMT->common.l.item.size = atof (&txt[1]);				break;	/* Fixed size for a symbol */
 				case 'v': /* Draw vertical line(s) */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_V;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_V], &txt[1], GMT_LEN32-1);
 					break;
+				case 'x': GMT->common.l.item.scale = atof (&txt[1]);				break;	/* Scale all symbols by this factor */
 				default: break;	/* These are caught in gmt_getmodopt so break is just for Coverity */
 			}
 		}
@@ -16004,7 +16007,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	double size;
 	FILE *fp = NULL;
 
-	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+l<length>][+n<cols>][+s<scale>][+v[<pen>]] */
+	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+l<length>][+n<cols>][+s<size>][+v[<pen>]][+x<scale>] */
 	
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
@@ -16019,26 +16022,33 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			GMT_Report (API, GMT_MSG_NORMAL, "Unable to create current legend file %s !\n", file);
 			return;
 		}
-		if (item->scale == 0.0) item->scale = 1.0;	/* Default scaling */
-		if (item->just == 0) item->just = PSL_TR;	/* Default justification */
+		if (item->scale == 0.0) item->scale = 1.0;	/* Default scaling set 1:1 */
+		if (item->just == 0) item->just = PSL_TR;	/* Default justification is top right corner */
 		gmt_just_to_code (API->GMT, item->just, justcode);
 		fprintf (fp, "# Auto-generated legend information file\n");
+		/* THe next two legend commends will be parsed by gmt legend and acted upon */
 		fprintf (fp, "# LEGEND_JUSTIFICATION: %s\n", justcode);
 		fprintf (fp, "# LEGEND_SCALING: %g\n", item->scale);
 		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
 			fprintf (fp, "G %gi\n", item->gap);
-			gap_done = true;	/* So we dont do it again below */
+			gap_done = true;	/* So we don't do it again below */
 		}
-		if (item->header[0]) {	/* Want to place a centered legend header */
-			if (item->font[0])	/* Use given font */
+		if (item->header[0]) {	/* Want to place a centered legend header first */
+			if (item->font[0])	/* Use the given font */
 				fprintf (fp, "H %s %s\n", item->font, item->header);
 			else	/* Default to FONT_TITLE setting */
 				fprintf (fp, "H - %s\n", item->header);
 		}
 	}
-	else if ((fp = fopen (file, "a")) == NULL) {	/* Append to an existing file */
-		GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to existing current legend file %s !\n", file);
-		return;
+	else {	/* Append to an existing file */
+		if ((fp = fopen (file, "a")) == NULL) {	/* Cannot append to an existing file? */
+			GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to existing current legend file %s !\n", file);
+			return;
+		}
+		if (item->scale > 0.0)
+			GMT_Report (API, GMT_MSG_VERBOSE, "Your -l+x<scale> is ignored - only applicable to the first instance of -l.\n");
+		if (item->just)
+			GMT_Report (API, GMT_MSG_VERBOSE, "Your -l+j<just> is ignored - only applicable to the first instance of -l.\n");
 	}
 	GMT_Report (API, GMT_MSG_DEBUG, "Add record to current legend file%s\n", file);
 	if (!gap_done && !gmt_M_is_zero (item->gap))	/* Always place a gap first, if requested, and not already done before title */
@@ -16050,9 +16060,15 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 		fprintf (fp, "N %d\n", item->ncols);
 	if (((item->draw & GMT_LEGEND_DRAW_V) && item->pen[GMT_LEGEND_PEN_V][0] == '\0'))	/* Initialize the vertical line setting */
 		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_V);
-	
+	/* Get the symbol size */
+	if (item->size > 0.0)	/* Hard-wired symbol size given */
+		size = item->size;
+	else if (item->length > 0.0)
+		size = item->length;
+	else
+		size = S->size_x;	/* Use the symbol size given */
+
 	/* Place the symbol command */
-	size = (item->length > 0.0) ? item->length : S->size_x;
 	if (S->symbol == GMT_SYMBOL_LINE) {	/* Line for legend entry */
 		if (size > 0.0)	/* Got a line length in inches */
 			fprintf (fp, "S - - %gi - %s - %s\n", size, gmt_putpen (API->GMT, pen), item->label);

From 960a1f368020a6f3104095927f33114124991016 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 17:19:36 -1000
Subject: [PATCH 19/31] Let psxy/z use +ssize again

Update these two to use the latest +ssize.
---
 src/psxy.c  | 2 +-
 src/psxyz.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/psxy.c b/src/psxy.c
index 9f62f239100..f567fa70be4 100644
--- a/src/psxy.c
+++ b/src/psxy.c
@@ -1150,7 +1150,7 @@ int GMT_psxy (void *V_API, int mode, void *args) {
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
 		else { /* Fixed symbol type throughout */
 			GMT_Set_Columns (API, GMT_IN, n_needed, GMT_COL_FIX);
-			if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.length > 0.0)) {
+			if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.size > 0.0)) {
 				/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
 				gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
 			}
diff --git a/src/psxyz.c b/src/psxyz.c
index 848ef17f189..fd7fc02bd00 100644
--- a/src/psxyz.c
+++ b/src/psxyz.c
@@ -885,7 +885,7 @@ int GMT_psxyz (void *V_API, int mode, void *args) {
 		if (!read_symbol) API->object[API->current_item[GMT_IN]]->n_expected_fields = n_needed;
 		if (S.read_symbol_cmd)	/* Must prepare for a rough ride */
 			GMT_Set_Columns (API, GMT_IN, 0, GMT_COL_VAR);
-		else if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.length > 0.0)) {
+		else if (GMT->common.l.active && !get_rgb && (!S.read_size || GMT->common.l.item.size > 0.0)) {
 			/* For specified symbol, size, color we can do an auto-legend entry under modern mode */
 			gmt_add_legend_item (API, &S, Ctrl->G.active, &(Ctrl->G.fill), Ctrl->W.active, &(Ctrl->W.pen), &(GMT->common.l.item));
 		}

From 3a0d89db846790993ef65f44837ff52e519b48d9 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 17:36:45 -1000
Subject: [PATCH 20/31] Also scale offsets in the legend

And fix insetlegend.sh script to use +x.
---
 src/pslegend.c             | 4 ++--
 test/modern/insetlegend.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pslegend.c b/src/pslegend.c
index ddab9def3ed..1163d1899f1 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -1237,7 +1237,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							x_off = Ctrl->D.refpoint->x + x_off_col[column_number];
 						}
 						else if (!strcmp (txt_a, "-")) {	/* Automatic margin offset */
-							off_ss = DX1_MUL * def_size;
+							off_ss = DX1_MUL * Ctrl->S.scale * def_size;
 							x_off = col_left_x + x_off_col[column_number];
 						}
 						else {	/* Gave a specific offset */
@@ -1245,7 +1245,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							x_off = col_left_x + x_off_col[column_number];
 						}
 						if (!strcmp (txt_b, "-"))	/* Automatic label offset */
-							off_tt = DX2_MUL * def_size;
+							off_tt = DX2_MUL * Ctrl->S.scale * def_size;
 						else	/* Gave a specific offset */
 							off_tt = gmt_M_to_inch (GMT, txt_b);
 						d_off = 0.5 * (Ctrl->D.spacing - FONT_HEIGHT_PRIMARY) * GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;	/* To center the text */
diff --git a/test/modern/insetlegend.sh b/test/modern/insetlegend.sh
index 66294581ec6..8cb8ac60515 100755
--- a/test/modern/insetlegend.sh
+++ b/test/modern/insetlegend.sh
@@ -3,7 +3,7 @@
 gmt begin insetlegend ps
   gmt psbasemap -R0/7/3/7 -Jx1i -B0 -B+t"Inset with plot and legend" -Xc
   gmt inset begin -DjTR+w4i/2.5i+o0.1i -M1c -F+p1p,red
-    gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL+s0.5
+    gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL+x0.5
     gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l1c
     gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
   gmt inset end

From b80a0be8b3e970452f3db0a37a31e4d048761919 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 18:24:17 -1000
Subject: [PATCH 21/31] Undo subset -J history when subplot is completed
 (#1766)

Like inset, we do not want -R -J settings used during the subplot to leak back into the history of the main plot.  While we had correctly set the region and linear scale we did not set the
---
 src/subplot.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/subplot.c b/src/subplot.c
index 9dab5295e41..728b18ffa7d 100644
--- a/src/subplot.c
+++ b/src/subplot.c
@@ -1208,7 +1208,7 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 	else {	/* SUBPLOT_END */
 		int k, id;
 		char *wmode[2] = {"w","a"}, vfile[GMT_STR16] = {""}, Rtxt[GMT_LEN64] = {""}, tag[GMT_LEN16] = {""};
-		char legend_justification[4] = {""};
+		char legend_justification[4] = {""}, Jstr[3] = {"J"};
 		double legend_width = 0.0, legend_scale = 1.0;
 		FILE *fp = NULL;
 		struct GMT_SUBPLOT *P = NULL;
@@ -1278,17 +1278,21 @@ int GMT_subplot (void *V_API, int mode, void *args) {
 		
 		/* Set -R and J to match subplot frame so later calls, e.g., colorbar, can use -DJ */
 		/* First set R (i.e., RP for plotting) */
-		id = gmt_get_option_id (0, "R");		/* The -RP history item */
+		id = gmt_get_option_id (0, "R");		/* The -RP history index */
 		if (GMT->init.history[id]) gmt_M_str_free (GMT->init.history[id]);	/* Remove what this was */
 		sprintf (Rtxt, "0/%.16g/0/%.16g", P->dim[GMT_X], P->dim[GMT_Y]);
-		GMT->init.history[id] = strdup (Rtxt);
-		/* Now set -Jx1i */
+		GMT->init.history[id] = strdup (Rtxt);	/* Update with the dimension of the whole subplot fiture */
+		/* Now add -Jx1i to the history */
 		id = gmt_get_option_id (0, "J");	/* Top level -J history */
-		if (GMT->init.history[id]) gmt_M_str_free (GMT->init.history[id]);	/* Remove what this was */
-		GMT->init.history[id] = strdup ("x");	/* Just the flavor */
+		if (id > 0 && GMT->init.history[id]) {	/* Should be an entry but we check id nevertheless */
+			Jstr[1] = GMT->init.history[id][0];	/* The acual -J? that was used in the subplot */
+			gmt_M_str_free (GMT->init.history[id]);	/* Remove what this was */
+			GMT->init.history[id] = strdup ("x");	/* Just the flavor */
+			if ((id = gmt_get_option_id (id + 1, Jstr)) >= 0 && GMT->init.history[id]) gmt_M_str_free (GMT->init.history[id]);	/* Remove the subplot -J? entry */
+		}
 		id = gmt_get_option_id (id, "Jx");	/* Find Jx history, if any */
-		if (GMT->init.history[id]) gmt_M_str_free (GMT->init.history[id]);	/* Remove what this was */
-		GMT->init.history[id] = strdup ("x1i");
+		if (id > 0 && GMT->init.history[id]) gmt_M_str_free (GMT->init.history[id]);	/* Remove what this was */
+		GMT->init.history[id] = strdup ("x1i");	/* Add a scale of 1 inch per unit to match the inches we gave in the -R history */
 		
 		gmt_M_memset (&GMT->current.plot.panel, 1, struct GMT_SUBPLOT);	/* Wipe that smile off your face */
 	}

From 43527053d23e1f8748cbd75f36c393cffef4ab4b Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 18:45:34 -1000
Subject: [PATCH 22/31] Improve the -l docs

---
 doc/rst/source/explain_-l.rst_      | 2 +-
 doc/rst/source/explain_-l_full.rst_ | 7 +++++--
 doc/rst/source/std_opts.rst         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/rst/source/explain_-l.rst_ b/doc/rst/source/explain_-l.rst_
index 1a02a971c2f..925fdd6489f 100644
--- a/doc/rst/source/explain_-l.rst_
+++ b/doc/rst/source/explain_-l.rst_
@@ -1,2 +1,2 @@
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ] :ref:`(more ...) <-l_full>`
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+l**\ *length*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ] :ref:`(more ...) <-l_full>`
     Add a legend entry for the symbol or line being plotted. |Add_-l|
diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index 2f252bbff61..cdd309708b2 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,16 +1,19 @@
 .. _-l_full:
 
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+l**\ *length*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]
     Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
     when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
     legend entry is placed [no line], use **+f** to set the font to use for title or labels,
     use **+g** to add some vertical space [0], use **+h** to add a legend header [no header],
-    **+j** to set placement of the legend [TR],
+    **+j** to set placement of the legend [TR], use **+l** to specify the length of a line symbol,
     use **+n** to change the number of columns used to set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
     use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
     previous to current horizontal line [no vertical line], and use **+x**\ *scale* to resize all symbol
     and length sizes in the legend.  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
     Note that **+h**, **+j**, and **+x** will only take effect if given on the very first **-l** option for a plot.
+    The automatic legend has a fixed white background with a solid black pen outline and offset 0.2 cm from the map frame.
+    The modifiers largely reflect legend codes described in :doc:`legend`, which provide more details and
+    customization.
diff --git a/doc/rst/source/std_opts.rst b/doc/rst/source/std_opts.rst
index 8c4bb5a6449..f57ed85934f 100644
--- a/doc/rst/source/std_opts.rst
+++ b/doc/rst/source/std_opts.rst
@@ -44,7 +44,7 @@ Common Options
 | **-je**\ \|\ **f**\ \|\ **g**                                            | Mode of spherical distance calculation :ref:`(...) <-j_full>`            |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*]\       | Add an item to the automatic plot legend :ref:`(...) <-l_full>`          |
-| [**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*]\                    |                                                                          |
+| [**+h**\ *header*\ ][**+j**\ *just*][**+l**\ *length*][**+n**\ *cols*]\  |                                                                          |
 | [**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]                   |                                                                          |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-n**\ [*type*][**+a**][\ **+b**\ *BC*]                                 |                                                                          |

From 4619ef68107412189c06c0291f82329c195ad2a6 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Tue, 8 Oct 2019 18:58:19 -1000
Subject: [PATCH 23/31] Improve legend width estimation

Also must update the PS files then.
---
 src/gmt_constants.h         |   3 +++
 src/gmt_init.c              |   4 ++--
 src/pslegend.c              |   7 ++-----
 test/modern/insetlegend.ps  | Bin 28389 -> 28382 bytes
 test/modern/onefiglegend.ps | Bin 28052 -> 28047 bytes
 test/modern/sublegend.ps    | Bin 36928 -> 36924 bytes
 test/modern/twofiglegend.ps | Bin 27923 -> 27918 bytes
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gmt_constants.h b/src/gmt_constants.h
index 8603c81e947..e867e5ed3d2 100644
--- a/src/gmt_constants.h
+++ b/src/gmt_constants.h
@@ -284,6 +284,9 @@ enum GMT_enum_autolegend {
 	GMT_LEGEND_PEN_D  = 0, GMT_LEGEND_PEN_V  = 1,
 	GMT_LEGEND_DRAW_D = 1, GMT_LEGEND_DRAW_V = 2};
 
+#define GMT_LEGEND_DX1_MUL 1.0	/* Default offset from margin to center of symbol if given as '-' times max symbol size */
+#define GMT_LEGEND_DX2_MUL 2.0	/* Default offset from margin to start of label if given as '-' times max symbol size */
+
 /*! Various mode for axes */
 enum GMT_enum_oblique {
 	GMT_OBL_ANNOT_LON_X_LAT_Y    =  0,
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 4317390dc65..b179b739955 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -16111,8 +16111,8 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 		if (size[0] != '-' && (W = gmt_M_to_inch (API->GMT, size)) > W_max) W_max = W;
 	}
 	fclose (fp);
-	/* Best estimate of legend box width from longest string in the labels */
-	*width = 3.0 * (*scale) * W_max + N_max * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
+	/* Best estimate of legend box width from longest string in the labels and space needed for symbols, plus 5 % */
+	*width = GMT_LEGEND_DX2_MUL * (*scale) * W_max + N_max * 1.05 * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
 	return true;
 }
 
diff --git a/src/pslegend.c b/src/pslegend.c
index 1163d1899f1..0a0e9a88695 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -408,9 +408,6 @@ GMT_LOCAL bool new_fontsyntax (struct GMT_CTRL *GMT, char *word1, char *word2) {
 #define FONT_HEIGHT(font_id) (GMT->session.font[font_id].height)
 #define FONT_HEIGHT_LABEL (GMT->session.font[GMT->current.setting.font_label.id].height)
 
-#define DX1_MUL 1.0	/* Default offset from margin to center of symbol if given as '*' */
-#define DX2_MUL 2.0	/* Default offset from margin to start of label if given as '*' */
-
 #define SYM 	0
 #define FRONT	1
 #define QLINE	2
@@ -1237,7 +1234,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							x_off = Ctrl->D.refpoint->x + x_off_col[column_number];
 						}
 						else if (!strcmp (txt_a, "-")) {	/* Automatic margin offset */
-							off_ss = DX1_MUL * Ctrl->S.scale * def_size;
+							off_ss = GMT_LEGEND_DX1_MUL * Ctrl->S.scale * def_size;
 							x_off = col_left_x + x_off_col[column_number];
 						}
 						else {	/* Gave a specific offset */
@@ -1245,7 +1242,7 @@ int GMT_pslegend (void *V_API, int mode, void *args) {
 							x_off = col_left_x + x_off_col[column_number];
 						}
 						if (!strcmp (txt_b, "-"))	/* Automatic label offset */
-							off_tt = DX2_MUL * Ctrl->S.scale * def_size;
+							off_tt = GMT_LEGEND_DX2_MUL * Ctrl->S.scale * def_size;
 						else	/* Gave a specific offset */
 							off_tt = gmt_M_to_inch (GMT, txt_b);
 						d_off = 0.5 * (Ctrl->D.spacing - FONT_HEIGHT_PRIMARY) * GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;	/* To center the text */
diff --git a/test/modern/insetlegend.ps b/test/modern/insetlegend.ps
index 0fd40d9a1ded32affcbc80805bb93d04f4035d87..af64ee7811a34310f40f4a16c0b5cfd764a94c4e 100644
GIT binary patch
delta 156
zcmaEQm+{_R#tEhDNfri)21%(Cn<lYaSecqx8JTXDW_%IEQemKHI$0s9Xme#qsR)aq
zg|YGE&l!*0O^gf_%nc0`Of4-Gf{VCJ6vDau6o5h&Mhd<Ph9Fr31s8>2E<<ymj9Va=
qzaf{Qp`|%Q3ZZfG+C<yUky+cBxIkhSmIgrGlj}qCH+Sa7FaiK#-7F6P

delta 115
zcmcb2m+|Rc#tEgohL(vIDaMAnDVaqjl@n_wu^U?%8(SHgZx&^I5yV)$`CsrW5msXp
zBU97KZ!#V!ni(1@SQwZom|9vW1Q&6cD1>wQDHtf2TNo+$Di{J~C%?~>V27&O%$N0>
Ni5aMTGf(a%MgY*sBiR4|

diff --git a/test/modern/onefiglegend.ps b/test/modern/onefiglegend.ps
index 3efcd4b43c369ec81a729c8ddb888e5c399ab4c6..9fb1589a81c24185e9c911af38d2fda347349fd7 100644
GIT binary patch
delta 134
zcmbPoo3Z~k<AhT7BnyK?gQV1nO}*?ER;FfF#wMG^7(b@57+6@EP3FotX>Dm~p<rxk
zV5tzoRc)x?SgYU`%w=e3X|7;sY+#{aW@@5f3RDqX#ATuo&gG|IpkQucq~Hsdoy?ah
c!46fmSvT_u6EjfxWRaX#%s@jYGv-bP0P@-+%K!iX

delta 133
zcmeCb%{b*Y<AhRPL(4>q6k|i(l+2=%%850-?8a8c##V-wn*|s@rZF2C7)@r)ILT~b
zW<2>~hB&*4iIIZ2k>TX`8RD8Cwt<3+LNJ%1xk5OXTOgOeA(x?{rMZG3RGEUQrG-Lp
a(c}q<wwrS@7cen{wDRY?0vq=yXEFeU%qL_3

diff --git a/test/modern/sublegend.ps b/test/modern/sublegend.ps
index 04294a24c935b7c41f70a03be8fb627a08cd877f..0a5bd05ca11e796785462d3027b5f50b63621c33 100644
GIT binary patch
delta 179
zcmX@GfN9SHrU|9&Nfri)21%(CoBG)-tW3?Uj5doiR%NmnT3DJ*?(LGEyguuIqJ_DI
zf|0R-r9uc-wV{Gzt%6%Hm!YAhxq_jIk%fY}p~>V4+2YJV_T-7(66{d1%^SMe88=_Z
ndCJHPQn4fNBQwyP&1>@SNx@8i3{#6k|6?Yo)^n3n`tJY$qH{VP

delta 229
zcmdn9fa$;jrU|9IhL(vIDaMAnDVaqjl@n|F*^I4>jjaqf3o=$^G8>y3P43US&1`02
zJUKU8T+z(PNWsF;P{GvFLLs<_%S0iZ%TK{T!Q8?~!B@c$C_A~gTY?>`YV(?IcE-)8
zbDlD?gY;Nf8chE0S2$TCzlIxVo`SBCv4N#R$m9)a5}S|b?~{UBCOvsc*9np>dd!4o
KN95#${yPAtXhj(S

diff --git a/test/modern/twofiglegend.ps b/test/modern/twofiglegend.ps
index 78af1589a7016f35a125241f55281ad180fc65ee..becf9607a3699a9e825152ff338254652f8b0be7 100644
GIT binary patch
delta 120
zcmbPyi?Qz(<AhT7BnyK?gQV1nO}*?ER;FfF#wMG^7+<Ba7+6@EO=iw`=wNJMp<rfe
zqF`!ip%7feWug$y<)>hvU~XZg;HzK=k~L6pQ3&QTGzZGK1#<Ztav2(0nnR?38aJzC
NK44-7G1zl>7y<nD9&`Wz

delta 105
zcmeCX#W?vE<AhRPL(4>q6k|i(l+2=%%850-?8a8c##V-wn*|tOr7;^B7)}0{{!r1x
z#7M#1$WX!5(n2A)h|5GFoXbzaK*8L?NWoXZ5GXq-Q-U3;XtR9g114sm>dj0!Jd6Ox
C?;Vx^


From e99e4d034ff0f1dec59999fd77dc3744ffb3ea4a Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Wed, 9 Oct 2019 12:23:59 -1000
Subject: [PATCH 24/31] If neither outline nor fill selected, legend must draw
 line, just line plot

Special case in gmt plot is symbols selected but no -G -W given.  Then we draw outline with default pen . Same has to happen for  -l.
---
 src/gmt_init.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index b179b739955..30b0d05b3ab 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -16070,13 +16070,17 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 
 	/* Place the symbol command */
 	if (S->symbol == GMT_SYMBOL_LINE) {	/* Line for legend entry */
+		if (pen == NULL) pen = &(API->GMT->current.setting.map_default_pen);	/* Must have pen to draw line */
 		if (size > 0.0)	/* Got a line length in inches */
 			fprintf (fp, "S - - %gi - %s - %s\n", size, gmt_putpen (API->GMT, pen), item->label);
 		else	/* Punt to the legend module */
 			fprintf (fp, "S - - - - %s - %s\n", gmt_putpen (API->GMT, pen), item->label);
 	}
-	else	/* Regular symbol */
+	else {	/* Regular symbol */
+		if (!(do_fill || do_line)) do_line = true;	/* If neither fill nor pen is selected, plot will draw line, so override do_line here */
+		if (do_line && pen == NULL) pen = &(API->GMT->current.setting.map_default_pen);	/* Must have pen to draw line */
 		fprintf (fp, "S - %c %gi %s %s - %s\n", S->symbol, size, (do_fill) ? gmtlib_putfill (API->GMT, fill) : "-", (do_line) ? gmt_putpen (API->GMT, pen) : "-", item->label);
+	}
 	
 	if (item->draw & GMT_LEGEND_DRAW_V && item->pen[GMT_LEGEND_PEN_V][0]) {	/* Must end with horizontal, then vertical line */
 		draw_legend_line (API, fp, item, GMT_LEGEND_DRAW_D);		/* Draw horizontal line, if requested, after last symbol */

From 5414d1f24fa12667744aa9fceed2dca47d015ee2 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Wed, 9 Oct 2019 17:45:51 -1000
Subject: [PATCH 25/31] Fix scripts

---
 doc/examples/ex03/ex03.sh     | 66 +++++++++++++++++------------------
 doc/scripts/GMT_autolegend.sh |  2 +-
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/doc/examples/ex03/ex03.sh b/doc/examples/ex03/ex03.sh
index 57b74dd1644..26d35afc7e6 100755
--- a/doc/examples/ex03/ex03.sh
+++ b/doc/examples/ex03/ex03.sh
@@ -19,38 +19,38 @@
 #
 
 gmt begin ex03
-  gmt set GMT_FFT kiss
-  # First, we use "gmt fitcircle" to find the parameters of a great circle
-  # most closely fitting the x,y points in "sat_03.txt":
-  cpos=`gmt fitcircle @sat_03.txt -L2 -Fm --IO_COL_SEPARATOR=/`
-  ppos=`gmt fitcircle @sat_03.txt -L2 -Fn --IO_COL_SEPARATOR=/`
-  # Now we use "gmt project" to project the data in both sat_03.txt and ship_03.txt
-  # into data.pg, where g is the same and p is the oblique longitude around
-  # the great circle.  We use -Q to get the p distance in kilometers, and -S
-  # to sort the output into increasing p values.
-  gmt project  @sat_03.txt -C$cpos -T$ppos -S -Fpz -Q > sat.pg
-  gmt project @ship_03.txt -C$cpos -T$ppos -S -Fpz -Q > ship.pg
-  bounds=`gmt info ship.pg sat.pg -I1 -Af -L -C -i0  --IO_COL_SEPARATOR=/`
-  # Now we can use $bounds in gmt math to make a sampling points file for gmt sample1d:
-  gmt math -T$bounds/1 -N1/0 T = samp.x
-  # Now we can resample the gmt projected satellite data:
-  gmt sample1d sat.pg -Tsamp.x > samp_sat.pg
-  # For reasons above, we use gmt filter1d to pre-treat the ship data.  We also need to sample
-  # it because of the gaps > 1 km we found.  So we use gmt filter1d | gmt sample1d.  We also
-  # use the -E on gmt filter1d to use the data all the way out to bounds :
-  gmt filter1d ship.pg -Fm1 -T$bounds/1 -E | gmt sample1d -Tsamp.x > samp_ship.pg
-  # Now to do the cross-spectra, assuming that the ship is the input and the sat is the output
-  # data, we do this:
-  gmt convert -A samp_ship.pg samp_sat.pg -o1,3 | gmt spectrum1d -S256 -D1 -W -C -T
-  # Time to plot spectra, use -l to build a legend
-  gmt set FONT_TAG 18p,Helvetica-Bold
-  gmt subplot begin 2x1 -M0.1i -SCb+l"Wavelength (km)" -T"Ship and Satellite Gravity" -Fs4i/3.75i -A+jTR+o0.1i -BWeSn+g240/255/240 -X2i -Y1.5i
-    gmt subplot set 0,0 -A"Input Power"
-    gmt plot spectrum.xpower -JX-?l/?l -Bxa1f3p -Bya1f3p+l"Power (mGal@+2@+km)" -Gred -ST0.07i -R1/1000/0.1/10000 -Ey+p0.5p -lShip
-    gmt plot spectrum.ypower -Gblue -Sc0.07i -Ey+p0.5p -lSatellite
-    gmt legend -DjBL+w1.2i+o0.25i -F+gwhite+pthicker --FONT_ANNOT_PRIMARY=14p,Helvetica-Bold
-    gmt subplot set 1,0 -A"Coherency@+2@+"
-    gmt plot spectrum.coh -JX-?l/? -Bxa1f3p -Bya0.25f0.05+l"Coherency@+2@+" -R1/1000/0/1 -Sc0.07i -Gpurple -Ey+p0.5p
-  gmt subplot end
+	gmt set GMT_FFT kiss
+	# First, we use "gmt fitcircle" to find the parameters of a great circle
+	# most closely fitting the x,y points in "sat_03.txt":
+	cpos=`gmt fitcircle @sat_03.txt -L2 -Fm --IO_COL_SEPARATOR=/`
+	ppos=`gmt fitcircle @sat_03.txt -L2 -Fn --IO_COL_SEPARATOR=/`
+	# Now we use "gmt project" to project the data in both sat_03.txt and ship_03.txt
+	# into data.pg, where g is the same and p is the oblique longitude around
+	# the great circle.  We use -Q to get the p distance in kilometers, and -S
+	# to sort the output into increasing p values.
+	gmt project  @sat_03.txt -C$cpos -T$ppos -S -Fpz -Q > sat.pg
+	gmt project @ship_03.txt -C$cpos -T$ppos -S -Fpz -Q > ship.pg
+	bounds=`gmt info ship.pg sat.pg -I1 -Af -L -C -i0  --IO_COL_SEPARATOR=/`
+	# Now we can use $bounds in gmt math to make a sampling points file for gmt sample1d:
+	gmt math -T$bounds/1 -N1/0 T = samp.x
+	# Now we can resample the gmt projected satellite data:
+	gmt sample1d sat.pg -Tsamp.x > samp_sat.pg
+	# For reasons above, we use gmt filter1d to pre-treat the ship data.  We also need to sample
+	# it because of the gaps > 1 km we found.  So we use gmt filter1d | gmt sample1d.  We also
+	# use the -E on gmt filter1d to use the data all the way out to bounds :
+	gmt filter1d ship.pg -Fm1 -T$bounds/1 -E | gmt sample1d -Tsamp.x > samp_ship.pg
+	# Now to do the cross-spectra, assuming that the ship is the input and the sat is the output
+	# data, we do this:
+	gmt convert -A samp_ship.pg samp_sat.pg -o1,3 | gmt spectrum1d -S256 -D1 -W -C -T
+	# Time to plot spectra, use -l to build a legend
+	gmt set FONT_TAG 18p,Helvetica-Bold
+	gmt subplot begin 2x1 -M0.1i -SCb+l"Wavelength (km)" -T"Ship and Satellite Gravity" -Fs4i/3.75i -A+jTR+o0.1i -BWeSn+g240/255/240 -X2i -Y1.5i
+		gmt subplot set 0,0 -A"Input Power"
+		gmt plot spectrum.xpower -JX-?l/?l -Bxa1f3p -Bya1f3p+l"Power (mGal@+2@+km)" -Gred -ST0.07i -R1/1000/0.1/10000 -Ey+p0.5p -lShip
+		gmt plot spectrum.ypower -Gblue -Sc0.07i -Ey+p0.5p -lSatellite
+		gmt legend -DjBL+w1.2i+o0.25i -F+gwhite+pthicker --FONT_ANNOT_PRIMARY=14p,Helvetica-Bold
+		gmt subplot set 1,0 -A"Coherency@+2@+"
+		gmt plot spectrum.coh -JX-?l/? -Bxa1f3p -Bya0.25f0.05+l"Coherency@+2@+" -R1/1000/0/1 -Sc0.07i -Gpurple -Ey+p0.5p
+	gmt subplot end
 gmt end show
 rm -f samp* *.pg spectrum.*
diff --git a/doc/scripts/GMT_autolegend.sh b/doc/scripts/GMT_autolegend.sh
index c3338603487..3d3883154f3 100755
--- a/doc/scripts/GMT_autolegend.sh
+++ b/doc/scripts/GMT_autolegend.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-gmt begin GMT_autolegend ps
+gmt begin GMT_autolegend
   gmt plot -R0/7.2/3/7.2 -Jx2c @Table_5_11.txt -Sc0.35c -Glightgreen -Wfaint -lApples+h"LEGEND"+f16p+d
   gmt plot @Table_5_11.txt -St0.35c -Gorange -B -BWStr -lOranges
   gmt legend -DjTR+w3c+o0.25c -F+p1p+ggray95+s

From 69babdf73c4e699c2d9116891b6aefc4b31ead77 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Wed, 9 Oct 2019 17:48:19 -1000
Subject: [PATCH 26/31] Read size with distance units

---
 src/gmt_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index 30b0d05b3ab..55259a976f3 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -8105,7 +8105,7 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 				case 'j': GMT->common.l.item.just = gmt_just_decode (GMT, &txt[1], PSL_TR);	break;	/* legend placement */
 				case 'l': GMT->common.l.item.length = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Line length */
 				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);				break;	/* Number of columns */
-				case 's': GMT->common.l.item.size = atof (&txt[1]);				break;	/* Fixed size for a symbol */
+				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Fixed size for a symbol */
 				case 'v': /* Draw vertical line(s) */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_V;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_V], &txt[1], GMT_LEN32-1);

From 148757f061c4a508a2f5b5f4d6890ba7b2f0ac80 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Wed, 9 Oct 2019 18:19:02 -1000
Subject: [PATCH 27/31] Remove +llength and add +wwidth

Line length is now set by +s as for other symbols. Legend width can be hard-wired via +w.
---
 doc/rst/source/explain_-l.rst_      |  2 +-
 doc/rst/source/explain_-l_full.rst_ |  8 +++---
 doc/rst/source/std_opts.rst         |  4 +--
 src/gmt_common.h                    |  6 ++---
 src/gmt_init.c                      | 40 +++++++++++++++++++++--------
 test/modern/insetlegend.sh          |  2 +-
 test/modern/sublegend.sh            |  4 +--
 7 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/doc/rst/source/explain_-l.rst_ b/doc/rst/source/explain_-l.rst_
index 925fdd6489f..d3400c83bf0 100644
--- a/doc/rst/source/explain_-l.rst_
+++ b/doc/rst/source/explain_-l.rst_
@@ -1,2 +1,2 @@
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+l**\ *length*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ] :ref:`(more ...) <-l_full>`
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+w**\ *width*][**+x**\ *scale*\ ] :ref:`(more ...) <-l_full>`
     Add a legend entry for the symbol or line being plotted. |Add_-l|
diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index cdd309708b2..e0bc1c49722 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,19 +1,19 @@
 .. _-l_full:
 
-**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+l**\ *length*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]
+**-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+w**\ *width*][**+x**\ *scale*\ ]
     Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
     when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
     legend entry is placed [no line], use **+f** to set the font to use for title or labels,
     use **+g** to add some vertical space [0], use **+h** to add a legend header [no header],
-    **+j** to set placement of the legend [TR], use **+l** to specify the length of a line symbol,
+    **+j** to set placement of the legend [TR], 
     use **+n** to change the number of columns used to set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
     use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
-    previous to current horizontal line [no vertical line], and use **+x**\ *scale* to resize all symbol
+    previous to current horizontal line [no vertical line], use **+w** to set legend width [auto], and use **+x**\ *scale* to resize all symbol
     and length sizes in the legend.  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
-    Note that **+h**, **+j**, and **+x** will only take effect if given on the very first **-l** option for a plot.
+    Note that **+h**, **+j**, **+w**, and **+x** will only take effect if given on the very first **-l** option for a plot.
     The automatic legend has a fixed white background with a solid black pen outline and offset 0.2 cm from the map frame.
     The modifiers largely reflect legend codes described in :doc:`legend`, which provide more details and
     customization.
diff --git a/doc/rst/source/std_opts.rst b/doc/rst/source/std_opts.rst
index f57ed85934f..99f6e0c4360 100644
--- a/doc/rst/source/std_opts.rst
+++ b/doc/rst/source/std_opts.rst
@@ -44,8 +44,8 @@ Common Options
 | **-je**\ \|\ **f**\ \|\ **g**                                            | Mode of spherical distance calculation :ref:`(...) <-j_full>`            |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*]\       | Add an item to the automatic plot legend :ref:`(...) <-l_full>`          |
-| [**+h**\ *header*\ ][**+j**\ *just*][**+l**\ *length*][**+n**\ *cols*]\  |                                                                          |
-| [**+s**\ *size*\ ][**+v**\ [*pen*]][**+x**\ *scale*\ ]                   |                                                                          |
+| [**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*]\                    |                                                                          |
+| [**+s**\ *size*\ ][**+v**\ [*pen*]][**+w**\ *width*][**+x**\ *scale*\ ]  |                                                                          |
 +--------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | **-n**\ [*type*][**+a**][\ **+b**\ *BC*]                                 |                                                                          |
 | [\ **+c**\ ][\ **+t**\ *threshold*]                                      | Set grid interpolation mode :ref:`(...) <-n_full>`                       |
diff --git a/src/gmt_common.h b/src/gmt_common.h
index f4b127bbdc6..0884cae5d7f 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -61,9 +61,9 @@ struct GMT_LEGEND_ITEM {	/* Information about one item in a legend */
 	char pen[2][GMT_LEN32];		/* Pens to use with +d and +v */
 	int draw;			/* 0 no draw, 1 draw horizontal +d, 2 draw vertical +v */
 	int just;			/* Legend placement [TR] */
-	double scale;			/* Fixed symbol size when otherwise cannot set it */
-	double size;			/* Scale all given sizes, including +llength of a line */
-	double length;			/* Set length of a line segment */
+	double size;		/* Fixed symbol size when otherwise cannot set it */
+	double scale;		/* Scale all given sizes, including +s<length> of a line */
+	double width;		/* Override auto-width with a fixed legend width */
 	double gap;			/* Move this much down before placing symbol entry */
 	unsigned int ncols;		/* How many columns to use for symbols */
 };
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 55259a976f3..f0bf6c45d69 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -8078,7 +8078,7 @@ int gmt_parse_j_option (struct GMT_CTRL *GMT, char *arg) {
 	return (err);
 }
 
-#define GMT_OPTION_L_MODIFIERS "dfghjlnsvx"	/* All the modifiers available to -l */
+#define GMT_OPTION_L_MODIFIERS "dfghjnsvwx"	/* All the modifiers available to -l */
 
 /*! Parse the legend-building option -l */
 int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
@@ -8103,13 +8103,13 @@ int gmt_parse_l_option (struct GMT_CTRL *GMT, char *arg) {
 				case 'g': GMT->common.l.item.gap = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Gap before next item */
 				case 'h': strncpy (GMT->common.l.item.header, &txt[1], GMT_LEN128-1);		break;	/* Legend header */
 				case 'j': GMT->common.l.item.just = gmt_just_decode (GMT, &txt[1], PSL_TR);	break;	/* legend placement */
-				case 'l': GMT->common.l.item.length = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Line length */
 				case 'n': GMT->common.l.item.ncols = atoi (&txt[1]);				break;	/* Number of columns */
 				case 's': GMT->common.l.item.size = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Fixed size for a symbol */
 				case 'v': /* Draw vertical line(s) */
 					GMT->common.l.item.draw |= GMT_LEGEND_DRAW_V;
 					if (&txt[1]) strncpy (GMT->common.l.item.pen[GMT_LEGEND_PEN_V], &txt[1], GMT_LEN32-1);
 					break;
+				case 'w': GMT->common.l.item.width = gmt_M_to_inch (GMT, &txt[1]);		break;	/* Legend width */
 				case 'x': GMT->common.l.item.scale = atof (&txt[1]);				break;	/* Scale all symbols by this factor */
 				default: break;	/* These are caught in gmt_getmodopt so break is just for Coverity */
 			}
@@ -16007,7 +16007,18 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	double size;
 	FILE *fp = NULL;
 
-	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+l<length>][+n<cols>][+s<size>][+v[<pen>]][+x<scale>] */
+	/* -l[<label>][+d[<pen>]][+f<font>][+g<gap>][+h<header>][+n<cols>][+s<size>][+v[<pen>]][+w<length>][+x<scale>]
+	 *
+	 * +d corresponds to command D in the legend codes and draws a horizontal line.
+	 * +f sets the font to use the header string [FONT_HEADER].
+	 * +g corresponds to command G in the legend codes and adds a gap before current item.
+	 * +h corresponds to command H in the legend codes and places a legend header (see +f).
+	 * +n corresponds to command N in the legend codes and changes the number of columns.
+	 * +s sets symbol size or line length for symbols that otherwise won't have a dimension.
+	 * +v corresponds to command V in the legend codes and starts/ends a vertical line.
+	 * +w specifies the legend width, as in -D+w<width>.
+	 * +s specifies an overall symbol scaling factor, as in -S<factor> [1].
+	 */
 	
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return;	/* Only available in modern mode */
 	if (item == NULL) return;	/* Nothing given */
@@ -16029,6 +16040,8 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 		/* THe next two legend commends will be parsed by gmt legend and acted upon */
 		fprintf (fp, "# LEGEND_JUSTIFICATION: %s\n", justcode);
 		fprintf (fp, "# LEGEND_SCALING: %g\n", item->scale);
+		if (item->width > 0.0)	/* Specified legend width directly */
+			fprintf (fp, "# LEGEND_WIDTH: %gi\n", item->width);
 		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
 			fprintf (fp, "G %gi\n", item->gap);
 			gap_done = true;	/* So we don't do it again below */
@@ -16040,7 +16053,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 				fprintf (fp, "H - %s\n", item->header);
 		}
 	}
-	else {	/* Append to an existing file */
+	else {	/* Append to an existing file, meaning we already wrote the part above */
 		if ((fp = fopen (file, "a")) == NULL) {	/* Cannot append to an existing file? */
 			GMT_Report (API, GMT_MSG_NORMAL, "Unable to append to existing current legend file %s !\n", file);
 			return;
@@ -16049,7 +16062,10 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 			GMT_Report (API, GMT_MSG_VERBOSE, "Your -l+x<scale> is ignored - only applicable to the first instance of -l.\n");
 		if (item->just)
 			GMT_Report (API, GMT_MSG_VERBOSE, "Your -l+j<just> is ignored - only applicable to the first instance of -l.\n");
+		if (item->width)
+			GMT_Report (API, GMT_MSG_VERBOSE, "Your -l+w<width> is ignored - only applicable to the first instance of -l.\n");
 	}
+
 	GMT_Report (API, GMT_MSG_DEBUG, "Add record to current legend file%s\n", file);
 	if (!gap_done && !gmt_M_is_zero (item->gap))	/* Always place a gap first, if requested, and not already done before title */
 		fprintf (fp, "G %gi\n", item->gap);
@@ -16063,8 +16079,6 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 	/* Get the symbol size */
 	if (item->size > 0.0)	/* Hard-wired symbol size given */
 		size = item->size;
-	else if (item->length > 0.0)
-		size = item->length;
 	else
 		size = S->size_x;	/* Use the symbol size given */
 
@@ -16073,7 +16087,7 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 		if (pen == NULL) pen = &(API->GMT->current.setting.map_default_pen);	/* Must have pen to draw line */
 		if (size > 0.0)	/* Got a line length in inches */
 			fprintf (fp, "S - - %gi - %s - %s\n", size, gmt_putpen (API->GMT, pen), item->label);
-		else	/* Punt to the legend module */
+		else	/* Let the legend module supply a default length */
 			fprintf (fp, "S - - - - %s - %s\n", gmt_putpen (API->GMT, pen), item->label);
 	}
 	else {	/* Regular symbol */
@@ -16091,12 +16105,13 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 
 bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale, char justification[]) {
 	/* Determine if there is a hidden legend file that has not been placed */
-	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""};
+	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""}, dim[GMT_LEN32] = {""};
 	size_t L, N_max = 0;
 	double W, W_max = 0.0;
 	FILE *fp = NULL;
 
 	*scale = 1.0;	/* Default scaling */
+	*width = 0.0;	/* Not set yet */
 	if (API->GMT->current.setting.run_mode == GMT_CLASSIC) return false;	/* This is a modern mode only feature */
 	if (!gmt_legend_file (API, file)) return false;			/* There is no legend file in the scope */
 	if ((fp = fopen (file, "r")) == NULL) {	/* Unable to open for reading */
@@ -16109,14 +16124,19 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 			sscanf (&file[2], "%*s %s\n", justification);
 		else if (strstr (file, "# LEGEND_SCALING:"))	/* Need to override the default justification */
 			sscanf (&file[2], "%*s %lf\n", scale);
+		else if (strstr (file, "# LEGEND_WIDTH:")) {	/* Need to explicitly set legend width */
+			sscanf (&file[2], "%*s %s\n", dim);
+			*width = gmt_M_to_inch (API->GMT, dim);
+		}
 		if (file[0] != 'S') continue;	/* Only examine symbol requests */
 		sscanf (file, "%*s %*s %*s %s %*s %*s %*s %[^\n]\n", size, label);
 		if ((L = strlen (label)) > N_max) N_max = L;
 		if (size[0] != '-' && (W = gmt_M_to_inch (API->GMT, size)) > W_max) W_max = W;
 	}
 	fclose (fp);
-	/* Best estimate of legend box width from longest string in the labels and space needed for symbols, plus 5 % */
-	*width = GMT_LEGEND_DX2_MUL * (*scale) * W_max + N_max * 1.05 * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
+	
+	if (*width == 0.0)	/* Best estimate of legend box width from longest string in the labels and space needed for symbols, plus 5 % */
+		*width = GMT_LEGEND_DX2_MUL * (*scale) * W_max + N_max * 1.05 * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
 	return true;
 }
 
diff --git a/test/modern/insetlegend.sh b/test/modern/insetlegend.sh
index 8cb8ac60515..2d92448e04f 100755
--- a/test/modern/insetlegend.sh
+++ b/test/modern/insetlegend.sh
@@ -4,7 +4,7 @@ gmt begin insetlegend ps
   gmt psbasemap -R0/7/3/7 -Jx1i -B0 -B+t"Inset with plot and legend" -Xc
   gmt inset begin -DjTR+w4i/2.5i+o0.1i -M1c -F+p1p,red
     gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL+x0.5
-    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l1c
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+s1c
     gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
   gmt inset end
 gmt end show
diff --git a/test/modern/sublegend.sh b/test/modern/sublegend.sh
index 8e077cabb10..e74bde1d14c 100755
--- a/test/modern/sublegend.sh
+++ b/test/modern/sublegend.sh
@@ -3,10 +3,10 @@
 gmt begin sublegend ps
   gmt subplot begin 2x1 -Fs7i/3i -T"Subplots with legends" -X0.7i
     gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d -c0
-    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l0.2i
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+s0.2i
     gmt plot @Table_5_11.txt -St0.15i -Gorange -lOranges
     gmt plot -R0/7/3/7 -B @Table_5_11.txt -Sc0.15i -Glightgreen -Wfaint -lApples+hLEGEND+f16p+d+jTL -c1
-    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+l0.2i
+    gmt plot @Table_5_11.txt -W1.5p,gray -l"My Lines"+s0.2i
     gmt plot @Table_5_11.txt -St0.15i -Gred -lRed
   gmt subplot end
 gmt end show

From c2a91ace5e337c968bb4af7d38bdf80ad1170914 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Wed, 9 Oct 2019 20:40:07 -1000
Subject: [PATCH 28/31] Process +n as well

Did not make it into the legends file.
---
 src/gmt_init.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gmt_init.c b/src/gmt_init.c
index f0bf6c45d69..ff5c9acf8ee 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -16042,6 +16042,8 @@ void gmt_add_legend_item (struct GMTAPI_CTRL *API, struct GMT_SYMBOL *S, bool do
 		fprintf (fp, "# LEGEND_SCALING: %g\n", item->scale);
 		if (item->width > 0.0)	/* Specified legend width directly */
 			fprintf (fp, "# LEGEND_WIDTH: %gi\n", item->width);
+		if (item->ncols > 1)	/* Specified +n up front */
+			fprintf (fp, "# LEGEND_NCOLS: %d\n", item->ncols);
 		if (!gmt_M_is_zero (item->gap)) {	/* Want to place a gap first, even before any title */
 			fprintf (fp, "G %gi\n", item->gap);
 			gap_done = true;	/* So we don't do it again below */
@@ -16107,6 +16109,7 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 	/* Determine if there is a hidden legend file that has not been placed */
 	char file[PATH_MAX] = {""}, label[GMT_LEN128] = {""}, size[GMT_LEN32] = {""}, dim[GMT_LEN32] = {""};
 	size_t L, N_max = 0;
+	int ncols = 1;
 	double W, W_max = 0.0;
 	FILE *fp = NULL;
 
@@ -16128,6 +16131,10 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 			sscanf (&file[2], "%*s %s\n", dim);
 			*width = gmt_M_to_inch (API->GMT, dim);
 		}
+		else if (strstr (file, "# LEGEND_NCOLS:")) {	/* Need to explicitly set number of columns */
+			sscanf (&file[2], "%*s %s\n", dim);
+			ncols = atoi (dim);
+		}
 		if (file[0] != 'S') continue;	/* Only examine symbol requests */
 		sscanf (file, "%*s %*s %*s %s %*s %*s %*s %[^\n]\n", size, label);
 		if ((L = strlen (label)) > N_max) N_max = L;
@@ -16136,7 +16143,7 @@ bool gmt_get_legend_info (struct GMTAPI_CTRL *API, double *width, double *scale,
 	fclose (fp);
 	
 	if (*width == 0.0)	/* Best estimate of legend box width from longest string in the labels and space needed for symbols, plus 5 % */
-		*width = GMT_LEGEND_DX2_MUL * (*scale) * W_max + N_max * 1.05 * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH;
+		*width = ncols * (GMT_LEGEND_DX2_MUL * (*scale) * W_max + N_max * 1.05 * GMT_LET_WIDTH * API->GMT->current.setting.font_annot[GMT_PRIMARY].size / PSL_POINTS_PER_INCH);
 	return true;
 }
 

From 3de30b6c2d09962f2f61c2ec303537ba256fdbc8 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Wed, 9 Oct 2019 20:44:34 -1000
Subject: [PATCH 29/31] Better explain +n

---
 doc/rst/source/explain_-l_full.rst_ | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index e0bc1c49722..f364e824661 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -14,6 +14,8 @@
     previous to current horizontal line [no vertical line], use **+w** to set legend width [auto], and use **+x**\ *scale* to resize all symbol
     and length sizes in the legend.  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
     Note that **+h**, **+j**, **+w**, and **+x** will only take effect if given on the very first **-l** option for a plot.
+    The **+n** modifier, if used on the first **-l** option, affects the legend width (unless set via **+w**); otherwise it
+    just subdivides the available width among the specified columns.
     The automatic legend has a fixed white background with a solid black pen outline and offset 0.2 cm from the map frame.
     The modifiers largely reflect legend codes described in :doc:`legend`, which provide more details and
     customization.

From c27e6660ac72485b35d4696b6a96d3b5f79fc0fb Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Thu, 10 Oct 2019 07:46:42 -1000
Subject: [PATCH 30/31] Clarify +f

---
 doc/rst/source/explain_-l_full.rst_ | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index f364e824661..480f7fd9512 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -5,16 +5,17 @@
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
     when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
-    legend entry is placed [no line], use **+f** to set the font to use for title or labels,
+    legend entry is placed [no line], use **+f** to set the font used for the legend header [:ref:`FONT_TITLE <FONT_TITLE>`],
     use **+g** to add some vertical space [0], use **+h** to add a legend header [no header],
-    **+j** to set placement of the legend [TR], 
-    use **+n** to change the number of columns used to set the following legend items [1], use **+s** to override the size of the
+    **+j** to set placement of the legend [TR], use **+n** to change the number of columns used to
+    set the following legend items [1], use **+s** to override the size of the
     current symbol for the legend or set a length if plotting a line or contour [same as plotted],
     use **+v** to start and **+v**\ *pen* to stop drawing vertical line from
-    previous to current horizontal line [no vertical line], use **+w** to set legend width [auto], and use **+x**\ *scale* to resize all symbol
-    and length sizes in the legend.  Default pen is given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.
-    Note that **+h**, **+j**, **+w**, and **+x** will only take effect if given on the very first **-l** option for a plot.
-    The **+n** modifier, if used on the first **-l** option, affects the legend width (unless set via **+w**); otherwise it
+    previous to current horizontal line [no vertical line], use **+w** to set legend width [auto],
+    and use **+x**\ *scale* to resize all symbol and length sizes in the legend.  Default pen is
+    given by :ref:`MAP_DEFAULT_PEN <MAP_DEFAULT_PEN>`.  Note that **+h**, **+j**, **+w**, and **+x**
+    will only take effect if given on the very first **-l** option for a plot.  The **+n** modifier,
+    if used on the first **-l** option, affects the legend width (unless set via **+w**); otherwise it
     just subdivides the available width among the specified columns.
     The automatic legend has a fixed white background with a solid black pen outline and offset 0.2 cm from the map frame.
     The modifiers largely reflect legend codes described in :doc:`legend`, which provide more details and

From 56ec0a52b89a716d36e096d8f0eb03f07784512b Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Thu, 10 Oct 2019 08:08:58 -1000
Subject: [PATCH 31/31] Label as beta

---
 doc/rst/source/explain_-l_full.rst_ | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/rst/source/explain_-l_full.rst_ b/doc/rst/source/explain_-l_full.rst_
index 480f7fd9512..ccf4bcf33e9 100644
--- a/doc/rst/source/explain_-l_full.rst_
+++ b/doc/rst/source/explain_-l_full.rst_
@@ -1,7 +1,7 @@
 .. _-l_full:
 
 **-l**\ [*label*]\ [**+d**\ *pen*][**+f**\ *font*][**+g**\ *gap*][**+h**\ *header*\ ][**+j**\ *just*][**+n**\ *cols*][**+s**\ *size*\ ][**+v**\ [*pen*]][**+w**\ *width*][**+x**\ *scale*\ ]
-    Add a map legend entry to the session legend information file for the
+    [**beta version**] Add a map legend entry to the session legend information file for the
     current plot.  Optionally append a text *label* to describe the entry.
     Several modifiers allow further changes to the legend (to be built
     when :doc:`legend` is called): Use **+d** to draw a horizontal line before the
@@ -19,4 +19,5 @@
     just subdivides the available width among the specified columns.
     The automatic legend has a fixed white background with a solid black pen outline and offset 0.2 cm from the map frame.
     The modifiers largely reflect legend codes described in :doc:`legend`, which provide more details and
-    customization.
+    customization.  If **legend** is not called explicitly we will call it implicitly when finishing the plot
+    via :doc:`end`.