Make page headers match ISO's example document.

jyasskin · jyasskin · commit 2b39467f16f4 · 2015-05-22T00:22:34.000-07:00
diff --git a/base.css b/base.css
@@ -15,13 +15,23 @@ limitations under the License.
 
 @page {
     margin: 10%;
-    @top-left { content: "© ISO/IEC"; font-size: 10pt; }
-    @top-right { content: string(docnum); font-weight: bold; font-size: 10pt; }
-    @bottom-left { content: string(current-section, last); font-size: 10pt; }
+}
+@page :left {
+    @top-left { content: string(docname); font-weight: bold; font-size: 10pt; }
+    @top-right { content: normal; }
+    @bottom-left { content: counter(page); font-size: 10pt; }
+    @bottom-right { content: "© ISO/IEC " string(pubyear) " — All rights reserved";
+                    font-size: 10pt; }
+}
+@page :right {
+    @top-left { content: normal; }
+    @top-right { content: string(docname); font-weight: bold; font-size: 10pt; }
+    @bottom-left { content: "© ISO/IEC " string(pubyear) " — All rights reserved";
+                   font-size: 10pt; }
     @bottom-right { content: counter(page); font-size: 10pt; }
 }
 @page :first {
-    /* @top-left is defined by base.js. */
+    @top-left { content: normal; }
     @top-right { content: normal; }
     @bottom-left { content: normal; }
     @bottom-right { content: normal; }
@@ -49,6 +59,8 @@ body { margin: 0; }
 }
 
 cxx-docnum { string-set: docnum content(); }
+* /deep/ .docname { string-set: docname content(); }
+* /deep/ .pubyear { string-set: pubyear content(); }
 
 cxx-clause { page-break-before: always; }
 @media screen {
diff --git a/base.js b/base.js
diff --git a/framework.html b/framework.html
@@ -41,4 +41,3 @@
 <link rel="import" href="codeblock.html"/>
 <link rel="import" href="grammar.html"/>
 <link rel="import" href="weak-break.html"/>
-<script src="base.js"></script>
diff --git a/titlepage.html b/titlepage.html
@@ -102,7 +102,7 @@ <h1>Working Draft, {{title}}</h1>
             </template>
           </template>
           <template if="{{stage == 'ts'}}">
-            <strong>ISO/IEC <content select="cxx-project-number"></content>:{{pubyear}}</strong><br/>
+            <strong class="docname">ISO/IEC <content select="cxx-project-number"></content>:<span class="pubyear">{{pubyear}}</span></strong><br/>
           </template>
           ISO/IEC JTC1 SC22 WG21<br/>
           Secretariat: ANSI
