metanorma-m3aawg 1.5.4 → 1.6.2
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/m3aawg/basicdoc.rng +32 -0
- data/lib/asciidoctor/m3aawg/converter.rb +4 -49
- data/lib/asciidoctor/m3aawg/isodoc.rng +29 -44
- data/lib/isodoc/m3aawg/base_convert.rb +2 -12
- data/lib/isodoc/m3aawg/html/htmlstyle.css +8 -4
- data/lib/isodoc/m3aawg/html/htmlstyle.scss +2 -2
- data/lib/isodoc/m3aawg/html/m3d.css +41 -41
- data/lib/isodoc/m3aawg/html/m3d.scss +41 -41
- data/lib/isodoc/m3aawg/html/wordstyle.css +31 -31
- data/lib/isodoc/m3aawg/html/wordstyle.scss +31 -31
- data/lib/isodoc/m3aawg/html_convert.rb +7 -31
- data/lib/isodoc/m3aawg/i18n.rb +3 -4
- data/lib/isodoc/m3aawg/init.rb +2 -5
- data/lib/isodoc/m3aawg/m3d.report.xsl +436 -78
- data/lib/isodoc/m3aawg/metadata.rb +5 -17
- data/lib/isodoc/m3aawg/presentation_xml_convert.rb +11 -6
- data/lib/isodoc/m3aawg/word_convert.rb +4 -35
- data/lib/isodoc/m3aawg/xref.rb +5 -0
- data/lib/metanorma/m3aawg.rb +28 -2
- data/lib/metanorma/m3aawg/fonts_manifest.yaml +5 -0
- data/lib/metanorma/m3aawg/processor.rb +4 -9
- data/lib/metanorma/m3aawg/version.rb +1 -1
- data/metanorma-m3d.gemspec +1 -2
- data/metanorma.yml +51 -0
- metadata +8 -23
- data/.github/workflows/macos.yml +0 -38
- data/.github/workflows/ubuntu.yml +0 -56
- data/.github/workflows/windows.yml +0 -40
- data/lib/asciidoctor/m3aawg/validate.rb +0 -22
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5c2e09acb297b880bb414e4ab8d3a27583d8b6e02d12f10ba20d36db3157b72f
|
|
4
|
+
data.tar.gz: 6b6395caeacba006b65d258b80ddecae051a8989bf92c19d0a73f523127e9fa5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cc7fa5298b88fc633b802e1ad873db706dec4f9c2d15a6932937206e88403a693dcc4b4afd94d564541cb7f0647f614580888473d0f44cb05c6dca92e62c8540
|
|
7
|
+
data.tar.gz: 2daf22dedf4b18319c873efa2a495f338e3f88dc4ca6cd2baaeca592990d95d8f9530558d156b185b162758ab3f1d6103e36b3668e2a299fcdc7d7fbb58f4043
|
|
@@ -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
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
= Metanorma processor for M3AAWG documents
|
|
2
2
|
|
|
3
3
|
https://github.com/metanorma/metanorma-m3aawg[metanorma-m3aawg] image:https://img.shields.io/gem/v/metanorma-m3aawg.svg["Gem Version", link="https://rubygems.org/gems/metanorma-m3aawg"]::
|
|
4
|
-
image:https://github.com/metanorma/metanorma-m3aawg/workflows/
|
|
5
|
-
image:https://github.com/metanorma/metanorma-m3aawg/workflows/windows/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=windows"]
|
|
6
|
-
image:https://github.com/metanorma/metanorma-m3aawg/workflows/ubuntu/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=ubuntu"]
|
|
4
|
+
image:https://github.com/metanorma/metanorma-m3aawg/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=rake"]
|
|
7
5
|
image:https://codeclimate.com/github/metanorma/metanorma-m3aawg/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-m3aawg"]
|
|
8
6
|
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-m3aawg.svg["Pull Requests", link="https://github.com/metanorma/metanorma-m3aawg/pulls"]
|
|
9
7
|
image:https://img.shields.io/github/commits-since/metanorma/metanorma-m3aawg/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-m3aawg/releases"]
|
|
@@ -12,7 +10,7 @@ _Formerly known as_ `asciidoctor-m3d`.
|
|
|
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 M3AAWG documents.
|
|
17
15
|
|
|
18
16
|
The gem currently inherits from the https://github.com/metanorma/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">
|
|
@@ -1,27 +1,14 @@
|
|
|
1
|
-
require "asciidoctor"
|
|
2
|
-
require "metanorma/m3aawg/version"
|
|
3
|
-
require "isodoc/m3aawg/html_convert"
|
|
4
|
-
require "isodoc/m3aawg/word_convert"
|
|
5
|
-
require "isodoc/m3aawg/pdf_convert"
|
|
6
1
|
require "asciidoctor/standoc/converter"
|
|
7
|
-
require
|
|
8
|
-
require_relative "./validate.rb"
|
|
2
|
+
require 'asciidoctor/generic/converter'
|
|
9
3
|
|
|
10
4
|
module Asciidoctor
|
|
11
5
|
module M3AAWG
|
|
12
|
-
|
|
13
|
-
# A {Converter} implementation that generates M3D output, and a document
|
|
14
|
-
# schema encapsulation of the document for validation
|
|
15
|
-
class Converter < Standoc::Converter
|
|
6
|
+
class Converter < Asciidoctor::Generic::Converter
|
|
16
7
|
XML_ROOT_TAG = "m3d-standard".freeze
|
|
17
8
|
XML_NAMESPACE = "https://www.metanorma.org/ns/m3d".freeze
|
|
18
9
|
|
|
19
10
|
register_for "m3aawg"
|
|
20
11
|
|
|
21
|
-
def default_publisher
|
|
22
|
-
"Messaging Malware and Mobile Anti-Abuse Working Group"
|
|
23
|
-
end
|
|
24
|
-
|
|
25
12
|
def metadata_committee(node, xml)
|
|
26
13
|
return unless node.attr("technical-committee")
|
|
27
14
|
xml.editorialgroup do |a|
|
|
@@ -36,21 +23,8 @@ module Asciidoctor
|
|
|
36
23
|
end
|
|
37
24
|
end
|
|
38
25
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
dn = node.attr("docnumber")
|
|
42
|
-
if docstatus
|
|
43
|
-
abbr = IsoDoc::M3AAWG::Metadata.new("en", "Latn", @i18n).
|
|
44
|
-
stage_abbr(docstatus)
|
|
45
|
-
dn = "#{dn}(#{abbr})" unless abbr.empty?
|
|
46
|
-
end
|
|
47
|
-
node.attr("copyright-year") and dn += ":#{node.attr("copyright-year")}"
|
|
48
|
-
xml.docidentifier dn, **{type: "M3AAWG"}
|
|
49
|
-
xml.docnumber { |i| i << node.attr("docnumber") }
|
|
50
|
-
end
|
|
51
|
-
|
|
52
|
-
def title_validate(root)
|
|
53
|
-
nil
|
|
26
|
+
def configuration
|
|
27
|
+
Metanorma::M3AAWG.configuration
|
|
54
28
|
end
|
|
55
29
|
|
|
56
30
|
def makexml(node)
|
|
@@ -58,15 +32,6 @@ module Asciidoctor
|
|
|
58
32
|
super
|
|
59
33
|
end
|
|
60
34
|
|
|
61
|
-
def doctype(node)
|
|
62
|
-
d = super
|
|
63
|
-
unless %w{policy best-practices supporting-document report}.include? d
|
|
64
|
-
@log.add("Document Attributes", nil, "#{d} is not a legal document type: reverting to 'report'")
|
|
65
|
-
d = "report"
|
|
66
|
-
end
|
|
67
|
-
d
|
|
68
|
-
end
|
|
69
|
-
|
|
70
35
|
def outputs(node, ret)
|
|
71
36
|
File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
|
|
72
37
|
presentation_xml_converter(node).convert(@filename + ".xml")
|
|
@@ -75,12 +40,6 @@ module Asciidoctor
|
|
|
75
40
|
pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
|
|
76
41
|
end
|
|
77
42
|
|
|
78
|
-
def validate(doc)
|
|
79
|
-
content_validate(doc)
|
|
80
|
-
schema_validate(formattedstr_strip(doc.dup),
|
|
81
|
-
File.join(File.dirname(__FILE__), "m3d.rng"))
|
|
82
|
-
end
|
|
83
|
-
|
|
84
43
|
def sections_cleanup(x)
|
|
85
44
|
super
|
|
86
45
|
x.xpath("//*[@inline-header]").each do |h|
|
|
@@ -88,10 +47,6 @@ module Asciidoctor
|
|
|
88
47
|
end
|
|
89
48
|
end
|
|
90
49
|
|
|
91
|
-
def style(n, t)
|
|
92
|
-
return
|
|
93
|
-
end
|
|
94
|
-
|
|
95
50
|
def presentation_xml_converter(node)
|
|
96
51
|
IsoDoc::M3AAWG::PresentationXMLConvert.new(html_extract_attributes(node))
|
|
97
52
|
end
|
|
@@ -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">
|
|
@@ -3,18 +3,8 @@ require "fileutils"
|
|
|
3
3
|
module IsoDoc
|
|
4
4
|
module M3AAWG
|
|
5
5
|
module BaseRender
|
|
6
|
-
def
|
|
7
|
-
|
|
8
|
-
term_cleanup(docxml)
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
def term_cleanup(docxml)
|
|
12
|
-
docxml.xpath("//p[@class = 'Terms']").each do |d|
|
|
13
|
-
h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
|
|
14
|
-
h2.add_child(" ")
|
|
15
|
-
h2.add_child(d.remove)
|
|
16
|
-
end
|
|
17
|
-
docxml
|
|
6
|
+
def configuration
|
|
7
|
+
Metanorma::M3AAWG.configuration
|
|
18
8
|
end
|
|
19
9
|
end
|
|
20
10
|
end
|
|
@@ -23,7 +23,7 @@ fieldset, form, label, legend,
|
|
|
23
23
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
|
24
24
|
article, aside, canvas, details, embed,
|
|
25
25
|
figure, figcaption, footer, header, hgroup,
|
|
26
|
-
menu,
|
|
26
|
+
menu, output, ruby, section, summary,
|
|
27
27
|
time, mark, audio, video {
|
|
28
28
|
margin: 0;
|
|
29
29
|
padding: 0; }
|
|
@@ -118,6 +118,10 @@ b, strong {
|
|
|
118
118
|
div.document-stage-band, div.document-type-band {
|
|
119
119
|
background-color: #333333; }
|
|
120
120
|
|
|
121
|
+
a.FootnoteRef + a.FootnoteRef:before {
|
|
122
|
+
content: ", ";
|
|
123
|
+
vertical-align: super; }
|
|
124
|
+
|
|
121
125
|
#standard-band {
|
|
122
126
|
background-color: #0AC442; }
|
|
123
127
|
|
|
@@ -224,7 +228,7 @@ body {
|
|
|
224
228
|
margin-left: auto;
|
|
225
229
|
margin-right: auto;
|
|
226
230
|
max-width: 100%;
|
|
227
|
-
font-size:
|
|
231
|
+
font-size: {{normalfontsize}};
|
|
228
232
|
font-weight: 300;
|
|
229
233
|
line-height: 1.4em;
|
|
230
234
|
color: #1d1d1d;
|
|
@@ -662,7 +666,7 @@ p.Biblio, p.NormRef {
|
|
|
662
666
|
pre,
|
|
663
667
|
.pseudocode {
|
|
664
668
|
background-color: #F5F6F6;
|
|
665
|
-
font-size:
|
|
669
|
+
font-size: {{monospacefontsize}};
|
|
666
670
|
line-height: 1.6em;
|
|
667
671
|
padding: 1.5em;
|
|
668
672
|
margin: 2em 0 1em 0;
|
|
@@ -785,7 +789,7 @@ a.footnote-number {
|
|
|
785
789
|
font-size: 0.8em; }
|
|
786
790
|
|
|
787
791
|
.footnote {
|
|
788
|
-
font-size:
|
|
792
|
+
font-size: {{footnotefontsize}}; }
|
|
789
793
|
|
|
790
794
|
/*
|
|
791
795
|
3.11 Blockquotes
|
|
@@ -18,7 +18,7 @@ Light Gray: #F5F6F6
|
|
|
18
18
|
@import 'base_style/all';
|
|
19
19
|
|
|
20
20
|
body {
|
|
21
|
-
@include bodyStyle1(
|
|
21
|
+
@include bodyStyle1($normalfontsize, 1.4em, #1d1d1d, #ffffff, 300);
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
#report {
|
|
@@ -431,7 +431,7 @@ a.footnote-number {
|
|
|
431
431
|
}
|
|
432
432
|
|
|
433
433
|
.footnote {
|
|
434
|
-
font-size:
|
|
434
|
+
font-size: $footnotefontsize;
|
|
435
435
|
}
|
|
436
436
|
|
|
437
437
|
|
|
@@ -10,7 +10,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
|
|
|
10
10
|
line-height: 12.0pt;
|
|
11
11
|
mso-pagination: widow-orphan;
|
|
12
12
|
tab-stops: 20.15pt;
|
|
13
|
-
font-size:
|
|
13
|
+
font-size: {{monospacefontsize}};
|
|
14
14
|
font-family: {{monospacefont}};
|
|
15
15
|
mso-fareast-font-family: Calibri;
|
|
16
16
|
mso-bidi-font-family: "Courier New";
|
|
@@ -28,7 +28,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
|
|
|
28
28
|
line-height: 12.0pt;
|
|
29
29
|
mso-pagination: widow-orphan;
|
|
30
30
|
tab-stops: 20.15pt;
|
|
31
|
-
font-size:
|
|
31
|
+
font-size: {{normalfontsize}};
|
|
32
32
|
font-family: {{bodyfont}};
|
|
33
33
|
mso-fareast-font-family: Calibri;
|
|
34
34
|
mso-bidi-font-family: "Courier New";
|
|
@@ -46,7 +46,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef {
|
|
|
46
46
|
tab-stops: 33.15pt;
|
|
47
47
|
line-height: 12.0pt;
|
|
48
48
|
mso-pagination: widow-orphan;
|
|
49
|
-
font-size:
|
|
49
|
+
font-size: {{normalfontsize}};
|
|
50
50
|
font-family: {{bodyfont}};
|
|
51
51
|
mso-fareast-font-family: {{bodyfont}};
|
|
52
52
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -65,7 +65,7 @@ p.FigureTitle {
|
|
|
65
65
|
page-break-before: avoid;
|
|
66
66
|
mso-pagination: widow-orphan;
|
|
67
67
|
tab-stops: 20.15pt;
|
|
68
|
-
font-size:
|
|
68
|
+
font-size: {{normalfontsize}};
|
|
69
69
|
font-family: {{bodyfont}};
|
|
70
70
|
font-weight: bold;
|
|
71
71
|
mso-fareast-font-family: {{bodyfont}};
|
|
@@ -85,7 +85,7 @@ p.SourceTitle {
|
|
|
85
85
|
page-break-before: avoid;
|
|
86
86
|
mso-pagination: widow-orphan;
|
|
87
87
|
tab-stops: 20.15pt;
|
|
88
|
-
font-size:
|
|
88
|
+
font-size: {{normalfontsize}};
|
|
89
89
|
font-family: {{bodyfont}};
|
|
90
90
|
font-weight: bold;
|
|
91
91
|
mso-fareast-font-family: {{bodyfont}};
|
|
@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
|
|
|
105
105
|
page-break-after: avoid;
|
|
106
106
|
mso-pagination: widow-orphan;
|
|
107
107
|
tab-stops: 20.15pt;
|
|
108
|
-
font-size:
|
|
108
|
+
font-size: {{normalfontsize}};
|
|
109
109
|
font-family: {{bodyfont}};
|
|
110
110
|
font-weight: bold;
|
|
111
111
|
mso-fareast-font-family: {{bodyfont}};
|
|
@@ -125,7 +125,7 @@ p.TableTitle {
|
|
|
125
125
|
line-height: 12.0pt;
|
|
126
126
|
mso-pagination: widow-orphan;
|
|
127
127
|
tab-stops: 20.15pt;
|
|
128
|
-
font-size:
|
|
128
|
+
font-size: {{normalfontsize}};
|
|
129
129
|
font-weight: bold;
|
|
130
130
|
font-family: {{bodyfont}};
|
|
131
131
|
mso-fareast-font-family: {{bodyfont}};
|
|
@@ -144,8 +144,8 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
|
|
|
144
144
|
line-height: 12.0pt;
|
|
145
145
|
mso-pagination: widow-orphan;
|
|
146
146
|
tab-stops: 20.15pt;
|
|
147
|
-
font-size:
|
|
148
|
-
mso-bidi-font-size:
|
|
147
|
+
font-size: {{smallerfontsize}};
|
|
148
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
149
149
|
font-family: {{bodyfont}};
|
|
150
150
|
mso-fareast-font-family: {{bodyfont}};
|
|
151
151
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -172,7 +172,7 @@ p.ANNEX, li.ANNEX, div.ANNEX {
|
|
|
172
172
|
mso-list: l0 level1 lfo12;
|
|
173
173
|
tab-stops: 20.15pt;
|
|
174
174
|
font-size: 14.0pt;
|
|
175
|
-
mso-bidi-font-size:
|
|
175
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
176
176
|
font-family: {{headerfont}};
|
|
177
177
|
mso-fareast-font-family: {{headerfont}};
|
|
178
178
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -195,7 +195,7 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle {
|
|
|
195
195
|
mso-outline-level: 1;
|
|
196
196
|
tab-stops: 20.15pt;
|
|
197
197
|
font-size: 14.0pt;
|
|
198
|
-
mso-bidi-font-size:
|
|
198
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
199
199
|
font-family: {{headerfont}};
|
|
200
200
|
mso-fareast-font-family: {{headerfont}};
|
|
201
201
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -215,7 +215,7 @@ p.Definition, li.Definition, div.Definition {
|
|
|
215
215
|
line-height: 12.0pt;
|
|
216
216
|
mso-pagination: widow-orphan;
|
|
217
217
|
tab-stops: 20.15pt;
|
|
218
|
-
font-size:
|
|
218
|
+
font-size: {{normalfontsize}};
|
|
219
219
|
font-family: {{bodyfont}};
|
|
220
220
|
mso-fareast-font-family: {{bodyfont}};
|
|
221
221
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -238,7 +238,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle {
|
|
|
238
238
|
mso-hyphenate: none;
|
|
239
239
|
tab-stops: 20.15pt;
|
|
240
240
|
font-size: 14.0pt;
|
|
241
|
-
mso-bidi-font-size:
|
|
241
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
242
242
|
font-family: {{headerfont}};
|
|
243
243
|
mso-fareast-font-family: {{headerfont}};
|
|
244
244
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -263,7 +263,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle {
|
|
|
263
263
|
mso-hyphenate: none;
|
|
264
264
|
tab-stops: 20.15pt;
|
|
265
265
|
font-size: 14.0pt;
|
|
266
|
-
mso-bidi-font-size:
|
|
266
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
267
267
|
font-family: {{headerfont}};
|
|
268
268
|
mso-fareast-font-family: {{headerfont}};
|
|
269
269
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -287,7 +287,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
|
|
|
287
287
|
mso-hyphenate: none;
|
|
288
288
|
tab-stops: 20.15pt;
|
|
289
289
|
font-size: 14.0pt;
|
|
290
|
-
mso-bidi-font-size:
|
|
290
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
291
291
|
font-family: {{headerfont}};
|
|
292
292
|
mso-fareast-font-family: {{headerfont}};
|
|
293
293
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -307,7 +307,7 @@ p.Terms, li.Terms, div.Terms {
|
|
|
307
307
|
page-break-after: avoid;
|
|
308
308
|
mso-hyphenate: none;
|
|
309
309
|
tab-stops: 20.15pt;
|
|
310
|
-
font-size:
|
|
310
|
+
font-size: {{normalfontsize}};
|
|
311
311
|
font-family: {{headerfont}};
|
|
312
312
|
mso-fareast-font-family: {{headerfont}};
|
|
313
313
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -327,7 +327,7 @@ p.AltTerms, li.AltTerms, div.AltTerms {
|
|
|
327
327
|
page-break-after: avoid;
|
|
328
328
|
mso-hyphenate: none;
|
|
329
329
|
tab-stops: 20.15pt;
|
|
330
|
-
font-size:
|
|
330
|
+
font-size: {{normalfontsize}};
|
|
331
331
|
font-family: {{bodyfont}};
|
|
332
332
|
mso-fareast-font-family: {{bodyfont}};
|
|
333
333
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -346,7 +346,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms {
|
|
|
346
346
|
page-break-after: avoid;
|
|
347
347
|
mso-hyphenate: none;
|
|
348
348
|
tab-stops: 20.15pt;
|
|
349
|
-
font-size:
|
|
349
|
+
font-size: {{normalfontsize}};
|
|
350
350
|
font-family: {{bodyfont}};
|
|
351
351
|
mso-fareast-font-family: {{bodyfont}};
|
|
352
352
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -364,7 +364,7 @@ p.TermNum, li.TermNum, div.TermNum {
|
|
|
364
364
|
mso-pagination: widow-orphan;
|
|
365
365
|
page-break-after: avoid;
|
|
366
366
|
tab-stops: 20.15pt;
|
|
367
|
-
font-size:
|
|
367
|
+
font-size: {{normalfontsize}};
|
|
368
368
|
font-family: {{headerfont}};
|
|
369
369
|
mso-fareast-font-family: {{headerfont}};
|
|
370
370
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -389,7 +389,7 @@ p.zzContents, li.zzContents, div.zzContents {
|
|
|
389
389
|
mso-hyphenate: none;
|
|
390
390
|
tab-stops: 20.15pt;
|
|
391
391
|
font-size: 14.0pt;
|
|
392
|
-
mso-bidi-font-size:
|
|
392
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
393
393
|
font-family: {{headerfont}};
|
|
394
394
|
mso-fareast-font-family: {{headerfont}};
|
|
395
395
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -414,7 +414,7 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
|
|
|
414
414
|
mso-border-alt: solid blue .5pt;
|
|
415
415
|
padding: 0cm;
|
|
416
416
|
mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
|
|
417
|
-
font-size:
|
|
417
|
+
font-size: {{normalfontsize}};
|
|
418
418
|
font-family: {{bodyfont}};
|
|
419
419
|
mso-fareast-font-family: {{bodyfont}};
|
|
420
420
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -435,7 +435,7 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle {
|
|
|
435
435
|
mso-hyphenate: none;
|
|
436
436
|
tab-stops: 20.15pt;
|
|
437
437
|
font-size: 16.0pt;
|
|
438
|
-
mso-bidi-font-size:
|
|
438
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
439
439
|
font-family: {{headerfont}};
|
|
440
440
|
mso-fareast-font-family: {{headerfont}};
|
|
441
441
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -456,7 +456,7 @@ p.zzSTDPreTitle, li.zzSTDPreTitle, div.zzSTDPreTitle {
|
|
|
456
456
|
mso-hyphenate: none;
|
|
457
457
|
tab-stops: 20.15pt;
|
|
458
458
|
font-size: 14.0pt;
|
|
459
|
-
mso-bidi-font-size:
|
|
459
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
460
460
|
font-family: {{headerfont}};
|
|
461
461
|
mso-fareast-font-family: {{headerfont}};
|
|
462
462
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -477,7 +477,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1 {
|
|
|
477
477
|
mso-hyphenate: none;
|
|
478
478
|
tab-stops: 20.15pt;
|
|
479
479
|
font-size: 24.0pt;
|
|
480
|
-
mso-bidi-font-size:
|
|
480
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
481
481
|
font-family: {{headerfont}};
|
|
482
482
|
mso-fareast-font-family: {{headerfont}};
|
|
483
483
|
mso-bidi-font-family: {{headerfont}};
|
|
@@ -495,7 +495,7 @@ p.Quote, li.Quote, div.Quote {
|
|
|
495
495
|
line-height: 12.0pt;
|
|
496
496
|
mso-pagination: widow-orphan;
|
|
497
497
|
tab-stops: 20.15pt;
|
|
498
|
-
font-size:
|
|
498
|
+
font-size: {{normalfontsize}};
|
|
499
499
|
font-family: {{bodyfont}};
|
|
500
500
|
mso-fareast-font-family: {{bodyfont}};
|
|
501
501
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -532,8 +532,8 @@ p.Code, li.Code, div.Code {
|
|
|
532
532
|
line-height: 10.0pt;
|
|
533
533
|
mso-pagination: widow-orphan;
|
|
534
534
|
tab-stops: 20.15pt;
|
|
535
|
-
font-size:
|
|
536
|
-
mso-bidi-font-size:
|
|
535
|
+
font-size: {{monospacefontsize}};
|
|
536
|
+
mso-bidi-font-size: {{normalfontsize}};
|
|
537
537
|
font-family: {{monospacefont}};
|
|
538
538
|
mso-fareast-font-family: Calibri;
|
|
539
539
|
mso-bidi-font-family: "Cambria";
|
|
@@ -545,12 +545,12 @@ p.Formula, li.Formula, div.Formula {
|
|
|
545
545
|
mso-style-unhide: no;
|
|
546
546
|
margin-top: 0cm;
|
|
547
547
|
margin-right: 0cm;
|
|
548
|
-
margin-bottom:
|
|
548
|
+
margin-bottom: {{normalfontsize}};
|
|
549
549
|
margin-left: 20.15pt;
|
|
550
550
|
line-height: 12.0pt;
|
|
551
551
|
mso-pagination: widow-orphan;
|
|
552
552
|
tab-stops: right 487.45pt;
|
|
553
|
-
font-size:
|
|
553
|
+
font-size: {{normalfontsize}};
|
|
554
554
|
font-family: {{bodyfont}};
|
|
555
555
|
mso-fareast-font-family: {{bodyfont}};
|
|
556
556
|
mso-bidi-font-family: {{bodyfont}};
|
|
@@ -559,7 +559,7 @@ p.Formula, li.Formula, div.Formula {
|
|
|
559
559
|
table.dl {
|
|
560
560
|
margin-top: 0cm;
|
|
561
561
|
margin-right: 0cm;
|
|
562
|
-
margin-bottom:
|
|
562
|
+
margin-bottom: {{normalfontsize}};
|
|
563
563
|
margin-left: 20.15pt; }
|
|
564
564
|
|
|
565
565
|
table.MsoISOTable, table.MsoISOTableBig {
|
|
@@ -580,7 +580,7 @@ table.MsoISOTable, table.MsoISOTableBig {
|
|
|
580
580
|
mso-yfti-tbllook: 480;
|
|
581
581
|
mso-border-insideh: .75pt solid windowtext;
|
|
582
582
|
mso-border-insidev: .75pt solid windowtext;
|
|
583
|
-
font-size:
|
|
583
|
+
font-size: {{smallerfontsize}};
|
|
584
584
|
font-family: {{bodyfont}}; }
|
|
585
585
|
|
|
586
586
|
table.MsoISOTable th, table.MsoISOTableBig th {
|
|
@@ -594,7 +594,7 @@ table.MsoISOTable td, table.MsoISOTableBig td {
|
|
|
594
594
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
|
595
595
|
|
|
596
596
|
table.MsoISOTable p, table.MsoISOTableBig p {
|
|
597
|
-
font-size:
|
|
597
|
+
font-size: {{smallerfontsize}}; }
|
|
598
598
|
|
|
599
599
|
table.MsoTableGrid {
|
|
600
600
|
mso-style-name: "Table Grid";
|
|
@@ -610,7 +610,7 @@ table.MsoTableGrid {
|
|
|
610
610
|
mso-para-margin: 0cm;
|
|
611
611
|
mso-para-margin-bottom: .0001pt;
|
|
612
612
|
mso-pagination: widow-orphan;
|
|
613
|
-
font-size:
|
|
613
|
+
font-size: {{smallerfontsize}};
|
|
614
614
|
font-family: {{bodyfont}}; }
|
|
615
615
|
|
|
616
616
|
div.formula {
|
|
@@ -723,7 +723,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
|
|
|
723
723
|
vertical-align: super; }
|
|
724
724
|
|
|
725
725
|
aside {
|
|
726
|
-
font-size:
|
|
726
|
+
font-size: {{footnotefontsize}}; }
|
|
727
727
|
|
|
728
728
|
.example-title {
|
|
729
729
|
font-weight: bold;
|
|
@@ -741,30 +741,30 @@ div.example {
|
|
|
741
741
|
|
|
742
742
|
p.example, li.example, div.example, td.example {
|
|
743
743
|
mso-pagination: none;
|
|
744
|
-
font-size:
|
|
744
|
+
font-size: {{smallerfontsize}};
|
|
745
745
|
font-family: {{bodyfont}}; }
|
|
746
746
|
|
|
747
747
|
td.example p.MsoListParagraph {
|
|
748
|
-
font-size:
|
|
748
|
+
font-size: {{smallerfontsize}}; }
|
|
749
749
|
|
|
750
750
|
div.example p.MsoListParagraph {
|
|
751
|
-
font-size:
|
|
751
|
+
font-size: {{smallerfontsize}}; }
|
|
752
752
|
|
|
753
753
|
div.Note p.MsoListParagraph {
|
|
754
|
-
font-size:
|
|
754
|
+
font-size: {{smallerfontsize}};
|
|
755
755
|
margin-left: 1.0cm; }
|
|
756
756
|
|
|
757
757
|
div.Note span.stem {
|
|
758
|
-
font-size:
|
|
758
|
+
font-size: {{smallerfontsize}}; }
|
|
759
759
|
|
|
760
760
|
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
|
761
761
|
font-size: 8.0pt;
|
|
762
762
|
margin-left: 1.0cm; }
|
|
763
763
|
|
|
764
764
|
div.Note table.dl {
|
|
765
|
-
font-size:
|
|
765
|
+
font-size: {{smallerfontsize}};
|
|
766
766
|
margin-left: 1.0cm; }
|
|
767
767
|
|
|
768
768
|
span.note_label, span.example_label, td.example_label, td.note_label {
|
|
769
|
-
font-size:
|
|
769
|
+
font-size: {{smallerfontsize}};
|
|
770
770
|
font-family: {{bodyfont}}; }
|