metanorma-nist 1.2.5 → 1.2.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: 6a69082cb58bde5a1305caea0316414723f519a71c550efe43ac3e894f028436
4
- data.tar.gz: 73b99485a31a90a15e6936d688fc4c677a2d948e95bc1896d822d7b02cda37f6
3
+ metadata.gz: 87d9c7be14355912b02f7f0dc22c25c4fc232911a18c6d5c41b95df158592314
4
+ data.tar.gz: dcc54050671bbb3265517009cee8bc5797c952473bd457cd72e0bc26ded1531c
5
5
  SHA512:
6
- metadata.gz: 59de2efb8bb15621e6479ba749b94228d0c61b0b244da02a6c95dc63668797c890090c49abe386a913ef096664b771a42e99b53d39ed698d4d30e45b2e324393
7
- data.tar.gz: 108786af3a06da4539acb195f2d42c21b66fb0d7b05543ed800202c117a98531c1cd83ec1f31f3a8249ef7429458407c7d7991fc41052cb3c522ed47762d9afd
6
+ metadata.gz: c23571ad0654a2470b91f7d4704debdd577df11567d37facff8b22b17a76d38c4fe4ef7e61cfd69b01810c9bc8d5c99611d9f922fe63234c74906e88dd569484
7
+ data.tar.gz: 25a3e238f7c4ebc8003b4276e988388b0d6df536d5867058bc531c04e6f0bed37a54a466f73387caba8cf7d739b9a34eaa4b396da9e0fbdd999609532aa74a34
@@ -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
@@ -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">
@@ -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
  #nist-sp-band {
108
112
  background-color: #d8eca8; }
109
113
 
@@ -1408,6 +1408,7 @@
1408
1408
 
1409
1409
 
1410
1410
 
1411
+
1411
1412
  </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">
1412
1413
 
1413
1414
 
@@ -1944,12 +1945,26 @@
1944
1945
 
1945
1946
 
1946
1947
 
1947
- <!-- except gb and bipm -->
1948
1948
 
1949
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1950
1949
 
1951
1950
 
1951
+ <!-- except gb -->
1952
+
1953
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1954
+
1952
1955
 
1956
+ <!-- show Note under table in preface (ex. abstract) sections -->
1957
+ <!-- empty, because notes show at page side in main sections -->
1958
+ <!-- <xsl:if test="$namespace = 'bipm'">
1959
+ <xsl:choose>
1960
+ <xsl:when test="ancestor::*[local-name()='preface']">
1961
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1962
+ </xsl:when>
1963
+ <xsl:otherwise>
1964
+ <fo:block/>
1965
+ </xsl:otherwise>
1966
+ </xsl:choose>
1967
+ </xsl:if> -->
1953
1968
 
1954
1969
 
1955
1970
  <!-- horizontal row separator -->
@@ -2012,7 +2027,11 @@
2012
2027
 
2013
2028
 
2014
2029
 
2015
- <!-- except gb and bipm -->
2030
+
2031
+
2032
+
2033
+
2034
+ <!-- except gb -->
2016
2035
 
2017
2036
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2018
2037
 
@@ -2100,6 +2119,9 @@
2100
2119
 
2101
2120
 
2102
2121
 
2122
+ <!-- <xsl:if test="$namespace = 'bipm'">
2123
+ <xsl:attribute name="height">8mm</xsl:attribute>
2124
+ </xsl:if> -->
2103
2125
 
2104
2126
  <xsl:apply-templates/>
2105
2127
  </fo:table-row>
@@ -3245,6 +3267,8 @@
3245
3267
 
3246
3268
 
3247
3269
 
3270
+
3271
+
3248
3272
  <fo:inline xsl:use-attribute-sets="note-name-style">
3249
3273
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3250
3274
  </fo:inline>
@@ -2496,6 +2496,7 @@
2496
2496
 
2497
2497
 
2498
2498
 
2499
+
2499
2500
  </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">
2500
2501
 
2501
2502
 
@@ -3031,12 +3032,26 @@
3031
3032
 
3032
3033
 
3033
3034
 
3034
- <!-- except gb and bipm -->
3035
3035
 
3036
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
3037
3036
 
3038
3037
 
3038
+ <!-- except gb -->
3039
+
3040
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
3041
+
3039
3042
 
3043
+ <!-- show Note under table in preface (ex. abstract) sections -->
3044
+ <!-- empty, because notes show at page side in main sections -->
3045
+ <!-- <xsl:if test="$namespace = 'bipm'">
3046
+ <xsl:choose>
3047
+ <xsl:when test="ancestor::*[local-name()='preface']">
3048
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
3049
+ </xsl:when>
3050
+ <xsl:otherwise>
3051
+ <fo:block/>
3052
+ </xsl:otherwise>
3053
+ </xsl:choose>
3054
+ </xsl:if> -->
3040
3055
 
3041
3056
 
3042
3057
  <!-- horizontal row separator -->
@@ -3099,7 +3114,11 @@
3099
3114
 
3100
3115
 
3101
3116
 
3102
- <!-- except gb and bipm -->
3117
+
3118
+
3119
+
3120
+
3121
+ <!-- except gb -->
3103
3122
 
3104
3123
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
3105
3124
 
@@ -3187,6 +3206,9 @@
3187
3206
 
3188
3207
 
3189
3208
 
3209
+ <!-- <xsl:if test="$namespace = 'bipm'">
3210
+ <xsl:attribute name="height">8mm</xsl:attribute>
3211
+ </xsl:if> -->
3190
3212
 
3191
3213
  <xsl:apply-templates/>
3192
3214
  </fo:table-row>
@@ -4332,6 +4354,8 @@
4332
4354
 
4333
4355
 
4334
4356
 
4357
+
4358
+
4335
4359
  <fo:inline xsl:use-attribute-sets="note-name-style">
4336
4360
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
4337
4361
  </fo:inline>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "1.2.5"
3
+ VERSION = "1.2.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-nist
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.5
4
+ version: 1.2.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: htmlentities
@@ -257,9 +257,7 @@ executables: []
257
257
  extensions: []
258
258
  extra_rdoc_files: []
259
259
  files:
260
- - ".github/workflows/macos.yml"
261
- - ".github/workflows/ubuntu.yml"
262
- - ".github/workflows/windows.yml"
260
+ - ".github/workflows/rake.yml"
263
261
  - ".hound.yml"
264
262
  - ".rubocop.yml"
265
263
  - CODE_OF_CONDUCT.md
@@ -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