metanorma-iso 1.3.21 → 1.3.26

data/lib/asciidoctor/iso/validate_requirements.rb

@@ -16,7 +16,7 @@ module Asciidoctor
            (is|are)_not_(allowed | permitted |
                          acceptable | permissible) |
            (is|are)_not_to_be |
-           do_not )
+           [.,:;]_do_not )
         \\b
       REGEXP
       REQUIREMENT_RE =

data/lib/asciidoctor/iso/validate_section.rb

@@ -22,7 +22,7 @@ module Asciidoctor
 
       # ISO/IEC DIR 2, 15.4
       def normref_validate(root)
-        f = root.at("//references[title = 'Normative References']") || return
+        f = root.at("//references[@normative = 'true']") || return
         f.at("./references | ./clause") &&
           @log.add("Style", f, "normative references contains subclauses")
       end
@@ -168,7 +168,7 @@ module Asciidoctor
         "//li[not(p)] | //dt | //dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
 
       NORM_BIBITEMS =
-        "//references[title = 'Normative References']/bibitem".freeze
+        "//references[@normative = 'true']/bibitem".freeze
 
       # ISO/IEC DIR 2, 10.2
       def norm_bibitem_style(root)

data/lib/asciidoctor/iso/validate_style.rb

@@ -1,6 +1,6 @@
 require "metanorma-standoc"
 require "nokogiri"
-require "pp"
+require "tokenizer"
 
 module Asciidoctor
   module ISO
@@ -8,7 +8,7 @@ module Asciidoctor
       def extract_text(node)
         return "" if node.nil?
         node1 = Nokogiri::XML.fragment(node.to_s)
-        node1.xpath("//link | //locality").each(&:remove)
+        node1.xpath("//link | //locality | //localityStack").each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         ret
@@ -70,7 +70,7 @@ module Asciidoctor
       # and a negative match on its preceding token
       def style_two_regex_not_prev(n, text, re, re_prev, warning)
         return if text.nil?
-        arr = text.split(/\W+/)
+        arr = Tokenizer::WhitespaceTokenizer.new.tokenize(text)
         arr.each_index do |i|
           m = re.match arr[i]
           m_prev = i.zero? ? nil : re_prev.match(arr[i - 1])
@@ -91,9 +91,10 @@ module Asciidoctor
       # ISO/IEC DIR 2, 9.1
       # ISO/IEC DIR 2, Table B.1
       def style_number(n, t)
-        style_two_regex_not_prev(n, t, /^(?<num>-?[0-9]{4,}[,0-9]*)$/,
-                                 %r{(\bISO|\bIEC|\bIEEE/)$},
-                                 "number not broken up in threes")
+        style_two_regex_not_prev(
+          n, t, /^(?<num>-?[0-9]{4,}[,0-9]*)$/,
+          %r{\b(ISO|IEC|IEEE/|(in|January|February|March|April|May|June|August|September|October|November|December)\b)$},
+          "number not broken up in threes")
         style_regex(/\b(?<num>[0-9]+\.[0-9]+)/i,
                     "possible decimal point", n, t)
         style_regex(/\b(?<num>billion[s]?)\b/i,

data/lib/isodoc/iso/base_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require_relative "sections"
 require "fileutils"
 
 module IsoDoc
@@ -9,34 +10,30 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def implicit_reference(b)
-        b&.at(ns("./docidentifier"))&.text == "IEV"
+      def convert1(docxml, filename, dir)
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        @amd = %w(amendment technical-corrigendum).include? doctype
+        if @amd
+          @oldsuppressheadingnumbers = @suppressheadingnumbers
+          @suppressheadingnumbers = true
+        end
+        super
       end
 
-      def introduction(isoxml, out)
-        f = isoxml.at(ns("//introduction")) || return
-        num = f.at(ns(".//clause")) ? "0" : nil
-        title_attr = { class: "IntroTitle" }
-        page_break(out)
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(num, @introduction_lbl, div, title_attr)
-          f.elements.each do |e|
-            if e.name == "patent-notice"
-              e.elements.each { |e1| parse(e1, div) }
-            else
-              parse(e, div) unless e.name == "title"
-            end
-          end
+      def anchor_names(docxml)
+        if @amd
+          back_anchor_names(docxml)
+          note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
+          note_anchor_names(docxml.xpath(ns("//annex")))
+          example_anchor_names(docxml.xpath(ns("//annex")))
+          list_anchor_names(docxml.xpath(ns("//annex")))
+        else
+          super
         end
       end
 
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
-        page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
+      def implicit_reference(b)
+        b&.at(ns("./docidentifier"))&.text == "IEV"
       end
 
       def initial_anchor_names(d)
@@ -91,9 +88,9 @@ module IsoDoc
         end
       end
 
-      def eref_localities1_zh(target, type, from, to)
+      def eref_localities1_zh(target, type, from, to, delim)
         subsection = from&.text&.match(/\./)
-        ret = type == "list" ? "" : ","
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
         ret += " 第#{from.text}" if from
         ret += "&ndash;#{to}" if to
         loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
@@ -103,11 +100,11 @@ module IsoDoc
         ret
       end
 
-      def eref_localities1(target, type, from, to, lang = "en")
+      def eref_localities1(target, type, from, to, delim, lang = "en")
         subsection = from&.text&.match(/\./)
         type = type.downcase
-        return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
-        ret = type == "list" ? "" : ","
+        return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
         loc = @locality[type] || type.sub(/^locality:/, "").capitalize
         ret += " #{loc}" unless subsection && type == "clause" ||
           type == "list" || target.match(/^IEV$|^IEC 60050-/)
@@ -170,6 +167,15 @@ module IsoDoc
         end
       end
 
+      def insertall_after_here(node, insert, name)
+        node.children.each do |n|
+          next unless n.name == name
+          insert.next = n.remove
+          insert = n
+        end
+        insert
+      end
+
       def termexamples_before_termnotes(node)
         return unless node.at(ns("./termnote")) && node.at(ns("./termexample"))
         return unless insert = node.at(ns("./definition"))
@@ -177,53 +183,31 @@ module IsoDoc
         insert = insertall_after_here(node, insert, "termnote")
       end
 
-      def term_parse(node, out)
+      def termdef_parse(node, out)
         termexamples_before_termnotes(node)
-        out.p **{ class: "Terms", style:"text-align:left;" } do |p|
-          node.children.each { |c| parse(c, p) }
-        end
+        super
       end
 
       def clausedelim
         ""
       end
 
-      def format_ref(ref, prefix, isopub, date, allparts)
-        ref = ref.sub(/ \(All Parts\)/i, "")
-        ref = docid_prefix(prefix, ref)
-        return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
-          !/^\[.*\]$/.match(ref)
-          ref
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].
+                                sub(/ \(All Parts\)/i, "") }
       end
 
       def table_footnote_reference_format(a)
         a.content = a.content + ")"
       end
 
-      def clause_parse_title(node, div, c1, out)
-        return inline_header_title(out, node, c1) if c1.nil?
-        super
-      end
-
       def cleanup(docxml)
         super
-        remove_internal_hyperlinks(docxml)
         table_th_center(docxml)
         docxml
       end
 
-      def remove_internal_hyperlinks(docxml)
-        docxml.xpath("//a[@href]").each do |a|
-          next unless /^#/.match(a[:href])
-          anchor = a[:href].sub(/^#/, "")
-          next if a["epub:type"] == "footnote"
-          next unless @anchors[anchor]
-          next unless @anchors[anchor][:type]
-          next if @anchors[anchor][:type] == "clause"
-          a.replace(a.children)
-        end
-      end
-
       def table_th_center(docxml)
         docxml.xpath("//thead//th | //thead//td").each do |th|
           th["align"] = "center"
@@ -232,14 +216,14 @@ module IsoDoc
       end
 
       def hierarchical_formula_names(clause, num)
-      c = IsoDoc::Function::XrefGen::Counter.new
-       clause.xpath(ns(".//formula")).each do |t|
-         next if t["id"].nil? || t["id"].empty?
-         @anchors[t["id"]] =
-           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
-                         t["inequality"] ? @inequality_lbl : @formula_lbl,
-                         "formula", t["unnumbered"])
-       end
+        c = IsoDoc::Function::XrefGen::Counter.new
+        clause.xpath(ns(".//formula")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] =
+            anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
+                          t["inequality"] ? @inequality_lbl : @formula_lbl,
+                          "formula", t["unnumbered"])
+        end
       end
     end
   end

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

@@ -66,7 +66,7 @@ normal'>
 
 <div style='mso-element:header' id=eh2>
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:header' id=eh2l>
 <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2l>
 <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>
@@ -238,8 +238,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>
 </div>
 
 <div style='mso-element:footer' id=f4>
-
+  {% if ics %}
 <p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span>ICS {{ ics }}<o:p></o:p></span></b></p>
+{% endif %}
+{% if keywords.size > 0 %}
+<p class=MsoFooter><b>Descriptors:</b> {{ keywords | join: ", " }}</p>
+{% 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 </span><!--[if supportFields]><span

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

@@ -4,7 +4,7 @@
 <p class="coverpage_docnumber">{{ num }}</p>
     {% endfor %}
     {% else %}
-<p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
+<p class="coverpage_docnumber">{{ docnumber_lang }} {{ draftinfo }}</p>
     {% endif %}
 
 {% if revdate %}
@@ -12,7 +12,7 @@
 {% endif %}
 
 {% if tc_docnumber.size > 0 %}
-<p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
+<p class="coverpage_docnumber">{{ docnumber_lang }} {{ draftinfo }}</p>
 {% endif %}
 
 <p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>
@@ -26,7 +26,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
   {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
   <span class="part">{{ doctitlepart }}</span>
   {% endif %}
-</div></div>
+</div>
+{% if doctitleamdlabel %}
+<div class="doctitle-part">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</div>
+{% endif %}
+{% if doctitlecorrlabel %}
+<div class="doctitle-part">{{ doctitlecorrlabel }}</div>
+{% endif %}
+</div>
 
 <div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
   {% if docsubtitlepart %}
@@ -34,7 +41,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
   {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
   <span class="part">{{ docsubtitlepart }}</span>
   {% endif %}
-</div></div>
+</div>
+{% if docsubtitleamdlabel %}
+<div>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</div>
+{% endif %}
+{% if docsubtitlecorrlabel %}
+<div>{{ docsubtitlecorrlabel }}</div>
+{% endif %}
+</div>
 
 <div class="coverpage_docstage">
   {% if unpublished %}
@@ -45,19 +59,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
 {% if unpublished %}
 <div class="coverpage_warning">
   <div id="boilerplate-license-destination"/>
-<!--
-<p>Warning for WDs
-and CDs</p>
-
-<p>This
-document is not an ISO 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>
--->
 </div>
 {% endif %}
+
+{% if ics %}
+<p><b>ICS:</b> {{ ics }}</p>
+{% endif %}
+
+{% if keywords.size > 0 %}
+<p><b>Descriptors:</b> {{ keywords | join: ", " }}
+{% endif %}
+

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

@@ -12,7 +12,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
 	tab-stops:20.15pt;
 	font-size:9.0pt;
 	font-family:$monospacefont;
-	mso-fareast-font-family:Calibri;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:"Courier New";
 	mso-ansi-language:EN-GB;}
 p.pseudocode, li.pseudocode, div.pseudocode
@@ -29,7 +29,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
         tab-stops:20.15pt;
         font-size:10.0pt;
         font-family:$bodyfont;
-        mso-fareast-font-family:Calibri;
+        mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:"Courier New";
         mso-ansi-language:EN-GB;}
 p.Biblio, li.Biblio, div.Biblio
@@ -46,7 +46,7 @@ p.Biblio, li.Biblio, div.Biblio
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.NormRef, li.NormRef, div.NormRef
@@ -63,7 +63,7 @@ p.NormRef, li.NormRef, div.NormRef
         mso-pagination:widow-orphan;
         font-size:11.0pt;
         font-family:$bodyfont;
-        mso-fareast-font-family:$bodyfont;
+        mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.FigureTitle
@@ -82,7 +82,7 @@ p.FigureTitle
 	font-size:11.0pt;
 	font-family:$bodyfont;
         font-weight:bold;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.AdmonitionTitle, p.RecommendationTitle
@@ -101,7 +101,7 @@ p.AdmonitionTitle, p.RecommendationTitle
         font-size:11.0pt;
         font-family:$bodyfont;
         font-weight:bold;
-        mso-fareast-font-family:$bodyfont;
+        mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.SourceTitle
@@ -120,7 +120,7 @@ p.SourceTitle
         font-size:11.0pt;
         font-family:$bodyfont;
         font-weight:bold;
-        mso-fareast-font-family:$bodyfont;
+        mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.TableTitle
@@ -139,7 +139,7 @@ p.TableTitle
 	font-size:11.0pt;
 	font-weight:bold;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
@@ -157,7 +157,7 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	font-size:10.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 	/* may need to be revised */
@@ -183,7 +183,7 @@ p.ANNEX, li.ANNEX, div.ANNEX
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -205,7 +205,7 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -224,7 +224,7 @@ p.Definition, li.Definition, div.Definition
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
@@ -246,7 +246,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -270,7 +270,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -293,7 +293,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
         font-size:14.0pt;
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
-        mso-fareast-font-family:$headerfont;
+        mso-fareast-font-family:"SimHei",serif;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
         font-weight:bold;
@@ -313,7 +313,7 @@ p.Terms, li.Terms, div.Terms
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -332,7 +332,7 @@ p.AltTerms, li.AltTerms, div.AltTerms
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	mso-bidi-font-weight:normal;}
@@ -350,7 +350,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	mso-bidi-font-weight:normal;}
@@ -367,7 +367,7 @@ p.TermNum, li.TermNum, div.TermNum
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -391,7 +391,7 @@ p.zzContents, li.zzContents, div.zzContents
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -412,7 +412,7 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
 	mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.zzCopyright1
@@ -431,7 +431,7 @@ p.zzCopyright1
         mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
         font-size:10.0pt;
         font-family:$bodyfont;
-        mso-fareast-font-family:$bodyfont;
+        mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.zzAddress {
@@ -483,7 +483,7 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
 	font-size:16.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -505,11 +505,32 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
 	font-size:16.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2
+        {mso-style-name:zzSTDTitle;
+        mso-style-noshow:yes;
+        mso-style-unhide:no;
+        mso-style-next:Normal;
+        margin-top:0pt;
+        margin-right:0cm;
+        margin-bottom:18.0pt;
+        margin-left:0cm;
+        line-height:17.5pt;
+        mso-line-height-rule:exactly;
+        mso-pagination:widow-orphan;
+        mso-hyphenate:none;
+        tab-stops:20.15pt;
+        font-size:16.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:"SimHei",serif;
+        mso-bidi-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        mso-bidi-font-weight:normal;}
 p.Quote, li.Quote, div.Quote
 	{mso-style-priority:99;
 	margin-top:0cm;
@@ -522,7 +543,7 @@ p.Quote, li.Quote, div.Quote
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.QuoteAttribution
@@ -536,7 +557,7 @@ p.Admonition, li.Admonition, div.Admonition
 	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-fareast-theme-font:minor-fareast;
 	mso-hansi-font-family:$bodyfont;
 	mso-hansi-theme-font:minor-latin;
@@ -557,7 +578,7 @@ p.Code, li.Code, div.Code
 	font-size:9.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$monospacefont;
-	mso-fareast-font-family:Calibri;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:"Cambria";
 	mso-ansi-language:EN-GB;}
 p.Formula, li.Formula, div.Formula
@@ -573,7 +594,7 @@ p.Formula, li.Formula, div.Formula
 	tab-stops:right 487.45pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 table.dl