metanorma-ribose 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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 76c92e3101791882684034ffa9ec62ee39a2838a14fdda750cb37f7272446e00
4
- data.tar.gz: ff0e212e1398c0de4ef6afba3ef4c6c7af882f0ca1e8aec0b4f1a99796211a7c
3
+ metadata.gz: 1336d588649f37107c8c9a66f4401e7c944efb208de7bd607e87bd1a4a7167ec
4
+ data.tar.gz: f00a115cb78b6388742d34ed27480058a1220f35a308aaa32de9ab40620b168b
5
5
  SHA512:
6
- metadata.gz: bc8cbb2fbda9c61fe7def3e027bbd0af199cd93578fe5d07526993410181a060b926670d3fbf36099d2e9983295a59208582e99fb5859212560e13f195034d47
7
- data.tar.gz: 5c52d881e32cbb5adda06fe28f2c96185cc0937e1fd0421a97f3e8c31ae385fdae956dd21a49ddd31368adbcffefc431994babed20c92ddb64fcc41b0341beb1
6
+ metadata.gz: fc83e3e0763b7f8b3bd2a3e2c42d28827608fbad3d850ffe87aed038f9c99afd4df254f9f0a0a517d03774f7b6ed7c8858b3262e2ed231848ca348fe7e61ee34
7
+ data.tar.gz: c9c1fb127ae4274a8e3664f308304a679deff458af6af6f8da67cb06f300fb64ae958e347209e34220930791bbd0c4157894bc6073cd066a756e246b326971db
@@ -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 ]
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: Install PlantUML Ubuntu
44
+ if: matrix.os == 'ubuntu-latest'
45
+ uses: nick-invision/retry@v1
46
+ with:
47
+ polling_interval_seconds: 5
48
+ timeout_minutes: 5
49
+ max_attempts: 3
50
+ command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
51
+
52
+ - name: Install PlantUML macOS
53
+ if: matrix.os == 'macos-latest'
54
+ run: brew install plantuml
55
+
56
+ - name: Install PlantUML Windows
57
+ if: matrix.os == 'windows-latest'
58
+ run: |
59
+ cinst -y plantuml
60
+
61
+ - name: Run specs
62
+ run: bundle exec rake
@@ -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">
@@ -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
 
@@ -1233,6 +1233,7 @@
1233
1233
 
1234
1234
 
1235
1235
 
1236
+
1236
1237
  </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">
1237
1238
 
1238
1239
 
@@ -1783,12 +1784,26 @@
1783
1784
 
1784
1785
 
1785
1786
 
1786
- <!-- except gb and bipm -->
1787
1787
 
1788
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1789
1788
 
1790
1789
 
1790
+ <!-- except gb -->
1791
+
1792
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1793
+
1791
1794
 
1795
+ <!-- show Note under table in preface (ex. abstract) sections -->
1796
+ <!-- empty, because notes show at page side in main sections -->
1797
+ <!-- <xsl:if test="$namespace = 'bipm'">
1798
+ <xsl:choose>
1799
+ <xsl:when test="ancestor::*[local-name()='preface']">
1800
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1801
+ </xsl:when>
1802
+ <xsl:otherwise>
1803
+ <fo:block/>
1804
+ </xsl:otherwise>
1805
+ </xsl:choose>
1806
+ </xsl:if> -->
1792
1807
 
1793
1808
 
1794
1809
  <!-- horizontal row separator -->
@@ -1851,7 +1866,11 @@
1851
1866
 
1852
1867
 
1853
1868
 
1854
- <!-- except gb and bipm -->
1869
+
1870
+
1871
+
1872
+
1873
+ <!-- except gb -->
1855
1874
 
1856
1875
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1857
1876
 
@@ -1936,6 +1955,9 @@
1936
1955
 
1937
1956
 
1938
1957
 
1958
+ <!-- <xsl:if test="$namespace = 'bipm'">
1959
+ <xsl:attribute name="height">8mm</xsl:attribute>
1960
+ </xsl:if> -->
1939
1961
 
1940
1962
  <xsl:apply-templates/>
1941
1963
  </fo:table-row>
@@ -3042,6 +3064,8 @@
3042
3064
 
3043
3065
 
3044
3066
 
3067
+
3068
+
3045
3069
  <fo:inline xsl:use-attribute-sets="note-name-style">
3046
3070
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3047
3071
  </fo:inline>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "1.6.5"
3
+ VERSION = "1.6.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ribose
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.5
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 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: isodoc
@@ -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"
@@ -1,41 +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: Install PlantUML
37
- run: |
38
- brew install plantuml
39
- - name: Run specs
40
- run: |
41
- bundle exec rake
@@ -1,45 +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
- pull_request:
9
- paths-ignore:
10
- - .github/workflows/macos.yml
11
- - .github/workflows/windows.yml
12
-
13
- jobs:
14
- test-linux:
15
- name: Test on Ruby ${{ matrix.ruby }} Ubuntu
16
- runs-on: ubuntu-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
- gem install bundler
35
- bundle install --jobs 4 --retry 3
36
- - name: Install PlantUML
37
- uses: nick-invision/retry@v1
38
- with:
39
- polling_interval_seconds: 5
40
- timeout_minutes: 5
41
- max_attempts: 3
42
- command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
43
- - name: Run specs
44
- run: |
45
- bundle exec rake
@@ -1,43 +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: Install PlantUML
39
- run: |
40
- cinst -y plantuml
41
- - name: Run specs
42
- run: |
43
- bundle exec rake