metanorma-ribose 1.6.13 → 1.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +11 -44
- data/.gitignore +2 -0
- data/.rubocop.yml +6 -2
- data/lib/asciidoctor/ribose/biblio.rng +4 -6
- data/lib/asciidoctor/ribose/boilerplate.xml +6 -6
- data/lib/asciidoctor/ribose/isodoc.rng +172 -3
- data/lib/asciidoctor/ribose/rsd.rng +6 -0
- data/lib/isodoc/ribose/html/header.html +10 -10
- data/lib/isodoc/ribose/html/html_rsd_titlepage.html +6 -6
- data/lib/isodoc/ribose/html/htmlstyle.css +7 -0
- data/lib/isodoc/ribose/html/word_rsd_intro.html +1 -1
- data/lib/isodoc/ribose/pdf_convert.rb +3 -4
- data/lib/isodoc/ribose/{rsd.standard.xsl → ribose.standard.xsl} +587 -129
- data/lib/metanorma/ribose/version.rb +1 -1
- data/metanorma-ribose.gemspec +3 -3
- metadata +11 -11
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 925018e056fa43a11378e6b304090504f13d5042254583ac4c4953f418f8ac40
|
4
|
+
data.tar.gz: 80308a8aa53fe8110b8e8d5367b75f8bb367410a459d3b971d8765e296881366
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 39f6df5375f989766daf8e1f95bfb51138c38bdec2c9ecc2d6f89c33aa132741b158adfb520a4c832e97ce700c7f6f5e75b8945729a0dde73bd2088028a26e71
|
7
|
+
data.tar.gz: d4dc7b1a585cbb029e2fe7273c42cb175bd0c6230aa84d0525bb89bb2281fec63771a6c12e5dd696f87cc51242255b960812ec935a5d90b849ac4868db194ad1
|
data/.github/workflows/rake.yml
CHANGED
@@ -16,17 +16,17 @@ 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: '
|
23
|
+
- ruby: '3.0'
|
24
24
|
os: 'ubuntu-latest'
|
25
25
|
experimental: true
|
26
|
-
- ruby: '
|
26
|
+
- ruby: '3.0'
|
27
27
|
os: 'windows-latest'
|
28
28
|
experimental: true
|
29
|
-
- ruby: '
|
29
|
+
- ruby: '3.0'
|
30
30
|
os: 'macos-latest'
|
31
31
|
experimental: true
|
32
32
|
steps:
|
@@ -35,52 +35,19 @@ jobs:
|
|
35
35
|
- uses: ruby/setup-ruby@v1
|
36
36
|
with:
|
37
37
|
ruby-version: ${{ matrix.ruby }}
|
38
|
+
bundler-cache: true
|
38
39
|
|
39
|
-
-
|
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
|
51
|
-
|
52
|
-
- name: install plantuml ubuntu
|
53
|
-
if: matrix.os == 'ubuntu-latest'
|
54
|
-
uses: nick-invision/retry@v1
|
55
|
-
with:
|
56
|
-
polling_interval_seconds: 5
|
57
|
-
timeout_minutes: 5
|
58
|
-
max_attempts: 3
|
59
|
-
command: >
|
60
|
-
sudo apt-get update -y && sudo bash -c
|
61
|
-
"curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
|
62
|
-
|
63
|
-
- if: matrix.os == 'macos-latest'
|
64
|
-
run: brew install plantuml
|
65
|
-
|
66
|
-
- if: matrix.os == 'windows-latest'
|
67
|
-
run: cinst -y plantuml
|
68
|
-
|
69
|
-
- if: matrix.os == 'macos-latest'
|
70
|
-
run: brew install autoconf automake libtool
|
40
|
+
- uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
|
71
41
|
|
72
42
|
- run: bundle exec rake
|
73
43
|
|
74
44
|
tests-passed:
|
75
45
|
needs: rake
|
76
46
|
runs-on: ubuntu-latest
|
77
|
-
continue-on-error: true
|
78
47
|
steps:
|
79
|
-
-
|
80
|
-
uses: Sibz/github-status-action@v1
|
48
|
+
- uses: peter-evans/repository-dispatch@v1
|
81
49
|
with:
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
sha: ${{ github.event.pull_request.head.sha || github.sha }}
|
50
|
+
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
51
|
+
repository: ${{ github.repository }}
|
52
|
+
event-type: notify
|
53
|
+
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.gitignore
CHANGED
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
|
-
|
10
|
+
DisplayCopNames: false
|
11
|
+
StyleGuideCopsOnly: false
|
12
|
+
TargetRubyVersion: 2.4
|
9
13
|
Rails:
|
10
14
|
Enabled: true
|
@@ -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-
|
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
|
-
<
|
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>
|
1107
|
+
<value>cites</value>
|
1110
1108
|
<value>isCitedIn</value>
|
1111
1109
|
</choice>
|
1112
1110
|
</define>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<boilerplate>
|
2
2
|
<copyright-statement>
|
3
3
|
<clause>
|
4
|
-
<p> ©
|
4
|
+
<p> © {{ publisher }} {{ docyear }}</p>
|
5
5
|
</clause>
|
6
6
|
</copyright-statement>
|
7
7
|
{% if unpublished %}
|
@@ -31,15 +31,15 @@
|
|
31
31
|
<feedback-statement>
|
32
32
|
<clause>
|
33
33
|
<p align="left" id="boilerplate-name">
|
34
|
-
Ribose Group Inc.
|
34
|
+
{% if publisher %}{{ publisher }}{% else %}Ribose Group Inc.{% endif %}
|
35
35
|
</p>
|
36
|
-
<p align="left" id="boilerplate-address">Suite 1, 8/F, New Henry House<br/>
|
36
|
+
<p align="left" id="boilerplate-address">{% if pub_address %}{{ pub_address }}{% else %}Suite 1, 8/F, New Henry House<br/>
|
37
37
|
10 Ice House Street<br/>
|
38
38
|
Central<br/>
|
39
|
-
Hong Kong<br/>
|
39
|
+
Hong Kong{% endif %}<br/>
|
40
40
|
<br />
|
41
|
-
<link target="mailto:copyright@ribose.com">copyright@ribose.com</link
|
42
|
-
<link target="https://www.ribose.com">www.ribose.com</link>
|
41
|
+
{% if pub_email %}<link target="mailto:{{ pub_email }}">{{ pub_email }}</link>{% else %}<link target="mailto:copyright@ribose.com">copyright@ribose.com</link>{% endif %}<br />
|
42
|
+
{% if pub_uri %}<link target="{{ pub_uri }}">{{ pub_uri }}</link>{% else %}<link target="https://www.ribose.com">www.ribose.com</link>{% endif %}
|
43
43
|
</p>
|
44
44
|
</clause>
|
45
45
|
</feedback-statement>
|
@@ -86,6 +86,35 @@
|
|
86
86
|
<text/>
|
87
87
|
</element>
|
88
88
|
</define>
|
89
|
+
<define name="erefType">
|
90
|
+
<optional>
|
91
|
+
<attribute name="normative">
|
92
|
+
<data type="boolean"/>
|
93
|
+
</attribute>
|
94
|
+
</optional>
|
95
|
+
<attribute name="citeas"/>
|
96
|
+
<attribute name="type">
|
97
|
+
<ref name="ReferenceFormat"/>
|
98
|
+
</attribute>
|
99
|
+
<optional>
|
100
|
+
<attribute name="alt"/>
|
101
|
+
</optional>
|
102
|
+
<optional>
|
103
|
+
<attribute name="case">
|
104
|
+
<choice>
|
105
|
+
<value>capital</value>
|
106
|
+
<value>lowercase</value>
|
107
|
+
</choice>
|
108
|
+
</attribute>
|
109
|
+
</optional>
|
110
|
+
<optional>
|
111
|
+
<attribute name="droploc">
|
112
|
+
<data type="boolean"/>
|
113
|
+
</attribute>
|
114
|
+
</optional>
|
115
|
+
<ref name="CitationType"/>
|
116
|
+
<text/>
|
117
|
+
</define>
|
89
118
|
<define name="ul">
|
90
119
|
<element name="ul">
|
91
120
|
<attribute name="id">
|
@@ -102,7 +131,7 @@
|
|
102
131
|
</attribute>
|
103
132
|
</optional>
|
104
133
|
<oneOrMore>
|
105
|
-
<ref name="
|
134
|
+
<ref name="ul_li"/>
|
106
135
|
</oneOrMore>
|
107
136
|
<zeroOrMore>
|
108
137
|
<ref name="note"/>
|
@@ -775,6 +804,78 @@
|
|
775
804
|
<ref name="paragraph"/>
|
776
805
|
</element>
|
777
806
|
</define>
|
807
|
+
<define name="em">
|
808
|
+
<element name="em">
|
809
|
+
<zeroOrMore>
|
810
|
+
<choice>
|
811
|
+
<ref name="PureTextElement"/>
|
812
|
+
<ref name="stem"/>
|
813
|
+
<ref name="index"/>
|
814
|
+
</choice>
|
815
|
+
</zeroOrMore>
|
816
|
+
</element>
|
817
|
+
</define>
|
818
|
+
<define name="strong">
|
819
|
+
<element name="strong">
|
820
|
+
<zeroOrMore>
|
821
|
+
<choice>
|
822
|
+
<ref name="PureTextElement"/>
|
823
|
+
<ref name="stem"/>
|
824
|
+
<ref name="index"/>
|
825
|
+
</choice>
|
826
|
+
</zeroOrMore>
|
827
|
+
</element>
|
828
|
+
</define>
|
829
|
+
<define name="tt">
|
830
|
+
<element name="tt">
|
831
|
+
<zeroOrMore>
|
832
|
+
<choice>
|
833
|
+
<ref name="PureTextElement"/>
|
834
|
+
<ref name="index"/>
|
835
|
+
</choice>
|
836
|
+
</zeroOrMore>
|
837
|
+
</element>
|
838
|
+
</define>
|
839
|
+
<define name="keyword">
|
840
|
+
<element name="keyword">
|
841
|
+
<zeroOrMore>
|
842
|
+
<choice>
|
843
|
+
<ref name="PureTextElement"/>
|
844
|
+
<ref name="index"/>
|
845
|
+
</choice>
|
846
|
+
</zeroOrMore>
|
847
|
+
</element>
|
848
|
+
</define>
|
849
|
+
<define name="strike">
|
850
|
+
<element name="strike">
|
851
|
+
<zeroOrMore>
|
852
|
+
<choice>
|
853
|
+
<ref name="PureTextElement"/>
|
854
|
+
<ref name="index"/>
|
855
|
+
</choice>
|
856
|
+
</zeroOrMore>
|
857
|
+
</element>
|
858
|
+
</define>
|
859
|
+
<define name="underline">
|
860
|
+
<element name="underline">
|
861
|
+
<zeroOrMore>
|
862
|
+
<choice>
|
863
|
+
<ref name="PureTextElement"/>
|
864
|
+
<ref name="index"/>
|
865
|
+
</choice>
|
866
|
+
</zeroOrMore>
|
867
|
+
</element>
|
868
|
+
</define>
|
869
|
+
<define name="smallcap">
|
870
|
+
<element name="smallcap">
|
871
|
+
<zeroOrMore>
|
872
|
+
<choice>
|
873
|
+
<ref name="PureTextElement"/>
|
874
|
+
<ref name="index"/>
|
875
|
+
</choice>
|
876
|
+
</zeroOrMore>
|
877
|
+
</element>
|
878
|
+
</define>
|
778
879
|
</include>
|
779
880
|
<!-- end overrides -->
|
780
881
|
<define name="colgroup">
|
@@ -793,7 +894,35 @@
|
|
793
894
|
<value>internal</value>
|
794
895
|
</define>
|
795
896
|
<define name="TextElement" combine="choice">
|
796
|
-
<
|
897
|
+
<choice>
|
898
|
+
<ref name="concept"/>
|
899
|
+
<ref name="add"/>
|
900
|
+
<ref name="del"/>
|
901
|
+
</choice>
|
902
|
+
</define>
|
903
|
+
<define name="add">
|
904
|
+
<element name="add">
|
905
|
+
<choice>
|
906
|
+
<ref name="PureTextElement"/>
|
907
|
+
<ref name="eref"/>
|
908
|
+
<ref name="stem"/>
|
909
|
+
<ref name="keyword"/>
|
910
|
+
<ref name="xref"/>
|
911
|
+
<ref name="hyperlink"/>
|
912
|
+
</choice>
|
913
|
+
</element>
|
914
|
+
</define>
|
915
|
+
<define name="del">
|
916
|
+
<element name="del">
|
917
|
+
<choice>
|
918
|
+
<ref name="PureTextElement"/>
|
919
|
+
<ref name="eref"/>
|
920
|
+
<ref name="stem"/>
|
921
|
+
<ref name="keyword"/>
|
922
|
+
<ref name="xref"/>
|
923
|
+
<ref name="hyperlink"/>
|
924
|
+
</choice>
|
925
|
+
</element>
|
797
926
|
</define>
|
798
927
|
<define name="concept">
|
799
928
|
<element name="concept">
|
@@ -919,6 +1048,9 @@
|
|
919
1048
|
</choice>
|
920
1049
|
</attribute>
|
921
1050
|
<ref name="bibdata"/>
|
1051
|
+
<optional>
|
1052
|
+
<ref name="misccontainer"/>
|
1053
|
+
</optional>
|
922
1054
|
<optional>
|
923
1055
|
<ref name="boilerplate"/>
|
924
1056
|
</optional>
|
@@ -929,11 +1061,21 @@
|
|
929
1061
|
<zeroOrMore>
|
930
1062
|
<ref name="annex"/>
|
931
1063
|
</zeroOrMore>
|
1064
|
+
<optional>
|
1065
|
+
<ref name="bibliography"/>
|
1066
|
+
</optional>
|
932
1067
|
<zeroOrMore>
|
933
|
-
<ref name="
|
1068
|
+
<ref name="indexsect"/>
|
934
1069
|
</zeroOrMore>
|
935
1070
|
</element>
|
936
1071
|
</define>
|
1072
|
+
<define name="misccontainer">
|
1073
|
+
<element name="misc-container">
|
1074
|
+
<oneOrMore>
|
1075
|
+
<ref name="AnyElement"/>
|
1076
|
+
</oneOrMore>
|
1077
|
+
</element>
|
1078
|
+
</define>
|
937
1079
|
<define name="preface">
|
938
1080
|
<element name="preface">
|
939
1081
|
<oneOrMore>
|
@@ -957,6 +1099,11 @@
|
|
957
1099
|
<ref name="Content-Section"/>
|
958
1100
|
</element>
|
959
1101
|
</define>
|
1102
|
+
<define name="indexsect">
|
1103
|
+
<element name="indexsect">
|
1104
|
+
<ref name="Content-Section"/>
|
1105
|
+
</element>
|
1106
|
+
</define>
|
960
1107
|
<define name="boilerplate">
|
961
1108
|
<element name="boilerplate">
|
962
1109
|
<optional>
|
@@ -1698,4 +1845,26 @@
|
|
1698
1845
|
</zeroOrMore>
|
1699
1846
|
</element>
|
1700
1847
|
</define>
|
1848
|
+
<define name="ul_li">
|
1849
|
+
<element name="li">
|
1850
|
+
<optional>
|
1851
|
+
<attribute name="id">
|
1852
|
+
<data type="ID"/>
|
1853
|
+
</attribute>
|
1854
|
+
</optional>
|
1855
|
+
<optional>
|
1856
|
+
<attribute name="uncheckedcheckbox">
|
1857
|
+
<data type="boolean"/>
|
1858
|
+
</attribute>
|
1859
|
+
</optional>
|
1860
|
+
<optional>
|
1861
|
+
<attribute name="checkedcheckbox">
|
1862
|
+
<data type="boolean"/>
|
1863
|
+
</attribute>
|
1864
|
+
</optional>
|
1865
|
+
<oneOrMore>
|
1866
|
+
<ref name="BasicBlock"/>
|
1867
|
+
</oneOrMore>
|
1868
|
+
</element>
|
1869
|
+
</define>
|
1701
1870
|
</grammar>
|
@@ -70,6 +70,9 @@
|
|
70
70
|
<zeroOrMore>
|
71
71
|
<ref name="termdocsource"/>
|
72
72
|
</zeroOrMore>
|
73
|
+
<optional>
|
74
|
+
<ref name="misccontainer"/>
|
75
|
+
</optional>
|
73
76
|
<optional>
|
74
77
|
<ref name="boilerplate"/>
|
75
78
|
</optional>
|
@@ -81,6 +84,9 @@
|
|
81
84
|
<ref name="annex"/>
|
82
85
|
</zeroOrMore>
|
83
86
|
<ref name="bibliography"/>
|
87
|
+
<zeroOrMore>
|
88
|
+
<ref name="indexsect"/>
|
89
|
+
</zeroOrMore>
|
84
90
|
</element>
|
85
91
|
</define>
|
86
92
|
</grammar>
|
@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>RR {{ docnumber }}:{{ docyea
|
|
74
74
|
|
75
75
|
<p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
|
76
76
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
|
77
|
-
|
77
|
+
{{ publisher }} {{ docyear }} – All rights reserved</span><span lang=EN-GB
|
78
78
|
style='font-weight:normal'><o:p></o:p></span></p>
|
79
79
|
|
80
80
|
</div>
|
@@ -93,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
93
93
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
94
94
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
95
95
|
style='mso-tab-count:1'> </span>©
|
96
|
-
|
96
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
97
97
|
|
98
98
|
</div>
|
99
99
|
|
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
129
129
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
130
130
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
131
131
|
1'> </span>©
|
132
|
-
|
132
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
133
133
|
</div>
|
134
134
|
|
135
135
|
<div style='mso-element:footer' id=ef2l>
|
@@ -144,12 +144,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
144
144
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
145
145
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
146
146
|
1'> </span>©
|
147
|
-
|
147
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
148
148
|
</div>
|
149
149
|
|
150
150
|
<div style='mso-element:footer' id=f2>
|
151
151
|
<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
|
152
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
152
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
153
153
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
154
154
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
155
155
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
@@ -163,7 +163,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
|
|
163
163
|
|
164
164
|
<div style='mso-element:footer' id=f2l>
|
165
165
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
166
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
166
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
167
167
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
168
168
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
169
169
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
@@ -188,7 +188,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
188
188
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
189
189
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
190
190
|
style='mso-tab-count:1'> </span>©
|
191
|
-
|
191
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
192
192
|
</div>
|
193
193
|
|
194
194
|
<div style='mso-element:footer' id=ef3l>
|
@@ -204,12 +204,12 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
204
204
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
205
205
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
206
206
|
style='mso-tab-count:1'> </span>©
|
207
|
-
|
207
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
208
208
|
</div>
|
209
209
|
|
210
210
|
<div style='mso-element:footer' id=f3>
|
211
211
|
<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
|
212
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
212
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
213
213
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
214
214
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
215
215
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|
@@ -224,7 +224,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
|
|
224
224
|
|
225
225
|
<div style='mso-element:footer' id=f3l>
|
226
226
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
227
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
227
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
228
228
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
229
229
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
230
230
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|