From 6b2981b315db0e8ade33572dc4183970c16dedef Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Thu, 9 Jun 2022 16:29:06 -0500
Subject: [PATCH] Add +start and -end sigils for markup elements

---
 spec/message.ebnf |  7 ++++---
 spec/syntax.md    | 15 +++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/spec/message.ebnf b/spec/message.ebnf
index d70b4caad3..094a9d43de 100644
--- a/spec/message.ebnf
+++ b/spec/message.ebnf
@@ -10,7 +10,7 @@ VariantKey ::= Literal | Nmtoken | '*'
 Pattern ::= '[' (Text | Placeholder)* ']' /* ws: explicit */
 
 /* Placeholders */
-Placeholder ::= '{' (Expression | MarkupStart | MarkupEnd)? '}'
+Placeholder ::= '{' (Expression | Markup | MarkupEnd)? '}'
 
 /* Expressions */
 Expression ::= Operand Annotation? | Annotation
@@ -19,8 +19,7 @@ Annotation ::= Function Option*
 Option ::= Name '=' (Literal | Nmtoken | Variable)
 
 /* Markup Tags */
-MarkupStart ::= Name Option*
-MarkupEnd ::= '/' Name
+Markup ::= MarkupStart Option*
 
 <?TOKENS?>
 
@@ -38,6 +37,8 @@ AnyChar ::= .
 /* Names */
 Variable ::= '$' Name /* ws: explicit */
 Function ::= ':' Name /* ws: explicit */
+MarkupStart ::= '+' Name /* ws: explicit */
+MarkupEnd ::= '-' Name /* ws: explicit */
 Name ::= NameStart NameChar* /* ws: explicit */
 Nmtoken ::= NameChar+ /* ws: explicit */
 NameStart ::= [a-zA-Z] | "_"
diff --git a/spec/syntax.md b/spec/syntax.md
index c4bda5862f..07d5409700 100644
--- a/spec/syntax.md
+++ b/spec/syntax.md
@@ -320,7 +320,7 @@ Examples:
 Placeholders can contain expressions and markup elements.
 
 ```ebnf
-Placeholder ::= '{' (Expression | MarkupStart | MarkupEnd) '}'
+Placeholder ::= '{' (Expression | Markup | MarkupEnd) '}'
 ```
 
 ### Expressions
@@ -340,6 +340,8 @@ Expression ::= Operand Annotation? | Annotation
 Operand ::= Literal | Variable
 Annotation ::= Function Option*
 Option ::= Name '=' (Literal | Nmtoken | Variable)
+Variable ::= '$' Name /* ws: explicit */
+Function ::= ':' Name /* ws: explicit */
 ```
 
 Examples:
@@ -377,8 +379,9 @@ They mimic XML elements, but do not require well-formedness.
 Standalone display elements should be represented as function expressions.
 
 ```ebnf
-MarkupStart ::= Name Option*
-MarkupEnd ::= '/' Name
+Markup ::= MarkupStart Option*
+MarkupStart ::= '+' Name /* ws: explicit */
+MarkupEnd ::= '-' Name /* ws: explicit */
 ```
 
 Examples:
@@ -412,7 +415,9 @@ AnyChar ::= .
 ### Names
 
 The _name_ token is used for variable names (prefixed with `$`),
-function names (prefixed with `:`) as well as option names.
+function names (prefixed with `:`),
+markup names (prefixed with `+` or `-`),
+as well as option names.
 A name cannot start with an ASCII digit and certain basic combining characters.
 Otherwise, the set of characters allowed in names is large.
 
@@ -427,8 +432,6 @@ and [defined in CLDR](https://unicode-org.github.io/cldr-staging/charts/latest/g
 uses Nmtokens.
 
 ```ebnf
-Variable ::= '$' Name /* ws: explicit */
-Function ::= ':' Name /* ws: explicit */
 Name ::= NameStart NameChar* /* ws: explicit */
 Nmtoken ::= NameChar+ /* ws: explicit */
 NameStart ::= [a-zA-Z] | "_"