Update the HTML document framework.

Author: jyasskin

Diff for: bower_components/cxx-html-doc-framework/.bower.json

@@ -13,12 +13,12 @@
     "polymer": "Polymer/polymer#0.5.2",
     "core-ajax": "Polymer/core-ajax#0.5.2"
   },
-  "version": "0.3.1",
-  "_release": "0.3.1",
+  "version": "0.3.2",
+  "_release": "0.3.2",
   "_resolution": {
     "type": "version",
-    "tag": "0.3.1",
-    "commit": "355de1737c3e1ee7e941b1ccf7ab0a69d5f63dea"
+    "tag": "0.3.2",
+    "commit": "9604bb1ff78b2f33fbcbcb941ea0fbae2e65d943"
   },
   "_source": "git://github.com/cplusplus/html-doc-framework.git",
   "_target": "*",

Diff for: bower_components/cxx-html-doc-framework/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; }
@@ -48,22 +58,23 @@ 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(); }
 
-cxx-clause { page-break-before: always; }
+cxx-clause, cxx-foreword { page-break-before: always; }
 @media screen {
-    cxx-clause, cxx-toc { margin-top: 3em; }
+    cxx-clause, cxx-toc, cxx-foreword { margin-top: 3em; }
 }
 
-cxx-clause::shadow header { font-size: 150%; }
+cxx-clause::shadow header, cxx-foreword::shadow h1 { font-size: 150%; }
 cxx-toc::shadow h1 { font-size: 150%; }
 cxx-clause cxx-section::shadow header { font-size: 117%; }
 cxx-clause cxx-section cxx-section::shadow header { font-size: 100%; }
 
 [data-bookmark-label] { bookmark-label: attr(data-bookmark-label); }
 h1 { bookmark-level: 1; }
 cxx-toc::shadow h1 { bookmark-level: 2; }
-cxx-clause h1 { bookmark-level: 2; }
+cxx-clause h1, cxx-foreword h1 { bookmark-level: 2; }
 cxx-clause cxx-section h1 { bookmark-level: 3; }
 cxx-clause cxx-section cxx-section h1 { bookmark-level: 4; }
 /* The <h2> is a subtitle, which shouldn't get a PDF bookmark. */

Diff for: bower_components/cxx-html-doc-framework/base.js

@@ -20,13 +20,26 @@
         this.super();
         var toc = document.querySelector('cxx-toc');
         if (toc) {
-          toc.clauses = document.querySelectorAll('cxx-clause');
+          toc.updateClauses();
         }
       }
       Polymer('cxx-clause', {
-        // Convenience function at the clause level, which gets called from <cxx-toc>.
+
+        // Convenience function at the clause level, which gets called
+        // from <cxx-toc>. If the clause is explicitly numbered, then
+        // this sets the clause_num to that value. Otherwise, the clause
+        // number is set to the argument clause_num. This returns
+        // 1 + the value set.
+        //
+        // Note that this will recursively set the section numbers for
+        // this clause.
         set_clause_num: function(clause_num) {
+          // If the author explicitly specified the clause number, don't
+          // use a different number.
+          if (this.number)
+            clause_num = Number(this.number)
           this.update_sec_nums(clause_num);
+          return clause_num + 1;
         },
 
         domReady: updateTocClauses,

Diff for: bower_components/cxx-html-doc-framework/clause.html

@@ -16,8 +16,8 @@
 <polymer-element name="cxx-ednote" noscript>
   <template>
     <style>
-      :host { display: block; }
-      :host-context(body.cxx-pdts) { display: none; }
+      :host { display: none; }
+      :host-context(body.cxx-draft) { display: block; }
       aside { float: right; max-width: 40%;
               margin: 1ex;
               border: 1px dashed #888;

Diff for: bower_components/cxx-html-doc-framework/ednote.html

@@ -0,0 +1,85 @@
+<!-- Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!--
+This element is empty and auto-generates the necessary content.
+-->
+<polymer-element name="cxx-foreword">
+  <template>
+    <style>
+      :host { display: block; min-height: 100%; }
+      :host { page-break-before: always; page-break-after: always; min-height: 100vh; margin-bottom: 2em; }
+
+      :host-context(body.cxx-draft) :host { display: none; }
+    </style>
+    <section>
+      <h1>Foreword</h1>
+
+      <p>
+        ISO (the International Organization for Standardization) is a
+        worldwide federation of national standards bodies (ISO member
+        bodies). The work of preparing International Standards is
+        normally carried out through ISO technical committees. Each
+        member body interested in a subject for which a technical
+        committee has been established has the right to be represented
+        on that committee. International organizations, governmental
+        and non-governmental, in liaison with ISO, also take part in
+        the work. ISO collaborates closely with the International
+        Electrotechnical Commission (IEC) on all matters of
+        electrotechnical standardization.
+      </p>
+      <p>
+        The procedures used to develop this document and those
+        intended for its further maintenance are described in the
+        ISO/IEC Directives, Part 1. In particular the different
+        approval criteria needed for the different types of ISO
+        documents should be noted. This document was drafted in
+        accordance with the editorial rules of the ISO/IEC Directives,
+        Part 2.
+        <a href="http://www.iso.org/directives">www.iso.org/directives</a>
+      </p>
+      <p>
+        Attention is drawn to the possibility that some of the
+        elements of this document may be the subject of patent rights.
+        ISO shall not be held responsible for identifying any or all
+        such patent rights. Details of any patent rights identified
+        during the development of the document will be in the
+        Introduction and/or on the ISO list of patent declarations
+        received.
+        <a href="http://www.iso.org/patents">www.iso.org/patents</a>
+      </p>
+      <p>
+        Any trade name used in this document is information given for
+        the convenience of users and does not constitute an
+        endorsement.
+      </p>
+      <p>
+        For an explanation on the meaning of ISO specific terms and
+        expressions related to conformity assessment, as well as
+        information about ISO's adherence to the WTO principles in the
+        Technical Barriers to Trade (TBT) see the following URL:
+        <a href="http://www.iso.org/iso/home/standards_development/resources-for-technical-work/foreword.htm">Foreword - Supplementary information</a>
+      </p>
+      <p>
+        The committee responsible for this document is ISO/IEC JTC1.
+      </p>
+    </section>
+  </template>
+  <script>
+    Polymer({
+      title: "Foreword",
+    });
+  </script>
+</polymer-element>

Diff for: bower_components/cxx-html-doc-framework/foreword.html

@@ -28,6 +28,7 @@
 <link rel="import" href="ref.html"/>
 <link rel="import" href="foreign-index.html"/>
 <link rel="import" href="titlepage.html"/>
+<link rel="import" href="foreword.html"/>
 <script src="include.js"></script>
 <link rel="import" href="email.html"/>
 <link rel="import" href="ednote.html"/>
@@ -40,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 for: bower_components/cxx-html-doc-framework/framework.html

@@ -14,10 +14,15 @@
 -->
 
 <!--
-    Recognizes attributes 'id' and 'title', but marking these as attributes
+    Sections auto-number themselves and their paragraphs. The chosen number can
+    be overridden by setting the 'number' attribute. A paragraph can also be
+    marked as a continuation of the previous paragraph (without its own number)
+    by giving it a 'cont' class.
+
+    Also recognizes attributes 'id' and 'title', but marking these as attributes
     cause problems for the ShadowDOM polyfill.
 -->
-<polymer-element name="cxx-section" constructor="CxxSectionElement">
+<polymer-element name="cxx-section" constructor="CxxSectionElement" attributes="number">
   <template>
     <style>
       :host { display: block; }

Diff for: bower_components/cxx-html-doc-framework/section.html

@@ -30,7 +30,10 @@ limitations under the License.
             // Assume there aren't any elements between cxx-section levels.
             for (var child = this.firstChild; child; child = child.nextSibling) {
                 if (child instanceof CxxSectionElement) {
-                    child.update_sec_nums(this.sec_num + '.' + (child_index++));
+                    if (child.number)
+                        child_index = Number(child.number);
+                    child.update_sec_nums(this.sec_num + '.' + child_index);
+                    child_index++;
                 }
             }
         },
@@ -58,19 +61,22 @@ limitations under the License.
                  child = child.nextElementSibling) {
                 if (child instanceof CxxSectionElement)
                     return para_num;
-                else if (child instanceof HTMLParagraphElement &&
-                         !child.classList.contains('cont'))
-                    this.numberParagraph(para_num++, child);
+                else if (child instanceof HTMLParagraphElement && !child.classList.contains('cont'))
+                    para_num = this.numberParagraph(para_num, child);
                 else if (child instanceof CxxFunctionElement) {
-                    this.numberParagraph(para_num++, child);
+                    para_num = this.numberParagraph(para_num, child);
                     para_num = this.numberParagraphChildren(child, para_num);
                 } else if (child instanceof CxxFunctionAttributeElement)
-                    this.numberParagraph(para_num++, child);
+                    para_num = this.numberParagraph(para_num, child);
             }
             return para_num;
         },
 
         numberParagraph: function(number, element) {
+            // If the paragraph is explicitly numbered, use that number.
+            if (element.hasAttribute("number"))
+                number = Number(element.getAttribute("number"))
+
             var id = this.id + '.' + number;
             if (element.id) {
                 console.warn('Paragraph already has id:', element);
@@ -81,6 +87,7 @@ limitations under the License.
                 element.id = id;
             }
             element.setAttribute('para_num', number);
+            return number + 1
         }
     })
 })();