@@ -58,7 +58,6 @@ body { margin: 0; }
     html, body {height: 100%}
 }
 
-cxx-docnum { string-set: docnum content(); }
 * /deep/ .docname { string-set: docname content(); }
 * /deep/ .pubyear { string-set: pubyear content(); }
 
 
@@ -68,8 +68,8 @@
           <template if="{{docnum}}">
             <tr><th>Document Number:</th><td><content select="cxx-docnum"></content></td></tr>
           </template>
-          <template if="{{pubdate}}">
-            <tr><th>Date:</th><td><content select="time[pubdate]"></content></td></tr>
+          <template if="{{hasPubdate}}">
+            <tr><th>Date:</th><td><time pubdate><span class="pubyear">{{pubyear}}</span>-{{pubmonth}}-{{pubday}}</time></td></tr>
           </template>
           <template if="{{revises}}">
             <tr><th>Revises:</th><td><content select="cxx-revises"></content></td></tr>
@@ -93,7 +93,7 @@ <h1>Working Draft, {{title}}</h1>
         <div class="header">
           <template if="{{stage == 'pdts' || stage == 'dts'}}">
             <strong>ISO/IEC JTC1 SC22 WG21 <content select="cxx-docnum"/></content></strong><br/>
-            Date: <content select="time[pubdate]"></content><br/>
+            Date: <time pubdate><span class="pubyear">{{pubyear}}</span>-{{pubmonth}}-{{pubday}}</time><br/>
             <template if="{{stage == 'pdts'}}">
               ISO/IEC PDTS <content select="cxx-project-number"></content><br/>
             </template>
@@ -178,7 +178,7 @@ <h2>Langages de programmation — {{title_fr}}</h2>
   <!-- Find your project number at https://isocpp.org/std/status. -->
   <template><content></content></template>
 </polymer-element>
-<polymer-element name="cxx-docnum" noscript>
+<polymer-element name="cxx-docnum" noscript class="docname">
   <template><content></content></template>
 </polymer-element>
 <polymer-element name="cxx-editor" noscript>
 
@@ -18,7 +18,7 @@ limitations under the License.
         // Default properties
         projectNumber: null,
         docnum: null,
-        pubdate: null,
+        hasPubdate: false,
         editor: null,
         revises: null,
         title: null,
@@ -65,8 +65,14 @@ limitations under the License.
         domReady: function() {
             this.projectNumber = this.querySelector('cxx-project-number');
             this.docnum = this.querySelector('cxx-docnum');
-            this.pubdate = this.querySelector('time[pubdate]');
-            this.pubyear = new Date(this.pubdate.textContent.split('-')).getFullYear();
+            var pubdateElem = this.querySelector('time[pubdate]');
+            this.hasPubdate = !!pubdateElem;
+            if (pubdateElem) {
+                var pubdate = pubdateElem.textContent.split('-');
+                this.pubyear = pubdate[0];
+                this.pubmonth = pubdate[1];
+                this.pubday = pubdate[2];
+            }
             this.editor = this.querySelector('cxx-editor');
             this.revises = this.querySelector('cxx-revises');
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ body { margin: 0; }`
`58`	`58`	`html, body {height: 100%}`
`59`	`59`	`}`
`60`	`60`
`61`		`-cxx-docnum { string-set: docnum content(); }`
`62`	`61`	`* /deep/ .docname { string-set: docname content(); }`
`63`	`62`	`* /deep/ .pubyear { string-set: pubyear content(); }`
`64`	`63`