Move edition number to subtitle (#352)

Move to ED

spec/entities.dtd

@@ -1,14 +1,15 @@
 
 <!-- comment / uncomment the appropriate entity -->
-<!-- <!ENTITY % sub.entities SYSTEM "entitiesedcopy.dtd" > -->
+<!ENTITY % sub.entities SYSTEM "entitiesedcopy.dtd" >
 <!-- <!ENTITY % sub.entities SYSTEM "entitieswd.dtd" > -->
-<!ENTITY % sub.entities SYSTEM "entitiescr.dtd" >
+<!-- <!ENTITY % sub.entities SYSTEM "entitiescr.dtd" > -->
 <!-- <!ENTITY % sub.entities SYSTEM "entitiesper.dtd" > -->
 <!-- <!ENTITY % sub.entities SYSTEM "entitiesrec.dtd" > -->
 %sub.entities;
 
 <!-- Titles -->
-<!ENTITY title "Timed Text Markup Language 1 (TTML1) (Third Edition)" >
+<!ENTITY title "Timed Text Markup Language 1 (TTML1)" >
+<!ENTITY subtitle "Third Edition" >
 
 <!-- XML Namespaces used in the drafts -->
 <!ENTITY nsuri "http://www.w3.org/ns/ttml" >

spec/ttml1.xml

@@ -6,6 +6,7 @@
 <!ENTITY status SYSTEM "status.xml">
 <!ENTITY document.status "W3C Editors' Draft">
 <!ENTITY title "&title;">
+<!ENTITY subtitle "&subtitle;">
 <!ENTITY prevloc "http://www.w3.org/TR/2013/REC-ttml1-20130924/">
 <!ENTITY latestedloc "https://w3c.github.io/ttml1/index.html">
 <!ENTITY versionOfTT "1">
@@ -51,6 +52,7 @@
 <spec w3c-doctype="&doctype;" role="&document.role;">
 <header>
 <title>&title;</title>
+<subtitle>&subtitle;</subtitle>
 <w3c-designation>&w3c-designation;</w3c-designation>
 <w3c-doctype>&document.status;</w3c-doctype>
 <pubdate>

spec/xmlspec-ttml1.xsl

@@ -498,7 +498,7 @@ width: 100%;
           <xsl:with-param name="conditional" select="0"/>
           <xsl:with-param name="default.id" select="'subtitle'"/>
         </xsl:call-template>
-        <xsl:apply-templates select="subtitle"/>
+        <xsl:value-of select="subtitle"/>
       </h2>
     </xsl:if>
     <xsl:text>&#10;</xsl:text>