mapshaper 0.7.68 → 0.7.70

package/www/mapshaper-gui.js

@@ -3053,12 +3053,12 @@
     return decimals >= 0 ? num.toFixed(decimals) : String(num);
   }
 
-  function formatNumber$3(val) {
+  function formatNumber$4(val) {
     return val + '';
   }
 
   function formatIntlNumber(val) {
-    var str = formatNumber$3(val);
+    var str = formatNumber$4(val);
     return '"' + str.replace('.', ',') + '"'; // need to quote if comma-delimited
   }
 
@@ -3324,7 +3324,7 @@
     return str;
   }
 
-  function formatValue(val, matches) {
+  function formatValue$2(val, matches) {
     var flags = matches[1];
     var padding = matches[2];
     var decimals = matches[3] ? parseInt(matches[3].substr(1)) : void 0;
@@ -3420,7 +3420,7 @@
         error$1("[format()] Data does not match format string; format:", fmt, "data:", arguments);
       }
       for (var i=0; i<n; i++) {
-        str += formatValue(arguments[i], formatCodes[i]) + literals[i+1];
+        str += formatValue$2(arguments[i], formatCodes[i]) + literals[i+1];
       }
       return str;
     };
@@ -3607,7 +3607,7 @@
     endsWith, every, expandoBuffer, extend, extendBuffer,
     find, findMedian, findQuantile, findRankByValue, findStringPrefix,
     findValueByPct, findValueByRank, forEach, forEachProperty, format,
-    formatDateISO, formatIntlNumber, formatNumber: formatNumber$3, formatNumberForDisplay,
+    formatDateISO, formatIntlNumber, formatNumber: formatNumber$4, formatNumberForDisplay,
     formatVersionedName, formatter,
     genericSort, getArrayBounds, getGenericComparator, getKeyComparator,
     getSortedIds, getUniqueName, groupBy,
@@ -8623,10 +8623,10 @@
   }
 
   // Whether a layer can be shown on the map alongside the active layer, and so
-  // has an eye icon in the layers panel. A frame is drawn by preview mode, and a
-  // data-only layer has nothing to draw.
+  // has an eye icon in the layers panel. A frame and its furniture are drawn by
+  // preview mode, and a data-only layer has nothing to draw.
   function layerIsPinnable(lyr, dataset) {
-    if (dataset && internal.isFrameLayer(lyr, dataset.arcs)) return false;
+    if (internal.isFrameComponentLayer(lyr, dataset)) return false;
     return internal.layerIsGeometric(lyr) || internal.layerHasRaster(lyr) ||
       internal.layerHasFurniture(lyr);
   }
@@ -10888,6 +10888,9 @@
       if (opts.format == 'svg' || opts.format == 'topojson') {
         opts.gui_frame = getGuiFrameContext();
       }
+      if (opts.format == 'svg') {
+        targets = addFrameFurnitureTargets(targets, opts.gui_frame);
+      }
       try {
         var files = await internal.exportTargetLayers(model, targets, opts);
       } catch(e) {
@@ -10953,7 +10956,7 @@
     function initLayerMenu() {
       var list = menu.findChild('.export-layer-list').empty();
       var layers = model.getLayers().filter(function(o) {
-        return !internal.isFrameLayer(o.layer, o.dataset.arcs);
+        return !internal.isFrameComponentLayer(o.layer, o.dataset);
       });
       sortLayersForMenuDisplay(layers);
 
@@ -11147,21 +11150,42 @@
       };
     }
 
+    // Snapshots keep the frame and its furniture
     function addFrameTarget(targets) {
       var frame = internal.getActiveFrame(model);
-      var group;
       if (!frame) return targets;
+      return addDatasetTargets(targets, frame.dataset,
+        [frame.layer].concat(internal.getFrameFurnitureLayers(frame.dataset)));
+    }
+
+    // The frame's furniture is drawn in SVG output, the way it is in preview.
+    // An unprojected frame can't show a scalebar, so it doesn't block the export.
+    function addFrameFurnitureTargets(targets, frameContext) {
+      var frame = internal.getActiveFrame(model);
+      var furniture = frame ? internal.getFrameFurnitureLayers(frame.dataset) : [];
+      if (furniture.length === 0) return targets;
+      if (internal.getFurnitureFrameProblem(frameContext && frameContext.data)) {
+        console.warn('Map furniture was not exported: the map frame is unprojected');
+        return targets;
+      }
+      return addDatasetTargets(targets, frame.dataset, furniture);
+    }
+
+    function addDatasetTargets(targets, dataset, layers) {
+      var group;
       targets = targets.map(function(target) {
         return Object.assign({}, target, {layers: target.layers.slice()});
       });
       group = targets.find(function(target) {
-        return target.dataset == frame.dataset;
+        return target.dataset == dataset;
       });
-      if (group) {
-        if (!group.layers.includes(frame.layer)) group.layers.push(frame.layer);
-      } else {
-        targets.push({dataset: frame.dataset, layers: [frame.layer]});
+      if (!group) {
+        group = {dataset: dataset, layers: []};
+        targets.push(group);
       }
+      layers.forEach(function(lyr) {
+        if (!group.layers.includes(lyr)) group.layers.push(lyr);
+      });
       return targets;
     }
 
@@ -11456,6 +11480,9 @@
       if (e.frameProperties) {
         addMenuItem('frame properties', e.frameProperties, '');
       }
+      if (e.scalebarProperties) {
+        addMenuItem(e.scalebarLabel || 'scale bar', e.scalebarProperties, '');
+      }
       if (e.resizeFrame) {
         addMenuItem('resize frame', e.resizeFrame, '');
       }
@@ -11491,9 +11518,12 @@
         }
 
         if (e.deleteVertex || e.deletePoint || copyable || e.deleteFeature ||
-            e.flipLabel) {
+            e.flipLabel || e.boldText) {
 
           addMenuLabel('actions');
+          if (e.boldText) {
+            addMenuItem(e.boldText.label, e.boldText.run);
+          }
           if (e.deleteVertex) {
             addMenuItem('delete vertex', e.deleteVertex);
           }
@@ -11883,6 +11913,8 @@
       sortLayersForMenuDisplay(model.getLayers()).forEach(function(o) {
         var lyr = o.layer;
         var isFrame = internal.isFrameLayer(lyr, o.dataset.arcs);
+        // furniture is shown as part of its frame's entry
+        if (!isFrame && internal.isFrameComponentLayer(lyr, o.dataset)) return;
         var opts = {
           show_source: layerCount < 5,
           pinnable: pinnableCount > 0 && isPinnable(lyr, o.dataset)
@@ -11982,25 +12014,39 @@
       function deleteLayer() {
         var target = findLayerById(id);
         var undoTransaction;
+        var furniture;
         if (!target) return;
+        // a frame's furniture goes with it, rather than becoming a stray layer
+        furniture = internal.isFrameLayer(target.layer, target.dataset.arcs) ?
+          internal.getFrameFurnitureLayers(target.dataset) : [];
         undoTransaction = createUndoTransaction(gui, 'delete layer');
         if (map.isVisibleLayer(target.layer)) {
           // TODO: check for double map refresh after model.deleteLayer() below
           setLayerPinning(target.layer, false);
         }
         if (undoTransaction) {
-          undoTransaction.run(function() {
-            model.deleteLayer(target.layer, target.dataset);
-          });
+          undoTransaction.run(deleteLayers);
           addUndoTransactionToHistory(gui, undoTransaction, {
             flags: {select: true, arc_count: true},
             entryPrefix: 'delete-layer'
           });
         } else {
+          deleteLayers();
+        }
+
+        function deleteLayers() {
+          furniture.forEach(function(lyr) {
+            model.deleteLayer(lyr, target.dataset);
+          });
           model.deleteLayer(target.layer, target.dataset);
         }
       }
 
+      function openScalebarProperties() {
+        var target = findLayerById(id);
+        if (target && gui.scalebarProperties) gui.scalebarProperties.open(target);
+      }
+
       // Duplicate a layer by running an equivalent command, so the copy is
       // recorded in session history and can be undone. Uses '-filter true +'
       // to append a copy without replacing the source, keeps the same name
@@ -12088,6 +12134,10 @@
           internal.isFrameLayer(target.layer, target.dataset.arcs);
         if (isFrame) {
           menuEvent.frameProperties = openFrameProperties;
+          menuEvent.scalebarProperties = openScalebarProperties;
+          menuEvent.scalebarLabel =
+            internal.findFrameFurnitureLayer(target.dataset, 'scalebar') ?
+              'scale bar' : 'add scale bar';
           menuEvent.resizeFrame = resizeFrame;
           menuEvent.deleteFrame = deleteLayer;
         } else {
@@ -12857,6 +12907,11 @@
     if (cmd.name == 'style' || cmd.name == 'svg-style') {
       return getStyleCullInfo(opts, isStyleProperty);
     }
+    // Adding a label or a labeled copy of a layer is not a style edit, and can
+    // not be superseded by one.
+    if (cmd.name == 'labels' && !('coordinates' in opts) && !opts.no_replace) {
+      return getStyleCullInfo(getLabelStyleOpts(opts), isStyleProperty);
+    }
     if (cmd.name == 'classify') {
       return getClassifyCullInfo(opts);
     }
@@ -12876,6 +12931,16 @@
     };
   }
 
+  // -labels text= writes the label-text property.
+  function getLabelStyleOpts(opts) {
+    var o = Object.assign({}, opts);
+    if ('text' in o) {
+      o['label-text'] = o.text;
+      delete o.text;
+    }
+    return o;
+  }
+
   function getStyleFields$2(opts, isStyleProperty) {
     var fields = [];
     Object.keys(opts).forEach(function(name) {
@@ -13874,6 +13939,11 @@
   var SOFT_BREAK = '<wbr>';
   var SOFT_BREAK_RXP = /<wbr>/gi;
 
+  // A bold stretch, which is the other markup label text carries. See
+  // svg-label-markup.mjs.
+  var BOLD_OPEN = '<b>';
+  var BOLD_CLOSE = '</b>';
+
   // How a label lays out its line breaks, which is not the same for the two kinds.
   // An anchored label stacks its lines with <tspan>. A path label joins them with
   // a space, because a <tspan> inside a <textPath> advances along the curve
@@ -13909,6 +13979,66 @@
     return {text: text, breaks: breaks};
   }
 
+  // Data value -> {text, breaks, bold}: the string the user edits, the offsets
+  // in it where the stored value has a soft break, and its bold stretches as
+  // [start, end) offsets into it (see gui-label-bold.mjs).
+  //
+  // The two kinds of markup are independent -- a bold stretch can cross a soft
+  // break, and a soft break can sit at either end of one -- so the bold is read
+  // first and its offsets are moved as the soft breaks come out.
+  function readLabelValue(val) {
+    var str = val === null || val === undefined ? '' : String(val).replace(ANY_NEWLINE, '\n');
+    var o = internal.svg.parseBoldMarkup(str);
+    var starts = [], m;
+    SOFT_BREAK_RXP.lastIndex = 0;
+    while ((m = SOFT_BREAK_RXP.exec(o.text))) starts.push(m.index);
+    return {
+      text: o.text.replace(SOFT_BREAK_RXP, ''),
+      breaks: starts.map(function(start, i) {
+        return start - i * SOFT_BREAK.length;
+      }),
+      bold: internal.svg.normalizeBoldRanges(o.bold.map(function(r) {
+        return [removeSoftBreakOffset(r[0], starts), removeSoftBreakOffset(r[1], starts)];
+      }))
+    };
+  }
+
+  // An offset into text with soft breaks in it -> the same place once they are
+  // removed. One that falls inside a marker goes to its start.
+  function removeSoftBreakOffset(x, starts) {
+    var shift = 0;
+    for (var i = 0; i < starts.length && starts[i] < x; i++) {
+      if (x < starts[i] + SOFT_BREAK.length) return starts[i] - shift;
+      shift += SOFT_BREAK.length;
+    }
+    return x - shift;
+  }
+
+  // The string the user edits, its soft breaks and its bold ranges -> the value
+  // to store, with both kinds of markup written in. Where they meet, a bold
+  // stretch closes before a soft break and opens after one, so that the break
+  // is never inside a pair of tags it is not part of.
+  function writeLabelValue(text, breaks, bold) {
+    var marks = [];
+    (bold || []).forEach(function(r) {
+      marks.push({pos: r[0], order: 2, str: BOLD_OPEN});
+      marks.push({pos: r[1], order: 0, str: BOLD_CLOSE});
+    });
+    (breaks || []).forEach(function(pos) {
+      marks.push({pos: pos, order: 1, str: SOFT_BREAK});
+    });
+    if (marks.length === 0) return text;
+    marks.sort(function(a, b) {
+      return a.pos - b.pos || a.order - b.order;
+    });
+    var out = '', prev = 0;
+    marks.forEach(function(mark) {
+      out += text.substring(prev, mark.pos) + mark.str;
+      prev = mark.pos;
+    });
+    return out + text.substring(prev);
+  }
+
   // The string the user edits, plus soft breaks at @breaks (ascending offsets
   // into it) -> the same string with the markers written in.
   function insertSoftBreaks(text, breaks) {
@@ -14089,6 +14219,29 @@
     return Math.min(renderedIndex, length);
   }
 
+  // The word a double-click at edited index @i selects, as [start, end), or an
+  // empty range at @i for a click between words. A click on the right half of a
+  // word's last letter lands on the index after it, which is still that word.
+  //
+  // Hyphens and apostrophes count as part of a word, so that "cease-fire" and
+  // "Israel's" are one word each, as they are one name on the map.
+  function getWordRange(text, i) {
+    var at = isWordChar(text.charAt(i)) ? i : isWordChar(text.charAt(i - 1)) ? i - 1 : -1;
+    var a, b;
+    if (at < 0) return [i, i];
+    a = at;
+    b = at + 1;
+    while (a > 0 && isWordChar(text.charAt(a - 1))) a--;
+    while (b < text.length && isWordChar(text.charAt(b))) b++;
+    return [a, b];
+  }
+
+  var WORD_CHAR_RXP = /[\p{L}\p{N}\p{M}'\u2019-]/u;
+
+  function isWordChar(c) {
+    return !!c && WORD_CHAR_RXP.test(c);
+  }
+
   // Strips the placeholder back out, so that a value read off a rendered node is
   // not mistaken for text the user typed.
   function stripPlaceholder(str) {
@@ -14153,7 +14306,7 @@
   function getAddLabelCommand(coords, opts) {
     var o = opts || {};
     var target = o.target || {mode: 'new', newLayerName: DEFAULT_LABEL_LAYER_NAME};
-    var parts = ['-add-label', 'coordinates=' + formatCoords(coords)];
+    var parts = ['-labels', 'coordinates=' + formatCoords(coords)];
     if (o.text) {
       // A real newline would break the command parser, so encodeLabelText()
       // writes the two-character escape the label renderer also accepts.
@@ -14220,7 +14373,7 @@
   //   id:     feature id of the label
   //   target: layer name, or null to use the current target
   function getLabelPlacementCommand(opts) {
-    var parts = ['-style', 'label-start-offset=' + opts.offset];
+    var parts = ['-labels', 'label-start-offset=' + opts.offset];
     if (opts.anchor) {
       parts.push('text-anchor=' + opts.anchor);
     }
@@ -14240,7 +14393,7 @@
   // with and the position goes -- "stop taking a position, carry these offsets
   // instead", which is one command because it is one edit.
   //
-  // label-pos= is always written, even by a label that has none. -style reads an
+  // label-pos= is always written, even by a label that has none. -labels reads an
   // empty value as "remove this", and removing a property no record carries adds
   // nothing to the layer, so there is nothing to be gained by asking first.
   //
@@ -14250,7 +14403,7 @@
   //   target: layer name, or null to use the current target
   //   via:    (optional) the callout-via the text carried with it
   function getLabelOffsetCommand(opts) {
-    var parts = ['-style', 'dx=' + opts.dx, 'dy=' + opts.dy,
+    var parts = ['-labels', 'dx=' + opts.dx, 'dy=' + opts.dy,
       'text-anchor=' + opts.anchor, 'label-pos='];
     if (opts.via) parts.push('callout-via=' + quoteCommandValue(opts.via));
     parts.push('ids=' + opts.id);
@@ -14261,16 +14414,16 @@
   // The command a drag on one of a label's handles writes, run once on release.
   //
   //   values: {field: value}, where '' removes the field -- which is what
-  //     -style reads an empty value as, and how a handle goes back to automatic
+  //     -labels reads an empty value as, and how a handle goes back to automatic
   //   id:     feature id of the label
   //   opts:
   //     target: layer name, or null to use the current target
   //     text:   (optional) rewrapped label-text, with real newlines and soft
-  //       breaks. A second -style in the same string, so that a new width and
+  //       breaks. A second -labels in the same string, so that a new width and
   //       the lines it breaks into are one undo step.
   function getLabelStyleCommand(values, id, opts) {
     var o = opts || {};
-    var parts = ['-style'];
+    var parts = ['-labels'];
     Object.keys(values).forEach(function(name) {
       var val = values[name];
       parts.push(name + '=' + (val === '' ? '' : quoteCommandValue(String(val))));
@@ -14292,7 +14445,7 @@
   function getLabelTextCommand(text, id, target) {
     // A real newline would break the command parser, so encodeLabelText() writes
     // the two-character escape that the label renderer also accepts.
-    var parts = ['-style', 'label-text=' + quoteCommandValue(encodeLabelText(text))];
+    var parts = ['-labels', 'text=' + quoteCommandValue(encodeLabelText(text))];
     parts.push('ids=' + id);
     if (target) parts.push('target=' + quoteCommandValue(target));
     return parts.join(' ');
@@ -15407,6 +15560,19 @@
     return cachedFontStyles[fontName];
   }
 
+  // Whether words in @fontName can be set in bold: a bold the browser
+  // synthesizes is not one the Node measurer can match, so wrapping and the
+  // path-fit check would disagree with what is drawn. A font that cannot be
+  // identified is given the benefit of the doubt -- the browser finds whatever
+  // bold it has, and there is nothing to check against.
+  function fontHasBoldFace(fontName) {
+    var variants = fontName ? getFontStyleVariants(fontName) : null;
+    if (!variants || variants.length === 0) return true;
+    return variants.some(function(variant) {
+      return Number(variant.weight) >= 600;
+    });
+  }
+
   // The installed font the browser draws unfonted text in, or '' if it cannot
   // be worked out.
   //
@@ -16569,6 +16735,15 @@
       !/^(button|checkbox|radio|submit)$/.test(node.type);
   }
 
+  // Whether clicking this node puts a native menu on screen, which must then be
+  // left holding the focus: a menu opens on mousedown, so a panel that lets go of
+  // focus on the click that follows closes it again -- it flashes open and shut.
+  // OPTION counts because a browser that reports the chosen option as the click
+  // target is reporting a menu interaction either way.
+  function opensAMenu(node) {
+    return !!node && /^(SELECT|OPTION)$/.test(node.nodeName);
+  }
+
   // While the caret is in one of @panel's fields, the keyboard belongs to that
   // field. Without this the GUI's own handlers see the keystrokes: a Backspace
   // typed into a field takes back the last knot of a curve being drawn, and an
@@ -16612,20 +16787,43 @@
 
   // The fraction an opacity control's contents mean ("50%", " 50 " -> 0.5), or
   // null if it is not holding a number. Out-of-range values are clamped rather
-  // than refused: a pasted 150% is an intent, not a mistake.
+  // than refused: a pasted 150% is an intent, not a mistake. A blank field is
+  // null, not zero: it is what a colour with no value shows beside it.
   function parseOpacityValue(str) {
-    var pct = Number(String(str).replace('%', '').trim());
-    if (!isFinite(pct)) return null;
+    var txt = String(str).replace('%', '').trim();
+    var pct = Number(txt);
+    if (txt === '' || !isFinite(pct)) return null;
     return Math.max(0, Math.min(100, pct)) / 100;
   }
 
+  // A typed dash pattern in the form -style stroke-dasharray= takes: lengths
+  // separated by single spaces. Commas and runs of whitespace are accepted
+  // because SVG accepts them, and a pasted "4, 2" means the same as "4 2".
+  // Returns '' for a blank field. Does not check that the lengths are numbers.
+  function normalizeDashArrayInput(str) {
+    return String(str).trim().split(/[\s,]+/).filter(Boolean).join(' ');
+  }
+
   // A stored fraction as the percentage a control shows, or '' for no value --
   // which is how a control over a selection that does not agree shows.
   function formatOpacityPct(val) {
+    if (isUnsetValue(val)) return '';
     val = Number(val);
     return isFinite(val) ? Math.round(Math.max(0, Math.min(1, val)) * 100) + '%' : '';
   }
 
+  // The opacity shown beside a colour. A colour with no opacity of its own is
+  // drawn opaque, and says so; with no colour either, there is nothing for an
+  // opacity to apply to, and the field is blank like the colour.
+  function formatColorOpacityPct(opacity, hasColor) {
+    if (isUnsetValue(opacity)) return hasColor ? '100%' : '';
+    return formatOpacityPct(opacity);
+  }
+
+  function isUnsetValue(val) {
+    return val === undefined || val === null || val === '';
+  }
+
   // The parts the style panels are built from. They were the label panel's, and
   // three panels drawing the same control three ways is how they came to look
   // like three programs: a colour was a swatch inside a field in one and a
@@ -16653,6 +16851,52 @@
     return section;
   }
 
+  // A switch: a track with a knob that sits left when off and right when on,
+  // which is the direction users expect and the only thing that says which
+  // state is which without a label for each. A third state says that the
+  // features it is asking about disagree -- the knob sits over the join of a
+  // half-and-half track, which is the only control that has to show "some of
+  // them" rather than a value. A section's switch goes in its heading row, and
+  // the section shows only its heading while it is off (the .collapsed class).
+  //
+  // role=checkbox rather than switch, which is what it looks like: 'mixed' is a
+  // legal aria-checked value for a checkbox and not for a switch, and a switch
+  // reporting a mixed selection as unchecked would be telling a screen reader
+  // the one thing the third state exists to avoid saying.
+  //
+  // opts.onChange(on)  the switch was clicked
+  // opts.title, opts.className
+  function makePanelToggle(parent, opts) {
+    var track = El('div').addClass('label-toggle').attr('role', 'checkbox').appendTo(parent);
+    var state = 'off';
+    if (opts.className) track.addClass(opts.className);
+    var disabled = false;
+    El('div').addClass('label-toggle-knob').appendTo(track);
+    if (opts.title) track.attr('title', opts.title);
+    // A click on a mixed switch turns everything on. It is the convention, and
+    // it is the reading that reaches a state the switch can describe: the next
+    // click then turns everything off, so both are one click away.
+    track.on('click', function() {
+      if (disabled) return;
+      opts.onChange(state != 'on');
+    });
+    return {
+      // val: 'on', 'off' or 'mixed'; anything else reads as off
+      setState: function(val) {
+        state = val == 'on' || val == 'mixed' ? val : 'off';
+        track.classed('on', state == 'on')
+          .classed('mixed', state == 'mixed')
+          .attr('aria-checked', state == 'mixed' ? 'mixed' :
+            state == 'on' ? 'true' : 'false');
+      },
+      setDisabled: function(off) {
+        disabled = !!off;
+        track.classed('disabled', disabled)
+          .attr('aria-disabled', disabled ? 'true' : 'false');
+      }
+    };
+  }
+
   // Deliberately not focusable: the GUI is pointer-only, so a tab stop here
   // would lead into a control the keyboard cannot then operate. See the focus
   // note in page.css.
@@ -16685,6 +16929,16 @@
     return btn;
   }
 
+  // The "?" the rest of the app uses for field help (see .tip-button in
+  // elements.css and the static ones in index.html). The bubble is white-space:
+  // pre, so the line breaks in the text are the ones it gets.
+  function makeFieldTip(parent, text) {
+    var btn = El('div').addClass('tip-button').appendTo(parent).text('?');
+    var anchor = El('div').addClass('tip-anchor').appendTo(btn);
+    El('div').addClass('tip').appendTo(anchor).text(text);
+    return btn;
+  }
+
   function setPanelButtonDisabled(el, disabled) {
     el.classed('disabled', !!disabled)
       .attr('aria-disabled', disabled ? 'true' : 'false');
@@ -16719,6 +16973,8 @@
   // opts.onColor(hex)     a colour was typed, picked or previewed to a finish
   // opts.onOpacity(frac)  a usable percentage was typed
   // opts.revert()         one that was not, so put the row back as it was
+  // opts.noOpacity        a colour with no opacity of its own, like a pattern's,
+  //                       which fill-opacity fades along with its background
   //
   // control.aside is the row's narrow column, empty, for a field that belongs
   // beside the colour -- a stroke's width, say.
@@ -16756,10 +17012,14 @@
         if (isHexColor(color)) control.picker.setColor(color);
         opts.onColor(color);
       });
-    control.opacity = makeColorOpacityField(colorCell, control.chit, control.input, {
-      onSet: opts.onOpacity,
-      revert: opts.revert
-    }).opacity;
+    if (opts.noOpacity) {
+      makeColorField(colorCell, control.chit, control.input);
+    } else {
+      control.opacity = makeColorOpacityField(colorCell, control.chit, control.input, {
+        onSet: opts.onOpacity,
+        revert: opts.revert
+      }).opacity;
+    }
     control.picker = new ColorPicker(colorCell, {
       presetRows: layerColorPresetRows,
       // A drag in the picker shows on the map's own terms -- the swatch and the
@@ -16799,13 +17059,13 @@
   //
   // The style panel is worth having open before there is anything to point it at:
   // pick a font, then place labels in it. Values set with nothing selected are
-  // held here rather than written to a layer, and -add-label writes them when a
+  // held here rather than written to a layer, and -labels coordinates= writes them when a
   // label finally exists -- so this is a tool default, not data, and it never
   // needs its own undo step.
   //
   // See docs/development/label-tool-design.md.
 
-  // The style properties -add-label accepts. A panel control whose property is
+  // The style properties -labels accepts. A panel control whose property is
   // missing from this list would appear to do nothing when set with no selection,
   // so the list is checked rather than assumed.
   var NEW_LABEL_STYLE_FIELDS = [
@@ -16827,7 +17087,7 @@
   //
   // A blank or zero value removes the field instead of setting it: that is how
   // the panel says "no icon" (icon='', icon-size=0) and "no inline css", and
-  // carrying those through to -add-label would write properties that mean
+  // carrying those through to -labels would write properties that mean
   // nothing.
   function mergeStyleValues(style, values) {
     var out = Object.assign({}, style);
@@ -16853,7 +17113,7 @@
   // somewhere and typing looks like it should do, and it is the position an icon
   // is drawn to sit behind.
   //
-  // Only the tool defaults this. -add-label with no position still creates a
+  // Only the tool defaults this. -labels coordinates= with no position still creates a
   // label without one, so the default is a choice this tool makes and passes on
   // explicitly, not a meaning the command gives to its absence.
   var DEFAULT_NEW_LABEL_STYLE = {'label-pos': 'c'};
@@ -17167,13 +17427,17 @@
 
   // Offsets into @text (real newlines, no soft breaks) where a line starts
   // because it was wrapped, in ascending order.
-  function getSoftBreaks(text, rec) {
+  //
+  // @bold: the text's bold stretches, as [start, end) offsets into it. A bold
+  // word is wider, so it moves the breaks.
+  function getSoftBreaks(text, rec, bold) {
     var width = getLabelWrapWidth(rec);
     var key, breaks;
     if (!width || !text) return [];
-    key = getWrapKey(text, rec);
+    bold = bold || [];
+    key = getWrapKey(text, rec, bold);
     if (cache$2.has(key)) return cache$2.get(key);
-    breaks = measureSoftBreaks(text, rec, width);
+    breaks = measureSoftBreaks(text, rec, width, bold);
     if (cache$2.size >= CACHE_LIMIT) cache$2.clear();
     cache$2.set(key, breaks);
     return breaks;
@@ -17183,29 +17447,30 @@
   // unchanged when neither the old value nor the new one has a soft break, so
   // that a label that does not wrap keeps the line breaks it was written with.
   function rewrapLabelValue(value, rec) {
-    var o = readSoftBreaks(value);
-    var breaks = getSoftBreaks(o.text, rec);
+    var o = readLabelValue(value);
+    var breaks = getSoftBreaks(o.text, rec, o.bold);
     if (sameSoftBreaks(o.breaks, breaks)) return value;
-    return encodeLabelText(insertSoftBreaks(o.text, breaks));
+    return encodeLabelText(writeLabelValue(o.text, breaks, o.bold));
   }
 
   function clearWrapCache() {
     cache$2.clear();
   }
 
-  function getWrapKey(text, rec) {
+  function getWrapKey(text, rec, bold) {
     var parts = [text];
     WRAP_FIELDS.forEach(function(name) {
       var val = rec[name];
       parts.push(val === null || val === undefined ? '' : String(val));
     });
     parts.push(rec['class'] || '');
+    parts.push(bold.join(';'));
     return parts.join('\u0000');
   }
 
-  function measureSoftBreaks(text, rec, width) {
+  function measureSoftBreaks(text, rec, width, bold) {
     var w = getWrapper();
-    var style, fontSize, node, range;
+    var style, fontSize, pieces, range;
     if (!w) return [];
     style = getLabelFontStyle(w, rec);
     if (!style) return [];
@@ -17213,15 +17478,15 @@
       w.div.style[name] = style[name] || '';
     });
     w.div.style.width = width + 'px';
-    w.div.textContent = text;
-    node = w.div.firstChild;
+    pieces = writeRuns(w.div, text, bold);
     fontSize = parseFloat(style.fontSize) || 12;
     range = document.createRange();
     var breaks = findSoftBreaks(text, function(i) {
+      var piece = findPiece(pieces, i);
       var end = isHighSurrogate(text.charCodeAt(i)) ? i + 2 : i + 1;
       var r;
-      range.setStart(node, i);
-      range.setEnd(node, Math.min(end, text.length));
+      range.setStart(piece.node, i - piece.start);
+      range.setEnd(piece.node, Math.min(end, piece.end) - piece.start);
       r = range.getBoundingClientRect();
       return r.height > 0 ? r.top : null;
     }, fontSize * LINE_HEIGHT / 2);
@@ -17229,6 +17494,35 @@
     return breaks;
   }
 
+  // Lays @text out in @div a run at a time, the bold ones in bold spans, and
+  // returns each run's text node with the offsets it covers: [{node, start,
+  // end}]. Offsets in the text become offsets in one of these nodes.
+  function writeRuns(div, text, bold) {
+    var pos = 0;
+    div.textContent = '';
+    return internal.svg.getBoldRuns(text, bold, 0, text.length).map(function(run) {
+      var node = document.createTextNode(run.text);
+      var span;
+      if (run.bold) {
+        span = document.createElement('span');
+        span.style.fontWeight = internal.svg.LABEL_BOLD_WEIGHT;
+        span.appendChild(node);
+        div.appendChild(span);
+      } else {
+        div.appendChild(node);
+      }
+      pos += run.text.length;
+      return {node: node, start: pos - run.text.length, end: pos};
+    });
+  }
+
+  function findPiece(pieces, i) {
+    for (var j = 0; j < pieces.length; j++) {
+      if (i < pieces[j].end) return pieces[j];
+    }
+    return pieces[pieces.length - 1];
+  }
+
   function isHighSurrogate(c) {
     return c >= 0xD800 && c <= 0xDBFF;
   }
@@ -17700,7 +17994,7 @@
       // spacing sits above.
       haloSection = addSection('Halo');
       var haloTitle = haloSection.findChild('.label-style-section-title');
-      haloToggle = makeToggle(haloTitle, {
+      haloToggle = makePanelToggle(haloTitle, {
         title: 'Draw a halo around the text',
         className: 'label-halo-toggle',
         onChange: setHaloOn
@@ -17751,7 +18045,7 @@
       // a label with no icon: nothing to apply it to.
       iconSection = addSection('Icon');
       var iconTitle = iconSection.findChild('.label-style-section-title');
-      iconToggle = makeToggle(iconTitle, {
+      iconToggle = makePanelToggle(iconTitle, {
         title: 'Draw a symbol at the label anchor',
         className: 'label-icon-toggle',
         onChange: setIconOn
@@ -17858,7 +18152,7 @@
     // the map rather than typed here. See docs/development/text-annotation-design.md.
     function initCalloutSection() {
       calloutSection = addSection('Callout');
-      calloutToggle = makeToggle(calloutSection.findChild('.label-style-section-title'), {
+      calloutToggle = makePanelToggle(calloutSection.findChild('.label-style-section-title'), {
         title: 'Draw a line from the label anchor to its text',
         className: 'label-callout-toggle',
         onChange: setCalloutOn
@@ -17979,48 +18273,6 @@
       return makePanelSection(panel, title, opts);
     }
 
-    // A switch: a track with a knob that sits left when off and right when on,
-    // which is the direction users expect and the only thing that says which
-    // state is which without a label for each. A third state says that the
-    // labels it is asking about disagree -- the knob sits over the join of a
-    // half-and-half track, which is the panel's only control that has to show
-    // "some of them" rather than a value.
-    //
-    // role=checkbox rather than switch, which is what it looks like: 'mixed' is a
-    // legal aria-checked value for a checkbox and not for a switch, and a switch
-    // reporting a mixed selection as unchecked would be telling a screen reader
-    // the one thing the third state exists to avoid saying.
-    function makeToggle(parent, opts) {
-      var track = El('div').addClass('label-toggle').attr('role', 'checkbox').appendTo(parent);
-      var state = 'off';
-      if (opts.className) track.addClass(opts.className);
-      var disabled = false;
-      El('div').addClass('label-toggle-knob').appendTo(track);
-      if (opts.title) track.attr('title', opts.title);
-      // A click on a mixed switch turns everything on. It is the convention, and
-      // it is the reading that reaches a state the switch can describe: the next
-      // click then turns everything off, so both are one click away.
-      track.on('click', function() {
-        if (disabled) return;
-        opts.onChange(state != 'on');
-      });
-      return {
-        // val: 'on', 'off' or 'mixed'; anything else reads as off
-        setState: function(val) {
-          state = val == 'on' || val == 'mixed' ? val : 'off';
-          track.classed('on', state == 'on')
-            .classed('mixed', state == 'mixed')
-            .attr('aria-checked', state == 'mixed' ? 'mixed' :
-              state == 'on' ? 'true' : 'false');
-        },
-        setDisabled: function(off) {
-          disabled = !!off;
-          track.classed('disabled', disabled)
-            .attr('aria-disabled', disabled ? 'true' : 'false');
-        }
-      };
-    }
-
     function addColorOpacityField(parent, chit, input, onOpacity) {
       return makeColorOpacityField(parent, chit, input, {
         onSet: onOpacity,
@@ -19348,14 +19600,6 @@
       return !!node && /^(INPUT|SELECT|TEXTAREA|BUTTON|OPTION)$/.test(node.nodeName);
     }
 
-    // Whether clicking this node puts a native menu on screen, which must then be
-    // left holding the focus. OPTION counts because a browser that reports the
-    // chosen option as the click target is reporting a menu interaction either
-    // way, and a choice restores the caret through its change handler.
-    function opensAMenu(node) {
-      return !!node && /^(SELECT|OPTION)$/.test(node.nodeName);
-    }
-
     // Hands the keyboard back after a control has done its job: to the label
     // being typed into if there is one, and to nothing at all otherwise.
     function releaseFocus() {
@@ -19374,7 +19618,7 @@
       if (styles.length === 0) return;
       releaseFocus();
       // What the panel is set to is always what the next label gets, whether or
-      // not these values also went to a label that already exists. -add-label
+      // not these values also went to a label that already exists. -labels
       // writes them when that label is created, which is why this needs no
       // command and no undo step of its own.
       if (labelModeIsOn()) {
@@ -19398,7 +19642,7 @@
 
     function applyStyleCommand(styles, ids) {
       var lyr = getActiveLayer();
-      var parts = ['-style'];
+      var parts = ['-labels'];
       if (!gui.console || !lyr) return;
       styles.forEach(function(style) {
         parts.push(style[0] + '=' + quoteCommandValue(style[1]));
@@ -19420,7 +19664,7 @@
     // A text block's breaks are only right for the width and font they were
     // found with, so a change to either rewraps it in the same command: one undo
     // step, and no moment at which the block is drawn with its old lines in its
-    // new font. One -style per label, since each has text of its own.
+    // new font. One -labels per label, since each has text of its own.
     function getRewrapCommands(styles, ids, lyr) {
       var table = lyr.data;
       var changes = {};
@@ -19554,13 +19798,480 @@
     return measureSvg;
   }
 
+  // The pattern fill controls of the polygon panel, and the fill-pattern codes
+  // they stand for.
+  //
+  // The panel covers the patterns that are one colour over a background: hatch
+  // lines, dots and squares. The background is the feature's own fill, so a
+  // pattern is described by five settings -- {type, color, size, gap, angle} --
+  // and the fill. A hatch has no background in the code: it is a run of stripes,
+  // and the panel's hatch is two of them, the gap in the fill colour and the line
+  // in the pattern colour. Anything else (dashes, several colours, a background
+  // that is not the fill) is a custom pattern, which the panel shows as its code.
+  //
+  // Written into every code rather than read from the fill when drawn, because
+  // the code is what -style stores and what the SVG exporter turns into a
+  // <pattern>: a pattern with no colour of its own would need both to change.
+
+  var patternTypes = ['hatches', 'dots', 'squares'];
+
+  var patternDefaults = {
+    hatches: {size: 1, gap: 3, angle: 45},
+    dots: {size: 2, gap: 3, angle: 0},
+    squares: {size: 2, gap: 2, angle: 0}
+  };
+
+  var defaultPatternColor = '#000000';
+
+  // The settings a newly chosen pattern type starts from. The colour carries
+  // over from the pattern being replaced; the sizes do not, because a hatch
+  // line's width and a dot's diameter look nothing alike at the same number.
+  function getDefaultPatternControls(type, color) {
+    var d = patternDefaults[type];
+    return {type: type, color: color || defaultPatternColor,
+      size: d.size, gap: d.gap, angle: d.angle};
+  }
+
+  // The background a pattern is given over a feature with @fill. A feature with
+  // no fill gets a clear one, so that the pattern is drawn over whatever is
+  // underneath.
+  function getPatternBackground(fill) {
+    return isBlank$1(fill) ? 'none' : String(fill).trim();
+  }
+
+  // Whether the settings describe a pattern the renderer will draw. A hatch with
+  // no gap would be a solid fill, and the parser refuses a stripe of no width.
+  function isValidPatternControls(o) {
+    if (!o || patternTypes.indexOf(o.type) == -1 || isBlank$1(o.color)) return false;
+    if (!(o.size > 0) || !isFinite(o.angle)) return false;
+    return o.type == 'hatches' ? o.gap > 0 : o.gap >= 0;
+  }
+
+  // The fill-pattern code for the settings @o over @background. The angle is left
+  // out where it is the parser's own default, which keeps the common codes as
+  // short as the ones in the documentation.
+  function formatFillPattern(o, background) {
+    var bg = background || 'none';
+    if (o.type == 'hatches') {
+      return 'hatches ' + formatAngle(o.angle, 45) +
+        formatPx(o.gap) + ' ' + bg + ' ' + formatPx(o.size) + ' ' + o.color;
+    }
+    return o.type + ' ' + formatAngle(o.angle, 0) +
+      formatPx(o.size) + ' ' + o.color + ' ' + formatPx(o.gap) + ' ' + bg;
+  }
+
+  // The settings a parsed fill-pattern code (from parsePattern()) was made from,
+  // given the fill of the feature it is on -- or null if the panel's settings
+  // cannot describe it, which makes it a custom pattern.
+  function getPatternControls(parsed, fill) {
+    var bg = getPatternBackground(fill);
+    var line;
+    if (!parsed) return null;
+    if (parsed.type == 'hatches') {
+      if (parsed.widths.length != 2) return null;
+      line = sameColor(parsed.colors[0], bg) ? 1 : sameColor(parsed.colors[1], bg) ? 0 : -1;
+      if (line == -1) return null;
+      return {type: 'hatches', color: parsed.colors[line], size: parsed.widths[line],
+        gap: parsed.widths[1 - line], angle: parsed.rotation};
+    }
+    if (parsed.type == 'dots' || parsed.type == 'squares') {
+      if (parsed.colors.length != 1 || !sameColor(parsed.background, bg)) return null;
+      return {type: parsed.type, color: parsed.colors[0], size: parsed.size,
+        gap: parsed.spacing, angle: parsed.rotation};
+    }
+    return null;
+  }
+
+  // The same pattern over a different fill, or null for a custom pattern, which
+  // is left as it is.
+  function refillPattern(parsed, oldFill, newFill) {
+    var o = getPatternControls(parsed, oldFill);
+    return o ? formatFillPattern(o, getPatternBackground(newFill)) : null;
+  }
+
+  // A -style expression giving each feature the pattern @o over its own fill.
+  // For a change that sets fills the panel cannot know in advance, like
+  // -classify's random colours.
+  function formatFillPatternExpression(o) {
+    var sentinel = '\u0000';
+    var parts = formatFillPattern(o, sentinel).split(sentinel);
+    return JSON.stringify(parts[0]) + ' + (fill || "none") + ' + JSON.stringify(parts[1]);
+  }
+
+  // Collects per-feature edits into as few -style commands as they allow.
+  // @edits: [{id, styles: [[name, value], ...]}]
+  // Returns [{styles, ids}], in the order each set of styles first appears.
+  function groupStyleEdits(edits) {
+    var groups = [];
+    var index = {};
+    edits.forEach(function(edit) {
+      var key = JSON.stringify(edit.styles);
+      if (!(key in index)) {
+        index[key] = groups.length;
+        groups.push({styles: edit.styles, ids: []});
+      }
+      groups[index[key]].ids.push(edit.id);
+    });
+    return groups;
+  }
+
+  function formatAngle(angle, defaultAngle) {
+    return angle == defaultAngle ? '' : formatNumber$3(angle) + 'deg ';
+  }
+
+  function formatPx(val) {
+    return formatNumber$3(val) + 'px';
+  }
+
+  function formatNumber$3(val) {
+    return String(Math.round(Number(val) * 100) / 100);
+  }
+
+  function sameColor(a, b) {
+    return normalizeColor(a) == normalizeColor(b);
+  }
+
+  function normalizeColor(color) {
+    var str = String(color || '').trim().toLowerCase();
+    return str == 'transparent' ? 'none' : str;
+  }
+
+  function isBlank$1(val) {
+    return val === undefined || val === null || String(val).trim() === '';
+  }
+
+  // The polygon panel's "Pattern" section. See gui-fill-pattern.mjs for how its
+  // settings map to fill-pattern codes.
+  //
+  // Switched like the label panel's Halo and Icon sections: a pattern is a
+  // yes/no that the rest of the section then qualifies, and the section shows
+  // only its heading while it is off.
+  //
+  // opts.getRecords()        the target layer's records
+  // opts.getTargetIds()      the features being styled
+  // opts.applyEdits(edits, title)   run per-feature edits: [{id, styles}]
+  // opts.revert()            put the panel back as the data has it
+  // opts.releaseFocus()
+  function PatternFillControl(parent, opts) {
+    var section = makePanelSection(parent, 'Pattern');
+    var shown = {type: 'none'};
+    // What switching the pattern on applies when the features have none: the
+    // last pattern the section showed, so that off and on again is a round trip.
+    var lastPattern = null;
+    // Custom was chosen from the menu, and the code field is waiting for a code.
+    // Until one is applied the data still says what it said before, so the
+    // choice has to be remembered or the next refresh would undo it.
+    var customPending = false;
+    var toggle, typeSelect, mixedOption, colorControl, angleField, sizeRow, sizeCaption,
+        sizeField, gapField, customRow, codeInput;
+
+    initRows();
+
+    this.section = section;
+
+    this.update = update;
+
+    this.reset = function() {
+      customPending = false;
+    };
+
+    this.hidePicker = function() {
+      colorControl.picker.hide();
+    };
+
+    // What a saved style records for the pattern, over the fill it records.
+    this.getCode = function(fill) {
+      if (isSimple(shown)) return formatFillPattern(shown, getPatternBackground(fill));
+      if (shown.type == 'custom') return shown.code || '';
+      return '';
+    };
+
+    // Per-feature edits applying @styles to the targets. A new fill is also
+    // written into the background of each feature's pattern, since that is where
+    // the pattern's background colour is kept; custom patterns are left alone.
+    this.getStyleEdits = function(styles) {
+      var records = opts.getRecords();
+      var fill = findStyle(styles, 'fill');
+      var refill = fill !== undefined && findStyle(styles, 'fill-pattern') === undefined;
+      return opts.getTargetIds().map(function(id) {
+        var rec = records[id];
+        var code = rec && rec['fill-pattern'];
+        var edit = {id: id, styles: styles};
+        var refilled;
+        if (refill && !isBlank(code)) {
+          refilled = refillPattern(internal.parsePattern(code), rec.fill, fill);
+          if (refilled) edit.styles = styles.concat([['fill-pattern', refilled]]);
+        }
+        return edit;
+      });
+    };
+
+    // Edits that keep each feature's pattern over its fill after a command that
+    // sets fills the panel cannot know beforehand. A -style expression reads
+    // the new fill when it runs.
+    this.getRefillExpressionEdits = function(ids) {
+      var records = opts.getRecords();
+      var edits = [];
+      ids.forEach(function(id) {
+        var rec = records[id];
+        var code = rec && rec['fill-pattern'];
+        var o = isBlank(code) ? null : getPatternControls(internal.parsePattern(code), rec.fill);
+        if (o) edits.push({id: id, styles: [['fill-pattern', formatFillPatternExpression(o)]]});
+      });
+      return edits;
+    };
+
+    function initRows() {
+      toggle = makePanelToggle(section.findChild('.label-style-section-title'), {
+        title: 'Fill with a pattern',
+        className: 'layer-pattern-toggle',
+        onChange: setPatternOn
+      });
+      var typeRow = El('div').addClass('label-style-row layer-pattern-type-row').appendTo(section);
+      typeSelect = El('select').attr('title', 'Pattern type').appendTo(typeRow)
+        .on('change', function() {
+          selectType(typeSelect.node().value);
+        });
+      [['hatches', 'Hatches'], ['dots', 'Dots'], ['squares', 'Squares'],
+        ['custom', 'Custom']].forEach(function(o) {
+        El('option').attr('value', o[0]).appendTo(typeSelect).text(o[1]);
+      });
+      // Shown only while the features being styled have different patterns,
+      // which is not a choice the menu offers.
+      mixedOption = El('option').attr('value', 'mixed').appendTo(typeSelect).text('Mixed');
+      mixedOption.node().disabled = true;
+
+      colorControl = makeColorRow(section, {
+        label: 'Color',
+        noOpacity: true,
+        onColor: function(color) {
+          if (color) applyChange({color: color});
+        },
+        revert: opts.revert
+      });
+      colorControl.row.addClass('layer-pattern-color-row');
+      El('span').appendTo(colorControl.aside).text('Angle');
+      angleField = new SizeField(colorControl.aside, {
+        min: -180, max: 180, step: 15, bigStep: 45,
+        title: 'Pattern angle in degrees',
+        onSet: function(value) {
+          applyChange({angle: value});
+        },
+        onStep: function(delta) {
+          applyChange({angle: Math.max(-180, Math.min(180, shown.angle + delta))});
+        },
+        onDone: opts.releaseFocus
+      });
+
+      sizeRow = El('div').addClass('label-style-row layer-pattern-size-row').appendTo(section);
+      var sizeCell = El('div').addClass('label-split-cell').appendTo(sizeRow);
+      var gapCell = El('div').addClass('label-split-cell').appendTo(sizeRow);
+      sizeCaption = El('span').appendTo(sizeCell).text('Size');
+      sizeField = new SizeField(sizeCell, {
+        min: 0.25, step: 0.5, bigStep: 2, decimals: 2,
+        title: 'Size in px',
+        onSet: function(value) {
+          applyChange({size: value});
+        },
+        onStep: function(delta) {
+          applyChange({size: Math.max(0.25, shown.size + delta)});
+        },
+        onDone: opts.releaseFocus
+      });
+      El('span').appendTo(gapCell).text('Gap');
+      gapField = new SizeField(gapCell, {
+        min: 0, step: 0.5, bigStep: 2, decimals: 2,
+        title: 'Gap in px',
+        onSet: function(value) {
+          applyChange({gap: value});
+        },
+        onStep: function(delta) {
+          applyChange({gap: Math.max(0, shown.gap + delta)});
+        },
+        onDone: opts.releaseFocus
+      });
+
+      customRow = El('div').addClass('label-style-row layer-pattern-code-row').appendTo(section);
+      var caption = El('div').addClass('label-style-row-label').appendTo(customRow).text('Code');
+      makeFieldTip(caption,
+        'The fill-pattern syntax of the -style command.\n' +
+        'See the command reference for details.');
+      codeInput = El('input').attr('type', 'text').attr('title', 'Pattern code').appendTo(customRow)
+        .on('change', function() {
+          applyCode(codeInput.node().value.trim());
+        });
+    }
+
+    function update() {
+      var ids = opts.getTargetIds();
+      var toggleState = getToggleState(ids);
+      var state = getCommonPatternState(ids);
+      if (customPending && state.type != 'custom') {
+        state = {type: 'custom', code: shown.type == 'custom' ? shown.code : getPendingCode(state)};
+      }
+      shown = state;
+      if (isSimple(state) || state.type == 'custom' && state.code) lastPattern = state;
+      toggle.setState(toggleState);
+      section.classed('collapsed', toggleState == 'off');
+      mixedOption.classed('hidden', state.type != 'mixed');
+      typeSelect.node().value = state.type;
+      colorControl.row.classed('hidden', !isSimple(state));
+      sizeRow.classed('hidden', !isSimple(state));
+      customRow.classed('hidden', state.type != 'custom');
+      if (isSimple(state)) {
+        colorControl.showColor(state.color);
+        angleField.setValue(state.angle);
+        sizeCaption.text(state.type == 'hatches' ? 'Width' : 'Size');
+        sizeField.setValue(state.size);
+        gapField.setValue(state.gap);
+      } else {
+        colorControl.picker.hide();
+      }
+      if (state.type == 'custom' && document.activeElement !== codeInput.node()) {
+        codeInput.node().value = state.code || '';
+      }
+    }
+
+    function selectType(type) {
+      if (type == 'custom') {
+        customPending = true;
+        update();
+        codeInput.node().focus();
+        return;
+      }
+      customPending = false;
+      if (patternTypes.indexOf(type) > -1) {
+        applyControls(getDefaultPatternControls(type, isSimple(shown) ? shown.color : null));
+      }
+    }
+
+    // On gives every feature being styled a pattern: the one the features that
+    // have a pattern agree on, if they do, or else the last one shown, or else a
+    // default hatch. Off takes the pattern off all of them.
+    function setPatternOn(on) {
+      var ids = opts.getTargetIds();
+      var common, pattern;
+      customPending = false;
+      if (!on) {
+        applyToTargets(function() { return ''; }, 'Remove pattern fill');
+        return;
+      }
+      common = getCommonPatternState(ids.filter(hasPattern));
+      pattern = isSimple(common) || common.type == 'custom' ? common :
+        lastPattern || getDefaultPatternControls('hatches');
+      if (pattern.type == 'custom') {
+        applyToTargets(function() { return pattern.code; }, 'Pattern fill');
+      } else {
+        applyControls(pattern);
+      }
+    }
+
+    function getToggleState(ids) {
+      var n = ids.filter(hasPattern).length;
+      return n === 0 ? 'off' : n < ids.length ? 'mixed' : 'on';
+    }
+
+    function hasPattern(id) {
+      var rec = opts.getRecords()[id];
+      return !isBlank(rec && rec['fill-pattern']);
+    }
+
+    function applyChange(change) {
+      if (!isSimple(shown)) return;
+      var o = Object.assign({}, shown, change);
+      if (!isValidPatternControls(o)) {
+        opts.revert();
+        return;
+      }
+      applyControls(o);
+    }
+
+    function applyControls(o) {
+      applyToTargets(function(rec) {
+        return formatFillPattern(o, getPatternBackground(rec && rec.fill));
+      }, 'Pattern fill');
+    }
+
+    function applyCode(code) {
+      if (code && !internal.parsePattern(code)) {
+        codeInput.node().value = shown.code || '';
+        opts.revert();
+        return;
+      }
+      if (!code) customPending = false;
+      applyToTargets(function() { return code; }, code ? 'Pattern fill' : 'Remove pattern fill');
+    }
+
+    function applyToTargets(getCode, title) {
+      var records = opts.getRecords();
+      opts.applyEdits(opts.getTargetIds().map(function(id) {
+        return {id: id, styles: [['fill-pattern', getCode(records[id])]]};
+      }), title);
+    }
+
+    // The pattern the features being styled have in common, as panel settings,
+    // {type: 'custom', code}, {type: 'none'} -- or {type: 'mixed'} if they differ.
+    // Features with the same pattern over different fills agree: each pattern's
+    // background is its own feature's fill.
+    function getCommonPatternState(ids) {
+      var records = opts.getRecords();
+      var cache = {};
+      var firstKey = null, first = null;
+      var rec, cacheKey, state, key;
+      for (var i=0; i<ids.length; i++) {
+        rec = records[ids[i]];
+        cacheKey = (rec && rec['fill-pattern']) + '\t' + (rec && rec.fill);
+        state = cache[cacheKey] || (cache[cacheKey] = readPatternState(rec));
+        key = JSON.stringify(state);
+        if (firstKey === null) {
+          firstKey = key;
+          first = state;
+        } else if (key != firstKey) {
+          return {type: 'mixed'};
+        }
+      }
+      return first || {type: 'none'};
+    }
+
+    // The code the Custom field starts from: the pattern being replaced, so that
+    // choosing Custom is a way to see the code for the settings shown.
+    function getPendingCode(state) {
+      var records = opts.getRecords();
+      var ids = opts.getTargetIds();
+      var rec = ids.length > 0 ? records[ids[0]] : null;
+      return isSimple(state) ? formatFillPattern(state, getPatternBackground(rec && rec.fill)) : '';
+    }
+  }
+
+  function readPatternState(rec) {
+    var code = rec && rec['fill-pattern'];
+    if (isBlank(code)) return {type: 'none'};
+    return getPatternControls(internal.parsePattern(code), rec.fill) ||
+      {type: 'custom', code: String(code)};
+  }
+
+  function isSimple(state) {
+    return patternTypes.indexOf(state.type) > -1;
+  }
+
+  function findStyle(styles, name) {
+    for (var i=0; i<styles.length; i++) {
+      if (styles[i][0] == name) return styles[i][1];
+    }
+    return undefined;
+  }
+
+  function isBlank(val) {
+    return val === undefined || val === null || String(val).trim() === '';
+  }
+
   var savedStylesKey = 'layer_style_presets';
-  var styleFields = ['stroke', 'stroke-width', 'stroke-opacity', 'fill', 'fill-opacity'];
+  var styleFields = ['stroke', 'stroke-width', 'stroke-opacity', 'stroke-dasharray', 'fill', 'fill-opacity', 'fill-pattern'];
 
   function LayerStyleTool(gui) {
     var parent = gui.container.findChild('.mshp-main-map');
     var panel = El('div').addClass('label-style-panel layer-style-panel rollover').appendTo(parent).hide();
-    var title, editingStatus, clearLink, strokeControl, fillControl, strokeWidthField, randomFillBtn, presetControl, hit;
+    var title, editingStatus, clearLink, strokeControl, fillControl, strokeWidthField, dashControl, randomFillBtn, presetControl, patternControl, hit;
     var targetLayer = null;
 
     initPanel();
@@ -19605,6 +20316,7 @@
 
     function turnOn() {
       targetLayer = getActiveLayer();
+      patternControl.reset();
       applyDefaultLineStyle();
       panel.show();
       updateControls();
@@ -19614,6 +20326,8 @@
       panel.hide();
       strokeControl.picker.hide();
       fillControl.picker.hide();
+      patternControl.hidePicker();
+      patternControl.reset();
       targetLayer = null;
     }
 
@@ -19630,8 +20344,8 @@
       // picker's Close button, and the panel's own buttons in the browsers that
       // focus a button on click. Left alone while the user is typing into a
       // field, which a click elsewhere in the panel ends on its own.
-      panel.node().addEventListener('click', function() {
-        if (isTextInput(document.activeElement)) return;
+      panel.node().addEventListener('click', function(e) {
+        if (isTextInput(document.activeElement) || opensAMenu(e.target)) return;
         releaseFocus();
       });
 
@@ -19646,11 +20360,22 @@
       fillControl = addColorControl(panel, 'Fill', 'fill', '');
       strokeControl = addColorControl(panel, 'Stroke', 'stroke', '#000000');
       strokeWidthField = addStrokeWidthControl(strokeControl.aside);
+      dashControl = addDashArrayControl(panel);
 
       var buttonRow = El('div').addClass('label-style-row label-panel-button-row').appendTo(panel);
       randomFillBtn = makePanelActionButton(buttonRow, 'Random fills', applyRandomFillColors);
       makePanelActionButton(buttonRow, 'Clear style', clearLayerStyle);
 
+      patternControl = new PatternFillControl(panel, {
+        getRecords: function() {
+          return targetLayer && targetLayer.data ? targetLayer.data.getRecords() : [];
+        },
+        getTargetIds: getTargetIds,
+        applyEdits: runStyleEdits,
+        revert: updateControls,
+        releaseFocus: releaseFocus
+      });
+
       presetControl = new StylePresetControl(panel, {
         storageKey: savedStylesKey,
         type: getStyleType,
@@ -19706,6 +20431,29 @@
       });
     }
 
+    // A literal stroke-dasharray, in the wide column so that it lines up with
+    // the stroke's colour above it. A blank field makes the line solid again.
+    function addDashArrayControl(parent) {
+      var row = El('div').addClass('label-style-row label-split-row layer-dash-row').appendTo(parent);
+      var cell = El('div').addClass('label-split-cell').appendTo(row);
+      El('div').addClass('label-split-cell').appendTo(row);
+      var caption = El('div').addClass('label-style-row-label').appendTo(cell).text('Dashes');
+      makeFieldTip(caption,
+        'Dash and gap lengths in pixels, separated\n' +
+        'by spaces. "4" gives 4px dashes and 4px gaps.\n' +
+        '"6 3" gives 6px dashes and 3px gaps.');
+      var input = El('input').attr('type', 'text').appendTo(cell)
+        .on('change', function() {
+          var value = normalizeDashArrayInput(input.node().value);
+          if (value && internal.parseStyleLiteral('stroke-dasharray', value) === undefined) {
+            updateControls();
+            return;
+          }
+          applyDashArrayStyle(value);
+        });
+      return {row: row, input: input};
+    }
+
     function releaseFocus() {
       releasePanelFocus(panel.node());
     }
@@ -19719,10 +20467,14 @@
       updateEditingStatus(manualIds.length);
       strokeControl.row.show();
       fillControl.row.classed('hidden', geom != 'polygon');
+      dashControl.row.classed('hidden', geom != 'polyline');
       updateColorControl(strokeControl);
       updateColorControl(fillControl);
       updateStrokeWidthControl();
+      updateDashArrayControl();
       randomFillBtn.classed('hidden', geom != 'polygon');
+      patternControl.section.classed('hidden', geom != 'polygon');
+      if (geom == 'polygon') patternControl.update();
       presetControl.render();
       updateSavedStyleControls();
     }
@@ -19735,10 +20487,13 @@
       if (!isHexColor(value)) control.picker.hide();
     }
 
+    // A selection whose colours disagree still has colours, so an opacity unset
+    // on all of it shows as full rather than blank.
     function updateOpacityControl(control) {
-      var value = getCommonStyleValue(control.field + '-opacity');
-      control.opacity.node().value =
-        formatOpacityPct(value === '' || value === undefined || value === null ? 1 : value);
+      var field = control.field + '-opacity';
+      control.opacity.node().value = styleFieldIsUnsetForTargets(field) ?
+        formatColorOpacityPct(null, !styleFieldIsUnsetForTargets(control.field)) :
+        formatOpacityPct(getCommonStyleValue(field));
     }
 
     function updateStrokeWidthControl() {
@@ -19748,6 +20503,11 @@
           getDefaultStrokeWidth() : value));
     }
 
+    function updateDashArrayControl() {
+      var value = getCommonStyleValue('stroke-dasharray');
+      dashControl.input.node().value = value === undefined || value === null ? '' : String(value);
+    }
+
     function nudgeStrokeWidth(direction) {
       var value = Number(getCommonStyleValue('stroke-width'));
       if (!isFinite(value)) value = getDefaultStrokeWidth();
@@ -19778,8 +20538,12 @@
       if (control.field == 'stroke' && strokeWidthIsUnsetForTargets()) {
         styles.push(['stroke-width', 1]);
       }
-      runStyleCommand(styles);
-    }
+      if (control.field == 'fill') {
+        runStyleEdits(patternControl.getStyleEdits(styles));
+      } else {
+        runStyleCommand(styles);
+      }
+    }
 
     function applyStrokeWidthStyle(value) {
       var styles = [['stroke-width', value]];
@@ -19789,12 +20553,39 @@
       runStyleCommand(styles);
     }
 
+    function applyDashArrayStyle(value) {
+      var styles = [['stroke-dasharray', value]];
+      if (value && styleFieldIsUnsetForTargets('stroke')) {
+        styles.push(['stroke', strokeControl.defaultColor]);
+      }
+      runStyleCommand(styles);
+    }
+
     function runStyleCommand(styles) {
-      var parts = ['-style'];
       releaseFocus();
       syncTargetLayer();
       var ids = getTargetIds();
       if (!gui.console || !targetLayer || ids.length === 0) return;
+      runCommand(formatStyleCommand(styles, ids), 'Style layer');
+    }
+
+    // Per-feature edits ([{id, styles}]), as one -style command for each set of
+    // styles. They are run as one command string, which is one undo step.
+    function runStyleEdits(edits, title) {
+      releaseFocus();
+      syncTargetLayer();
+      if (!gui.console || !targetLayer || edits.length === 0) return;
+      runCommand(formatStyleEditCommands(edits), title || 'Style layer');
+    }
+
+    function formatStyleEditCommands(edits) {
+      return groupStyleEdits(edits).map(function(group) {
+        return formatStyleCommand(group.styles, group.ids);
+      }).join(' ');
+    }
+
+    function formatStyleCommand(styles, ids) {
+      var parts = ['-style'];
       styles.forEach(function(style) {
         parts.push(style[0] + '=' + quoteCommandValue(style[1]));
       });
@@ -19802,7 +20593,7 @@
       if (ids.length < internal.getFeatureCount(targetLayer)) {
         parts.push('ids=' + ids.join(','));
       }
-      runCommand(parts.join(' '), 'Style layer');
+      return parts.join(' ');
     }
 
     function applyDefaultLineStyle() {
@@ -19816,13 +20607,21 @@
       }
     }
 
+    // Patterns keep their backgrounds in step with the fills, and the new fills
+    // are not known until -classify has chosen them, so the patterns are
+    // rewritten by an expression that reads each feature's fill when it runs.
     function applyRandomFillColors() {
       var cmd = '-classify colors=random non-adjacent';
+      var patternEdits;
       syncTargetLayer();
       if (!gui.console || !targetLayer || targetLayer.geometry_type != 'polygon') return;
       if (getActiveLayer() != targetLayer) {
         cmd += ' target=' + internal.formatOptionValue(internal.getLayerTargetId(gui.model, targetLayer));
       }
+      patternEdits = patternControl.getRefillExpressionEdits(getAllFeatureIds(targetLayer));
+      if (patternEdits.length > 0) {
+        cmd += ' ' + formatStyleEditCommands(patternEdits);
+      }
       runCommand(cmd, 'Random fill colors');
     }
 
@@ -19841,7 +20640,7 @@
         }
       });
       if (styles.length > 0) {
-        runStyleCommand(styles);
+        runStyleEdits(patternControl.getStyleEdits(styles));
       }
     }
 
@@ -19850,9 +20649,13 @@
       addStyleValue(style, 'stroke', getControlValue(strokeControl.input));
       addStyleValue(style, 'stroke-width', strokeWidthField.getValue());
       addStyleValue(style, 'stroke-opacity', parseOpacityValue(strokeControl.opacity.node().value));
+      if (targetLayer && targetLayer.geometry_type == 'polyline') {
+        addStyleValue(style, 'stroke-dasharray', getControlValue(dashControl.input));
+      }
       if (targetLayer && targetLayer.geometry_type == 'polygon') {
         addStyleValue(style, 'fill', getControlValue(fillControl.input));
         addStyleValue(style, 'fill-opacity', parseOpacityValue(fillControl.opacity.node().value));
+        addStyleValue(style, 'fill-pattern', patternControl.getCode(getControlValue(fillControl.input)));
       }
       return style;
     }
@@ -20067,8 +20870,8 @@
         revert: updateControls,
         release: releaseFocus
       });
-      panel.node().addEventListener('click', function() {
-        if (isTextInput(document.activeElement)) return;
+      panel.node().addEventListener('click', function(e) {
+        if (isTextInput(document.activeElement) || opensAMenu(e.target)) return;
         releaseFocus();
       });
 
@@ -20260,27 +21063,42 @@
       var radius = getCommonValue('r');
       var fill = getCommonValue('fill');
       var stroke = getCommonValue('stroke');
-      var fillOpacity = getCommonValue('fill-opacity');
-      var strokeOpacity = getCommonValue('stroke-opacity');
       var strokeWidth = getCommonValue('stroke-width');
       setCircleRadius(radius);
       setCircleColor(circleFillControl, fill);
       setCircleColor(circleStrokeControl, stroke);
-      setCircleOpacity(circleFillControl, fillOpacity);
-      setCircleOpacity(circleStrokeControl, strokeOpacity);
+      updateCircleOpacity(circleFillControl);
+      updateCircleOpacity(circleStrokeControl);
       setCircleStrokeWidth(strokeWidth === '' ? 0 : strokeWidth);
       if (representation != 'circle' && representation != 'unstyled') {
         setCircleRadius(defaultCircleRadius);
         setCircleColor(circleFillControl, '');
         setCircleColor(circleStrokeControl, '');
-        setCircleOpacity(circleFillControl, '');
-        setCircleOpacity(circleStrokeControl, '');
+        circleFillControl.opacity.node().value = '';
+        circleStrokeControl.opacity.node().value = '';
         setCircleStrokeWidth(0);
       }
     }
 
-    function setCircleOpacity(control, value) {
-      control.opacity.node().value = formatOpacityPct(value === '' ? 1 : value);
+    // The opacity to put in the style command: undefined to leave the property
+    // as it is, null for a field holding something that is not an opacity.
+    // A blank field has nothing to say, and 100% over an unset opacity is the
+    // default being shown rather than a value to store.
+    function getCircleOpacityToWrite(control) {
+      var str = control.opacity.node().value.trim();
+      var val = parseOpacityValue(str);
+      if (str === '') return undefined;
+      if (val === 1 && styleFieldIsUnset(control.field + '-opacity')) return undefined;
+      return val;
+    }
+
+    // A selection whose colours disagree still has colours, so an opacity unset
+    // on all of it shows as full rather than blank.
+    function updateCircleOpacity(control) {
+      var field = control.field + '-opacity';
+      control.opacity.node().value = styleFieldIsUnset(field) ?
+        formatColorOpacityPct(null, !styleFieldIsUnset(control.field)) :
+        formatOpacityPct(getCommonValue(field));
     }
 
     function renderCreateFields() {
@@ -20307,9 +21125,8 @@
       var expr = createExprInput.node().value.trim();
       var cmd;
       if (!expr || !gui.console) return;
-      cmd = createCopyCheckbox.node().checked ?
-        '-filter true + name=labels -style label-text=' + quoteCommandValue(expr) :
-        '-style label-text=' + quoteCommandValue(expr);
+      cmd = '-labels text=' + quoteCommandValue(expr);
+      if (createCopyCheckbox.node().checked) cmd += ' + name=labels';
       runGuiEditCommand(gui, cmd, {
         title: 'Create labels',
         onSuccess: openLabelStyles
@@ -20331,16 +21148,16 @@
     function createSimpleCircles() {
       runCommand('-style r=' + defaultCreatedCircleRadius +
         ' fill=' + quoteCommandValue(defaultCircleFill) +
-        ' fill-opacity=1 stroke-opacity=1 stroke-width=0', 'Create circles');
+        ' stroke-width=0', 'Create circles');
     }
 
     function applyCircleStyles() {
       var representation = getPointRepresentation();
       var radius = getCircleRadius();
       var fill = circleFillControl.input.node().value.trim();
-      var fillOpacity = parseOpacityValue(circleFillControl.opacity.node().value);
+      var fillOpacity = getCircleOpacityToWrite(circleFillControl);
       var stroke = circleStrokeControl.input.node().value.trim();
-      var strokeOpacity = parseOpacityValue(circleStrokeControl.opacity.node().value);
+      var strokeOpacity = getCircleOpacityToWrite(circleStrokeControl);
       var strokeWidth = getCircleStrokeWidth();
       var args;
       if (!gui.console || !(representation == 'unstyled' || representation == 'circle') ||
@@ -20349,11 +21166,9 @@
         fill = defaultCircleFill;
         setCircleColor(circleFillControl, fill);
       }
-      args = [
-        'fill-opacity=' + fillOpacity,
-        'stroke-opacity=' + strokeOpacity,
-        'stroke-width=' + strokeWidth
-      ];
+      args = ['stroke-width=' + strokeWidth];
+      if (fillOpacity !== undefined) args.push('fill-opacity=' + fillOpacity);
+      if (strokeOpacity !== undefined) args.push('stroke-opacity=' + strokeOpacity);
       if (radius !== null) args.unshift('r=' + radius);
       if (fill) args.push('fill=' + quoteCommandValue(fill));
       if (stroke) args.push('stroke=' + quoteCommandValue(stroke));
@@ -20580,7 +21395,7 @@
     var setDefaultTargets = self.setDefaultTargets;
     utils$1.extend(self, EventDispatcher.prototype);
 
-    // A map frame is composition state, not editable content. Commands may
+    // A map frame (and its furniture) is composition state, not editable content. Commands may
     // explicitly target it, but it must not replace the GUI's active content
     // layer or become the implicit target of the next console command.
     self.setDefaultTargets = function(targets, opts) {
@@ -20647,15 +21462,25 @@
     };
 
     self.selectNextLayer = function() {
-      var next = self.findNextLayer(self.getActiveLayer().layer);
+      var next = findContentLayer(self.findNextLayer);
       if (next) self.selectLayer(next.layer, next.dataset);
     };
 
     self.selectPrevLayer = function() {
-      var prev = self.findPrevLayer(self.getActiveLayer().layer);
+      var prev = findContentLayer(self.findPrevLayer);
       if (prev) self.selectLayer(prev.layer, prev.dataset);
     };
 
+    // step past the frame and its furniture, which can't be selected
+    function findContentLayer(step) {
+      var start = self.getActiveLayer().layer;
+      var o = step.call(self, start);
+      while (o && o.layer != start && internal.isFrameComponentLayer(o.layer, o.dataset)) {
+        o = step.call(self, o.layer);
+      }
+      return o;
+    }
+
     return self;
 
     function getContentTargets(targets) {
@@ -20663,7 +21488,7 @@
         return {
           dataset: target.dataset,
           layers: target.layers.filter(function(lyr) {
-            return !internal.isFrameLayer(lyr, target.dataset.arcs);
+            return !internal.isFrameComponentLayer(lyr, target.dataset);
           })
         };
       }).filter(function(target) {
@@ -20673,7 +21498,7 @@
 
     function getFirstContentTarget() {
       var target = self.getLayers().find(function(o) {
-        return !internal.isFrameLayer(o.layer, o.dataset.arcs);
+        return !internal.isFrameComponentLayer(o.layer, o.dataset);
       });
       return target ? [{dataset: target.dataset, layers: [target.layer]}] : [];
     }
@@ -21286,7 +22111,7 @@
   // hit test, the reposition pass and the selection cue all find labels by those,
   // and a node with no feature behind it must not be found by any of them.
   //
-  // @rec: the label's record, as -add-label will write it
+  // @rec: the label's record, as -labels coordinates= will write it
   // @shp: its knots, in the layer's display coordinates
   // Returns a markup string, or '' if there is nothing to draw.
   function renderPendingSymbol(rec, shp, ext, idPrefix) {
@@ -23056,15 +23881,22 @@
     this.zoomToBbox = zoomToBbox;
 
     if (gui.options.homeControl) {
-      gui.buttons.addButton("#home-icon").on('click', function() {
-        if (disabled()) return;
-        gui.dispatchEvent('map_reset');
-      });
+      gui.buttons.addButton("#home-icon")
+        .attr('data-tooltip', 'Zoom to fit')
+        .attr('aria-label', 'Zoom to fit')
+        .on('click', function() {
+          if (disabled()) return;
+          gui.dispatchEvent('map_reset');
+        });
     }
 
     if (gui.options.zoomControl) {
-      inBtn = gui.buttons.addButton("#zoom-in-icon");
-      outBtn = gui.buttons.addButton("#zoom-out-icon");
+      inBtn = gui.buttons.addButton("#zoom-in-icon")
+        .attr('data-tooltip', 'Zoom in')
+        .attr('aria-label', 'Zoom in');
+      outBtn = gui.buttons.addButton("#zoom-out-icon")
+        .attr('data-tooltip', 'Zoom out')
+        .attr('aria-label', 'Zoom out');
       initVariableClick(inBtn.node(), zoomIn);
       initVariableClick(outBtn.node(), zoomOut);
       ext.on('change', function() {
@@ -25768,6 +26600,112 @@
     return true;
   }
 
+  // The bold stretches of a label being edited, as [start, end) offsets into the
+  // text the user edits, and how they follow the text as it changes.
+  //
+  // The editor keeps these beside the textarea's value rather than as markup in
+  // it, so that the caret and the selection index the text the user sees. The
+  // markup they come from and go back to is read and written by
+  // readLabelValue() and writeLabelValue() in gui-label-text.mjs.
+  //
+  // Every function returns a new, normalized list -- sorted, non-empty, and with
+  // no two ranges touching -- and leaves its argument alone.
+
+  function isBoldAt(ranges, i) {
+    for (var j = 0; j < ranges.length; j++) {
+      if (i >= ranges[j][0] && i < ranges[j][1]) return true;
+    }
+    return false;
+  }
+
+  // Whether every character in [start, end) is bold. False for an empty range.
+  function rangeIsAllBold(ranges, start, end) {
+    var pos = start;
+    if (!(end > start)) return false;
+    for (var j = 0; j < ranges.length && pos < end; j++) {
+      if (ranges[j][1] <= pos) continue;
+      if (ranges[j][0] > pos) return false;
+      pos = ranges[j][1];
+    }
+    return pos >= end;
+  }
+
+  // [start, end) set bold (@on) or not.
+  function setBoldRange(ranges, start, end, on) {
+    var out = [];
+    ranges.forEach(function(r) {
+      if (r[1] <= start || r[0] >= end) {
+        out.push([r[0], r[1]]);
+        return;
+      }
+      if (r[0] < start) out.push([r[0], start]);
+      if (r[1] > end) out.push([end, r[1]]);
+    });
+    if (on && end > start) out.push([start, end]);
+    return normalize(out);
+  }
+
+  // What pressing Bold does to [start, end): unbolds a range that is all bold
+  // and bolds any other, including one that is partly bold -- the convention of
+  // every word processor, and the reading that leaves the range one weight.
+  function toggleBoldRange(ranges, start, end) {
+    return setBoldRange(ranges, start, end, !rangeIsAllBold(ranges, start, end));
+  }
+
+  // The ranges for @newText, given the ranges they were for @oldText.
+  //
+  // The edit is found as the text between the longest common prefix and suffix,
+  // which is exact for everything a textarea does in one step -- typing,
+  // deleting, pasting over a selection, an IME composition -- and still gives a
+  // sensible answer for its own undo, which can replace a larger stretch at once.
+  //
+  // Inserted text takes the weight of the character before it, so typing on at
+  // the end of a bold word stays bold and typing after it does not; at the start
+  // of the text it takes the weight of the first character.
+  function updateBoldForEdit(ranges, oldText, newText) {
+    var edit, inherit, mapped;
+    if (ranges.length === 0 || oldText === newText) return normalize(ranges);
+    edit = findEdit(oldText, newText);
+    inherit = edit.start > 0 ? isBoldAt(ranges, edit.start - 1) :
+      isBoldAt(ranges, edit.start + edit.removed);
+    mapped = ranges.map(function(r) {
+      return [mapOffset(r[0], edit), mapOffset(r[1], edit)];
+    });
+    return setBoldRange(normalize(mapped), edit.start, edit.start + edit.inserted,
+      inherit);
+  }
+
+  function sameBoldRanges(a, b) {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; i++) {
+      if (a[i][0] !== b[i][0] || a[i][1] !== b[i][1]) return false;
+    }
+    return true;
+  }
+
+  // {start, removed, inserted}: characters [start, start + removed) of the old
+  // text became [start, start + inserted) of the new one.
+  function findEdit(a, b) {
+    var max = Math.min(a.length, b.length);
+    var pre = 0, suf = 0;
+    while (pre < max && a.charCodeAt(pre) === b.charCodeAt(pre)) pre++;
+    while (suf < max - pre &&
+      a.charCodeAt(a.length - 1 - suf) === b.charCodeAt(b.length - 1 - suf)) suf++;
+    return {start: pre, removed: a.length - pre - suf, inserted: b.length - pre - suf};
+  }
+
+  // A boundary inside the removed stretch collapses to its start. One after it
+  // moves by the change in length.
+  function mapOffset(x, edit) {
+    if (x <= edit.start) return x;
+    if (x >= edit.start + edit.removed) return x - edit.removed + edit.inserted;
+    return edit.start;
+  }
+
+  function normalize(ranges) {
+    return internal.svg.normalizeBoldRanges(ranges);
+  }
+
   // Caret and selection geometry, computed from the SVG character position APIs.
   //
   // The APIs behave identically on <text> and on <text><textPath>, so this code
@@ -26087,16 +27025,19 @@
     // so the tool cannot do this at its own call sites.
     self.open = function(target, id, opts) {
       var rec = getRecord(target, id);
+      var value;
       if (!rec) return false;
       self.close();
+      value = readLabelValue(rec['label-text']);
       session = {
         target: target,
         id: id,
         pending: null,
         created: false,
         onClose: opts && opts.onClose || null,
-        startText: decodeLabelText(rec['label-text']),
-        startBreaks: readSoftBreaks(rec['label-text']).breaks,
+        startText: value.text,
+        startBreaks: value.breaks,
+        startBold: value.bold,
         nodes: null
       };
       startSession();
@@ -26142,6 +27083,7 @@
         onClose: opts.onClose || null,
         startText: '',
         startBreaks: [],
+        startBold: [],
         nodes: null
       };
       startSession();
@@ -26150,6 +27092,7 @@
 
     function startSession() {
       session.text = session.startText;
+      session.bold = session.startBold;
       getTextarea().value = session.text;
       setCaret(session.text.length, session.text.length);
       focusTextarea();
@@ -26165,6 +27108,74 @@
       self.refresh();
     }
 
+    // The text a Bold item in the context menu would act on, as {start, end,
+    // bold}, where @bold says whether all of it is bold already; or null. That is
+    // the selection, or with nothing selected, the word under @p -- read when the
+    // menu opens, because by the time an item is chosen the pointer is on the
+    // menu rather than the label.
+    self.getBoldTargetAtPoint = function(p) {
+      var start = getCaretStart(), end = getCaretEnd();
+      var range;
+      if (!session) return null;
+      if (!(end > start)) {
+        start = getEditIndexAtPoint(p);
+        if (start < 0) return null;
+        range = getWordRange(session.text, start);
+        start = range[0];
+        end = range[1];
+      }
+      if (!(end > start)) return null;
+      return {start: start, end: end, bold: rangeIsAllBold(session.bold, start, end)};
+    };
+
+    // Bolds the selected text, or unbolds it if it is all bold already; or the
+    // text from @start to @end, which is selected first. The text stays
+    // selected, so that a second press takes it back.
+    self.toggleBold = function(start, end) {
+      if (!session) return;
+      if (start >= 0 && end > start) {
+        setCaret(start, end);
+      } else {
+        start = getCaretStart();
+        end = getCaretEnd();
+      }
+      if (!(end > start)) return;
+      session.bold = toggleBoldRange(session.bold, start, end);
+      self.refresh();
+    };
+
+    // Selects the text between two points in the label's own coordinate space,
+    // for a drag across it. The selection runs from @p0 towards @p1, so that
+    // shift-arrow then extends it from the end the pointer let go of.
+    self.selectBetweenPoints = function(p0, p1) {
+      var a = getEditIndexAtPoint(p0);
+      var b = getEditIndexAtPoint(p1);
+      if (a < 0 || b < 0) return false;
+      setCaret(Math.min(a, b), Math.max(a, b), b < a ? 'backward' : 'forward');
+      redrawCaret();
+      return true;
+    };
+
+    // Selects the word under @p, for a double-click inside the text.
+    self.selectWordAtPoint = function(p) {
+      var i = getEditIndexAtPoint(p);
+      var range;
+      if (i < 0) return false;
+      range = getWordRange(session.text, i);
+      setCaret(range[0], range[1]);
+      redrawCaret();
+      return true;
+    };
+
+    function getEditIndexAtPoint(p) {
+      var provider, layout, i;
+      if (!session || !session.nodes) return -1;
+      provider = getProvider(session.nodes);
+      layout = getLayout(session);
+      i = getCaretIndexAtPoint(provider, p, getRenderedLength(session.text, layout));
+      return i < 0 ? -1 : getEditIndex(session.text, i, layout);
+    }
+
     self.isOpen = function() {
       return !!session;
     };
@@ -26195,6 +27206,7 @@
       // arriving just after a redraw is holding one of those.
       if (session.pending && node.closest &&
         node.closest('.label-edit-pending')) return true;
+      if (session.nodes && session.nodes.symbol.contains(node)) return true;
       return !!groups && (groups.hit.contains(node) || groups.back.contains(node) ||
         groups.front.contains(node));
     };
@@ -26253,7 +27265,7 @@
       if (i < 0) return false;
       i = getEditIndex(session.text, i, layout);
       setCaret(i, i);
-      drawOverlay(session);
+      redrawCaret();
       return true;
     };
 
@@ -26287,7 +27299,7 @@
       var blank = textHasNoGlyphs(o.text);
       var breaks = getBreaks(o);
       if (o.pending) {
-        if (!blank) o.pending.create(insertSoftBreaks(o.text, breaks));
+        if (!blank) o.pending.create(writeLabelValue(o.text, breaks, o.bold));
         return;
       }
       if (blank) {
@@ -26295,8 +27307,9 @@
         removeLabel(o);
         return;
       }
-      if (o.text === o.startText && sameSoftBreaks(breaks, o.startBreaks)) return;
-      runGuiEditCommand(gui, getLabelTextCommand(insertSoftBreaks(o.text, breaks),
+      if (o.text === o.startText && sameSoftBreaks(breaks, o.startBreaks) &&
+        sameBoldRanges(o.bold, o.startBold)) return;
+      runGuiEditCommand(gui, getLabelTextCommand(writeLabelValue(o.text, breaks, o.bold),
         o.id, o.target.name), {
         title: 'Label text'
       });
@@ -26309,7 +27322,7 @@
       var rec;
       if (!shp || shp.length > 1) return [];
       rec = o.pending ? o.pending.getStyle() : getRecord(o.target, o.id);
-      return getSoftBreaks(o.text, rec);
+      return getSoftBreaks(o.text, rec, o.bold);
     }
 
     // Deletes the label's feature, geometry and all.
@@ -26396,7 +27409,7 @@
       var rec = Object.assign({}, o.pending.getStyle());
       // With its soft breaks, so that what is aligned and what a callout meets
       // is the block as wrapped
-      rec['label-text'] = encodeLabelText(insertSoftBreaks(o.text, getBreaks(o)));
+      rec['label-text'] = encodeLabelText(writeLabelValue(o.text, getBreaks(o), o.bold));
       // No need to expand label-pos here, or to measure its text: the renderer
       // resolves the position and asks for the width it needs, so a pending
       // label is laid out by exactly the same code as a committed one.
@@ -26444,11 +27457,15 @@
     //   - Line breaks. An empty <tspan> lays out nothing, so a line just opened
     //     with Enter had no position for the caret to move to. The placeholder in
     //     getRenderedLines() gives it one.
+    //
+    // Bold stretches are <tspan>s inside the line they fall on. The character
+    // position APIs count the characters of descendant elements in document
+    // order, so the rendered indexes stay the edited ones whatever the runs are.
     function writeText(o) {
       var content = o.nodes.content;
       var breaks = getBreaks(o);
-      var written = o.text + '\u0000' + breaks.join(',');
-      var lines, i, tspan;
+      var written = o.text + '\u0000' + breaks.join(',') + '\u0000' + o.bold.join(';');
+      var lines, full, pos, i, tspan;
       // refresh() runs on every map render, which during a pan is every frame;
       // rebuilding text nodes that already say the right thing is pure waste
       if (o.writtenTo === content && o.writtenText === written) return;
@@ -26462,23 +27479,53 @@
       // or from a label that was multi-line before it was given a path -- and
       // turning them into spaces is what export does too.
       if (getLayout(o) === LINES_JOINED) {
-        content.appendChild(document.createTextNode(getRenderedContent(o.text)));
+        full = getRenderedContent(o.text);
+        appendRuns(content, full, o.bold, 0, full.length);
         return;
       }
       // A soft break keeps the space it broke at at the end of its line, where
       // the rendered label drops it: here every typed character has to be one
       // the caret can sit beside.
+      //
+      // The lines laid end to end are the edited text character for character --
+      // each hard break is the placeholder that opens the line after it -- so a
+      // line's offset in the one is its offset in the other.
       lines = getRenderedLines(o.text, breaks);
-      content.appendChild(document.createTextNode(lines[0]));
+      full = lines.join('');
+      pos = lines[0].length;
+      appendRuns(content, full, o.bold, 0, pos);
       for (i = 1; i < lines.length; i++) {
         tspan = document.createElementNS(SVG_NS$3, 'tspan');
         tspan.setAttribute('x', o.nodes.text.getAttribute('x') || 0);
         tspan.setAttribute('dy', getLineHeight(o));
-        tspan.appendChild(document.createTextNode(lines[i]));
+        appendRuns(tspan, full, o.bold, pos, pos + lines[i].length);
+        pos += lines[i].length;
         content.appendChild(tspan);
       }
     }
 
+    // Characters [start, end) of @str into @parent, the bold ones in bold
+    // <tspan>s and the rest as text. An empty stretch still gets a text node, as
+    // an empty line always did.
+    function appendRuns(parent, str, bold, start, end) {
+      var runs = internal.svg.getBoldRuns(str, bold, start, end);
+      var tspan;
+      if (runs.length === 0) {
+        parent.appendChild(document.createTextNode(''));
+        return;
+      }
+      runs.forEach(function(run) {
+        if (!run.bold) {
+          parent.appendChild(document.createTextNode(run.text));
+          return;
+        }
+        tspan = document.createElementNS(SVG_NS$3, 'tspan');
+        tspan.setAttribute('font-weight', internal.svg.LABEL_BOLD_WEIGHT);
+        tspan.appendChild(document.createTextNode(run.text));
+        parent.appendChild(tspan);
+      });
+    }
+
     // Cached per session: asking costs a record lookup and a geometry test, and
     // the answer cannot change while a session is open.
     function getLayout(o) {
@@ -26604,18 +27651,33 @@
       return el;
     }
 
+    // Updated in place rather than rebuilt. Every caret move redraws the
+    // overlay, and a click is one: a region replaced by the first click of a
+    // double-click takes the node the button went down on out of the document,
+    // and the browser then fires neither the click nor the dblclick.
     function drawHitRegion(o, g, box, caret, pathId) {
-      var el;
-      clear(g);
-      if (box) g.appendChild(rect(box, 'label-edit-hit-area'));
-      if (!pathId) return;
+      var area = g.querySelector('.label-edit-hit-area');
+      var line = g.querySelector('.label-edit-hit-baseline');
+      if (box && area) {
+        setRect(area, box);
+      } else if (box) {
+        g.insertBefore(rect(box, 'label-edit-hit-area'), g.firstChild);
+      } else if (area) {
+        g.removeChild(area);
+      }
+      if (!pathId) {
+        if (line) g.removeChild(line);
+        return;
+      }
       // A thickened, transparent copy of the baseline: about one em wide, so that
       // the region follows the curve rather than boxing it.
-      el = document.createElementNS(SVG_NS$3, 'use');
-      el.setAttribute('href', '#' + pathId);
-      el.setAttribute('class', 'label-edit-hit-baseline');
-      el.setAttribute('stroke-width', caret ? caret.ascent + caret.descent : 12);
-      g.appendChild(el);
+      if (!line) {
+        line = document.createElementNS(SVG_NS$3, 'use');
+        line.setAttribute('class', 'label-edit-hit-baseline');
+        g.appendChild(line);
+      }
+      line.setAttribute('href', '#' + pathId);
+      line.setAttribute('stroke-width', caret ? caret.ascent + caret.descent : 12);
     }
 
     function getLabelPathId(nodes) {
@@ -26708,12 +27770,16 @@
 
     function rect(box, className) {
       var el = document.createElementNS(SVG_NS$3, 'rect');
+      setRect(el, box);
+      el.setAttribute('class', className);
+      return el;
+    }
+
+    function setRect(el, box) {
       el.setAttribute('x', box.x);
       el.setAttribute('y', box.y);
       el.setAttribute('width', box.width);
       el.setAttribute('height', box.height);
-      el.setAttribute('class', className);
-      return el;
     }
 
     function caretLine(caret) {
@@ -26743,6 +27809,7 @@
 
       textarea.addEventListener('input', function() {
         if (!session) return;
+        session.bold = updateBoldForEdit(session.bold, session.text, textarea.value);
         session.text = textarea.value;
         self.refresh();
       });
@@ -26767,6 +27834,13 @@
         return !e.isComposing && e.keyCode != 229;
       }
 
+      // Cmd-B on a Mac, Ctrl-B elsewhere, as in every text editor. A textarea
+      // has no default for it to replace.
+      function isBoldKey(e) {
+        if (!(e.metaKey || e.ctrlKey) || e.shiftKey || e.altKey) return false;
+        return (e.key || '').toLowerCase() == 'b';
+      }
+
       textarea.addEventListener('keydown', function(e) {
         if (!session) return;
         // The GUI's global key handlers are told to keep out of the way by
@@ -26793,6 +27867,10 @@
           e.preventDefault();
           e.stopPropagation();
           self.close();
+        } else if (isBoldKey(e)) {
+          e.preventDefault();
+          e.stopPropagation();
+          self.toggleBold();
         } else {
           e.stopPropagation();
         }
@@ -26846,10 +27924,11 @@
       return textarea ? textarea.selectionEnd : 0;
     }
 
-    function setCaret(start, end) {
+    // @direction: 'forward' (the default) or 'backward', which end of the
+    //   selection shift-arrow moves
+    function setCaret(start, end, direction) {
       if (!textarea) return;
-      textarea.selectionStart = start;
-      textarea.selectionEnd = end;
+      textarea.setSelectionRange(start, end, direction || 'forward');
     }
   }
 
@@ -27542,7 +28621,7 @@
   }
 
   // The label tool: arming a label type, placing an anchor or a curve, turning
-  // the result into an -add-label command, and handing the new label to the
+  // the result into a -labels coordinates= command, and handing the new label to the
   // in-place text editor.
   //
   // Creating a label and editing one are one gesture, not two: a click leaves a
@@ -27606,6 +28685,14 @@
     // The mouseup that ended the last block drag, or null. A short one is
     // followed by a click from the same mouseup, which it has already handled.
     var blockRelease = null;
+    // A drag across the text of the label being typed into, which selects the
+    // characters it passes over: {start}, where start is the pointer's position
+    // at the press, filled in by the first drag event.
+    var selectDrag = null;
+    // The mouseup that ended the last select drag, or null, for the same reason
+    // as blockRelease: the click that follows it would put the caret down and
+    // lose the selection just made.
+    var selectRelease = null;
     var editor = new LabelEditor(gui, ext);
     var selection = new LabelSelection(gui, ext, hit, function() {
       return editor.isOpen() ? editor.getFeatureId() : -1;
@@ -27635,7 +28722,7 @@
     // tools do on entry as well (`addEmptyLayer()` in `gui-edit-points.mjs` and
     // `gui-draw-lines2.mjs`). It is named rather than left unnamed, unlike
     // theirs: it is the layer `getLabelTarget()` would have created for a label
-    // anyway, and naming it is what lets the `-add-label` commands name their
+    // anyway, and naming it is what lets the `-labels` commands name their
     // target and so replay from the session history.
     //
     // Called before entering the tool's own mode, because getInitialTool() reads
@@ -27685,6 +28772,8 @@
       handleDrag = null;
       releasedDrag = null;
       blockRelease = null;
+      selectDrag = null;
+      selectRelease = null;
       shownHandles = null;
       clearBlockDrag();
       hoverHandle = null;
@@ -27811,6 +28900,10 @@
         blockRelease = null;
         return;
       }
+      if (selectRelease && getDomEvent(e) == selectRelease) {
+        selectRelease = null;
+        return;
+      }
       if (armed == 'path' && drawingCurve()) {
         extendCurve(pixToMapCoords(e.x, e.y));
         return;
@@ -27883,9 +28976,34 @@
           e.flipLabel = getFlipAction(target, id);
         }
       }
+      if (target && editor.isOpen() && clickIsOnEditedLabel(e)) {
+        addBoldAction(e, target);
+      }
       gui.contextMenu.open(e, target);
     });
 
+    // Bold for the words being typed: the selection, or with nothing selected,
+    // the word that was right-clicked. The item says what it will do, since a
+    // menu has no pressed state to show that the words are bold already. There
+    // is none in a font with no bold face (see fontHasBoldFace()).
+    function addBoldAction(e, target) {
+      var range = editor.getBoldTargetAtPoint(getLabelSpacePoint(editor.getAnchorCoords(), e));
+      if (!range || !fontHasBoldFace(getEditedFontName(target))) return;
+      e.boldText = {
+        label: range.bold ? 'remove bold' : 'bold text',
+        run: function() { editor.toggleBold(range.start, range.end); }
+      };
+    }
+
+    // The font the label being typed into is drawn in: its own, or for a label
+    // not created yet, the one the panel will give it.
+    function getEditedFontName(target) {
+      var id = editor.getFeatureId();
+      var rec = id > -1 ? getRecord(target, id) : getNewLabelStyle(gui);
+      var font = rec && rec['font-family'];
+      return font || (id > -1 ? getDefaultFontName() : getNewLabelFontName());
+    }
+
     // The label a right-click was aimed at, or -1.
     //
     // A label being typed into is not a hit target -- the editor's own overlay
@@ -28141,7 +29259,16 @@
     // takes a drag -- everything else over a label is left alone so that the map
     // still pans, which is why these handlers stop the event themselves.
     hit.on('dragstart', function(e) {
-      if (!active() || drawingCurve() || editor.isOpen()) return;
+      if (!active() || drawingCurve()) return;
+      // With a label open for typing, a drag across its text selects some of it,
+      // as it would in any text field. Anywhere else the map still pans.
+      if (editor.isOpen()) {
+        if (clickIsOnEditedLabel(e)) {
+          selectDrag = {start: null};
+          consumeDrag(e);
+        }
+        return;
+      }
       // The handle comes from the last hover, not from testing the pointer here.
       // dragstart arrives with the pointer already moved off the handle -- by the
       // first mousemove that made it a drag, which on a quick gesture is further
@@ -28166,6 +29293,22 @@
       consumeDrag(e);
     });
 
+    // The selection runs from where the button went down, which dragstart does
+    // not report -- it arrives after the first move -- but every drag event
+    // carries its distance from the press.
+    function updateSelectDrag(e) {
+      var anchor = editor.getAnchorCoords();
+      if (!editor.isOpen() || !anchor) {
+        selectDrag = null;
+        return;
+      }
+      if (!selectDrag.start) {
+        selectDrag.start = {x: e.x - (e.dragX || 0), y: e.y - (e.dragY || 0)};
+      }
+      editor.selectBetweenPoints(getLabelSpacePoint(anchor, selectDrag.start),
+        getLabelSpacePoint(anchor, e));
+    }
+
     // handle: {id, index, point, pointer} from findHandle(), or the same shape
     //   made up for a drag that grabbed a label somewhere other than its knot
     function beginKnotDrag(handle) {
@@ -28191,6 +29334,11 @@
 
     hit.on('drag', function(e) {
       var shp, p;
+      if (selectDrag) {
+        consumeDrag(e);
+        updateSelectDrag(e);
+        return;
+      }
       if (textDrag) {
         consumeDrag(e);
         updateTextDrag(e);
@@ -28225,6 +29373,12 @@
 
     hit.on('dragend', function(e) {
       var o = drag;
+      if (selectDrag) {
+        selectDrag = null;
+        selectRelease = getDomEvent(e);
+        consumeDrag(e);
+        return;
+      }
       if (textDrag) {
         o = textDrag;
         textDrag = null;
@@ -28865,9 +30019,9 @@
       selection.refresh(true);
     }
 
-    // Turns the previewed offset into one -style.
+    // Turns the previewed offset into one -labels.
     //
-    // Only the label under the pointer moves, even with several selected: -style
+    // Only the label under the pointer moves, even with several selected: -labels
     // writes one value to every id it is given, so a group drag would set them
     // all to the same absolute offset rather than nudging each by its own delta.
     function commitOffsetDrag(o) {
@@ -29011,7 +30165,7 @@
     }
 
     function dragging() {
-      return !!(drag || textDrag || handleDrag || blockDrag);
+      return !!(drag || textDrag || handleDrag || blockDrag || selectDrag);
     }
 
     // The exception is about the pointer being on the glyphs, not about the mode:
@@ -29129,6 +30283,12 @@
         resetHandle(hoverHandle);
         return;
       }
+      // Inside the text being typed, a double-click selects a word -- which is
+      // the quickest way to pick the words to set in bold.
+      if (editor.isOpen() && clickIsOnEditedLabel(e)) {
+        editor.selectWordAtPoint(getLabelSpacePoint(editor.getAnchorCoords(), e));
+        return;
+      }
       // Double-clicking a label reaches straight into its text, which is the
       // gesture most editors use and saves selecting it first. The single-click
       // route got there already if the label was the selection; this covers the
@@ -29341,6 +30501,7 @@
       referenceStyle = { // outline style for reference layers
         type: 'outline',
         strokeColors: [null, '#87b73b'], // was 78c110
+        // strokeColors: [null, 'rgba(79,140,0,0.67)'],
         strokeWidth: 0.85,
         dotColor: "#73ba20",
         dotSize: 1
@@ -30220,43 +31381,115 @@
   }
 
 
-  function getCanvasFillPattern(style) {
-    var fill = hatches[style.fillPattern];
-    if (fill === undefined) {
-      fill = makePatternFill(style);
-      hatches[style.fillPattern] = fill;
+  // symbolScale: the preview symbol scale (1 outside preview). Pattern sizes are
+  // in output pixels, like stroke widths, so the tile grows with the page.
+  // anchor: canvas-pixel position the pattern origin is pinned to, so the tile
+  // travels with the map instead of sticking to the viewport. Panning only
+  // updates this matrix. The tile image is rebuilt when the scale changes,
+  // which is at most once per pattern per render.
+  function getCanvasFillPattern(style, symbolScale, anchor) {
+    var scale = symbolScale > 0 ? symbolScale : 1;
+    var entry = hatches[style.fillPattern];
+    if (!entry || entry.scale != scale) {
+      entry = makePatternEntry(style, scale);
+      hatches[style.fillPattern] = entry;
     }
-    return fill || style.fill || '#000'; // use fill if hatches are invalid
+    if (!entry || !entry.pattern) return style.fill || '#000';
+    if (anchor) applyPatternAnchor(entry, anchor);
+    return entry.pattern;
   }
 
-  function makePatternFill(style) {
+  function makePatternEntry(style, scale) {
     var o = internal.parsePattern(style.fillPattern);
     if (!o) return null;
     var canv = document.createElement('canvas');
     var ctx = canv.getContext('2d');
-    var res = GUI.getPixelRatio();
-    var w = o.tileSize[0] * res;
-    var h = o.tileSize[1] * res;
+    var k = GUI.getPixelRatio() * scale;
+    var tw = o.tileSize[0], th = o.tileSize[1];
+    // A canvas has whole-pixel dimensions, but the scaled tile generally does
+    // not. The tile is drawn into the nearest whole-pixel canvas, and the
+    // pattern transform stretches it back to its exact size so that the
+    // repeat period doesn't drift across a large polygon.
+    var w = Math.max(1, Math.round(tw * k));
+    var h = Math.max(1, Math.round(th * k));
     canv.setAttribute('width', w);
     canv.setAttribute('height', h);
+    ctx.scale(w / tw, h / th);
     if (o.background) {
-      ctx.fillStyle = o.background;
-      ctx.fillRect(0, 0, w, h);
-    }
-    if (o.type == 'dots' || o.type == 'squares') makeDotFill(o, ctx, res);
-    if (o.type == 'dashes') makeDashFill(o, ctx, res);
-    if (o.type == 'hatches') makeHatchFill(o, ctx, res);
-    var pattern = ctx.createPattern(canv, 'repeat');
-    if (o.rotation) {
-      pattern.setTransform(new DOMMatrix('rotate(' + o.rotation + 'deg)'));
+      ctx.fillStyle = getCanvasColor(o.background);
+      ctx.fillRect(0, 0, tw, th);
     }
-    return pattern;
+    if (o.type == 'dots' || o.type == 'squares') makeDotFill(o, ctx, 1);
+    if (o.type == 'dashes') makeDashFill(o, ctx, 1);
+    if (o.type == 'hatches') makeHatchFill(o, ctx, 1);
+    return {
+      scale: scale,
+      pattern: ctx.createPattern(canv, 'repeat'),
+      rotation: o.rotation || 0,
+      sx: tw * k / w,
+      sy: th * k / h,
+      w: w,
+      h: h
+    };
+  }
+
+  // Pins the cached pattern to @anchor. Skipped when the view has not moved,
+  // so a hover redraw does not touch the pattern.
+  function applyPatternAnchor(entry, anchor) {
+    if (entry.ax == anchor.x && entry.ay == anchor.y) return;
+    entry.ax = anchor.x;
+    entry.ay = anchor.y;
+    var t = getPatternTransform(entry, anchor);
+    entry.pattern.setTransform(new DOMMatrix([t.a, t.b, t.c, t.d, t.e, t.f]));
+  }
+
+  // Matrix taking pattern-image pixels to canvas pixels: translate to the
+  // anchor, then rotate, then scale. The anchor is folded into one tile so a
+  // map origin far outside the viewport does not blow the matrix precision.
+  function getPatternTransform(entry, anchor) {
+    var p = wrapPatternAnchor(anchor.x, anchor.y, entry);
+    var rad = (entry.rotation || 0) * Math.PI / 180;
+    var c = Math.cos(rad);
+    var s = Math.sin(rad);
+    return {
+      a: c * entry.sx,
+      b: s * entry.sx,
+      c: -s * entry.sy,
+      d: c * entry.sy,
+      e: p.x,
+      f: p.y
+    };
+  }
+
+  // @entry.sx/sy scale image pixels to canvas pixels; the image repeats every
+  // @entry.w by @entry.h pixels. Returns a point in the same place on the
+  // pattern, within one tile of the origin.
+  function wrapPatternAnchor(x, y, entry) {
+    var rad = (entry.rotation || 0) * Math.PI / 180;
+    var c = Math.cos(rad);
+    var s = Math.sin(rad);
+    var rx = c * x + s * y;
+    var ry = -s * x + c * y;
+    var qx = rx / entry.sx - Math.floor(rx / entry.sx / entry.w) * entry.w;
+    var qy = ry / entry.sy - Math.floor(ry / entry.sy / entry.h) * entry.h;
+    var lx = qx * entry.sx;
+    var ly = qy * entry.sy;
+    return {
+      x: c * lx - s * ly,
+      y: s * lx + c * ly
+    };
+  }
+
+  // SVG's "none" is not a canvas colour, and a canvas ignores a fillStyle it
+  // cannot parse -- keeping the last one set, which on a fresh tile is black.
+  function getCanvasColor(color) {
+    return String(color).trim().toLowerCase() == 'none' ? 'transparent' : color;
   }
 
   function makeDashFill(o, ctx, res) {
     var x = 0;
     for (var i=0; i<o.colors.length; i++) {
-      ctx.fillStyle = o.colors[i];
+      ctx.fillStyle = getCanvasColor(o.colors[i]);
       ctx.fillRect(x, 0, o.width * res, o.dashes[0] * res);
       x += res * (o.spacing + o.width);
     }
@@ -30271,7 +31504,7 @@
     var x = 0, y = 0;
     for (var i=0; i<dots; i++) {
       if (o.type == 'dots') ctx.beginPath();
-      ctx.fillStyle = o.colors[(i + Math.floor(i / n)) % n];
+      ctx.fillStyle = getCanvasColor(o.colors[(i + Math.floor(i / n)) % n]);
       if (o.type == 'dots') {
         ctx.arc(x + r, y + r, r, 0, Math.PI * 2);
       } else {
@@ -30288,8 +31521,8 @@
     var w;
     for (var i=0, x=0; i<o.widths.length; i++) {
       w = o.widths[i] * res;
-      ctx.fillStyle = o.colors[i];
-      ctx.fillRect(x, 0, x + w, h);
+      ctx.fillStyle = getCanvasColor(o.colors[i]);
+      ctx.fillRect(x, 0, w, h);
       x += w;
     }
   }
@@ -30941,27 +32174,66 @@
     return iter;
   }
 
+  // Same multiplier as ctx.lineWidth. Retina canvases are pixRatio times the
+  // CSS pixel; preview mode multiplies styled strokes by the symbol scale.
+  function getCanvasStrokeScale(pixRatio, lineScale) {
+    return (pixRatio > 1 ? pixRatio : 1) * (lineScale || 1);
+  }
+
+  // Scale a stroke-dasharray into canvas pixels. Scale 1 returns the authored
+  // tokens, so a 100% preview and a non-preview view keep the pattern as stored.
+  function scaleCanvasLineDash(lineDash, scale) {
+    var parts = String(lineDash).split(' ');
+    var out, i;
+    if (!(scale > 0) || scale === 1) return parts;
+    out = new Array(parts.length);
+    for (i = 0; i < parts.length; i++) {
+      out[i] = +parts[i] * scale;
+    }
+    return out;
+  }
+
+  // Where a fill pattern's origin sits, in canvas pixels. In preview that is
+  // the top-left of the page; otherwise the geographic origin, so a pan (which
+  // only changes the translation) carries the pattern with the shapes.
+  function getPatternAnchor(ext) {
+    var t = ext.getTransform(GUI.getPixelRatio());
+    var frame = ext.getFrameData();
+    if (frame && frame.bbox) {
+      return {
+        x: frame.bbox[0] * t.mx + t.bx,
+        y: frame.bbox[3] * t.my + t.by
+      };
+    }
+    return {x: t.bx, y: t.by};
+  }
+
   function getPathStart(ext, lineScale) {
     var pixRatio = GUI.getPixelRatio();
     if (!lineScale) lineScale = 1;
+    // Same factor as lineWidth, so dash length and gap stay in proportion to
+    // the stroke. In preview that factor includes the symbol scale; without it
+    // the pattern stays a fixed screen size while the line grows.
+    var strokeScale = getCanvasStrokeScale(pixRatio, lineScale);
+    // The symbol scale itself, not lineScale: lineScale adds a bump to widen
+    // hover outlines, which a fill has no reason to follow.
+    var patternScale = ext.getSymbolScale() || 1;
+    // Page corner in preview, so the pattern is fixed to the page the way the
+    // exported SVG is. With no frame, the geographic origin, which is enough
+    // for panning: the pattern is not scaled by the geographic zoom then.
+    var patternAnchor = getPatternAnchor(ext);
     return function(ctx, style) {
       var strokeWidth;
       ctx.beginPath();
       if (style.strokeWidth > 0) {
         strokeWidth = style.strokeWidth;
-        if (pixRatio > 1) {
-          // bump up thin lines on retina, but not to more than 1px
-          // (tests on Chrome showed much faster rendering of 1px lines)
-          // strokeWidth = strokeWidth < 1 ? 1 : strokeWidth * pixRatio;
-          strokeWidth = strokeWidth * pixRatio;
-        }
         ctx.lineCap = style.lineCap || 'round';
         ctx.lineJoin = style.lineJoin || 'round';
-        ctx.lineWidth = strokeWidth * lineScale;
+        ctx.lineWidth = strokeWidth * strokeScale;
         ctx.strokeStyle = style.strokeColor;
         if (style.lineDash){
           ctx.lineCap = 'butt';
-          ctx.setLineDash(style.lineDash.split(' '));
+          ctx.setLineDash(scaleCanvasLineDash(style.lineDash, strokeScale));
         }
         if (style.miterLimit) {
           ctx.miterLimit = style.miterLimit;
@@ -30969,7 +32241,7 @@
       }
 
       if (style.fillPattern) {
-        ctx.fillStyle = getCanvasFillPattern(style);
+        ctx.fillStyle = getCanvasFillPattern(style, patternScale, patternAnchor);
       } else if (style.fillColor) {
         ctx.fillStyle = style.fillColor;
       }
@@ -31008,20 +32280,28 @@
     return internal.svg.getTransform(p, scale);
   }
 
-  function repositionFurniture(container, layer, ext) {
-    var g = El.findAll('.mapshaper-svg-furniture', container)[0];
-    g.setAttribute('transform', getSvgFurnitureTransform(ext));
+  function repositionFurniture(container, ext) {
+    if (!ext.getFrameData()) return;
+    El.findAll('.mapshaper-svg-furniture', container).forEach(function(g) {
+      g.setAttribute('transform', getSvgFurnitureTransform(ext));
+    });
   }
 
+  // Returns an SVG string, or '' if the furniture can't be drawn in the current
+  // frame (e.g. the map is unprojected). The scalebar panel explains why.
   function renderFurniture(lyr, ext) {
-    var frame = ext.getFrameData(); // frame should be set if we're rendering a furniture layer
-    var obj = internal.getEmptyLayerForSVG(lyr, {});
-    if (!frame) {
-      stop$1('Missing map frame data');
-    }
+    var frame = ext.getFrameData();
+    var obj;
+    if (internal.getFurnitureFrameProblem(frame)) return '';
+    obj = internal.getEmptyLayerForSVG(lyr, {});
     obj.properties.transform = getSvgFurnitureTransform(ext);
     obj.properties.class = 'mapshaper-svg-furniture';
-    obj.children = internal.renderFurnitureLayer(lyr, frame);
+    try {
+      obj.children = internal.renderFurnitureLayer(lyr, frame);
+    } catch(e) {
+      console.error(e);
+      return '';
+    }
     return internal.svg.stringify(obj);
   }
 
@@ -31063,8 +32343,6 @@
       resize(ext);
       if (type == 'label' || type == 'symbol') {
         html = renderSymbols(lyr.gui.displayLayer, ext, id);
-      } else if (type == 'furniture') {
-        html = renderFurniture(lyr.gui.displayLayer, ext);
       }
       g.innerHTML = html;
       if (type == 'label' || type == 'symbol') {
@@ -31078,6 +32356,26 @@
       }
     };
 
+    // Furniture layers are dataset layers (they have no display layer)
+    el.drawFurniture = function(layers) {
+      el.clear();
+      resize(ext);
+      layers.forEach(function(lyr) {
+        var html = renderFurniture(lyr, ext);
+        var g;
+        if (!html) return;
+        g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+        g.setAttribute('class', 'mapshaper-svg-layer mapshaper-furniture-layer');
+        g.innerHTML = html;
+        svg.append(g);
+      });
+    };
+
+    el.repositionFurniture = function() {
+      resize(ext);
+      repositionFurniture(svg, ext);
+    };
+
     function reposition(lyr, type, ext) {
       var container = el.findChild('.' + lyr.gui.svg_id);
       if (!container || !container.node()) {
@@ -31091,8 +32389,6 @@
         // a symbol group's transform absorbs panning, and zooming too when a
         // frame is defined; anything it can't absorb needs the baselines rebuilt
         updateLabelPaths(container.node(), lyr.gui.displayLayer, ext);
-      } else if (type == 'furniture') {
-        repositionFurniture(container.node(), lyr.gui.displayLayer, ext);
       } else {
         // container.getElementsByTagName('text')
         error('Unsupported symbol type:', type);
@@ -31248,19 +32544,14 @@
       });
     };
 
+    // Furniture is sized in frame pixels, so panning and zooming only need to
+    // update its transform; its content changes only with a full redraw.
     this.drawFurnitureLayers = function(layers, action) {
-      // re-render if action == 'nav', because scalebars get resized
-      var noRedraw = action == 'hover';
-      if (!noRedraw) {
-        _furniture.clear();
+      if (action == 'nav' || action == 'hover') {
+        _furniture.repositionFurniture();
+      } else {
+        _furniture.drawFurniture(layers);
       }
-      layers.forEach(function(lyr) {
-        if (noRedraw) {
-          _furniture.reposition(lyr, 'furniture');
-        } else {
-          _furniture.drawLayer(lyr, 'furniture');
-        }
-      });
     };
 
     // kludge: skip rendering base layers if hovering, except on first hover
@@ -33111,7 +34402,7 @@
 
     function isFrameMapLayer(lyr) {
       var dataset = lyr && lyr.gui && lyr.gui.source && lyr.gui.source.dataset;
-      return !!dataset && internal.isFrameLayer(lyr, dataset.arcs);
+      return !!dataset && internal.isFrameComponentLayer(lyr, dataset);
     }
 
     function getDrawableContentLayers() {
@@ -33121,11 +34412,18 @@
       });
     }
 
-    function getDrawableFurnitureLayers(layers) {
-      if (!isPreviewView()) return [];
-      return getVisibleMapLayers().filter(function(o) {
-        return internal.isFurnitureLayer(o);
+    // The active frame's furniture, plus any visible standalone furniture layers
+    // (e.g. from -scalebar run before a frame was created)
+    function getDrawableFurnitureLayers() {
+      var frame = isPreviewView() ? internal.getActiveFrame(model) : null;
+      if (!frame) return [];
+      var layers = internal.getFrameFurnitureLayers(frame.dataset);
+      getVisibleMapLayers().forEach(function(lyr) {
+        if (internal.layerIsFurniture(lyr) && !layers.includes(lyr) && !lyr.hidden) {
+          layers.push(lyr);
+        }
       });
+      return layers;
     }
 
     function updateLayerStyles(layers) {
@@ -33177,7 +34475,6 @@
       var layersMayHaveChanged = action != 'nav'; // !action;
       var fullBounds;
       var contentLayers = getDrawableContentLayers();
-      // var furnitureLayers = getDrawableFurnitureLayers();
       if (!(_ext.width() > 0 && _ext.height() > 0)) {
         // TODO: track down source of these errors
         console.error("Collapsed map container, unable to draw.");
@@ -33218,8 +34515,7 @@
       }
       _renderer.drawOverlayLayers(_overlayLayers, action);
 
-      // TODO: draw furniture
-      // _renderer.drawFurnitureLayers(furnitureLayers, action);
+      _renderer.drawFurnitureLayers(getDrawableFurnitureLayers(), action);
       // The action says how much was redrawn, which a listener rebuilding its own
       // DOM overlays needs: a 'hover' draw leaves the SVG markup and its
       // transforms alone, so anything anchored to them is still good.
@@ -33808,10 +35104,7 @@
         return;
       }
       if (!getSourceLayer()) {
-        showPopupAlert(
-          'Add one or more layers before creating a map frame.',
-          'Map frame'
-        );
+        showPopupAlert(getNoSourceMessage(), 'Map frame');
         return;
       }
       var popup = showPopupAlert('', 'Add map frame', {classname: 'frame-create-box'});
@@ -33956,7 +35249,7 @@
     function createFromVisibleLayers(width, aspect, margin) {
       var entries = getCompositionEntries();
       if (!entries.length) {
-        showPopupAlert('No visible geographic layers are available.', 'Map frame');
+        showPopupAlert(getNoSourceMessage(), 'Map frame');
         return;
       }
       var ids = entries.map(function(o) {
@@ -33979,6 +35272,15 @@
       });
     }
 
+    function getNoSourceMessage() {
+      var active = gui.model.getActiveLayer();
+      if (active && active.layer && !internal.layerHasGeometry(active.layer)) {
+        return 'A map frame is fitted to layers with shapes, and this layer ' +
+          'contains only attribute data. Select or show a map layer to create a frame.';
+      }
+      return 'Add one or more layers before creating a map frame.';
+    }
+
     function getFrameTarget() {
       return internal.getActiveFrame(gui.model);
     }
@@ -33998,10 +35300,11 @@
       return entries.length ? entries[0].layer : null;
     }
 
+    // A frame is fitted to shapes, so a data-only layer on show doesn't count
     function getCompositionEntries() {
       var layers = gui.map.getCompositionLayers();
       return gui.model.getLayers().filter(function(o) {
-        return layers.includes(o.layer);
+        return layers.includes(o.layer) && internal.layerHasGeometry(o.layer);
       });
     }
 
@@ -34038,16 +35341,6 @@
       .text(label).on('click', action);
   }
 
-  // The "?" the rest of the app uses for field help (see .tip-button in
-  // elements.css and the static ones in index.html). The bubble is white-space:
-  // pre, so the line breaks in the text are the ones it gets.
-  function makeFieldTip(parent, text) {
-    var btn = El('div').addClass('tip-button').appendTo(parent).text('?');
-    var anchor = El('div').addClass('tip-anchor').appendTo(btn);
-    El('div').addClass('tip').appendTo(anchor).text(text);
-    return btn;
-  }
-
   function getUnitFactor$1(units) {
     return units == 'in' ? 72 : units == 'cm' ? 28.3465 : 1;
   }
@@ -34067,7 +35360,7 @@
   function FrameProperties(gui) {
     var target, form, widthInput, heightInput, unitsSelect, aspectValue;
     var backgroundControl, neatlineControl, neatlineWidthInput;
-    var boundsValue, crsValue;
+    var boundsValue, crsValue, scalebarButton;
 
     gui.frameProperties = this;
 
@@ -34139,6 +35432,14 @@
         .appendTo(appearance);
       makeActionButton(clearRow, 'Clear appearance', clearFrameStyle);
 
+      var elements = makePanelSection(form, 'Map elements');
+      var elementsRow = El('div')
+        .addClass('label-style-row label-panel-button-row')
+        .appendTo(elements);
+      scalebarButton = makeActionButton(elementsRow, '', function() {
+        if (gui.scalebarProperties) gui.scalebarProperties.open(target);
+      }).addClass('frame-scalebar-btn');
+
       var details = makePanelSection(form, 'Details');
       boundsValue = makeReadOnlyRow(details, 'Bounds');
       crsValue = makeReadOnlyRow(details, 'CRS');
@@ -34156,11 +35457,13 @@
       unitsSelect.node().value = units;
       aspectValue.text(getAspectText(frame));
       backgroundControl.showColor(rec.fill || '');
-      backgroundControl.opacity.node().value = formatOpacity(rec['fill-opacity'], rec.fill);
+      backgroundControl.opacity.node().value = formatColorOpacityPct(rec['fill-opacity'], !!rec.fill);
       neatlineControl.showColor(rec.stroke || '');
-      neatlineControl.opacity.node().value = formatOpacity(rec['stroke-opacity'], rec.stroke);
+      neatlineControl.opacity.node().value = formatColorOpacityPct(rec['stroke-opacity'], !!rec.stroke);
       neatlineWidthInput.node().value =
         rec['stroke-width'] === undefined ? '' : rec['stroke-width'];
+      scalebarButton.text(internal.findFrameFurnitureLayer(target.dataset, 'scalebar') ?
+        'Edit scale bar' : 'Add scale bar');
       boundsValue.text(frame.bbox.map(formatCoordinate).join(', '));
       crsValue.text(info.proj4 || '[unknown]');
     }
@@ -34284,15 +35587,6 @@
     return String(Number(value.toPrecision(12)));
   }
 
-  // A colour with no opacity of its own is drawn opaque, and says so; with no
-  // colour either, there is nothing for an opacity to apply to.
-  function formatOpacity(value, color) {
-    if (value === undefined || value === null || value === '') {
-      return color ? '100%' : '';
-    }
-    return String(Math.round(Number(value) * 100)) + '%';
-  }
-
   // A fixed ratio holds when the frame is rescaled; one taken from the extent
   // changes whenever the extent does. That difference is the reason to show the
   // ratio at all, so it is said rather than implied.
@@ -34306,6 +35600,434 @@
     return formatFrameAspectRatio(ratio) + ' (from extent)';
   }
 
+  // Record fields of a scalebar, in the order they are written as options
+  var scalebarOptions = ['units', 'style', 'position', 'label_position',
+    'font_size', 'font_family', 'font_style', 'font_weight', 'color', 'bar_width',
+    'tic_length', 'label_offset', 'margin'];
+
+  // Returns a -scalebar command that recreates a scalebar with the given
+  // settings (a scalebar data record, with any edits applied). -scalebar
+  // replaces the frame's scalebar, so every setting has to be written.
+  function getScalebarCommand(settings) {
+    var parts = ['-scalebar'];
+    var d = settings || {};
+    if (isSet(d.label)) {
+      parts.push(quoteCommandValue(d.label));
+    }
+    scalebarOptions.forEach(function(k) {
+      if (isSet(d[k])) {
+        parts.push(k.replace(/_/g, '-') + '=' + formatValue$1(d[k]));
+      }
+    });
+    if (d.dual_units) {
+      parts.push('dual-units');
+    }
+    return parts.join(' ');
+  }
+
+  function isSet(val) {
+    return val !== undefined && val !== null && val !== '';
+  }
+
+  function formatValue$1(val) {
+    var str = String(val);
+    return /^[\w.#-]+$/.test(str) ? str : quoteCommandValue(str);
+  }
+
+  var positionOptions = [
+    ['top-left', 'Top left'],
+    ['top-right', 'Top right'],
+    ['bottom-left', 'Bottom left'],
+    ['bottom-right', 'Bottom right']
+  ];
+
+  // What the scalebar is drawn in when it has no color of its own
+  var defaultColor = '#000000';
+
+  // Settings of the frame's scalebar. Every edit sends a complete -scalebar
+  // command, which replaces the scalebar, so edits are undoable and replayable
+  // like any other command.
+  function ScalebarProperties(gui) {
+    var popup, form, note;
+    var labelInput, unitsSelect, styleSelect, dualUnitsBox, positionSelect,
+      labelPositionSelect, fontSizeInput, barWidthInput, marginInput,
+      fontSelect, fontStyleSelect, colorChit, colorInput, colorPicker;
+
+    gui.scalebarProperties = this;
+
+    // The panel doesn't block the map, so anything can change the scalebar or
+    // the frame while it is open: an undo, a frame edit, a console command.
+    gui.model.on('update', function(e) {
+      var flags = e.flags || {};
+      if (!popup || flags.simplify_amount || flags.redraw_only) return;
+      if (getScalebarRecord()) {
+        updateControls();
+      } else {
+        closePanel();
+      }
+    });
+
+    // Adds a scalebar to the frame if it doesn't have one
+    this.open = function(frameTarget) {
+      var frame = frameTarget || internal.getActiveFrame(gui.model);
+      if (!frame) return;
+      if (getScalebarRecord()) {
+        showPanel();
+      } else {
+        runCommand('-scalebar', 'Add scale bar', showPanel);
+      }
+    };
+
+    this.isOpen = function() {
+      return !!popup;
+    };
+
+    // The map stays live, so the panel is placed where it is least likely to
+    // hide the scalebar: at the top of the map, on the side away from it
+    function showPanel() {
+      var d = getScalebarRecord();
+      if (!d) return;
+      closePanel();
+      popup = showPopupAlert('', 'Scale bar', {
+        non_blocking: true,
+        classname: 'scalebar-properties-box'
+      });
+      popup.onClose(function() {
+        popup = form = null;
+      });
+      popup.container().addClass('scalebar-properties-popup');
+      form = El('div')
+        .addClass('label-style-panel scalebar-properties-form')
+        .appendTo(popup.container());
+      initForm();
+      updateControls();
+      placePanel(/right/.test(d.position || '') ? 'left' : 'right');
+    }
+
+    function closePanel() {
+      if (popup) popup.close();
+    }
+
+    function placePanel(side) {
+      var box = popup.container().node().parentNode;
+      var map = gui.container.findChild('.map-layers').node().getBoundingClientRect();
+      // clears the zoom buttons on the right edge of the map
+      var rightInset = 58;
+      var leftInset = 16;
+      box.style.position = 'absolute';
+      box.style.marginTop = '0';
+      box.style.top = Math.round(map.top + 12) + 'px';
+      if (side == 'left') {
+        box.style.left = Math.round(map.left + leftInset) + 'px';
+      } else {
+        box.style.right = Math.round(window.innerWidth - map.right + rightInset) + 'px';
+      }
+    }
+
+    function initForm() {
+      var row;
+      note = El('div').addClass('scalebar-properties-note').appendTo(form).hide();
+
+      row = makeRow(form);
+      labelInput = makeInput(makeCell(row, 'Distance'), 'scalebar-label-input')
+        .attr('placeholder', 'Automatic')
+        .on('change', function() {
+          update({label: labelInput.node().value.trim()});
+        });
+      unitsSelect = makeSelect(makeCell(row, 'Units'), 'scalebar-units-select',
+        [['miles', 'Miles'], ['km', 'Kilometers']])
+        .on('change', function() {
+          var changes = {units: unitsSelect.node().value};
+          var bare = getBareDistance(getScalebarRecord().label);
+          if (bare) changes.label = bare;
+          update(changes);
+        });
+
+      row = makeRow(form);
+      styleSelect = makeSelect(makeCell(row, 'Style'), 'scalebar-style-select',
+        [['a', 'Bar'], ['b', 'Ticks']])
+        .on('change', function() {
+          update({style: styleSelect.node().value});
+        });
+      dualUnitsBox = makeCheckbox(row, 'Metric + imperial', 'scalebar-dual-units')
+        .on('change', function() {
+          update({dual_units: dualUnitsBox.node().checked});
+        });
+
+      row = makeRow(form);
+      positionSelect = makeSelect(makeCell(row, 'Position'), 'scalebar-position-select',
+        positionOptions)
+        .on('change', function() {
+          update({position: positionSelect.node().value});
+        });
+      labelPositionSelect = makeSelect(makeCell(row, 'Labels'),
+        'scalebar-label-position-select', [['top', 'Above'], ['bottom', 'Below']])
+        .on('change', function() {
+          update({label_position: labelPositionSelect.node().value});
+        });
+
+      var appearance = makePanelSection(form, 'Appearance');
+
+      // Font and face menus, as in the label panel
+      row = makeRow(appearance);
+      fontSelect = El('select').attr('title', 'Font').addClass('scalebar-font-select')
+        .appendTo(makeCell(row, 'Font'))
+        .on('change', function() {
+          if (fontSelect.node().value) applyFont(fontSelect.node().value);
+        });
+      renderFontOptions();
+      fontStyleSelect = El('select').attr('title', 'Font style')
+        .addClass('scalebar-font-style-select')
+        .appendTo(makeCell(row, 'Font style'))
+        .on('change', function() {
+          if (fontStyleSelect.node().value) applyFontStyle(fontStyleSelect.node().value);
+        });
+
+      // The picker lines up with the right edge of its parent, so the row is its
+      // parent rather than the narrow color cell
+      row = makeRow(appearance);
+      var colorCell = El('div').addClass('frame-input-cell scalebar-color-cell').appendTo(row);
+      El('span').appendTo(colorCell).text('Color');
+      colorChit = El('div').addClass('label-color-chit').attr('role', 'button')
+        .on('click', function() { colorPicker.toggle(); });
+      colorInput = El('input').attr('type', 'text').attr('title', 'Scale bar color')
+        .on('change', function() {
+          var color = colorInput.node().value.trim();
+          if (!color) {
+            updateControls();
+            return;
+          }
+          if (isHexColor(color)) colorPicker.setColor(color);
+          update({color: color});
+        });
+      makeColorField(colorCell, colorChit, colorInput);
+      colorPicker = new ColorPicker(row, {
+        onPreview: showColor,
+        onChange: function(hex) {
+          showColor(hex);
+          update({color: hex});
+        }
+      });
+      fontSizeInput = makeNumberInput(makeCell(row, 'Font size'), 'font_size',
+        'scalebar-font-size');
+
+      row = makeRow(appearance);
+      barWidthInput = makeNumberInput(makeCell(row, 'Bar width'), 'bar_width',
+        'scalebar-bar-width');
+      marginInput = makeNumberInput(makeCell(row, 'Inset'), 'margin',
+        'scalebar-margin')
+        .attr('title', 'Distance from the edges of the frame, in pixels');
+
+      row = El('div').addClass('label-style-row label-panel-button-row').appendTo(form);
+      makePanelActionButton(row, 'Remove scale bar', function() {
+        runCommand('-scalebar remove', 'Remove scale bar', function() {
+          if (popup) popup.close();
+        });
+      });
+    }
+
+    function updateControls() {
+      var d = getScalebarRecord();
+      var problem;
+      if (!d || !form) return;
+      labelInput.node().value = d.label || '';
+      setSelectValue(unitsSelect, getUnitsMenuValue(d.units ||
+        internal.parseScalebarUnits(d.label || '')));
+      setSelectValue(styleSelect, d.style == 'b' || d.style == 'B' ||
+        !d.style && d.dual_units ? 'b' : 'a');
+      dualUnitsBox.node().checked = !!d.dual_units;
+      setSelectValue(positionSelect, d.position || 'top-left');
+      setSelectValue(labelPositionSelect, d.label_position || 'top');
+      fontSizeInput.node().value = formatValue(d.font_size);
+      barWidthInput.node().value = formatValue(d.bar_width);
+      marginInput.node().value = formatValue(d.margin);
+      updateFontControls(d);
+      showColor(d.color || defaultColor);
+      if (isHexColor(d.color || defaultColor)) colorPicker.setColor(d.color || defaultColor);
+      problem = getFrameProblem();
+      note.text(problem ? 'The scale bar is hidden: ' + problem + '.' : '');
+      if (problem) note.show(); else note.hide();
+    }
+
+    function showColor(color) {
+      colorInput.node().value = color || '';
+      colorChit.css('background-color', color || 'transparent');
+    }
+
+    function renderFontOptions() {
+      getInstalledFonts().forEach(function(group) {
+        var optgroup = El('optgroup').attr('label', group.name).appendTo(fontSelect);
+        group.fonts.forEach(function(fontName) {
+          El('option').attr('value', fontName).appendTo(optgroup).text(fontName);
+        });
+      });
+    }
+
+    // A scalebar with no font of its own is shown in the font it is drawn in
+    function getShownFont(d) {
+      return d.font_family || getDefaultFontName();
+    }
+
+    function updateFontControls(d) {
+      var font = getShownFont(d);
+      var shown = font ? getNearestFontStyleVariant(font, d.font_style, d.font_weight) : null;
+      if (font) {
+        setSelectValue(fontSelect, font);
+      } else {
+        fontSelect.node().selectedIndex = -1;
+      }
+      fontStyleSelect.empty();
+      getFontStyleVariants(font).forEach(function(variant) {
+        El('option').attr('value', variant.value).appendTo(fontStyleSelect).text(variant.label);
+      });
+      fontStyleSelect.node().disabled = !font;
+      if (shown) {
+        fontStyleSelect.node().value = shown.value;
+      } else {
+        fontStyleSelect.node().selectedIndex = -1;
+      }
+    }
+
+    // Keeps the current face, or the nearest one the new font has
+    function applyFont(fontName) {
+      var d = getScalebarRecord();
+      var changes = {font_family: fontName};
+      var variant = getNearestFontStyleVariant(fontName, d.font_style, d.font_weight);
+      if (variant) Object.assign(changes, getFontStyleValues(variant));
+      update(changes);
+    }
+
+    // A face belongs to a font, so a scalebar given one names the font it is
+    // drawn in
+    function applyFontStyle(value) {
+      var parts = value.split('|');
+      var changes = getFontStyleValues({style: parts[0], weight: parts[1]});
+      var d = getScalebarRecord();
+      if (!d.font_family && getDefaultFontName()) {
+        changes.font_family = getDefaultFontName();
+      }
+      update(changes);
+    }
+
+    // Regular is stored as no face at all
+    function getFontStyleValues(variant) {
+      if (variantIsRegular(variant)) {
+        return {font_style: '', font_weight: ''};
+      }
+      return {font_style: variant.style, font_weight: variant.weight};
+    }
+
+    // Applies edits to the current settings and replaces the scalebar. The
+    // units menu always applies, so it is written even when it shows the default.
+    function update(changes) {
+      var d = Object.assign({}, getScalebarRecord(), changes);
+      if (changes.style == 'a') d.dual_units = false;
+      if (changes.dual_units) d.style = 'b';
+      if (!d.units) d.units = unitsSelect.node().value;
+      runCommand(getScalebarCommand(d), 'Update scale bar', updateControls);
+    }
+
+    function makeNumberInput(cell, field, className) {
+      var input = makeInput(cell, className).attr('placeholder', 'auto');
+      input.on('change', function() {
+        var str = input.node().value.trim();
+        var o = {};
+        if (str !== '' && !(Number(str) >= 0)) {
+          updateControls();
+          return;
+        }
+        o[field] = str === '' ? '' : Number(str);
+        update(o);
+      });
+      return input;
+    }
+
+    function getFrameProblem() {
+      var frame = internal.getActiveFrame(gui.model);
+      var crs, data;
+      if (!frame) return 'there is no map frame';
+      crs = frame.layer.gui && frame.layer.gui.dynamic_crs ||
+        internal.getDatasetCRS(frame.dataset);
+      data = internal.getFrameLayerData(frame.layer, frame.dataset.arcs, crs);
+      return internal.getFurnitureFrameProblem(data);
+    }
+
+    function getScalebarRecord() {
+      var frame = internal.getActiveFrame(gui.model);
+      var lyr = frame && internal.findFrameFurnitureLayer(frame.dataset, 'scalebar');
+      return lyr ? lyr.data.getReadOnlyRecordAt(0) : null;
+    }
+
+    function runCommand(cmd, title, done) {
+      runGuiEditCommand(gui, cmd, {
+        title: title,
+        onSuccess: done,
+        onError: updateControls
+      });
+    }
+  }
+
+  function makeRow(parent, className) {
+    return El('div').addClass('label-style-row scalebar-row')
+      .addClass(className || 'scalebar-two-col').appendTo(parent);
+  }
+
+  function makeCell(row, label) {
+    var cell = El('label').addClass('frame-input-cell').appendTo(row);
+    El('span').appendTo(cell).text(label);
+    return cell;
+  }
+
+  function makeInput(parent, className) {
+    return El('input').attr('type', 'text').addClass(className).appendTo(parent);
+  }
+
+  function makeSelect(parent, className, options) {
+    var select = El('select').addClass(className).appendTo(parent);
+    options.forEach(function(o) {
+      El('option').attr('value', o[0]).appendTo(select).text(o[1]);
+    });
+    return select;
+  }
+
+  function makeCheckbox(parent, label, className) {
+    var box = El('input').attr('type', 'checkbox').addClass(className);
+    var wrapper = El('label').addClass('scalebar-checkbox').appendTo(parent);
+    box.appendTo(wrapper);
+    El('span').appendTo(wrapper).text(label);
+    return box;
+  }
+
+  // Shows a value that came from the command line even if the menu lacks it
+  function setSelectValue(select, value) {
+    var node = select.node();
+    var found = Array.prototype.some.call(node.options, function(o) {
+      return o.value == value;
+    });
+    if (!found) {
+      El('option').attr('value', value).appendTo(select).text(value);
+    }
+    node.value = value;
+  }
+
+  // The number of a single-distance label, e.g. "100" from "100 km", so the
+  // units menu can apply to it
+  function getBareDistance(label) {
+    var match = /^([\d\s.,/]*\d)\s*[^\d\s.,/]+$/.exec(String(label || '').trim());
+    return match ? match[1].trim() : '';
+  }
+
+  function getUnitsMenuValue(units) {
+    var parsed = internal.parseLabelUnits(units);
+    return parsed == 'mile' || !parsed ? 'miles' :
+      parsed == 'm' ? 'meters' :
+      parsed == 'ft' ? 'feet' : 'km';
+  }
+
+  function formatValue(val) {
+    return val === undefined || val === null ? '' : String(val);
+  }
+
   // This is a new way to handle compatibility problems between
   // interactive editing modes and other interface modes
   // (by default, interactive modes stay on when, e.g., the user clicks
@@ -35108,6 +36830,7 @@
     new PreviewMode(gui);
     new FrameResizeTool(gui);
     new FrameProperties(gui);
+    new ScalebarProperties(gui);
     gui.editToolbar = new EditToolbar(gui);
     gui.labelTool = new LabelTool(gui);
     gui.layerStyleTool = new LayerStyleTool(gui);