metanorma-cc 1.5.5 → 1.5.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +44 -0
  3. data/lib/asciidoctor/cc/converter.rb +1 -0
  4. data/lib/asciidoctor/cc/isodoc.rng +1 -43
  5. data/lib/isodoc/cc/csd.standard.xsl +27 -3
  6. data/lib/isodoc/cc/html/_coverpage.css +4 -0
  7. data/lib/isodoc/cc/html/htmlstyle.css +8 -0
  8. data/lib/metanorma/cc/version.rb +1 -1
  9. metadata +3 -5
  10. data/.github/workflows/macos.yml +0 -38
  11. data/.github/workflows/ubuntu.yml +0 -56
  12. data/.github/workflows/windows.yml +0 -40
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 941c50863de4016c3c72a513676f9e955e9afa7caf0bf09cfb01dc2176041e2f
4
- data.tar.gz: 84c80743bd6df2db228c5289f6b95f174f2242c9747e5aed127bd77685c687c0
3
+ metadata.gz: d512119733aec0e381d969a3bb23f3908caaa3953cc1ed7524a9d3e727e639c0
4
+ data.tar.gz: f26c2d06edb3a888bc8bc2b1214e897eca07e0d3fa6acdc9ae94b745f44fc328
5
5
  SHA512:
6
- metadata.gz: 976210e1d2c6308cb2206a234a194d11f63b4b5924fc65e4e36461fe7417b978983a76909a3427bf25fd069fc6f56aebb16b2bdbf8740bbf30976bfc45ca826a
7
- data.tar.gz: 89f6d272ce0827c1f083fe4c774be2b93f01cbc534b69e769f711832088a83740d35e2dcd91d4363d55e170950c585804def03825c1db4fcd23690647afaac97
6
+ metadata.gz: d5187f1fbe65adb3644ae800c8b47be62e7be2c24d8c43266ff50cc01bbb060889cea81c1bd3173d510606ca924fa9054222762d66582974b3226af256dd2078
7
+ data.tar.gz: 03c5867a2464256d539ef13936be713653bc512a1cdb447af78de3dc0378508e31d7ab8d52cf34acc71af9f70f6aef9614ddfe55775902bed9b923886e01c8b4
data/.github/workflows/rake.yml ADDED
@@ -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
data/lib/asciidoctor/cc/converter.rb CHANGED
@@ -57,6 +57,7 @@ module Asciidoctor
57
57
  end
58
58
 
59
59
  def pdf_converter(node)
60
+ return if node.attr("no-pdf")
60
61
  IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
61
62
  end
62
63
 
data/lib/asciidoctor/cc/isodoc.rng CHANGED
@@ -1164,49 +1164,7 @@
1164
1164
  </define>
1165
1165
  <define name="annex">
1166
1166
  <element name="annex">
1167
- <optional>
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">
data/lib/isodoc/cc/csd.standard.xsl CHANGED
@@ -1130,6 +1130,7 @@
1130
1130
 
1131
1131
 
1132
1132
 
1133
+
1133
1134
  </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">
1134
1135
 
1135
1136
 
@@ -1674,12 +1675,26 @@
1674
1675
 
1675
1676
 
1676
1677
 
1677
- <!-- except gb and bipm -->
1678
1678
 
1679
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1680
1679
 
1681
1680
 
1681
+ <!-- except gb -->
1682
+
1683
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1684
+
1682
1685
 
1686
+ <!-- show Note under table in preface (ex. abstract) sections -->
1687
+ <!-- empty, because notes show at page side in main sections -->
1688
+ <!-- <xsl:if test="$namespace = 'bipm'">
1689
+ <xsl:choose>
1690
+ <xsl:when test="ancestor::*[local-name()='preface']">
1691
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1692
+ </xsl:when>
1693
+ <xsl:otherwise>
1694
+ <fo:block/>
1695
+ </xsl:otherwise>
1696
+ </xsl:choose>
1697
+ </xsl:if> -->
1683
1698
 
1684
1699
 
1685
1700
  <!-- horizontal row separator -->
@@ -1742,7 +1757,11 @@
1742
1757
 
1743
1758
 
1744
1759
 
1745
- <!-- except gb and bipm -->
1760
+
1761
+
1762
+
1763
+
1764
+ <!-- except gb -->
1746
1765
 
1747
1766
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1748
1767
 
@@ -1827,6 +1846,9 @@
1827
1846
 
1828
1847
 
1829
1848
 
1849
+ <!-- <xsl:if test="$namespace = 'bipm'">
1850
+ <xsl:attribute name="height">8mm</xsl:attribute>
1851
+ </xsl:if> -->
1830
1852
 
1831
1853
  <xsl:apply-templates/>
1832
1854
  </fo:table-row>
@@ -2933,6 +2955,8 @@
2933
2955
 
2934
2956
 
2935
2957
 
2958
+
2959
+
2936
2960
  <fo:inline xsl:use-attribute-sets="note-name-style">
2937
2961
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2938
2962
  </fo:inline>
data/lib/isodoc/cc/html/_coverpage.css CHANGED
@@ -104,6 +104,10 @@ b, strong {
104
104
  div.document-stage-band, div.document-type-band {
105
105
  background-color: #333333; }
106
106
 
107
+ a.FootnoteRef + a.FootnoteRef:before {
108
+ content: ", ";
109
+ vertical-align: super; }
110
+
107
111
  #standard-band {
108
112
  background-color: #0AC442; }
109
113
 
data/lib/isodoc/cc/html/htmlstyle.css CHANGED
@@ -104,6 +104,10 @@ b, strong {
104
104
  div.document-stage-band, div.document-type-band {
105
105
  background-color: #333333; }
106
106
 
107
+ a.FootnoteRef + a.FootnoteRef:before {
108
+ content: ", ";
109
+ vertical-align: super; }
110
+
107
111
  #standard-band {
108
112
  background-color: #0AC442; }
109
113
 
@@ -774,6 +778,10 @@ b, strong {
774
778
  div.document-stage-band, div.document-type-band {
775
779
  background-color: #333333; }
776
780
 
781
+ a.FootnoteRef + a.FootnoteRef:before {
782
+ content: ", ";
783
+ vertical-align: super; }
784
+
777
785
  #standard-band {
778
786
  background-color: #0AC442; }
779
787
 
data/lib/metanorma/cc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "1.5.5"
3
+ VERSION = "1.5.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-cc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.5
4
+ version: 1.5.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 00:00:00.000000000 Z
11
+ date: 2020-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -190,9 +190,7 @@ executables: []
190
190
  extensions: []
191
191
  extra_rdoc_files: []
192
192
  files:
193
- - ".github/workflows/macos.yml"
194
- - ".github/workflows/ubuntu.yml"
195
- - ".github/workflows/windows.yml"
193
+ - ".github/workflows/rake.yml"
196
194
  - ".gitignore"
197
195
  - ".hound.yml"
198
196
  - ".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
data/.github/workflows/ubuntu.yml DELETED
@@ -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
data/.github/workflows/windows.yml DELETED
@@ -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