From f11e6c7898537d368e7fc77df35dea668bb636c6 Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Wed, 1 Aug 2018 12:39:25 -0700
Subject: [PATCH 1/5] Introduce "format" expression. Returns "formatted" type
 with formatting annotations applied to subsections. "text-field" now accepts
 formatted text, allowing symbols to use multiple fonts within the same label.

---
 build/generate-flow-typed-style-spec.js       |   2 +
 build/generate-style-code.js                  |   6 +-
 docs/components/expression-metadata.js        |   8 +
 docs/pages/style-spec.js                      |  16 ++
 src/data/bucket/symbol_bucket.js              |  35 ++-
 src/source/rtl_text_plugin.js                 |   2 +
 src/source/worker.js                          |   4 +-
 .../expression/definitions/formatted.js       | 145 +++++++++++
 .../expression/definitions/index.js           |   4 +-
 .../expression/definitions/literal.js         |   4 +
 src/style-spec/expression/types.js            |   6 +-
 src/style-spec/reference/v8.json              |  15 +-
 src/style-spec/types.js                       |   5 +-
 src/style-spec/validate/validate.js           |  10 +-
 src/style-spec/validate/validate_formatted.js |  11 +
 .../background_style_layer_properties.js      |   2 +
 .../circle_style_layer_properties.js          |   2 +
 .../fill_extrusion_style_layer_properties.js  |   2 +
 .../fill_style_layer_properties.js            |   2 +
 .../heatmap_style_layer_properties.js         |   2 +
 .../hillshade_style_layer_properties.js       |   2 +
 src/style/style_layer/layer_properties.js.ejs |   2 +
 .../line_style_layer_properties.js            |   2 +
 .../raster_style_layer_properties.js          |   2 +
 .../symbol_style_layer_properties.js          |   4 +-
 src/symbol/mergelines.js                      |   3 +-
 src/symbol/quads.js                           |  16 +-
 src/symbol/shaping.js                         | 226 ++++++++++++++----
 src/symbol/symbol_layout.js                   |  19 +-
 src/symbol/transform_text.js                  |  16 +-
 test/expected/text-shaping-default.json       |  22 +-
 test/expected/text-shaping-linebreak.json     |  40 +++-
 test/expected/text-shaping-newline.json       |  40 +++-
 .../text-shaping-newlines-in-middle.json      |  40 +++-
 test/expected/text-shaping-null.json          |  10 +-
 test/expected/text-shaping-spacing.json       |  22 +-
 .../formatted/basic/test.json                 |  80 +++++++
 .../formatted/to-string/test.json             |  42 ++++
 .../text-field/formatted-line/expected.png    | Bin 0 -> 30757 bytes
 .../text-field/formatted-line/style.json      |  56 +++++
 .../text-field/formatted/expected.png         | Bin 0 -> 4867 bytes
 .../text-field/formatted/style.json           |  53 ++++
 test/unit/style-spec/spec.test.js             |   3 +-
 test/unit/symbol/shaping.test.js              |  27 +--
 44 files changed, 862 insertions(+), 148 deletions(-)
 create mode 100644 src/style-spec/expression/definitions/formatted.js
 create mode 100644 src/style-spec/validate/validate_formatted.js
 create mode 100644 test/integration/expression-tests/formatted/basic/test.json
 create mode 100644 test/integration/expression-tests/formatted/to-string/test.json
 create mode 100644 test/integration/render-tests/text-field/formatted-line/expected.png
 create mode 100644 test/integration/render-tests/text-field/formatted-line/style.json
 create mode 100644 test/integration/render-tests/text-field/formatted/expected.png
 create mode 100644 test/integration/render-tests/text-field/formatted/style.json

diff --git a/build/generate-flow-typed-style-spec.js b/build/generate-flow-typed-style-spec.js
index f704771114a..59569593ff8 100644
--- a/build/generate-flow-typed-style-spec.js
+++ b/build/generate-flow-typed-style-spec.js
@@ -118,6 +118,8 @@ fs.writeFileSync('src/style-spec/types.js', `// @flow
 
 export type ColorSpecification = string;
 
+export type FormattedSpecification = string;
+
 export type FilterSpecification =
     | ['has', string]
     | ['!has', string]
diff --git a/build/generate-style-code.js b/build/generate-style-code.js
index 8fa49c1bb21..70e7b852b2b 100644
--- a/build/generate-style-code.js
+++ b/build/generate-style-code.js
@@ -5,6 +5,7 @@ const fs = require('fs');
 const ejs = require('ejs');
 const spec = require('../src/style-spec/reference/v8');
 const Color = require('../src/style-spec/util/color');
+const {Formatted} = require('../src/style-spec/expression/definitions/formatted');
 
 global.camelize = function (str) {
     return str.replace(/(?:^|-)(.)/g, function (_, x) {
@@ -24,6 +25,8 @@ global.flowType = function (property) {
             return Object.keys(property.values).map(JSON.stringify).join(' | ');
         case 'color':
             return `Color`;
+        case 'formatted':
+            return `string | Formatted`;
         case 'array':
             if (property.length) {
                 return `[${new Array(property.length).fill(flowType({type: property.value})).join(', ')}]`;
@@ -61,6 +64,8 @@ global.runtimeType = function (property) {
             return 'StringType';
         case 'color':
             return `ColorType`;
+        case 'formatted':
+            return `FormattedType`;
         case 'array':
             if (property.length) {
                 return `array(${runtimeType({type: property.value})}, ${property.length})`;
@@ -131,4 +136,3 @@ const layers = Object.keys(spec.layer.type.values).map((type) => {
 for (const layer of layers) {
     fs.writeFileSync(`src/style/style_layer/${layer.type.replace('-', '_')}_style_layer_properties.js`, propertiesJs(layer))
 }
-
diff --git a/docs/components/expression-metadata.js b/docs/components/expression-metadata.js
index 40928cf52b7..15c8f55741d 100644
--- a/docs/components/expression-metadata.js
+++ b/docs/components/expression-metadata.js
@@ -134,6 +134,14 @@ const types = {
     collator: [{
         type: 'collator',
         parameters: [ '{ "case-sensitive": boolean, "diacritic-sensitive": boolean, "locale": string }' ]
+    }],
+    format: [{
+        type: 'formatted',
+        parameters: [
+            'input_1: string, options_1: { "font-scale": number, "text-font": array<string> }',
+            '...',
+            'input_n: string, options_n: { "font-scale": number, "text-font": array<string> }'
+        ]
     }]
 };
 
diff --git a/docs/pages/style-spec.js b/docs/pages/style-spec.js
index a55e6a056dc..efc2532c968 100644
--- a/docs/pages/style-spec.js
+++ b/docs/pages/style-spec.js
@@ -159,6 +159,9 @@ const navigation = [
             {
                 "title": "String"
             },
+            {
+                "title": "Formatted"
+            },
             {
                 "title": "Boolean"
             },
@@ -948,6 +951,19 @@ export default class extends React.Component {
                                     <p>Especially of note is the support for hsl, which can be <a href='http://mothereffinghsl.com/'>easier to reason about than rgb()</a>.</p>
                                 </div>
 
+                                <div className='pad2 keyline-bottom'>
+                                    <a id='types-formatted' className='anchor'/>
+                                    <h3 className='space-bottom1'><a href='#types-formatted' title='link to formatted'>Formatted</a></h3>
+                                    <p>The <code>formatted</code> type represents a string broken into sections annotated with separate formatting options.</p>
+                                    {highlightJSON(`
+                                        {
+                                            "text-field": ["format",
+                                              "foo", { "font-scale": 1.2 },
+                                              "bar", { "font-scale": 0.8 }
+                                            ]
+                                        }`)}
+                                </div>
+
                                 <div className='pad2 keyline-bottom'>
                                     <a id='types-string' className='anchor'/>
                                     <h3 className='space-bottom1'><a href='#types-string' title='link to string'>String</a></h3>
diff --git a/src/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js
index 8d1cd96ec18..6f85864a84b 100644
--- a/src/data/bucket/symbol_bucket.js
+++ b/src/data/bucket/symbol_bucket.js
@@ -18,6 +18,7 @@ import Anchor from '../../symbol/anchor';
 import { getSizeData } from '../../symbol/symbol_size';
 import { register } from '../../util/web_worker_transfer';
 import EvaluationParameters from '../../style/evaluation_parameters';
+import {Formatted} from '../../style-spec/expression/definitions/formatted';
 
 import type {
     Bucket,
@@ -53,7 +54,7 @@ export type CollisionArrays = {
 };
 
 export type SymbolFeature = {|
-    text: string | void,
+    text: string | Formatted | void,
     icon: string | void,
     index: number,
     sourceLayerIndex: number,
@@ -328,6 +329,18 @@ class SymbolBucket implements Bucket {
         this.lineVertexArray = new SymbolLineVertexArray();
     }
 
+    calculateGlyphDependencies(text: string, stack: {[number]: boolean}, textAlongLine: boolean, doesAllowVerticalWritingMode: boolean) {
+        for (let i = 0; i < text.length; i++) {
+            stack[text.charCodeAt(i)] = true;
+            if (textAlongLine && doesAllowVerticalWritingMode) {
+                const verticalChar = verticalizedCharacterMap[text.charAt(i)];
+                if (verticalChar) {
+                    stack[verticalChar.charCodeAt(0)] = true;
+                }
+            }
+        }
+    }
+
     populate(features: Array<IndexedFeature>, options: PopulateParameters) {
         const layer = this.layers[0];
         const layout = layer.layout;
@@ -336,7 +349,7 @@ class SymbolBucket implements Bucket {
         const textField = layout.get('text-field');
         const iconImage = layout.get('icon-image');
         const hasText =
-            (textField.value.kind !== 'constant' || textField.value.value.length > 0) &&
+            (textField.value.kind !== 'constant' || textField.value.value.toString().length > 0) &&
             (textFont.value.kind !== 'constant' || textFont.value.value.length > 0);
         const hasIcon = iconImage.value.kind !== 'constant' || iconImage.value.value && iconImage.value.value.length > 0;
 
@@ -392,16 +405,18 @@ class SymbolBucket implements Bucket {
                 const fontStack = textFont.evaluate(feature, {}).join(',');
                 const stack = stacks[fontStack] = stacks[fontStack] || {};
                 const textAlongLine = layout.get('text-rotation-alignment') === 'map' && layout.get('symbol-placement') !== 'point';
-                const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text);
-                for (let i = 0; i < text.length; i++) {
-                    stack[text.charCodeAt(i)] = true;
-                    if (textAlongLine && doesAllowVerticalWritingMode) {
-                        const verticalChar = verticalizedCharacterMap[text.charAt(i)];
-                        if (verticalChar) {
-                            stack[verticalChar.charCodeAt(0)] = true;
-                        }
+                if (text instanceof Formatted) {
+                    for (const section of text.sections) {
+                        const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text.toString());
+                        const sectionFont = section.fontStack || fontStack;
+                        const sectionStack = stacks[sectionFont] = stacks[sectionFont] || {};
+                        this.calculateGlyphDependencies(section.text, sectionStack, textAlongLine, doesAllowVerticalWritingMode);
                     }
+                } else {
+                    const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text);
+                    this.calculateGlyphDependencies(text, stack, textAlongLine, doesAllowVerticalWritingMode);
                 }
+
             }
         }
 
diff --git a/src/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js
index 25b2602ee17..db2c711ca4f 100644
--- a/src/source/rtl_text_plugin.js
+++ b/src/source/rtl_text_plugin.js
@@ -54,10 +54,12 @@ export const setRTLTextPlugin = function(url: string, callback: ErrorCallback) {
 export const plugin: {
     applyArabicShaping: ?Function,
     processBidirectionalText: ?(string, Array<number>) => Array<string>,
+    processStyledBidirectionalText: ?(string, Array<number>, Array<number>) => Array<[string, Array<number>]>,
     isLoaded: () => boolean
 } = {
     applyArabicShaping: null,
     processBidirectionalText: null,
+    processStyledBidirectionalText: null,
     isLoaded: function() {
         return foregroundLoadComplete ||       // Foreground: loaded if the completion callback returned successfully
             plugin.applyArabicShaping != null; // Background: loaded if the plugin functions have been compiled
diff --git a/src/source/worker.js b/src/source/worker.js
index 0d73371edc1..98fcb3a7419 100644
--- a/src/source/worker.js
+++ b/src/source/worker.js
@@ -55,12 +55,13 @@ export default class Worker {
             this.workerSourceTypes[name] = WorkerSource;
         };
 
-        this.self.registerRTLTextPlugin = (rtlTextPlugin: {applyArabicShaping: Function, processBidirectionalText: Function}) => {
+        this.self.registerRTLTextPlugin = (rtlTextPlugin: {applyArabicShaping: Function, processBidirectionalText: Function, processStyledBidirectionalText?: Function}) => {
             if (globalRTLTextPlugin.isLoaded()) {
                 throw new Error('RTL text plugin already registered.');
             }
             globalRTLTextPlugin['applyArabicShaping'] = rtlTextPlugin.applyArabicShaping;
             globalRTLTextPlugin['processBidirectionalText'] = rtlTextPlugin.processBidirectionalText;
+            globalRTLTextPlugin['processStyledBidirectionalText'] = rtlTextPlugin.processStyledBidirectionalText;
         };
     }
 
@@ -197,4 +198,3 @@ if (typeof WorkerGlobalScope !== 'undefined' &&
     self instanceof WorkerGlobalScope) {
     new Worker(self);
 }
-
diff --git a/src/style-spec/expression/definitions/formatted.js b/src/style-spec/expression/definitions/formatted.js
new file mode 100644
index 00000000000..b9f5238e51e
--- /dev/null
+++ b/src/style-spec/expression/definitions/formatted.js
@@ -0,0 +1,145 @@
+// @flow
+
+import { NumberType, ValueType, FormattedType } from '../types';
+
+
+import type { Expression } from '../expression';
+import type EvaluationContext from '../evaluation_context';
+import type ParsingContext from '../parsing_context';
+import type { Type } from '../types';
+
+export class FormattedSection {
+    text: string
+    scale: number | null
+    fontStack: string | null
+
+    constructor(text: string, scale: number | null, fontStack: string | null) {
+        this.text = text;
+        this.scale = scale;
+        this.fontStack = fontStack;
+    }
+}
+
+export class Formatted {
+    sections: Array<FormattedSection>
+
+    constructor(sections: Array<FormattedSection>) {
+        this.sections = sections;
+    }
+
+    toString(): string {
+        return this.sections.map(section => section.text).join('');
+    }
+
+    serialize() {
+        const serialized = ["format"];
+        for (const section of this.sections) {
+            serialized.push(section.text);
+            const fontStack = section.fontStack ?
+                ["literal", section.fontStack.split(',')] :
+                null;
+            serialized.push({ "text-font": fontStack, "font-scale": section.scale });
+        }
+        return serialized;
+    }
+}
+
+type FormattedSectionExpression = {
+    text: Expression,
+    scale: Expression | null;
+    font: Expression | null;
+}
+
+export class FormattedExpression implements Expression {
+    type: Type;
+    sections: Array<FormattedSectionExpression>;
+
+    constructor(sections: Array<FormattedSectionExpression>) {
+        this.type = FormattedType;
+        this.sections = sections;
+    }
+
+    static parse(args: Array<mixed>, context: ParsingContext): ?Expression {
+        if (args.length < 3) {
+            return context.error(`Expected at least two arguments.`);
+        }
+
+        if ((args.length - 1) % 2 !== 0) {
+            return context.error(`Expected an even number of arguments.`);
+        }
+
+        const sections: Array<FormattedSectionExpression> = [];
+        for (let i = 1; i < args.length - 1; i += 2) {
+            const text = context.parse(args[i], 1, ValueType);
+            if (!text) return null;
+            const kind = text.type.kind;
+            if (kind !== 'string' && kind !== 'value' && kind !== 'null')
+                return context.error(`Formatted text type must be 'string', 'value', or 'null'.`);
+
+            const options = (args[i + 1]: any);
+            if (typeof options !== "object" || Array.isArray(options))
+                return context.error(`Format options argument must be an object.`);
+
+            let scale = null;
+            if (options['font-scale']) {
+                scale = context.parse(options['font-scale'], 1, NumberType);
+                if (!scale) return null;
+            }
+
+            let font = null;
+            if (options['text-font']) {
+                font = context.parse(options['text-font'], 1, ValueType); // Require array of strings?
+                if (!font) return null;
+            }
+            sections.push({text, scale, font});
+        }
+
+        return new FormattedExpression(sections);
+    }
+
+    evaluate(ctx: EvaluationContext) {
+        return new Formatted(
+            this.sections.map(section =>
+                new FormattedSection(
+                    section.text.evaluate(ctx) || "",
+                    section.scale ? section.scale.evaluate(ctx) : null,
+                    section.font ? section.font.evaluate(ctx).join(',') : null
+                )
+            )
+        );
+    }
+
+    eachChild(fn: (Expression) => void) {
+        for (const section of this.sections) {
+            fn(section.text);
+            if (section.scale) {
+                fn(section.scale);
+            }
+            if (section.font) {
+                fn(section.font);
+            }
+        }
+    }
+
+    possibleOutputs() {
+        // Technically the combinatoric set of all children
+        // Usually, this.text will be undefined anyway
+        return [undefined];
+    }
+
+    serialize() {
+        const serialized = ["format"];
+        for (const section of this.sections) {
+            serialized.push(section.text.serialize());
+            const options = {};
+            if (section.scale) {
+                options['font-scale'] = section.scale.serialize();
+            }
+            if (section.font) {
+                options['text-font'] = section.font.serialize();
+            }
+            serialized.push(options);
+        }
+        return serialized;
+    }
+}
diff --git a/src/style-spec/expression/definitions/index.js b/src/style-spec/expression/definitions/index.js
index b0221082afc..c36001e97db 100644
--- a/src/style-spec/expression/definitions/index.js
+++ b/src/style-spec/expression/definitions/index.js
@@ -26,6 +26,7 @@ import {
     GreaterThanOrEqual
 } from './comparison';
 import { CollatorExpression } from './collator';
+import { Formatted, FormattedExpression } from './formatted';
 import Length from './length';
 
 import type { Type } from '../types';
@@ -46,6 +47,7 @@ const expressions: ExpressionRegistry = {
     'case': Case,
     'coalesce': Coalesce,
     'collator': CollatorExpression,
+    'format': FormattedExpression,
     'interpolate': Interpolate,
     'length': Length,
     'let': Let,
@@ -117,7 +119,7 @@ CompoundExpression.register(expressions, {
                 return '';
             } else if (type === 'string' || type === 'number' || type === 'boolean') {
                 return String(v);
-            } else if (v instanceof Color) {
+            } else if (v instanceof Color || v instanceof Formatted) {
                 return v.toString();
             } else {
                 return JSON.stringify(v);
diff --git a/src/style-spec/expression/definitions/literal.js b/src/style-spec/expression/definitions/literal.js
index d1800400afc..d686aa6e036 100644
--- a/src/style-spec/expression/definitions/literal.js
+++ b/src/style-spec/expression/definitions/literal.js
@@ -2,6 +2,7 @@
 
 import assert from 'assert';
 import { isValue, typeOf, Color } from '../values';
+import { Formatted } from './formatted';
 
 import type { Type } from '../types';
 import type { Value }  from '../values';
@@ -60,6 +61,9 @@ class Literal implements Expression {
             // couldn't actually generate with a "literal" expression,
             // so we have to implement an equivalent serialization here
             return ["rgba"].concat(this.value.toArray());
+        } else if (this.value instanceof Formatted) {
+            // Same as Color
+            return this.value.serialize();
         } else {
             assert(this.value === null ||
                 typeof this.value === 'string' ||
diff --git a/src/style-spec/expression/types.js b/src/style-spec/expression/types.js
index 33324df1636..5a6cd4c2d8d 100644
--- a/src/style-spec/expression/types.js
+++ b/src/style-spec/expression/types.js
@@ -9,6 +9,7 @@ export type ObjectTypeT = { kind: 'object' };
 export type ValueTypeT = { kind: 'value' };
 export type ErrorTypeT = { kind: 'error' };
 export type CollatorTypeT = { kind: 'collator' };
+export type FormattedTypeT = { kind: 'formatted' };
 
 export type Type =
     NullTypeT |
@@ -20,7 +21,8 @@ export type Type =
     ValueTypeT |
     ArrayType | // eslint-disable-line no-use-before-define
     ErrorTypeT |
-    CollatorTypeT
+    CollatorTypeT |
+    FormattedTypeT
 
 export type ArrayType = {
     kind: 'array',
@@ -37,6 +39,7 @@ export const ObjectType = { kind: 'object' };
 export const ValueType = { kind: 'value' };
 export const ErrorType = { kind: 'error' };
 export const CollatorType = { kind: 'collator' };
+export const FormattedType = { kind: 'formatted' };
 
 export function array(itemType: Type, N: ?number): ArrayType {
     return {
@@ -63,6 +66,7 @@ const valueMemberTypes = [
     StringType,
     BooleanType,
     ColorType,
+    FormattedType,
     ObjectType,
     array(ValueType)
 ];
diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
index fd4c24b768c..93750fe70d4 100644
--- a/src/style-spec/reference/v8.json
+++ b/src/style-spec/reference/v8.json
@@ -1505,10 +1505,10 @@
       "property-type": "data-constant"
     },
     "text-field": {
-      "type": "string",
+      "type": "formatted",
       "default": "",
       "tokens": true,
-      "doc": "Value to use for a text label.",
+      "doc": "Value to use for a text label. If a plain `string` is provided, it will be treated as a `formatted` with default/inherited formatting options.",
       "sdk-support": {
         "basic functionality": {
           "js": "0.10.0",
@@ -2505,6 +2505,15 @@
           }
         }
       },
+      "format": {
+        "doc": "Returns `formatted` text containing annotations for use in mixed-format `text-field` entries. If set, the `text-font` argument overrides the font specified by the root layout properties. If set, the `font-scale` argument specifies a scaling factor relative to the `text-size` specified in the root layout properties.",
+        "group": "Types",
+        "sdk-support": {
+          "basic functionality": {
+            "js": "0.48.0"
+          }
+        }
+      },
       "to-string": {
         "doc": "Converts the input value to a string. If the input is `null`, the result is `\"\"`. If the input is a boolean, the result is `\"true\"` or `\"false\"`. If the input is a number, it is converted to a string as specified by the [\"NumberToString\" algorithm](https://tc39.github.io/ecma262/#sec-tostring-applied-to-the-number-type) of the ECMAScript Language Specification. If the input is a color, it is converted to a string of the form `\"rgba(r,g,b,a)\"`, where `r`, `g`, and `b` are numerals ranging from 0 to 255, and `a` ranges from 0 to 1. Otherwise, the input is converted to a string in the format specified by the [`JSON.stringify`](https://tc39.github.io/ecma262/#sec-json.stringify) function of the ECMAScript Language Specification.",
         "group": "Types",
@@ -3099,7 +3108,7 @@
         }
       },
       "concat": {
-        "doc": "Returns a string consisting of the concatenation of the inputs.",
+        "doc": "Returns a `string` consisting of the concatenation of the inputs. If any inputs are `formatted`, returns a `formatted` with default formatting options for all unformatted inputs.",
         "group": "String",
         "sdk-support": {
           "basic functionality": {
diff --git a/src/style-spec/types.js b/src/style-spec/types.js
index 143288020a2..2db91885160 100644
--- a/src/style-spec/types.js
+++ b/src/style-spec/types.js
@@ -4,6 +4,8 @@
 
 export type ColorSpecification = string;
 
+export type FormattedSpecification = string;
+
 export type FilterSpecification =
     | ['has', string]
     | ['!has', string]
@@ -225,7 +227,7 @@ export type SymbolLayerSpecification = {|
         "icon-pitch-alignment"?: PropertyValueSpecification<"map" | "viewport" | "auto">,
         "text-pitch-alignment"?: PropertyValueSpecification<"map" | "viewport" | "auto">,
         "text-rotation-alignment"?: PropertyValueSpecification<"map" | "viewport" | "auto">,
-        "text-field"?: DataDrivenPropertyValueSpecification<string>,
+        "text-field"?: DataDrivenPropertyValueSpecification<FormattedSpecification>,
         "text-font"?: DataDrivenPropertyValueSpecification<Array<string>>,
         "text-size"?: DataDrivenPropertyValueSpecification<number>,
         "text-max-width"?: DataDrivenPropertyValueSpecification<number>,
@@ -405,4 +407,3 @@ export type LayerSpecification =
     | RasterLayerSpecification
     | HillshadeLayerSpecification
     | BackgroundLayerSpecification;
-
diff --git a/src/style-spec/validate/validate.js b/src/style-spec/validate/validate.js
index 231d9ff8686..5caa8d75800 100644
--- a/src/style-spec/validate/validate.js
+++ b/src/style-spec/validate/validate.js
@@ -18,6 +18,7 @@ import validateLayer from './validate_layer';
 import validateSource from './validate_source';
 import validateLight from './validate_light';
 import validateString from './validate_string';
+import validateFormatted from './validate_formatted';
 
 const VALIDATORS = {
     '*': function() {
@@ -35,7 +36,8 @@ const VALIDATORS = {
     'object': validateObject,
     'source': validateSource,
     'light': validateLight,
-    'string': validateString
+    'string': validateString,
+    'formatted': validateFormatted
 };
 
 
@@ -64,8 +66,12 @@ export default function validate(options) {
         return VALIDATORS[valueSpec.type](options);
 
     } else {
-        return validateObject(extend({}, options, {
+        const valid = validateObject(extend({}, options, {
             valueSpec: valueSpec.type ? styleSpec[valueSpec.type] : valueSpec
         }));
+        if (!valid) {
+            console.log("not valid");
+        }
+        return valid;
     }
 }
diff --git a/src/style-spec/validate/validate_formatted.js b/src/style-spec/validate/validate_formatted.js
new file mode 100644
index 00000000000..61ed402df3d
--- /dev/null
+++ b/src/style-spec/validate/validate_formatted.js
@@ -0,0 +1,11 @@
+// @flow
+import validateExpression from './validate_expression';
+import validateString from './validate_string';
+
+export default function validateFormatted(options: any) {
+    if (validateString(options).length === 0) {
+        return [];
+    }
+
+    return validateExpression(options);
+}
diff --git a/src/style/style_layer/background_style_layer_properties.js b/src/style/style_layer/background_style_layer_properties.js
index 5b1cbacbefd..182cd821891 100644
--- a/src/style/style_layer/background_style_layer_properties.js
+++ b/src/style/style_layer/background_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "background-color": DataConstantProperty<Color>,
diff --git a/src/style/style_layer/circle_style_layer_properties.js b/src/style/style_layer/circle_style_layer_properties.js
index 3e9176f6947..9321d797397 100644
--- a/src/style/style_layer/circle_style_layer_properties.js
+++ b/src/style/style_layer/circle_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "circle-radius": DataDrivenProperty<number>,
diff --git a/src/style/style_layer/fill_extrusion_style_layer_properties.js b/src/style/style_layer/fill_extrusion_style_layer_properties.js
index ac0966a83be..78a29cdcf18 100644
--- a/src/style/style_layer/fill_extrusion_style_layer_properties.js
+++ b/src/style/style_layer/fill_extrusion_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "fill-extrusion-opacity": DataConstantProperty<number>,
diff --git a/src/style/style_layer/fill_style_layer_properties.js b/src/style/style_layer/fill_style_layer_properties.js
index 9851f734508..a62dd756e1c 100644
--- a/src/style/style_layer/fill_style_layer_properties.js
+++ b/src/style/style_layer/fill_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "fill-antialias": DataConstantProperty<boolean>,
diff --git a/src/style/style_layer/heatmap_style_layer_properties.js b/src/style/style_layer/heatmap_style_layer_properties.js
index dd53a9ee9a0..d425156c001 100644
--- a/src/style/style_layer/heatmap_style_layer_properties.js
+++ b/src/style/style_layer/heatmap_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "heatmap-radius": DataDrivenProperty<number>,
diff --git a/src/style/style_layer/hillshade_style_layer_properties.js b/src/style/style_layer/hillshade_style_layer_properties.js
index f16f9b51fd6..3f2e5c2ecdd 100644
--- a/src/style/style_layer/hillshade_style_layer_properties.js
+++ b/src/style/style_layer/hillshade_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "hillshade-illumination-direction": DataConstantProperty<number>,
diff --git a/src/style/style_layer/layer_properties.js.ejs b/src/style/style_layer/layer_properties.js.ejs
index d9740285990..7bf3c2bf567 100644
--- a/src/style/style_layer/layer_properties.js.ejs
+++ b/src/style/style_layer/layer_properties.js.ejs
@@ -19,6 +19,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 <% if (layoutProperties.length) { -%>
 export type LayoutProps = {|
 <% for (const property of layoutProperties) { -%>
diff --git a/src/style/style_layer/line_style_layer_properties.js b/src/style/style_layer/line_style_layer_properties.js
index bef2f2ed44a..442d67d04b3 100644
--- a/src/style/style_layer/line_style_layer_properties.js
+++ b/src/style/style_layer/line_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 export type LayoutProps = {|
     "line-cap": DataConstantProperty<"butt" | "round" | "square">,
     "line-join": DataDrivenProperty<"bevel" | "round" | "miter">,
diff --git a/src/style/style_layer/raster_style_layer_properties.js b/src/style/style_layer/raster_style_layer_properties.js
index e0193d510b2..4c0e28bb8f3 100644
--- a/src/style/style_layer/raster_style_layer_properties.js
+++ b/src/style/style_layer/raster_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 
 export type PaintProps = {|
     "raster-opacity": DataConstantProperty<number>,
diff --git a/src/style/style_layer/symbol_style_layer_properties.js b/src/style/style_layer/symbol_style_layer_properties.js
index ed22587f068..1d06c35d6bd 100644
--- a/src/style/style_layer/symbol_style_layer_properties.js
+++ b/src/style/style_layer/symbol_style_layer_properties.js
@@ -14,6 +14,8 @@ import {
 
 import type Color from '../../style-spec/util/color';
 
+import type {Formatted} from '../../style-spec/expression/definitions/formatted';
+
 export type LayoutProps = {|
     "symbol-placement": DataConstantProperty<"point" | "line" | "line-center">,
     "symbol-spacing": DataConstantProperty<number>,
@@ -34,7 +36,7 @@ export type LayoutProps = {|
     "icon-pitch-alignment": DataConstantProperty<"map" | "viewport" | "auto">,
     "text-pitch-alignment": DataConstantProperty<"map" | "viewport" | "auto">,
     "text-rotation-alignment": DataConstantProperty<"map" | "viewport" | "auto">,
-    "text-field": DataDrivenProperty<string>,
+    "text-field": DataDrivenProperty<string | Formatted>,
     "text-font": DataDrivenProperty<Array<string>>,
     "text-size": DataDrivenProperty<number>,
     "text-max-width": DataDrivenProperty<number>,
diff --git a/src/symbol/mergelines.js b/src/symbol/mergelines.js
index 0c9c46a9cb4..f8785fdcbdf 100644
--- a/src/symbol/mergelines.js
+++ b/src/symbol/mergelines.js
@@ -1,6 +1,7 @@
 // @flow
 
 import type {SymbolFeature} from '../data/bucket/symbol_bucket';
+import {Formatted} from '../style-spec/expression/definitions/formatted';
 
 export default function (features: Array<SymbolFeature>) {
     const leftIndex: {[string]: number} = {};
@@ -41,7 +42,7 @@ export default function (features: Array<SymbolFeature>) {
     for (let k = 0; k < features.length; k++) {
         const feature = features[k];
         const geom = feature.geometry;
-        const text = feature.text;
+        const text = feature.text instanceof Formatted ? feature.text.toString() : feature.text;
 
         if (!text) {
             add(k);
diff --git a/src/symbol/quads.js b/src/symbol/quads.js
index e0edec15abd..a5ae86fd15a 100644
--- a/src/symbol/quads.js
+++ b/src/symbol/quads.js
@@ -119,7 +119,7 @@ export function getGlyphQuads(anchor: Anchor,
                        layer: SymbolStyleLayer,
                        alongLine: boolean,
                        feature: Feature,
-                       positions: {[number]: GlyphPosition}): Array<SymbolQuad> {
+                       positions: {[string]: {[number]: GlyphPosition}}): Array<SymbolQuad> {
 
     const oneEm = 24;
     const textRotate = layer.layout.get('text-rotate').evaluate(feature, {}) * Math.PI / 180;
@@ -131,7 +131,8 @@ export function getGlyphQuads(anchor: Anchor,
 
     for (let k = 0; k < positionedGlyphs.length; k++) {
         const positionedGlyph = positionedGlyphs[k];
-        const glyph = positions[positionedGlyph.glyph];
+        const glyphPositions = positions[positionedGlyph.fontStack];
+        const glyph = glyphPositions && glyphPositions[positionedGlyph.glyph];
         if (!glyph) continue;
 
         const rect = glyph.rect;
@@ -141,7 +142,7 @@ export function getGlyphQuads(anchor: Anchor,
         const glyphPadding = 1.0;
         const rectBuffer = GLYPH_PBF_BORDER + glyphPadding;
 
-        const halfAdvance = glyph.metrics.advance / 2;
+        const halfAdvance = glyph.metrics.advance * positionedGlyph.scale / 2;
 
         const glyphOffset = alongLine ?
             [positionedGlyph.x + halfAdvance, positionedGlyph.y] :
@@ -151,11 +152,10 @@ export function getGlyphQuads(anchor: Anchor,
             [0, 0] :
             [positionedGlyph.x + halfAdvance + textOffset[0], positionedGlyph.y + textOffset[1]];
 
-
-        const x1 = glyph.metrics.left - rectBuffer - halfAdvance + builtInOffset[0];
-        const y1 = -glyph.metrics.top - rectBuffer + builtInOffset[1];
-        const x2 = x1 + rect.w;
-        const y2 = y1 + rect.h;
+        const x1 = (glyph.metrics.left - rectBuffer) * positionedGlyph.scale - halfAdvance + builtInOffset[0];
+        const y1 = (-glyph.metrics.top - rectBuffer) * positionedGlyph.scale + builtInOffset[1];
+        const x2 = x1 + rect.w * positionedGlyph.scale;
+        const y2 = y1 + rect.h * positionedGlyph.scale;
 
         const tl = new Point(x1, y1);
         const tr = new Point(x2, y1);
diff --git a/src/symbol/shaping.js b/src/symbol/shaping.js
index d6667185749..30022a3a737 100644
--- a/src/symbol/shaping.js
+++ b/src/symbol/shaping.js
@@ -9,6 +9,7 @@ import { plugin as rtlTextPlugin } from '../source/rtl_text_plugin';
 
 import type {StyleGlyph} from '../style/style_glyph';
 import type {ImagePosition} from '../render/image_atlas';
+import {Formatted} from '../style-spec/expression/definitions/formatted';
 
 const WritingMode = {
     horizontal: 1,
@@ -23,7 +24,9 @@ export type PositionedGlyph = {
     glyph: number,
     x: number,
     y: number,
-    vertical: boolean
+    vertical: boolean,
+    scale: number,
+    fontStack: string
 };
 
 // A collection of positioned glyphs and some metadata
@@ -39,22 +42,109 @@ export type Shaping = {
 type SymbolAnchor = 'center' | 'left' | 'right' | 'top' | 'bottom' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 type TextJustify = 'left' | 'center' | 'right';
 
-function breakLines(text: string, lineBreakPoints: Array<number>) {
+class TaggedString {
+    text: string;
+    sectionIndex: Array<number>
+    sections: Array<{ scale: number, fontStack: string }>
+
+    constructor() {
+        this.text = "";
+        this.sectionIndex = [];
+        this.sections = [];
+    }
+
+    static fromFeature(text: string | Formatted, defaultFontStack: string) {
+        const result = new TaggedString();
+        if (text instanceof Formatted) {
+            for (let i = 0; i < text.sections.length; i++) {
+                const section = text.sections[i];
+                result.sections.push({
+                    scale: section.scale || 1,
+                    fontStack: section.fontStack || defaultFontStack
+                });
+                result.text += section.text;
+                for (let j = 0; j < section.text.length; j++) {
+                    result.sectionIndex.push(i);
+                }
+            }
+        } else {
+            result.text = text;
+            result.sections.push({ scale: 1, fontStack: defaultFontStack });
+            for (let i = 0; i < text.length; i++) {
+                result.sectionIndex.push(0);
+            }
+        }
+        return result;
+    }
+
+    length(): number {
+        return this.text.length;
+    }
+
+    getSection(index: number): { scale: number, fontStack: string } {
+        return this.sections[this.sectionIndex[index]];
+    }
+
+    getCharCode(index: number): number {
+        return this.text.charCodeAt(index);
+    }
+
+    verticalizePunctuation() {
+        this.text = verticalizePunctuation(this.text);
+    }
+
+    trim() {
+        let beginningWhitespace = 0;
+        for (let i = 0;
+            i < this.text.length && whitespace[this.text.charCodeAt(i)];
+            i++) {
+            beginningWhitespace++;
+        }
+        let trailingWhitespace = this.text.length;
+        for (let i = this.text.length - 1;
+            i >= 0 && i >= beginningWhitespace && whitespace[this.text.charCodeAt(i)];
+            i--) {
+            trailingWhitespace--;
+        }
+        this.text = this.text.substring(beginningWhitespace, trailingWhitespace);
+        this.sectionIndex = this.sectionIndex.slice(beginningWhitespace, trailingWhitespace);
+    }
+
+    substring(start: number, end: number): TaggedString {
+        const substring = new TaggedString();
+        substring.text = this.text.substring(start, end);
+        substring.sectionIndex = this.sectionIndex.slice(start, end);
+        substring.sections = this.sections;
+        return substring;
+    }
+
+    toString(): string {
+        return this.text;
+    }
+
+    getMaxScale() {
+        return this.sectionIndex.reduce((max, index) => Math.max(max, this.sections[index].scale), 0);
+    }
+}
+
+function breakLines(input: TaggedString, lineBreakPoints: Array<number>): Array<TaggedString> {
     const lines = [];
+    const text = input.text;
     let start = 0;
     for (const lineBreak of lineBreakPoints) {
-        lines.push(text.substring(start, lineBreak));
+        lines.push(input.substring(start, lineBreak));
         start = lineBreak;
     }
 
     if (start < text.length) {
-        lines.push(text.substring(start, text.length));
+        lines.push(input.substring(start, text.length));
     }
     return lines;
 }
 
-function shapeText(text: string,
-                   glyphs: {[number]: ?StyleGlyph},
+function shapeText(text: string | Formatted,
+                   glyphs: {[string]: {[number]: ?StyleGlyph}},
+                   defaultFontStack: string,
                    maxWidth: number,
                    lineHeight: number,
                    textAnchor: SymbolAnchor,
@@ -63,9 +153,10 @@ function shapeText(text: string,
                    translate: [number, number],
                    verticalHeight: number,
                    writingMode: 1 | 2): Shaping | false {
-    let logicalInput = text.trim();
+    const logicalInput = TaggedString.fromFeature(text, defaultFontStack);
+
     if (writingMode === WritingMode.vertical) {
-        logicalInput = verticalizePunctuation(logicalInput);
+        logicalInput.verticalizePunctuation();
     }
 
     const positionedGlyphs = [];
@@ -79,11 +170,39 @@ function shapeText(text: string,
         writingMode
     };
 
-    let lines: Array<string>;
-
-    const {processBidirectionalText} = rtlTextPlugin;
-    if (processBidirectionalText) {
-        lines = processBidirectionalText(logicalInput, determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
+    let lines: Array<TaggedString>;
+
+    const {processBidirectionalText, processStyledBidirectionalText} = rtlTextPlugin;
+    if (processBidirectionalText && logicalInput.sections.length === 1) {
+        // Bidi doesn't have to be style-aware
+        lines = [];
+        const untaggedLines =
+            processBidirectionalText(logicalInput.toString(),
+                                     determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
+        for (const line of untaggedLines) {
+            const taggedLine = new TaggedString();
+            taggedLine.text = line;
+            taggedLine.sections = logicalInput.sections;
+            for (let i = 0; i < line.length; i++) {
+                taggedLine.sectionIndex.push(0);
+            }
+            lines.push(taggedLine);
+        }
+    } else if (processStyledBidirectionalText) {
+        // Need version of mapbox-gl-rtl-text with style support for combining RTL text
+        // with formatting
+        lines = [];
+        const processedLines =
+            processStyledBidirectionalText(logicalInput.text,
+                                           logicalInput.sectionIndex,
+                                           determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
+        for (const line of processedLines) {
+            const taggedLine = new TaggedString();
+            taggedLine.text = line[0];
+            taggedLine.sectionIndex = line[1];
+            taggedLine.sections = logicalInput.sections;
+            lines.push(taggedLine);
+        }
     } else {
         lines = breakLines(logicalInput, determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
     }
@@ -93,6 +212,7 @@ function shapeText(text: string,
     if (!positionedGlyphs.length)
         return false;
 
+    shaping.text = shaping.text.toString();
     return shaping;
 }
 
@@ -125,17 +245,19 @@ const breakable: {[number]: boolean} = {
     // See https://github.com/mapbox/mapbox-gl-js/issues/3658
 };
 
-function determineAverageLineWidth(logicalInput: string,
+function determineAverageLineWidth(logicalInput: TaggedString,
                                    spacing: number,
                                    maxWidth: number,
-                                   glyphs: {[number]: ?StyleGlyph}) {
+                                   glyphMap: {[string]: {[number]: ?StyleGlyph}}) {
     let totalWidth = 0;
 
-    for (let index = 0; index < logicalInput.length; index++) {
-        const glyph = glyphs[logicalInput.charCodeAt(index)];
+    for (let index = 0; index < logicalInput.length(); index++) {
+        const section = logicalInput.getSection(index);
+        const positions = glyphMap[section.fontStack];
+        const glyph = positions && positions[logicalInput.getCharCode(index)];
         if (!glyph)
             continue;
-        totalWidth += glyph.metrics.advance + spacing;
+        totalWidth += glyph.metrics.advance * section.scale + spacing;
     }
 
     const lineCount = Math.max(1, Math.ceil(totalWidth / maxWidth));
@@ -223,10 +345,10 @@ function leastBadBreaks(lastLineBreak: ?Break): Array<number> {
     return leastBadBreaks(lastLineBreak.priorBreak).concat(lastLineBreak.index);
 }
 
-function determineLineBreaks(logicalInput: string,
+function determineLineBreaks(logicalInput: TaggedString,
                              spacing: number,
                              maxWidth: number,
-                             glyphs: {[number]: ?StyleGlyph}): Array<number> {
+                             glyphMap: {[string]: {[number]: ?StyleGlyph}}): Array<number> {
     if (!maxWidth)
         return [];
 
@@ -234,20 +356,22 @@ function determineLineBreaks(logicalInput: string,
         return [];
 
     const potentialLineBreaks = [];
-    const targetWidth = determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphs);
+    const targetWidth = determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphMap);
 
     let currentX = 0;
 
-    for (let i = 0; i < logicalInput.length; i++) {
-        const codePoint = logicalInput.charCodeAt(i);
-        const glyph = glyphs[codePoint];
+    for (let i = 0; i < logicalInput.length(); i++) {
+        const section = logicalInput.getSection(i);
+        const codePoint = logicalInput.getCharCode(i);
+        const positions = glyphMap[section.fontStack];
+        const glyph = positions && positions[codePoint];
 
         if (glyph && !whitespace[codePoint])
-            currentX += glyph.metrics.advance + spacing;
+            currentX += glyph.metrics.advance * section.scale + spacing;
 
         // Ideographic characters, spaces, and word-breaking punctuation that often appear without
         // surrounding spaces.
-        if ((i < logicalInput.length - 1) &&
+        if ((i < logicalInput.length() - 1) &&
             (breakable[codePoint] ||
                 charAllowsIdeographicBreaking(codePoint))) {
 
@@ -257,14 +381,14 @@ function determineLineBreaks(logicalInput: string,
                     currentX,
                     targetWidth,
                     potentialLineBreaks,
-                    calculatePenalty(codePoint, logicalInput.charCodeAt(i + 1)),
+                    calculatePenalty(codePoint, logicalInput.getCharCode(i + 1)),
                     false));
         }
     }
 
     return leastBadBreaks(
         evaluateBreak(
-            logicalInput.length,
+            logicalInput.length(),
             currentX,
             targetWidth,
             potentialLineBreaks,
@@ -305,8 +429,8 @@ function getAnchorAlignment(anchor: SymbolAnchor) {
 }
 
 function shapeLines(shaping: Shaping,
-                    glyphs: {[number]: ?StyleGlyph},
-                    lines: Array<string>,
+                    glyphMap: {[string]: {[number]: ?StyleGlyph}},
+                    lines: Array<TaggedString>,
                     lineHeight: number,
                     textAnchor: SymbolAnchor,
                     textJustify: TextJustify,
@@ -326,27 +450,35 @@ function shapeLines(shaping: Shaping,
         textJustify === 'right' ? 1 :
         textJustify === 'left' ? 0 : 0.5;
 
-    for (let line of lines) {
-        line = line.trim();
+    for (const line of lines) {
+        line.trim();
+
+        const lineMaxScale = line.getMaxScale();
 
-        if (!line.length) {
+        if (!line.length()) {
             y += lineHeight; // Still need a line feed after empty line
             continue;
         }
 
         const lineStartIndex = positionedGlyphs.length;
-        for (let i = 0; i < line.length; i++) {
-            const codePoint = line.charCodeAt(i);
-            const glyph = glyphs[codePoint];
+        for (let i = 0; i < line.length(); i++) {
+            const section = line.getSection(i);
+            const codePoint = line.getCharCode(i);
+            // We don't know the baseline, but since we're laying out
+            // at 24 points, we can calculate how much it will move when
+            // we scale up or down.
+            const baselineOffset = (lineMaxScale - section.scale) * 24;
+            const positions = glyphMap[section.fontStack];
+            const glyph = positions && positions[codePoint];
 
             if (!glyph) continue;
 
             if (!charHasUprightVerticalOrientation(codePoint) || writingMode === WritingMode.horizontal) {
-                positionedGlyphs.push({glyph: codePoint, x, y, vertical: false});
-                x += glyph.metrics.advance + spacing;
+                positionedGlyphs.push({glyph: codePoint, x, y: y + baselineOffset, vertical: false, scale: section.scale, fontStack: section.fontStack});
+                x += glyph.metrics.advance * section.scale + spacing;
             } else {
-                positionedGlyphs.push({glyph: codePoint, x, y: 0, vertical: true});
-                x += verticalHeight + spacing;
+                positionedGlyphs.push({glyph: codePoint, x, y: baselineOffset, vertical: true, scale: section.scale, fontStack: section.fontStack});
+                x += verticalHeight * section.scale + spacing;
             }
         }
 
@@ -355,18 +487,18 @@ function shapeLines(shaping: Shaping,
             const lineLength = x - spacing;
             maxLineLength = Math.max(lineLength, maxLineLength);
 
-            justifyLine(positionedGlyphs, glyphs, lineStartIndex, positionedGlyphs.length - 1, justify);
+            justifyLine(positionedGlyphs, glyphMap, lineStartIndex, positionedGlyphs.length - 1, justify);
         }
 
         x = 0;
-        y += lineHeight;
+        y += lineHeight * lineMaxScale;
     }
 
     const {horizontalAlign, verticalAlign} = getAnchorAlignment(textAnchor);
     align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lines.length);
 
     // Calculate the bounding box
-    const height = lines.length * lineHeight;
+    const height = y - yOffset;
 
     shaping.top += -verticalAlign * height;
     shaping.bottom = shaping.top + height;
@@ -376,16 +508,18 @@ function shapeLines(shaping: Shaping,
 
 // justify right = 1, left = 0, center = 0.5
 function justifyLine(positionedGlyphs: Array<PositionedGlyph>,
-                     glyphs: {[number]: ?StyleGlyph},
+                     glyphMap: {[string]: {[number]: ?StyleGlyph}},
                      start: number,
                      end: number,
                      justify: 1 | 0 | 0.5) {
     if (!justify)
         return;
 
-    const glyph = glyphs[positionedGlyphs[end].glyph];
+    const lastPositionedGlyph = positionedGlyphs[end];
+    const positions = glyphMap[lastPositionedGlyph.fontStack];
+    const glyph = positions && positions[lastPositionedGlyph.glyph];
     if (glyph) {
-        const lastAdvance = glyph.metrics.advance;
+        const lastAdvance = glyph.metrics.advance * lastPositionedGlyph.scale;
         const lineIndent = (positionedGlyphs[end].x + lastAdvance) * justify;
 
         for (let j = start; j <= end; j++) {
diff --git a/src/symbol/symbol_layout.js b/src/symbol/symbol_layout.js
index 730972c0c9f..4f07e5fd793 100644
--- a/src/symbol/symbol_layout.js
+++ b/src/symbol/symbol_layout.js
@@ -18,6 +18,7 @@ import classifyRings from '../util/classify_rings';
 import EXTENT from '../data/extent';
 import SymbolBucket from '../data/bucket/symbol_bucket';
 import EvaluationParameters from '../style/evaluation_parameters';
+import {Formatted} from '../style-spec/expression/definitions/formatted';
 
 import type {Shaping, PositionedIcon} from './shaping';
 import type {CollisionBoxArray} from '../data/array_types';
@@ -100,24 +101,24 @@ export function performSymbolLayout(bucket: SymbolBucket,
 
     for (const feature of bucket.features) {
         const fontstack = layout.get('text-font').evaluate(feature, {}).join(',');
-        const glyphs = glyphMap[fontstack] || {};
-        const glyphPositionMap = glyphPositions[fontstack] || {};
+        const glyphPositionMap = glyphPositions;
 
         const shapedTextOrientations = {};
         const text = feature.text;
         if (text) {
+            const unformattedText = text instanceof Formatted ? text.toString() : text;
             const textOffset: [number, number] = (layout.get('text-offset').evaluate(feature, {}).map((t)=> t * oneEm): any);
             const spacing = layout.get('text-letter-spacing').evaluate(feature, {}) * oneEm;
-            const spacingIfAllowed = allowsLetterSpacing(text) ? spacing : 0;
+            const spacingIfAllowed = allowsLetterSpacing(unformattedText) ? spacing : 0;
             const textAnchor = layout.get('text-anchor').evaluate(feature, {});
             const textJustify = layout.get('text-justify').evaluate(feature, {});
             const maxWidth = layout.get('symbol-placement') === 'point' ?
                 layout.get('text-max-width').evaluate(feature, {}) * oneEm :
                 0;
 
-            shapedTextOrientations.horizontal = shapeText(text, glyphs, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed, textOffset, oneEm, WritingMode.horizontal);
-            if (allowsVerticalWritingMode(text) && textAlongLine && keepUpright) {
-                shapedTextOrientations.vertical = shapeText(text, glyphs, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed, textOffset, oneEm, WritingMode.vertical);
+            shapedTextOrientations.horizontal = shapeText(text, glyphMap, fontstack, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed, textOffset, oneEm, WritingMode.horizontal);
+            if (allowsVerticalWritingMode(unformattedText) && textAlongLine && keepUpright) {
+                shapedTextOrientations.vertical = shapeText(text, glyphMap, fontstack, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed, textOffset, oneEm, WritingMode.vertical);
             }
         }
 
@@ -164,7 +165,7 @@ function addFeature(bucket: SymbolBucket,
                     feature: SymbolFeature,
                     shapedTextOrientations: any,
                     shapedIcon: PositionedIcon | void,
-                    glyphPositionMap: {[number]: GlyphPosition},
+                    glyphPositionMap: {[string]: {[number]: GlyphPosition}},
                     sizes: Sizes) {
     const layoutTextSize = sizes.layoutTextSize.evaluate(feature, {});
     const layoutIconSize = sizes.layoutIconSize.evaluate(feature, {});
@@ -278,7 +279,7 @@ function addTextVertices(bucket: SymbolBucket,
                          lineArray: {lineStartIndex: number, lineLength: number},
                          writingMode: number,
                          placedTextSymbolIndices: Array<number>,
-                         glyphPositionMap: {[number]: GlyphPosition},
+                         glyphPositionMap: {[string]: {[number]: GlyphPosition}},
                          sizes: Sizes) {
     const glyphQuads = getGlyphQuads(anchor, shapedText,
                             layer, textAlongLine, feature, glyphPositionMap);
@@ -341,7 +342,7 @@ function addSymbol(bucket: SymbolBucket,
                    iconAlongLine: boolean,
                    iconOffset: [number, number],
                    feature: SymbolFeature,
-                   glyphPositionMap: {[number]: GlyphPosition},
+                   glyphPositionMap: {[string]: {[number]: GlyphPosition}},
                    sizes: Sizes) {
     const lineArray = bucket.addToLineVertexArray(anchor, line);
 
diff --git a/src/symbol/transform_text.js b/src/symbol/transform_text.js
index 39f80c6e5e6..45040543618 100644
--- a/src/symbol/transform_text.js
+++ b/src/symbol/transform_text.js
@@ -4,8 +4,9 @@ import { plugin as rtlTextPlugin } from '../source/rtl_text_plugin';
 
 import type SymbolStyleLayer from '../style/style_layer/symbol_style_layer';
 import type {Feature} from '../style-spec/expression';
+import {Formatted} from '../style-spec/expression/definitions/formatted';
 
-export default function(text: string, layer: SymbolStyleLayer, feature: Feature) {
+function transformText(text: string, layer: SymbolStyleLayer, feature: Feature) {
     const transform = layer.layout.get('text-transform').evaluate(feature, {});
     if (transform === 'uppercase') {
         text = text.toLocaleUpperCase();
@@ -19,3 +20,16 @@ export default function(text: string, layer: SymbolStyleLayer, feature: Feature)
 
     return text;
 }
+
+
+export default function(text: string | Formatted, layer: SymbolStyleLayer, feature: Feature) {
+    if (text instanceof Formatted) {
+        // OK to transform in place?
+        text.sections.forEach(section => {
+            section.text = transformText(section.text, layer, feature);
+        });
+        return text;
+    } else {
+        return transformText(text, layer, feature);
+    }
+}
diff --git a/test/expected/text-shaping-default.json b/test/expected/text-shaping-default.json
index 34324492e0f..4ba26796ccf 100644
--- a/test/expected/text-shaping-default.json
+++ b/test/expected/text-shaping-default.json
@@ -4,31 +4,41 @@
       "glyph": 97,
       "x": -32.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     }
   ],
   "text": "abcde",
@@ -37,4 +47,4 @@
   "left": -32.5,
   "right": 32.5,
   "writingMode": 1
-}
\ No newline at end of file
+}
diff --git a/test/expected/text-shaping-linebreak.json b/test/expected/text-shaping-linebreak.json
index 1948fcecab1..2be83dac03a 100644
--- a/test/expected/text-shaping-linebreak.json
+++ b/test/expected/text-shaping-linebreak.json
@@ -4,61 +4,81 @@
       "glyph": 97,
       "x": -32.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 97,
       "x": -32.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     }
   ],
   "text": "abcde abcde",
diff --git a/test/expected/text-shaping-newline.json b/test/expected/text-shaping-newline.json
index 583c5018b1f..977e3a5f42e 100644
--- a/test/expected/text-shaping-newline.json
+++ b/test/expected/text-shaping-newline.json
@@ -4,61 +4,81 @@
       "glyph": 97,
       "x": -32.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": -29,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 97,
       "x": -32.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": -5,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     }
   ],
   "text": "abcde\nabcde",
diff --git a/test/expected/text-shaping-newlines-in-middle.json b/test/expected/text-shaping-newlines-in-middle.json
index a11952a84a6..8a22ba5c720 100644
--- a/test/expected/text-shaping-newlines-in-middle.json
+++ b/test/expected/text-shaping-newlines-in-middle.json
@@ -4,61 +4,81 @@
       "glyph": 97,
       "x": -32.5,
       "y": -41,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": -41,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -41,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": -41,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": -41,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 97,
       "x": -32.5,
       "y": 7,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -19.5,
       "y": 7,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": 7,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 5.5,
       "y": 7,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 19.5,
       "y": 7,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     }
   ],
   "text": "abcde\n\nabcde",
diff --git a/test/expected/text-shaping-null.json b/test/expected/text-shaping-null.json
index 65c9cb911aa..242ef1c7a9d 100644
--- a/test/expected/text-shaping-null.json
+++ b/test/expected/text-shaping-null.json
@@ -4,13 +4,17 @@
       "glyph": 104,
       "x": -10,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 105,
       "x": 4,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     }
   ],
   "text": "hi\u0000",
@@ -19,4 +23,4 @@
   "left": -10,
   "right": 10,
   "writingMode": 1
-}
\ No newline at end of file
+}
diff --git a/test/expected/text-shaping-spacing.json b/test/expected/text-shaping-spacing.json
index b9b712bf563..5e8872e0f6f 100644
--- a/test/expected/text-shaping-spacing.json
+++ b/test/expected/text-shaping-spacing.json
@@ -4,31 +4,41 @@
       "glyph": 97,
       "x": -38.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 98,
       "x": -22.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 99,
       "x": -5.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 100,
       "x": 8.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     },
     {
       "glyph": 101,
       "x": 25.5,
       "y": -17,
-      "vertical": false
+      "vertical": false,
+      "scale": 1,
+      "fontStack": "Test"
     }
   ],
   "text": "abcde",
@@ -37,4 +47,4 @@
   "left": -38.5,
   "right": 38.5,
   "writingMode": 1
-}
\ No newline at end of file
+}
diff --git a/test/integration/expression-tests/formatted/basic/test.json b/test/integration/expression-tests/formatted/basic/test.json
new file mode 100644
index 00000000000..eef30eb57f4
--- /dev/null
+++ b/test/integration/expression-tests/formatted/basic/test.json
@@ -0,0 +1,80 @@
+{
+  "expression": [
+    "format",
+    "a",
+    {},
+    "b",
+    {
+      "font-scale": 2
+    },
+    "c",
+    {
+      "text-font": [
+        "literal",
+        [
+          "a",
+          "b"
+        ]
+      ]
+    }
+  ],
+  "inputs": [
+    [
+      {},
+      {}
+    ]
+  ],
+  "expected": {
+    "compiled": {
+      "result": "success",
+      "isFeatureConstant": true,
+      "isZoomConstant": true,
+      "type": "formatted"
+    },
+    "outputs": [
+      {
+        "sections": [
+          {
+            "text": "a",
+            "scale": null,
+            "fontStack": null
+          },
+          {
+            "text": "b",
+            "scale": 2,
+            "fontStack": null
+          },
+          {
+            "text": "c",
+            "scale": null,
+            "fontStack": "a,b"
+          }
+        ]
+      }
+    ],
+    "serialized": [
+      "format",
+      "a",
+      {
+        "font-scale": null,
+        "text-font": null
+      },
+      "b",
+      {
+        "font-scale": 2,
+        "text-font": null
+      },
+      "c",
+      {
+        "font-scale": null,
+        "text-font": [
+          "literal",
+          [
+            "a",
+            "b"
+          ]
+        ]
+      }
+    ]
+  }
+}
diff --git a/test/integration/expression-tests/formatted/to-string/test.json b/test/integration/expression-tests/formatted/to-string/test.json
new file mode 100644
index 00000000000..2c505712fbd
--- /dev/null
+++ b/test/integration/expression-tests/formatted/to-string/test.json
@@ -0,0 +1,42 @@
+{
+  "expression": [
+    "to-string",
+    [
+      "format",
+      "a",
+      {},
+      "b",
+      {
+        "font-scale": 2
+      },
+      "c",
+      {
+        "text-font": [
+          "literal",
+          [
+            "a",
+            "b"
+          ]
+        ]
+      }
+    ]
+  ],
+  "inputs": [
+    [
+      {},
+      {}
+    ]
+  ],
+  "expected": {
+    "compiled": {
+      "result": "success",
+      "isFeatureConstant": true,
+      "isZoomConstant": true,
+      "type": "string"
+    },
+    "outputs": [
+      "abc"
+    ],
+    "serialized": "abc"
+  }
+}
diff --git a/test/integration/render-tests/text-field/formatted-line/expected.png b/test/integration/render-tests/text-field/formatted-line/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c6a684a0854f0216264415251fbbedd0ed865a
GIT binary patch
literal 30757
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
G=lH*nY$4D9

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/text-field/formatted-line/style.json b/test/integration/render-tests/text-field/formatted-line/style.json
new file mode 100644
index 00000000000..cd8e99a5f1e
--- /dev/null
+++ b/test/integration/render-tests/text-field/formatted-line/style.json
@@ -0,0 +1,56 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256
+    }
+  },
+  "center": [
+    13.418056,
+    52.499167
+  ],
+  "zoom": 14,
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "maxzoom": 14,
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.mvt"
+      ]
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "literal",
+      "type": "symbol",
+      "source": "mapbox",
+      "source-layer": "road_label",
+      "layout": {
+        "symbol-placement": "line",
+        "text-allow-overlap": true,
+        "text-ignore-placement": true,
+        "text-field": ["format",
+            ["get", "name"], { "font-scale": 1.2 },
+            " - ", {},
+            ["get", "class"], { "font-scale": 0.8, "text-font": ["literal", [ "NotoCJK" ]] }
+        ],
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ],
+        "text-size": 10
+      },
+      "paint": {
+        "text-opacity": 1
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/text-field/formatted/expected.png b/test/integration/render-tests/text-field/formatted/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..08f856cb509f84717eb04e0d68dde1fafcd0902d
GIT binary patch
literal 4867
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
Xr#bW*!Mx^IOY88#*ofXR%;o<Edsf5r

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/text-field/formatted/style.json b/test/integration/render-tests/text-field/formatted/style.json
new file mode 100644
index 00000000000..5fdaa3c4178
--- /dev/null
+++ b/test/integration/render-tests/text-field/formatted/style.json
@@ -0,0 +1,53 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256,
+      "width": 256
+    }
+  },
+  "center": [ 0, 0 ],
+  "zoom": 0,
+  "sources": {
+    "point": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+              "name": "Napoli",
+              "name_en": "Naples"
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [ 0, 0 ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "text",
+      "type": "symbol",
+      "source": "point",
+      "layout": {
+        "text-field": ["format",
+            ["get", "name_en"], { "font-scale": 1.5 },
+            "Italy", { "font-scale": 0.5} ,
+            "\n", {},
+            ["get", "name"], { "font-scale": 0.5, "text-font": ["literal", [ "NotoCJK" ]] }
+        ],
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ],
+        "text-size": 32
+      }
+    }
+  ]
+}
diff --git a/test/unit/style-spec/spec.test.js b/test/unit/style-spec/spec.test.js
index 8052f61c217..0f29e0d10a1 100644
--- a/test/unit/style-spec/spec.test.js
+++ b/test/unit/style-spec/spec.test.js
@@ -35,7 +35,8 @@ function validSchema(k, t, obj, ref, version, kind) {
         'text-anchor-enum',
         'text-transform-enum',
         'visibility-enum',
-        'property-type'
+        'property-type',
+        'formatted'
     ]);
     const keys = [
         'default',
diff --git a/test/unit/symbol/shaping.test.js b/test/unit/symbol/shaping.test.js
index 23f59fbc9ce..69183efa35c 100644
--- a/test/unit/symbol/shaping.test.js
+++ b/test/unit/symbol/shaping.test.js
@@ -11,60 +11,59 @@ if (typeof process !== 'undefined' && process.env !== undefined) {
 
 test('shaping', (t) => {
     const oneEm = 24;
-    const name = 'Test';
-    const stacks = {
+    const fontStack = 'Test';
+    const glyphs = {
         'Test': JSON.parse(fs.readFileSync(path.join(__dirname, '/../../fixtures/fontstack-glyphs.json')))
     };
-    const glyphs = stacks[name];
 
     let shaped;
 
     JSON.parse('{}');
 
-    shaped = shaping.shapeText(`hi${String.fromCharCode(0)}`, glyphs, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText(`hi${String.fromCharCode(0)}`, glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-null.json'), JSON.stringify(shaped, null, 2));
     t.deepEqual(shaped, JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-null.json'))));
 
     // Default shaping.
-    shaped = shaping.shapeText('abcde', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('abcde', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-default.json'), JSON.stringify(shaped, null, 2));
     t.deepEqual(shaped, JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-default.json'))));
 
     // Letter spacing.
-    shaped = shaping.shapeText('abcde', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0.125 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('abcde', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0.125 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-spacing.json'), JSON.stringify(shaped, null, 2));
     t.deepEqual(shaped, JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-spacing.json'))));
 
     // Line break.
-    shaped = shaping.shapeText('abcde abcde', glyphs, 4 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('abcde abcde', glyphs, fontStack, 4 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-linebreak.json'), JSON.stringify(shaped, null, 2));
     t.deepEqual(shaped, require('../../expected/text-shaping-linebreak.json'));
 
     const expectedNewLine = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-newline.json')));
 
-    shaped = shaping.shapeText('abcde\nabcde', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('abcde\nabcde', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], oneEm, WritingMode.horizontal);
     if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-newline.json'), JSON.stringify(shaped, null, 2));
     t.deepEqual(shaped, expectedNewLine);
 
-    shaped = shaping.shapeText('abcde\r\nabcde', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('abcde\r\nabcde', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], oneEm, WritingMode.horizontal);
     t.deepEqual(shaped.positionedGlyphs, expectedNewLine.positionedGlyphs);
 
     const expectedNewLinesInMiddle = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-newlines-in-middle.json')));
 
-    shaped = shaping.shapeText('abcde\n\nabcde', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('abcde\n\nabcde', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], oneEm, WritingMode.horizontal);
     if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-newlines-in-middle.json'), JSON.stringify(shaped, null, 2));
     t.deepEqual(shaped, expectedNewLinesInMiddle);
 
     // Null shaping.
-    shaped = shaping.shapeText('', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     t.equal(false, shaped);
 
-    shaped = shaping.shapeText(String.fromCharCode(0), glyphs, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText(String.fromCharCode(0), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     t.equal(false, shaped);
 
     // https://github.com/mapbox/mapbox-gl-js/issues/3254
-    shaped = shaping.shapeText('   foo bar\n', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
-    const shaped2 = shaping.shapeText('foo bar', glyphs, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    shaped = shaping.shapeText('   foo bar\n', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
+    const shaped2 = shaping.shapeText('foo bar', glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], oneEm, WritingMode.horizontal);
     t.same(shaped.positionedGlyphs, shaped2.positionedGlyphs);
 
     t.end();

From c88b4dd8b44bde3eccb3608f246ac28fb332d9cd Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Wed, 18 Jul 2018 10:55:54 -0700
Subject: [PATCH 2/5] Support implicit argument coercions for compound
 expressions with multiple overloads. Support string->formatted coercion
 (currently unused).

---
 .../expression/compound_expression.js         | 53 ++++++++++++-------
 .../expression/definitions/coercion.js        | 10 ++++
 src/style-spec/expression/parsing_context.js  |  4 ++
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/style-spec/expression/compound_expression.js b/src/style-spec/expression/compound_expression.js
index e5417f1c6bf..d9dd2b7223d 100644
--- a/src/style-spec/expression/compound_expression.js
+++ b/src/style-spec/expression/compound_expression.js
@@ -67,22 +67,6 @@ class CompoundExpression implements Expression {
             signature.length === args.length - 1 // correct param count
         ));
 
-        // First parse all the args
-        const parsedArgs: Array<Expression> = [];
-        for (let i = 1; i < args.length; i++) {
-            const arg = args[i];
-            let expected;
-            if (overloads.length === 1) {
-                const params = overloads[0][0];
-                expected = Array.isArray(params) ?
-                    params[i - 1] :
-                    params.type;
-            }
-            const parsed = context.parse(arg, 1 + parsedArgs.length, expected);
-            if (!parsed) return null;
-            parsedArgs.push(parsed);
-        }
-
         let signatureContext: ParsingContext = (null: any);
 
         for (const [params, evaluate] of overloads) {
@@ -90,6 +74,29 @@ class CompoundExpression implements Expression {
             // we eventually succeed, we haven't polluted `context.errors`.
             signatureContext = new ParsingContext(context.registry, context.path, null, context.scope);
 
+            // First parse all the args, potentially coercing to the
+            // types expected by this overload.
+            const parsedArgs: Array<Expression> = [];
+            let argParseFailed = false;
+            for (let i = 1; i < args.length; i++) {
+                const arg = args[i];
+                const expectedType = Array.isArray(params) ?
+                    params[i - 1] :
+                    params.type;
+
+                const parsed = signatureContext.parse(arg, 1 + parsedArgs.length, expectedType);
+                if (!parsed) {
+                    argParseFailed = true;
+                    break;
+                }
+                parsedArgs.push(parsed);
+            }
+            if (argParseFailed) {
+                // Couldn't coerce args of this overload to expected type, move
+                // on to next one.
+                continue;
+            }
+
             if (Array.isArray(params)) {
                 if (params.length !== parsedArgs.length) {
                     signatureContext.error(`Expected ${params.length} arguments, but found ${parsedArgs.length} instead.`);
@@ -117,10 +124,16 @@ class CompoundExpression implements Expression {
             const signatures = expected
                 .map(([params]) => stringifySignature(params))
                 .join(' | ');
-            const actualTypes = parsedArgs
-                .map(arg => toString(arg.type))
-                .join(', ');
-            context.error(`Expected arguments of type ${signatures}, but found (${actualTypes}) instead.`);
+
+            const actualTypes = [];
+            // For error message, re-parse arguments without trying to
+            // apply any coercions
+            for (let i = 1; i < args.length; i++) {
+                const parsed = context.parse(args[i], 1 + actualTypes.length);
+                if (!parsed) return null;
+                actualTypes.push(toString(parsed.type));
+            }
+            context.error(`Expected arguments of type ${signatures}, but found (${actualTypes.join(', ')}) instead.`);
         }
 
         return null;
diff --git a/src/style-spec/expression/definitions/coercion.js b/src/style-spec/expression/definitions/coercion.js
index ba50f63aee4..59fcbef4e2b 100644
--- a/src/style-spec/expression/definitions/coercion.js
+++ b/src/style-spec/expression/definitions/coercion.js
@@ -10,6 +10,7 @@ import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
 import type EvaluationContext from '../evaluation_context';
 import type { Type } from '../types';
+import { Formatted, FormattedSection } from './formatted';
 
 const types = {
     'to-number': NumberType,
@@ -73,6 +74,15 @@ class Coercion implements Expression {
                 }
             }
             throw new RuntimeError(error || `Could not parse color from value '${typeof input === 'string' ? input : JSON.stringify(input)}'`);
+        } else if (this.type.kind === 'formatted') {
+            let input;
+            for (const arg of this.args) {
+                input = arg.evaluate(ctx);
+                if (typeof input === 'string') {
+                    return new Formatted([new FormattedSection(input, null, null)]);
+                }
+            }
+            throw new RuntimeError(`Could not parse formatted text from value '${typeof input === 'string' ? input : JSON.stringify(input)}'`);
         } else {
             let value = null;
             for (const arg of this.args) {
diff --git a/src/style-spec/expression/parsing_context.js b/src/style-spec/expression/parsing_context.js
index 1ce14898323..5e4d1a51e21 100644
--- a/src/style-spec/expression/parsing_context.js
+++ b/src/style-spec/expression/parsing_context.js
@@ -113,6 +113,10 @@ class ParsingContext {
                         if (!options.omitTypeAnnotations) {
                             parsed = new Coercion(expected, [parsed]);
                         }
+                    } else if (expected.kind === 'formatted' && (actual.kind === 'value' || actual.kind === 'string')) {
+                        if (!options.omitTypeAnnotations) {
+                            parsed = new Coercion(expected, [parsed]);
+                        }
                     } else if (this.checkSubtype(this.expectedType, parsed.type)) {
                         return null;
                     }

From c742e35f5d6e8097723076b9cd869702ffdfbffc Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Fri, 27 Jul 2018 13:44:11 -0700
Subject: [PATCH 3/5] Update to mapbox-gl-rtl-text 0.2.0 for formatted text
 support. Add test using new formatted RTL functionality.

---
 debug/csp.html                                |   2 +-
 docs/pages/example/mapbox-gl-rtl-text.html    |   2 +-
 package.json                                  |   2 +-
 src/index.js                                  |   2 +-
 .../text-field/formatted-arabic/expected.png  | Bin 0 -> 5873 bytes
 .../text-field/formatted-arabic/style.json    |  61 ++++++++++++++++++
 test/suite_implementation.js                  |   1 +
 yarn.lock                                     |   6 +-
 8 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 test/integration/render-tests/text-field/formatted-arabic/expected.png
 create mode 100644 test/integration/render-tests/text-field/formatted-arabic/style.json

diff --git a/debug/csp.html b/debug/csp.html
index 6f13f833396..3cb47672d54 100644
--- a/debug/csp.html
+++ b/debug/csp.html
@@ -27,7 +27,7 @@
     hash: true
 });
 
-mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.1.2/mapbox-gl-rtl-text.js');
+mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js');
 
 </script>
 </body>
diff --git a/docs/pages/example/mapbox-gl-rtl-text.html b/docs/pages/example/mapbox-gl-rtl-text.html
index 8e99ed3afe5..7e9a18dd222 100644
--- a/docs/pages/example/mapbox-gl-rtl-text.html
+++ b/docs/pages/example/mapbox-gl-rtl-text.html
@@ -1,7 +1,7 @@
 <div id='map'></div>
 
 <script>
-mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.1.2/mapbox-gl-rtl-text.js');
+mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js');
 
 var map = new mapboxgl.Map({
     container: 'map',
diff --git a/package.json b/package.json
index 4f0ce878e58..86a96b4329d 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@mapbox/batfish": "^1.0.4",
     "@mapbox/flow-remove-types": "^1.3.0-await.upstream.1",
-    "@mapbox/mapbox-gl-rtl-text": "^0.1.2",
+    "@mapbox/mapbox-gl-rtl-text": "^0.2.0",
     "@mapbox/mapbox-gl-test-suite": "file:test/integration",
     "babel-eslint": "^7.0.0",
     "benchmark": "~2.1.0",
diff --git a/src/index.js b/src/index.js
index 779d1a18b48..ca505cd65f6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -96,7 +96,7 @@ const exported = {
  * @param {string} pluginURL URL pointing to the Mapbox RTL text plugin source.
  * @param {Function} callback Called with an error argument if there is an error.
  * @example
- * mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.1.2/mapbox-gl-rtl-text.js');
+ * mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js');
  * @see [Add support for right-to-left scripts](https://www.mapbox.com/mapbox-gl-js/example/mapbox-gl-rtl-text/)
  */
 
diff --git a/test/integration/render-tests/text-field/formatted-arabic/expected.png b/test/integration/render-tests/text-field/formatted-arabic/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa904bda07515d25e6a5fa18e23ef3f05b11d6c3
GIT binary patch
literal 5873
zcmds*`&$y&y2mv|3k6d|5xhLzG{F?g)YNLy)XB{44J7YC+fnlZrN*R|H^2**nLS;Y
zG*cN1@dl4hI%&y8VD?T+?INWmm$QpZ3wBmanH}cr^PFGKKX9J2ep$D7t>^o!XRY`B
zysI%GJ_ZDY11&5pKu5kkoMd5PX>M9tY_u^~8K?NU=4!){!-rC+mdo&SvlbREf<JpJ
zl1;)z0Kvy_|0^~1P0RLgzWp`?@+J~&2~8l1qJ~6|o));3MbAGff7RRbpg8@;uj!(+
z(P!+w{>MCQQ+sjKsef$whwl#-HQRr%iU3EvxjgnC9$&9MTU=g$aWG)6;`qCNsXzbG
z@c*?W$qjpfuALs()egu<Uiz5lq)e2D)k}eXP}{Cz)0O&R-7y$z%H-*JXqej9qqg@G
zXV7eo(0@-aiTzsX@N$jiL;34N00`NJovdnd)V4nYm8|f6hj?;LVq{c@D+rUKK(bDm
z9$q|apInAX_=&tLx|8lovHQ?4*Nh_XehNL;&_(aK1>^sH#QrkTu2{LE+Lq-Y2m!p6
zQ}DHNd;v_*EP*wX(BL9|!(59F13)AM$32qg^eU_L6Fqv!K=47?_A%yFdbfEKs3|5T
zQIcB-9dNB0fpXdfh9QEWSdT>mSNO;>A|vuaEr#FGIW0!z!CL*pdmnCQ2mqu6v(lQ>
zX*3nej0h9NUR4ncZA!aXkSyidG@=GY4r1f<irBS1SwYl6jF(Tl2dGrzvcNiETVl<Y
z&2X8HdU<@I6xe&{GK~L(%h{*@#wycv;7!CeiQE6IuCzMoK8EzxQQc{nJb7`UB(zuD
zlLzx&qG$PJiNhx+j^rtGmnY_gQ|hsXUqc|@kwTH&dJpP!4NLmli1W)F8}D|j{dy_R
zPZnU<>?w_>2(u>AS{ny39?&>NQ1}UQs4@Hn(K|jOEQsWDhusG*1p6xhT!t@<=CZ5+
z7m9zP!W@Xd5!&DUZrF|tv3W^w_Erarz`?wEaT#$-C>gHc)uN2Ro5aQ{MBSovLn~|M
z!%AF6qmL1^(BPrXDK#6R9dwBjD4vljT2T8%K$Y4Irowv66+wZN&kw&dY{_UOB@CbO
z(QTbnUN!lwNgexN{4N5wpaFx^wZ3{WviEV}?tZCzR}3Zi)`br_(1H+8$V`o!s^*69
z?(<9*M@t;qCoFeoQ1Eqs)#j{7kSQ31*?=eV_zUl7ckMf4?htCMX<isNSf;A~JD29-
zPMg8AE`E4}uY|porKGH6Lm_C$eyY<|cFx|IOM6wUeIf9&IEiO?T~X{$6zGec`<q5*
zx{kYMDMBVA5zz#{$HYzWD=hKe5%|iL_XO8liHES=wO~I9PoE5Lw!=X7U@X(8x2+HR
zk1;7+Mi5hyH^zK<0U6>|5<M#I83Em09k!`JBb4oQU%h0Hs&o8%YC!x<cJQrf#;x3K
zLZ}0=F878eWpW~JSyCSP%bVY48KY=OG6teEqVV-4ol14Dl*Mg4nIL;L;&NZ@JB7@P
zVdSDH!ML4q%D;wSyFK=P$)q0?!%9i}ip3D^*EALa1DR{54;tdb>t5Q&d%clTxb&Z4
zb;CN}O2D%#k1(-=&qlnOg_heWp8krwuAr2_mIjX2euxKIl+KCfH}gaPRjAxG;x-S>
z)t#C=mFFoNHtdAwN#rB2y;J2{N^jDVBGcq_fOB7Gvj!Wza7le+RbK+Ur}&=BzE#uR
z+0+#IkpqsmJ5ZdHW}wu)gWYM2nfV6cFNxy2jjfCTf=Q!N%82{m`;Qyi4s&LKl^((B
z60+5u+8wc1sn!8cMhD3*@lt9ef9dxj;IQsE4H>U&1Ro3V6n{~5prPO8bmoG>>%(Tc
z6Xd0FhoD8=Cb!tvWS=(SnLZ$Ph^JLwtzML2xXt4eEn^>6wU!GE4`7VWk9j5!rz;Qd
zNsx4h965iIjBxQ~DMhdvq$0;g;ajRpT(fRj&TNrx9D+xb#q>j|n_l|HDeY5czB2?7
z_LUO@m$)pR@X+9+5yxaBjwuD0Hix1Cmvy^`a)Qs*dJ%c+1$^XQ`vnNT&){1L`Dps5
z06rp!9CW)Yg79W)br?&8#}z2m(Y&k7$mhj$*HobGNEG+$>f3ys<Cx<+j1?%H^Hy`{
z3pVjVZw-A*(wP%*)*w2jn;!J1i1>-)uz^y0ww(B7e|7n)_7qbdM)C93z=m?Ry-}tb
z`RfJTYH*k5YDi#J>}4&IDLy)Kh=5$*Cg9e;G|mA_l<Cd~IKKi@HNX^MT6gWDGA@v8
z^%$8!LnTNG7%!|_X_VMqd8hNDb$*kHaN2PgCpB=s;cYv>jtqQ30A3<`Mt9c8O|A>|
zMV}CLBL2?6X_i@K@G6qu$#x8}bj>*skA2#7OkZX|@;d+z$Z&u8Ksz?y<$3Kt@q*)F
zL0U_u0)YX#?krLSkPl`>A#Rx;$|hIR-)6lF_n>`<I~1BZGH;f+aD%)lUV7SOf8ZDL
zF3$+p>$>6vf#Hm)YBDCcKb1=d0I`)vUfnfqe8EG^q2gp4Y;V-U)6mcxx}-JWQ)jrU
zA>MYN7Ptg!gpe&?kouE6T(wSX8%Hk`=w-=VdU<O-k9;8_;F2cGPjrSvw!D|{wDFi8
zb9jk<udubL5mxsjw|<bk`+8^Rkb6Ko;j4gZcRj~1nq(a>$>%oyc%@7Ye`vHWC%7Vk
zMJn12GBP^<gVUu>yVK;>2oK0i)6Y~yn)6wsQxJlC6<_y$1mQI?jw;0ENw!ZaPU{oT
zT3l9pk1_qbaI}wVt60Rvvlp)uYNZth%P!W3fu>->ZUrGQT79CG{WGk4$nB_brpANw
z8@B-iYdjKS=R-mwuUxHpP4;_CaQNh0kf(%)GxqU)-xD#9bNue5!Z{+oZdXX+D{Su}
z+2(FUC`n|I+79Z=i_AQapxCyNbIK;=3=Fg{FKYBl3(G-$<RRL!54g89$NlN*8F;)R
zclq!@1QdaG`w1PLkGe$csri1>ZN1zI&wNd>>Nj8e&`a8IntzvrE?_zHnpKbbzH#Rp
zac*6*GNTffJk#V-svoF{A-mq(C#2x3QPXtXP)G4%8W|ct;WQb65b)dC6c}$Dw-)-G
zzM@Zh$|{aiq@-NH5oudef=kmdcF8M?IKK&wNLGVIdk&&!*Nf!%E)kcFn-rc;M?38T
z?&5ZihkEle2jx`v+u$j1oWglhaSh3w_#QZF^kpit+wZSqSLWvomS3=-IH(R|w{2x{
zYo)_qLPGkujolvxY%9<a9Zj!PwfpjhOR7}0n_@}m=)w49apILCStNC4vjC9>{rs2(
zH96jCmVbJkycBsY0syU;V}PjegUWRB79<c9xIAARUgxF8XD}fNgJ-ZQd(+u8e4%>j
z%9kAnSiaP#S4FYO#v`^RTl~d!z|@`Zk-rjKr4bp`w$OfZ4m4$X-g|9Bu=ca6YdovV
zvrAAl-w37JryJ6_?bF{_m3_Wx`7y`wdHreh^XHG=4_h6SWU7icJ_7Z<S2dNd=7c@g
zMfu5PCbz7iGwDX)Q<2+M;HVHB)4|T90(yk@M-6^Bb$+j8U!Kf!m0%m{d{zXxui3KD
z{2A@|QOlxQ<#t$^$<FSo{u>X3aN|d9g{mMYNJrvwfS1%i0Ru?DbqL(F<@(NE@nR>I
zfI854Bd{V?6YVFyn5P`~t+LM++k`W{Pzw!!5vLVXu<cE|lNe~(vb2Zl)?=_f$5x8&
zKJPmmcGmc}+0eqMu(Lvs01Y6Vu>(&pUKY1tAXRz=ju{OCt>)}%6I+eg^%yPu74i^>
zZdxF;ZJA*l%gb>)$M({^q~qn&KhuJB&ZQ(omIOIg|6Wx~zui)uEi>xH;PA$DV{R+Q
zQ7?7rodEVqTvm5Jr0jm7!80R4WnIry4N9YZ&`vA{bVFCljLGb1LOvDQ92MEW7P^4O
zD_^!-9mJm9lchLKkB64X|A5u_7fPC`jweNyqbu_}LL44IFX;{}Po$H9w?rU>AsnZH
zmLiWS!dq)!>7~>_=TAb&eWGKVvbgKV5X+a^JSI*+a(+y(YLhnOn?3%N-rW(|;jmvH
zEt4R+#ywzN)87P~oz{udrUeO!OLEWEr{lPx_RfdwP=Sh_3EU6n93OG|%3u9!<-|1N
zzm3(uwjUeJ1bP6g^oN4sW*32bn2=b|Zacb?4JhKH9-)Ez^K$GyO*hlG;2ar|cKs3&
zAGv06*WL4mI<)YRYw>2ry!)6HHpQ^DSmGJU_Xjhw%wBU+?Bu7|%}_dJ1kjW0?#a7U
zP4i^iAh(DzN{9#N@2cu6)Z1?VCTkecJhs332-Pi2{(9={0waE`DJ!yfEBNy95FnNo
zrP`7ekVXy?@N*z-P{;pWFnLgnJ4@*|1*c|ASUi-IOT(WxzjMZ^gTia*4RtB5vKi-$
z2D=$C#RL%Op_Cs4#1Z&Ff&}kam*6VH$~D2Dm+hGZOdCXo%bbveLB^XOh~SIzQ>#sc
zZhvA<yrPgP-H7RZ6lFh|#GE))2$7|k?JB^FiZjk_(F3rXOGN&!uS$j^Q=^*K%MoL)
zhFa<rzqupOvP3F^^$2Y_TF+HjEAoY=a56zJ_gq6|?M9cm(~iIxL8UxMi^wKSE=+cf
z%y*5}+PBiXfgB#<BfRy%surKoL_#}(9vYy9r8(Qst|j8%xO5|omZ@S-Q8#c17+fQP
z=TD#YUtngnR`U`i*1gK;@FH>>j$6G4eMA#1vRsV1QPontD4nOcc=L#F`zKC?*AHk3
z7{7-T39l8%6tt~5sE~w^qto3_HjMy(axT|-hBN82C{@D|ZeviK*t%D~yCPNjt7+%+
zh9CK=VO*TNkhVj$l}+7C*{)(;MmwFxY}khJL<p^`Vtv%exFi*;!hnWf>5KHqCAbuD
zn~-gC)Tb8qq6Er+HPDeT)9bN|3cnkOVCm3~kVLsZ=9eYyx8`Jk;O){5I&Jh1Z;r8#
zxB5u5VJpmuNxCr*M`Gl9aGAI%9MSP{yVW4t0dmnh=a*dUT2Oz|+0EIKvzQZttZVBM
z$>;8x&)t&a%o5#qz_N_`yVC^2EyF=$=9mBtNYw^@=~EJyQ=YQZ4aY0t=a~Uo$Eh|&
zk{Nr=01S84!5-RQJxC$<EAUpQ_bT8v0y^is{4>Sl4)ZAJIn}o0Z#69^$Z)E~FtJX0
zV$5=n`;{_$17o@e?fPBE^(R3K9G}4X##AAoMF^<UC*zwdgp<!%sj%i5n->Fyb7NlT
z>%H~`lH6O%Q$TTH0(#9Y4G+4QVnVLNIm8=tmprJ>J(wuXVRzO`_bWT7PM3M~P29Q}
zRp*mBlfO3s9IZ<$)q1x!pHUN2rW@zUVWD5XrYeW06HM;s>i-~4FVP3C5uI?TO8ZpZ
zflAyf5*6Ws3co&G`?cnX$pL>oK@JK5WX~3Q->IG%0rxlyMl5frkAkQ0ld_a9m(q~Z
zL5kB;=QK3rCsEX3ktw)Ty`Rh2XWBnG0pQmBh-Z8@l=;nOhbeeb-3W7N%#Yn;1TZCK
z_-?ZE9o8}YbwfVwsKIxEaUXe=b5I6fOBm#6Jw_a^VMD#n)AyP>2%W{$Q1~?|061rc
z`~3=y&Xiv1<|SJs1>KWQ;j1~CFTi2#3UF8xO9M}(8RBW9<lm%4BS{@Hb*VZeqdr?c
zV@{BZ$Ve{p0ol#}VWIy$Nwa>o5aBs-Vn}x)PFcqHEtK;{JWwmo{3fGXBD`)Ah9%wF
zWGW{K^}L(x>Yr*NWpt1a`X^E$>(1{mF5`9Q6<+H2$y8J1!hj*h<h~xJ&_YaG*DcNv
z??}D0=VaeJGbG9o(@l0F>?@nDKC0Kc%Q%~}Gn`YR_NE0Ozc^znH`-k&&%YV>Dto$S
zQL&*b6TDnFM6xy`U9LK#mHx!cvce6o-SM{ZQDM=f?V)7<dx}QxFHhXpY@)S*Qj(7u
zXz4!FG)|6F0T8sd(Sc-jov`~88cs@(9H(wW0>jJ>0yOytkc8P3gW84t6ckGKTtD>6
zWrz^`MgpewQ3KZ9ye3>P;80cZ`H1I?0BxPAcD6uv_?cm*nc@6KnXU8B=r`;NXNM&u
zj~vT)x|931ytDR<=I)1;q&0A{G%v;AU-?ArUbiUD&x;9DkbYUmX~5wx#nBqz7{bFm
z<ju={D;R+f8n<8XsJ#_|QfPKEAN1Cq(e3V4mUjgeDh^MIPjrFs?EN+`2!YPU%J0ai
za<x<C=3qh~(&V;oeZJFByvDlS(?O?wc$-djALh~FF7WG1^x=2TZIbR!pAl=2XdR~V
z-g=R+<gNH@#trl_LR}4lWrx0NW;BiwQW_@2wbt)R6rIn^OXX`$tg5L@(fKe;L<c*c
zd;NI8;~aQeU<L4gXz4+*F~kL790hu%=p|u>=t9}Rlku!cVaZW)Q|@gpfh&OD$yMKX
zZc7lLs%*WaCF;}Q<@?416(4coy@81ubJJ?BU=dE;w5SL+jMdH6HdW0x*%}?F*lt0B
zsN^;ko-MsEl-+rh5ZRm?pa%Dn_3J1X4f4NM@2s>bk?f_)YchX%lG5dKu^`qpKj;xU
zF}Tvb`R&djO>SkDCckonP89d*8NQ*M#xUf6zUll{noaO1h@CSZ0iZ<e;CxA&X+rfz
zPDze)eDe-@m20rQa;NZyFyq+mbj}mK{BCTz&}tj>tkCVGVMCiVnF_8zd-)K<Zix`v
z60u8CJ1Xpq+Q;PUFOT9jn<I9h(9Rq*epFRQjUa+amuo(!(t`XX^UnQBp2;Vp`Yozg
z>0{iqEGb^YoFgpelD4>L)7GxeZZ!)PX5<IC5V!Qp7u~#(S@U-|CoeoTW*e@7`cRY|
zxt)j>kqb%)>=AlC`|u`i400NpHSxu?$weKz+74+E+TRrcUyC4BT=qMPKRY6Tttjrw
z#M5Go);Qi@2wUUjfDlLB#it_MDpkEwWQ`KdYK)Xh(ENpS4cXAIG0#q>0_Fq50AGvs
zyCg|8&(aP^CitFHVFb3LCaX~1Hv+n?s`D?5xwf9A_(<^yMcZIYQ7aN$>C#*50*8SC
zd&CyOYL4lp-mC2z!#;<v#|D4Xe(k0fjar{?s-XDZX`pGzSE~QeM_-eUlP=42J*ry&
zAuVU(YqF#9?q2XUGvq2`D}nc$wxqgJsI44iR#c|D<I+|zM>$i=Qf*^zEOQ*sm?t~D
liNO+B|EK<ILz2D(h)YW<c>_0pF#lm&9EplQ+#ius`=24)_u~Kn

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/text-field/formatted-arabic/style.json b/test/integration/render-tests/text-field/formatted-arabic/style.json
new file mode 100644
index 00000000000..3e694e5464a
--- /dev/null
+++ b/test/integration/render-tests/text-field/formatted-arabic/style.json
@@ -0,0 +1,61 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256,
+      "width": 256
+    }
+  },
+  "center": [ 0, 0 ],
+  "zoom": 0,
+  "sources": {
+    "point": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+              "name": "بغداد",
+              "name_en": "Baghdad"
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [ 0, 0 ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "text",
+      "type": "symbol",
+      "source": "point",
+      "layout": {
+        "text-field": ["format",
+            ["get", "name"], { "font-scale": 1.5 },
+            " ", {},
+            ["get", "name_en"], { "font-scale": 0.5, "text-font": ["literal", [ "NotoCJK" ]] },
+            " ", {},
+            ["get", "name"], { "font-scale": 1.5 },
+            " ", {},
+            ["get", "name_en"], { "font-scale": 0.5, "text-font": ["literal", [ "NotoCJK" ]] },
+            " ", {},
+            ["get", "name"], { "font-scale": 1.5 },
+            " ", {},
+            ["get", "name_en"], { "font-scale": 0.5, "text-font": ["literal", [ "NotoCJK" ]] }
+        ],
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ],
+        "text-size": 24,
+        "text-max-width": 10
+      }
+    }
+  ]
+}
diff --git a/test/suite_implementation.js b/test/suite_implementation.js
index aca3e7354e4..21674350ea3 100644
--- a/test/suite_implementation.js
+++ b/test/suite_implementation.js
@@ -10,6 +10,7 @@ import path from 'path';
 
 rtlTextPlugin['applyArabicShaping'] = rtlText.applyArabicShaping;
 rtlTextPlugin['processBidirectionalText'] = rtlText.processBidirectionalText;
+rtlTextPlugin['processStyledBidirectionalText'] = rtlText.processStyledBidirectionalText;
 
 module.exports = function(style, options, _callback) { // eslint-disable-line import/no-commonjs
     let wasCallbackCalled = false;
diff --git a/yarn.lock b/yarn.lock
index 288f5937726..d31d0dc4234 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -144,9 +144,9 @@
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/link-to-location/-/link-to-location-1.0.0.tgz#484a4d922e3e6f7b54fd7964d8035bcb00bbf59a"
 
-"@mapbox/mapbox-gl-rtl-text@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.1.2.tgz#c6bdcc05ac71c1caa4dfa09022466d1e278083bc"
+"@mapbox/mapbox-gl-rtl-text@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.2.0.tgz#332fa991dcf6913be369c21f4c20c6c73b5d1c8c"
 
 "@mapbox/mapbox-gl-supported@^1.4.0":
   version "1.4.0"

From e9bbaac2a0c83ecb289954daacb9163410242c5a Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Wed, 1 Aug 2018 12:09:02 -0700
Subject: [PATCH 4/5] Address review comments: - "FormattedExpression" ->
 "FormatExpression" (reasoning: the expression itself is a verb, the result is
 a noun) - Remove dead/debug code - Add comments

---
 build/generate-style-code.js                       | 1 -
 src/style-spec/expression/definitions/formatted.js | 4 ++--
 src/style-spec/expression/definitions/index.js     | 4 ++--
 src/style-spec/validate/validate.js                | 3 ---
 src/symbol/shaping.js                              | 2 +-
 src/symbol/transform_text.js                       | 1 -
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/build/generate-style-code.js b/build/generate-style-code.js
index 70e7b852b2b..e9fa58b72bc 100644
--- a/build/generate-style-code.js
+++ b/build/generate-style-code.js
@@ -5,7 +5,6 @@ const fs = require('fs');
 const ejs = require('ejs');
 const spec = require('../src/style-spec/reference/v8');
 const Color = require('../src/style-spec/util/color');
-const {Formatted} = require('../src/style-spec/expression/definitions/formatted');
 
 global.camelize = function (str) {
     return str.replace(/(?:^|-)(.)/g, function (_, x) {
diff --git a/src/style-spec/expression/definitions/formatted.js b/src/style-spec/expression/definitions/formatted.js
index b9f5238e51e..9a87d99d31a 100644
--- a/src/style-spec/expression/definitions/formatted.js
+++ b/src/style-spec/expression/definitions/formatted.js
@@ -50,7 +50,7 @@ type FormattedSectionExpression = {
     font: Expression | null;
 }
 
-export class FormattedExpression implements Expression {
+export class FormatExpression implements Expression {
     type: Type;
     sections: Array<FormattedSectionExpression>;
 
@@ -94,7 +94,7 @@ export class FormattedExpression implements Expression {
             sections.push({text, scale, font});
         }
 
-        return new FormattedExpression(sections);
+        return new FormatExpression(sections);
     }
 
     evaluate(ctx: EvaluationContext) {
diff --git a/src/style-spec/expression/definitions/index.js b/src/style-spec/expression/definitions/index.js
index c36001e97db..2b50821baa0 100644
--- a/src/style-spec/expression/definitions/index.js
+++ b/src/style-spec/expression/definitions/index.js
@@ -26,7 +26,7 @@ import {
     GreaterThanOrEqual
 } from './comparison';
 import { CollatorExpression } from './collator';
-import { Formatted, FormattedExpression } from './formatted';
+import { Formatted, FormatExpression } from './formatted';
 import Length from './length';
 
 import type { Type } from '../types';
@@ -47,7 +47,7 @@ const expressions: ExpressionRegistry = {
     'case': Case,
     'coalesce': Coalesce,
     'collator': CollatorExpression,
-    'format': FormattedExpression,
+    'format': FormatExpression,
     'interpolate': Interpolate,
     'length': Length,
     'let': Let,
diff --git a/src/style-spec/validate/validate.js b/src/style-spec/validate/validate.js
index 5caa8d75800..09543fd4580 100644
--- a/src/style-spec/validate/validate.js
+++ b/src/style-spec/validate/validate.js
@@ -69,9 +69,6 @@ export default function validate(options) {
         const valid = validateObject(extend({}, options, {
             valueSpec: valueSpec.type ? styleSpec[valueSpec.type] : valueSpec
         }));
-        if (!valid) {
-            console.log("not valid");
-        }
         return valid;
     }
 }
diff --git a/src/symbol/shaping.js b/src/symbol/shaping.js
index 30022a3a737..fc6036fed9d 100644
--- a/src/symbol/shaping.js
+++ b/src/symbol/shaping.js
@@ -44,7 +44,7 @@ type TextJustify = 'left' | 'center' | 'right';
 
 class TaggedString {
     text: string;
-    sectionIndex: Array<number>
+    sectionIndex: Array<number> // maps each character in 'text' to its corresponding entry in 'sections'
     sections: Array<{ scale: number, fontStack: string }>
 
     constructor() {
diff --git a/src/symbol/transform_text.js b/src/symbol/transform_text.js
index 45040543618..e7058086c90 100644
--- a/src/symbol/transform_text.js
+++ b/src/symbol/transform_text.js
@@ -24,7 +24,6 @@ function transformText(text: string, layer: SymbolStyleLayer, feature: Feature)
 
 export default function(text: string | Formatted, layer: SymbolStyleLayer, feature: Feature) {
     if (text instanceof Formatted) {
-        // OK to transform in place?
         text.sections.forEach(section => {
             section.text = transformText(section.text, layer, feature);
         });

From d2e6dcc30b97147aed1794ffaec76bb45b160c75 Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Fri, 3 Aug 2018 14:02:10 -0700
Subject: [PATCH 5/5] Require that `text-font` format argument be an array of
 strings.

---
 src/style-spec/expression/definitions/formatted.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/style-spec/expression/definitions/formatted.js b/src/style-spec/expression/definitions/formatted.js
index 9a87d99d31a..d6e517479b1 100644
--- a/src/style-spec/expression/definitions/formatted.js
+++ b/src/style-spec/expression/definitions/formatted.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { NumberType, ValueType, FormattedType } from '../types';
+import { NumberType, ValueType, FormattedType, array, StringType } from '../types';
 
 
 import type { Expression } from '../expression';
@@ -88,7 +88,7 @@ export class FormatExpression implements Expression {
 
             let font = null;
             if (options['text-font']) {
-                font = context.parse(options['text-font'], 1, ValueType); // Require array of strings?
+                font = context.parse(options['text-font'], 1, array(StringType));
                 if (!font) return null;
             }
             sections.push({text, scale, font});