asciidoctor-iso 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037ae405ca1ab7a6f18676326cb76f89f708ae1991434c91144d3e431149519d
-  data.tar.gz: 4dba9c034ef24e4595e5105c8a6c9a643924c892dd229a7682fc56cbf8bf01da
+  metadata.gz: 1684660c6b23276d073d38c022903310b3d77f1d34d2298e56854193d647e2a0
+  data.tar.gz: 35946f1642384ecffdeb3cd9c539439650cc24752a871613f2195d85ef17abd9
 SHA512:
-  metadata.gz: 30302f78ee8fc4ee5b3cd7a3f6aa3cd52dda9090844ccced275f9cc3d25af7cc6c3f871a00b20e28abf6a3eeea7d78362529efd2f13527e088c50ef1bd220417
-  data.tar.gz: 77367db460c5bc2f009a0760f18fe100ae8da27f3c22dc03a26c5397c0ee75db5012aba54eeed7a0617d08315b5433c87b2c2861042135d4686d108d675592d4
+  metadata.gz: 46ac681e5cd9f1844620d70179e2f8855b212960421864c71ed37fac27853e9ed558c0c8380804ce83fd5fd9cef21439f5c201c79f61d7866e053e018e7f0645
+  data.tar.gz: f26a12df8df3d6861f5b58ad2ed103f05f29da7d8288e6ffc7e369e17fd164c098fdd31a461a5f81511a1cea7c158e0fe0b2bd51cd2b459cc2be515f62f87969

data/README.adoc

@@ -794,7 +794,7 @@ not supplied. Example values: `JWG`, `JAG`, `AG` (advisory group), `AHG`, `SWG`,
 
 `:workgroup:`:: The name of the relevant ISO workgroup
 
-`:language:` :: The language of the document (`en` or `fr`)  (mandatory)
+`:language:` :: The language of the document (`en` or `fr`). Defaults to `en`.
 
 `:script:` :: The script of the document (defaults to `Latn`). Must be supplied as
 `Hans` for Simplified Chinese.
@@ -811,6 +811,32 @@ Cambria for Latin script, SimHei for Simplified Chinese.
 `:monospace-font`:: Font for monospace; will be inserted into CSS. Defaults to
 Courier New.
 
+`:htmlstylesheet`:: SCSS stylesheet to use for HTML output. Defaults to built in stylesheet,
+which adheres with ISO formatting requirements. Recommend against overriding this.
+
+`:htmlcoverpage`:: HTML template for cover page. Defaults to built in template. Recommend against overriding this.
+
+`:htmlintropage`:: HTML template for introductory section. Defaults to built in template. Recommend against overriding this.
+
+`:scripts`:: Javascript scripts for HTML output. Defaults to built in scripts. Recommend against overriding this.
+
+`:wordstylesheet`:: Primary SCSS stylesheet to use for Word output. Defaults to built in stylesheet,
+which adheres with ISO formatting requirements. Recommend against overriding this.
+
+`:standardstylesheet`:: Secondary SCSS stylesheet use for Word output. Defaults to built in stylesheet,
+which adheres with ISO formatting requirements. Recommend against overriding this.
+
+`:header`:: Header and footer file for Word output. Defaults to built in template. Recommend against overriding this.
+
+`:wordcoverpage`:: Word template for cover page. Defaults to built in template. Recommend against overriding this.
+
+`:wordintropage`:: Word template for introductory section. Defaults to built in template. Recommend against overriding this.
+
+`:ulstyle`:: Word CSS selector for unordered lists in supplied stylesheets. Defaults to value for built in stylesheet. Recommend against overriding this.
+
+`:olstyle`:: Word CSS selector for ordered lists in supplied stylesheets. Defaults to value for built in stylesheet. Recommend against overriding this.
+
+
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.
 

data/asciidoctor-iso.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", ">= 0.8"
+  spec.add_dependency "isodoc", "~> 0.8.8"
   spec.add_dependency "iev", "~> 0.2.0"
   spec.add_dependency "relaton", "~> 0.1.3"
   spec.add_dependency "metanorma-standoc", "~> 0.0.1"

data/docs/customisation.adoc

@@ -33,6 +33,10 @@ To adapt the schema for your publication set,
 
 [TIP]
 ====
+The easiest way to adopt StanDoc is to use the metanorma-acme gem: https://github.com/riboseinc/metanorma-acme, supplying your own stylesheets and HTML files for styling.
+
+If you wish to create a custom gem, in order to customise behaviour further:
+
 * Clone the asciidoctor-metanorma_sample gem: https://github.com/riboseinc/asciidoctor-metanorma_sample.
 * Change the namespace for RSD documents (`RSD_NAMESPACE = "https://open.ribose.com/standards/rsd"`) to a namespace specific to your organisation's document standard.
 * Change any references to `sample` or `Sample` in the gem to your organisation's document standard.
@@ -82,21 +86,23 @@ The `Isodoc::HtmlConvert` and `Isodoc::WordConvert` overlap substantially, as bo
 * Edit the `html_sample_titlepage.html` and `html_sample_intro.html` pages to match your organisation's branding.
 ** Leave the Liquid Template instructions alone (`{{`, `{%`) unless you know what you're doing with them: they are how the pages are populated with metadata.
 * Edit the `default_fonts()` method in your `IsoDoc::...::HtmlConvert` class, to match your desired fonts.
+* Edit the `default_file_locations()` method in your `IsoDoc::...::HtmlConvert` class, to match your desired stylesheets and HTML templates.
 * Edit the `htmlstyle.scss` stylesheet to match your organisation's branding. The classes already in place there are used to style existing blocks of text; refer to the sample documents included in the gem (`spec/examples`) for their use.
 ====
 
-Styling of output is intended to be configurable. HTML stylesheets are in https://sass-lang.com/guide[SCSS], with their fonts populated through the `default_fonts()` method in the `IsoDoc::...::HtmlConvert` class. Frontispiece content is templated, populated from metadata parsed in the `IsoDoc::...::Metadata` class, via https://shopify.github.io/liquid/[Liquid templates]. That means you can change the styling of output documents readily, so long as you are aware of the functionality of the stylesheet.
+Styling of output is intended to be configurable. HTML stylesheets are expressed in https://sass-lang.com/guide[SCSS], with their fonts populated through the `default_fonts()` method in the `IsoDoc::...::HtmlConvert` class. Frontispiece content is templated, populated from metadata parsed in the `IsoDoc::...::Metadata` class, via https://shopify.github.io/liquid/[Liquid templates]. The default stylesheets and HTML templates themselves are nominated in the `default_file_locations()` method in the `IsoDoc::...::HtmlConvert` class. That means you can change the styling of output documents readily, so long as you are aware of the functionality of the stylesheet.
 
 * Styling information is stored in the `.../lib/isodoc/html` folder of the gem, and applies to both Word and HTML content. For HTML content, the relevant files are `html_..._titlepage.html` (title page HTML template), `html_..._intro.html` (introductory HTML template, typically restricted to Table of Contents), `scripts.html` (Javascript scripts), and `htmlstyle.scss` (the HTML stylesheet).
-* The styling files to be loaded in are set in the `initialize()` method of `IsoDoc::...::HtmlConvert`. Additional files (e.g. logos) can be loaded there; for them to be access during document generation, they need to be copied to the working directory. (They can be removed subsequently by adding them to the `@files_to_delete` array. All image files are copied into an `_html` subdirectory.)
+* The styling files to be loaded in are set in the `default_file_locations()` method of `IsoDoc::...::HtmlConvert`. The files can be overridden through document variables in the Asciidoc document.
+* Additional files (e.g. logos) can be loaded in the `initialize()` method of `IsoDoc::...::HtmlConvert`; for them to be access during document generation, they need to be copied to the working directory. (They can be removed subsequently by adding them to the `@files_to_delete` array. All image files are copied into an `_html` subdirectory.)
 * The HTML templates are populated through Liquid Templates: variables in `{{` correspond to the hash keys for metadata extracted in `IsoDoc::...::Metadata`, and its superclass `IsoDoc::Metadata` in the isodoc gem.
-* The SCSS stylesheets treat fonts as variables. Those variables are set in `default_fonts()`, which generates variable assignments for SCSS. Stylesheets normally recognise three fonts: `$bodyfont` for body text, `$headerfont` for headers and captions (which may be the same font as `$bodyfont`), and `$monospacefont` for monospace text. Note that `default_fonts()` takes the document script as a parameter, and permits different font choices for different document scripts. (The existing gems refer to `Latn`, Latin script, and `Hans`, Simplified Chinese script.)
+* The SCSS stylesheets treat fonts as variables. Those variables are set in `default_fonts()`, which generates variable assignments for SCSS. Stylesheets normally recognise three fonts: `$bodyfont` for body text, `$headerfont` for headers and captions (which may be the same font as `$bodyfont`), and `$monospacefont` for monospace text. Note that `default_fonts()` takes the options passed to initialise `HtmlConvert` as a paremeter; the document language and script can be used to make different font choices for different document scripts. (The existing gems refer to `Latn`, Latin script, and `Hans`, Simplified Chinese script.)
 * Javascript scripts are populated in `scripts.html`; the scripts already in place in any gem you modify are in live use, and you should work out what they do before removing them. The AnchorJS script, for example, is used to generate navigable anchors in the document.
 * Additional scripts and fonts may be loaded in the document head through the `html_head()` method of  `IsoDoc::...::HtmlConvert`. The existing gems use the document head to load Jquery, the Table of Contents generation script, Google Fonts, and Font Awesome.
 * An HTML document is populated as follows:
 ** HTML Head wrapper (in `IsoDoc::HtmlConvert`)
 *** `html_head()` content
-*** `@htmlstylesheet` CSS stylesheet (generated from SCSS through the `generate_css()` method of `Isodoc::HtmlConvert`).
+*** `@htmlstylesheet` CSS stylesheet (expected to be in SCSS, generated from SCSS in the `generate_css()` method of `Isodoc::HtmlConvert`).
 ** HTML Body
 *** `@htmlcoverpage` HTML template (optional, corresponds to `html_..._titlepage.html`)
 *** `@htmlintropage` HTML template (optional, corresponds to `html_..._intro.html`)
@@ -114,6 +120,7 @@ Styling of output is intended to be configurable. HTML stylesheets are in https:
 * Edit the `word_sample_titlepage.html` and `word_sample_intro.html` pages to match your organisation's branding. With lots of iterations of saving Word documents as HTML, for trial and error.
 ** Leave the Liquid Template instructions alone (`{{`, `{%`) unless you know what you're doing with them: they are how the pages are populated with metadata.
 * Edit the `default_fonts()` method in your `IsoDoc::...::WordConvert` class, to match your desired fonts.
+* Edit the `default_file_locations()` method in your `IsoDoc::...::WordConvert` class, to match your desired stylesheets and file templates.
 * Edit the `wordstyle.scss` and `sample.scss` stylesheets to match your organisation's branding. With lots of iterations of saving Word documents as HTML, for trial and error.
 ====
 
@@ -126,7 +133,8 @@ It's still better than learning OOXML.
 The process for generating Word output is fairly similar to that for generating HTML, since both processes are generating a form of HTML; as we already noted, the two processes share a substantial amount of code. The main differences are in the handling of page-media features that CSS has lagged in (footnotes, pagination, headers and footers), and in the styling of lists, for which Word HTML uses custom (and undocumented) CSS classes prefixed with `@`, specifying inter alia the numbering for nine levels of nesting of the same list.
 
 * Styling information is stored in the `.../lib/isodoc/html` folder of the gem, and applies to both Word and HTML content. For Word content, the relevant files are `word_..._titlepage.html` (title page HTML template), `word_..._intro.html` (introductory HTML template, typically restricted to Table of Contents),  `wordstyle.scss` and `{name_of_standard}.scss` (the Word stylesheets), and `header.html` (document headers, footers, and endnote/footnote separators, referenced from the stylesheets).
-* The styling files to be loaded in are set in the `initialize()` method of `IsoDoc::...::WordConvert`. As with HTML generation, additional files (e.g. logos) can be loaded there. The `initialize()` method also sets the `@` styles in the stylesheet to be used for unordered and ordered lists; a single such style is intended to capture the behaviour of all levels of indentation. 
+* The styling files to be loaded in are set in the `default_file_locations()` method of `IsoDoc::...::WordConvert`. 
+* As with HTML generation, additional files (e.g. logos) can be loaded in the `initialize()` method of `IsoDoc::...::WordConvert`. The `initialize()` method also sets the `@` styles in the stylesheet to be used for unordered and ordered lists; a single such style is intended to capture the behaviour of all levels of indentation. 
 * As with HTML output, the HTML templates are populated through Liquid Templates: variables in `{{` correspond to the hash keys for metadata extracted in `IsoDoc::...::Metadata`, and its superclass `IsoDoc::Metadata` in the isodoc gem.
 * As with HTML, the SCSS stylesheets treat fonts as variables, and are set in the `default_fonts()` method of `IsoDoc::...::WordConvert`.
 * Document headers and footers are set in the `header.html` file. This is also an HTML template, which is populated with metadata attributes through Liquid Template. The structure of `header.html` is determined by Word, and elements of `header.html` need to be crossreferenced from the Word stylesheet. To inspect Word `header.html` files, save a Word document as HTML, and look inside the `{document_name}.fld` folder generated alongside the HTML output.

data/lib/asciidoctor/iso/base.rb

@@ -16,6 +16,11 @@ module Asciidoctor
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
           i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+          htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlcoverpage: node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage"),
+          scripts: node.attr("scripts"),
         )
       end
 
@@ -27,6 +32,11 @@ module Asciidoctor
           monospacefont: node.attr("monospace-font"),
           i18nyaml: node.attr("i18nyaml"),
           alt: true,
+          scope: node.attr("scope"),
+          htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlcoverpage: node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage"),
+          scripts: node.attr("scripts"),
         )
       end
 
@@ -37,6 +47,14 @@ module Asciidoctor
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
           i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+          wordstylesheet: node.attr("wordstylesheet"),
+          standardstylesheet: node.attr("standardstylesheet"),
+          header: node.attr("header"),
+          wordcoverpage: node.attr("wordcoverpage"),
+          wordintropage: node.attr("wordintropage"),
+          ulstyle: node.attr("ulstyle"),
+          olstyle: node.attr("olstyle"),
         )
       end
 

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.10.2".freeze
+    VERSION = "0.10.3".freeze
   end
 end

data/lib/isodoc/iso/html_convert.rb

@@ -4,48 +4,30 @@ require_relative "metadata"
 module IsoDoc
   module Iso
     class HtmlConvert < IsoDoc::HtmlConvert
-
-      def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Cambria",serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Cambria",serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
-      end
-
-      def alt_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Lato",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Lato",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
-      end
-
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
       end
 
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        if options[:alt]
-          css = generate_css(html_doc_path("style-human.scss"), true, alt_fonts(options))
-        else
-          css = generate_css(html_doc_path("style-iso.scss"), true, default_fonts(options))
-        end
-        @htmlstylesheet = css
-        @htmlcoverpage = html_doc_path("html_iso_titlepage.html")
-        @htmlintropage = html_doc_path("html_iso_intro.html")
-        @scripts = html_doc_path("scripts.html")
+      end
+
+      def default_fonts(options)
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
+          monospacefont: (options[:alt] ?  '"Space Mono",monospace' : '"Courier New",monospace'),
+        }
+      end
+
+      def default_file_locations(options)
+        {
+          htmlstylesheet: options[:alt] ? html_doc_path("style-human.scss") : html_doc_path("style-iso.scss"),
+          htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
+          htmlintropage: html_doc_path("html_iso_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def implicit_reference(b)

data/lib/isodoc/iso/word_convert.rb

@@ -4,31 +4,33 @@ require_relative "metadata"
 module IsoDoc
   module Iso
     class WordConvert < IsoDoc::WordConvert
-
-      def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Cambria",serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Cambria",serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
-      end
-
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(html_doc_path("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(html_doc_path("isodoc.scss"), false, default_fonts(options))
-        @header = html_doc_path("header.html")
-        @wordcoverpage = html_doc_path("word_iso_titlepage.html")
-        @wordintropage = html_doc_path("word_iso_intro.html")
-        @ulstyle = "l3"
-        @olstyle = "l2"
+      end
+
+      def default_fonts(options)
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Cambria",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Cambria",serif'),
+          monospacefont: '"Courier New",monospace',
+        }
+      end
+
+      def default_file_locations(options)
+        {
+          htmlstylesheet: options[:alt] ? html_doc_path("style-human.scss") : html_doc_path("style-iso.scss"),
+          htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
+          htmlintropage: html_doc_path("html_iso_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+          wordstylesheet: html_doc_path("wordstyle.scss"),
+          standardstylesheet: html_doc_path("isodoc.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_iso_titlepage.html"),
+          wordintropage: html_doc_path("word_iso_intro.html"),
+          ulstyle: "l3", 
+          olstyle: "l2",
+        }
       end
 
       def metadata_init(lang, script, labels)

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_94e7f467.3c17.4d67"
+Content-Type: multipart/related; boundary="----=_NextPart_933e0e5f.7f75.40e3"
 
-------=_NextPart_94e7f467.3c17.4d67
+------=_NextPart_933e0e5f.7f75.40e3
 Content-Location: file:///C:/Doc/spec/assets/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -22,1226 +22,7 @@ Content-Type: text/html; charset="utf-8"
 <meta http-equiv=Content-Type content="text/html; charset=UTF-8"/>
     <title>spec/assets/iso</title><style>
   <!--
-@charset "UTF-8";
-/* Font Definitions */
-@font-face {
-  font-family: Arial;
-  panose-1: 2 11 6 4 2 2 2 2 2 4;
-  mso-font-charset: 0;
-  mso-generic-font-family: swiss;
-  mso-font-pitch: variable;
-  mso-font-signature: -536859905 -1073711037 9 0 511 0; }
-@font-face {
-  font-family: "Courier New";
-  panose-1: 2 7 3 9 2 2 5 2 4 4;
-  mso-font-charset: 0;
-  mso-generic-font-family: roman;
-  mso-font-pitch: fixed;
-  mso-font-signature: -536859905 -1073711037 9 0 511 0; }
-@font-face {
-  font-family: "Cambria Math";
-  panose-1: 2 4 5 3 5 4 6 3 2 4;
-  mso-font-charset: 0;
-  mso-generic-font-family: roman;
-  mso-font-pitch: variable;
-  mso-font-signature: -536870145 1107305727 0 0 415 0; }
-@font-face {
-  font-family: Calibri;
-  panose-1: 2 15 5 2 2 2 4 3 2 4;
-  mso-font-charset: 0;
-  mso-generic-font-family: swiss;
-  mso-font-pitch: variable;
-  mso-font-signature: -536870145 1073786111 1 0 415 0; }
-@font-face {
-  font-family: Cambria;
-  panose-1: 2 4 5 3 5 4 6 3 2 4;
-  mso-font-charset: 0;
-  mso-generic-font-family: roman;
-  mso-font-pitch: variable;
-  mso-font-signature: -536870145 1073743103 0 0 415 0; }
-@font-face {
-  font-family: "Malgun Gothic";
-  panose-1: 2 11 5 3 2 0 0 2 0 4;
-  mso-font-charset: 129;
-  mso-generic-font-family: swiss;
-  mso-font-pitch: variable;
-  mso-font-signature: -1879048145 701988091 18 0 524289 0; }
-@font-face {
-  font-family: "Cambria", serif;
-  panose-1: 2 2 6 9 4 2 5 8 3 4;
-  mso-font-charset: 128;
-  mso-generic-font-family: roman;
-  mso-font-pitch: fixed;
-  mso-font-signature: -536870145 1791491579 134217746 0 131231 0; }
-/* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal {
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "";
-  margin-top: 0cm;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-align: justify;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  tab-stops: 20.15pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB; }
-
-p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent {
-  mso-style-priority: 99;
-  margin-top: 0cm;
-  margin-right: 36.0cm;
-  margin-bottom: 0cm;
-  margin-left: 36.0pt;
-  text-align: justify;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  tab-stops: 20.15pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB; }
-
-p.MsoBlockText, li.MsoBlockText, div.MsoBlockText {
-  mso-style-priority: 99;
-  margin-top: 0cm;
-  margin-right: 57.6pt;
-  margin-bottom: 0cm;
-  margin-left: 57.6pt;
-  margin-bottom: .0001pt;
-  mso-pagination: widow-orphan;
-  border: none;
-  mso-border-alt: solid #4472C4 .25pt;
-  mso-border-themecolor: accent1;
-  padding: 0cm;
-  mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
-  font-size: 12.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: "Cambria", serif;
-  mso-ascii-theme-font: minor-latin;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-fareast-theme-font: minor-fareast;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-hansi-theme-font: minor-latin;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-bidi-theme-font: minor-bidi;
-  color: #4472C4;
-  mso-themecolor: accent1;
-  mso-ansi-language: EN-AU;
-  font-style: italic; }
-
-h1 {
-  mso-style-priority: 1;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-link: "Heading 1 Char";
-  mso-style-next: Normal;
-  margin-top: 13.5pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 13.5pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
-  mso-hyphenate: none;
-  tab-stops: 20.0pt list 21.6pt left 28.0pt;
-  font-size: 13.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-font-kerning: 0pt;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-h1.Annex {
-  mso-style-priority: 1;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-link: "Heading 1 Char";
-  mso-style-next: Normal;
-  margin-top: 13.5pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 13.5pt;
-  text-align: center;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  font-weight: normal;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
-  mso-hyphenate: none;
-  tab-stops: 20.0pt list 21.6pt left 28.0pt;
-  font-size: 13.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-font-kerning: 0pt;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-h2 {
-  mso-style-priority: 2;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "Heading 1";
-  mso-style-link: "Heading 2 Char";
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.5pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
-  mso-hyphenate: none;
-  tab-stops: 27.0pt 35.0pt;
-  font-size: 12.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-h3 {
-  mso-style-priority: 3;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "Heading 1";
-  mso-style-link: "Heading 3 Char";
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
-  mso-hyphenate: none;
-  tab-stops: list 36.0pt left 44.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-h4 {
-  mso-style-priority: 4;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "Heading 3";
-  mso-style-link: "Heading 4 Char";
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
-  mso-hyphenate: none;
-  tab-stops: 51.05pt 57.0pt 68.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-h5 {
-  mso-style-priority: 5;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "Heading 4";
-  mso-style-link: "Heading 5 Char";
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
-  mso-hyphenate: none;
-  tab-stops: 51.05pt list 54.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-h6 {
-  mso-style-priority: 6;
-  mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "Heading 5";
-  mso-style-link: "Heading 6 Char";
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 6;
-  mso-list: l1 level6 lfo6;
-  mso-hyphenate: none;
-  tab-stops: 51.05pt list 72.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  mso-bidi-font-weight: normal; }
-
-p.MsoToc1, li.MsoToc1, div.MsoToc1 {
-  mso-style-priority: 39;
-  mso-style-unhide: no;
-  mso-style-next: Normal;
-  margin-top: 6.0pt;
-  margin-right: 25.0pt;
-  margin-bottom: 0cm;
-  margin-left: 36.0pt;
-  margin-bottom: .0001pt;
-  text-indent: -36.0pt;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  mso-hyphenate: none;
-  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.MsoToc2, li.MsoToc2, div.MsoToc2 {
-  mso-style-noshow: yes;
-  mso-style-priority: 39;
-  mso-style-unhide: no;
-  mso-style-parent: "TOC 1";
-  mso-style-next: Normal;
-  margin-top: 0cm;
-  margin-right: 25.0pt;
-  margin-bottom: 0cm;
-  margin-left: 36.0pt;
-  margin-bottom: .0001pt;
-  text-indent: -36.0pt;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  mso-hyphenate: none;
-  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.MsoToc3, li.MsoToc3, div.MsoToc3 {
-  mso-style-noshow: yes;
-  mso-style-priority: 39;
-  mso-style-unhide: no;
-  mso-style-parent: "TOC 2";
-  mso-style-next: Normal;
-  margin-top: 0cm;
-  margin-right: 25.0pt;
-  margin-bottom: 0cm;
-  margin-left: 36.0pt;
-  margin-bottom: .0001pt;
-  text-indent: -36.0pt;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  mso-hyphenate: none;
-  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.MsoHeader, li.MsoHeader, div.MsoHeader {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-link: "Header Char";
-  margin-top: 0cm;
-  margin-right: 0cm;
-  margin-bottom: 30.0pt;
-  margin-left: 0cm;
-  text-align: justify;
-  line-height: 11.0pt;
-  mso-line-height-rule: exactly;
-  mso-pagination: widow-orphan;
-  tab-stops: 20.15pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.MsoFooter, li.MsoFooter, div.MsoFooter {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-link: "Footer Char";
-  margin-top: 18.0pt;
-  margin-right: 0cm;
-  margin-bottom: 6.0pt;
-  margin-left: 0cm;
-  text-align: justify;
-  line-height: 11.0pt;
-  mso-line-height-rule: exactly;
-  mso-pagination: widow-orphan;
-  tab-stops: right 487.6pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB; }
-
-span.MsoFootnoteReference {
-  mso-style-priority: 99;
-  vertical-align: super; }
-
-p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-link: "Footnote Text Char";
-  margin-top: 0cm;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-align: justify;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  tab-stops: 20.15pt;
-  font-size: 10.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: EN-US; }
-
-p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-link: "Body 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: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB; }
-
-a:link, span.MsoHyperlink {
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-parent: "";
-  mso-ansi-language: EN;
-  color: black;
-  text-decoration: none; }
-
-a:visited, span.MsoHyperlinkFollowed {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-themecolor: followedhyperlink;
-  text-decoration: none;
-  color: black; }
-
-span.MsoPlaceholderText {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-parent: "";
-  color: gray; }
-
-span.Heading1Char {
-  mso-style-name: "Heading 1 Char";
-  mso-style-priority: 1;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Heading 1";
-  mso-ansi-font-size: 13.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: Cambria;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-span.Heading2Char {
-  mso-style-name: "Heading 2 Char";
-  mso-style-priority: 2;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Heading 2";
-  mso-ansi-font-size: 12.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: Cambria;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-span.Heading3Char {
-  mso-style-name: "Heading 3 Char";
-  mso-style-priority: 3;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Heading 3";
-  mso-ansi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-span.Heading4Char {
-  mso-style-name: "Heading 4 Char";
-  mso-style-priority: 4;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Heading 4";
-  mso-ansi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-span.Heading5Char {
-  mso-style-name: "Heading 5 Char";
-  mso-style-priority: 5;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Heading 5";
-  mso-ansi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-span.Heading6Char {
-  mso-style-name: "Heading 6 Char";
-  mso-style-priority: 6;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Heading 6";
-  mso-ansi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-ascii-font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.a2, li.a2, div.a2 {
-  mso-style-name: a2;
-  mso-style-priority: 11;
-  mso-style-unhide: no;
-  mso-style-next: Normal;
-  margin-top: 13.5pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 13.5pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l0 level2 lfo12;
-  tab-stops: 1.0cm 36.0pt;
-  font-size: 13.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.a3, li.a3, div.a3 {
-  mso-style-name: a3;
-  mso-style-priority: 12;
-  mso-style-unhide: no;
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.5pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l0 level3 lfo12;
-  tab-stops: 20.15pt list 36.0pt;
-  font-size: 12.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
-p.a4, li.a4, div.a4 {
-  mso-style-name: a4;
-  mso-style-priority: 13;
-  mso-style-unhide: no;
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l0 level4 lfo12;
-  tab-stops: 20.15pt 44.0pt list 54.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-style: italic; }
-
-p.a5, li.a5, div.a5 {
-  mso-style-name: a5;
-  mso-style-priority: 14;
-  mso-style-unhide: no;
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l0 level5 lfo12;
-  tab-stops: 20.15pt list 54.0pt left 62.35pt 68.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-style: italic; }
-
-p.a6, li.a6, div.a6 {
-  mso-style-name: a6;
-  mso-style-priority: 15;
-  mso-style-unhide: no;
-  mso-style-next: Normal;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l0 level6 lfo12;
-  tab-stops: 20.15pt 62.35pt 68.0pt list 72.0pt;
-  font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: JA;
-  font-weight: bold; }
-
-span.FooterChar {
-  mso-style-name: "Footer Char";
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: Footer;
-  mso-ansi-font-size: 11.0pt;
-  mso-bidi-font-size: 11.0pt;
-  mso-ansi-language: EN-GB; }
-
-span.HeaderChar {
-  mso-style-name: "Header Char";
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: Header;
-  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; }
-
-span.BodyTextChar {
-  mso-style-name: "Body Text Char";
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-unhide: no;
-  mso-style-locked: yes;
-  mso-style-parent: "";
-  mso-style-link: "Body Text";
-  mso-ansi-font-size: 11.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB; }
-
-p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-link: "Comment Text Char";
-  margin-top: 0cm;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-align: justify;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  tab-stops: 20.15pt;
-  font-size: 12.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: EN-US; }
-
-span.MsoCommentReference {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-parent: "";
-  mso-ansi-font-size: 9.0pt;
-  mso-bidi-font-size: 9.0pt; }
-
-p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-parent: "Comment Text";
-  mso-style-link: "Comment Subject Char";
-  mso-style-next: "Comment Text";
-  margin-top: 0cm;
-  margin-right: 0cm;
-  margin-bottom: 12.0pt;
-  margin-left: 0cm;
-  text-align: justify;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  tab-stops: 20.15pt;
-  font-size: 10.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: EN-US;
-  font-weight: bold; }
-
-p.Tablebody, li.Tablebody, div.Tablebody {
-  mso-style-name: "Table body";
-  mso-style-noshow: yes;
-  mso-style-unhide: no;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 3.0pt;
-  margin-left: 0cm;
-  line-height: 10.5pt;
-  mso-pagination: widow-orphan;
-  font-size: 10.0pt;
-  mso-bidi-font-size: 11.0pt;
-  font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-language: EN-GB; }
-
-.MsoChpDefault {
-  mso-style-type: export-only;
-  mso-default-props: yes;
-  mso-ascii-font-family: "Cambria", serif;
-  mso-fareast-font-family: "Cambria", serif;
-  mso-hansi-font-family: "Cambria", serif; }
-
-/* Page Definitions */
-@page {
-  mso-mirror-margins: yes;
-  mso-footnote-separator: url("file:///C:/Doc/spec/assets/iso_files/header.html") fs;
-  mso-footnote-continuation-separator: url("file:///C:/Doc/spec/assets/iso_files/header.html") fcs;
-  mso-endnote-separator: url("file:///C:/Doc/spec/assets/iso_files/header.html") es;
-  mso-endnote-continuation-separator: url("file:///C:/Doc/spec/assets/iso_files/header.html") ecs;
-  mso-facing-pages: yes;
-  mso-page-orientation: portrait; }
-@page WordSection1 {
-  size: 595.0pt 842.0pt;
-  margin: 72.0pt 90.0pt 72.0pt 90.0pt;
-  mso-header-margin: 35.4pt;
-  mso-footer-margin: 35.4pt;
-  mso-even-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") eha;
-  mso-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") ha;
-  mso-even-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") efa;
-  mso-paper-source: 0; }
-div.WordSection1 {
-  page: WordSection1; }
-
-@page WordSection2 {
-  size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
-  mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
-  mso-page-numbers: roman-lower;
-  mso-even-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") eh2;
-  mso-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") h2;
-  mso-even-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") ef2;
-  mso-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") f2;
-  mso-paper-source: 0; }
-div.WordSection2 {
-  page: WordSection2; }
-
-@page WordSection3 {
-  size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
-  mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
-  mso-page-numbers: 1;
-  mso-even-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") eh2;
-  mso-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") h2;
-  mso-even-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") ef3;
-  mso-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") f3;
-  mso-paper-source: 0; }
-div.WordSection3 {
-  page: WordSection3; }
-
-@page WordSection4 {
-  size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
-  mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
-  mso-page-numbers: 1;
-  mso-even-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") eh2;
-  mso-header: url("file:///C:/Doc/spec/assets/iso_files/header.html") h2;
-  mso-even-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") f4;
-  mso-footer: url("file:///C:/Doc/spec/assets/iso_files/header.html") f4;
-  mso-paper-source: 0; }
-div.colophon {
-  page: WordSection4; }
-
-/* List Definitions */
-@list l0 {
-  mso-list-id: 145051656;
-  mso-list-template-ids: 2112159680; }
-@list l0:level1 {
-  mso-level-number-format: alpha-upper;
-  mso-level-style-link: ANNEX;
-  mso-level-suffix: none;
-  mso-level-text: "Annex\00A0%1";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-ansi-font-size: 14.0pt;
-  mso-bidi-font-size: 14.0pt;
-  font-family: "Cambria", serif;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l0:level2 {
-  mso-level-style-link: a2;
-  mso-level-text: "%1\.%2";
-  mso-level-tab-stop: 18.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l0:level3 {
-  mso-level-style-link: a3;
-  mso-level-text: "%1\.%2\.%3";
-  mso-level-tab-stop: 36.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l0:level4 {
-  mso-level-style-link: a4;
-  mso-level-text: "%1\.%2\.%3\.%4";
-  mso-level-tab-stop: 54.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l0:level5 {
-  mso-level-style-link: a5;
-  mso-level-text: "%1\.%2\.%3\.%4\.%5";
-  mso-level-tab-stop: 54.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l0:level6 {
-  mso-level-style-link: a6;
-  mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6";
-  mso-level-tab-stop: 72.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l0:level7 {
-  mso-level-reset-level: level2;
-  mso-level-suffix: space;
-  mso-level-text: "Figure\00A0%1\.%7\00A0—";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif; }
-@list l0:level8 {
-  mso-level-reset-level: level2;
-  mso-level-suffix: space;
-  mso-level-text: "Table\00A0%1\.%8\00A0—";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif; }
-@list l0:level9 {
-  mso-level-number-format: roman-lower;
-  mso-level-text: "\(%9\)";
-  mso-level-tab-stop: 306.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif; }
-@list l1 {
-  mso-list-id: 866942648;
-  mso-list-template-ids: -1756330000; }
-@list l1:level1 {
-  mso-level-style-link: "Heading 1";
-  mso-level-text: "%1";
-  mso-level-tab-stop: 21.6pt;
-  mso-level-number-position: left;
-  margin-left: 21.6pt;
-  text-indent: -21.6pt;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l1:level2 {
-  mso-level-style-link: "Heading 2";
-  mso-level-text: "%1\.%2";
-  mso-level-tab-stop: 18.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l1:level3 {
-  mso-level-style-link: "Heading 3";
-  mso-level-text: "%1\.%2\.%3";
-  mso-level-tab-stop: 36.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l1:level4 {
-  mso-level-style-link: "Heading 4";
-  mso-level-text: "%1\.%2\.%3\.%4";
-  mso-level-tab-stop: 54.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l1:level5 {
-  mso-level-style-link: "Heading 5";
-  mso-level-text: "%1\.%2\.%3\.%4\.%5";
-  mso-level-tab-stop: 54.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l1:level6 {
-  mso-level-style-link: "Heading 6";
-  mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6";
-  mso-level-tab-stop: 72.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif;
-  mso-ansi-font-weight: bold;
-  mso-ansi-font-style: normal; }
-@list l1:level7 {
-  mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6\.%7";
-  mso-level-tab-stop: 72.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif; }
-@list l1:level8 {
-  mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6\.%7\.%8";
-  mso-level-tab-stop: 90.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif; }
-@list l1:level9 {
-  mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6\.%7\.%8\.%9";
-  mso-level-tab-stop: 90.0pt;
-  mso-level-number-position: left;
-  margin-left: 0cm;
-  text-indent: 0cm;
-  mso-bidi-font-family: "Cambria", serif; }
-/* ordered list */
-@list l2 {
-  mso-list-id: 525294607;
-  mso-list-template-ids: 67633181; }
-@list l2:level1 {
-  mso-level-number-format: alpha-lower;
-  mso-level-text: "%1\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 18.0pt;
-  text-indent: -18.0pt; }
-@list l2:level2 {
-  mso-level-text: "%2\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 36.0pt;
-  text-indent: -18.0pt; }
-@list l2:level3 {
-  mso-level-number-format: roman-lower;
-  mso-level-text: "%3\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 54.0pt;
-  text-indent: -18.0pt; }
-@list l2:level4 {
-  mso-level-number-format: alpha-upper;
-  mso-level-text: "%4\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 72.0pt;
-  text-indent: -18.0pt; }
-@list l2:level5 {
-  mso-level-number-format: roman-upper;
-  mso-level-text: "%5\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 90.0pt;
-  text-indent: -18.0pt; }
-@list l2:level6 {
-  mso-level-number-format: alpha-lower;
-  mso-level-text: "%6\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 108.0pt;
-  text-indent: -18.0pt; }
-@list l2:level7 {
-  mso-level-tab-stop: none;
-  mso-level-text: "%7\)";
-  mso-level-number-position: left;
-  margin-left: 126.0pt;
-  text-indent: -18.0pt; }
-@list l2:level8 {
-  mso-level-number-format: roman-lower;
-  mso-level-text: "%8\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 144.0pt;
-  text-indent: -18.0pt; }
-@list l2:level9 {
-  mso-level-number-format: alpha-upper;
-  mso-level-text: "%9\)";
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 162.0pt;
-  text-indent: -18.0pt; }
-/* Unordered list */
-@list l3 {
-  mso-list-id: 1308196397;
-  mso-list-type: hybrid;
-  mso-list-template-ids: -277327948 -457018030 67633155 67633157 67633153 67633155 67633157 67633153 67633155 67633157; }
-@list l3:level1 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 18.0pt;
-  text-indent: -18.0pt; }
-@list l3:level2 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 36.0pt;
-  text-indent: -18.0pt; }
-@list l3:level3 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 54.0pt;
-  text-indent: -18.0pt; }
-@list l3:level4 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 72.0pt;
-  text-indent: -18.0pt; }
-@list l3:level5 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 90.0pt;
-  text-indent: -18.0pt; }
-@list l3:level6 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 108.0pt;
-  text-indent: -18.0pt; }
-@list l3:level7 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 126.0pt;
-  text-indent: -18.0pt; }
-@list l3:level8 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 144.0pt;
-  text-indent: -18.0pt; }
-@list l3:level9 {
-  mso-level-number-format: bullet;
-  mso-level-text: —;
-  mso-level-tab-stop: none;
-  mso-level-number-position: left;
-  margin-left: 162.0pt;
-  text-indent: -18.0pt; }
-table.MsoNormalTable {
-  mso-style-name: "Table Normal";
-  mso-tstyle-rowband-size: 0;
-  mso-tstyle-colband-size: 0;
-  mso-style-noshow: yes;
-  mso-style-priority: 99;
-  mso-style-parent: "";
-  mso-padding-alt: 0cm 5.4pt 0cm 5.4pt;
-  mso-para-margin: 0cm;
-  mso-para-margin-bottom: .0001pt;
-  mso-pagination: widow-orphan;
-  font-size: 10.0pt;
-  font-family: "Cambria", serif; }
-
-br.section {
-  page-break-before: always;
-  mso-break-type: section-break; }
-
-br.pagebreak {
-  page-break-before: always;
-  mso-special-character: line-break; }
-
-ol {
-  margin-bottom: 0cm;
-  margin-left: 18pt; }
-
-ul {
-  margin-bottom: 0cm;
-  margin-left: 18pt; }
+/* one empty stylesheet */
 
 -->
 </style>
@@ -2069,11 +850,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
 <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
   \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
 <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-<a href="#_Toc938931447">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc835854273">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-tab-count:1 dotted">. </span>
 </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-element:field-begin"></span></span>
-<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc938931447 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc835854273 \h </span>
   <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
   <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
 
@@ -2106,7 +887,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_94e7f467.3c17.4d67
+------=_NextPart_933e0e5f.7f75.40e3
 Content-Location: file:///C:/Doc/spec/assets/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -2116,7 +897,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_94e7f467.3c17.4d67
+------=_NextPart_933e0e5f.7f75.40e3
 Content-Location: file:///C:/Doc/spec/assets/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -2309,4 +1090,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_94e7f467.3c17.4d67--
+------=_NextPart_933e0e5f.7f75.40e3--