metanorma-itu 1.2.10 → 1.2.15

data/lib/asciidoctor/itu/itu.rng

@@ -42,6 +42,8 @@
         <value>joint-itu-iso-iec</value>
         <value>resolution</value>
         <value>service-publication</value>
+        <value>handbook</value>
+        <value>question</value>
       </choice>
     </define>
     <define name="editorialgroup">
@@ -98,6 +100,9 @@
       <optional>
         <ref name="meeting"/>
       </optional>
+      <optional>
+        <ref name="meeting-place"/>
+      </optional>
       <optional>
         <ref name="meeting-date"/>
       </optional>
@@ -125,9 +130,74 @@
         </oneOrMore>
       </element>
     </define>
+    <define name="Clause-Section">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <group>
+        <choice>
+          <group>
+            <zeroOrMore>
+              <ref name="BasicBlock"/>
+            </zeroOrMore>
+            <zeroOrMore>
+              <ref name="note"/>
+            </zeroOrMore>
+          </group>
+          <ref name="amend"/>
+        </choice>
+        <zeroOrMore>
+          <choice>
+            <ref name="clause-subsection"/>
+            <ref name="terms"/>
+            <ref name="definitions"/>
+          </choice>
+        </zeroOrMore>
+      </group>
+    </define>
   </include>
   <define name="meeting">
     <element name="meeting">
+      <optional>
+        <attribute name="acronym"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="meeting-place">
+    <element name="meeting-place">
       <text/>
     </element>
   </define>
@@ -316,6 +386,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -327,6 +400,9 @@
         <ref name="annex"/>
       </zeroOrMore>
       <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/itu/validate.rb

@@ -12,8 +12,7 @@ module Asciidoctor
         recommendation-corrigendum recommendation-errata recommendation-annex 
         focus-group implementers-guide technical-paper technical-report 
         joint-itu-iso-iec service-publication).include? doctype or
-        @log.add("Document Attributes", nil, 
-                 "#{doctype} is not a recognised document type")
+        @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
       end
 
       def stage_validate(xmldoc)
@@ -41,8 +40,7 @@ module Asciidoctor
         xmldoc.xpath("//bibdata/series/title").each do |s|
           series = s.text.sub(/^[A-Z]: /, "")
           t.downcase.include?(series.downcase) and
-            @log.add("Document Attributes", nil, 
-                     "Title includes series name #{series}")
+            @log.add("Document Attributes", nil, "Title includes series name #{series}")
         end
       end
 
@@ -99,7 +97,7 @@ module Asciidoctor
 
       def itu_identifier_validate(xmldoc)
         s = xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
-          /^ITU-[RTF] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
+          /^ITU-[RTD] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
             @log.add("Style", nil, "#{x.text} does not match ITU document "\
                      "identifier conventions")
         end
@@ -108,6 +106,16 @@ module Asciidoctor
       def section_validate(doc)
         super
         section_check(doc.root)
+        unnumbered_check(doc.root)
+      end
+
+      def unnumbered_check(xmldoc)
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        xmldoc.xpath("//clause[@unnumbered = 'true']").each do |c|
+          next if doctype == "resolution" and c.parent.name == "sections" and
+            !c.at("./preceding-sibling::clause")
+          @log.add("Style", c, "Unnumbered clause out of place")
+        end
       end
 
       # Editing Guidelines 7.2, 7.3

data/lib/isodoc/itu/base_convert.rb

@@ -3,6 +3,7 @@ require "fileutils"
 require_relative "./ref.rb"
 require_relative "./xref.rb"
 require_relative "./terms.rb"
+require_relative "./cleanup.rb"
 
 module IsoDoc
   module ITU
@@ -31,6 +32,11 @@ module IsoDoc
         " – "
       end
 
+      def para_class(node)
+        return "supertitle" if node["class"] == "supertitle"
+        super
+      end
+
       def ol_depth(node)
         return super unless node["class"] == "steps" or
           node.at(".//ancestor::xmlns:ol[@class = 'steps']")
@@ -48,21 +54,19 @@ module IsoDoc
         div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
           name&.children&.each { |c2| parse(c2, t) }
         end
-        annex_obligation_subtitle(annex, div)
+        annex_obligation_subtitle(annex, div) unless @meta.get[:doctype_original] == "resolution"
       end
 
       def annex_obligation_subtitle(annex, div)
         info = annex["obligation"] == "informative"
         div.p **{class: "annex_obligation" } do |p|
-          p << (info ? @i18n.inform_annex : @i18n.norm_annex).
-            sub(/%/, @meta.get[:doctype] || "")
+          p << (info ? @i18n.inform_annex : @i18n.norm_annex).sub(/%/, @meta.get[:doctype] || "")
         end
       end
 
       def annex(isoxml, out)
         isoxml.xpath(ns("//annex")).each do |c|
-          @meta.get[:doctype_original] == "recommendation-annex" or
-            page_break(out)
+          @meta.get[:doctype_original] == "recommendation-annex" or page_break(out)
           out.div **attr_code(id: c["id"], class: "Section3") do |s|
             annex_name(c, nil, s) unless c.at(ns("./title"))
             c.elements.each do |c1|
@@ -75,67 +79,52 @@ module IsoDoc
         end
       end
 
-      def cleanup(docxml)
+      def info(isoxml, out)
+        @meta.ip_notice_received isoxml, out
+        @meta.techreport isoxml, out
         super
-        term_cleanup(docxml)
-        refs_cleanup(docxml)
-        title_cleanup(docxml)
-      end
-
-      def title_cleanup(docxml)
-        docxml.xpath("//h1[@class = 'RecommendationAnnex']").each do |h|
-          h.name = "p"
-          h["class"] = "h1Annex"
-        end
-        docxml
-      end
-
-      def term_cleanup(docxml)
-        term_cleanup1(docxml)
-        term_cleanup2(docxml)
-        docxml
       end
 
-      def term_cleanup1(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&nbsp;"
-          d["id"] = h2["id"]
-          h2.remove
+      def middle_title(isoxml, out)
+        if @meta.get[:doctype] == "Resolution"
+          middle_title_resolution(isoxml, out)
+        else
+          middle_title_recommendation(isoxml, out)
         end
       end
 
-      def term_cleanup2(docxml)
-        docxml.xpath("//p[@class = 'TermNum']").each do |d|
-          d1 = d.next_element and d1.name == "p" or next
-          d1.children.each { |e| e.parent = d }
-          d1.remove
+      def middle_title_resolution(isoxml, out)
+        res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
+        out.p(**{ align: "center", style: "text-align:center;" }) do |p|
+          res.children.each { |n| parse(n, p) }
         end
+        out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
+        middle_title_resolution_subtitle(isoxml, out)
       end
 
-      def refs_cleanup(docxml)
-        docxml.xpath("//tx[following-sibling::tx]").each do |tx|
-          tx << tx.next_element.remove.children
-        end
-        docxml.xpath("//tx").each do |tx|
-          tx.name = "td"
-          tx["colspan"] = "2"
-          tx.wrap("<tr></tr>")
+      def middle_title_resolution_subtitle(isoxml, out)
+        out.p(**{ align: "center", style: "text-align:center;" }) do |p|
+          p.i do |i|
+            i << "("
+            isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']")).children.each { |n| parse(n, i) }
+            i << ")"
+          end
+          isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
+            footnote_parse(f, p)
+          end
         end
-        docxml
       end
 
-      def info(isoxml, out)
-        @meta.ip_notice_received isoxml, out
-        @meta.techreport isoxml, out
-        super
-      end
-
-      def middle_title(out)
+      def middle_title_recommendation(isoxml, out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
           id = @meta.get[:docnumber] and p << "#{@meta.get[:doctype]} #{id}" 
         end
-        out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
+        out.p(**{ class: "zzSTDTitle2" }) do |p|
+          p << @meta.get[:doctitle]
+          isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
+            footnote_parse(f, p)
+          end
+        end
         s = @meta.get[:docsubtitle] and
           out.p(**{ class: "zzSTDTitle3" }) { |p| p << s }
       end
@@ -178,7 +167,6 @@ module IsoDoc
         div.p do |p|
           name and p.span **{ class: "note_label" } do |s|
             name.children.each { |n| parse(n, s) }
-            #s << note_delim
           end
         end
         node.children.each { |n| parse(n, div) }
@@ -187,6 +175,36 @@ module IsoDoc
       def table_footnote_reference_format(a)
         a.content = a.content + ")"
       end
+
+      def note_parse(node, out)
+        return if node["type"] == "title-footnote"
+        super
+      end
+
+      # can have supertitle in resolution
+      def clause(isoxml, out)
+        isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
+          clause_core(c, out)
+        end
+      end
+
+      def clause_core(c, out)
+        out.div **attr_code(clause_attrs(c)) do |s|
+          c.elements.each do |c1|
+            if c1.name == "title" then clause_name(nil, c1, s, nil)
+            else
+              parse(c1, s)
+            end
+          end
+        end
+      end
+
+      def scope(isoxml, out, num)
+        return super unless @meta.get[:doctype_original] == "resolution"
+        f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
+        clause_core(f, out)
+        num + 1
+      end
     end
   end
 end

data/lib/isodoc/itu/cleanup.rb

@@ -0,0 +1,55 @@
+module IsoDoc
+  module ITU
+    module BaseConvert
+      def cleanup(docxml)
+        super
+        term_cleanup(docxml)
+        refs_cleanup(docxml)
+        title_cleanup(docxml)
+      end
+
+      def title_cleanup(docxml)
+        docxml.xpath("//h1[@class = 'RecommendationAnnex']").each do |h|
+          h.name = "p"
+          h["class"] = "h1Annex"
+        end
+        docxml
+      end
+
+      def term_cleanup(docxml)
+        term_cleanup1(docxml)
+        term_cleanup2(docxml)
+        docxml
+      end
+
+      def term_cleanup1(docxml)
+        docxml.xpath("//p[@class = 'Terms']").each do |d|
+          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&nbsp;"
+          d["id"] = h2["id"]
+          h2.remove
+        end
+      end
+
+      def term_cleanup2(docxml)
+        docxml.xpath("//p[@class = 'TermNum']").each do |d|
+          d1 = d.next_element and d1.name == "p" or next
+          d1.children.each { |e| e.parent = d }
+          d1.remove
+        end
+      end
+
+      def refs_cleanup(docxml)
+        docxml.xpath("//tx[following-sibling::tx]").each do |tx|
+          tx << tx.next_element.remove.children
+        end
+        docxml.xpath("//tx").each do |tx|
+          tx.name = "td"
+          tx["colspan"] = "2"
+          tx.wrap("<tr></tr>")
+        end
+        docxml
+      end
+    end
+  end
+end

data/lib/isodoc/itu/html/header.html

@@ -115,7 +115,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -127,11 +127,12 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
-<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><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
@@ -141,7 +142,8 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2l>
-<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><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
@@ -159,7 +161,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -171,11 +173,12 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
-<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %}  ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><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
@@ -185,7 +188,8 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3l>
-<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumeric}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><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