metanorma-itu 1.2.11 → 1.2.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +9 -32
  3. data/.gitignore +2 -0
  4. data/.rubocop.yml +6 -2
  5. data/lib/asciidoctor/itu/basicdoc.rng +5 -3
  6. data/lib/asciidoctor/itu/biblio.rng +4 -6
  7. data/lib/asciidoctor/itu/converter.rb +1 -1
  8. data/lib/asciidoctor/itu/front.rb +5 -5
  9. data/lib/asciidoctor/itu/isodoc.rng +108 -2
  10. data/lib/asciidoctor/itu/itu.rng +6 -0
  11. data/lib/asciidoctor/itu/validate.rb +1 -1
  12. data/lib/isodoc/itu/base_convert.rb +5 -0
  13. data/lib/isodoc/itu/html/header.html +8 -8
  14. data/lib/isodoc/itu/html/html_itu_intro.html +1 -1
  15. data/lib/isodoc/itu/html/htmlstyle.css +11 -0
  16. data/lib/isodoc/itu/html/htmlstyle.scss +17 -0
  17. data/lib/isodoc/itu/html/word_itu_intro.html +2 -2
  18. data/lib/isodoc/itu/html/word_itu_titlepage.html +1 -1
  19. data/lib/isodoc/itu/html/wordstyle.css +31 -0
  20. data/lib/isodoc/itu/html/wordstyle.scss +30 -0
  21. data/lib/isodoc/itu/html_convert.rb +2 -2
  22. data/lib/isodoc/itu/i18n-en.yaml +1 -1
  23. data/lib/isodoc/itu/itu.implementers-guide.xsl +5889 -0
  24. data/lib/isodoc/itu/itu.in-force.xsl +5889 -0
  25. data/lib/isodoc/itu/itu.recommendation-annex.xsl +1046 -441
  26. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +5889 -0
  27. data/lib/isodoc/itu/itu.recommendation.xsl +1046 -441
  28. data/lib/isodoc/itu/itu.resolution.xsl +1046 -441
  29. data/lib/isodoc/itu/itu.technical-paper.xsl +1046 -441
  30. data/lib/isodoc/itu/itu.technical-report.xsl +1046 -441
  31. data/lib/isodoc/itu/pdf_convert.rb +5 -8
  32. data/lib/isodoc/itu/presentation_xml_convert.rb +2 -2
  33. data/lib/isodoc/itu/word_convert.rb +2 -2
  34. data/lib/isodoc/itu/xref.rb +10 -6
  35. data/lib/metanorma/itu/processor.rb +1 -0
  36. data/lib/metanorma/itu/version.rb +1 -1
  37. data/metanorma-itu.gemspec +4 -4
  38. metadata +16 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ebf36f8725648a2e24bf148c5b6eca7227892eb9f91a18cc7f274a62981db6e2
4
- data.tar.gz: c4e7229799f091ce3cf6ac21e2fbb202d39e7bf57d1f72e0e74c726f7fb0441e
3
+ metadata.gz: 74f8f79bc99c8ff459c43ec1dd68f5fc1486f9f55d2632408a3d22514b5c9d9e
4
+ data.tar.gz: 9c15a9900916ffaad81a23b3d44e8238da413fbf2bc042a8c5aa2ff34a67e62b
5
5
  SHA512:
6
- metadata.gz: 924c0c3a471675ad01f3b52dd1e28192cff5a5124b1808f867417a96d28ee6357268820ab00301f6710752afec711d256909b5bac24a714d77ff951129b6ca62
7
- data.tar.gz: 6da337d4917c9f6d537636540ba5ea8569a3d410100261ca79beb3f1082438db50af7cd33a1065b08fb8a0226b2d4fb814c4fc94bc615721b68c0e2826f7c19c
6
+ metadata.gz: 00f039f6898254841544adace9b22ecc17e9e470198885be2027dc2b435401203fd240ccbcc0a61dae4bf239791e42a62ec27235e940060aea64168f07b5526e
7
+ data.tar.gz: ca7a801478f776e35b0dc25fac1b32cc9e5b610466a85ad381e4b689bef95159fbdb5e3017e3a542f0eaa8329bef5b724104b50b9abc5a6a070c63a00381376e
data/.github/workflows/rake.yml CHANGED
@@ -4,7 +4,7 @@ name: rake
4
4
 
5
5
  on:
6
6
  push:
7
- branches: [ master, main ]
7
+ branches: [ master, main ]
8
8
  tags: [ v* ]
9
9
  pull_request:
10
10
 
@@ -16,50 +16,27 @@ jobs:
16
16
  strategy:
17
17
  fail-fast: false
18
18
  matrix:
19
- ruby: [ '2.6', '2.5', '2.4' ]
19
+ ruby: [ '2.7', '2.6', '2.5', '2.4' ]
20
20
  os: [ ubuntu-latest, windows-latest, macos-latest ]
21
21
  experimental: [ false ]
22
22
  include:
23
- - ruby: '2.7'
23
+ - ruby: '3.0'
24
24
  os: 'ubuntu-latest'
25
25
  experimental: true
26
- - ruby: '2.7'
26
+ - ruby: '3.0'
27
27
  os: 'windows-latest'
28
28
  experimental: true
29
- - ruby: '2.7'
29
+ - ruby: '3.0'
30
30
  os: 'macos-latest'
31
31
  experimental: true
32
32
  steps:
33
- - uses: actions/checkout@master
33
+ - uses: actions/checkout@v2
34
+ with:
35
+ submodules: true
34
36
 
35
37
  - uses: ruby/setup-ruby@v1
36
38
  with:
37
39
  ruby-version: ${{ matrix.ruby }}
38
-
39
- - if: matrix.os == 'macos-latest'
40
- run: brew install autoconf automake libtool
41
-
42
- - uses: actions/cache@v2
43
- with:
44
- path: vendor/bundle
45
- key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
46
- restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
47
-
48
- - run: bundle config set path 'vendor/bundle'
49
-
50
- - run: bundle install --jobs 4 --retry 3
40
+ bundler-cache: true
51
41
 
52
42
  - run: bundle exec rake
53
-
54
- tests-passed:
55
- needs: rake
56
- runs-on: ubuntu-latest
57
- steps:
58
- - name: Trigger tests passed event
59
- uses: Sibz/github-status-action@v1
60
- with:
61
- authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
62
- context: 'tests-passed-successfully'
63
- description: 'Tests passed successfully'
64
- state: 'success'
65
- sha: ${{ github.event.pull_request.head.sha || github.sha }}
data/.gitignore CHANGED
@@ -2,3 +2,5 @@
2
2
  .byebug_history
3
3
  .rspec_status
4
4
  coverage/
5
+
6
+ .rubocop-https--*
data/.rubocop.yml CHANGED
@@ -1,10 +1,14 @@
1
1
  # This project follows the Ribose OSS style guide.
2
2
  # https://github.com/riboseinc/oss-guides
3
3
  # All project-specific additions and overrides should be specified in this file.
4
-
5
4
  inherit_from:
6
5
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
6
+
7
+ # local repo-specific modifications
8
+
7
9
  AllCops:
8
- TargetRubyVersion: 2.3
10
+ DisplayCopNames: false
11
+ StyleGuideCopsOnly: false
12
+ TargetRubyVersion: 2.4
9
13
  Rails:
10
14
  Enabled: true
data/lib/asciidoctor/itu/basicdoc.rng CHANGED
@@ -729,9 +729,11 @@
729
729
  </define>
730
730
  <define name="index">
731
731
  <element name="index">
732
- <attribute name="to">
733
- <data type="IDREF"/>
734
- </attribute>
732
+ <optional>
733
+ <attribute name="to">
734
+ <data type="IDREF"/>
735
+ </attribute>
736
+ </optional>
735
737
  <element name="primary">
736
738
  <oneOrMore>
737
739
  <ref name="PureTextElement"/>
data/lib/asciidoctor/itu/biblio.rng CHANGED
@@ -124,7 +124,7 @@
124
124
  <value>application/tei+xml</value>
125
125
  <value>text/x-asciidoc</value>
126
126
  <value>text/markdown</value>
127
- <value>application/x-isodoc+xml</value>
127
+ <value>application/x-metanorma+xml</value>
128
128
  <text/>
129
129
  </choice>
130
130
  </attribute>
@@ -452,6 +452,7 @@
452
452
  <attribute name="type">
453
453
  <choice>
454
454
  <value>isni</value>
455
+ <value>orcid</value>
455
456
  <value>uri</value>
456
457
  </choice>
457
458
  </attribute>
@@ -461,10 +462,7 @@
461
462
  <define name="org-identifier">
462
463
  <element name="identifier">
463
464
  <attribute name="type">
464
- <choice>
465
- <value>orcid</value>
466
- <value>uri</value>
467
- </choice>
465
+ <data type="string" datatypeLibrary=""/>
468
466
  </attribute>
469
467
  <text/>
470
468
  </element>
@@ -1106,7 +1104,7 @@
1106
1104
  <value>complementOf</value>
1107
1105
  <value>obsoletes</value>
1108
1106
  <value>obsoletedBy</value>
1109
- <value>cited</value>
1107
+ <value>cites</value>
1110
1108
  <value>isCitedIn</value>
1111
1109
  </choice>
1112
1110
  </define>
data/lib/asciidoctor/itu/converter.rb CHANGED
@@ -45,7 +45,7 @@ module Asciidoctor
45
45
  end
46
46
 
47
47
  def olist(node)
48
- id = Asciidoctor::Standoc::Utils::anchor_or_uuid(node)
48
+ id = Metanorma::Utils::anchor_or_uuid(node)
49
49
  noko do |xml|
50
50
  xml.ol **attr_code(id: id, class: node.attr("class")) do |xml_ol|
51
51
  node.items.each { |item| li(xml_ol, item) }
data/lib/asciidoctor/itu/front.rb CHANGED
@@ -16,12 +16,12 @@ module Asciidoctor
16
16
  at = { language: "en", format: "text/plain", type: "main" }
17
17
  a = node.attr("title") || node.attr("title-en")
18
18
  xml.title **attr_code(at) do |t|
19
- t << (Asciidoctor::Standoc::Utils::asciidoc_sub(a) || node.title)
19
+ t << (Metanorma::Utils::asciidoc_sub(a) || node.title)
20
20
  end
21
21
  if a = node.attr("annextitle") || node.attr("annextitle-en")
22
22
  at[:type] = "annex"
23
23
  xml.title **attr_code(at) do |t|
24
- t << Asciidoctor::Standoc::Utils::asciidoc_sub(a)
24
+ t << Metanorma::Utils::asciidoc_sub(a)
25
25
  end
26
26
  end
27
27
  end
@@ -32,7 +32,7 @@ module Asciidoctor
32
32
  next if lang == "en"
33
33
  type = /^annex/.match(k) ? "annex" : "main"
34
34
  xml.title **attr_code(language: lang, format: "text/plain", type: type) do |t|
35
- t << Asciidoctor::Standoc::Utils::asciidoc_sub(v)
35
+ t << Metanorma::Utils::asciidoc_sub(v)
36
36
  end
37
37
  end
38
38
  end
@@ -49,7 +49,7 @@ module Asciidoctor
49
49
  at = { language: "en", format: "text/plain", type: type.sub(/-title/, "") }
50
50
  a = node.attr(type) || node.attr("#{type}-en")
51
51
  xml.title **attr_code(at) do |t|
52
- t << Asciidoctor::Standoc::Utils::asciidoc_sub(a)
52
+ t << Metanorma::Utils::asciidoc_sub(a)
53
53
  end
54
54
  end
55
55
 
@@ -59,7 +59,7 @@ module Asciidoctor
59
59
  next if m[:lang] == "en"
60
60
  xml.title **attr_code(language: m[:lang], format: "text/plain",
61
61
  type: type.sub(/-title/, "")) do |t|
62
- t << Asciidoctor::Standoc::Utils::asciidoc_sub(v)
62
+ t << Metanorma::Utils::asciidoc_sub(v)
63
63
  end
64
64
  end
65
65
  end
data/lib/asciidoctor/itu/isodoc.rng CHANGED
@@ -102,7 +102,7 @@
102
102
  </attribute>
103
103
  </optional>
104
104
  <oneOrMore>
105
- <ref name="li"/>
105
+ <ref name="ul_li"/>
106
106
  </oneOrMore>
107
107
  <zeroOrMore>
108
108
  <ref name="note"/>
@@ -789,6 +789,9 @@
789
789
  <attribute name="width"/>
790
790
  </element>
791
791
  </define>
792
+ <define name="BibItemType" combine="choice">
793
+ <value>internal</value>
794
+ </define>
792
795
  <define name="TextElement" combine="choice">
793
796
  <ref name="concept"/>
794
797
  </define>
@@ -809,6 +812,8 @@
809
812
  <ref name="requirement"/>
810
813
  <ref name="recommendation"/>
811
814
  <ref name="permission"/>
815
+ <ref name="imagemap"/>
816
+ <ref name="svgmap"/>
812
817
  </choice>
813
818
  </define>
814
819
  <define name="bibliography">
@@ -914,6 +919,9 @@
914
919
  </choice>
915
920
  </attribute>
916
921
  <ref name="bibdata"/>
922
+ <optional>
923
+ <ref name="misccontainer"/>
924
+ </optional>
917
925
  <optional>
918
926
  <ref name="boilerplate"/>
919
927
  </optional>
@@ -924,11 +932,21 @@
924
932
  <zeroOrMore>
925
933
  <ref name="annex"/>
926
934
  </zeroOrMore>
935
+ <optional>
936
+ <ref name="bibliography"/>
937
+ </optional>
927
938
  <zeroOrMore>
928
- <ref name="references"/>
939
+ <ref name="indexsect"/>
929
940
  </zeroOrMore>
930
941
  </element>
931
942
  </define>
943
+ <define name="misccontainer">
944
+ <element name="misc-container">
945
+ <oneOrMore>
946
+ <ref name="AnyElement"/>
947
+ </oneOrMore>
948
+ </element>
949
+ </define>
932
950
  <define name="preface">
933
951
  <element name="preface">
934
952
  <oneOrMore>
@@ -952,6 +970,11 @@
952
970
  <ref name="Content-Section"/>
953
971
  </element>
954
972
  </define>
973
+ <define name="indexsect">
974
+ <element name="indexsect">
975
+ <ref name="Content-Section"/>
976
+ </element>
977
+ </define>
955
978
  <define name="boilerplate">
956
979
  <element name="boilerplate">
957
980
  <optional>
@@ -1632,4 +1655,87 @@
1632
1655
  <text/>
1633
1656
  </element>
1634
1657
  </define>
1658
+ <define name="imagemap">
1659
+ <element name="imagemap">
1660
+ <ref name="figure"/>
1661
+ <zeroOrMore>
1662
+ <element name="area">
1663
+ <attribute name="type">
1664
+ <choice>
1665
+ <value>rect</value>
1666
+ <value>circle</value>
1667
+ <value>ellipse</value>
1668
+ <value>poly</value>
1669
+ </choice>
1670
+ </attribute>
1671
+ <choice>
1672
+ <ref name="xref"/>
1673
+ <ref name="hyperlink"/>
1674
+ <ref name="eref"/>
1675
+ </choice>
1676
+ <oneOrMore>
1677
+ <element name="coords">
1678
+ <attribute name="x">
1679
+ <data type="float"/>
1680
+ </attribute>
1681
+ <attribute name="y">
1682
+ <data type="float"/>
1683
+ </attribute>
1684
+ </element>
1685
+ </oneOrMore>
1686
+ <optional>
1687
+ <element name="radius">
1688
+ <attribute name="x">
1689
+ <data type="float"/>
1690
+ </attribute>
1691
+ <optional>
1692
+ <attribute name="y">
1693
+ <data type="float"/>
1694
+ </attribute>
1695
+ </optional>
1696
+ </element>
1697
+ </optional>
1698
+ </element>
1699
+ </zeroOrMore>
1700
+ </element>
1701
+ </define>
1702
+ <define name="svgmap">
1703
+ <element name="svgmap">
1704
+ <ref name="figure"/>
1705
+ <zeroOrMore>
1706
+ <element name="target">
1707
+ <attribute name="href">
1708
+ <data type="anyURI"/>
1709
+ </attribute>
1710
+ <choice>
1711
+ <ref name="xref"/>
1712
+ <ref name="hyperlink"/>
1713
+ <ref name="eref"/>
1714
+ </choice>
1715
+ </element>
1716
+ </zeroOrMore>
1717
+ </element>
1718
+ </define>
1719
+ <define name="ul_li">
1720
+ <element name="li">
1721
+ <optional>
1722
+ <attribute name="id">
1723
+ <data type="ID"/>
1724
+ </attribute>
1725
+ </optional>
1726
+ <optional>
1727
+ <attribute name="uncheckedcheckbox">
1728
+ <data type="boolean"/>
1729
+ </attribute>
1730
+ </optional>
1731
+ <optional>
1732
+ <attribute name="checkedcheckbox">
1733
+ <data type="boolean"/>
1734
+ </attribute>
1735
+ </optional>
1736
+ <oneOrMore>
1737
+ <ref name="BasicBlock"/>
1738
+ </oneOrMore>
1739
+ </element>
1740
+ </define>
1635
1741
  </grammar>
data/lib/asciidoctor/itu/itu.rng CHANGED
@@ -386,6 +386,9 @@
386
386
  <zeroOrMore>
387
387
  <ref name="termdocsource"/>
388
388
  </zeroOrMore>
389
+ <optional>
390
+ <ref name="misccontainer"/>
391
+ </optional>
389
392
  <optional>
390
393
  <ref name="boilerplate"/>
391
394
  </optional>
@@ -397,6 +400,9 @@
397
400
  <ref name="annex"/>
398
401
  </zeroOrMore>
399
402
  <ref name="bibliography"/>
403
+ <zeroOrMore>
404
+ <ref name="indexsect"/>
405
+ </zeroOrMore>
400
406
  </element>
401
407
  </define>
402
408
  </grammar>
data/lib/asciidoctor/itu/validate.rb CHANGED
@@ -97,7 +97,7 @@ module Asciidoctor
97
97
 
98
98
  def itu_identifier_validate(xmldoc)
99
99
  s = xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
100
- /^ITU-[RTF] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
100
+ /^ITU-[RTD] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
101
101
  @log.add("Style", nil, "#{x.text} does not match ITU document "\
102
102
  "identifier conventions")
103
103
  end
data/lib/isodoc/itu/base_convert.rb CHANGED
@@ -32,6 +32,11 @@ module IsoDoc
32
32
  " &ndash; "
33
33
  end
34
34
 
35
+ def para_class(node)
36
+ return "supertitle" if node["class"] == "supertitle"
37
+ super
38
+ end
39
+
35
40
  def ol_depth(node)
36
41
  return super unless node["class"] == "steps" or
37
42
  node.at(".//ancestor::xmlns:ol[@class = 'steps']")
data/lib/isodoc/itu/html/header.html CHANGED
@@ -115,7 +115,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
115
115
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
116
116
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
117
117
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
118
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% 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>
118
+ 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>
119
119
  </div>
120
120
 
121
121
  <div style='mso-element:footer' id=ef2l>
@@ -127,11 +127,11 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
127
127
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
128
128
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
129
129
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
130
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% 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>
130
+ 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>
131
131
  </div>
132
132
 
133
133
  <div style='mso-element:footer' id=f2>
134
- <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 }} {{ docnumber}}{% 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 %}
134
+ <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 %}
135
135
  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
136
136
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
137
137
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
@@ -142,7 +142,7 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
142
142
  </div>
143
143
 
144
144
  <div style='mso-element:footer' id=f2l>
145
- <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 }} {{ docnumber}}{% 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 %}
145
+ <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 %}
146
146
  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
147
147
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
148
148
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
@@ -161,7 +161,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
161
161
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
162
162
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
163
163
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
164
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% 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>
164
+ 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>
165
165
  </div>
166
166
 
167
167
  <div style='mso-element:footer' id=ef3l>
@@ -173,11 +173,11 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
173
173
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
174
174
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
175
175
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
176
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% 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>
176
+ 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>
177
177
  </div>
178
178
 
179
179
  <div style='mso-element:footer' id=f3>
180
- <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 }} {{ docnumber}}{% 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 %}
180
+ <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 %}
181
181
  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
182
182
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
183
183
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
@@ -188,7 +188,7 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
188
188
  </div>
189
189
 
190
190
  <div style='mso-element:footer' id=f3l>
191
- <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 }} {{ docnumber}}{% 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 %}
191
+ <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 %}
192
192
  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
193
193
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
194
194
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span