metanorma-un 0.5.5 → 0.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +44 -0
  3. data/lib/asciidoctor/un/isodoc.rng +1 -43
  4. data/lib/isodoc/un/html/htmlstyle.css +4 -0
  5. data/lib/isodoc/un/pdf_convert.rb +2 -2
  6. data/lib/isodoc/un/un.plenary-attachment.xsl +27 -3
  7. data/lib/isodoc/un/un.plenary.xsl +27 -3
  8. data/lib/isodoc/un/un.recommendation.xsl +27 -3
  9. data/lib/metanorma/un/version.rb +1 -1
  10. metadata +3 -5
  11. data/.github/workflows/macos.yml +0 -38
  12. data/.github/workflows/ubuntu.yml +0 -56
  13. data/.github/workflows/windows.yml +0 -40
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a89fbe7a8aacf50f53139a549d660b7d0706321463965c5050bb6c2c1d4acdac
4
- data.tar.gz: f43a231cf294d7f45becca41ce489d6534811cc9f414a0163aeffcb3aa199415
3
+ metadata.gz: 79714156551c88f6bc3eefeebdbeffe4193e8dbd1733c37daafe177a86eacea0
4
+ data.tar.gz: 5840e63035de8487fc98ef7b666b25f30aaaf3176e0d2b117f9b2e8d4797eda1
5
5
  SHA512:
6
- metadata.gz: 62377ec55bd35ef893b6ac9bf80676a2873cdd5a63cf6635412b6ceb294aa6d85b352c535392647e633691fd9c1424a740460586e6f3395c1a8958e230e6ea98
7
- data.tar.gz: 75337ef3e5cab047fae4c81d3e879291d904de3e58bb07bdf976e1bb3197789679b0fecd6f9ecf20b3489701d9a4036ef6584b1f969e56996dd24300195425e4
6
+ metadata.gz: 894f12d8ecf83d3d6b6550e034bcc14412788df9c1f094457ff09590e133385ccb424c7ed3d7048edb82a5cd162f63ccae0cdcb82bf80783e108d529ab5ad882
7
+ data.tar.gz: c80957880910920416881f277c72b7990cc50cda1b7bbccda5457916a6ec8b8d175dc5a7c1138c9c662acca0aac23ca08151ec2f117a9cb30f90a8b3385100c7
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/un/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/un/html/htmlstyle.css CHANGED
@@ -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
 
data/lib/isodoc/un/pdf_convert.rb CHANGED
@@ -16,10 +16,10 @@ module IsoDoc
16
16
  def pdf_stylesheet(docxml)
17
17
  case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
18
18
  when "plenary", "agenda", "budgetary"
19
- "unece.plenary.xsl"
19
+ "un.plenary.xsl"
20
20
  else
21
21
  docxml&.at(ns("//bibdata/ext/session/*")) ?
22
- "un.plenary-attachment.xsl" : "unece.recommendation.xsl"
22
+ "un.plenary-attachment.xsl" : "un.recommendation.xsl"
23
23
  end
24
24
  end
25
25
  end
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -1475,6 +1475,7 @@
1475
1475
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1476
1476
 
1477
1477
 
1478
+
1478
1479
  </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">
1479
1480
 
1480
1481
 
@@ -2012,12 +2013,26 @@
2012
2013
 
2013
2014
 
2014
2015
 
2015
- <!-- except gb and bipm -->
2016
2016
 
2017
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2018
2017
 
2019
2018
 
2019
+ <!-- except gb -->
2020
+
2021
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2022
+
2020
2023
 
2024
+ <!-- show Note under table in preface (ex. abstract) sections -->
2025
+ <!-- empty, because notes show at page side in main sections -->
2026
+ <!-- <xsl:if test="$namespace = 'bipm'">
2027
+ <xsl:choose>
2028
+ <xsl:when test="ancestor::*[local-name()='preface']">
2029
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2030
+ </xsl:when>
2031
+ <xsl:otherwise>
2032
+ <fo:block/>
2033
+ </xsl:otherwise>
2034
+ </xsl:choose>
2035
+ </xsl:if> -->
2021
2036
 
2022
2037
 
2023
2038
  <!-- horizontal row separator -->
@@ -2080,7 +2095,11 @@
2080
2095
 
2081
2096
 
2082
2097
 
2083
- <!-- except gb and bipm -->
2098
+
2099
+
2100
+
2101
+
2102
+ <!-- except gb -->
2084
2103
 
2085
2104
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2086
2105
 
@@ -2169,6 +2188,9 @@
2169
2188
  </xsl:if>
2170
2189
 
2171
2190
 
2191
+ <!-- <xsl:if test="$namespace = 'bipm'">
2192
+ <xsl:attribute name="height">8mm</xsl:attribute>
2193
+ </xsl:if> -->
2172
2194
 
2173
2195
  <xsl:apply-templates/>
2174
2196
  </fo:table-row>
@@ -3310,6 +3332,8 @@
3310
3332
 
3311
3333
 
3312
3334
 
3335
+
3336
+
3313
3337
  <fo:inline xsl:use-attribute-sets="note-name-style">
3314
3338
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3315
3339
  </fo:inline>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -1475,6 +1475,7 @@
1475
1475
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1476
1476
 
1477
1477
 
1478
+
1478
1479
  </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">
1479
1480
 
1480
1481
 
@@ -2012,12 +2013,26 @@
2012
2013
 
2013
2014
 
2014
2015
 
2015
- <!-- except gb and bipm -->
2016
2016
 
2017
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2018
2017
 
2019
2018
 
2019
+ <!-- except gb -->
2020
+
2021
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2022
+
2020
2023
 
2024
+ <!-- show Note under table in preface (ex. abstract) sections -->
2025
+ <!-- empty, because notes show at page side in main sections -->
2026
+ <!-- <xsl:if test="$namespace = 'bipm'">
2027
+ <xsl:choose>
2028
+ <xsl:when test="ancestor::*[local-name()='preface']">
2029
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2030
+ </xsl:when>
2031
+ <xsl:otherwise>
2032
+ <fo:block/>
2033
+ </xsl:otherwise>
2034
+ </xsl:choose>
2035
+ </xsl:if> -->
2021
2036
 
2022
2037
 
2023
2038
  <!-- horizontal row separator -->
@@ -2080,7 +2095,11 @@
2080
2095
 
2081
2096
 
2082
2097
 
2083
- <!-- except gb and bipm -->
2098
+
2099
+
2100
+
2101
+
2102
+ <!-- except gb -->
2084
2103
 
2085
2104
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2086
2105
 
@@ -2169,6 +2188,9 @@
2169
2188
  </xsl:if>
2170
2189
 
2171
2190
 
2191
+ <!-- <xsl:if test="$namespace = 'bipm'">
2192
+ <xsl:attribute name="height">8mm</xsl:attribute>
2193
+ </xsl:if> -->
2172
2194
 
2173
2195
  <xsl:apply-templates/>
2174
2196
  </fo:table-row>
@@ -3310,6 +3332,8 @@
3310
3332
 
3311
3333
 
3312
3334
 
3335
+
3336
+
3313
3337
  <fo:inline xsl:use-attribute-sets="note-name-style">
3314
3338
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3315
3339
  </fo:inline>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -1367,6 +1367,7 @@
1367
1367
  <xsl:attribute name="border-top">0.1mm solid black</xsl:attribute>
1368
1368
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1369
1369
 
1370
+
1370
1371
  </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">
1371
1372
 
1372
1373
 
@@ -1910,12 +1911,26 @@
1910
1911
 
1911
1912
 
1912
1913
 
1913
- <!-- except gb and bipm -->
1914
1914
 
1915
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1916
1915
 
1917
1916
 
1917
+ <!-- except gb -->
1918
+
1919
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1920
+
1918
1921
 
1922
+ <!-- show Note under table in preface (ex. abstract) sections -->
1923
+ <!-- empty, because notes show at page side in main sections -->
1924
+ <!-- <xsl:if test="$namespace = 'bipm'">
1925
+ <xsl:choose>
1926
+ <xsl:when test="ancestor::*[local-name()='preface']">
1927
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1928
+ </xsl:when>
1929
+ <xsl:otherwise>
1930
+ <fo:block/>
1931
+ </xsl:otherwise>
1932
+ </xsl:choose>
1933
+ </xsl:if> -->
1919
1934
 
1920
1935
 
1921
1936
  <!-- horizontal row separator -->
@@ -1978,7 +1993,11 @@
1978
1993
 
1979
1994
 
1980
1995
 
1981
- <!-- except gb and bipm -->
1996
+
1997
+
1998
+
1999
+
2000
+ <!-- except gb -->
1982
2001
 
1983
2002
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1984
2003
 
@@ -2063,6 +2082,9 @@
2063
2082
 
2064
2083
 
2065
2084
 
2085
+ <!-- <xsl:if test="$namespace = 'bipm'">
2086
+ <xsl:attribute name="height">8mm</xsl:attribute>
2087
+ </xsl:if> -->
2066
2088
 
2067
2089
  <xsl:apply-templates/>
2068
2090
  </fo:table-row>
@@ -3212,6 +3234,8 @@
3212
3234
 
3213
3235
 
3214
3236
 
3237
+
3238
+
3215
3239
  <fo:inline xsl:use-attribute-sets="note-name-style">
3216
3240
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3217
3241
  </fo:inline>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.5.5"
3
+ VERSION = "0.5.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5
4
+ version: 0.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: roman-numerals
@@ -230,9 +230,7 @@ executables: []
230
230
  extensions: []
231
231
  extra_rdoc_files: []
232
232
  files:
233
- - ".github/workflows/macos.yml"
234
- - ".github/workflows/ubuntu.yml"
235
- - ".github/workflows/windows.yml"
233
+ - ".github/workflows/rake.yml"
236
234
  - ".gitignore"
237
235
  - ".hound.yml"
238
236
  - ".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