metanorma-iec 1.2.7 → 1.2.12

data/lib/asciidoctor/iec/iec_intro_fr.xml

@@ -1,29 +1,36 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if unpublished %}
+      <p><strong>Copyright © {{ docyear }} International Electrotechnical Commission, IEC.</strong>
+        All rights reserved. It is permitted to download this electronic file, to make a copy and to
+        print out the content for the sole purpose of preparing National Committee positions. You
+        may not copy or "mirror" the file or printed version of the document, or any part of it,
+        for any other purpose without permission in writing from IEC.
+      {% else %}
       <p id="boilerplate-year">
-    &copy; {{ agency }} {{ docyear }}, Published in Switzerland
+    © {{ agency }} {{ docyear }}, Publié en Suisse
   </p>
 
   <p id="boilerplate-message">
-    All rights
-reserved. Unless otherwise specified, no part of this publication may be
-reproduced or utilized otherwise in any form or by any means, electronic or
-mechanical, including photocopying, or posting on the internet or an intranet,
-without prior written permission. Permission can be requested from either IEC
-at the address below or IEC's member body in the country of the requester.
+Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne
+peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique
+ou mécanique, y compris la photocopie, l’affichage sur l’internet ou sur un Intranet, sans
+autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’IEC à
+l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
   </p>
 
   <p id="boilerplate-name">IEC Central Office</p>
 
   <p id="boilerplate-address" align="left">
-    3, rue de Varemb&eacute;<br/>
+    3, rue de Varembé<br/>
     CH-1211 Geneva 20, Switzerland<br/>
-    Tel.&nbsp;&nbsp;+ 41 22 919 02 11<br/>
-    Fax&nbsp;&nbsp;+ 41 22 919 03 00<br/>
+    Tel.&#xa0;&#xa0;+ 41 22 919 02 11<br/>
+    Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
     info@iec.ch<br/>
     www.iec.ch
   </p>
+  {% endif %}
 </clause>
 </copyright-statement>
 <legal-statement>
@@ -43,19 +50,68 @@ at the address below or IEC's member body in the country of the requester.
 </legal-statement>
  {% if unpublished %}
 <license-statement>
+    <clause>
+      {% if stage_int < 40 %}
+      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
+      until published as such.</p>
+    {% endif %}
+      {% if stage_int >= 40 %}
+      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
+        until published as such.</p>
+      {% endif %}
+      {% if stage_int >= 50 %}
+      <p>In addition to their evaluation as being acceptable for industrial, technological, commercial and user
+        purposes, Final Draft International Standards may on occasion have to be considered in the light of their
+        potential to become standards to which reference may be made in national regulations.</p>
+      {% endif %}
+      <p>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.</p>
+    </clause>
+</license-statement>
+{% endif %}
+<feedback-statement>
+  {% if unpublished %}
+    <clause id="boilerplate-cenelec-attention">
+      <title>Attention IEC-CENELEC parallel voting</title>
+      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
+        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
+        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
+        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
+        ({{ stageabbr }})
+        is submitted for parallel voting.</p>
+      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+    </clause>
+    {% else %}
+<clause>
+  <title>A propos de l'IEC</title>
+  <p>La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</p>
+</clause>
+<clause>
+  <title>A propos des publications IEC</title>
+  <p>Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la plus récente, un corrigendum ou amendement peut avoir été publié.</p>
+</clause>
+<clause>
   <clause>
-  <title>Warning for CDs, CDVs and FDISs</title>
-
-<p>This
-document is not an IEC International Standard. It is distributed for review and
-comment. It is subject to change without notice and may not be referred to as
-an International Standard.</p>
-
-<p>Recipients
-of this draft are invited to submit, with their comments, notification of any
-relevant patent rights of which they are aware and to provide supporting
-documentation.</p>
+    <title>Catalogue IEC - <link target="https://webstore.iec.ch/catalogue">webstore.iec.ch/catalogue</link></title>
+    <p>Application autonome pour consulter tous les renseignements bibliographiques sur les Normes internationales, Spécifications techniques, Rapports techniques et autres documents de l'IEC. Disponible pour PC, Mac OS, tablettes Android et iPad.</p>
+  </clause>
+  <clause><title>Recherche de publications IEC - <link target="https://www.iec.ch/searchpub">www.iec.ch/searchpub</link></title>
+    <p>La recherche avancée permet de trouver des publications IEC en utilisant différents critères (numéro de référence, texte, comité d’études,...). Elle donne aussi des informations sur les projets et les publications remplacées ou retirées.</p>
+  </clause>
+  <clause><title>IEC Just Published - <link target="https://webstore.iec.ch/justpublished">webstore.iec.ch/justpublished</link></title>
+    <p>Restez informé sur les nouvelles publications IEC. Just Published détaille les nouvelles publications parues. Disponible en ligne et aussi une fois par mois par email.</p>
+  </clause>
+  <clause><title>Electropedia - <link target="http://www.electropedia.org">www.electropedia.org</link></title>
+    <p>Le premier dictionnaire en ligne de termes électroniques et électriques. Il contient plus de 30 000 termes et définitions en anglais et en français, ainsi que les termes équivalents dans 14 langues additionnelles. Egalement appelé Vocabulaire Electrotechnique International (IEV) en ligne.</p>
+  </clause>
+  <clause><title>Glossaire IEC - <link target="http://std.iec.ch/glossary">std.iec.ch/glossary</link></title>
+    <p>Plus de 55 000 entrées terminologiques électrotechniques, en anglais et en français, extraites des articles Termes et Définitions des publications IEC parues depuis 2002. Plus certaines entrées antérieures extraites des publications des CE 37, 77, 86 et CISPR de l'IEC.</p>
+  </clause>
+  <clause><title>Service Clients - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
+    <p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
+  </clause>
 </clause>
-</license-statement>
 {% endif %}
+</feedback-statement>
 </boilerplate>
+

data/lib/asciidoctor/iec/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">
@@ -47,6 +55,13 @@
             <param name="pattern">\i\c*|\c+#\c+</param>
           </data>
         </attribute>
+        <optional>
+          <attribute name="to">
+            <data type="string">
+              <param name="pattern">\i\c*|\c+#\c+</param>
+            </data>
+          </attribute>
+        </optional>
         <optional>
           <attribute name="type">
             <ref name="ReferenceFormat"/>
@@ -141,6 +156,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -233,6 +253,12 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="width"/>
+        </optional>
+        <optional>
+          <ref name="colgroup"/>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -751,6 +777,18 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="colgroup">
+    <element name="colgroup">
+      <oneOrMore>
+        <ref name="col"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="col">
+    <element name="col">
+      <attribute name="width"/>
+    </element>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>
@@ -801,6 +839,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -856,9 +897,11 @@
       <element name="code">
         <text/>
       </element>
-      <element name="text">
-        <text/>
-      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="standard-document">
@@ -1028,6 +1071,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1081,6 +1127,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1183,6 +1232,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1511,6 +1563,7 @@
           <value>add</value>
           <value>modify</value>
           <value>delete</value>
+          <value>replace</value>
         </choice>
       </attribute>
       <optional>
@@ -1541,6 +1594,11 @@
       </optional>
       <optional>
         <element name="newcontent">
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
           <zeroOrMore>
             <ref name="BasicBlock"/>
           </zeroOrMore>

data/lib/asciidoctor/iec/isostandard.rng

@@ -38,6 +38,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="horizontal"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -137,22 +140,28 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+      <group>
+        <choice>
+          <group>
+            <oneOrMore>
+              <ref name="BasicBlock"/>
+            </oneOrMore>
+            <zeroOrMore>
+              <ref name="note"/>
+            </zeroOrMore>
+          </group>
+          <ref name="amend"/>
+        </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </choice>
+      </group>
     </define>
     <define name="term">
       <element name="term">
@@ -379,6 +388,9 @@
             <data type="anyURI"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="colgroup"/>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -429,6 +441,11 @@
       <ref name="bibliography"/>
     </element>
   </define>
+  <define name="horizontal">
+    <element name="horizontal">
+      <data type="boolean"/>
+    </element>
+  </define>
   <define name="documentnumber">
     <element name="project-number">
       <optional>

data/lib/isodoc/iec/base_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
         b = isoxml.at(ns("//boilerplate/legal-statement"))
         page_break(out)
         iec_orgname(out)
-        middle_title(out)
+        middle_title(isoxml, out)
         out.div **attr_code(id: f ? f["id"] : "") do |s|
           s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
           @meta.get[:doctype] == "Amendment" or
@@ -30,7 +30,7 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
 
-      def middle_title(out)
+      def middle_title(_isoxml, out)
         title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
         @meta.get[:doctitleintro] and
           title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"

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

@@ -768,12 +768,12 @@ p.NormRef {
 pre,
 .pseudocode {
   background-color: #f5faff;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
-  font-size: 1em; }
+  font-size: {{monospacefontsize}}; }
   .figure .SourceTitle,
   pre .SourceTitle,
   .pseudocode .SourceTitle {
@@ -890,14 +890,14 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
   font-size: 0.8em; }
 
 .footnote {
-  font-size: 0.9em; }
+  font-size: {{footnotefontsize}}; }
 
 sup a {
   vertical-align: super;
   font-size: 0.8em; }
 
 #footnote_box {
-  font-size: 14px;
+  font-size: {{footnotefontsize}};
   background: white;
   padding: 0 10px;
   margin: 10px;
@@ -910,7 +910,7 @@ ol.footnotes-list, aside.footnote {
   margin-left: 1em; }
 
 ol.footnotes-list li, aside.footnote {
-  font-size: 0.9em;
+  font-size: {{footnotefontsize}};
   vertical-align: top;
   list-style: decimal;
   margin-bottom: 1em; }

data/lib/isodoc/iec/html/htmlstyle.scss

@@ -517,7 +517,7 @@ p.NormRef {
 pre,
 .pseudocode {
     @include pseudocodeBlock(#f5faff);
-    font-size: 1em;
+    font-size: $monospacefontsize;
 }
 
 pre {
@@ -618,7 +618,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
 }
 
 .footnote {
-    font-size: 0.9em;
+    font-size: $footnotefontsize;
 }
 
 sup a {
@@ -626,7 +626,7 @@ sup a {
     font-size: 0.8em;
 }
 #footnote_box {
-    font-size: 14px;
+    font-size: $footnotefontsize;
     background: white;
     padding: 0 10px;
     margin: 10px;
@@ -642,7 +642,7 @@ ol.footnotes-list, aside.footnote {
 }
 
 ol.footnotes-list li, aside.footnote {
-    font-size: 0.9em;
+    font-size: $footnotefontsize;
     vertical-align: top;
     list-style:decimal;
     margin-bottom: 1em;

data/lib/isodoc/iec/html/isodoc.css

@@ -10,9 +10,9 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
   text-align: left;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 9.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Courier New",monospace;
+  font-size: {{monospacefontsize}};
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{monospacefont}};
   mso-fareast-font-family: "Times New Roman";
   mso-bidi-font-family: Arial;
   letter-spacing: -.1pt;
@@ -31,9 +31,9 @@ p.pseudocode, li.pseudocode, div.pseudocode {
   text-align: left;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-bidi-font-family: Arial;
   letter-spacing: -.1pt;
@@ -54,9 +54,9 @@ p.CODE-TableCell, li.CODE-TableCell, div.CODE-TableCell, pre.CODE-TableCell {
   text-align: left;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Courier New";
+  font-size: {{smallerfontsize}};
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{monospacefontsize}};
   mso-fareast-font-family: "Times New Roman";
   mso-bidi-font-family: Arial;
   letter-spacing: -.1pt;
@@ -71,7 +71,7 @@ p.Biblio, li.Biblio, div.Biblio {
   mso-style-parent: Normal;
   margin-top: 5.0pt;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 34.0pt;
   text-align: justify;
   text-indent: -34.0pt;
@@ -80,8 +80,8 @@ p.Biblio, li.Biblio, div.Biblio {
   /* mso-list:l6 level1 lfo20; */
   tab-stops: list 34.0pt;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -93,7 +93,7 @@ p.NormRef, li.NormRef, div.NormRef {
   mso-style-parent: Normal;
   margin-top: 5.0pt;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0pt;
   text-align: justify;
   mso-pagination: widow-orphan;
@@ -101,8 +101,8 @@ p.NormRef, li.NormRef, div.NormRef {
   /* mso-list:l6 level1 lfo20; */
   tab-stops: list 34.0pt;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -115,13 +115,13 @@ p.FigureTitle {
   mso-style-next: Normal;
   margin-top: 5.0pt;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -134,13 +134,13 @@ p.AdmonitionTitle, p.RecommendationTitle {
   mso-style-next: Normal;
   margin-top: 5.0pt;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -153,13 +153,13 @@ p.SourceTitle {
   mso-style-next: Normal;
   margin-top: 5.0pt;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -174,14 +174,14 @@ p.TableTitle {
   mso-style-next: Normal;
   margin-top: 5.0pt;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -200,8 +200,8 @@ p.Note, div.Note, li.Note {
   text-align: justify;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -220,8 +220,8 @@ p.TableFootnote, div.TableFootnote, li.TableFootnote {
   mso-pagination: widow-orphan;
   tab-stops: 14.2pt;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -236,7 +236,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle {
   mso-style-next: Normal;
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   text-indent: 0pt;
@@ -246,8 +246,8 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle {
   mso-hyphenate: none;
   layout-grid-mode: char;
   font-size: 12.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -262,7 +262,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle {
   mso-style-next: Normal;
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   text-indent: 0pt;
@@ -272,8 +272,8 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle {
   mso-hyphenate: none;
   layout-grid-mode: char;
   font-size: 12.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -286,7 +286,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
   mso-style-next: Normal;
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: center;
   text-indent: 0pt;
@@ -295,8 +295,8 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
   mso-hyphenate: none;
   layout-grid-mode: char;
   font-size: 12.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -318,8 +318,8 @@ p.Terms, li.Terms, div.Terms {
   mso-pagination: widow-orphan;
   page-break-after: avoid;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -346,8 +346,8 @@ p.AltTerms, li.AltTerms, div.AltTerms {
   mso-pagination: widow-orphan;
   page-break-after: avoid;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -368,8 +368,8 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms {
   text-align: justify;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -396,8 +396,8 @@ p.TermNum, li.TermNum, div.TermNum {
   mso-hyphenate: none;
   tab-stops: list 31.2pt;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -464,7 +464,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1 {
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
   font-size: 12.0pt;
-  font-family: "Arial",sans-serif;
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -483,7 +483,7 @@ p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2 {
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
   font-size: 12.0pt;
-  font-family: "Arial",sans-serif;
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -503,8 +503,8 @@ p.TABLE-col-heading, li.TABLE-col-heading, div.TABLE-col-heading {
   mso-pagination: widow-orphan;
   page-break-after: avoid;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{smallerfontsize}};
+  font-family: {{headerfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -523,9 +523,9 @@ p.TABLE-cell, li.TABLE-cell, div.TABLE-cell {
   text-align: left;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  mso-bidi-font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{smallerfontsize}};
+  mso-bidi-font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -542,7 +542,7 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -554,7 +554,7 @@ p.QuoteAttribution {
 p.Admonition, li.Admonition, div.Admonition {
   mso-style-priority: 99;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
@@ -577,16 +577,16 @@ p.formula, li.formula, div.formula {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-next: Normal;
-  margin-top: 10.0pt;
+  margin-top: {{normalfontsize}};
   margin-right: 0cm;
-  margin-bottom: 10.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm;
   text-align: justify;
   mso-pagination: widow-orphan;
   tab-stops: center 8.0cm right 16.0cm;
   layout-grid-mode: char;
-  font-size: 10.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -607,8 +607,8 @@ p.FOREWORD, li.FOREWORD, div.FOREWORD {
   mso-pagination: widow-orphan;
   tab-stops: 14.2pt;
   layout-grid-mode: char;
-  font-size: 8.0pt;
-  font-family: "Arial",sans-serif;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
@@ -652,7 +652,7 @@ table.MsoISOTable, table.MsoISOTableBig {
   mso-yfti-tbllook: 480;
   mso-border-insideh: .75pt solid windowtext;
   mso-border-insidev: .75pt solid windowtext;
-  font-size: 10.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}}; }
 
 table.MsoISOTable th, table.MsoISOTableBig th {
@@ -666,7 +666,7 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
 table.MsoISOTable p, table.MsoISOTableBig p {
-  font-size: 10.0pt; }
+  font-size: {{normalfontsize}}; }
 
 table.MsoTableGrid {
   mso-style-name: "Table Grid";
@@ -682,7 +682,7 @@ table.MsoTableGrid {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}}; }
 
 body {
@@ -716,7 +716,7 @@ div.coverpage_warning {
 
 .coverpage_warning {
   color: #485094;
-  font-size: 10.0pt; }
+  font-size: {{normalfontsize}}; }
 
 .coverpage {
   text-align: center;
@@ -799,16 +799,16 @@ a.TableFootnoteRef, span.TableFootnoteRef {
   vertical-align: super; }
 
 aside {
-  font-size: 10.0pt; }
+  font-size: {{footnotefontsize}}; }
 
 /*
 div.example {
 	border:solid black .25pt;
 	mso-border-alt:solid black .25pt;
 	padding:10pt;
-	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
+	mso-padding-alt:$normalfontsize 10.0pt 10.0pt 10.0pt;
 	margin:10pt;
-	mso-margin-alt:10.0pt 10.0pt 10.0pt 10.0pt;
+	mso-margin-alt:$normalfontsize 10.0pt 10.0pt 10.0pt;
 }
 */
 /*
@@ -820,28 +820,28 @@ div.example {
 p.example, li.example, div.example, td.example {
   mso-pagination: none;
   tab-stops: 70.9pt;
-  font-size: 10.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}}; }
 
 td.example p.MsoListParagraph {
-  font-size: 10.0pt; }
+  font-size: {{normalfontsize}}; }
 
 div.example p.MsoListParagraph {
-  font-size: 10.0pt; }
+  font-size: {{normalfontsize}}; }
 
 div.Note p.MsoListParagraph {
-  font-size: 8.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 div.Note span.stem {
-  font-size: 8.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.Note p.Sourcecode, div.Note pre.Sourcecode {
-  font-size: 8.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 div.Note table.dl {
-  font-size: 8.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 div.example, td.example {
@@ -849,9 +849,9 @@ div.example, td.example {
   margin-bottom: 12.0pt; }
 
 span.example_label, td.example_label {
-  font-size: 10.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}}; }
 
 span.note_label, td.note_label {
-  font-size: 8.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }