metanorma-iso 1.5.12 → 1.7.0

data/lib/asciidoctor/iso/validate_section.rb

@@ -4,11 +4,14 @@ module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
       def section_validate(doc)
-        foreword_validate(doc.root)
-        normref_validate(doc.root)
-        symbols_validate(doc.root)
-        sections_presence_validate(doc.root)
-        sections_sequence_validate(doc.root)
+        doctype = doc&.at("//bibdata/ext/doctype")&.text
+        unless %w(amendment technical-corrigendum).include? doctype
+          foreword_validate(doc.root)
+          normref_validate(doc.root)
+          symbols_validate(doc.root)
+          sections_presence_validate(doc.root)
+          sections_sequence_validate(doc.root)
+        end
         section_style(doc.root)
         subclause_validate(doc.root)
         super
@@ -111,13 +114,13 @@ module Asciidoctor
         end
         n&.at("./self::clause") ||
           @log.add("Style", nil, "Document must contain clause after "\
-               "Terms and Definitions")
+                   "Terms and Definitions")
         n&.at("./self::clause[@type = 'scope']") &&
           @log.add("Style", nil, "Scope must occur before Terms and Definitions")
         n = names.shift 
         while n&.name == "clause"
           n&.at("./self::clause[@type = 'scope']")
-            @log.add("Style", nil, "Scope must occur before Terms and Definitions")
+          @log.add("Style", nil, "Scope must occur before Terms and Definitions")
           n = names.shift 
         end
         unless %w(annex references).include? n&.name
@@ -127,12 +130,12 @@ module Asciidoctor
           n = names.shift
           if n.nil?
             @log.add("Style", nil, "Document must include (references) "\
-                 "Normative References")
+                     "Normative References")
           end
         end
         n&.at("./self::references[@normative = 'true']") ||
           @log.add("Style", nil, "Document must include (references) "\
-               "Normative References")
+                   "Normative References")
         n = names&.shift
         n&.at("./self::references[@normative = 'false']") ||
           @log.add("Style", nil, "Final section must be (references) Bibliography")

data/lib/isodoc/iso/base_convert.rb

@@ -14,7 +14,8 @@ module IsoDoc
       end
 
       def implicit_reference(b)
-        b&.at(ns("./docidentifier"))&.text == "IEV"
+        return true if b&.at(ns("./docidentifier"))&.text == "IEV"
+        super
       end
 
       # terms not defined in standoc

data/lib/isodoc/iso/html/header.html

@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draft
 
 <p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}</span><span lang=EN-GB
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
 style='font-weight:normal'><o:p></o:p></span></p>
 
 </div>
@@ -93,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 
 </div>
 
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
 1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -144,12 +144,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
 1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
 <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
 </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -162,7 +162,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
 
 <div style='mso-element:footer' id=f2l>
 <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
 </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -186,7 +186,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -202,12 +202,12 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
 <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
@@ -221,7 +221,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
 
 <div style='mso-element:footer' id=f3l>
 <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
@@ -242,10 +242,10 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
 {% endif %}
 
 <p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
-10.0pt;mso-ansi-language:EN-AU'>{{ price_based_on | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
+10.0pt;mso-ansi-language:EN-AU'>{{ labels["price_based_on"] | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
 
 <p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 
 </div>
 

data/lib/isodoc/iso/html/html_iso_intro.html

@@ -2,7 +2,7 @@
 
 <nav>
 
-  <h1 id="content">Contents</h1>
+  <h1 id="content">{{ labels["table_of_contents"] }}</h1>
   <div id="toc"></div>
 
 </nav>

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -8,7 +8,7 @@
     {% endif %}
 
 {% if revdate %}
-<p class="coverpage_docnumber">Date: {{ revdate }}</p>
+<p class="coverpage_docnumber">{{ labels["date"]}}: {{ revdate }}</p>
 {% endif %}
 
 {% if tc_docnumber.size > 0 %}

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

@@ -10,7 +10,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 12.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: Calibri;
   mso-bidi-font-family: "Times New Roman";

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

@@ -10,7 +10,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
         line-height:12.0pt;
         mso-pagination:widow-orphan;
         tab-stops:20.15pt;
-        font-size:12.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:Calibri;
         mso-bidi-font-family:"Times New Roman";

data/lib/isodoc/iso/html/isodoc.css

@@ -10,7 +10,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 9.0pt;
+  font-size: {{monospacefontsize}};
   font-family: {{monospacefont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: "Courier New";
@@ -28,7 +28,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: "Courier New";
@@ -46,7 +46,7 @@ p.Biblio, li.Biblio, div.Biblio {
   tab-stops: 33.15pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -64,7 +64,7 @@ p.NormRef, li.NormRef, div.NormRef {
   tab-stops: 33.15pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -83,7 +83,7 @@ p.FigureTitle {
   page-break-before: avoid;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   font-weight: bold;
   mso-fareast-font-family: "SimSun",serif;
@@ -103,7 +103,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
   page-break-after: avoid;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   font-weight: bold;
   mso-fareast-font-family: "SimSun",serif;
@@ -123,7 +123,7 @@ p.SourceTitle {
   page-break-before: avoid;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   font-weight: bold;
   mso-fareast-font-family: "SimSun",serif;
@@ -143,7 +143,7 @@ p.TableTitle {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-weight: bold;
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
@@ -162,8 +162,8 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.0pt;
-  mso-bidi-font-size: 11.0pt;
+  font-size: {{smallerfontsize}};
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -190,7 +190,7 @@ p.ANNEX, li.ANNEX, div.ANNEX {
   mso-list: l0 level1 lfo12;
   tab-stops: 20.15pt;
   font-size: 14.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -213,7 +213,7 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle {
   mso-outline-level: 1;
   tab-stops: 20.15pt;
   font-size: 14.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -233,7 +233,7 @@ p.Definition, li.Definition, div.Definition {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -256,7 +256,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 14.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -281,7 +281,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 14.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -305,7 +305,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 14.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -325,7 +325,7 @@ p.Terms, li.Terms, div.Terms {
   page-break-after: avoid;
   mso-hyphenate: none;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -345,7 +345,7 @@ p.AltTerms, li.AltTerms, div.AltTerms {
   page-break-after: avoid;
   mso-hyphenate: none;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -364,7 +364,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms {
   page-break-after: avoid;
   mso-hyphenate: none;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -382,7 +382,7 @@ p.TermNum, li.TermNum, div.TermNum {
   mso-pagination: widow-orphan;
   page-break-after: avoid;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -407,7 +407,7 @@ p.zzContents, li.zzContents, div.zzContents {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 14.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -502,7 +502,7 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 16.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -525,7 +525,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1 {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 16.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -548,7 +548,7 @@ p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2 {
   mso-hyphenate: none;
   tab-stops: 20.15pt;
   font-size: 16.0pt;
-  mso-bidi-font-size: 11.0pt;
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
@@ -565,7 +565,7 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -602,8 +602,8 @@ p.Code, li.Code, div.Code {
   line-height: 10.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 9.0pt;
-  mso-bidi-font-size: 11.0pt;
+  font-size: {{monospacefontsize}};
+  mso-bidi-font-size: {{normalfontsize}};
   font-family: {{monospacefont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: "Cambria";
@@ -615,12 +615,12 @@ p.Formula, li.Formula, div.Formula {
   mso-style-unhide: no;
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 11.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 20.15pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: right 487.45pt;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -629,7 +629,7 @@ p.Formula, li.Formula, div.Formula {
 table.dl {
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 11.0pt;
+  margin-bottom: {{normalfontsize}};
   margin-left: 0cm; }
 
 div.figdl {
@@ -647,7 +647,7 @@ table.figdl {
   margin-right: 0cm; }
 
 div.figdl p, table.figdl p {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 table.formula_dl {
   margin-left: 20.15pt; }
@@ -670,7 +670,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: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 table.MsoISOTable th, table.MsoISOTableBig th {
@@ -684,7 +684,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: {{smallerfontsize}}; }
 
 table.MsoTableGrid {
   mso-style-name: "Table Grid";
@@ -700,7 +700,7 @@ table.MsoTableGrid {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 div.formula {
@@ -820,7 +820,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
   vertical-align: super; }
 
 aside {
-  font-size: 10.0pt; }
+  font-size: {{footnotefontsize}}; }
 
 /*
 div.example {
@@ -841,7 +841,7 @@ div.example {
 p.example, li.example, div.example, td.example {
   mso-pagination: none;
   tab-stops: 70.9pt;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 div.example, td.example {
@@ -849,26 +849,26 @@ div.example, td.example {
   margin-bottom: 12.0pt; }
 
 td.example p.MsoListParagraph {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.example p.MsoListParagraph {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.Note p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 div.Note span.stem {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.Note p.Sourcecode, div.Note pre.Sourcecode {
   font-size: 8.0pt;
   margin-left: 1.0cm; }
 
 div.Note table.dl {
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 span.note_label, span.example_label, td.example_label, td.note_label {
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }