metanorma-gb 1.3.18 → 1.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17f96bfe0f493dda7d474e7657141d1446fc1d8e5929515a07f5979328e76c1
-  data.tar.gz: 39980a1836f220dc4b671d650e37abe25563fca561e4fa1178502bc571ff55e1
+  metadata.gz: daee15e26a48bc580373f3d97b94ae8df4ae002ca0ca733839f9393c1342325c
+  data.tar.gz: b7fe019ce181e3b1de58268e4a0a8bd11079754ebbd22ae29bd5eb37269bb0cd
 SHA512:
-  metadata.gz: c8ab47c105e7703bc0bf9b5351fbb97489ebefe0ac9a8560f401c995645773046d45ab23391bcc801e2a99c241d6cfdf126d8c5ae25e1f8ba1b64acf01d97a07
-  data.tar.gz: 4e2a684f3da878a41bcf60ed2b348c95356072c8e86157e391880056dfd175538a8e2a3c456c1b659e2a6c9e1a1d75454c87fefadfaf64eff5c2275a1765d081
+  metadata.gz: 05373eccae4ad8ecc33b895767e9ee9c15b58105e5c9d045427797e508f0a4e47b877f68a01cefdd54cc410ca763bef9f4c90370c751fcd6cfa798e017c6a68e
+  data.tar.gz: 4b0a193930a6c8896a9f4273f4c70a96ece6f55a9867c9f4c7510931da5d3d2391303decdefeaff81ab693a6451e69994c399631c96693afd398d74143403077

data/lib/asciidoctor/gb/converter.rb

@@ -69,6 +69,7 @@ module Asciidoctor
           html_converter(node).convert(filename + ".xml")
           doc_converter(node).convert(filename + ".xml")
         end
+        @log.write(@filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end

data/lib/asciidoctor/gb/front.rb

@@ -1,4 +1,3 @@
-
 module Asciidoctor
   module Gb
     class Converter < ISO::Converter
@@ -102,7 +101,7 @@ module Asciidoctor
                     m[0] == "Q" ? "enterprise" : nil
                 end
         return scope unless scope.nil?
-        warn "GB: no scope supplied, defaulting to National"
+        @log.add("Document Attributes", nil, "GB: no scope supplied, defaulting to National")
         "national"
       end
 
@@ -115,7 +114,7 @@ module Asciidoctor
         else
           prefix = "GB"
           scope = "national"
-          warn "GB: no prefix supplied, defaulting to GB"
+          @log.add("Document Attributes", nil, "GB: no prefix supplied, defaulting to GB")
         end
         [scope, prefix]
       end
@@ -127,14 +126,14 @@ module Asciidoctor
           %r{/Z}.match(p) ? "guidelines" : nil
         if mandate.nil?
           mandate = "mandatory"
-          warn "GB: no mandate supplied, defaulting to mandatory"
+          @log.add("Document Attributes", nil, "GB: no mandate supplied, defaulting to mandatory")
         end
         mandate
       end
 
       def get_topic(node)
         node.attr("topic") and return node.attr("topic")
-        warn "GB: no topic supplied, defaulting to basic"
+        @log.add("Document Attributes", nil, "GB: no topic supplied, defaulting to basic")
         "basic"
       end
 
@@ -200,7 +199,7 @@ module Asciidoctor
         if node.attr("docstage") && node.attr("docstage").to_i < 60
           abbr = IsoDoc::Gb::Metadata.new("en", "Latn", {}).
             status_abbrev(node.attr("docstage"), node.attr("iteration"),
-                         node.attr("draft"))
+                          node.attr("draft"))
           dn = "/#{abbr} #{dn}" # prefixes added in cleanup
         else
           dn += "-#{node.attr("copyright-year")}" if node.attr("copyright-year")

data/lib/asciidoctor/gb/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/asciidoctor/gb/isostandard.rng

@@ -73,6 +73,19 @@
         </choice>
       </element>
     </define>
+    <define name="ul">
+      <element name="ul">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <oneOrMore>
+          <ref name="ul_li"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>
@@ -325,6 +338,51 @@
         </oneOrMore>
       </choice>
     </define>
+    <define name="table">
+      <element name="table">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="width"/>
+        </optional>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <attribute name="alt"/>
+        </optional>
+        <optional>
+          <attribute name="summary"/>
+        </optional>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <optional>
+          <ref name="thead"/>
+        </optional>
+        <ref name="tbody"/>
+        <optional>
+          <ref name="tfoot"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="table-note"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="dl"/>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -431,4 +489,26 @@
       <ref name="Clause-Section"/>
     </element>
   </define>
+  <define name="ul_li">
+    <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="uncheckedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="checkedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="paragraph-with-footnote"/>
+      </oneOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/gb/validate.rb

@@ -25,13 +25,13 @@ module Asciidoctor
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(standard recommendation).include? doctype or
-          warn "Document Attributes: #{doctype} is not a recognised document type"
+          @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)
         script = xmldoc&.at("//bibdata/script")&.text
         %(Hans Latn).include?(script) or
-          warn "Document Attributes: #{script} is not a recognised script"
+          @log.add("Document Attributes", nil, "#{script} is not a recognised script")
       end
 
       def prefix_validate(root)
@@ -40,23 +40,23 @@ module Asciidoctor
         case scope
         when "social-group"
           /^[A-Za-z]{3,6}$/.match(prefix) or
-            warn("#{prefix} is improperly formatted for social standards")
+            @log.add("Document Attributes", nil, "#{prefix} is improperly formatted for social standards")
         when "enterprise"
           /^[A-Z0-9]{3,}$/.match(prefix) or
-            warn("#{prefix} is improperly formatted for enterprise standards")
+            @log.add("Document Attributes", nil, "#{prefix} is improperly formatted for enterprise standards")
         when "sector"
           %w(AQ BB CB CH CJ CY DA DB DL DZ EJ FZ GA GH GM GY HB HG HJ HS HY
              JB JC JG JR JT JY LB LD LS LY MH MT MZ NY QB QC QJ QX SB SC SH
              SJ SL SN SY TB TD TJ TY WB WH WJ WM WS WW XB YB YC YD YS YY YZ
              ZY).include? prefix or
-             warn("#{prefix} is not a legal sector standard prefix")
+             @log.add("Document Attributes", nil, "#{prefix} is not a legal sector standard prefix")
         when "local"
           %w(11 12 13 14 15 21 22 23 31 32 33 34 35 36 37 41 42 43 44 45 46
              50 51 52 53 54 61 62 63 64 65 71 81 82 end).include? prefix or
-             warn("#{prefix} is not a legal local standard prefix")
+             @log.add("Document Attributes", nil, "#{prefix} is not a legal local standard prefix")
         when "national"
           %w(GB GBZ GJB GBn GHZB GWPB JJF JJG).include? prefix or
-            warn("#{prefix} is not a legal national standard prefix")
+            @log.add("Document Attributes", nil, "#{prefix} is not a legal national standard prefix")
         end
       end
 
@@ -65,7 +65,7 @@ module Asciidoctor
                           "organization/name")&.text
         scope = root&.at("//gbscope")&.text
         if %w(enterprise social).include?(scope) && issuer == "GB"
-          warn "No issuer provided for #{scope} standard"
+          @log.add("Document Attributes", nil, "No issuer provided for #{scope} standard")
         end
       end
 
@@ -73,9 +73,9 @@ module Asciidoctor
         zh = t.at(".//#{element}[@language = 'zh']")
         en = t.at(".//#{element}[@language = 'en']")
         (en.nil? || en.text.empty?) && !(zh.nil? || zh.text.empty?) &&
-          warn("GB: #{element} term #{zh.text} has no English counterpart")
+          @log.add("Style", t, "GB: #{element} term #{zh.text} has no English counterpart")
         !(en.nil? || en.text.empty?) && (zh.nil? || zh.text.empty?) &&
-          warn("GB: #{element} term #{en.text} has no Chinese counterpart")
+          @log.add("Style", t, "GB: #{element} term #{en.text} has no Chinese counterpart")
       end
 
       def bilingual_terms_validate(root)
@@ -90,10 +90,10 @@ module Asciidoctor
         title_intro_en = root.at("//title[@type='title-intro' and @language='en']")
         title_intro_zh = root.at("//title[@type='title-intro' and @language='zh']")
         if title_intro_en.nil? && !title_intro_zh.nil?
-          warn "No English Title Intro!"
+          @log.add("Style", title_intro_zh, "No English Title Intro!")
         end
         if !title_intro_en.nil? && title_intro_zh.nil?
-          warn "No Chinese Title Intro!"
+          @log.add("Style", title_intro_en, "No Chinese Title Intro!")
         end
       end
 
@@ -101,10 +101,10 @@ module Asciidoctor
         title_main_en = root.at("//title[@type='title-main' and @language='en']")
         title_main_zh = root.at("//title[@type='title-main' and @language='zh']")
         if title_main_en.nil? && !title_main_zh.nil?
-          warn "No English Title!"
+          @log.add("Style", title_main_zh,  "No English Title!")
         end
         if !title_main_en.nil? && title_main_zh.nil?
-          warn "No Chinese Title!"
+          @log.add("Style", title_main_en,  "No Chinese Title!")
         end
       end
 
@@ -112,10 +112,10 @@ module Asciidoctor
         title_part_en = root.at("//title[@type='title-part' and @language='en']")
         title_part_zh = root.at("//title[@type='title-part' and @language='zh']")
         if title_part_en.nil? && !title_part_zh.nil?
-          warn "No English Title Part!"
+          @log.add("Style", title_part_en,  "No English Title Part!")
         end
         if !title_part_en.nil? && title_part_zh.nil?
-          warn "No Chinese Title Part!"
+          @log.add("Style", title_part_zh,  "No Chinese Title Part!")
         end
       end
 
@@ -123,7 +123,7 @@ module Asciidoctor
         root.xpath(NORM_BIBITEMS).each do |b|
           if b.at(Asciidoctor::Standoc::Converter::ISO_PUBLISHER_XPATH).nil?
             unless /^#{GBCODE}(?![A-Z])/.match(b.at("./docidentifier").text)
-              Asciidoctor::Standoc::Utils::warning(b, NORM_ISO_WARN, b.text)
+              @log.add("Bibliography", b, "#{NORM_ISO_WARN}: #{b.text}")
             end
           end
         end

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -69,12 +69,14 @@ module IsoDoc
 
       def formula_where(dl, out)
         return unless dl
-        out.p { |p| p << @where_lbl }
+        out.p **{ style: "page-break-after:avoid;"} do |p|
+          p << @where_lbl
+        end
         formula_dl_parse(dl, out)
       end
 
       def formula_dl_parse(node, out)
-        out.table **{ class: "dl" } do |v|
+        out.table **{ class: "formula_dl" } do |v|
           node.elements.each_slice(2) do |dt, dd|
             v.tr do |tr|
               tr.td **{ style: "vertical-align:top;text-align:left;" } do |term|
@@ -204,7 +206,7 @@ module IsoDoc
             h1 << "&#x3000;"
           end
           title.is_a?(String) ? h1 << title :
-          title&.children&.each { |c2| parse(c2, h1) }
+            title&.children&.each { |c2| parse(c2, h1) }
         end
         div.parent.at(".//h1")
       end

data/lib/isodoc/gb/html/gb.scss

@@ -384,6 +384,9 @@ p.Formula, li.Formula, div.Formula
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+table.formula_dl {
+        margin-left:20.15pt;
+}
 table.MsoISOTable
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;

data/lib/isodoc/gb/html/htmlcompliantstyle.scss

@@ -7,191 +7,68 @@
    License: none (public domain)
 */
 
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-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,
-time, mark, audio, video {
-        margin: 0;
-        padding: 0;
-}   
-    
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-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,
-time, mark, audio, video {
-        border: 0;
-        font-size: 100%;
-}   
-    
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-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,
-time, mark, audio, video {
-        vertical-align: baseline;
-}       
-        
-        
-html, body, div, span, applet, object, iframe,
-p, blockquote, 
-a, abbr, acronym, address, big, cite, 
-del, dfn, em, img, ins, q, s, 
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-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,
-time, mark, audio, video {
-  font-family: $bodyfont;
-}       
+$doctype-colors-list: (standard: #0ac442,
+  governance: #750697,
+  guide: #48a0e7,
+);
 
-code, pre, tt, kbd, samp {
-  font-family: $monospacefont;
-  font-variant-ligatures: none;
-}
+$docstage-colors-list: (working-draft: #fda706,
+  committee-draft: #fd06fd,
+  draft-standard: #fdf906,
+  standard: #0ac442,
+  obsolete: #7e0d13,
+);
 
-code *, pre *, tt *, kbd *, samp * {
-  font-family: $monospacefont !important;
-  font-variant-ligatures: none;
-}
+$mainContentsOffsetLeft: 4em;
+
+@import 'base_style/all';
 
 h1, h2, h3, h4, h5, h6, .h2Annex {
   margin-top: 1.5em;
   margin-bottom: 0.3em;
   color: #000000;
   font-family: $headerfont;
-}       
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto;
-}
-
-dt {
-  grid-column-start: 1;
-}
-
-dd {
-  grid-column-start: 2;
-}
-
-dd p, dt p {
-  margin-top: 0px;
-}
-
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-        display: block;
-}
-body {
-        line-height: 1;
-        margin: 0;
 }
 
 body {
-    margin-left: 298px;
-    margin-right: 2em;
+  @include bodyStyle1($bodyfont, 1, black, white);
+  margin: 0;
+  margin-left: 298px;
+  margin-right: 2em;
+  main {
+    margin: 0 1.5em;
+  }
 }
 
-blockquote, q {
-        quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-        content: '';
-        content: none;
-}
-table {
-        border-collapse: collapse;
-        border-spacing: 0;
-}
+@import 'coverpage';
 
 /* Setting of the page size and margins */
 
 @page {
-   size: 210mm 297mm;
-   margin: 10mm 15mm 20mm 25mm;
+  size: 210mm 297mm;
+  margin: 10mm 15mm 20mm 25mm;
 }
 
 .title-section {
-    padding-left: 4em;
-    padding-top: 10mm;
+  padding-left: 4em;
+  padding-top: 10mm;
 }
 
 .prefatory-section {
-    padding: 0 3em 0 6em;
+  padding: 0 3em 0 6em;
 }
 
-
 .prefatory-section, main {
-    margin: 0 1.5em;
+  margin: 0 1.5em;
 }
 
 main {
-    padding-left: 4em;
-    padding-right: 2em;
-}
-
-  .zzSTDTitle1, .MsoCommentText {
-    display: none; }
-
-
-
-.doctitle-en, .doctitle-fr {
-    margin-top: 2em;
-    text-align: left;
-}
-
-.doctitle-en {
-    padding-left: 3em;
-    margin-left: -3em;
-    padding-top: 2em;
-    padding-bottom: 2em;
-
+  padding-left: 4em;
+  padding-right: 2em;
 }
 
-.doctitle-en span {
-    font-size: 2em;
-    line-height: 1.5em;
-    display: block;
-}
-
-
-.doctitle-fr span {
-    font-size: 1.5em;
-    line-height: 1.2em;
-    font-style: italic;
-    display: block;
+.zzSTDTitle1, .MsoCommentText {
+  display: none;
 }
 
 span.title {
@@ -200,48 +77,33 @@ span.title {
     font-weight: 800;
 }
 
-.coverpage_docstage {
-    margin-top: 2em;
-    margin-bottom: 2em;
-}
-
-/*
-.coverpage_warning {
-  border-top: solid 1px #f36f36;
-  border-bottom: solid 1px #f36f36;
-  margin: 1em 2em;
-  color: #485094;
-  padding: 1em;
-}
-*/
-
 .coverpage_warning {
     font-size: 0.9em;
     font-style: italic;
     padding-bottom: 1em;
 }
 
-/*
-.coverpage_warning .title {
-  color: #f36f36;
-  font-weight: 500;
-}
-
-.coverpage_warning .content {
-  font-style: italic;
-}
-
-.coverpage_docnumber, .coverpage_techcommittee {
-    text-align: right;
-    font-size:0.9em;
-    line-height: 0.5em;
-}
-*/
-
 .coverpage {
   text-align: center;
+  padding: 0;
   /* margin: 2em 0; */
 }
+.coverpage-doc-relations,
+.coverpage-doc-identity-first {
+  padding-top: 0;
+}
+.coverpage-stage-block {
+  font-style: normal;
+  font-weight: 400;
+}
+.coverpage-logo {
+  color: black;
+  font-weight: normal;
+}
+.coverpage_docnumber,
+.coverpage_techcommittee {
+  font-size: 100%;
+}
 
 /* NEW */
 .coverpage-header {
@@ -288,33 +150,12 @@ span.title {
 	flex-direction: column;
 }
 
-
-
-
 .coverpage-tc-name {
   font-size: 1.2em;
     line-height: 1.2em;
     margin: 0.25em 0;
 }
 
-/*
-.coverpage-doc-identity {
-  background-color: #485094;
-  color: white;
-  font-size: 2em;
-  line-height: 2em;
-  margin: 0.5em 0;
-}
-*/
-
-.coverpage-title {
-  font-weight: 400;
-}
-
-.coverpage-title .title-second {
-  display: none;
-}
-
 span.coverpage-logo-text {
   font-size: 5mm;
   text-align: right;
@@ -325,11 +166,6 @@ span.coverpage-logo-text {
 
 /* NEW */
 .coverpage-doc-identity-first {
-  font-size: 5mm;
-  text-align: right;
-  padding-right: 5mm;
-  /*font-weight: bold; */
-  padding-bottom: 1em;
   border-bottom: solid black 1px;
 }
 
@@ -382,174 +218,86 @@ span.date-active {
   float:right;
 }
 
-
 .coverpage-doc-relations {
         font-size:10.5pt;
 }
 
-.coverpage-title-zh {
-    font-size: 8mm;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  /* flex-direction: column; */
-  font-family:$headerfont;
-}
-
 .coverpage-title-zh span {
 	padding-top: 2mm;
 	font-size: 8mm;
 }
 
 .coverpage-title-en {
-    margin-top: 10mm;
-    font-size: 5mm;
-      display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-        font-family:$headerfont;
-}
-
-.coverpage-title-en span {
-  display: block;
-}
-
-.coverpage-title-en .title-first {
-  text-transform: uppercase;
+  font-size: 5mm;
 }
 
 /* NEW */
-  .coverpage-warning {
-    border-top: solid 1px #f36f36;
-    border-bottom: solid 1px #f36f36;
-    margin: 1em 2em;
-    color: #485094;
-    padding: 1em; }
+.coverpage-warning {
+  border-top: solid 1px #f36f36;
+  border-bottom: solid 1px #f36f36;
+  margin: 1em 2em;
+  color: #485094;
+  padding: 1em;
+}
 
 /* NEW */
-      .coverpage-warning .title {
-    color: #f36f36;
-    font-weight: 500; }
+.coverpage-warning .title {
+  color: #f36f36;
+  font-weight: 500;
+}
 
 /* NEW */
-  .coverpage-warning .content {
-    font-style: italic; }
-
-
-
-.coverpage-iso-relation {
-        font-size:14pt;
-        margin-top: 10mm;
-        text-align: center;
+.coverpage-warning .content {
+  font-style: italic;
 }
 
-
 .coverpage-dates {
-  width:100%;
-  margin-top: 25mm;
-  border-bottom: 1px solid #000;
   font-size: 4.5mm;
-  font-family:$headerfont;
 }
 
 .coverpage_footer {
-    text-align:center;
   font-size: 1em;
-  font-weight: 600;
-  width: 100%;
-  margin-top: 10mm;
-}
-
-/* NEW */
-.coverpage_footer table, .coverpage_footer th, .coverpage_footer td {
-  border: 0;
 }
 
-/* NEW */
-.coverpage_footer th, .coverpage_footer td {
-  padding: 5px;
-  font-size: 1.1em;
-  font-weight: 600;
-}
-
-/* NEW */
-.coverpage_footer .publish {
-  vertical-align: middle;
-}
-
-
 /* NEW */
 .coverpage-banner {
-  padding-top: 5mm;
-  margin-left:auto;
-  margin-right:auto;
-  width:auto;
-  display:flex;
-  flex-wrap: wrap;
-  justify-content: center;
   height: 177.5mm;
 }
 
-  .copyright {
-    padding: 1em; }
-
-
-/*
-.copyright .name {
-    font-weight: 900;
-    padding-top: 1em;
+.copyright {
+  padding: 1em;
 }
-*/
 
 .copyright .year, .copyright .message,
 .copyright .name, .copyright .address {
-    margin-top: 1em;
-    /* line-height: 1.1em; */
-    display: block;
-}
-
-.copyright .message, .copyright .name,
-.copyright .address {
-    font-size: 0.9em;
-}
-
-.copyright .name {
-  color: #485094;
-  font-weight: 600;
+   line-height: 1;
+}
+
+p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 12.0pt;
+  margin-left: 0cm;
+  text-align: justify;
+  line-height: 12.0pt;
+  /* tab-stops: 20.15pt; */
+  font-size: 12.0pt;
+  font-family: $bodyfont;
 }
 
-.copyright .address {
-  color: #485094;
+p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 12.0pt;
+  margin-left: 0cm;
+  text-align: justify;
+  line-height: 12.0pt;
+  tab-stops: 20.15pt;
+  font-size: 10.0pt;
+  font-family: $headerfont;
+  font-weight: bold;
 }
 
-
-  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
-    margin-top: 0cm;
-    margin-right: 0cm;
-    margin-bottom: 12.0pt;
-    margin-left: 0cm;
-    text-align: justify;
-    line-height: 12.0pt;
-    /* tab-stops: 20.15pt; */
-    font-size: 12.0pt;
-    font-family: $bodyfont;
-  }
-
-  p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
-    margin-top: 0cm;
-    margin-right: 0cm;
-    margin-bottom: 12.0pt;
-    margin-left: 0cm;
-    text-align: justify;
-    line-height: 12.0pt;
-    tab-stops: 20.15pt;
-    font-size: 10.0pt;
-    font-family: $headerfont;
-    font-weight: bold; }
-
-
-
-
 /* TYPOGRAPHY */
 
 a {
@@ -559,17 +307,17 @@ a {
 }
 
 h1 {
-  font-size: 1.5em; 
+  font-size: 1.5em;
   font-weight: 400;
 }
 
 h2 {
-  font-size: 1.3em; 
+  font-size: 1.3em;
   font-weight: 300;
 }
 
 h3 {
-  font-size: 1.1em; 
+  font-size: 1.1em;
   font-weight: 300;
 }
 
@@ -584,11 +332,11 @@ h2 {
 }
 
 h1, h2, h3, h4, h5, h6 {
-    line-height: 1.2;
+  line-height: 1.2;
 }
 
 h2 p {
-    display: inline;
+  display: inline;
 }
 
 p {
@@ -600,34 +348,18 @@ p {
 }
 
 p.zzSTDTitle1 {
-    font-weight: 700;
-    font-size: 1.5em;
-  }
-
-span.obligation {
-    font-weight: 400;
-}
-
-a:visited {
-  text-decoration: none;
+  font-weight: 700;
+  font-size: 1.5em;
 }
 
-/*
-a:hover {
-  text-style: italic;
-  color: #485094;
-}
-*/
-
-nav a {
-    color: black;
-    /* line-height: 1.2em; */
+span.obligation {
+  font-weight: 400;
 }
 
 p.TermNum {
     font-size: 1.3em;
     font-weight: 300;
-    margin: 1em 0 0 0; 
+    margin: 1em 0 0 0;
 }
 
 p.Terms {
@@ -651,150 +383,82 @@ p.DeprecatedTerms {
 
 /* Navigation*/
 
-@media screen and (min-width: 768px) {
-    nav {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        width: 278px;
-        font-size: 0.9em;
-        overflow: auto;
-        padding: 0 0 0 45px;
-        background-color:#f7f7f7;
-        line-height: 1.2em;
-    }
+nav {
+  @include sidebarNav(#f7f7f7, 278px, 45px);
 
-    #toggle {
-        position: fixed;
-        height: 100%;
-        width: 30px;
-        border-right: solid black 1px;
-        background-color:black;
-        color: white!important;
-        cursor: pointer;
-        margin-left: -4em;
-        margin-top: -2em;
-    }
-
-    #toggle span {
-        text-align: center;
-        width: 100%;
-        position: absolute;
-        top: 50%;
-        transform: translate(0, -50%);
+  a {
+    color: black;
+    text-decoration: none;
+    line-height: 1.2em;
+  }
+}
 
-    }
+#toggle {
+  @include sidebarNavToggle(white, black);
 
+  @media screen and (min-width: $bigscreenBreakpoint) {
+    margin-left: -$mainContentsOffsetLeft;
+    width: 30px;
+    border-right: solid black 1px;
+    margin-top: -2em;
+    z-index: 0;
+  }
+}
 
-    .container {
-        padding-left: 360px;
-    }
+#toc {
+  @include toc(inherit, #1d1d1d, white);
 
-    .rule.toc {
-        display: none;
-    }
+  li:before {
+    content: " ";
+    display: none;
+  }
 
-    h1.toc-contents {
-        margin-top: 1em;
+  ul{
+    a {
+      &:hover {
+        box-shadow: none;
+        color: black;
+      }
+      color: #000000;
+      text-decoration: none !important;
+      display: block;
+      font-family: $bodyfont;
     }
-
-    ul#toc-list {
-        padding:0;
-        margin:0;
+  }
+  .toc-active {
+    a {
+      color: black;
     }
+  }
+  .toc-active,
+  li:hover {
+    background: none;
+    box-shadow: none !important;
+  }
 }
 
-@media screen and (max-width: 768px) {
-    #toc {
-        padding: 0 1.5em 0 1.5em;
-        overflow: visible;
-    }
-
-    #toggle {
-        display: none;
-        margin-left: -4em;
-        margin-top: -2em;
-    }
-
-    body {
-        margin-left: 2em;
-    }
-
-    main {
-        padding: 0;
-    }
+#toc-list {
+  ul {
+    margin-bottom: 0.25em;
 
-    .title-section, .prefatory-section {
-        padding-left: 0;
-        padding-top: 0;
-        width: 100%;
+    li {
+      list-style-type: none;
     }
-}
-
-  div.figure > img:not(.logo) { 
-    margin-left: auto;
-margin-right: auto;
-display: block;
-max-width: 100%;
-height: auto;
   }
-    
 
-#toc ul {
-    margin: 0;
+  @media screen and (min-width: $bigscreenBreakpoint) {
     padding: 0;
-    list-style: none;
-}
-
-#toc li a {
-    padding: 5px 10px;
+    margin: 0;
+  }
 }
 
-#toc a {
-  color: #000000;
-  text-decoration: none!important;
+div.figure > img:not(.logo) {
+  margin-left: auto;
+  margin-right: auto;
   display: block;
-  font-family: $bodyfont;
-}
-
-#toc a:hover {
-    box-shadow: none;
-    color: black;
-}
-
-#toc .h2 {
-    padding-left: 30px;
-}
-
-#toc .h3 {
-    padding-left: 50px;
-}
-
-nav a {
-  text-decoration: none!important;
-}
-
-#toc .toc-active a {
-    color: black;
-}
-
-/*
-#toc .toc-active, #toc li:hover {
-    background: #1d1d1d;
-    box-shadow: inset -5px 0px 10px -5px #1d1d1d!important;
-
+  max-width: 100%;
+  height: auto;
 }
-*/
-#toc li:hover a {
-    color: black;
-}
-
-
-  #toc li:before {
-    content: " ";
-    display: none;
-  }
 
 ::selection {
   background: #1d1d1d; /* WebKit/Blink Browsers */
@@ -805,7 +469,6 @@ nav a {
   color: white;
 }
 
-
 /*
     Document types + stages
 */
@@ -1095,28 +758,23 @@ ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
 3.4 Rules
 */
 
-/*
-  div.rule {
-    width: 100%;
-    height: 1px;
-    background-color: #485094;
-    margin: 2em 0; }
-*/
-
 .rule {
-    width: 100%;
-    height: 1px;
-    background-color: #0e1a85;
-    margin: 2em 0;
+  @include rule(1px, #0e1a85);
+
+  &.toc {
+    @media screen and (min-width: $bigscreenBreakpoint) {
+      display: none;
+    }
   }
+}
 
 /*
 3.5 Bibliograhy
 */
 
 p.Biblio, p.NormRef {
-margin-top: 1em;
-margin-left: 2em;
+  margin-top: 1em;
+  margin-left: 2em;
 }
 
 /*
@@ -1124,24 +782,52 @@ margin-left: 2em;
 */
 
 pre {
-font-family: $monospacefont;
-font-variant-ligatures: none;
+  font-family: $monospacefont;
+  font-variant-ligatures: none;
 }
 
-pre, .figure, .pseudocode {
-  font-size:0.9em;
+pre,
+.figure,
+.pseudocode {
+  font-size: 0.9em;
   line-height: 1.6em;
-padding: 1.5em;
+  padding: 1.5em;
   background-color: #f7f7f7;
-margin: 2em 0 1em 0;
-overflow: auto;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
+
+.Sourcecode {
+  @include sourceBlock(#f7f7f7, null);
+  // Requires fontSize: null, but needs an update in isodoc
+  // @include sourceBlock(#f7f7f7, null, null);
 }
 
-.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
-font-weight: 700;
-font-size: 1em;
-text-align: center;
-font-family: $headerfont;
+.pseudocode {
+  @include pseudocodeBlock(#f7f7f7, null);
+  // Requires fontSize: null, but needs an update in isodoc
+  // @include pseudocodeBlock(#f7f7f7, null, null);
+}
+
+.Sourcecode,
+.figure,
+.pseudocode {
+  font-size: 0.9em;
+}
+
+.figure {
+  @include figureBlock();
+  background-color: #f7f7f7;
+}
+
+.figure-title,
+.FigureTitle,
+.SourceTitle,
+.AdmonitionTitle,
+.RecommendationTitle {
+  font-weight: 700;
+  font-size: 1em;
+  font-family: $headerfont;
 }
 
 /*
@@ -1176,30 +862,17 @@ font-family: $headerfont;
 */
 
 .example {
-    background-color: #e1eef1;
-    /*padding: 1.2em; */
-    padding: 0.5em;
-    margin: 2em 0 1em 0;
-    text-align: left; 
-}
-
-.example p {
-    margin: 0;
-}
+  @include exampleBlock(#e1eef1, null, .5em, 1.5em);
 
-.example .example-title {
-font-weight: 700;
-text-transform: uppercase;
-margin-top:0;
-}
-
-.example-title {
-  font-family: $headerfont;
+  .example-title {
+    margin-top: 0;
   }
 
-
-.example pre, .example .pseudocode {
-      background: none;
+  .Sourcecode,
+  .pseudocode,
+  pre {
+    background: none;
+  }
 }
 
 /*
@@ -1207,40 +880,25 @@ margin-top:0;
 */
 
 table {
-border-collapse: collapse;
-width: 100%;
-font-weight: 300;
-margin: 1em 0 2em 0;
-margin-left: auto;
-margin-right: auto;
-padding-right: 2em;
-text-align: center; 
-}
+  @include table(1px solid black);
 
-table, th, td {
-border: 1px solid black;
-font-size: 0.95em;
-}
-
-td, th {
-padding: 1em!important;
-}
-
-td.header {
-font-weight: 400;
+  td,
+  th {
+    padding: 1em !important;
+  }
+  text-align: center;
 }
 
 p.TableTitle {
-text-align: center;
-margin-top: 2.5em;
-font-weight: 400;
-font-size: 1.1em; 
-font-family: $headerfont;
+  margin-top: 2.5em;
+  font-weight: 400;
+  font-size: 1.1em;
+  font-family: $headerfont;
 }
 
 .TableFootnote {
-    text-align: left!important;
-    list-style: lower-alpha;
+  text-align: left !important;
+  list-style: lower-alpha;
 }
 
 /*
@@ -1302,14 +960,9 @@ sup a {
 3.11 Blockquotes
 */
 
-.blockquote, .Quote {
-background-color: #f7f7f7;
-font-style: italic;
-width: 80%;
-padding: 1.5em;
-margin-top: 2em;
-margin-left: auto;
-margin-right: auto;
+.blockquote,
+.Quote {
+  @include blockquoteBlock(#f7f7f7);
 }
 
 /*
@@ -1317,22 +970,25 @@ margin-right: auto;
 */
 
 .formula {
-    /* background-color: #f1f1f1; */
-    background-color: #f7f7f7;
-    padding: 1.5em;
-    margin-top: 2em;
-    margin-bottom: 1em;
-    text-align: center;
-    margin-left: 20%;
-    margin-right: 20%;
+  @include formulaBlock(#f7f7f7);
+
+  margin-left: 20%;
+  margin-right: 20%;
+}
+
+dl.formula_dl {
+background-color: #f7f7f7;
+margin-left: 20%;
+margin-right: 20%;
 }
 
+
 /*
 Keywords
 */
 
 span.keyword {
-font-weight: 600;
+  font-weight: 600;
 }