--- a/ttml2/spec/ttml2.xml	Tue Sep 23 12:57:58 2014 -0600
+++ b/ttml2/spec/ttml2.xml	Tue Sep 23 20:35:12 2014 -0600
@@ -3142,6 +3142,7 @@
 <eg xml:space="preserve">
 ttp:cellResolution
   : columns rows                            // <emph>columns</emph> != 0; <emph>rows</emph> != 0
+
 columns | rows
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
 </eg>
@@ -3250,10 +3251,13 @@
   : designators
   | "all(" designators ")"
   | "any(" designators ")"
+
 designators
   : designator (lwsp designator)*
+
 designator
   : xsd:anyURI
+
 lwsp
   : ( ' ' | '\t' | '\n' | '\r' )+
 </eg>
@@ -3511,6 +3515,7 @@
 <eg xml:space="preserve">
 ttp:frameRateMultiplier
   : numerator denominator                   // <emph>numerator</emph> != 0; <emph>denominator</emph> != 0
+
 numerator | denominator
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
 </eg>
@@ -3787,6 +3792,7 @@
 <eg xml:space="preserve">
 ttp:mediaOffset
   : sign? <loc href="#timing-value-timeExpression">&lt;timeExpression&gt;</loc>                  // restricted to <emph>offset-time</emph> form
+
 sign
   : "+" | "-"
 </eg>
@@ -3883,6 +3889,7 @@
 <eg xml:space="preserve">
 ttp:pixelAspectRatio
   : width height                            // <emph>width</emph> != 0; <emph>height</emph> != 0
+
 width | height
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
 </eg>
@@ -3926,6 +3933,7 @@
 <eg xml:space="preserve">
 <phrase role="deprecated">ttp:profile</phrase>
   : designator
+
 designator
   : xsd:anyURI
 </eg>
@@ -3962,10 +3970,13 @@
   : designators
   | "all(" designators ")"
   | "any(" designators ")"
+
 designators
   : designator (lwsp designator)*
+
 designator
   : xsd:anyURI
+
 lwsp
   : ( ' ' | '\t' | '\n' | '\r' )+
 </eg>
@@ -8470,14 +8481,19 @@
   | "rgb" "(" r-value "," g-value "," b-value ")"
   | "rgba" "(" r-value "," g-value "," b-value "," a-value ")"
   | <loc href="#style-value-namedColor">&lt;namedColor&gt;</loc>
+
 rrggbb
   :  <loc href="#style-value-hexDigit">&lt;hexDigit&gt;</loc>{6}
+
 rrggbbaa
   :  <loc href="#style-value-hexDigit">&lt;hexDigit&gt;</loc>{8}
+
 r-value | g-value | b-value | a-value
   : component-value
+
 component-value
   : non-negative-integer                    // valid range: [0,255]
+
 non-negative-integer
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
 </eg>
@@ -8546,29 +8562,39 @@
 &lt;familyName&gt;
   : unquoted-string
   | quoted-string
+
 unquoted-string
   : identifier ( lwsp identifier )*
+
 lwsp
   : ( ' ' | '\t' | '\n' | '\r' )+
+
 identifier
   : [-]? identifier-start identifier-following*
+
 identifier-start
   : [_a-zA-Z]
   | non-ascii-or-c1
   | escape
+
 identifier-following
   : [_a-zA-Z0-9-]
   | non-ascii-or-c1
   | escape
+
 non-ascii-or-c1
   : [^\0-\237]
+
 escape
   : '\\' <emph>char</emph>
+
 quoted-string
   : double-quoted-string
   | single-quoted-string
+
 double-quoted-string
   : '"' ( [^"\\] | escape )+ '"'
+
 single-quoted-string
   : "'" ( [^'\\] | escape )+ "'"
 </eg>
@@ -8707,21 +8733,29 @@
 &lt;length&gt;
   : scalar
   | percentage
+
 scalar
   : number units
+
 percentage
   : number "%"
+
 sign
   : "+" | "-"
+
 number
   : sign? non-negative-number
+
 non-negative-number
   : non-negative-integer
   | non-negative-real
+
 non-negative-integer
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 non-negative-real
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>* "." <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 units
   : "px"
   | "em"
@@ -10583,24 +10617,33 @@
 &lt;timeExpression&gt;
   : clock-time
   | offset-time
+
 clock-time
   : hours ":" minutes ":" seconds ( fraction | ":" frames ( "." sub-frames )? )?
+
 offset-time
   : time-count fraction? metric?
+
 hours
   : <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc>
   | <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 minutes | seconds
   : <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc>
+
 frames
   : <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc>
   | <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc> <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 sub-frames
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 fraction
   : "." <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 time-count
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 metric
   : "h"                 // hours
   | "m"                 // minutes
@@ -10634,7 +10677,7 @@
 ref="parameter-attribute-subFrameRate"/>.
 It is considered an error if a <emph>sub-frames</emph> term is specified
 when the <code>clock</code> time base applies.</p>
-<p>If a &lt;timeExpression&gt; is expressed in terms of a
+<p>If a &lt;timeExpression&gt; is expressed in terms of an
 <emph>offset-time</emph> and no <emph>metric</emph> is specified, then it is to be treated as
 if a metric of <code>s</code> (seconds) were specified.</p>
 </div3>
@@ -11177,18 +11220,24 @@
 <eg xml:space="preserve">
 &lt;keySplines&gt;
   : control [ lwsp? ";" lwsp? control ]*
+
 control
   : x1 comma? y1 comma? x2 comma? y2
+
 x1, x2, y1, y2
   : coordinate
+
 coordinate                                // 0 &ge; <emph>value</emph> &ge; 1
   : whole
   | whole "." fraction
   | "." fraction
+
 whole, fraction
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 comma
   : ","
+
 lwsp
   : ( ' ' | '\t' | '\n' | '\r' )+
 </eg>
@@ -11212,12 +11261,15 @@
 <eg xml:space="preserve">
 &lt;keyTimes&gt;
   : time [ lwsp? ";" lwsp? time ]*
+
 time                                // 0 &ge; <emph>value</emph> &ge; 1
   : whole
   | whole "." fraction
   | "." fraction
+
 whole, fraction
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
+
 lwsp
   : ( ' ' | '\t' | '\n' | '\r' )+
 </eg>
@@ -11240,6 +11292,7 @@
 &lt;repeatCount&gt;
   : count
   | "indefinite"
+
 count:
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+                       // <emph>value</emph> > 0
 </eg>
@@ -11711,6 +11764,7 @@
 <eg xml:space="preserve">
 ttm:role
   role ( <emph>S</emph> role )*
+
 role
   : "action"
   | "caption"
@@ -11730,8 +11784,10 @@
   | "title"
   | "transcription"
   | extension-role
+
 extension-role
   : "x-" token-char+
+
 token-char
   : { XML NameChar }    // XML 1.1 Production [4a]
 </eg>
@@ -12151,10 +12207,13 @@
 <eg xml:space="preserve">
 feature-designation
   : feature-namespace designation
+
 feature-namespace
   : <emph>TT Feature Namespace</emph>                    // http://www.w3.org/ns/ttml/feature/
+
 designation
   : "#" token-char+
+
 token-char
   : { XML NameChar }                        // XML 1.1 Production [4a]
 </eg>
@@ -14656,11 +14715,14 @@
 <eg xml:space="preserve">
 extension-designation
   : extension-namespace designation
+
 extension-namespace
   : <emph>TT Extension Namespace</emph>                  // http://www.w3.org/ns/ttml/extension/
   | <emph>Other Extension Namespace</emph>               // expressed as an absolute URI
+
 designation
   : "#" token-char+
+
 token-char
   : { XML NameChar }                        // XML 1.1 Production [4a]
 </eg>