metanorma-un 0.12.1 → 0.12.3

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 (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/un/metadata.rb +15 -13
  3. data/lib/isodoc/un/un.plenary-attachment.xsl +44 -6
  4. data/lib/isodoc/un/un.plenary.xsl +44 -6
  5. data/lib/isodoc/un/un.recommendation.xsl +44 -6
  6. data/lib/metanorma/un/converter.rb +0 -1
  7. data/lib/metanorma/un/version.rb +1 -1
  8. data/metanorma-un.gemspec +1 -1
  9. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ca1718fe6e550e1d258909aa0fd41cd2504819961992616742a291f59b6b26f
4
- data.tar.gz: 3115ad4a86646bac1ebed1fa17dc9e52c97da57ae8da1a5b22310ca26be77580
3
+ metadata.gz: afef4ddbab8e145f16145d3073dab882a4655888e14361bfcd0cafa8df0df6f5
4
+ data.tar.gz: 376ced8cee4bb57461c1aeaaf4dc93d1160da3e08cdc2aa455c5e30faff1d5c7
5
5
  SHA512:
6
- metadata.gz: 793116ea6802000c243ebed98df18b9ba2b8fa20bdf012e76986d80fd8974974d635a42f59aa86ac6f457107c882d26b4f0746b15a40ee57b983e0cd7d5ea576
7
- data.tar.gz: 214a04cacddd622d3e636b4b1f681a120d19c2392ad44912b4753926cfed243bda2ac294d73e0d9b92d9046b00cf399f34c27f29c5151c64ee684fd12eda53f1
6
+ metadata.gz: e78e0ea377c90c1f10c2dad246747f34d52bcc4135bf4d5528cec7cad043f72fe1546bbe53057eaf0ade3bbc421e95f3d311d3ffe61fe4b52c94adc26143b146
7
+ data.tar.gz: 5f951a6ac21e68a2bc21e4b60d855d8230f978d242fc96bbad62ca691287461cea5d9c8a8e686235510a0a2b5f7513f8eeda5483eddf855417d5f0d109541884
data/lib/isodoc/un/metadata.rb CHANGED
@@ -12,24 +12,22 @@ module IsoDoc
12
12
  end
13
13
 
14
14
  def title(isoxml, _out)
15
- main = isoxml&.at(ns("//bibdata/title"\
16
- "[@language='en' and @type='main']"))&.text
15
+ main = isoxml.at(ns("//bibdata/title[@language='en' and @type='main']"))
16
+ &.children&.to_xml
17
17
  set(:doctitle, main)
18
18
  end
19
19
 
20
20
  def subtitle(isoxml, _out)
21
- main = isoxml&.at(ns("//bibdata/title"\
22
- "[@language='en' and @type='subtitle']"))&.text
21
+ main = isoxml.at(ns("//bibdata/title[@language='en' and @type='subtitle']"))
22
+ &.children&.to_xml
23
23
  set(:docsubtitle, main)
24
24
  end
25
25
 
26
26
  def extract_languages(nodeset)
27
- lgs = []
28
- nodeset.each do |l|
29
- l && ISO_639.find(l.text)&.english_name and
30
- lgs << ISO_639.find(l.text).english_name
27
+ lgs = nodeset.each_with_object([]) do |l, m|
28
+ l and lg = ISO_639.find(l.text) and m << lg.english_name
31
29
  end
32
- lgs.map { |l| l == "Spanish; Castilian" ? "Spanish" : l }
30
+ lgs.compact.map { |l| l == "Spanish; Castilian" ? "Spanish" : l }
33
31
  end
34
32
 
35
33
  def author(isoxml, _out)
@@ -61,10 +59,7 @@ module IsoDoc
61
59
  set(:session_date, isoxml.at(ns("//bibdata/ext/session/date"))&.text)
62
60
  set(:session_collaborator,
63
61
  isoxml.at(ns("//bibdata/ext/session/collaborator"))&.text)
64
- sid = isoxml.at(ns("//bibdata/ext/session/id"))&.text
65
- set(:session_id, sid)
66
- set(:session_id_head, sid&.sub(%r{/.*$}, ""))
67
- set(:session_id_tail, sid&.sub(%r{^[^/]+}, ""))
62
+ session_id(isoxml)
68
63
  set(:item_footnote,
69
64
  isoxml.at(ns("//bibdata/ext/session/item-footnote"))&.text)
70
65
  set(:session_itemnumber,
@@ -75,6 +70,13 @@ module IsoDoc
75
70
  multival(isoxml, "//bibdata/ext/session/subitem-name"))
76
71
  end
77
72
 
73
+ def session_id(isoxml)
74
+ sid = isoxml.at(ns("//bibdata/ext/session/id"))&.text
75
+ set(:session_id, sid)
76
+ set(:session_id_head, sid&.sub(%r{/.*$}, ""))
77
+ set(:session_id_tail, sid&.sub(%r{^[^/]+}, ""))
78
+ end
79
+
78
80
  def docid(isoxml, _out)
79
81
  dn = isoxml.at(ns("//bibdata/docidentifier"))&.text
80
82
  set(:docnumber, dn)
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -1240,6 +1240,10 @@
1240
1240
 
1241
1241
  </xsl:attribute-set>
1242
1242
 
1243
+ <xsl:template name="refine_termexample-style">
1244
+
1245
+ </xsl:template>
1246
+
1243
1247
  <xsl:attribute-set name="example-style">
1244
1248
 
1245
1249
  </xsl:attribute-set> <!-- example-style -->
@@ -2345,6 +2349,36 @@
2345
2349
  </xsl:for-each>
2346
2350
  </xsl:template>
2347
2351
 
2352
+ <xsl:template name="processMainSectionsDefault_flatxml">
2353
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2354
+ <xsl:sort select="@displayorder" data-type="number"/>
2355
+ <xsl:variable name="flatxml">
2356
+ <xsl:apply-templates select="." mode="flatxml"/>
2357
+ </xsl:variable>
2358
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2359
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2360
+
2361
+ </xsl:for-each>
2362
+
2363
+ <xsl:for-each select="/*/*[local-name()='annex']">
2364
+ <xsl:sort select="@displayorder" data-type="number"/>
2365
+ <xsl:variable name="flatxml">
2366
+ <xsl:apply-templates select="." mode="flatxml"/>
2367
+ </xsl:variable>
2368
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2369
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2370
+ </xsl:for-each>
2371
+
2372
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
2373
+ <xsl:sort select="@displayorder" data-type="number"/>
2374
+ <xsl:variable name="flatxml">
2375
+ <xsl:apply-templates select="." mode="flatxml"/>
2376
+ </xsl:variable>
2377
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2378
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2379
+ </xsl:for-each>
2380
+ </xsl:template>
2381
+
2348
2382
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2349
2383
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2350
2384
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -4427,13 +4461,13 @@
4427
4461
  <tr>
4428
4462
  <td>
4429
4463
  <xsl:attribute name="id">
4430
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
4464
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
4431
4465
  </xsl:attribute>
4432
4466
  <xsl:apply-templates/>
4433
4467
  </td>
4434
4468
  <td>
4435
4469
  <xsl:attribute name="id">
4436
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
4470
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
4437
4471
  </xsl:attribute>
4438
4472
 
4439
4473
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5042,6 +5076,10 @@
5042
5076
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
5043
5077
  </xsl:template>
5044
5078
 
5079
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
5080
+ <xsl:value-of select="."/>
5081
+ </xsl:template>
5082
+
5045
5083
  <!-- ========================= -->
5046
5084
  <!-- END Rich text formatting -->
5047
5085
  <!-- ========================= -->
@@ -5672,7 +5710,7 @@
5672
5710
  </xsl:choose>
5673
5711
  </xsl:variable>
5674
5712
  <xsl:attribute name="id">
5675
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
5713
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
5676
5714
  </xsl:attribute>
5677
5715
 
5678
5716
  <xsl:for-each select="*[local-name() = 'p']">
@@ -5680,7 +5718,7 @@
5680
5718
  <xsl:copy-of select="@*"/>
5681
5719
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
5682
5720
  <xsl:attribute name="id">
5683
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5721
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5684
5722
  </xsl:attribute>
5685
5723
 
5686
5724
  <!-- <xsl:copy-of select="node()" /> -->
@@ -5744,7 +5782,7 @@
5744
5782
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
5745
5783
  <xsl:copy>
5746
5784
  <xsl:attribute name="id">
5747
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5785
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5748
5786
  </xsl:attribute>
5749
5787
  <xsl:copy-of select="node()"/>
5750
5788
  </xsl:copy>
@@ -8557,7 +8595,7 @@
8557
8595
  <!-- ====== -->
8558
8596
  <xsl:template match="*[local-name() = 'termexample']">
8559
8597
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
8560
-
8598
+ <xsl:call-template name="refine_termexample-style"/>
8561
8599
  <xsl:call-template name="setBlockSpanAll"/>
8562
8600
 
8563
8601
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -1240,6 +1240,10 @@
1240
1240
 
1241
1241
  </xsl:attribute-set>
1242
1242
 
1243
+ <xsl:template name="refine_termexample-style">
1244
+
1245
+ </xsl:template>
1246
+
1243
1247
  <xsl:attribute-set name="example-style">
1244
1248
 
1245
1249
  </xsl:attribute-set> <!-- example-style -->
@@ -2345,6 +2349,36 @@
2345
2349
  </xsl:for-each>
2346
2350
  </xsl:template>
2347
2351
 
2352
+ <xsl:template name="processMainSectionsDefault_flatxml">
2353
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2354
+ <xsl:sort select="@displayorder" data-type="number"/>
2355
+ <xsl:variable name="flatxml">
2356
+ <xsl:apply-templates select="." mode="flatxml"/>
2357
+ </xsl:variable>
2358
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2359
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2360
+
2361
+ </xsl:for-each>
2362
+
2363
+ <xsl:for-each select="/*/*[local-name()='annex']">
2364
+ <xsl:sort select="@displayorder" data-type="number"/>
2365
+ <xsl:variable name="flatxml">
2366
+ <xsl:apply-templates select="." mode="flatxml"/>
2367
+ </xsl:variable>
2368
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2369
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2370
+ </xsl:for-each>
2371
+
2372
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
2373
+ <xsl:sort select="@displayorder" data-type="number"/>
2374
+ <xsl:variable name="flatxml">
2375
+ <xsl:apply-templates select="." mode="flatxml"/>
2376
+ </xsl:variable>
2377
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2378
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2379
+ </xsl:for-each>
2380
+ </xsl:template>
2381
+
2348
2382
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2349
2383
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2350
2384
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -4427,13 +4461,13 @@
4427
4461
  <tr>
4428
4462
  <td>
4429
4463
  <xsl:attribute name="id">
4430
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
4464
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
4431
4465
  </xsl:attribute>
4432
4466
  <xsl:apply-templates/>
4433
4467
  </td>
4434
4468
  <td>
4435
4469
  <xsl:attribute name="id">
4436
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
4470
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
4437
4471
  </xsl:attribute>
4438
4472
 
4439
4473
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5042,6 +5076,10 @@
5042
5076
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
5043
5077
  </xsl:template>
5044
5078
 
5079
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
5080
+ <xsl:value-of select="."/>
5081
+ </xsl:template>
5082
+
5045
5083
  <!-- ========================= -->
5046
5084
  <!-- END Rich text formatting -->
5047
5085
  <!-- ========================= -->
@@ -5672,7 +5710,7 @@
5672
5710
  </xsl:choose>
5673
5711
  </xsl:variable>
5674
5712
  <xsl:attribute name="id">
5675
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
5713
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
5676
5714
  </xsl:attribute>
5677
5715
 
5678
5716
  <xsl:for-each select="*[local-name() = 'p']">
@@ -5680,7 +5718,7 @@
5680
5718
  <xsl:copy-of select="@*"/>
5681
5719
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
5682
5720
  <xsl:attribute name="id">
5683
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5721
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5684
5722
  </xsl:attribute>
5685
5723
 
5686
5724
  <!-- <xsl:copy-of select="node()" /> -->
@@ -5744,7 +5782,7 @@
5744
5782
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
5745
5783
  <xsl:copy>
5746
5784
  <xsl:attribute name="id">
5747
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5785
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5748
5786
  </xsl:attribute>
5749
5787
  <xsl:copy-of select="node()"/>
5750
5788
  </xsl:copy>
@@ -8557,7 +8595,7 @@
8557
8595
  <!-- ====== -->
8558
8596
  <xsl:template match="*[local-name() = 'termexample']">
8559
8597
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
8560
-
8598
+ <xsl:call-template name="refine_termexample-style"/>
8561
8599
  <xsl:call-template name="setBlockSpanAll"/>
8562
8600
 
8563
8601
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -1346,6 +1346,10 @@
1346
1346
 
1347
1347
  </xsl:attribute-set>
1348
1348
 
1349
+ <xsl:template name="refine_termexample-style">
1350
+
1351
+ </xsl:template>
1352
+
1349
1353
  <xsl:attribute-set name="example-style">
1350
1354
 
1351
1355
  </xsl:attribute-set> <!-- example-style -->
@@ -2476,6 +2480,36 @@
2476
2480
  </xsl:for-each>
2477
2481
  </xsl:template>
2478
2482
 
2483
+ <xsl:template name="processMainSectionsDefault_flatxml">
2484
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2485
+ <xsl:sort select="@displayorder" data-type="number"/>
2486
+ <xsl:variable name="flatxml">
2487
+ <xsl:apply-templates select="." mode="flatxml"/>
2488
+ </xsl:variable>
2489
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2490
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2491
+
2492
+ </xsl:for-each>
2493
+
2494
+ <xsl:for-each select="/*/*[local-name()='annex']">
2495
+ <xsl:sort select="@displayorder" data-type="number"/>
2496
+ <xsl:variable name="flatxml">
2497
+ <xsl:apply-templates select="." mode="flatxml"/>
2498
+ </xsl:variable>
2499
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2500
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2501
+ </xsl:for-each>
2502
+
2503
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
2504
+ <xsl:sort select="@displayorder" data-type="number"/>
2505
+ <xsl:variable name="flatxml">
2506
+ <xsl:apply-templates select="." mode="flatxml"/>
2507
+ </xsl:variable>
2508
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2509
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2510
+ </xsl:for-each>
2511
+ </xsl:template>
2512
+
2479
2513
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2480
2514
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2481
2515
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -4554,13 +4588,13 @@
4554
4588
  <tr>
4555
4589
  <td>
4556
4590
  <xsl:attribute name="id">
4557
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
4591
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
4558
4592
  </xsl:attribute>
4559
4593
  <xsl:apply-templates/>
4560
4594
  </td>
4561
4595
  <td>
4562
4596
  <xsl:attribute name="id">
4563
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
4597
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
4564
4598
  </xsl:attribute>
4565
4599
 
4566
4600
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5169,6 +5203,10 @@
5169
5203
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
5170
5204
  </xsl:template>
5171
5205
 
5206
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
5207
+ <xsl:value-of select="."/>
5208
+ </xsl:template>
5209
+
5172
5210
  <!-- ========================= -->
5173
5211
  <!-- END Rich text formatting -->
5174
5212
  <!-- ========================= -->
@@ -5799,7 +5837,7 @@
5799
5837
  </xsl:choose>
5800
5838
  </xsl:variable>
5801
5839
  <xsl:attribute name="id">
5802
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
5840
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
5803
5841
  </xsl:attribute>
5804
5842
 
5805
5843
  <xsl:for-each select="*[local-name() = 'p']">
@@ -5807,7 +5845,7 @@
5807
5845
  <xsl:copy-of select="@*"/>
5808
5846
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
5809
5847
  <xsl:attribute name="id">
5810
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5848
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5811
5849
  </xsl:attribute>
5812
5850
 
5813
5851
  <!-- <xsl:copy-of select="node()" /> -->
@@ -5871,7 +5909,7 @@
5871
5909
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
5872
5910
  <xsl:copy>
5873
5911
  <xsl:attribute name="id">
5874
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5912
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5875
5913
  </xsl:attribute>
5876
5914
  <xsl:copy-of select="node()"/>
5877
5915
  </xsl:copy>
@@ -8684,7 +8722,7 @@
8684
8722
  <!-- ====== -->
8685
8723
  <xsl:template match="*[local-name() = 'termexample']">
8686
8724
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
8687
-
8725
+ <xsl:call-template name="refine_termexample-style"/>
8688
8726
  <xsl:call-template name="setBlockSpanAll"/>
8689
8727
 
8690
8728
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/metanorma/un/converter.rb CHANGED
@@ -60,7 +60,6 @@ module Metanorma
60
60
  end
61
61
  id = node.attr("docidentifier") and dn = id
62
62
  xml.docidentifier { |i| i << dn }
63
- xml.docnumber { |i| i << node.attr("docnumber") }
64
63
  end
65
64
 
66
65
  def metadata_distribution(node, xml)
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.12.1".freeze
3
+ VERSION = "0.12.3".freeze
4
4
  end
5
5
  end
data/metanorma-un.gemspec CHANGED
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
31
31
  spec.add_dependency "roman-numerals"
32
32
  spec.add_dependency "twitter_cldr"
33
33
 
34
- spec.add_dependency "metanorma-standoc", "~> 2.8.0"
34
+ spec.add_dependency "metanorma-standoc", "~> 2.8.2"
35
35
 
36
36
  spec.add_development_dependency "debug"
37
37
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.12.1
4
+ version: 0.12.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-02-05 00:00:00.000000000 Z
11
+ date: 2024-02-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 2.8.0
61
+ version: 2.8.2
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 2.8.0
68
+ version: 2.8.2
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: debug
71
71
  requirement: !ruby/object:Gem::Requirement