metanorma-rsd 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce37da0a99a43ff97c8d164b12d54cafb7bfc22c05ffb5534f5bf3e0f6027981
-  data.tar.gz: 84ef50e88b1497d29264827fba61d34df1b59ca7c8cbf96e3ee2709bf731f32c
+  metadata.gz: 101eb1fc5a1a726cefc8e12dcd570733d0cb2b800c586c4628ba4674647e671f
+  data.tar.gz: 78064e1735d8fac74138360ae08438a82447b2974d6a38f3587ce8e9b2d5c47f
 SHA512:
-  metadata.gz: 1b5aaa4b960777024ed7f31433097d1ade41064890723998c86bcfe58e07487eae22e49f457654776dc52a9ba55ff7d8953463102b32fa332eabc1d1e475f8c5
-  data.tar.gz: 3f43e7271b1f3b41f557f3142ef62830d1fbdbb86ca476bd4afe0be4d002db9cb488f8eca6e0b5e437e95de55393637a9647a771502f22a115357210a4d37d45
+  metadata.gz: 1311e29995441ad9c98b18cf3a280a131e3870736706369610328fc34bf673a29461777048f48fd155b9c2dfb428c72a0bd8b22bd4664847f43ed5ee74bad15a
+  data.tar.gz: 5dd2bd74300087c571aaaa77377192e4f55943df03cbc87080903812d20894a4f49359d6ab79f77f7cce3a7267ca735c83a781d06572a702cf4570df132dccd4

data/.github/workflows/macos.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-macos:

data/.github/workflows/ubuntu.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-linux:
@@ -25,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler 
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/.github/workflows/windows.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-windows:
@@ -26,7 +25,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler 
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/README.adoc

@@ -1,8 +1,9 @@
 = AsciiRSD: Asciidoctor processor for Ribose Standard Documents (RSD)
 
 image:https://img.shields.io/gem/v/metanorma-rsd.svg["Gem Version", link="https://rubygems.org/gems/metanorma-rsd"]
-image:https://travis-ci.com/metanorma/metanorma-rsd.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-rsd"]
-image:https://ci.appveyor.com/api/projects/status/col74y763yt5xaka?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-rsd"]
+image:https://github.com/metanorma/metanorma-rsd/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-rsd/actions?workflow=macos"]
+image:https://github.com/metanorma/metanorma-rsd/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-rsd/actions?workflow=ubuntu"]
+image:https://github.com/metanorma/metanorma-rsd/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-rsd/actions?workflow=windows"]
 image:https://codeclimate.com/github/metanorma/metanorma-rsd/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-rsd"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-rsd.svg["Pull Requests", link="https://github.com/metanorma/metanorma-rsd/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-rsd/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-rsd/releases"]
@@ -87,8 +88,7 @@ this general model can be found on its page. Details of the RSD modifications
 to this general model can be found on the https://github.com/metanorma/metanorma-model-rsd[RSD model]
 repository.
 
+////
 == Examples
+////
 
-* link:spec/examples/rfc6350.adoc[] is an AsciiRSD version of https://tools.ietf.org/html/rfc6350[RFC 6350].
-* link:spec/examples/rfc6350.html[] is an HTML file generated from the AsciiRSD.
-* link:spec/examples/rfc6350.doc[] is a Word document generated from the AsciiRSD.

data/lib/asciidoctor/rsd/biblio.rng

@@ -703,21 +703,11 @@
   </define>
   <define name="TypedTitleString">
     <optional>
-      <attribute name="type">
-        <ref name="TitleType"/>
-      </attribute>
+      <attribute name="type"/>
     </optional>
     <ref name="FormattedString"/>
   </define>
-  <define name="TitleType">
-    <choice>
-      <value>alternative</value>
-      <value>original</value>
-      <value>unofficial</value>
-      <value>subtitle</value>
-      <value>main</value>
-    </choice>
-  </define>
+  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>

data/lib/asciidoctor/rsd/converter.rb

@@ -1,14 +1,19 @@
 require "asciidoctor/standoc/converter"
-require 'asciidoctor/acme/converter'
+require 'asciidoctor/generic/converter'
 
 module Asciidoctor
   module Rsd
     # A {Converter} implementation that generates RSD output, and a document
     # schema encapsulation of the document for validation
     #
-    class Converter < Asciidoctor::Acme::Converter
+    class Converter < Asciidoctor::Generic::Converter
       register_for "rsd"
 
+      def metadata_recipient(node, xml)
+        recipient = node.attr("recipient") || return
+        xml.recipient recipient
+      end
+
       def metadata_security(node, xml)
         security = node.attr("security") || return
         xml.security security
@@ -17,6 +22,46 @@ module Asciidoctor
       def metadata_ext(node, xml)
         super
         metadata_security(node, xml)
+        metadata_recipient(node, xml)
+      end
+
+      def sectiontype(node, level = true)
+        ret = node&.attr("heading")&.downcase ||
+          node.title.gsub(/<[^>]+>/, "").downcase
+        ret1 = sectiontype_streamline(ret)
+        return ret1 if "symbols and abbreviated terms" == ret1
+        return ret1 if "executive summary" == ret1
+        return nil unless !level || node.level == 1
+        return nil if @seen_headers.include? ret
+        @seen_headers << ret
+        ret1
+      end
+
+      def make_preface(x, s)
+        if x.at("//foreword | //introduction | //acknowledgements | "\
+            "//clause[@preface] | //executivesummary")
+          preface = s.add_previous_sibling("<preface/>").first
+          f = x.at("//foreword") and preface.add_child f.remove
+          f = x.at("//executivesummary") and preface.add_child f.remove
+          f = x.at("//introduction") and preface.add_child f.remove
+          move_clauses_into_preface(x, preface)
+          f = x.at("//acknowledgements") and preface.add_child f.remove
+        end
+        make_abstract(x, s)
+      end
+
+      def clause_parse(attrs, xml, node)
+        sectiontype(node) == "executive summary" and
+          return executivesummary_parse(attrs, xml, node)
+        super
+      end
+
+      def executivesummary_parse(attrs, xml, node)
+        xml.executivesummary **attr_code(attrs) do |xml_section|
+          xml_section.title { |t| t << node.title || "Executive Summary" }
+          content = node.content
+          xml_section << content
+        end
       end
 
       def configuration

data/lib/asciidoctor/rsd/isodoc.rng

@@ -101,9 +101,7 @@
         <ref name="structuredidentifier"/>
       </zeroOrMore>
     </define>
-    <define name="TitleType">
-      <text/>
-    </define>
+    <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
         <oneOrMore>

data/lib/isodoc/rsd/base_convert.rb

@@ -0,0 +1,62 @@
+module IsoDoc
+  module Rsd
+    module BaseConvert
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def info(isoxml, out)
+        @meta.security isoxml, out
+        @meta.recipient isoxml, out
+        super
+      end
+
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{anchor(annex['id'], :label)}<br/><br/>"
+          name&.children&.each { |c2| parse(c2, t) }
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        obl = l10n("(#{@inform_annex_lbl})")
+        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
+        l10n("#{@annex_lbl} #{num}<br/>#{obl}")
+      end
+
+      def executivesummary docxml, out
+        f = docxml.at(ns("//executivesummary")) || return
+        title_attr = { class: "IntroTitle" }
+        page_break(out)
+        out.div **{ class: "Section3", id: f["id"] } do |div|
+          clause_name(nil, f&.at(ns("./title")), div, title_attr)
+          f.elements.each do |e|
+            parse(e, div) unless e.name == "title"
+          end
+        end
+      end
+
+      def initial_anchor_names(d)
+        preface_names(d.at(ns("//executivesummary")))
+        super
+        sequential_asset_names(
+          d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                     "//preface/clause | //acknowledgements | //executivesummary")))
+      end
+
+      def clausedelim
+        ""
+      end
+
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: num }
+        # subclauses are not prefixed with "Clause"
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
+          each_with_index do |c, i|
+          section_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/rsd/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=eh1>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>RS&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>RR&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
 
 </div>
 
@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>RS&nbsp;{{ docnumber }}:{{ docyea
 
 <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'>©
-Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
+Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
 style='font-weight:normal'><o:p></o:p></span></p>
 
 </div>
@@ -93,28 +93,28 @@ 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>©
-Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
 
 </div>
 
 <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>Ribose {{ doctype }}&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>RR&nbsp;{{ docnumber }}:{{ docyear }}</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>Ribose {{ doctype }}&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>RR&nbsp;{{ docnumber }}:{{ docyear }}</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>Ribose {{ doctype }}&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>RR&nbsp;{{ docnumber }}:{{ docyear }}</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>Ribose {{ doctype }}&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>RR&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>
@@ -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>©
-Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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>©
-Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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'>  
@@ -163,7 +163,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'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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'>  
@@ -188,7 +188,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>©
-Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -204,12 +204,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>©
-Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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>
@@ -224,7 +224,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'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited&nbsp;{{ docyear }}&nbsp;– 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>

data/lib/isodoc/rsd/html/html_rsd_titlepage.html

@@ -1,4 +1,4 @@
-<div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band'>
+<div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band">
   <p class="document-stage">{{ stage }}</p>
 </div>
 

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

@@ -87,16 +87,15 @@ div.figure {
 */
 
 .document-type-band {
-  @include docBand(2, 100%, 180px);
-}
+  @include docBand($order: 2, $offset: 180px);
 
-.document-stage-band {
-  @include docBand(1, 150);
+  .document-type {
+    top: 20px;
+  }
 }
 
-p.document-type,
-p.document-stage {
-  @include docBandTitle(150);
+.document-stage-band {
+  @include docBand($order: 1, $textLength: 160px, $fontWeight: 300);
 }
 
 #governance-band p.document-type {

data/lib/isodoc/rsd/html/rsd.scss

@@ -42,7 +42,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
     tab-stops: 33.15pt;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-weight:normal;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -135,10 +135,9 @@ 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;
+	font-size:11.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-    font-size:10.0pt;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
@@ -161,14 +160,14 @@ p.ANNEX, li.ANNEX, div.ANNEX
 	mso-outline-level:1;
 	mso-list:l0 level1 lfo12;
 	tab-stops:20.15pt;
-	font-size:14.0pt;
+	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
 	{mso-style-name:"Biblio Title";
@@ -183,13 +182,13 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
 	mso-pagination:widow-orphan;
 	mso-outline-level:1;
 	tab-stops:20.15pt;
-	font-size:14.0pt;
+	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.Definition, li.Definition, div.Definition
 	{mso-style-name:Definition;
@@ -203,7 +202,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:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -224,13 +223,13 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
 	mso-outline-level:1;
 	mso-hyphenate:none;
 	tab-stops:20.15pt;
-	font-size:14.0pt;
+	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.IntroTitle, li.IntroTitle, div.IntroTitle
 	{mso-style-name:"Intro Title";
@@ -248,13 +247,13 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	mso-outline-level:1;
 	mso-hyphenate:none;
 	tab-stops:20.15pt;
-	font-size:14.0pt;
+	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
         page-break-before:always;
 	mso-bidi-font-weight:normal;}
 p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
@@ -271,13 +270,13 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
         page-break-after:avoid;
         mso-hyphenate:none;
         tab-stops:20.15pt;
-        font-size:14.0pt;
+        font-size:12.0pt;
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
+        color:#0E1A85;
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;
 }
 p.Terms, li.Terms, div.Terms
@@ -292,12 +291,11 @@ p.Terms, li.Terms, div.Terms
         page-break-after:avoid;
         mso-hyphenate:none;
         tab-stops:20.15pt;
-        font-size:11.0pt;
+        font-size:12.0pt;
         font-family:$headerfont;
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
         {mso-style-name:"AltTerm\(s\)";
@@ -311,7 +309,7 @@ p.AltTerms, li.AltTerms, div.AltTerms
         page-break-after:avoid;
         mso-hyphenate:none;
         tab-stops:20.15pt;
-        font-size:11.0pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
@@ -329,7 +327,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
         page-break-after:avoid;
         mso-hyphenate:none;
         tab-stops:20.15pt;
-        font-size:11.0pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
@@ -346,7 +344,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:12.0pt;
         font-family:$headerfont;
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
@@ -369,13 +367,13 @@ p.zzContents, li.zzContents, div.zzContents
 	page-break-after:avoid;
 	mso-hyphenate:none;
 	tab-stops:20.15pt;
-	font-size:14.0pt;
+	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.zzCopyright, li.zzCopyright
 	{mso-style-name:zzCopyright;
@@ -392,7 +390,7 @@ p.zzCopyright, li.zzCopyright
 	tab-stops:20.15pt 25.7pt 481.15pt;
 	padding:0cm;
 	mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -416,7 +414,7 @@ p.zzCopyright_address
     text-autospace:none;
 	padding-left:20pt;
 	mso-padding-alt-left:20pt;
-    font-size:10.0pt;
+    font-size:12.0pt;
 	text-align:left;
     mso-bidi-font-size:11.0pt;}
 p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
@@ -439,7 +437,6 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
 	{mso-style-name:zzSTDTitle;
@@ -473,7 +470,7 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -488,7 +485,7 @@ p.QuoteAttribution
         line-height:12.0pt;
         mso-pagination:widow-orphan;
         tab-stops:20.15pt;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
@@ -531,7 +528,7 @@ p.Code, li.Code, div.Code
 	line-height:10.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:9.0pt;
+	font-size:10.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$monospacefont;
 	mso-fareast-font-family:Calibri;
@@ -548,7 +545,7 @@ p.Formula, li.Formula, div.Formula
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:right 487.45pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -558,9 +555,9 @@ p.Formula, li.Formula, div.Formula
 }
 @page WordSection1
 	{size:595.3pt 841.9pt;
-	margin:39.7pt 53.85pt 1.0cm 53.85pt;
-	mso-header-margin:50pt;
-	mso-footer-margin:50pt;
+	margin:85.65pt 53.85pt 57.4pt 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:61.0pt;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
@@ -569,9 +566,9 @@ div.WordSection1
 	{page:WordSection1;}
 @page WordSection2
 	{size:595.3pt 841.9pt;
-	margin:39.7pt 53.85pt 1.0cm 53.85pt;
-	mso-header-margin:50pt;
-	mso-footer-margin:50pt;
+	margin:79.8pt 53.85pt 1.0cm 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:49.3pt;
 	mso-page-numbers:roman-lower;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -580,9 +577,9 @@ div.WordSection1
 	mso-paper-source:0;}
 @page WordSection2L
         {size:841.9pt 595.3pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:50pt;
-        mso-footer-margin:50pt;
+	margin:79.8pt 53.85pt 1.0cm 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:49.3pt;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -590,9 +587,9 @@ div.WordSection1
         mso-paper-source:0;}
 @page WordSection2P
         {size:595.3pt 841.9pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:50pt;
-        mso-footer-margin:50pt;
+	margin:79.8pt 53.85pt 1.0cm 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:49.3pt;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -602,9 +599,9 @@ div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
 	{size:595.3pt 841.9pt;
-	margin:39.7pt 53.85pt 1.0cm 53.85pt;
-	mso-header-margin:50pt;
-	mso-footer-margin:50pt;
+        margin:59.2pt 53.85pt 70.8pt 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:54.7pt;
 	mso-page-numbers:1;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -613,9 +610,9 @@ div.WordSection2
 	mso-paper-source:0;}
 @page WordSection3L
         {size:841.9pt 595.3pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:50pt;
-        mso-footer-margin:50pt;
+        margin:59.2pt 53.85pt 70.8pt 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:54.7pt;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -623,9 +620,9 @@ div.WordSection2
         mso-paper-source:0;}
 @page WordSection3P
         {size:595.3pt 841.9pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:50pt;
-        mso-footer-margin:50pt;
+        margin:59.2pt 53.85pt 70.8pt 53.85pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:54.7pt;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
@@ -651,7 +648,7 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
-	font-size:10.0pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable th
     {border:solid windowtext 1pt;
@@ -662,7 +659,7 @@ table.MsoISOTable td
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
 table.MsoISOTable p
-{font-size:10.0pt; }
+{font-size:12.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
 	mso-tstyle-rowband-size:0;
@@ -677,7 +674,7 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;}
 div.formula
     {tab-stops:right 487.45pt;}
@@ -699,12 +696,12 @@ div.coverpage_warning
     border:solid windowtext 1.0pt #485094;
     mso-border-alt:solid windowtext .5pt;
     padding:1.0pt 4.0pt 1.0pt 4.0pt #485094;
-    font-size:10.0pt;
+    font-size:12.0pt;
     margin-left:4.25pt;
     margin-right:4.25pt}
 .coverpage_warning
     {color:#485094;
-    font-size:10.0pt;}
+    font-size:12.0pt;}
 
     a.TableFootnoteRef, span.TableFootnoteRef
         {mso-style-priority:99;
@@ -712,7 +709,7 @@ div.coverpage_warning
         vertical-align:super;}
 
         aside {
-          font-size:10.0pt;
+          font-size:12.0pt;
 }
 
 .example-title {
@@ -734,24 +731,24 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:10.0pt;
+        font-size:11.0pt;
         font-family:$bodyfont;}
 
 td.example p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: 11.0pt;
 }
 
 div.example p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: 11.0pt;
 }
 
 div.Note p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: 11.0pt;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label
 {
-font-size: 10.0pt;
+font-size: 11.0pt;
 font-family:$bodyfont;
 }