metanorma-iso 1.3.22 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f454035889b3408ef910c7bdc28bb3d53cca352078b04459381fbeb48cfe71e
-  data.tar.gz: f9de44382a1a76374569a60fd18807f4a4412222148a7529f42420923b60ffdc
+  metadata.gz: 8e8cbb045e33e2e3403dffc3beac4df18852c29f0bb18edbf579f919ba7923b0
+  data.tar.gz: e38bf3e9fd8169b4ec39110360497a839690d2aed836f80b5033f0c5fc432cba
 SHA512:
-  metadata.gz: 638a95ff84fe3bdeec6cb509c3a00f740190dcddfa5765ee585a5c2e79716a86be12cdb5a351fed9133b21d0414b554922aaf8a24ddf317017ac1368d526ca0c
-  data.tar.gz: 8abc4415c4ad990b6cafd3f1bdce2ea93dadaece4cf4f339455d6547ee4c7cb4af2a73ee2b8816d065270c0955c620d739e54dc376c0cb3f1ecb23411298bb0f
+  metadata.gz: 5ab999ee188ea2819dfe7a7c50192a96a7dfb2353d28ba3790033846d120f5b262c137bf5cfe5ed29f0dfd3e2129d4a2dad031d1d9974b6cf5bfb4e198dc40c3
+  data.tar.gz: c2da9c1dcded9f65252718d00a22c6195f4a403477a91a3dba51572025ee3aaebbcf02e888301b04b461c938498fe5435c62ff0209b3705c57406bdaa903685f

data/.github/workflows/macos.yml

@@ -26,13 +26,6 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Install PlantUML
         run: |
           brew install plantuml

data/.github/workflows/ubuntu.yml

@@ -26,13 +26,6 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Install PlantUML
         run: |
           sudo bash -c "curl -L https://github.com/riboseinc/plantuml-install/raw/master/ubuntu.sh | bash"

data/.github/workflows/windows.yml

@@ -27,15 +27,7 @@ jobs:
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Install PlantUML
         run: |
           cinst -y plantuml

data/Gemfile

@@ -4,8 +4,10 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
+#gem "asciimath", git: "https://github.com/asciidoctor/asciimath"
 gemspec
 
 if File.exist? 'Gemfile.devel'
   eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
 end
+

data/lib/asciidoctor/iso/base.rb

@@ -26,6 +26,11 @@ module Asciidoctor
         IsoDoc::Iso::WordConvert.new(doc_extract_attributes(node))
       end
 
+      def pdf_converter(node)
+        return nil if node.attr("no-pdf")
+        IsoDoc::Iso::PdfConvert.new(doc_extract_attributes(node))
+      end
+
       def document(node)
         init(node)
         ret = makexml(node).to_xml(indent: 2)
@@ -35,6 +40,7 @@ module Asciidoctor
           FileUtils.mv "#{@filename}.html", "#{@filename}_alt.html"
           html_converter(node).convert(@filename + ".xml")
           doc_converter(node).convert(@filename + ".xml")
+          pdf_converter(node)&.convert(@filename + ".xml")
         end
         @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }

data/lib/asciidoctor/iso/biblio.rng

@@ -767,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1019,38 +1021,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/iso/isodoc.rng

@@ -303,8 +303,23 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -911,7 +926,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +937,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/isodoc/iso/base_convert.rb

@@ -21,11 +21,7 @@ module IsoDoc
         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
+            parse(e, div) unless e.name == "title"
           end
         end
       end
@@ -170,6 +166,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,11 +182,9 @@ 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
@@ -232,14 +235,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'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
 <div style='mso-element:header' id=eha>
 
 <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_lang }}{{ draftinfo }}</span></p>
 
 </div>
 
@@ -99,22 +99,22 @@ style='mso-tab-count:1'>
 
 <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_lang }}{{ 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_lang }}{{ 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_lang }}{{ 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_lang }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>

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>

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,7 +505,7 @@ 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;
@@ -522,7 +522,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 +536,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 +557,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 +573,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