metanorma-un 0.10.9 → 0.10.11

Sign up to get free protection for your applications and to get access to all the features.
@@ -1851,6 +1851,10 @@
1851
1851
  </xsl:attribute-set> <!-- formula-stem-number-style -->
1852
1852
  <!-- End Formula's styles -->
1853
1853
 
1854
+ <xsl:template name="refine_formula-stem-number-style">
1855
+
1856
+ </xsl:template>
1857
+
1854
1858
  <xsl:attribute-set name="image-style">
1855
1859
  <xsl:attribute name="text-align">center</xsl:attribute>
1856
1860
 
@@ -2346,13 +2350,13 @@
2346
2350
 
2347
2351
  <xsl:template name="processPrefaceSectionsDefault_Contents">
2348
2352
  <xsl:variable name="nodes_preface_">
2349
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
2353
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
2350
2354
  <node id="{@id}"/>
2351
2355
  </xsl:for-each>
2352
2356
  </xsl:variable>
2353
2357
  <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
2354
2358
 
2355
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
2359
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
2356
2360
  <xsl:sort select="@displayorder" data-type="number"/>
2357
2361
 
2358
2362
  <!-- process Section's title -->
@@ -2386,12 +2390,12 @@
2386
2390
  <xsl:apply-templates select="." mode="contents"/>
2387
2391
  </xsl:for-each>
2388
2392
 
2389
- <xsl:for-each select="/*/*[local-name()='annex']">
2393
+ <!-- <xsl:for-each select="/*/*[local-name()='annex']">
2390
2394
  <xsl:sort select="@displayorder" data-type="number"/>
2391
2395
  <xsl:apply-templates select="." mode="contents"/>
2392
- </xsl:for-each>
2396
+ </xsl:for-each> -->
2393
2397
 
2394
- <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
2398
+ <xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
2395
2399
  <xsl:sort select="@displayorder" data-type="number"/>
2396
2400
  <xsl:apply-templates select="." mode="contents"/>
2397
2401
  </xsl:for-each>
@@ -2763,7 +2767,7 @@
2763
2767
  </xsl:attribute>
2764
2768
  </xsl:for-each>
2765
2769
 
2766
- <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
2770
+ <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
2767
2771
  <xsl:if test="$isNoteOrFnExist = 'true'">
2768
2772
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2769
2773
  </xsl:if>
@@ -2807,7 +2811,7 @@
2807
2811
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
2808
2812
  </xsl:when>
2809
2813
  <xsl:otherwise>
2810
- <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
2814
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
2811
2815
  </xsl:otherwise>
2812
2816
  </xsl:choose>
2813
2817
 
@@ -2892,7 +2896,7 @@
2892
2896
  <xsl:param name="continued"/>
2893
2897
  <xsl:if test="normalize-space() != ''">
2894
2898
 
2895
- <fo:block xsl:use-attribute-sets="table-name-style">
2899
+ <fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
2896
2900
 
2897
2901
  <xsl:call-template name="refine_table-name-style">
2898
2902
  <xsl:with-param name="continued" select="$continued"/>
@@ -3277,8 +3281,8 @@
3277
3281
  <xsl:template name="table-header-title">
3278
3282
  <xsl:param name="cols-count"/>
3279
3283
  <!-- row for title -->
3280
- <fo:table-row>
3281
- <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
3284
+ <fo:table-row role="SKIP">
3285
+ <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP">
3282
3286
 
3283
3287
  <xsl:call-template name="refine_table-header-title-style"/>
3284
3288
 
@@ -3287,7 +3291,7 @@
3287
3291
  </xsl:apply-templates>
3288
3292
 
3289
3293
  <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
3290
- <fo:block/>
3294
+ <fo:block role="SKIP"/>
3291
3295
  </xsl:if>
3292
3296
 
3293
3297
  </fo:table-cell>
@@ -3322,7 +3326,7 @@
3322
3326
  <xsl:param name="colwidths"/>
3323
3327
  <xsl:param name="colgroup"/>
3324
3328
 
3325
- <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
3329
+ <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
3326
3330
 
3327
3331
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
3328
3332
 
@@ -3395,6 +3399,7 @@
3395
3399
  <xsl:apply-templates select="../*[local-name()='p']"/>
3396
3400
  <xsl:apply-templates select="../*[local-name()='dl']"/>
3397
3401
  <xsl:apply-templates select="../*[local-name()='note']"/>
3402
+ <xsl:apply-templates select="../*[local-name()='example']"/>
3398
3403
  <xsl:apply-templates select="../*[local-name()='source']"/>
3399
3404
 
3400
3405
  <xsl:variable name="isDisplayRowSeparator">
@@ -3403,7 +3408,7 @@
3403
3408
 
3404
3409
  <!-- horizontal row separator -->
3405
3410
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
3406
- <xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
3411
+ <xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
3407
3412
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
3408
3413
 
3409
3414
  <xsl:call-template name="setBordersTableArray"/>
@@ -3597,7 +3602,7 @@
3597
3602
 
3598
3603
  <xsl:call-template name="refine_table-header-cell-style"/>
3599
3604
 
3600
- <fo:block>
3605
+ <fo:block role="SKIP">
3601
3606
  <xsl:apply-templates/>
3602
3607
  </fo:block>
3603
3608
  </fo:table-cell>
@@ -3650,7 +3655,7 @@
3650
3655
  <xsl:attribute name="text-align">left</xsl:attribute>
3651
3656
  </xsl:if>
3652
3657
 
3653
- <fo:block>
3658
+ <fo:block role="SKIP">
3654
3659
 
3655
3660
  <xsl:if test="$isGenerateTableIF = 'true'">
3656
3661
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -3664,13 +3669,13 @@
3664
3669
  </fo:table-cell>
3665
3670
  </xsl:template> <!-- td -->
3666
3671
 
3667
- <xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
3672
+ <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
3668
3673
 
3669
3674
  <fo:block xsl:use-attribute-sets="table-note-style">
3670
3675
 
3671
3676
  <xsl:call-template name="refine_table-note-style"/>
3672
3677
 
3673
- <!-- Table's note name (NOTE, for example) -->
3678
+ <!-- Table's note/example name (NOTE, for example) -->
3674
3679
  <fo:inline xsl:use-attribute-sets="table-note-name-style">
3675
3680
 
3676
3681
  <xsl:call-template name="refine_table-note-name-style"/>
@@ -3684,7 +3689,7 @@
3684
3689
 
3685
3690
  </xsl:template> <!-- table/note -->
3686
3691
 
3687
- <xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
3692
+ <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
3688
3693
  <xsl:apply-templates/>
3689
3694
  </xsl:template>
3690
3695
 
@@ -4513,7 +4518,7 @@
4513
4518
  -->
4514
4519
  <fo:table-row>
4515
4520
  <fo:table-cell number-columns-spanned="2">
4516
- <fo:block>
4521
+ <fo:block role="SKIP">
4517
4522
  <xsl:call-template name="note"/>
4518
4523
  </fo:block>
4519
4524
  </fo:table-cell>
@@ -4578,7 +4583,7 @@
4578
4583
 
4579
4584
  <xsl:call-template name="refine_dt-cell-style"/>
4580
4585
 
4581
- <fo:block xsl:use-attribute-sets="dt-block-style">
4586
+ <fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
4582
4587
  <xsl:copy-of select="@id"/>
4583
4588
 
4584
4589
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -4608,7 +4613,7 @@
4608
4613
 
4609
4614
  <xsl:call-template name="refine_dd-cell-style"/>
4610
4615
 
4611
- <fo:block>
4616
+ <fo:block role="SKIP">
4612
4617
 
4613
4618
  <xsl:if test="$isGenerateTableIF = 'true'">
4614
4619
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -4750,10 +4755,15 @@
4750
4755
  <!-- ========================= -->
4751
4756
  <xsl:template match="*[local-name()='em']">
4752
4757
  <fo:inline font-style="italic">
4758
+ <xsl:call-template name="refine_italic_style"/>
4753
4759
  <xsl:apply-templates/>
4754
4760
  </fo:inline>
4755
4761
  </xsl:template>
4756
4762
 
4763
+ <xsl:template name="refine_italic_style">
4764
+
4765
+ </xsl:template>
4766
+
4757
4767
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
4758
4768
  <xsl:param name="split_keep-within-line"/>
4759
4769
  <fo:inline font-weight="bold">
@@ -4976,11 +4986,41 @@
4976
4986
 
4977
4987
  <xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
4978
4988
  <xsl:variable name="text" select="normalize-space(.)"/>
4979
- <fo:inline font-size="75%">
4989
+ <fo:inline font-size="75%" role="SKIP">
4980
4990
  <xsl:if test="string-length($text) &gt; 0">
4981
- <xsl:call-template name="recursiveSmallCaps">
4982
- <xsl:with-param name="text" select="$text"/>
4983
- </xsl:call-template>
4991
+ <xsl:variable name="smallCapsText">
4992
+ <xsl:call-template name="recursiveSmallCaps">
4993
+ <xsl:with-param name="text" select="$text"/>
4994
+ </xsl:call-template>
4995
+ </xsl:variable>
4996
+ <!-- merge neighboring fo:inline -->
4997
+ <xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
4998
+ <xsl:choose>
4999
+ <xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
5000
+ <xsl:when test="self::fo:inline and @font-size">
5001
+ <xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
5002
+ <!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
5003
+ <xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
5004
+ <xsl:variable name="next_text">
5005
+ <xsl:choose>
5006
+ <xsl:when test="$next_text_ = 0">99999999</xsl:when>
5007
+ <xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
5008
+ </xsl:choose>
5009
+ </xsl:variable>
5010
+ <!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
5011
+ <fo:inline>
5012
+ <xsl:copy-of select="@*"/>
5013
+ <xsl:copy-of select="./node()"/>
5014
+ <xsl:for-each select="following-sibling::node()[position() &lt; $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
5015
+ <xsl:copy-of select="./node()"/>
5016
+ </xsl:for-each>
5017
+ </fo:inline>
5018
+ </xsl:when>
5019
+ <xsl:otherwise>
5020
+ <xsl:copy-of select="."/>
5021
+ </xsl:otherwise>
5022
+ </xsl:choose>
5023
+ </xsl:for-each>
4984
5024
  </xsl:if>
4985
5025
  </fo:inline>
4986
5026
  </xsl:template>
@@ -4992,7 +5032,7 @@
4992
5032
  <xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
4993
5033
  <xsl:choose>
4994
5034
  <xsl:when test="$char=$upperCase">
4995
- <fo:inline font-size="{100 div 0.75}%">
5035
+ <fo:inline font-size="{100 div 0.75}%" role="SKIP">
4996
5036
  <xsl:value-of select="$upperCase"/>
4997
5037
  </fo:inline>
4998
5038
  </xsl:when>
@@ -5154,6 +5194,10 @@
5154
5194
 
5155
5195
  <xsl:when test="not(contains($text, $separator))">
5156
5196
  <word>
5197
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
5198
+ <xsl:text>
5199
+  </xsl:text> <!-- to add distance between dt and dd -->
5200
+ </xsl:if>
5157
5201
  <xsl:call-template name="enclose_text_in_tags">
5158
5202
  <xsl:with-param name="text" select="normalize-space($text)"/>
5159
5203
  <xsl:with-param name="tags" select="$tags"/>
@@ -5162,6 +5206,10 @@
5162
5206
  </xsl:when>
5163
5207
  <xsl:otherwise>
5164
5208
  <word>
5209
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
5210
+ <xsl:text>
5211
+  </xsl:text> <!-- to add distance between dt and dd -->
5212
+ </xsl:if>
5165
5213
  <xsl:call-template name="enclose_text_in_tags">
5166
5214
  <xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
5167
5215
  <xsl:with-param name="tags" select="$tags"/>
@@ -5345,6 +5393,10 @@
5345
5393
  <xsl:template name="getSimpleTable">
5346
5394
  <xsl:param name="id"/>
5347
5395
 
5396
+ <!-- <test0>
5397
+ <xsl:copy-of select="."/>
5398
+ </test0> -->
5399
+
5348
5400
  <xsl:variable name="simple-table">
5349
5401
 
5350
5402
  <!-- Step 0. replace <br/> to <p>...</p> -->
@@ -6390,7 +6442,7 @@
6390
6442
  <fo:table-body>
6391
6443
  <fo:table-row>
6392
6444
  <fo:table-cell display-align="center">
6393
- <fo:block xsl:use-attribute-sets="formula-stem-block-style">
6445
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
6394
6446
 
6395
6447
  <xsl:call-template name="refine_formula-stem-block-style"/>
6396
6448
 
@@ -6398,7 +6450,10 @@
6398
6450
  </fo:block>
6399
6451
  </fo:table-cell>
6400
6452
  <fo:table-cell display-align="center">
6401
- <fo:block xsl:use-attribute-sets="formula-stem-number-style">
6453
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
6454
+
6455
+ <xsl:call-template name="refine_formula-stem-number-style"/>
6456
+
6402
6457
  <xsl:apply-templates select="../*[local-name() = 'name']"/>
6403
6458
  </fo:block>
6404
6459
  </fo:table-cell>
@@ -7920,7 +7975,7 @@
7920
7975
  <!-- second td with sourcecode -->
7921
7976
  <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
7922
7977
  <fo:table-cell>
7923
- <fo:block>
7978
+ <fo:block role="SKIP">
7924
7979
  <xsl:apply-templates/>
7925
7980
  </fo:block>
7926
7981
  </fo:table-cell>
@@ -8407,7 +8462,7 @@
8407
8462
 
8408
8463
  <xsl:call-template name="setTableCellAttributes"/>
8409
8464
 
8410
- <fo:block>
8465
+ <fo:block role="SKIP">
8411
8466
  <xsl:apply-templates/>
8412
8467
  </fo:block>
8413
8468
  </fo:table-cell>
@@ -8429,7 +8484,7 @@
8429
8484
 
8430
8485
  <xsl:call-template name="setTableCellAttributes"/>
8431
8486
 
8432
- <fo:block>
8487
+ <fo:block role="SKIP">
8433
8488
  <xsl:apply-templates/>
8434
8489
  </fo:block>
8435
8490
  </fo:table-cell>
@@ -8624,6 +8679,12 @@
8624
8679
 
8625
8680
  </xsl:template>
8626
8681
 
8682
+ <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
8683
+ <fo:inline xsl:use-attribute-sets="example-name-style">
8684
+ <xsl:apply-templates/>
8685
+ </fo:inline>
8686
+ </xsl:template>
8687
+
8627
8688
  <xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
8628
8689
  <xsl:param name="fo_element">block</xsl:param>
8629
8690
 
@@ -9200,6 +9261,50 @@
9200
9261
  <xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
9201
9262
  </xsl:choose>
9202
9263
  </xsl:when>
9264
+ <xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
9265
+
9266
+ <xsl:variable name="label">
9267
+
9268
+ <xsl:variable name="type" select="../@type"/>
9269
+
9270
+ <xsl:variable name="style_prefix_">
9271
+ <xsl:if test="$type = 'roman'">
9272
+ <!-- Example: (i) -->
9273
+ </xsl:if>
9274
+ </xsl:variable>
9275
+ <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
9276
+
9277
+ <xsl:variable name="style_suffix_">
9278
+ <xsl:choose>
9279
+ <xsl:when test="$type = 'arabic'">
9280
+ )
9281
+ </xsl:when>
9282
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
9283
+ )
9284
+ </xsl:when>
9285
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
9286
+ .
9287
+ </xsl:when>
9288
+ <xsl:when test="$type = 'roman'">
9289
+ )
9290
+ </xsl:when>
9291
+ <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
9292
+ </xsl:choose>
9293
+ </xsl:variable>
9294
+ <xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
9295
+
9296
+ <xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
9297
+ <xsl:value-of select="$style_prefix"/>
9298
+ </xsl:if>
9299
+ <xsl:value-of select="@label"/>
9300
+ <xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
9301
+ <xsl:value-of select="$style_suffix"/>
9302
+ </xsl:if>
9303
+ </xsl:variable>
9304
+
9305
+ <xsl:value-of select="normalize-space($label)"/>
9306
+
9307
+ </xsl:when>
9203
9308
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
9204
9309
 
9205
9310
  <!-- Example: for BSI <?list-start 2?> -->
@@ -9257,10 +9362,10 @@
9257
9362
  <xsl:when test="$type = 'arabic'">
9258
9363
  1)
9259
9364
  </xsl:when>
9260
- <xsl:when test="$type = 'alphabet'">
9365
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
9261
9366
  a)
9262
9367
  </xsl:when>
9263
- <xsl:when test="$type = 'alphabet_upper'">
9368
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
9264
9369
  A.
9265
9370
  </xsl:when>
9266
9371
  <xsl:when test="$type = 'roman'">
@@ -9395,7 +9500,7 @@
9395
9500
  <xsl:call-template name="refine_list-item-style"/>
9396
9501
 
9397
9502
  <fo:list-item-label end-indent="label-end()">
9398
- <fo:block xsl:use-attribute-sets="list-item-label-style">
9503
+ <fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
9399
9504
 
9400
9505
  <xsl:call-template name="refine_list-item-label-style"/>
9401
9506
 
@@ -9409,7 +9514,7 @@
9409
9514
  </fo:block>
9410
9515
  </fo:list-item-label>
9411
9516
  <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
9412
- <fo:block>
9517
+ <fo:block role="SKIP">
9413
9518
 
9414
9519
  <xsl:call-template name="refine_list-item-body-style"/>
9415
9520
 
@@ -9688,10 +9793,10 @@
9688
9793
  <fo:table-body>
9689
9794
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
9690
9795
 
9691
- <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
9692
- <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
9693
- <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
9694
- <fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
9796
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
9797
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
9798
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
9799
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
9695
9800
  </fo:table-row>
9696
9801
  <xsl:apply-templates/>
9697
9802
  </fo:table-body>
@@ -9706,7 +9811,7 @@
9706
9811
 
9707
9812
  <xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
9708
9813
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
9709
- <fo:block><xsl:apply-templates/></fo:block>
9814
+ <fo:block role="SKIP"><xsl:apply-templates/></fo:block>
9710
9815
  </fo:table-cell>
9711
9816
  </xsl:template>
9712
9817
  <!-- ============ -->
@@ -9988,7 +10093,7 @@
9988
10093
  <xsl:for-each select="*[local-name() = 'tab']">
9989
10094
  <xsl:variable name="current_id" select="generate-id()"/>
9990
10095
  <fo:table-cell>
9991
- <fo:block line-height-shift-adjustment="disregard-shifts">
10096
+ <fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
9992
10097
  <xsl:call-template name="insert_basic_link">
9993
10098
  <xsl:with-param name="element">
9994
10099
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -10006,7 +10111,7 @@
10006
10111
  </xsl:for-each>
10007
10112
  <!-- last column - for page numbers -->
10008
10113
  <fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
10009
- <fo:block>
10114
+ <fo:block role="SKIP">
10010
10115
  <xsl:call-template name="insert_basic_link">
10011
10116
  <xsl:with-param name="element">
10012
10117
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -0,0 +1,56 @@
1
+ == copyright-statement
2
+ === {blank}
3
+
4
+ [[boilerplate-ECEhdr]]
5
+ ECE/TRADE/437
6
+
7
+ Copyright © United Nations {{ docyear }} +
8
+ All rights reserved worldwide +
9
+ United Nations publication issued by the Economic Commission for Europe
10
+
11
+ == license-statement
12
+ === {blank}
13
+ None of the materials provided on this web site may be used,
14
+ reproduced or transmitted, in whole or in part, in any form or by any
15
+ means, electronic or mechanical, including photocopying, recording or
16
+ the use of any information storage and retrieval system, except as
17
+ provided for in the Terms and Conditions of Use of United Nations Web
18
+ Sites, without permission in writing from the publisher.
19
+
20
+ News-related material can be used as long as the appropriate credit is given and the United Nations is advised.
21
+
22
+ To request such permission or for further enquires, please visit:
23
+ https://shop.un.org/rights-permissions[United Nations Publications: Rights and Permissions.]
24
+
25
+ == legal-statement
26
+ === {blank}
27
+ ==== Note
28
+ The designations employed and the presentation of the material in this publication do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries.
29
+
30
+ {% if tc == "United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)" %}
31
+ ==== <title>{{tc}}pass:[<br/>]Simple, Transparent and Effective Processes for Global Commerce
32
+
33
+ UN/CEFACT's mission is to improve the ability of business, trade and administrative organizations, from developed, developing and transitional economies, to exchange products and relevant services effectively. Its principal focus is on facilitating national and international transactions, through the simplification and harmonization of processes, procedures and information flows, and so contribute to the growth of global commerce.
34
+
35
+ Participation in UN/CEFACT is open to experts from United Nations Member States, Intergovernmental Organizations and Non-Governmental Organizations recognised by the United Nations Economic and Social Council (ECOSOC). Through this participation of government and business representatives from around the world, UN/CEFACT has developed a range of trade facilitation and e-business standards, recommendations and tools that are approved within a broad intergovernmental process and implemented globally.
36
+
37
+ [align="center"]
38
+ *www.unece.org/cefact*
39
+ {% endif %}
40
+
41
+ == feedback-statement
42
+ [[boilerplate-feedback-name]]
43
+ {% if subdivision %}{{subdivision}}{% else %}UN Economic Commission for Europe: Information Service{% endif %}
44
+
45
+ [[boilerplate-feedback-address]]
46
+ {% if pub_address %}{{ pub_address }}{% else %}
47
+ Palais des Nations +
48
+ CH-1211 Geneva 10 +
49
+ Switzerland{% endif %} +
50
+ +
51
+ +++<link target="tel:{% if pub_phone %}{{ pub_phone }}{% else %}+41(0)229171234{% endif %}">{% if pub_phone %}{{ pub_phone }}{% else %}+41 (0) 22 917 12 34 (switchboard){% endif %}</link>+++ +
52
+ {% if pub_fax %}+++<link target="tel:{{pub_fax}}">{{pub_fax}}+++ +{% endif %}
53
+ +++<link target="mailto:{% if pub_email %}{{ pub_email }}{% else %}unece_info@un.org{% endif %}">{% if pub_email %}{{ pub_email }}{% else %}unece_info@un.org{% endif %}+++ +
54
+ +++<link target="{% if pub_uri %}{{pub_uri}}{% else %}https://www.unece.org/{% endif %}">{% if pub_uri %}{{pub_uri}}{% else %}www.unece.org/{% endif %}</link>+++
55
+
56
+
@@ -15,6 +15,10 @@ module Metanorma
15
15
  "United Nations"
16
16
  end
17
17
 
18
+ def boilerplate_file(_xmldoc)
19
+ File.join(@libdir, "boilerplate.adoc")
20
+ end
21
+
18
22
  def metadata_committee(node, xml)
19
23
  return unless node.attr("committee")
20
24
 
@@ -1012,6 +1012,7 @@
1012
1012
  <ref name="del"/>
1013
1013
  <ref name="span"/>
1014
1014
  <ref name="erefstack"/>
1015
+ <ref name="date_inline"/>
1015
1016
  </choice>
1016
1017
  </define>
1017
1018
  <define name="add">
@@ -1053,6 +1054,23 @@
1053
1054
  </oneOrMore>
1054
1055
  </element>
1055
1056
  </define>
1057
+ <define name="date_inline">
1058
+ <element name="date">
1059
+ <attribute name="value"/>
1060
+ <optional>
1061
+ <attribute name="format"/>
1062
+ </optional>
1063
+ <optional>
1064
+ <attribute name="language"/>
1065
+ </optional>
1066
+ <optional>
1067
+ <attribute name="script"/>
1068
+ </optional>
1069
+ <optional>
1070
+ <attribute name="locale"/>
1071
+ </optional>
1072
+ </element>
1073
+ </define>
1056
1074
  <define name="concept">
1057
1075
  <element name="concept">
1058
1076
  <optional>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.10.9".freeze
3
+ VERSION = "0.10.11".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.10.9
4
+ version: 0.10.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-05-22 00:00:00.000000000 Z
11
+ date: 2023-06-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -258,7 +258,7 @@ files:
258
258
  - lib/metanorma/un/basicdoc.rng
259
259
  - lib/metanorma/un/biblio-standoc.rng
260
260
  - lib/metanorma/un/biblio.rng
261
- - lib/metanorma/un/boilerplate.xml
261
+ - lib/metanorma/un/boilerplate.adoc
262
262
  - lib/metanorma/un/converter.rb
263
263
  - lib/metanorma/un/input.rb
264
264
  - lib/metanorma/un/isodoc.rng