asciidoctor-iso 0.9.9 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb66e36c45b81ea74df0f2f99014369c36ee1910425fbfe258034da6498b6de
-  data.tar.gz: 5967537b4c5ecf61bc2cdf3a6ce85219df2f92b03caa447b6c0594b07300fc82
+  metadata.gz: 9f33d6a123eea911079343a47615fa26a433e777d3dcd57866711705b8fd02e8
+  data.tar.gz: c1bd60cc9ce1b4a164f112ab17a181fe3cf32a42f8d5e0a5efbecd26902a517a
 SHA512:
-  metadata.gz: 26da20f2117a447051df311f61145aa0f5841d78adad3ebfcef08b3c97208c353e19add9151f5eda043d27621822b4b09440bfe51aca92dad754452e7ad8ad2e
-  data.tar.gz: 2cd75fbdd50c9858a0b1ed81d4f1a77e59cbdac4eccb315be14b06ff50a4a621d5f3bf7363c4940cfe9fcd9e1dfda224f4349e35202b1d82c1bdd7a66f5695aa
+  metadata.gz: b29a3b72d11cea8a6e8b4bc2f4cfbed276d475c92702facd1214177fc9452f04e90a842e7d7758519291264826f7a74d5894437148106ae631f6392a6830be8a
+  data.tar.gz: 48b79c7530f7a756d5646d99131d7ae57b3cb5434c6349e827f7dedc4082bb6332c18e80f617057b264db70e61a1ddc33db131e3406990a638ef24e43352b05f

data/.travis.yml

@@ -8,6 +8,13 @@ rvm:
 before_install:
   - gem install bundler -v 1.16.1
   - unset _JAVA_OPTIONS
+  - wget "http://downloads.sourceforge.net/project/plantuml/plantuml.jar?r=&ts=1424308684&use_mirror=jaist" -O plantuml.jar
+  - sudo mkdir -p /opt/plantuml
+  - sudo cp plantuml.jar /opt/plantuml
+  - echo "#! /bin/sh" > plantuml.sh
+  - echo 'exec java -jar /opt/plantuml/plantuml.jar "$@"' >> plantuml.sh
+  - sudo install -m 755 -D plantuml.sh /usr/bin/plantuml
+  - plantuml -version
 matrix:
   allow_failures:
     - rvm: ruby-head

data/README.adoc

@@ -514,6 +514,38 @@ This generates the following ISO XML:
 </clause>
 --
 
+=== PlantUML
+
+The http://plantuml.com[PlantUML] diagramming tool is integrated with Asciidoctor
+in this gem, as a literal block with the style attribute `plantuml`:
+
+[source,asciidoctor]
+--
+[plantuml]
+....
+@startuml
+Alice -> Bob: Authentication Request
+Bob --> Alice: Authentication Response
+
+Alice -> Bob: Another authentication Request
+Alice <-- Bob: another authentication Response
+@enduml
+....
+--
+
+The integration runs PlantUML for each such block, generating a PNG image.
+The images are stored in the `plantuml` directory, and linked into the output
+document in place of the PlantUML.
+
+PlantUML needs to be installed by users separately, and accesssible from the
+command line:
+
+* `brew install plantuml` on MacOS.
+* For Linux, link the PlantUML jar file into a command line executable; see
+`.travis.yml` for an example.
+
+If PlantUML is not installed locally, the source PlantUML is incorporated into
+the output document as sourcecode. 
 
 === Features not visible in HTML preview
 
@@ -623,17 +655,20 @@ identifier as the item label; e.g.
 By default, the `isobib` gem is used to look up the reference details for 
 any item label prefixed with `ISO` on the ISO web site. The full bibliographic details 
 of the item are screenscraped from the ISO site and inserted into the XML file 
-(although only the title of the reference is used in rendering).
+(although only the title of the reference is used in rendering). The
+http://www.electropedia.org[Electropedia] termbank is queried in validation, to confirm
+that the cited entries in Terms and Definitions are the same as what is cited online;
+those queries are routed through the `iev` gem
 
 [[cache]]
 The results of all `isobib` searches done to date, across all documents,
-are cached in the global cache file `~/.relaton-bib.json`, 
+are cached in the global cache file `~/.relaton-bib.pstore`, 
 so they do not need to be re-fetched each time a document is processed. 
 (The web query takes a few seconds per reference.)
 
 The results of all `isobib` searches done to date for the current document
 (`filename.adoc`) are stored in the same directory as the current document,
-in the file `filename`.relaton.json. The local cache overrides entries in
+in the file `{filename}.relaton.pstore`. The local cache overrides entries in
 the global cache, and can be manually edited. The local cache is only used
 if the `:local-cache:` document attribute is set.
 
@@ -646,6 +681,11 @@ Any entry in the cache that corresponds to an undated ISO reference fetches its
 from the latest available entry on the ISO web site. If the entry is more than 60
 days old, it is refetched.
 
+The results of all `iev` searches done to date across all documents are cached
+in the global cache fule `~/iev.pstore`, and the results of all `iev` searches 
+done to date for the current document are stored in the same directory as the
+current document, in the file `(filename).iev.pstore`.
+
 == Document Attributes
 
 The gem relies on Asciidoctor document attributes to provide necessary
@@ -660,14 +700,14 @@ Can be used as a command-line option (like all other document attributes):
 `:flush-caches:`:: If set, delete and reinitialise the <<cache,cache>> of `isobib` searches
 for ISO references from the ISO web site.
 
-`:no-isobib:`:: If set, do not use the `isobib` gem functionality to look up
-ISO references online, nor the <<cache,cache>> of `isobib` searches.
+`:no-isobib:`:: If set, do not use the `isobib` or `iev` gem functionality to look up
+ISO and IEV references online, nor the <<cache,cache>> of `isobib` and `iev` searches.
 
-`:no-isobib-cache:`:: If set, use the `isobib` gem functionality to look up
-ISO references online, but do not use the <<cache,cache>> of `isobib` searches.
+`:no-isobib-cache:`:: If set, use the `isobib` and `iev` gem functionality to look up
+ISO and IEV references online, but do not use the <<cache,cache>> of `isobib` and `iev` searches.
 
-`:local-cache:`:: Use the local isobib search cache to override the global isobib search
-cache.
+`:local-cache:`:: Use the local isobib and iev search caches to override the global isobib and iev search
+caches.
 
 `:i18nyaml:`:: Name of YAML file of internationalisation text, to use instead
 of the built-in English, French or Chinese text used to label parts of the document

data/asciidoctor-iso.gemspec

@@ -25,16 +25,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", ">= 0.8"
-  spec.add_dependency "iev", "~> 0.1.0"
+  spec.add_dependency "iev", "~> 0.2.0"
   spec.add_dependency "relaton", "~> 0.1.3"
 
   spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

data/lib/asciidoctor-iso.rb

@@ -1,6 +1,8 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/iso/converter"
 require_relative "asciidoctor/iso/version"
+require_relative "isodoc/iso/html_convert"
+require_relative "isodoc/iso/word_convert"
 require "asciidoctor/extensions"
 
 if defined? Metanorma

data/lib/asciidoctor/iso/base.rb

@@ -16,6 +16,7 @@ module Asciidoctor
         inline_macro Asciidoctor::ISO::AltTermInlineMacro
         inline_macro Asciidoctor::ISO::DeprecatedTermInlineMacro
         inline_macro Asciidoctor::ISO::DomainTermInlineMacro
+        block Asciidoctor::ISO::PlantUMLBlockMacro
       end
 
       def content(node)
@@ -75,6 +76,7 @@ module Asciidoctor
         @no_isobib = node.attr("no-isobib")
         @bibdb = nil
         init_bib_caches(node)
+        init_iev_caches(node)
       end
 
       def init_bib_caches(node)
@@ -89,6 +91,18 @@ module Asciidoctor
         @bibdb = Relaton::Db.new(globalname, localname) unless @no_isobib
       end
 
+      def init_iev_caches(node)
+        unless (@no_isobib_cache || @no_isobib)
+          globalname = ievcache_name(true)
+          localname = ievcache_name(false) if node.attr("local-cache")
+          if node.attr("flush-caches")
+            system("rm -f #{globalname}") unless globalname.nil?
+            system("rm -f #{localname}") unless localname.nil?
+          end
+        end
+        @iev = Iev::Db.new(globalname, localname) unless @no_isobib
+      end
+
       def default_fonts(node)
         b = node.attr("body-font") ||
           (node.attr("script") == "Hans" ? '"SimSun",serif' :

data/lib/asciidoctor/iso/blocks.rb

@@ -35,7 +35,7 @@ module Asciidoctor
 
       def sidebar_attrs(node)
         date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
-        date += "T00:00:00Z" unless /T/.match? date
+        date += "T00:00:00Z" unless /T/.match date
         {
           reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
           id: Utils::anchor_or_uuid(node),

data/lib/asciidoctor/iso/cleanup.rb

@@ -203,7 +203,7 @@ module Asciidoctor
       def empty_text_before_first_element(x)
         x.children.each do |c|
           if c.text?
-            return false if /\S/.match?(c.text)
+            return false if /\S/.match(c.text)
           end
           return true if c.element?
         end
@@ -212,7 +212,7 @@ module Asciidoctor
 
       def strip_initial_space(x)
         if x.children[0].text?
-          if !/\S/.match?(x.children[0].text)
+          if !/\S/.match(x.children[0].text)
             x.children[0].remove
           else
             x.children[0].content = x.children[0].text.gsub(/^ /, "")

data/lib/asciidoctor/iso/cleanup_ref.rb

@@ -90,7 +90,7 @@ module Asciidoctor
 
       def format_ref(ref, isopub)
         return ref if isopub
-        return "[#{ref}]" if /^\d+$/.match?(ref) && !/^\[.*\]$/.match?(ref)
+        return "[#{ref}]" if /^\d+$/.match(ref) && !/^\[.*\]$/.match(ref)
         ref
       end
 

data/lib/asciidoctor/iso/inline.rb

@@ -93,7 +93,7 @@ module Asciidoctor
 
       def stem_parse(text, xml)
         if /<([^:>&]+:)?math(\s+[^>&]+)?> |
-          <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
+          <([^:>&]+:)?math(\s+[^>&]+)?>/x.match text
           math = HTMLEntities.new.encode(text, :basic, :hexadecimal).
             gsub(/&amp;gt;/, ">").gsub(/\&amp;lt;/, "<").gsub(/&amp;amp;/, "&").
             gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&")

data/lib/asciidoctor/iso/macros.rb

@@ -37,5 +37,59 @@ module Asciidoctor
         %{<domain>#{out}</domain>}
       end
     end
+
+    class PlantUMLBlockMacroBackend
+      # https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+      def self.plantuml_installed?
+        cmd = "plantuml"
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+          end
+        end
+        nil
+      end
+
+      def self.generate_file parent, reader
+        src = reader.source
+        reader.lines.first.sub(/\s+$/, "") != "@startuml" or
+          src = "@startuml\n#{src}\n@enduml\n"
+        filename = parent.document.reader.lineno
+        system "mkdir -p plantuml"
+        File.open("plantuml/#{filename}.pml", "w") { |f| f.write src }
+        system "plantuml plantuml/#{filename}.pml"
+        filename
+      end
+
+      def self.generate_attrs attrs
+        through_attrs = %w(id align float title role width height alt).
+          inject({}) do |memo, key|
+          memo[key] = attrs[key] if attrs.has_key? key
+          memo
+        end
+      end
+    end
+
+    class PlantUMLBlockMacro < Asciidoctor::Extensions::BlockProcessor
+      use_dsl
+      named :plantuml
+      on_context :literal
+      parse_content_as :raw
+
+      def process(parent, reader, attrs)
+        if PlantUMLBlockMacroBackend.plantuml_installed?
+          filename = PlantUMLBlockMacroBackend.generate_file parent, reader
+          through_attrs = PlantUMLBlockMacroBackend.generate_attrs attrs
+          through_attrs["target"] = "plantuml/#{filename}.png"
+          create_image_block parent, through_attrs
+        else
+          warn "PlantUML not installed"
+          # attrs.delete(1) : remove the style attribute
+          create_listing_block parent, reader.source, attrs.reject { |k, v| k == 1 }
+        end
+      end
+    end
   end
 end

data/lib/asciidoctor/iso/ref.rb

@@ -93,7 +93,7 @@ module Asciidoctor
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
             i << ref_normalise_no_format(m[:text])
           end
-          t.docidentifier(/^\d+$/.match?(m[:code]) ? "[#{m[:code]}]" : m[:code])
+          t.docidentifier(/^\d+$/.match(m[:code]) ? "[#{m[:code]}]" : m[:code])
         end
       end
 
@@ -103,7 +103,7 @@ module Asciidoctor
           Utils::warning(node, "no anchor on reference", item) 
           return
         end
-        unless m[:code] && /^\d+$/.match?(m[:code])
+        unless m[:code] && /^\d+$/.match(m[:code])
           ref = fetch_ref xml, m[:code], 
             m.named_captures.has_key?("year") ? m[:year] : nil, {}
           return use_my_anchor(ref, m[:anchor]) if ref
@@ -177,6 +177,11 @@ module Asciidoctor
         global ?  "#{Dir.home}/.relaton-bib.pstore" :
           "#{@filename}.relaton.pstore"
       end
+
+      def ievcache_name(global)
+        global ?  "#{Dir.home}/.iev.pstore" :
+          "#{@filename}.iev.pstore"
+      end
     end
   end
 end

data/lib/asciidoctor/iso/validate.rb

@@ -53,11 +53,11 @@ module Asciidoctor
         doctypes = /International\sStandard | Technical\sSpecification |
         Publicly\sAvailable\sSpecification | Technical\sReport | Guide /xi
         title_main_en = root.at("//title-main[@language='en']")
-        if !title_main_en.nil? && doctypes.match?(title_main_en.text)
+        if !title_main_en.nil? && doctypes.match(title_main_en.text)
           warn "Main Title may name document type"
         end
         title_intro_en = root.at("//title-intro[@language='en']")
-        if !title_intro_en.nil? && doctypes.match?(title_intro_en.text)
+        if !title_intro_en.nil? && doctypes.match(title_intro_en.text)
           warn "Title Intro may name document type"
         end
       end
@@ -124,7 +124,7 @@ module Asciidoctor
     root.xpath("//xref").each do |t|
       # does not deal with preceding text marked up
       preceding = t.at("./preceding-sibling::text()[last()]")
-      next unless !preceding.nil? && /\bsee\s*$/mi.match?(preceding)
+      next unless !preceding.nil? && /\bsee\s*$/mi.match(preceding)
       (target = root.at("//*[@id = '#{t['target']}']")) || next
       if target&.at("./ancestor-or-self::*[@obligation = 'normative']")
         warn "ISO: 'see #{t['target']}' is pointing to a normative section"
@@ -135,7 +135,7 @@ module Asciidoctor
   def see_erefs_validate(root)
     root.xpath("//eref").each do |t|
       preceding = t.at("./preceding-sibling::text()[last()]")
-      next unless !preceding.nil? && /\bsee\s*$/mi.match?(preceding)
+      next unless !preceding.nil? && /\bsee\s*$/mi.match(preceding)
       target = root.at("//*[@id = '#{t['bibitemid']}']")
       if target.at("./ancestor::references"\
           "[title = 'Normative References']")
@@ -146,7 +146,7 @@ module Asciidoctor
 
   def locality_erefs_validate(root)
     root.xpath("//eref[locality]").each do |t|
-      unless /:[ ]?\d+{4}$/.match? t["citeas"]
+      unless /:[ ]?\d+{4}$/.match t["citeas"]
         warn "ISO: undated reference #{t['citeas']} should not contain "\
           "specific elements"
       end
@@ -154,7 +154,7 @@ module Asciidoctor
   end
 
   def termdef_warn(text, re, term, msg)
-    re.match?(text) && warn("ISO style: #{term}: #{msg}")
+    re.match(text) && warn("ISO style: #{term}: #{msg}")
   end
 
   def termdef_style(xmldoc)
@@ -172,10 +172,10 @@ module Asciidoctor
 
   def iev_validate(xmldoc)
     xmldoc.xpath("//term").each do |t|
-      /^IEV($|\s|:)/.match? t&.at(".//origin/@citeas")&.text or next
+      /^IEV($|\s|:)/.match(t&.at(".//origin/@citeas")&.text) or next
       pref = t.xpath("./preferred").inject([]) { |m, x| m << x&.text&.downcase }
       locality = t.xpath(SOURCELOCALITY)&.text or next
-      iev = Iev.get(locality, xmldoc&.at("//language")&.text || "en") or next
+      iev = @iev.fetch(locality, xmldoc&.at("//language")&.text || "en") or next
       pref.include?(iev.downcase) or
         warn %(Term "#{pref[0]}" does not match IEV #{locality} "#{iev}")
     end

data/lib/asciidoctor/iso/validate_requirements.rb

@@ -25,7 +25,7 @@ module Asciidoctor
 
       def requirement(text)
         text.split(/\.\s+/).each do |t|
-          return t if REQUIREMENT_RE.match? t
+          return t if REQUIREMENT_RE.match t
         end
         nil
       end
@@ -43,7 +43,7 @@ module Asciidoctor
 
       def recommendation(text)
         text.split(/\.\s+/).each do |t|
-          return t if RECOMMENDATION_RE.match? t
+          return t if RECOMMENDATION_RE.match t
         end
         nil
       end
@@ -62,7 +62,7 @@ module Asciidoctor
 
       def permission(text)
         text.split(/\.\s+/).each do |t|
-          return t if PERMISSION_RE.match? t
+          return t if PERMISSION_RE.match t
         end
         nil
       end
@@ -81,13 +81,13 @@ module Asciidoctor
                    Regexp::IGNORECASE)
 
       def possibility(text)
-        text.split(/\.\s+/).each { |t| return t if POSSIBILITY_RE.match? t }
+        text.split(/\.\s+/).each { |t| return t if POSSIBILITY_RE.match t }
         nil
       end
 
       def external_constraint(text)
         text.split(/\.\s+/).each do |t|
-          return t if /\b(must)\b/xi.match? t
+          return t if /\b(must)\b/xi.match t
         end
         nil
       end

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.9.9".freeze
+    VERSION = "0.10.0".freeze
   end
 end

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

@@ -0,0 +1,206 @@
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns:mv="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta name=Title content="">
+<meta name=Keywords content="">
+<meta http-equiv=Content-Type content="text/html; charset=utf-8">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 15">
+<meta name=Originator content="Microsoft Word 15">
+<link id=Main-File rel=Main-File href="../{{ filename }}.html">
+<!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="2049"/>
+</xml><![endif]-->
+</head>
+
+<body lang=EN link=blue vlink="#954F72">
+
+<div style='mso-element:footnote-separator' id=fs>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1 width="33%">
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:footnote-continuation-separator' id=fcs>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1>
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:endnote-separator' id=es>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1 width="33%">
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:endnote-continuation-separator' id=ecs>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1>
+
+<![endif]></span></span></p>
+
+</div>
+
+<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>
+
+</div>
+
+<div style='mso-element:header' id=ha>
+
+<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'>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
+style='font-weight:normal'><o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=efa>
+
+<p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
+exactly'><!--[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><span
+style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><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-no-proof:yes'>2</span></span></b><!--[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-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>©
+{{ agency }}&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>{{ docnumber }}:{{ docyear }}(E){{ 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>
+
+</div>
+
+<div style='mso-element:footer' id=ef2>
+
+<p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-begin'></span><span
+style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
+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>©
+{{ agency }}&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'>© {{ agency }}&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'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
+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'><o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=ef3>
+
+<p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
+exactly'><!--[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><span
+style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><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-no-proof:yes'>2</span></span></b><!--[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-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>©
+{{ agency }}&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'>© {{ agency }}&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>
+PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
+style='mso-element:field-separator'></span></span></b><![endif]--><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-no-proof:yes'>3</span></span></b><!--[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-end'></span></span></b><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=f4>
+
+<p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span>ICS {{ ics }}<o:p></o:p></span></b></p>
+
+<p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
+10.0pt;mso-ansi-language:EN-AU'>Price based on </span><!--[if supportFields]><span
+lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
+style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span
+style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
+lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
+style='mso-no-proof:yes'>26</span></span><!--[if supportFields]><span
+lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
+style='mso-element:field-end'></span></span><![endif]--><span lang=EN-AU
+style='font-size:10.0pt;mso-ansi-language:EN-AU'> pages<o:p></o:p></span></p>
+
+<p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
+</div>
+
+
+
+</body>
+
+</html>