metanorma-iso 1.8.3 → 1.9.0

data/lib/asciidoctor/iso/validate_style.rb

@@ -102,8 +102,8 @@ module Asciidoctor
       # ISO/IEC DIR 2, Table B.1
       def style_number(node, text)
         style_two_regex_not_prev(
-          node, text, /^(?<num>-?[0-9]{4,}[,0-9]*)$/,
-          %r{\b(ISO|IEC|IEEE/|(in|January|February|March|April|May|June|August|September|October|November|December)\b)$},
+          node, text, /^(?<num>-?[0-9]{4,}[,0-9]*)\Z/,
+          %r{\b(ISO|IEC|IEEE/|(in|January|February|March|April|May|June|August|September|October|November|December)\b)\Z},
           "number not broken up in threes"
         )
         style_regex(/\b(?<num>[0-9]+\.[0-9]+)/i,
@@ -123,7 +123,7 @@ module Asciidoctor
       # ISO/IEC DIR 2, 8.4
       # ISO/IEC DIR 2, 9.3
       def style_abbrev(node, text)
-        style_regex(/(^|\s)(?!e\.g\.|i\.e\.)
+        style_regex(/(\A|\s)(?!e\.g\.|i\.e\.)
                     (?<num>[a-z]{1,2}\.([a-z]{1,2}|\.))\b/ix,
                     "no dots in abbreviations", node, text)
         style_regex(/\b(?<num>ppm)\b/i,

data/lib/isodoc/iso/base_convert.rb

@@ -13,8 +13,8 @@ module IsoDoc
         super
       end
 
-      def implicit_reference(b)
-        return true if b&.at(ns("./docidentifier"))&.text == "IEV"
+      def implicit_reference(bib)
+        return true if bib&.at(ns("./docidentifier"))&.text == "IEV"
 
         super
       end
@@ -32,7 +32,7 @@ module IsoDoc
         return if name.nil?
 
         div.span **{ class: "example_label" } do |p|
-          name.children.each { |n| parse(n, div) }
+          name.children.each { |n| parse(n, p) }
         end
       end
 
@@ -89,7 +89,7 @@ module IsoDoc
         return unless insert = node.at(ns("./definition"))
 
         insert = insertall_after_here(node, insert, "termexample")
-        insert = insertall_after_here(node, insert, "termnote")
+        insertall_after_here(node, insert, "termnote")
       end
 
       def termdef_parse(node, out)
@@ -110,26 +110,29 @@ module IsoDoc
         end
       end
 
-      def formula_where(dl, out)
-        return if dl.nil?
-        return super unless (dl&.xpath(ns("./dt"))&.size == 1 && 
-                             dl&.at(ns("./dd"))&.elements&.size == 1 &&
-                             dl&.at(ns("./dd/p")))
+      def formula_where(dlist, out)
+        return if dlist.nil?
+        return super unless dlist&.xpath(ns("./dt"))&.size == 1 &&
+          dlist&.at(ns("./dd"))&.elements&.size == 1 &&
+          dlist&.at(ns("./dd/p"))
 
         out.span **{ class: "zzMoveToFollowing" } do |s|
           s << "#{@i18n.where} "
-          dl.at(ns("./dt")).children.each { |n| parse(n, s) }
+          dlist.at(ns("./dt")).children.each { |n| parse(n, s) }
           s << " "
         end
-        parse(dl.at(ns("./dd/p")), out)
+        parse(dlist.at(ns("./dd/p")), out)
       end
 
       def admonition_parse(node, out)
         type = node["type"]
         name = admonition_name(node, type)
         out.div **{ id: node["id"], class: admonition_class(node) } do |div|
-          node.first_element_child.name == "p" ?
-            admonition_p_parse(node, div, name) : admonition_parse1(node, div, name)
+          if node.first_element_child.name == "p"
+            admonition_p_parse(node, div, name)
+          else
+            admonition_parse1(node, div, name)
+          end
         end
       end
 
@@ -153,17 +156,39 @@ module IsoDoc
         div << " &mdash; "
       end
 
-      def figure_name_parse(node, div, name)
+      def figure_name_parse(_node, div, name)
         div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
-          name&.children&.each { |n| parse(n, div) }
+          name&.children&.each { |n| parse(n, p) }
         end
       end
 
       def middle(isoxml, out)
-        super
+        middle_title(isoxml, out)
+        middle_admonitions(isoxml, out)
+        i = scope isoxml, out, 0
+        i = norm_ref isoxml, out, i
+        # i = terms_defs isoxml, out, i
+        # symbols_abbrevs isoxml, out, i
+        clause_etc isoxml, out, i
+        annex isoxml, out
+        bibliography isoxml, out
         indexsect isoxml, out
       end
 
+      def clause_etc(isoxml, out, num)
+        isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+                        "//sections/terms | //sections/definitions")).each do |f|
+          out.div **attr_code(id: f["id"],
+                              class: f.name == "definitions" ? "Symbols" : nil) do |div|
+            num = num + 1
+            clause_name(num, f&.at(ns("./title")), div, nil)
+            f.elements.each do |e|
+              parse(e, div) unless %w{title source}.include? e.name
+            end
+          end
+        end
+      end
+
       def indexsect(isoxml, out)
         isoxml.xpath(ns("//indexsect")).each do |i|
           clause_parse(i, out)

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

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -70,18 +71,23 @@ p.NormRef, li.NormRef, div.NormRef {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
-p.FigureTitle {
+p.FigureTitle, li.FigureTitle, div.FigureTitle {
+  mso-style-name: "Figure Title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Figure Title Char";
   margin-top: 0cm;
   margin-right: 0cm;
   margin-bottom: 6.0pt;
-  margin-left: 0cm;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
   text-align: center;
+  text-indent: -30.35pt;
   line-height: 12.0pt;
-  page-break-before: avoid;
   mso-pagination: widow-orphan;
+  /*mso-list:l9 level1 lfo17;*/
   tab-stops: 20.15pt;
   font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
@@ -90,6 +96,246 @@ p.FigureTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.FigureTitleCxSpFirst, li.FigureTitleCxSpFirst, div.FigureTitleCxSpFirst {
+  mso-style-name: "Figure TitleCxSpFirst";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Figure Title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: -30.35pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  /*mso-list:l9 level1 lfo17;*/
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+p.FigureTitleCxSpMiddle, li.FigureTitleCxSpMiddle, div.FigureTitleCxSpMiddle {
+  mso-style-name: "Figure TitleCxSpMiddle";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Figure Title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: -30.35pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  /*mso-list:l9 level1 lfo17;*/
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+p.FigureTitleCxSpLast, li.FigureTitleCxSpLast, div.FigureTitleCxSpLast {
+  mso-style-name: "Figure TitleCxSpLast";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Figure Title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: -30.35pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  /*mso-list:l9 level1 lfo17;*/
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+span.NoteChar {
+  mso-style-name: "Note Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-link: Note;
+  mso-ansi-language: EN-GB; }
+
+p.AnnexFigureTitle, li.AnnexFigureTitle, div.AnnexFigureTitle {
+  mso-style-name: "Annex Figure Title";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-link: "Annex Figure Title Char";
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 17.0pt;
+  text-align: center;
+  text-indent: -11.35pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  /* mso-list:l6 level1 lfo13; */
+  tab-stops: list 5.65pt left 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
+  mso-style-name: "Annex Table Title";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "Παράγραφος λίστας";
+  mso-style-link: "Annex Table Title Char";
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 0cm;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: 0cm;
+  line-height: 12.0pt;
+  page-break-before: always;
+  mso-pagination: widow-orphan;
+  page-break-after: avoid;
+  /* mso-list:l4 level1 lfo15; */
+  tab-stops: list 0cm left 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold;
+  mso-bidi-font-weight: normal; }
+
+p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSpFirst {
+  mso-style-name: "Annex Table TitleCxSpFirst";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Annex Table Title Char";
+  mso-style-type: export-only;
+  margin: 0cm;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: 0cm;
+  line-height: 12.0pt;
+  page-break-before: always;
+  mso-pagination: widow-orphan;
+  page-break-after: avoid;
+  /* mso-list:l4 level1 lfo15; */
+  tab-stops: list 0cm left 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold;
+  mso-bidi-font-weight: normal; }
+
+p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCxSpMiddle {
+  mso-style-name: "Annex Table TitleCxSpMiddle";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Annex Table Title Char";
+  mso-style-type: export-only;
+  margin: 0cm;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: 0cm;
+  line-height: 12.0pt;
+  page-break-before: always;
+  mso-pagination: widow-orphan;
+  page-break-after: avoid;
+  /* mso-list:l4 level1 lfo15; */
+  tab-stops: list 0cm left 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold;
+  mso-bidi-font-weight: normal; }
+
+p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLast {
+  mso-style-name: "Annex Table TitleCxSpLast";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Annex Table Title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 0cm;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: 0cm;
+  line-height: 12.0pt;
+  page-break-before: always;
+  mso-pagination: widow-orphan;
+  page-break-after: avoid;
+  /* mso-list:l4 level1 lfo15; */
+  tab-stops: list 0cm left 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US;
+  font-weight: bold;
+  mso-bidi-font-weight: normal; }
+
+span.Char2 {
+  mso-style-name: "List Paragraph Char";
+  mso-style-noshow: yes;
+  mso-style-priority: 34;
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-link: "List Paragraph";
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: EN-GB; }
+
+span.AnnexTableTitleChar {
+  mso-style-name: "Annex Table Title Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-parent: "List Paragraph Char";
+  mso-style-link: "Annex Table Title";
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: EN-GB;
+  font-weight: bold;
+  mso-bidi-font-weight: normal; }
+
 p.AdmonitionTitle, p.RecommendationTitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -130,18 +376,21 @@ p.SourceTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
-p.TableTitle {
+p.Tabletitle, li.Tabletitle, div.Tabletitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
   margin-top: 0cm;
   margin-right: 0cm;
   margin-bottom: 6.0pt;
-  margin-left: 0cm;
+  margin-left: 36.0pt;
   text-align: center;
+  text-indent: -18.0pt;
+  line-height: 12.0pt;
   page-break-after: avoid;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
+  /* mso-list:l8 level1 lfo16; */
   tab-stops: 20.15pt;
   font-size: {{normalfontsize}};
   font-weight: bold;
@@ -150,6 +399,116 @@ p.TableTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.TabletitleCxSpFirst, li.TabletitleCxSpFirst, div.TabletitleCxSpFirst {
+  mso-style-name: "Table titleCxSpFirst";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Table title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: -18.0pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  mso-list: l8 level1 lfo16;
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: FR-CH;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+p.TabletitleCxSpMiddle, li.TabletitleCxSpMiddle, div.TabletitleCxSpMiddle {
+  mso-style-name: "Table titleCxSpMiddle";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Table title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: -18.0pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  mso-list: l8 level1 lfo16;
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: FR-CH;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+p.TabletitleCxSpLast, li.TabletitleCxSpLast, div.TabletitleCxSpLast {
+  mso-style-name: "Table titleCxSpLast";
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: "List Paragraph";
+  mso-style-link: "Table title Char";
+  mso-style-type: export-only;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 36.0pt;
+  mso-add-space: auto;
+  text-align: center;
+  text-indent: -18.0pt;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  mso-list: l8 level1 lfo16;
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: FR-CH;
+  mso-fareast-language: EN-US;
+  font-weight: bold; }
+
+span.FigureTitleChar {
+  mso-style-name: "Figure Title Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-parent: "List Paragraph Char";
+  mso-style-link: "Figure Title";
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: EN-GB;
+  font-weight: bold; }
+
+span.TabletitleChar {
+  mso-style-name: "Table title Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-parent: "List Paragraph Char";
+  mso-style-link: "Table title";
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: FR-CH;
+  font-weight: bold; }
+
+span.AnnexFigureTitleChar {
+  mso-style-name: "Annex Figure Title Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-link: "Annex Figure Title";
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: EN-GB;
+  font-weight: bold; }
+
 p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -201,6 +560,7 @@ p.ANNEX, li.ANNEX, div.ANNEX {
 
 p.BiblioTitle, li.BiblioTitle, div.BiblioTitle {
   mso-style-name: "Biblio Title";
+  mso-style-priority: 5;
   mso-style-noshow: yes;
   mso-style-unhide: no;
   margin-top: 0cm;
@@ -225,9 +585,10 @@ p.Definition, li.Definition, div.Definition {
   mso-style-name: Definition;
   mso-style-priority: 9;
   mso-style-unhide: no;
+  mso-style-link: "Definition Char";
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 12.0pt;
+  margin-bottom: 6.0pt;
   margin-left: 0cm;
   text-align: justify;
   line-height: 12.0pt;
@@ -319,7 +680,6 @@ p.Terms, li.Terms, div.Terms {
   mso-style-unhide: no;
   mso-style-next: Definition;
   margin: 0cm;
-  margin-bottom: .0001pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
@@ -377,7 +737,6 @@ p.TermNum, li.TermNum, div.TermNum {
   mso-style-unhide: no;
   mso-style-next: "Term\(s\)";
   margin: 0cm;
-  margin-bottom: .0001pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
@@ -421,7 +780,9 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
   mso-style-unhide: no;
   mso-style-next: Normal;
   margin-top: 0cm;
-  margin-bottom: 12.0pt;
+  margin-right: 14.2pt;
+  margin-bottom: 6.0pt;
+  margin-left: 14.2pt;
   text-align: justify;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
@@ -429,7 +790,7 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
   border: none;
   padding: 0cm;
   mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
-  font-size: 10.0pt;
+  font-size: 11.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -441,7 +802,9 @@ p.zzCopyright1 {
   mso-style-unhide: no;
   mso-style-next: Normal;
   margin-top: 0cm;
-  margin-bottom: 12.0pt;
+  margin-right: 14.2pt;
+  margin-bottom: 6.0pt;
+  margin-left: 14.2pt;
   text-align: justify;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
@@ -449,7 +812,7 @@ p.zzCopyright1 {
   border: none;
   padding: 0cm;
   mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
-  font-size: 10.0pt;
+  font-size: 11.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
@@ -598,7 +961,6 @@ p.Code, li.Code, div.Code {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   margin: 0cm;
-  margin-bottom: .0001pt;
   line-height: 10.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
@@ -615,7 +977,7 @@ p.Formula, li.Formula, div.Formula {
   mso-style-unhide: no;
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: {{normalfontsize}};
+  margin-bottom: 11.0pt;
   margin-left: 20.15pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
@@ -626,6 +988,73 @@ p.Formula, li.Formula, div.Formula {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.ForewordText, li.ForewordText, div.ForewordText {
+  mso-style-name: "Foreword Text";
+  mso-style-unhide: no;
+  mso-style-link: "Foreword Text Char";
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 0cm;
+  text-align: justify;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-fareast-language: EN-US; }
+
+span.ForewordTextChar {
+  mso-style-name: "Foreword Text Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-parent: "";
+  mso-style-link: "Foreword Text";
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt; }
+
+p.Source, li.Source, div.Source {
+  mso-style-name: Source;
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-parent: Definition;
+  mso-style-link: "Source Char";
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 0cm;
+  text-align: justify;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  tab-stops: 20.15pt;
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US; }
+
+span.DefinitionChar {
+  mso-style-name: "Definition Char";
+  mso-style-priority: 9;
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-link: Definition;
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: EN-GB; }
+
+span.SourceChar {
+  mso-style-name: "Source Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-parent: "Definition Char";
+  mso-style-link: Source;
+  mso-ansi-font-size: 11.0pt;
+  mso-bidi-font-size: 11.0pt;
+  mso-ansi-language: EN-GB; }
+
 table.dl {
   margin-top: 0cm;
   margin-right: 0cm;
@@ -838,22 +1267,48 @@ div.example {
   text-indent:-70.9pt;
 }
 */
-p.example, li.example, div.example, td.example {
-  mso-pagination: none;
+p.Example, li.Example, div.Example, td.Example {
   tab-stops: 70.9pt;
   font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
-div.example, td.example {
+div.Example, td.Example {
   margin: 0in;
-  margin-bottom: 12.0pt; }
+  margin-bottom: 6.0pt; }
 
-td.example p.MsoListParagraph {
+td.Example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }
 
-div.example p.MsoListParagraph {
+div.Example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }
 
+p.Example, li.Example, div.Example {
+  mso-style-name: Example;
+  mso-style-unhide: no;
+  mso-style-qformat: yes;
+  mso-style-link: "Example Char";
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 6.0pt;
+  margin-left: 0cm;
+  text-align: justify;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  /* tab-stops:20.15pt; */
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: Calibri;
+  mso-bidi-font-family: "Times New Roman";
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: EN-US; }
+
+span.ExampleChar {
+  mso-style-name: "Example Char";
+  mso-style-unhide: no;
+  mso-style-locked: yes;
+  mso-style-link: Example;
+  mso-ansi-language: EN-GB; }
+
 div.Note p.MsoListParagraph {
   font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }