metanorma-ogc 1.2.3 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c6f3c76c039ed3ea541e1f0185171f1a69c085191dc873b117443f12fa872df
-  data.tar.gz: 0f28b83c892db58c13a08104a533059a3b554f4171e8cbecf95b00bb984d11fd
+  metadata.gz: 6245ace03109e272fe254101d73a9cc5480d88d381c55d74559a947765996927
+  data.tar.gz: b26cf5092c6612aca2b976587bcca88a6779d8df5a71c65e83c906ca50448f92
 SHA512:
-  metadata.gz: 28e2a963922bddfd0059639441e0a3813082071e62cf518e33f6953f83bdd327ccf154b8832ac01a05a2ac9848414d8d359da9c8c1ca5c892bf592e29b9c50fa
-  data.tar.gz: 84402d7fe7fe190ff748955c48bfefa3eebb546bffaffbfdd446066a36152785314c0d5033d0c08b8a56ac36fb2390e2d32a79686b823e3259c7e6535addffe5
+  metadata.gz: 6a043cf809b33c32c3f5fba14a6b626bde3a3a0b17378fc09d5de47d5d3ea1f469b8b2a2e47d4a04ef603b7a9d57a17977e9d37e8f3ff71ec2af7892aa0df20d
+  data.tar.gz: 3535cca021ddde7151343fb0b281685bcda3e2800256eb2e2f3a60a3508ae11a39c9a57cd866642b4ca31b18692cdcff10b0707fed54caadb8eff61fd4cc8d89

data/.github/workflows/rake.yml

@@ -0,0 +1,62 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main  ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '2.7'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
+
+      - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger tests passed event
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/README.adoc

@@ -1,16 +1,15 @@
 = metanorma-ogc: Metanorma processor for the Open Geospatial Consortium document class
 
 image:https://img.shields.io/gem/v/metanorma-ogc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ogc"]
-image:https://github.com/metanorma/metanorma-ogc/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=macos"]
-image:https://github.com/metanorma/metanorma-ogc/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=ubuntu"]
-image:https://github.com/metanorma/metanorma-ogc/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=windows"]
+image:https://github.com/metanorma/metanorma-ogc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ogc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-ogc.svg["Pull Requests", link="https://github.com/metanorma/metanorma-ogc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-ogc/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-ogc/releases"]
 
 == Functionality
 
-This gem processes Metanorma documents into the OGC document class.
+This gem processes https://www.metanorma.com[Metanorma documents] following
+a template for generating OGC standards and documents.
 
 It provides the following functions:
 

data/lib/asciidoctor/ogc/basicdoc.rng

@@ -158,17 +158,7 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <choice>
-          <ref name="formula"/>
-          <ref name="ul"/>
-          <ref name="ol"/>
-          <ref name="dl"/>
-          <ref name="quote"/>
-          <ref name="sourcecode"/>
-          <ref name="paragraph"/>
-          <ref name="table"/>
-          <ref name="figure"/>
-        </choice>
+        <ref name="paragraph"/>
       </oneOrMore>
     </element>
   </define>
@@ -1028,6 +1018,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/lib/asciidoctor/ogc/boilerplate.xml

@@ -92,8 +92,8 @@
   </license-statement>
 
   <legal-statement>
-    {% if doctype == "Standard" or doctype == "Community Standard" %}
-    {% if stage == "Published" or stage == "Withdrawn" %}
+    {% if doctype == "Standard" or doctype == "Community Standard" or doctype == "Abstract Specification" %}
+    {% if stage == "Approved" or stage == "Withdrawn" %}
     <clause>
       <title>Warning</title>
       <p>This document is an OGC Member approved international standard. This document is available on a royalty free, non-discriminatory basis. Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.

data/lib/asciidoctor/ogc/converter.rb

@@ -78,6 +78,25 @@ module Asciidoctor
 
       def make_preface(x, s)
         super
+        insert_security(x, s)
+        insert_submitters(x, s)
+      end
+
+      def add_id
+        %(id="_#{UUIDTools::UUID.random_create}")
+      end
+
+      def insert_security(x, s)
+        preface = s.at("//preface") ||
+          s.add_previous_sibling("<preface/>").first
+        s = x&.at("//clause[@type = 'security']")&.remove ||
+          "<clause type='security' #{add_id}>"\
+          "<title>Security Considerations</title>"\
+          "<p>#{@i18n.security_empty}</p></clause>"
+        preface.add_child s
+      end
+
+      def insert_submitters(x, s)
         if x.at("//submitters")
           preface = s.at("//preface") || 
             s.add_previous_sibling("<preface/>").first
@@ -90,6 +109,8 @@ module Asciidoctor
         case clausetype = node&.attr("heading")&.downcase || node.title.downcase
         when "submitters" then return submitters_parse(attrs, xml, node)
         when "conformance" then attrs = attrs.merge(type: "conformance")
+        when "security considerations" then attrs = 
+          attrs.merge(type: "security")
         end
         super
       end
@@ -109,8 +130,11 @@ module Asciidoctor
         return
       end
 
-      def cleanup(xmldoc)
+      def bibdata_cleanup(xmldoc)
         super
+        a = xmldoc.at("//bibdata/status/stage")
+        a.text == "published" and
+          a.children = "approved"
       end
 
       def presentation_xml_converter(node)

data/lib/asciidoctor/ogc/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -64,6 +71,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -137,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -859,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -880,7 +904,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1153,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">
@@ -1481,11 +1463,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>

data/lib/asciidoctor/ogc/ogc.rng

@@ -54,7 +54,7 @@
     <define name="preface">
       <element name="preface">
         <optional>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
         </optional>
         <ref name="foreword"/>
         <optional>
@@ -104,6 +104,13 @@
   </define>
   <define name="ogc-standard">
     <element name="ogc-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/asciidoctor/ogc/validate.rb

@@ -18,7 +18,7 @@ module Asciidoctor
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(swg-draft oab-review public-rfc tc-vote
-        published deprecated retired).include? stage or
+        approved deprecated retired).include? stage or
         @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
       end
 

data/lib/isodoc/ogc/base_convert.rb

@@ -7,7 +7,6 @@ module IsoDoc
   module Ogc
     module BaseConvert
       def cleanup(docxml)
-        #requirement_table_cleanup(docxml)
         super
         term_cleanup(docxml)
       end

data/lib/isodoc/ogc/biblio.rb

@@ -12,6 +12,7 @@ module IsoDoc
         list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
           id = bibitem_ref_code(b)
           identifier = render_identifier(id)
+          identifier[1] = nil
           if bibliography
             ref_entry_code(r, ordinal, identifier, id)
           end

data/lib/isodoc/ogc/html/_coverpage.css

@@ -23,6 +23,12 @@
   border-right: 100px solid transparent;
   position: absolute; }
 
+.document-type-band {
+  top: 260px; }
+
+.document-stage-band > :first-child {
+  height: 240px; }
+
 .coverpage-metadata {
   margin-top: 35px;
   padding-top: 15px;

data/lib/isodoc/ogc/html/_coverpage.scss

@@ -27,6 +27,14 @@
   position: absolute;
 }
 
+.document-type-band {
+  top: 260px;
+}
+
+.document-stage-band > :first-child {
+  height: 240px;
+}
+
 .coverpage-metadata {
   margin-top: 35px;
   padding-top: 15px;

data/lib/isodoc/ogc/html/html_ogc_titlepage.html

@@ -1,5 +1,5 @@
 <div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band">
-    <p class="document-stage">{{ stage }}</p>
+    <p class="document-stage">{{ stage_display }}</p>
 </div>
 
 <div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
@@ -85,7 +85,7 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <p><span class="coverpage-maturity" id="{{ stage | replace: ' ', '-' | downcase }}">{{ stage }}</span></p>
+    <p><span class="coverpage-maturity" id="{{ stage | replace: ' ', '-' | downcase }}">{{ stage_display }}</span></p>
   </div>
 </div>
 
@@ -98,7 +98,7 @@
     <tr><td>Document number:</td><td>{{docnumber}}</td></tr>
     <tr><td>Document type:</td><td>OGC {{doctype}}</td></tr>
     <tr><td align="right">Document subtype:</td><td align="right">{{docsubtype}}</td></tr>
-    <tr><td align="right">Document stage:</td><td align="right">{{stage}}</td></tr>
+    <tr><td align="right">Document stage:</td><td align="right">{{stage_display}}</td></tr>
     <tr><td align="right">Document language:</td><td align="right">{{doclanguage}}</td></tr>
   </table>
 </div>

data/lib/isodoc/ogc/html/htmlstyle.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -104,6 +104,10 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #standard-band {
   background-color: #3D9970; }
 
@@ -260,11 +264,213 @@ div.document-stage-band, div.document-type-band {
 #retired {
   border-bottom: solid 3px #7e0d13; }
 
+.coverpage-maturity, .coverpage-stage {
+  font-family: {{headerfont}};
+  font-weight: 400;
+  font-size: 1.3em;
+  margin: 0 0 2em 0;
+  text-transform: uppercase; }
+
+.icon-svg {
+  width: 100%;
+  color: #5ecf86; }
+
+.wrapper-top {
+  background: #00335b;
+  background: linear-gradient(130deg, #00335b 45%, #f1f8ff 100%);
+  color: #ffffff;
+  padding: 5em 0;
+  width: 100%; }
+
+.wrapper-top-bottom {
+  width: 0;
+  height: 0;
+  border-top: 100px solid #00335b;
+  border-right: 100px solid transparent;
+  position: absolute; }
+
+.document-type-band {
+  top: 260px; }
+
+.document-stage-band > :first-child {
+  height: 240px; }
+
+.coverpage-metadata {
+  margin-top: 35px;
+  padding-top: 15px;
+  margin-right: 25px;
+  border-top: solid 1px white; }
+
+.coverpage-metadata,
+.coverpage-alt-formats {
+  font-size: 12px;
+  font-family: {{headerfont}};
+  margin-left: 1em;
+  text-align: left; }
+  .coverpage-metadata span,
+  .coverpage-alt-formats span {
+    display: block;
+    text-align: left; }
+    .coverpage-metadata span a,
+    .coverpage-alt-formats span a {
+      color: white; }
+      .coverpage-metadata span a:hover,
+      .coverpage-alt-formats span a:hover {
+        text-decoration: underline;
+        background: none;
+        box-shadow: none !important;
+        font-weight: 400; }
+  .coverpage-metadata .value,
+  .coverpage-alt-formats .value {
+    font-size: 15px;
+    margin-bottom: 15px; }
+  .coverpage-metadata .label,
+  .coverpage-alt-formats .label {
+    font-size: 12px;
+    padding: 0; }
+
+.coverpage-alt-formats span {
+  display: inline;
+  text-align: left; }
+  .coverpage-alt-formats span a {
+    padding-right: 5px; }
+
+.coverpage-title {
+  padding-bottom: 0.5em;
+  font-family: {{headerfont}};
+  font-weight: 100;
+  padding-left: 1em;
+  padding-right: 1em; }
+  .coverpage-title span {
+    font-family: {{headerfont}};
+    font-size: 1.8em;
+    line-height: 1; }
+
+.docstage-box table {
+  width: auto; }
+
+.docstage-box th {
+  background-color: #93c0d6; }
+
+.docstage-box td {
+  vertical-align: top;
+  background-color: #daeef3;
+  padding: 0.5em;
+  border: 0; }
+
+.docstage-box th:first-child {
+  border-radius: 1em 0 0 0; }
+
+.docstage-box th:last-child {
+  border-radius: 0 1em 0 0; }
+
+.docstage-box tr:first-child {
+  border-radius: 0 0 0 1em; }
+
+.docstage-box tr:last-child {
+  border-radius: 0 1em 0 0; }
+
+.docstage-box tr:last-child > td:first-child {
+  border-radius: 0 0 0 1em; }
+
+.docstage-box tr:last-child > td:last-child {
+  border-radius: 0 0 1em 0; }
+
+.WordSection11 {
+  padding: 0 2em 0 3em; }
+
+.info-section {
+  padding: 0 2em 0 5em; }
+
+.prefatory-section {
+  padding: 0 3em 0 6em; }
+
+.zzSTDTitle1, .MsoCommentText {
+  display: none; }
+
+.coverpage {
+  text-align: center;
+  padding-left: 1.5em; }
+
+.coverpage-logo span, .coverpage-tc-name span {
+  font-family: {{bodyfont}};
+  text-transform: none;
+  font-weight: 300;
+  margin-left: 1em; }
+
+.coverpage-tc-name {
+  font-size: 1.2em;
+  line-height: 1.2em;
+  margin: 0.25em 0; }
+
+.copyright {
+  padding: 1em;
+  font-size: 0.9em;
+  text-align: left; }
+
+/* Document Identity */
+.coverpage-doc-identity {
+  font-size: 2em;
+  line-height: 2em; }
+
+.coverpage-title .title-second {
+  display: none; }
+
+.coverpage-stage-block {
+  font-family: {{headerfont}};
+  font-weight: 600;
+  font-size: 1.25em;
+  margin: 2em 0em 2em 0em;
+  text-transform: uppercase; }
+
+.authors {
+  margin-top: 2em; }
+  .authors span {
+    display: block;
+    line-height: 2; }
+  .authors span.roletag {
+    display: inline-block;
+    font-size: 12px;
+    color: #00335b;
+    background-color: white;
+    padding: 2px 5px;
+    margin-left: 7px;
+    border-radius: 5px; }
+
+/* Draft Warning */
+.coverpage-warning {
+  border: #f36f36 solid 2px;
+  color: #f36f36 !important;
+  margin: 1em 2em;
+  color: #2e81c2;
+  padding: 2em 1em 1em 1em;
+  border-radius: 25px; }
+  .coverpage-warning h1 {
+    font-family: {{headerfont}};
+    font-weight: 300;
+    text-transform: uppercase;
+    font-size: 1.2em; }
+
+@media print {
+  .document-info, .copyright {
+    page-break-before: always; }
+  .coverpage {
+    height: 23cm; }
+  .info-section {
+    display: none; }
+  .wrapper-top {
+    top: 0;
+    padding-top: 4cm;
+    padding-bottom: 4cm; }
+  .wrapper-top-bottom {
+    margin-top: -5px;
+    display: none; } }
+
 body {
   margin-left: auto;
   margin-right: auto;
   max-width: 100%;
-  font-size: 16px;
+  font-size: {{normalfontsize}};
   font-weight: 300;
   line-height: 1.5;
   color: #00335b;
@@ -497,202 +703,6 @@ dl {
 #published {
   color: #9ABD48; }
 
-.coverpage-maturity, .coverpage-stage {
-  font-family: {{headerfont}};
-  font-weight: 400;
-  font-size: 1.3em;
-  margin: 0 0 2em 0;
-  text-transform: uppercase; }
-
-.icon-svg {
-  width: 100%;
-  color: #5ecf86; }
-
-.wrapper-top {
-  background: #00335b;
-  background: linear-gradient(130deg, #00335b 45%, #f1f8ff 100%);
-  color: #ffffff;
-  padding: 5em 0;
-  width: 100%; }
-
-.wrapper-top-bottom {
-  width: 0;
-  height: 0;
-  border-top: 100px solid #00335b;
-  border-right: 100px solid transparent;
-  position: absolute; }
-
-.coverpage-metadata {
-  margin-top: 35px;
-  padding-top: 15px;
-  margin-right: 25px;
-  border-top: solid 1px white; }
-
-.coverpage-metadata,
-.coverpage-alt-formats {
-  font-size: 12px;
-  font-family: {{headerfont}};
-  margin-left: 1em;
-  text-align: left; }
-  .coverpage-metadata span,
-  .coverpage-alt-formats span {
-    display: block;
-    text-align: left; }
-    .coverpage-metadata span a,
-    .coverpage-alt-formats span a {
-      color: white; }
-      .coverpage-metadata span a:hover,
-      .coverpage-alt-formats span a:hover {
-        text-decoration: underline;
-        background: none;
-        box-shadow: none !important;
-        font-weight: 400; }
-  .coverpage-metadata .value,
-  .coverpage-alt-formats .value {
-    font-size: 15px;
-    margin-bottom: 15px; }
-  .coverpage-metadata .label,
-  .coverpage-alt-formats .label {
-    font-size: 12px;
-    padding: 0; }
-
-.coverpage-alt-formats span {
-  display: inline;
-  text-align: left; }
-  .coverpage-alt-formats span a {
-    padding-right: 5px; }
-
-.coverpage-title {
-  padding-bottom: 0.5em;
-  font-family: {{headerfont}};
-  font-weight: 100;
-  padding-left: 1em;
-  padding-right: 1em; }
-  .coverpage-title span {
-    font-family: {{headerfont}};
-    font-size: 1.8em;
-    line-height: 1; }
-
-.docstage-box table {
-  width: auto; }
-
-.docstage-box th {
-  background-color: #93c0d6; }
-
-.docstage-box td {
-  vertical-align: top;
-  background-color: #daeef3;
-  padding: 0.5em;
-  border: 0; }
-
-.docstage-box th:first-child {
-  border-radius: 1em 0 0 0; }
-
-.docstage-box th:last-child {
-  border-radius: 0 1em 0 0; }
-
-.docstage-box tr:first-child {
-  border-radius: 0 0 0 1em; }
-
-.docstage-box tr:last-child {
-  border-radius: 0 1em 0 0; }
-
-.docstage-box tr:last-child > td:first-child {
-  border-radius: 0 0 0 1em; }
-
-.docstage-box tr:last-child > td:last-child {
-  border-radius: 0 0 1em 0; }
-
-.WordSection11 {
-  padding: 0 2em 0 3em; }
-
-.info-section {
-  padding: 0 2em 0 5em; }
-
-.prefatory-section {
-  padding: 0 3em 0 6em; }
-
-.zzSTDTitle1, .MsoCommentText {
-  display: none; }
-
-.coverpage {
-  text-align: center;
-  padding-left: 1.5em; }
-
-.coverpage-logo span, .coverpage-tc-name span {
-  font-family: {{bodyfont}};
-  text-transform: none;
-  font-weight: 300;
-  margin-left: 1em; }
-
-.coverpage-tc-name {
-  font-size: 1.2em;
-  line-height: 1.2em;
-  margin: 0.25em 0; }
-
-.copyright {
-  padding: 1em;
-  font-size: 0.9em;
-  text-align: left; }
-
-/* Document Identity */
-.coverpage-doc-identity {
-  font-size: 2em;
-  line-height: 2em; }
-
-.coverpage-title .title-second {
-  display: none; }
-
-.coverpage-stage-block {
-  font-family: {{headerfont}};
-  font-weight: 600;
-  font-size: 1.25em;
-  margin: 2em 0em 2em 0em;
-  text-transform: uppercase; }
-
-.authors {
-  margin-top: 2em; }
-  .authors span {
-    display: block;
-    line-height: 2; }
-  .authors span.roletag {
-    display: inline-block;
-    font-size: 12px;
-    color: #00335b;
-    background-color: white;
-    padding: 2px 5px;
-    margin-left: 7px;
-    border-radius: 5px; }
-
-/* Draft Warning */
-.coverpage-warning {
-  border: #f36f36 solid 2px;
-  color: #f36f36 !important;
-  margin: 1em 2em;
-  color: #2e81c2;
-  padding: 2em 1em 1em 1em;
-  border-radius: 25px; }
-  .coverpage-warning h1 {
-    font-family: {{headerfont}};
-    font-weight: 300;
-    text-transform: uppercase;
-    font-size: 1.2em; }
-
-@media print {
-  .document-info, .copyright {
-    page-break-before: always; }
-  .coverpage {
-    height: 23cm; }
-  .info-section {
-    display: none; }
-  .wrapper-top {
-    top: 0;
-    padding-top: 4cm;
-    padding-bottom: 4cm; }
-  .wrapper-top-bottom {
-    margin-top: -5px;
-    display: none; } }
-
 p {
   margin-top: 1em;
   margin-bottom: 1em; }
@@ -878,7 +888,7 @@ pre {
   font-family: {{monospacefont}};
   font-variant-ligatures: none;
   background-color: #f7f7f7;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -911,7 +921,7 @@ pre {
 .figure, pre, .pseudocode {
   background-color: #e1eef1;
   color: #424242;
-  font-size: 0.8em; }
+  font-size: {{monospacefontsize}}; }
 
 .Note {
   background-color: #fff8bb;
@@ -1081,4 +1091,4 @@ a.footnote-number {
   font-size: 0.8em; }
 
 .footnote {
-  font-size: 0.9em; }
+  font-size: {{footnotefontsize}}; }