metanorma-un 0.5.4 → 0.5.9
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 +62 -0
- data/README.adoc +2 -4
- data/lib/asciidoctor/un/basicdoc.rng +32 -0
- data/lib/asciidoctor/un/boilerplate.xml +7 -5
- data/lib/asciidoctor/un/isodoc.rng +29 -44
- data/lib/isodoc/un/html/html_unece_plenary_titlepage.html +17 -1
- data/lib/isodoc/un/html/html_unece_titlepage.html +20 -1
- data/lib/isodoc/un/html/htmlstyle.css +11 -4
- data/lib/isodoc/un/html/htmlstyle.scss +6 -2
- data/lib/isodoc/un/html/unece.css +19 -20
- data/lib/isodoc/un/html/unece.scss +19 -20
- data/lib/isodoc/un/html/word_unece_plenary_titlepage.html +17 -1
- data/lib/isodoc/un/html/word_unece_titlepage.html +17 -1
- data/lib/isodoc/un/html/wordstyle.css +17 -17
- data/lib/isodoc/un/html/wordstyle.scss +17 -17
- data/lib/isodoc/un/html_convert.rb +3 -1
- data/lib/isodoc/un/i18n-en.yaml +1 -0
- data/lib/isodoc/un/pdf_convert.rb +2 -2
- data/lib/isodoc/un/presentation_xml_convert.rb +1 -0
- data/lib/isodoc/un/un.plenary-attachment.xsl +471 -82
- data/lib/isodoc/un/un.plenary.xsl +471 -82
- data/lib/isodoc/un/un.recommendation.xsl +444 -86
- data/lib/isodoc/un/word_convert.rb +5 -1
- data/lib/isodoc/un/xref.rb +4 -4
- data/lib/metanorma/un/fonts_manifest.yaml +6 -0
- data/lib/metanorma/un/processor.rb +0 -8
- data/lib/metanorma/un/version.rb +1 -1
- data/metanorma-unece.gemspec +1 -1
- metadata +6 -7
- data/.github/workflows/macos.yml +0 -38
- data/.github/workflows/ubuntu.yml +0 -56
- data/.github/workflows/windows.yml +0 -40
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d2ace1a52aae154584b20d0cfd1ad6c406e8e03fe94d05f0856c1bee51a3f4e9
|
|
4
|
+
data.tar.gz: 343c07319b3614aae5dc670b758a673e0e9e9e23dc85479456f728cdb6b53fdc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 385e51a5b3b7370c9e87dad6da2c2af529933dced215d9f53ddc56729c35f08fbf4ad91836efad4cf078cb58d800c1018e12bba81040f2e6ff1ba320d64415b4
|
|
7
|
+
data.tar.gz: 9a43c038e94d2974ab446513729b774a169b49220414e7d5db74fc18dc63902b57c08bcbd673d30c1b4cde878399a66233a04b5c90b7a2ae03c0157a6bf091ea
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
|
+
name: rake
|
|
4
|
+
|
|
5
|
+
on:
|
|
6
|
+
push:
|
|
7
|
+
branches: [ master, main ]
|
|
8
|
+
tags: [ v* ]
|
|
9
|
+
pull_request:
|
|
10
|
+
|
|
11
|
+
jobs:
|
|
12
|
+
rake:
|
|
13
|
+
name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
|
|
14
|
+
runs-on: ${{ matrix.os }}
|
|
15
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
16
|
+
strategy:
|
|
17
|
+
fail-fast: false
|
|
18
|
+
matrix:
|
|
19
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
20
|
+
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
|
+
experimental: [ false ]
|
|
22
|
+
include:
|
|
23
|
+
- ruby: '2.7'
|
|
24
|
+
os: 'ubuntu-latest'
|
|
25
|
+
experimental: true
|
|
26
|
+
- ruby: '2.7'
|
|
27
|
+
os: 'windows-latest'
|
|
28
|
+
experimental: true
|
|
29
|
+
- ruby: '2.7'
|
|
30
|
+
os: 'macos-latest'
|
|
31
|
+
experimental: true
|
|
32
|
+
steps:
|
|
33
|
+
- uses: actions/checkout@master
|
|
34
|
+
|
|
35
|
+
- uses: ruby/setup-ruby@v1
|
|
36
|
+
with:
|
|
37
|
+
ruby-version: ${{ matrix.ruby }}
|
|
38
|
+
|
|
39
|
+
- uses: actions/cache@v2
|
|
40
|
+
with:
|
|
41
|
+
path: vendor/bundle
|
|
42
|
+
key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
|
|
43
|
+
restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
|
|
44
|
+
|
|
45
|
+
- run: bundle config set path 'vendor/bundle'
|
|
46
|
+
|
|
47
|
+
- run: bundle install --jobs 4 --retry 3
|
|
48
|
+
|
|
49
|
+
- run: bundle exec rake
|
|
50
|
+
|
|
51
|
+
tests-passed:
|
|
52
|
+
needs: rake
|
|
53
|
+
runs-on: ubuntu-latest
|
|
54
|
+
steps:
|
|
55
|
+
- name: Trigger tests passed event
|
|
56
|
+
uses: Sibz/github-status-action@v1
|
|
57
|
+
with:
|
|
58
|
+
authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
59
|
+
context: 'tests-passed-successfully'
|
|
60
|
+
description: 'Tests passed successfully'
|
|
61
|
+
state: 'success'
|
|
62
|
+
sha: ${{ github.event.pull_request.head.sha || github.sha }}
|
data/README.adoc
CHANGED
|
@@ -3,16 +3,14 @@
|
|
|
3
3
|
(Formerly known as metanorma-unece)
|
|
4
4
|
|
|
5
5
|
image:https://img.shields.io/gem/v/metanorma-un.svg["Gem Version", link="https://rubygems.org/gems/metanorma-un"]::
|
|
6
|
-
image:https://github.com/metanorma/metanorma-un/workflows/
|
|
7
|
-
image:https://github.com/metanorma/metanorma-un/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-un/actions?workflow=windows"]
|
|
8
|
-
image:https://github.com/metanorma/metanorma-un/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/metanorma/metanorma-un/actions?workflow=ubuntu"]
|
|
6
|
+
image:https://github.com/metanorma/metanorma-un/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-un/actions?workflow=rake"]
|
|
9
7
|
image:https://codeclimate.com/github/metanorma/metanorma-unece/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-unece"]
|
|
10
8
|
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-un.svg["Pull Requests", link="https://github.com/metanorma/metanorma-un/pulls"]
|
|
11
9
|
image:https://img.shields.io/github/commits-since/metanorma/metanorma-un/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-un/releases"]
|
|
12
10
|
|
|
13
11
|
== Functionality
|
|
14
12
|
|
|
15
|
-
This gem processes
|
|
13
|
+
This gem processes https://www.metanorma.com/[Metanorma documents] following
|
|
16
14
|
a template for generating UN International Standards.
|
|
17
15
|
|
|
18
16
|
The gem currently inherits from the https://github.com/metanorma/metanorma-standoc[Metanorma-Standoc]
|
|
@@ -596,6 +596,7 @@
|
|
|
596
596
|
<ref name="bookmark"/>
|
|
597
597
|
<ref name="image"/>
|
|
598
598
|
<ref name="index"/>
|
|
599
|
+
<ref name="index-xref"/>
|
|
599
600
|
</choice>
|
|
600
601
|
</define>
|
|
601
602
|
<define name="PureTextElement">
|
|
@@ -737,6 +738,37 @@
|
|
|
737
738
|
</optional>
|
|
738
739
|
</element>
|
|
739
740
|
</define>
|
|
741
|
+
<define name="index-xref">
|
|
742
|
+
<element name="index-xref">
|
|
743
|
+
<attribute name="also">
|
|
744
|
+
<data type="boolean"/>
|
|
745
|
+
</attribute>
|
|
746
|
+
<element name="primary">
|
|
747
|
+
<oneOrMore>
|
|
748
|
+
<ref name="PureTextElement"/>
|
|
749
|
+
</oneOrMore>
|
|
750
|
+
</element>
|
|
751
|
+
<optional>
|
|
752
|
+
<element name="secondary">
|
|
753
|
+
<oneOrMore>
|
|
754
|
+
<ref name="PureTextElement"/>
|
|
755
|
+
</oneOrMore>
|
|
756
|
+
</element>
|
|
757
|
+
</optional>
|
|
758
|
+
<optional>
|
|
759
|
+
<element name="tertiary">
|
|
760
|
+
<oneOrMore>
|
|
761
|
+
<ref name="PureTextElement"/>
|
|
762
|
+
</oneOrMore>
|
|
763
|
+
</element>
|
|
764
|
+
</optional>
|
|
765
|
+
<element name="target">
|
|
766
|
+
<oneOrMore>
|
|
767
|
+
<ref name="PureTextElement"/>
|
|
768
|
+
</oneOrMore>
|
|
769
|
+
</element>
|
|
770
|
+
</element>
|
|
771
|
+
</define>
|
|
740
772
|
<!-- bare ID element, used for referencing arbitrary spans of text -->
|
|
741
773
|
<define name="bookmark">
|
|
742
774
|
<element name="bookmark">
|
|
@@ -40,15 +40,17 @@
|
|
|
40
40
|
</legal-statement>
|
|
41
41
|
<feedback-statement>
|
|
42
42
|
<clause>
|
|
43
|
-
<p id="boilerplate-feedback-name">UN Economic Commission for Europe: Information Service</p>
|
|
43
|
+
<p id="boilerplate-feedback-name">{% if subdivision %}{{subdivision}}{% else %}UN Economic Commission for Europe: Information Service{% endif %}</p>
|
|
44
44
|
<p id="boilerplate-feedback-address">
|
|
45
|
+
{% if pub_address %}{{ pub_address }}{% else %}
|
|
45
46
|
Palais des Nations<br />
|
|
46
47
|
CH-1211 Geneva 10<br />
|
|
47
|
-
Switzerland<br />
|
|
48
|
+
Switzerland{% endif %}<br />
|
|
48
49
|
<br />
|
|
49
|
-
<link target="tel
|
|
50
|
-
<link target="
|
|
51
|
-
<link target="
|
|
50
|
+
<link target="tel:{% if pub_phone %}{{ pub_phone }}{% else %}+41(0)229171234{% endif %}">{% if pub_phone %}{{ pub_phone }}{% else %}+41 (0) 22 917 12 34 (switchboard){% endif %}</link><br />
|
|
51
|
+
{% if pub_fax %}<link target="tel:{{pub_fax}}">{{pub_fax}}</link><br/>{% endif %}
|
|
52
|
+
<link target="mailto:{% if pub_email %}{{ pub_email }}{% else %}unece_info@un.org{% endif %}">{% if pub_email %}{{ pub_email }}{% else %}unece_info@un.org{% endif %}</link><br />
|
|
53
|
+
<link target="{% if pub_uri %}{{pub_uri}}{% else %}https://www.unece.org/{% endif %}">{% if pub_uri %}{{pub_uri}}{% else %}www.unece.org/{% endif %}</link>
|
|
52
54
|
</p>
|
|
53
55
|
</clause>
|
|
54
56
|
</feedback-statement>
|
|
@@ -24,6 +24,14 @@
|
|
|
24
24
|
<start>
|
|
25
25
|
<ref name="standard-document"/>
|
|
26
26
|
</start>
|
|
27
|
+
<define name="doctype">
|
|
28
|
+
<element name="doctype">
|
|
29
|
+
<optional>
|
|
30
|
+
<attribute name="abbreviation"/>
|
|
31
|
+
</optional>
|
|
32
|
+
<ref name="DocumentType"/>
|
|
33
|
+
</element>
|
|
34
|
+
</define>
|
|
27
35
|
<define name="hyperlink">
|
|
28
36
|
<element name="link">
|
|
29
37
|
<attribute name="target">
|
|
@@ -42,7 +50,6 @@
|
|
|
42
50
|
</define>
|
|
43
51
|
<define name="xref">
|
|
44
52
|
<element name="xref">
|
|
45
|
-
<!-- attribute target { xsd:IDREF }, -->
|
|
46
53
|
<attribute name="target">
|
|
47
54
|
<data type="string">
|
|
48
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
@@ -142,6 +149,11 @@
|
|
|
142
149
|
<data type="boolean"/>
|
|
143
150
|
</attribute>
|
|
144
151
|
</optional>
|
|
152
|
+
<optional>
|
|
153
|
+
<attribute name="key">
|
|
154
|
+
<data type="boolean"/>
|
|
155
|
+
</attribute>
|
|
156
|
+
</optional>
|
|
145
157
|
<oneOrMore>
|
|
146
158
|
<ref name="dt"/>
|
|
147
159
|
<ref name="dd"/>
|
|
@@ -234,6 +246,9 @@
|
|
|
234
246
|
<data type="boolean"/>
|
|
235
247
|
</attribute>
|
|
236
248
|
</optional>
|
|
249
|
+
<optional>
|
|
250
|
+
<ref name="colgroup"/>
|
|
251
|
+
</optional>
|
|
237
252
|
<optional>
|
|
238
253
|
<ref name="tname"/>
|
|
239
254
|
</optional>
|
|
@@ -752,6 +767,18 @@
|
|
|
752
767
|
</define>
|
|
753
768
|
</include>
|
|
754
769
|
<!-- end overrides -->
|
|
770
|
+
<define name="colgroup">
|
|
771
|
+
<element name="colgroup">
|
|
772
|
+
<oneOrMore>
|
|
773
|
+
<ref name="col"/>
|
|
774
|
+
</oneOrMore>
|
|
775
|
+
</element>
|
|
776
|
+
</define>
|
|
777
|
+
<define name="col">
|
|
778
|
+
<element name="col">
|
|
779
|
+
<attribute name="width"/>
|
|
780
|
+
</element>
|
|
781
|
+
</define>
|
|
755
782
|
<define name="TextElement" combine="choice">
|
|
756
783
|
<ref name="concept"/>
|
|
757
784
|
</define>
|
|
@@ -1165,49 +1192,7 @@
|
|
|
1165
1192
|
</define>
|
|
1166
1193
|
<define name="annex">
|
|
1167
1194
|
<element name="annex">
|
|
1168
|
-
<
|
|
1169
|
-
<attribute name="id">
|
|
1170
|
-
<data type="ID"/>
|
|
1171
|
-
</attribute>
|
|
1172
|
-
</optional>
|
|
1173
|
-
<optional>
|
|
1174
|
-
<attribute name="language"/>
|
|
1175
|
-
</optional>
|
|
1176
|
-
<optional>
|
|
1177
|
-
<attribute name="script"/>
|
|
1178
|
-
</optional>
|
|
1179
|
-
<optional>
|
|
1180
|
-
<attribute name="inline-header">
|
|
1181
|
-
<data type="boolean"/>
|
|
1182
|
-
</attribute>
|
|
1183
|
-
</optional>
|
|
1184
|
-
<attribute name="obligation">
|
|
1185
|
-
<choice>
|
|
1186
|
-
<value>normative</value>
|
|
1187
|
-
<value>informative</value>
|
|
1188
|
-
</choice>
|
|
1189
|
-
</attribute>
|
|
1190
|
-
<optional>
|
|
1191
|
-
<ref name="section-title"/>
|
|
1192
|
-
</optional>
|
|
1193
|
-
<group>
|
|
1194
|
-
<group>
|
|
1195
|
-
<zeroOrMore>
|
|
1196
|
-
<ref name="BasicBlock"/>
|
|
1197
|
-
</zeroOrMore>
|
|
1198
|
-
<zeroOrMore>
|
|
1199
|
-
<ref name="note"/>
|
|
1200
|
-
</zeroOrMore>
|
|
1201
|
-
</group>
|
|
1202
|
-
<zeroOrMore>
|
|
1203
|
-
<choice>
|
|
1204
|
-
<ref name="annex-subsection"/>
|
|
1205
|
-
<ref name="terms"/>
|
|
1206
|
-
<ref name="definitions"/>
|
|
1207
|
-
<ref name="references"/>
|
|
1208
|
-
</choice>
|
|
1209
|
-
</zeroOrMore>
|
|
1210
|
-
</group>
|
|
1195
|
+
<ref name="Annex-Section"/>
|
|
1211
1196
|
</element>
|
|
1212
1197
|
</define>
|
|
1213
1198
|
<define name="terms">
|
|
@@ -42,8 +42,16 @@
|
|
|
42
42
|
</div>
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
|
+
{% assign fn_refs = "" | split: ',' %}
|
|
46
|
+
{% assign txt = "" %}
|
|
47
|
+
{% for item in title_footnote %}
|
|
48
|
+
{% assign txt = txt | append: "*" %}
|
|
49
|
+
{% assign txtarr = txt | split: "," %}
|
|
50
|
+
{% assign fn_refs = fn_refs | concat: txtarr %}
|
|
51
|
+
{% endfor %}
|
|
52
|
+
|
|
45
53
|
<div class="coverpage-title">
|
|
46
|
-
<span class="title-first">{{ doctitle }}</span>
|
|
54
|
+
<span class="title-first">{{ doctitle }}{% if fn_refs.size > 0 %}<sup>{{ fn_refs | join: "," }}</sup>{% endif %} </span>
|
|
47
55
|
<!--<span class="title-second">{{ docsubtitle }}</span>-->
|
|
48
56
|
</div>
|
|
49
57
|
</div>
|
|
@@ -69,6 +77,14 @@
|
|
|
69
77
|
<div class="coverpage-stage-block" >{{ revdate }}</div>
|
|
70
78
|
{% endif %}
|
|
71
79
|
|
|
80
|
+
{% if fn_refs.size > 0 %}
|
|
81
|
+
<div class="title-footnote">
|
|
82
|
+
{% for item in title_footnote %}
|
|
83
|
+
<p><sup>{{fn_refs[forloop.index0]}}</sup> {{ item }}</p>
|
|
84
|
+
{% endfor %}
|
|
85
|
+
</div>
|
|
86
|
+
{% endif %}
|
|
87
|
+
|
|
72
88
|
<div class="info-section">
|
|
73
89
|
<div class="copyright">
|
|
74
90
|
<p class="year">
|
|
@@ -22,8 +22,17 @@
|
|
|
22
22
|
<span class="docyear">{{ draftinfo }}</span>
|
|
23
23
|
</div>
|
|
24
24
|
|
|
25
|
+
|
|
26
|
+
{% assign fn_refs = "" | split: ',' %}
|
|
27
|
+
{% assign txt = "" %}
|
|
28
|
+
{% for item in title_footnote %}
|
|
29
|
+
{% assign txt = txt | append: "*" %}
|
|
30
|
+
{% assign txtarr = txt | split: "," %}
|
|
31
|
+
{% assign fn_refs = fn_refs | concat: txtarr %}
|
|
32
|
+
{% endfor %}
|
|
33
|
+
|
|
25
34
|
<div class="coverpage-title">
|
|
26
|
-
<span class="title-first">{{ doctitle }}</span>
|
|
35
|
+
<span class="title-first">{{ doctitle }}{% if fn_refs.size > 0 %}<sup>{{ fn_refs | join: "," }}</sup>{% endif %} </span>
|
|
27
36
|
<!--<span class="title-second">{{ docsubtitle }}</span>-->
|
|
28
37
|
</div>
|
|
29
38
|
</div>
|
|
@@ -57,6 +66,16 @@
|
|
|
57
66
|
<div class="coverpage-stage-block" >{{ revdate }}</div>
|
|
58
67
|
{% endif %}
|
|
59
68
|
|
|
69
|
+
{% if fn_refs.size > 0 %}
|
|
70
|
+
<div class="title-footnote">
|
|
71
|
+
{% for item in title_footnote %}
|
|
72
|
+
<p><sup>{{fn_refs[forloop.index0]}}</sup> {{ item }}</p>
|
|
73
|
+
{% endfor %}
|
|
74
|
+
</div>
|
|
75
|
+
{% endif %}
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
|
|
60
79
|
<div class="info-section">
|
|
61
80
|
<div class="copyright">
|
|
62
81
|
<p class="year">
|
|
@@ -16,7 +16,7 @@ fieldset, form, label, legend,
|
|
|
16
16
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
|
17
17
|
article, aside, canvas, details, embed,
|
|
18
18
|
figure, figcaption, footer, header, hgroup,
|
|
19
|
-
menu,
|
|
19
|
+
menu, output, ruby, section, summary,
|
|
20
20
|
time, mark, audio, video {
|
|
21
21
|
margin: 0;
|
|
22
22
|
padding: 0; }
|
|
@@ -111,6 +111,10 @@ b, strong {
|
|
|
111
111
|
div.document-stage-band, div.document-type-band {
|
|
112
112
|
background-color: #333333; }
|
|
113
113
|
|
|
114
|
+
a.FootnoteRef + a.FootnoteRef:before {
|
|
115
|
+
content: ", ";
|
|
116
|
+
vertical-align: super; }
|
|
117
|
+
|
|
114
118
|
#standard-band {
|
|
115
119
|
background-color: #0AC442; }
|
|
116
120
|
|
|
@@ -226,7 +230,7 @@ body {
|
|
|
226
230
|
margin-left: auto;
|
|
227
231
|
margin-right: auto;
|
|
228
232
|
max-width: 100%;
|
|
229
|
-
font-size:
|
|
233
|
+
font-size: {{normalfontsize}};
|
|
230
234
|
font-weight: 300;
|
|
231
235
|
line-height: 1.4em;
|
|
232
236
|
color: #333;
|
|
@@ -705,7 +709,7 @@ p.NormRef {
|
|
|
705
709
|
pre,
|
|
706
710
|
.pseudocode {
|
|
707
711
|
background-color: #f2f2f2;
|
|
708
|
-
font-size:
|
|
712
|
+
font-size: {{monospacefontsize}};
|
|
709
713
|
line-height: 1.6em;
|
|
710
714
|
padding: 1.5em;
|
|
711
715
|
margin: 2em 0 1em 0;
|
|
@@ -809,7 +813,7 @@ a.footnote-number {
|
|
|
809
813
|
vertical-align: super; }
|
|
810
814
|
|
|
811
815
|
.footnote {
|
|
812
|
-
font-size:
|
|
816
|
+
font-size: {{footnotefontsize}}; }
|
|
813
817
|
|
|
814
818
|
/*
|
|
815
819
|
3.11 Blockquotes
|
|
@@ -920,6 +924,9 @@ h2 p {
|
|
|
920
924
|
padding: 0 2em 0 3em;
|
|
921
925
|
text-align: center; }
|
|
922
926
|
|
|
927
|
+
.title-footnote {
|
|
928
|
+
text-align: left; }
|
|
929
|
+
|
|
923
930
|
.info-section {
|
|
924
931
|
padding: 0 2em; }
|
|
925
932
|
|
|
@@ -58,7 +58,7 @@ $un-admonition-color: #47430c;
|
|
|
58
58
|
$un-toc-active: #4d7ea5;
|
|
59
59
|
|
|
60
60
|
body {
|
|
61
|
-
@include bodyStyle1(
|
|
61
|
+
@include bodyStyle1($normalfontsize, 1.4em, $un-text, #ffffff, 300);
|
|
62
62
|
font-weight: 400;
|
|
63
63
|
}
|
|
64
64
|
|
|
@@ -523,7 +523,7 @@ a.footnote-number {
|
|
|
523
523
|
}
|
|
524
524
|
|
|
525
525
|
.footnote {
|
|
526
|
-
font-size:
|
|
526
|
+
font-size: $footnotefontsize;
|
|
527
527
|
}
|
|
528
528
|
|
|
529
529
|
|
|
@@ -653,6 +653,10 @@ h2 p {
|
|
|
653
653
|
text-align: center;
|
|
654
654
|
}
|
|
655
655
|
|
|
656
|
+
.title-footnote {
|
|
657
|
+
text-align: left;
|
|
658
|
+
}
|
|
659
|
+
|
|
656
660
|
.info-section {
|
|
657
661
|
padding: 0 2em;
|
|
658
662
|
}
|
|
@@ -14,7 +14,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre {
|
|
|
14
14
|
text-align: left;
|
|
15
15
|
mso-pagination: widow-orphan;
|
|
16
16
|
tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
|
|
17
|
-
font-size:
|
|
17
|
+
font-size: {{monospacefontsize}};
|
|
18
18
|
font-family: {{monospacefont}};
|
|
19
19
|
mso-fareast-font-family: Calibri;
|
|
20
20
|
mso-bidi-font-family: "Courier New";
|
|
@@ -31,7 +31,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
|
|
|
31
31
|
text-align: left;
|
|
32
32
|
mso-pagination: widow-orphan;
|
|
33
33
|
tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
|
|
34
|
-
font-size:
|
|
34
|
+
font-size: {{normalfontsize}};
|
|
35
35
|
font-family: {{bodyfont}};
|
|
36
36
|
mso-fareast-font-family: Calibri;
|
|
37
37
|
mso-bidi-font-family: "Courier New";
|
|
@@ -49,7 +49,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef {
|
|
|
49
49
|
tab-stops: 33.15pt;
|
|
50
50
|
line-height: 12.0pt;
|
|
51
51
|
mso-pagination: widow-orphan;
|
|
52
|
-
font-size:
|
|
52
|
+
font-size: {{normalfontsize}};
|
|
53
53
|
font-weight: normal;
|
|
54
54
|
font-family: {{bodyfont}};
|
|
55
55
|
mso-fareast-font-family: {{bodyfont}};
|
|
@@ -147,10 +147,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
|
|
|
147
147
|
line-height: 12.0pt;
|
|
148
148
|
mso-pagination: widow-orphan;
|
|
149
149
|
tab-stops: 20.15pt;
|
|
150
|
-
font-size:
|
|
150
|
+
font-size: {{smallerfontsize}};
|
|
151
151
|
mso-bidi-font-size: 11.0pt;
|
|
152
152
|
font-family: {{bodyfont}};
|
|
153
|
-
font-size: 10.0pt;
|
|
154
153
|
mso-fareast-font-family: {{bodyfont}};
|
|
155
154
|
mso-bidi-font-family: {{bodyfont}};
|
|
156
155
|
mso-ansi-language: EN-GB; }
|
|
@@ -415,7 +414,7 @@ p.zzCopyright, li.zzCopyright {
|
|
|
415
414
|
tab-stops: 20.15pt 25.7pt 481.15pt;
|
|
416
415
|
padding: 0cm;
|
|
417
416
|
mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
|
|
418
|
-
font-size:
|
|
417
|
+
font-size: {{normalfontsize}};
|
|
419
418
|
font-family: {{bodyfont}};
|
|
420
419
|
mso-fareast-font-family: {{bodyfont}};
|
|
421
420
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -501,7 +500,7 @@ p.Quote, li.Quote, div.Quote {
|
|
|
501
500
|
line-height: 12.0pt;
|
|
502
501
|
mso-pagination: widow-orphan;
|
|
503
502
|
tab-stops: 20.15pt;
|
|
504
|
-
font-size:
|
|
503
|
+
font-size: {{normalfontsize}};
|
|
505
504
|
font-family: {{bodyfont}};
|
|
506
505
|
mso-fareast-font-family: {{bodyfont}};
|
|
507
506
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -517,7 +516,7 @@ p.QuoteAttribution {
|
|
|
517
516
|
line-height: 12.0pt;
|
|
518
517
|
mso-pagination: widow-orphan;
|
|
519
518
|
tab-stops: 20.15pt;
|
|
520
|
-
font-size:
|
|
519
|
+
font-size: {{normalfontsize}};
|
|
521
520
|
font-family: {{bodyfont}};
|
|
522
521
|
mso-fareast-font-family: {{bodyfont}};
|
|
523
522
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -575,7 +574,7 @@ p.Formula, li.Formula, div.Formula {
|
|
|
575
574
|
line-height: 12.0pt;
|
|
576
575
|
mso-pagination: widow-orphan;
|
|
577
576
|
tab-stops: right 487.45pt;
|
|
578
|
-
font-size:
|
|
577
|
+
font-size: {{normalfontsize}};
|
|
579
578
|
font-family: {{bodyfont}};
|
|
580
579
|
mso-fareast-font-family: {{bodyfont}};
|
|
581
580
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -698,7 +697,7 @@ table.MsoISOTable, table.MsoISOTableBig {
|
|
|
698
697
|
mso-border-insideh: .75pt solid windowtext;
|
|
699
698
|
mso-border-insidev: .75pt solid windowtext;
|
|
700
699
|
margin-bottom: 12pt;
|
|
701
|
-
font-size:
|
|
700
|
+
font-size: {{smallerfontsize}};
|
|
702
701
|
font-family: {{bodyfont}}; }
|
|
703
702
|
|
|
704
703
|
table.MsoISOTable th, table.MsoISOTableBig th {
|
|
@@ -707,7 +706,7 @@ table.MsoISOTable th, table.MsoISOTableBig th {
|
|
|
707
706
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
|
708
707
|
|
|
709
708
|
table.MsoISOTable p, table.MsoISOTableBig p {
|
|
710
|
-
font-size:
|
|
709
|
+
font-size: {{smallerfontsize}}; }
|
|
711
710
|
|
|
712
711
|
table.MsoISOTable td, table.MsoISOTableBig td {
|
|
713
712
|
border: solid windowtext 1pt;
|
|
@@ -729,7 +728,7 @@ table.MsoTableGrid {
|
|
|
729
728
|
mso-para-margin-bottom: .0001pt;
|
|
730
729
|
mso-pagination: widow-orphan;
|
|
731
730
|
margin-bottom: 12pt;
|
|
732
|
-
font-size:
|
|
731
|
+
font-size: {{smallerfontsize}};
|
|
733
732
|
font-family: {{bodyfont}}; }
|
|
734
733
|
|
|
735
734
|
div.formula {
|
|
@@ -771,7 +770,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
|
|
|
771
770
|
vertical-align: super; }
|
|
772
771
|
|
|
773
772
|
aside {
|
|
774
|
-
font-size:
|
|
773
|
+
font-size: {{footnotefontsize}}; }
|
|
775
774
|
|
|
776
775
|
.example-title {
|
|
777
776
|
font-weight: bold;
|
|
@@ -789,32 +788,32 @@ div.example {
|
|
|
789
788
|
|
|
790
789
|
p.example, li.example, div.example, td.example {
|
|
791
790
|
mso-pagination: none;
|
|
792
|
-
font-size:
|
|
791
|
+
font-size: {{smallerfontsize}};
|
|
793
792
|
font-family: {{bodyfont}}; }
|
|
794
793
|
|
|
795
794
|
td.example p.MsoListParagraph {
|
|
796
|
-
font-size:
|
|
795
|
+
font-size: {{smallerfontsize}}; }
|
|
797
796
|
|
|
798
797
|
div.example p.MsoListParagraph {
|
|
799
|
-
font-size:
|
|
798
|
+
font-size: {{smallerfontsize}}; }
|
|
800
799
|
|
|
801
800
|
div.Note p.MsoListParagraph {
|
|
802
|
-
font-size:
|
|
801
|
+
font-size: {{smallerfontsize}};
|
|
803
802
|
margin-left: 1.0cm; }
|
|
804
803
|
|
|
805
804
|
div.Note span.stem {
|
|
806
|
-
font-size:
|
|
805
|
+
font-size: {{smallerfontsize}}; }
|
|
807
806
|
|
|
808
807
|
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
|
809
808
|
font-size: 8.0pt;
|
|
810
809
|
margin-left: 1.0cm; }
|
|
811
810
|
|
|
812
811
|
div.Note table.dl {
|
|
813
|
-
font-size:
|
|
812
|
+
font-size: {{smallerfontsize}};
|
|
814
813
|
margin-left: 1.0cm; }
|
|
815
814
|
|
|
816
815
|
span.note_label, span.example_label, td.example_label, td.note_label {
|
|
817
|
-
font-size:
|
|
816
|
+
font-size: {{smallerfontsize}};
|
|
818
817
|
font-family: {{bodyfont}}; }
|
|
819
818
|
|
|
820
819
|
table.dl {
|