metanorma-csa 1.6.5 → 1.6.6
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 +44 -0
- data/lib/asciidoctor/csa/converter.rb +4 -0
- data/lib/asciidoctor/csa/isodoc.rng +1 -43
- data/lib/isodoc/csa/csa.standard.xsl +27 -3
- data/lib/isodoc/csa/html/htmlstyle.css +4 -0
- data/lib/metanorma/csa/version.rb +1 -1
- metadata +3 -5
- 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: 3167e8f69fcf1788c807e29b0b0bf466372b86a587e349db7ed2b9581593b919
|
4
|
+
data.tar.gz: c47618d4156d5d68d37a033260b5d3f13c4dd1ef7ad5165eeb20b8b25be9cbc8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b9fd562124e26c29ce6df45597cda035dc3f4042efd1af231c3020d9c643c09702ac889b4c64fe782c5519839ebffe13ae6769e6cbd1093e2d1144f06730fc1d
|
7
|
+
data.tar.gz: 2478c8a52b6663cc90e82f7b51d7f85b40546eebc432fd6c990e20859a7cec3fcc9f8b73b2705b98f5c2337687541088d2e6e7db4bdbae19360d6ae8271697f6
|
@@ -0,0 +1,44 @@
|
|
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 ]
|
8
|
+
pull_request:
|
9
|
+
|
10
|
+
jobs:
|
11
|
+
rake:
|
12
|
+
name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
|
13
|
+
runs-on: ${{ matrix.os }}
|
14
|
+
continue-on-error: ${{ matrix.experimental }}
|
15
|
+
strategy:
|
16
|
+
fail-fast: false
|
17
|
+
matrix:
|
18
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
19
|
+
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
20
|
+
experimental: [ false ]
|
21
|
+
include:
|
22
|
+
- ruby: '2.7'
|
23
|
+
os: 'ubuntu-latest'
|
24
|
+
experimental: true
|
25
|
+
- ruby: '2.7'
|
26
|
+
os: 'windows-latest'
|
27
|
+
experimental: true
|
28
|
+
- ruby: '2.7'
|
29
|
+
os: 'macos-latest'
|
30
|
+
experimental: true
|
31
|
+
steps:
|
32
|
+
- uses: actions/checkout@master
|
33
|
+
|
34
|
+
- name: Use Ruby
|
35
|
+
uses: ruby/setup-ruby@v1
|
36
|
+
with:
|
37
|
+
ruby-version: ${{ matrix.ruby }}
|
38
|
+
bundler-cache: true
|
39
|
+
|
40
|
+
- name: Update gems
|
41
|
+
run: bundle install --jobs 4 --retry 3
|
42
|
+
|
43
|
+
- name: Run specs
|
44
|
+
run: bundle exec rake
|
@@ -106,12 +106,16 @@ module Asciidoctor
|
|
106
106
|
def html_converter(node)
|
107
107
|
IsoDoc::Csa::HtmlConvert.new(html_extract_attributes(node))
|
108
108
|
end
|
109
|
+
|
109
110
|
def pdf_converter(node)
|
111
|
+
return if node.attr("no-pdf")
|
110
112
|
IsoDoc::Csa::PdfConvert.new(html_extract_attributes(node))
|
111
113
|
end
|
114
|
+
|
112
115
|
def doc_converter(node)
|
113
116
|
IsoDoc::Csa::WordConvert.new(doc_extract_attributes(node))
|
114
117
|
end
|
118
|
+
|
115
119
|
def presentation_xml_converter(node)
|
116
120
|
IsoDoc::Csa::PresentationXMLConvert.new(doc_extract_attributes(node))
|
117
121
|
end
|
@@ -1164,49 +1164,7 @@
|
|
1164
1164
|
</define>
|
1165
1165
|
<define name="annex">
|
1166
1166
|
<element name="annex">
|
1167
|
-
<
|
1168
|
-
<attribute name="id">
|
1169
|
-
<data type="ID"/>
|
1170
|
-
</attribute>
|
1171
|
-
</optional>
|
1172
|
-
<optional>
|
1173
|
-
<attribute name="language"/>
|
1174
|
-
</optional>
|
1175
|
-
<optional>
|
1176
|
-
<attribute name="script"/>
|
1177
|
-
</optional>
|
1178
|
-
<optional>
|
1179
|
-
<attribute name="inline-header">
|
1180
|
-
<data type="boolean"/>
|
1181
|
-
</attribute>
|
1182
|
-
</optional>
|
1183
|
-
<attribute name="obligation">
|
1184
|
-
<choice>
|
1185
|
-
<value>normative</value>
|
1186
|
-
<value>informative</value>
|
1187
|
-
</choice>
|
1188
|
-
</attribute>
|
1189
|
-
<optional>
|
1190
|
-
<ref name="section-title"/>
|
1191
|
-
</optional>
|
1192
|
-
<group>
|
1193
|
-
<group>
|
1194
|
-
<zeroOrMore>
|
1195
|
-
<ref name="BasicBlock"/>
|
1196
|
-
</zeroOrMore>
|
1197
|
-
<zeroOrMore>
|
1198
|
-
<ref name="note"/>
|
1199
|
-
</zeroOrMore>
|
1200
|
-
</group>
|
1201
|
-
<zeroOrMore>
|
1202
|
-
<choice>
|
1203
|
-
<ref name="annex-subsection"/>
|
1204
|
-
<ref name="terms"/>
|
1205
|
-
<ref name="definitions"/>
|
1206
|
-
<ref name="references"/>
|
1207
|
-
</choice>
|
1208
|
-
</zeroOrMore>
|
1209
|
-
</group>
|
1167
|
+
<ref name="Annex-Section"/>
|
1210
1168
|
</element>
|
1211
1169
|
</define>
|
1212
1170
|
<define name="terms">
|
@@ -1199,6 +1199,7 @@
|
|
1199
1199
|
|
1200
1200
|
|
1201
1201
|
|
1202
|
+
|
1202
1203
|
</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
|
1203
1204
|
|
1204
1205
|
<xsl:attribute name="padding-right">4mm</xsl:attribute>
|
@@ -1745,12 +1746,26 @@
|
|
1745
1746
|
|
1746
1747
|
|
1747
1748
|
|
1748
|
-
<!-- except gb and bipm -->
|
1749
1749
|
|
1750
|
-
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1751
1750
|
|
1752
1751
|
|
1752
|
+
<!-- except gb -->
|
1753
|
+
|
1754
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1755
|
+
|
1753
1756
|
|
1757
|
+
<!-- show Note under table in preface (ex. abstract) sections -->
|
1758
|
+
<!-- empty, because notes show at page side in main sections -->
|
1759
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1760
|
+
<xsl:choose>
|
1761
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
1762
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1763
|
+
</xsl:when>
|
1764
|
+
<xsl:otherwise>
|
1765
|
+
<fo:block/>
|
1766
|
+
</xsl:otherwise>
|
1767
|
+
</xsl:choose>
|
1768
|
+
</xsl:if> -->
|
1754
1769
|
|
1755
1770
|
|
1756
1771
|
<!-- horizontal row separator -->
|
@@ -1813,7 +1828,11 @@
|
|
1813
1828
|
|
1814
1829
|
|
1815
1830
|
|
1816
|
-
|
1831
|
+
|
1832
|
+
|
1833
|
+
|
1834
|
+
|
1835
|
+
<!-- except gb -->
|
1817
1836
|
|
1818
1837
|
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1819
1838
|
|
@@ -1898,6 +1917,9 @@
|
|
1898
1917
|
|
1899
1918
|
|
1900
1919
|
|
1920
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1921
|
+
<xsl:attribute name="height">8mm</xsl:attribute>
|
1922
|
+
</xsl:if> -->
|
1901
1923
|
|
1902
1924
|
<xsl:apply-templates/>
|
1903
1925
|
</fo:table-row>
|
@@ -3004,6 +3026,8 @@
|
|
3004
3026
|
|
3005
3027
|
|
3006
3028
|
|
3029
|
+
|
3030
|
+
|
3007
3031
|
<fo:inline xsl:use-attribute-sets="note-name-style">
|
3008
3032
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
3009
3033
|
</fo:inline>
|
@@ -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
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-csa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-10-
|
11
|
+
date: 2020-10-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: htmlentities
|
@@ -274,9 +274,7 @@ executables: []
|
|
274
274
|
extensions: []
|
275
275
|
extra_rdoc_files: []
|
276
276
|
files:
|
277
|
-
- ".github/workflows/
|
278
|
-
- ".github/workflows/ubuntu.yml"
|
279
|
-
- ".github/workflows/windows.yml"
|
277
|
+
- ".github/workflows/rake.yml"
|
280
278
|
- ".gitignore"
|
281
279
|
- ".hound.yml"
|
282
280
|
- ".rubocop.yml"
|
data/.github/workflows/macos.yml
DELETED
@@ -1,38 +0,0 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
|
-
name: macos
|
4
|
-
|
5
|
-
on:
|
6
|
-
push:
|
7
|
-
branches: [ master ]
|
8
|
-
pull_request:
|
9
|
-
paths-ignore:
|
10
|
-
- .github/workflows/ubuntu.yml
|
11
|
-
- .github/workflows/windows.yml
|
12
|
-
|
13
|
-
jobs:
|
14
|
-
test-macos:
|
15
|
-
name: Test on Ruby ${{ matrix.ruby }} macOS
|
16
|
-
runs-on: macos-latest
|
17
|
-
continue-on-error: ${{ matrix.experimental }}
|
18
|
-
strategy:
|
19
|
-
fail-fast: false
|
20
|
-
matrix:
|
21
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
22
|
-
experimental: [false]
|
23
|
-
include:
|
24
|
-
- ruby: '2.7'
|
25
|
-
experimental: true
|
26
|
-
steps:
|
27
|
-
- uses: actions/checkout@master
|
28
|
-
- name: Use Ruby
|
29
|
-
uses: actions/setup-ruby@v1
|
30
|
-
with:
|
31
|
-
ruby-version: ${{ matrix.ruby }}
|
32
|
-
- name: Update gems
|
33
|
-
run: |
|
34
|
-
sudo gem install bundler --force
|
35
|
-
bundle install --jobs 4 --retry 3
|
36
|
-
- name: Run specs
|
37
|
-
run: |
|
38
|
-
bundle exec rake
|
@@ -1,56 +0,0 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
|
-
name: ubuntu
|
4
|
-
|
5
|
-
on:
|
6
|
-
push:
|
7
|
-
branches: [ master ]
|
8
|
-
tags:
|
9
|
-
- '*'
|
10
|
-
pull_request:
|
11
|
-
paths-ignore:
|
12
|
-
- .github/workflows/macos.yml
|
13
|
-
- .github/workflows/windows.yml
|
14
|
-
|
15
|
-
jobs:
|
16
|
-
test-linux:
|
17
|
-
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
18
|
-
runs-on: ubuntu-latest
|
19
|
-
continue-on-error: ${{ matrix.experimental }}
|
20
|
-
strategy:
|
21
|
-
fail-fast: false
|
22
|
-
matrix:
|
23
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
24
|
-
experimental: [false]
|
25
|
-
include:
|
26
|
-
- ruby: '2.7'
|
27
|
-
experimental: true
|
28
|
-
steps:
|
29
|
-
- uses: actions/checkout@master
|
30
|
-
- name: Use Ruby
|
31
|
-
uses: actions/setup-ruby@v1
|
32
|
-
with:
|
33
|
-
ruby-version: ${{ matrix.ruby }}
|
34
|
-
- name: Update gems
|
35
|
-
run: |
|
36
|
-
gem install bundler
|
37
|
-
bundle install --jobs 4 --retry 3
|
38
|
-
- name: Run specs
|
39
|
-
run: |
|
40
|
-
bundle exec rake
|
41
|
-
- name: Trigger repositories
|
42
|
-
if: matrix.ruby == '2.6'
|
43
|
-
env:
|
44
|
-
GH_USERNAME: metanorma-ci
|
45
|
-
GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
46
|
-
run: |
|
47
|
-
curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
|
48
|
-
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
49
|
-
CLIENT_PAYLOAD=$(cat <<EOF
|
50
|
-
"{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
|
51
|
-
EOF
|
52
|
-
)
|
53
|
-
for repo in $REPOS
|
54
|
-
do
|
55
|
-
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
|
56
|
-
done
|
@@ -1,40 +0,0 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
|
-
name: windows
|
4
|
-
|
5
|
-
on:
|
6
|
-
push:
|
7
|
-
branches: [ master ]
|
8
|
-
pull_request:
|
9
|
-
paths-ignore:
|
10
|
-
- .github/workflows/macos.yml
|
11
|
-
- .github/workflows/ubuntu.yml
|
12
|
-
|
13
|
-
jobs:
|
14
|
-
test-windows:
|
15
|
-
name: Test on Ruby ${{ matrix.ruby }} Windows
|
16
|
-
runs-on: windows-latest
|
17
|
-
continue-on-error: ${{ matrix.experimental }}
|
18
|
-
strategy:
|
19
|
-
fail-fast: false
|
20
|
-
matrix:
|
21
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
22
|
-
experimental: [false]
|
23
|
-
include:
|
24
|
-
- ruby: '2.7'
|
25
|
-
experimental: true
|
26
|
-
steps:
|
27
|
-
- uses: actions/checkout@master
|
28
|
-
- name: Use Ruby
|
29
|
-
uses: actions/setup-ruby@v1
|
30
|
-
with:
|
31
|
-
ruby-version: ${{ matrix.ruby }}
|
32
|
-
- name: Update gems
|
33
|
-
shell: pwsh
|
34
|
-
run: |
|
35
|
-
gem install bundler
|
36
|
-
bundle config --local path vendor/bundle
|
37
|
-
bundle install --jobs 4 --retry 3
|
38
|
-
- name: Run specs
|
39
|
-
run: |
|
40
|
-
bundle exec rake
|