metanorma-ogc 1.2.5 → 1.2.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -1238,6 +1238,7 @@
1238
1238
 
1239
1239
 
1240
1240
 
1241
+
1241
1242
  </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">
1242
1243
 
1243
1244
 
@@ -1802,12 +1803,26 @@
1802
1803
 
1803
1804
 
1804
1805
 
1805
- <!-- except gb and bipm -->
1806
1806
 
1807
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1808
1807
 
1809
1808
 
1809
+ <!-- except gb -->
1810
+
1811
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1812
+
1810
1813
 
1814
+ <!-- show Note under table in preface (ex. abstract) sections -->
1815
+ <!-- empty, because notes show at page side in main sections -->
1816
+ <!-- <xsl:if test="$namespace = 'bipm'">
1817
+ <xsl:choose>
1818
+ <xsl:when test="ancestor::*[local-name()='preface']">
1819
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1820
+ </xsl:when>
1821
+ <xsl:otherwise>
1822
+ <fo:block/>
1823
+ </xsl:otherwise>
1824
+ </xsl:choose>
1825
+ </xsl:if> -->
1811
1826
 
1812
1827
 
1813
1828
  <!-- horizontal row separator -->
@@ -1870,7 +1885,11 @@
1870
1885
 
1871
1886
 
1872
1887
 
1873
- <!-- except gb and bipm -->
1888
+
1889
+
1890
+
1891
+
1892
+ <!-- except gb -->
1874
1893
 
1875
1894
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1876
1895
 
@@ -1955,6 +1974,9 @@
1955
1974
 
1956
1975
 
1957
1976
 
1977
+ <!-- <xsl:if test="$namespace = 'bipm'">
1978
+ <xsl:attribute name="height">8mm</xsl:attribute>
1979
+ </xsl:if> -->
1958
1980
 
1959
1981
  <xsl:apply-templates/>
1960
1982
  </fo:table-row>
@@ -3092,6 +3114,8 @@
3092
3114
 
3093
3115
 
3094
3116
 
3117
+
3118
+
3095
3119
  <fo:inline xsl:use-attribute-sets="note-name-style">
3096
3120
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3097
3121
  </fo:inline>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
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-ogc
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: metanorma-standoc
@@ -201,9 +201,7 @@ executables: []
201
201
  extensions: []
202
202
  extra_rdoc_files: []
203
203
  files:
204
- - ".github/workflows/macos.yml"
205
- - ".github/workflows/ubuntu.yml"
206
- - ".github/workflows/windows.yml"
204
+ - ".github/workflows/rake.yml"
207
205
  - ".gitignore"
208
206
  - ".hound.yml"
209
207
  - ".rubocop.yml"
@@ -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