metanorma-iho 0.2.5 → 0.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: 220adb84380d83295f89f7657a7311c2242c0b36ca7ad3cf8f87badc7a53d9a9
4
- data.tar.gz: b5d713d761cc297c8cb434912eb1ebb3b8ee541036f05679341c62d94141ec45
3
+ metadata.gz: a0c2a686f87ad955be0535dc3f7dcf731a6dbe3ff9cc9e19590e9f405cae388a
4
+ data.tar.gz: aef7a3c731c28b32b6f7e31e9b21f8f4991bfb85f69da21f2cccf2a41d478d28
5
5
  SHA512:
6
- metadata.gz: 1046417d144ae07ced41c663572cc23f4b95526b61d0a59f5f8525b3b4e38906e70c2737cc54de5488f556e2e58f878008792f82352485875829662b1372bbb3
7
- data.tar.gz: 7f1a7d1208ace1b629eb26214ac2938f8e1bc45b1c6897b4cdac08d67182d609d5c5ee06d7ed9cbd259aa007a7eaf43856f1c606068fa969734375715db991db
6
+ metadata.gz: 89cc2a1a41714537930fabb066aa4ad205cf5d0ee0bab66d8ced8fd23b7c3b8f8cabecc1c9e388e32e97ce73c507c8b21445e715ba388849c08c736dd29acf3b
7
+ data.tar.gz: e719eabc24d5dbc2f4fdf5b9fd9679d2edaa661c3b2e3764e0a4b4e702daaee352add08c27d9708d28412816c184b78658fa5b0e9f0dad2eac7ae7c297f407a6
@@ -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
 
@@ -1280,6 +1280,7 @@
1280
1280
 
1281
1281
 
1282
1282
 
1283
+
1283
1284
  </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">
1284
1285
 
1285
1286
 
@@ -1837,12 +1838,26 @@
1837
1838
 
1838
1839
 
1839
1840
 
1840
- <!-- except gb and bipm -->
1841
1841
 
1842
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1843
1842
 
1844
1843
 
1844
+ <!-- except gb -->
1845
1845
 
1846
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1847
+
1848
+
1849
+ <!-- show Note under table in preface (ex. abstract) sections -->
1850
+ <!-- empty, because notes show at page side in main sections -->
1851
+ <!-- <xsl:if test="$namespace = 'bipm'">
1852
+ <xsl:choose>
1853
+ <xsl:when test="ancestor::*[local-name()='preface']">
1854
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1855
+ </xsl:when>
1856
+ <xsl:otherwise>
1857
+ <fo:block/>
1858
+ </xsl:otherwise>
1859
+ </xsl:choose>
1860
+ </xsl:if> -->
1846
1861
 
1847
1862
 
1848
1863
  <!-- horizontal row separator -->
@@ -1905,7 +1920,11 @@
1905
1920
 
1906
1921
 
1907
1922
 
1908
- <!-- except gb and bipm -->
1923
+
1924
+
1925
+
1926
+
1927
+ <!-- except gb -->
1909
1928
 
1910
1929
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1911
1930
 
@@ -1990,6 +2009,9 @@
1990
2009
 
1991
2010
 
1992
2011
 
2012
+ <!-- <xsl:if test="$namespace = 'bipm'">
2013
+ <xsl:attribute name="height">8mm</xsl:attribute>
2014
+ </xsl:if> -->
1993
2015
 
1994
2016
  <xsl:apply-templates/>
1995
2017
  </fo:table-row>
@@ -3112,6 +3134,8 @@
3112
3134
 
3113
3135
 
3114
3136
 
3137
+
3138
+
3115
3139
  <fo:inline xsl:use-attribute-sets="note-name-style">
3116
3140
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3117
3141
  </fo:inline>
@@ -1280,6 +1280,7 @@
1280
1280
 
1281
1281
 
1282
1282
 
1283
+
1283
1284
  </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">
1284
1285
 
1285
1286
 
@@ -1837,12 +1838,26 @@
1837
1838
 
1838
1839
 
1839
1840
 
1840
- <!-- except gb and bipm -->
1841
1841
 
1842
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1843
1842
 
1844
1843
 
1844
+ <!-- except gb -->
1845
1845
 
1846
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1847
+
1848
+
1849
+ <!-- show Note under table in preface (ex. abstract) sections -->
1850
+ <!-- empty, because notes show at page side in main sections -->
1851
+ <!-- <xsl:if test="$namespace = 'bipm'">
1852
+ <xsl:choose>
1853
+ <xsl:when test="ancestor::*[local-name()='preface']">
1854
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1855
+ </xsl:when>
1856
+ <xsl:otherwise>
1857
+ <fo:block/>
1858
+ </xsl:otherwise>
1859
+ </xsl:choose>
1860
+ </xsl:if> -->
1846
1861
 
1847
1862
 
1848
1863
  <!-- horizontal row separator -->
@@ -1905,7 +1920,11 @@
1905
1920
 
1906
1921
 
1907
1922
 
1908
- <!-- except gb and bipm -->
1923
+
1924
+
1925
+
1926
+
1927
+ <!-- except gb -->
1909
1928
 
1910
1929
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1911
1930
 
@@ -1990,6 +2009,9 @@
1990
2009
 
1991
2010
 
1992
2011
 
2012
+ <!-- <xsl:if test="$namespace = 'bipm'">
2013
+ <xsl:attribute name="height">8mm</xsl:attribute>
2014
+ </xsl:if> -->
1993
2015
 
1994
2016
  <xsl:apply-templates/>
1995
2017
  </fo:table-row>
@@ -3112,6 +3134,8 @@
3112
3134
 
3113
3135
 
3114
3136
 
3137
+
3138
+
3115
3139
  <fo:inline xsl:use-attribute-sets="note-name-style">
3116
3140
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3117
3141
  </fo:inline>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.2.5"
3
+ VERSION = "0.2.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.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
@@ -202,9 +202,7 @@ executables: []
202
202
  extensions: []
203
203
  extra_rdoc_files: []
204
204
  files:
205
- - ".github/workflows/macos.yml"
206
- - ".github/workflows/ubuntu.yml"
207
- - ".github/workflows/windows.yml"
205
+ - ".github/workflows/rake.yml"
208
206
  - CODE_OF_CONDUCT.md
209
207
  - Gemfile
210
208
  - LICENSE
@@ -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