metanorma-cc 1.7.3 → 1.7.4

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: 4246fc710a6116a54dbb54fb9d983194f44fd97c1874d5e1caa684a3b8729974
4
- data.tar.gz: 6af597c710faabc0b2eb57f31e32e6349103f1d7472259221a445d9bb06475f0
3
+ metadata.gz: 16288509334e991274063c83ad8dd4df27f5064eb72e38e708060785ac440253
4
+ data.tar.gz: cf91c3a36c694b8188d198475a992e4c4b442b7e0836377e4521cb4412d004be
5
5
  SHA512:
6
- metadata.gz: fa96ffbafe4f555da75dd05a02b0eecf6b0f3b6f2b56c757818d93749872a262b9ad24f6b46ca644df5244ee530e0b928aab819f7aaf8bb7df3a98f9f0779da1
7
- data.tar.gz: bbe9b70f768719e9d4f004f22495268e5fbfa6cfae88ae977de8ea19214de73cbfa5732b43be8847ba0d07aba0fa8ee9524de6fda06d704d250158aac90cca6c
6
+ metadata.gz: 370ae0b96c03a413cfe7d43bb6d1ec3a0dd17ec0098e70b323dc45d740d96af37c1c1ea639429e60280fd2b62b3a87135de319f93ccea082673c55af8605e1bb
7
+ data.tar.gz: 59e4462db2c88d3096b4b216e67c8ebfcec2fda10f6abdc8459e1763a0baab19a434af8fb7f7d7f4e2c81da951e372762cfdd7f6af27fbf61f23a8578d935081
@@ -16,19 +16,9 @@ jobs:
16
16
  strategy:
17
17
  fail-fast: false
18
18
  matrix:
19
- ruby: [ '2.7', '2.6', '2.5', '2.4' ]
19
+ ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
20
20
  os: [ ubuntu-latest, windows-latest, macos-latest ]
21
21
  experimental: [ false ]
22
- include:
23
- - ruby: '3.0'
24
- os: 'ubuntu-latest'
25
- experimental: true
26
- - ruby: '3.0'
27
- os: 'windows-latest'
28
- experimental: true
29
- - ruby: '3.0'
30
- os: 'macos-latest'
31
- experimental: true
32
22
  steps:
33
23
  - uses: actions/checkout@v2
34
24
  with:
@@ -40,3 +30,14 @@ jobs:
40
30
  bundler-cache: true
41
31
 
42
32
  - run: bundle exec rake
33
+
34
+ tests-passed:
35
+ needs: rake
36
+ runs-on: ubuntu-latest
37
+ steps:
38
+ - uses: peter-evans/repository-dispatch@v1
39
+ with:
40
+ token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
41
+ repository: ${{ github.repository }}
42
+ event-type: tests-passed
43
+ client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
data/.hound.yml CHANGED
@@ -1,3 +1,5 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
1
3
  ruby:
2
- Enabled: true
4
+ enabled: true
3
5
  config_file: .rubocop.yml
data/.rubocop.yml CHANGED
@@ -1,12 +1,10 @@
1
- # This project follows the Ribose OSS style guide.
2
- # https://github.com/riboseinc/oss-guides
3
- # All project-specific additions and overrides should be specified in this file.
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
4
3
  inherit_from:
5
4
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
6
5
 
7
6
  # local repo-specific modifications
7
+ # ...
8
8
 
9
9
  AllCops:
10
- DisplayCopNames: false
11
- StyleGuideCopsOnly: false
12
10
  TargetRubyVersion: 2.4
@@ -73,6 +73,9 @@
73
73
  <optional>
74
74
  <ref name="doctype"/>
75
75
  </optional>
76
+ <optional>
77
+ <ref name="docsubtype"/>
78
+ </optional>
76
79
  <ref name="editorialgroup"/>
77
80
  <zeroOrMore>
78
81
  <ref name="ics"/>
@@ -45,6 +45,11 @@
45
45
  <optional>
46
46
  <attribute name="alt"/>
47
47
  </optional>
48
+ <optional>
49
+ <attribute name="updatetype">
50
+ <data type="boolean"/>
51
+ </attribute>
52
+ </optional>
48
53
  <text/>
49
54
  </element>
50
55
  </define>
@@ -543,6 +548,9 @@
543
548
  </define>
544
549
  <define name="BibDataExtensionType">
545
550
  <ref name="doctype"/>
551
+ <optional>
552
+ <ref name="docsubtype"/>
553
+ </optional>
546
554
  <optional>
547
555
  <ref name="editorialgroup"/>
548
556
  </optional>
@@ -890,6 +898,14 @@
890
898
  </define>
891
899
  </include>
892
900
  <!-- end overrides -->
901
+ <define name="docsubtype">
902
+ <element name="docsubtype">
903
+ <ref name="DocumentSubtype"/>
904
+ </element>
905
+ </define>
906
+ <define name="DocumentSubtype">
907
+ <text/>
908
+ </define>
893
909
  <define name="colgroup">
894
910
  <element name="colgroup">
895
911
  <oneOrMore>
@@ -969,6 +969,7 @@
969
969
 
970
970
 
971
971
 
972
+
972
973
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
973
974
  <xsl:attribute name="white-space">pre</xsl:attribute>
974
975
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -1032,6 +1033,7 @@
1032
1033
 
1033
1034
 
1034
1035
 
1036
+
1035
1037
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
1036
1038
 
1037
1039
 
@@ -1054,9 +1056,7 @@
1054
1056
 
1055
1057
 
1056
1058
 
1057
-
1058
-
1059
-
1059
+
1060
1060
 
1061
1061
 
1062
1062
 
@@ -1104,6 +1104,7 @@
1104
1104
 
1105
1105
 
1106
1106
 
1107
+
1107
1108
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1108
1109
 
1109
1110
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1126,6 +1127,7 @@
1126
1127
 
1127
1128
 
1128
1129
 
1130
+
1129
1131
  </xsl:attribute-set><xsl:attribute-set name="eref-style">
1130
1132
 
1131
1133
 
@@ -1134,6 +1136,7 @@
1134
1136
 
1135
1137
 
1136
1138
 
1139
+
1137
1140
  </xsl:attribute-set><xsl:attribute-set name="note-style">
1138
1141
 
1139
1142
 
@@ -1227,10 +1230,12 @@
1227
1230
 
1228
1231
 
1229
1232
 
1233
+
1230
1234
  </xsl:attribute-set><xsl:attribute-set name="origin-style">
1231
1235
 
1232
1236
 
1233
1237
 
1238
+
1234
1239
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1235
1240
 
1236
1241
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
@@ -1300,8 +1305,10 @@
1300
1305
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1301
1306
 
1302
1307
 
1308
+
1303
1309
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1304
1310
 
1311
+
1305
1312
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
1306
1313
 
1307
1314
 
@@ -2049,6 +2056,7 @@
2049
2056
 
2050
2057
 
2051
2058
 
2059
+
2052
2060
  <xsl:if test="$lang = 'ar'">
2053
2061
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2054
2062
  </xsl:if>
@@ -2410,6 +2418,7 @@
2410
2418
 
2411
2419
 
2412
2420
 
2421
+
2413
2422
  <xsl:variable name="title-key">
2414
2423
 
2415
2424
 
@@ -2693,6 +2702,8 @@
2693
2702
 
2694
2703
  <xsl:apply-templates/>
2695
2704
  </fo:inline>
2705
+ </xsl:template><xsl:template match="*[local-name()='padding']">
2706
+ <fo:inline padding-right="{@value}"> </fo:inline>
2696
2707
  </xsl:template><xsl:template match="*[local-name()='sup']">
2697
2708
  <fo:inline font-size="80%" vertical-align="super">
2698
2709
  <xsl:apply-templates/>
@@ -3185,6 +3196,16 @@
3185
3196
  <mathml:mspace width="0.5ex"/>
3186
3197
  </xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
3187
3198
  <xsl:variable name="target">
3199
+ <xsl:choose>
3200
+ <xsl:when test="@updatetype = 'true'">
3201
+ <xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
3202
+ </xsl:when>
3203
+ <xsl:otherwise>
3204
+ <xsl:value-of select="normalize-space(@target)"/>
3205
+ </xsl:otherwise>
3206
+ </xsl:choose>
3207
+ </xsl:variable>
3208
+ <xsl:variable name="target_text">
3188
3209
  <xsl:choose>
3189
3210
  <xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
3190
3211
  <xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
@@ -3197,19 +3218,19 @@
3197
3218
  <fo:inline xsl:use-attribute-sets="link-style">
3198
3219
 
3199
3220
  <xsl:choose>
3200
- <xsl:when test="$target = ''">
3221
+ <xsl:when test="$target_text = ''">
3201
3222
  <xsl:apply-templates/>
3202
3223
  </xsl:when>
3203
3224
  <xsl:otherwise>
3204
- <fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
3225
+ <fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
3205
3226
  <xsl:choose>
3206
3227
  <xsl:when test="normalize-space(.) = ''">
3207
- <!-- <xsl:value-of select="$target"/> -->
3208
3228
  <xsl:call-template name="add-zero-spaces-link-java">
3209
- <xsl:with-param name="text" select="$target"/>
3229
+ <xsl:with-param name="text" select="$target_text"/>
3210
3230
  </xsl:call-template>
3211
3231
  </xsl:when>
3212
3232
  <xsl:otherwise>
3233
+ <!-- output text from <link>text</link> -->
3213
3234
  <xsl:apply-templates/>
3214
3235
  </xsl:otherwise>
3215
3236
  </xsl:choose>
@@ -3783,6 +3804,7 @@
3783
3804
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
3784
3805
 
3785
3806
  <fo:block-container margin-left="0mm">
3807
+ <xsl:copy-of select="@id"/>
3786
3808
  <xsl:if test="parent::*[local-name() = 'note']">
3787
3809
  <xsl:attribute name="margin-left">
3788
3810
  <xsl:choose>
@@ -4060,6 +4082,7 @@
4060
4082
  </xsl:template><xsl:template match="*[local-name() = 'example']">
4061
4083
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
4062
4084
 
4085
+
4063
4086
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4064
4087
 
4065
4088
  <xsl:variable name="element">
@@ -4169,12 +4192,13 @@
4169
4192
 
4170
4193
 
4171
4194
 
4195
+
4172
4196
  <xsl:call-template name="getTitle">
4173
4197
  <xsl:with-param name="name" select="'title-source'"/>
4174
4198
  </xsl:call-template>
4199
+ <xsl:text>: </xsl:text>
4175
4200
 
4176
4201
 
4177
- <xsl:text>: </xsl:text>
4178
4202
  </fo:inline>
4179
4203
 
4180
4204
  <fo:inline xsl:use-attribute-sets="origin-style">
@@ -4301,6 +4325,7 @@
4301
4325
 
4302
4326
 
4303
4327
 
4328
+
4304
4329
  </xsl:variable>
4305
4330
 
4306
4331
  <xsl:variable name="padding-right">
@@ -4971,6 +4996,9 @@
4971
4996
  <xsl:when test="parent::*[local-name() = 'preface']">
4972
4997
  <xsl:value-of select="$level_total - 1"/>
4973
4998
  </xsl:when>
4999
+ <xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
5000
+ <xsl:value-of select="$level_total - 1"/>
5001
+ </xsl:when>
4974
5002
  <xsl:when test="ancestor::*[local-name() = 'preface']">
4975
5003
  <xsl:value-of select="$level_total - 2"/>
4976
5004
  </xsl:when>
@@ -5111,7 +5139,14 @@
5111
5139
  <xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
5112
5140
  <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
5113
5141
  </xsl:when>
5114
- <xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
5142
+ <xsl:otherwise>
5143
+ <xsl:variable name="key_">
5144
+ <xsl:call-template name="capitalize">
5145
+ <xsl:with-param name="str" select="translate($key, '_', ' ')"/>
5146
+ </xsl:call-template>
5147
+ </xsl:variable>
5148
+ <xsl:value-of select="$key_"/>
5149
+ </xsl:otherwise>
5115
5150
  </xsl:choose>
5116
5151
 
5117
5152
  </xsl:template><xsl:template name="setTrackChangesStyles">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "1.7.3".freeze
3
+ VERSION = "1.7.4".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-cc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.3
4
+ version: 1.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-05-24 00:00:00.000000000 Z
11
+ date: 2021-06-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic