metanorma-un 0.9.6 → 0.9.7

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/un/un.plenary-attachment.xsl +15 -6
  3. data/lib/isodoc/un/un.plenary.xsl +15 -6
  4. data/lib/isodoc/un/un.recommendation.xsl +15 -6
  5. data/lib/metanorma/un/converter.rb +3 -0
  6. data/lib/metanorma/un/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 78b9305eb6614a7bec670abe0970bf5bdb14c07b1a0047e1b5411c850232f27f
4
- data.tar.gz: e0131738e33f8e0937b7bfcb460fc9c70bb8da925716e2a9513a43f7909346bb
3
+ metadata.gz: 29292d69fa96f3e607e00ff39abf3787ce5f27d5bdb65141b8030acbc01f7b9e
4
+ data.tar.gz: 8cea34c39e5970e4f03f8cae444170a7ae249ad01fffae7a798648524df70e99
5
5
  SHA512:
6
- metadata.gz: 4a411e9e1591ffec208efed4fa0ed768f6c180922a5629e69bd2b6e09aebddf76e19e58fe94d6aa1a0461acfcb8ad6e085a0ea9ed19b539ae30803e7f4c69890
7
- data.tar.gz: ced5e4b35a56e25593299a88c90d4e4e0fbc545d20516170b0a96bd8748ea5840a3f2afa1f09ff8ca76facb4f0948af942e0eb8d44db5f5cd2bbf0581f6505cd
6
+ metadata.gz: e93209ba3a682e76208c79a94f93f7ec6f8e8076013ed81f60a22dc35110ed9c1cc62a6527f8b728ef139536b161df6aed667847eff02a045949d066239f7c96
7
+ data.tar.gz: a7b55069b5727c72ac572ea4a17606b816e5f8fb5d8f6dd070c75ac2abf92c2e743d2e7f8a59617c28edd3d5951b971228b1f0d9669cf9f4293e88ed05ecb9e9
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -1184,6 +1184,9 @@
1184
1184
  <xsl:attribute-set name="import-style">
1185
1185
  </xsl:attribute-set>
1186
1186
 
1187
+ <xsl:attribute-set name="component-style">
1188
+ </xsl:attribute-set>
1189
+
1187
1190
  <xsl:attribute-set name="recommendation-style">
1188
1191
 
1189
1192
  </xsl:attribute-set>
@@ -7029,41 +7032,47 @@
7029
7032
  </fo:block>
7030
7033
  </xsl:template>
7031
7034
 
7032
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7035
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7033
7036
  <fo:block xsl:use-attribute-sets="inherit-style">
7034
7037
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7035
7038
  </fo:block>
7036
7039
  </xsl:template>
7037
7040
 
7038
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7041
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7039
7042
  <fo:block xsl:use-attribute-sets="description-style">
7040
7043
  <xsl:apply-templates/>
7041
7044
  </fo:block>
7042
7045
  </xsl:template>
7043
7046
 
7044
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7047
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7045
7048
  <fo:block xsl:use-attribute-sets="specification-style">
7046
7049
  <xsl:apply-templates/>
7047
7050
  </fo:block>
7048
7051
  </xsl:template>
7049
7052
 
7050
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7053
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7051
7054
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7052
7055
  <xsl:apply-templates/>
7053
7056
  </fo:block>
7054
7057
  </xsl:template>
7055
7058
 
7056
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7059
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7057
7060
  <fo:block xsl:use-attribute-sets="verification-style">
7058
7061
  <xsl:apply-templates/>
7059
7062
  </fo:block>
7060
7063
  </xsl:template>
7061
7064
 
7062
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7065
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7063
7066
  <fo:block xsl:use-attribute-sets="import-style">
7064
7067
  <xsl:apply-templates/>
7065
7068
  </fo:block>
7066
7069
  </xsl:template>
7070
+
7071
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7072
+ <fo:block xsl:use-attribute-sets="component-style">
7073
+ <xsl:apply-templates/>
7074
+ </fo:block>
7075
+ </xsl:template>
7067
7076
  <!-- ========== -->
7068
7077
  <!-- END -->
7069
7078
  <!-- ========== -->
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -1184,6 +1184,9 @@
1184
1184
  <xsl:attribute-set name="import-style">
1185
1185
  </xsl:attribute-set>
1186
1186
 
1187
+ <xsl:attribute-set name="component-style">
1188
+ </xsl:attribute-set>
1189
+
1187
1190
  <xsl:attribute-set name="recommendation-style">
1188
1191
 
1189
1192
  </xsl:attribute-set>
@@ -7029,41 +7032,47 @@
7029
7032
  </fo:block>
7030
7033
  </xsl:template>
7031
7034
 
7032
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7035
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7033
7036
  <fo:block xsl:use-attribute-sets="inherit-style">
7034
7037
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7035
7038
  </fo:block>
7036
7039
  </xsl:template>
7037
7040
 
7038
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7041
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7039
7042
  <fo:block xsl:use-attribute-sets="description-style">
7040
7043
  <xsl:apply-templates/>
7041
7044
  </fo:block>
7042
7045
  </xsl:template>
7043
7046
 
7044
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7047
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7045
7048
  <fo:block xsl:use-attribute-sets="specification-style">
7046
7049
  <xsl:apply-templates/>
7047
7050
  </fo:block>
7048
7051
  </xsl:template>
7049
7052
 
7050
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7053
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7051
7054
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7052
7055
  <xsl:apply-templates/>
7053
7056
  </fo:block>
7054
7057
  </xsl:template>
7055
7058
 
7056
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7059
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7057
7060
  <fo:block xsl:use-attribute-sets="verification-style">
7058
7061
  <xsl:apply-templates/>
7059
7062
  </fo:block>
7060
7063
  </xsl:template>
7061
7064
 
7062
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7065
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7063
7066
  <fo:block xsl:use-attribute-sets="import-style">
7064
7067
  <xsl:apply-templates/>
7065
7068
  </fo:block>
7066
7069
  </xsl:template>
7070
+
7071
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7072
+ <fo:block xsl:use-attribute-sets="component-style">
7073
+ <xsl:apply-templates/>
7074
+ </fo:block>
7075
+ </xsl:template>
7067
7076
  <!-- ========== -->
7068
7077
  <!-- END -->
7069
7078
  <!-- ========== -->
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -1244,6 +1244,9 @@
1244
1244
  <xsl:attribute-set name="import-style">
1245
1245
  </xsl:attribute-set>
1246
1246
 
1247
+ <xsl:attribute-set name="component-style">
1248
+ </xsl:attribute-set>
1249
+
1247
1250
  <xsl:attribute-set name="recommendation-style">
1248
1251
 
1249
1252
  </xsl:attribute-set>
@@ -7109,41 +7112,47 @@
7109
7112
  </fo:block>
7110
7113
  </xsl:template>
7111
7114
 
7112
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7115
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7113
7116
  <fo:block xsl:use-attribute-sets="inherit-style">
7114
7117
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7115
7118
  </fo:block>
7116
7119
  </xsl:template>
7117
7120
 
7118
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7121
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7119
7122
  <fo:block xsl:use-attribute-sets="description-style">
7120
7123
  <xsl:apply-templates/>
7121
7124
  </fo:block>
7122
7125
  </xsl:template>
7123
7126
 
7124
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7127
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7125
7128
  <fo:block xsl:use-attribute-sets="specification-style">
7126
7129
  <xsl:apply-templates/>
7127
7130
  </fo:block>
7128
7131
  </xsl:template>
7129
7132
 
7130
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7133
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7131
7134
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7132
7135
  <xsl:apply-templates/>
7133
7136
  </fo:block>
7134
7137
  </xsl:template>
7135
7138
 
7136
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7139
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7137
7140
  <fo:block xsl:use-attribute-sets="verification-style">
7138
7141
  <xsl:apply-templates/>
7139
7142
  </fo:block>
7140
7143
  </xsl:template>
7141
7144
 
7142
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7145
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7143
7146
  <fo:block xsl:use-attribute-sets="import-style">
7144
7147
  <xsl:apply-templates/>
7145
7148
  </fo:block>
7146
7149
  </xsl:template>
7150
+
7151
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7152
+ <fo:block xsl:use-attribute-sets="component-style">
7153
+ <xsl:apply-templates/>
7154
+ </fo:block>
7155
+ </xsl:template>
7147
7156
  <!-- ========== -->
7148
7157
  <!-- END -->
7149
7158
  <!-- ========== -->
data/lib/metanorma/un/converter.rb CHANGED
@@ -212,6 +212,9 @@ module Metanorma
212
212
  subsequence: node.attr("subsequence")))
213
213
  end
214
214
 
215
+ PREFACE_CLAUSE_NAMES = %w(donotrecognise-foreword
216
+ acknowledgements).freeze
217
+
215
218
  def sectiontype_streamline(ret)
216
219
  case ret
217
220
  when "foreword", "introduction" then "donotrecognise-foreword"
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.9.6".freeze
3
+ VERSION = "0.9.7".freeze
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.9.6
4
+ version: 0.9.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-08-08 00:00:00.000000000 Z
11
+ date: 2022-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639