metanorma-un 0.10.9 → 0.10.10
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.
- checksums.yaml +4 -4
- data/lib/isodoc/un/un.plenary-attachment.xsl +24 -9
- data/lib/isodoc/un/un.plenary.xsl +24 -9
- data/lib/isodoc/un/un.recommendation.xsl +24 -9
- data/lib/metanorma/un/isodoc.rng +18 -0
- data/lib/metanorma/un/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 97b538520143d4dd803f58fe306198e1deaeb8c06fbe5ea07fa4055ea3541f1e
|
|
4
|
+
data.tar.gz: 4eaa116630755926a0f21d775d751ae30d090c878a69f6444e99b4fe44017459
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5a6d85f8e2d49d36002a5c4769a5cf6eea769e09924f98313ae428cf07e49bf984ba6b240604d7f9bf7f4f79d7b6ecf83e5c9cedd233c171648b50e79f4e221d
|
|
7
|
+
data.tar.gz: 3674711e675dd9b7c9ad3ae62ace63a908513d19c12f432ab696c0a1233934876abb977698c9a7f7b72d471bf956938bdc5446ef04c8b51dd3423ab54de568e8
|
|
@@ -2630,7 +2630,7 @@
|
|
|
2630
2630
|
</xsl:attribute>
|
|
2631
2631
|
</xsl:for-each>
|
|
2632
2632
|
|
|
2633
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2633
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2634
2634
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
2635
2635
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
|
2636
2636
|
</xsl:if>
|
|
@@ -2674,7 +2674,7 @@
|
|
|
2674
2674
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
2675
2675
|
</xsl:when>
|
|
2676
2676
|
<xsl:otherwise>
|
|
2677
|
-
<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 -->
|
|
2677
|
+
<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 -->
|
|
2678
2678
|
</xsl:otherwise>
|
|
2679
2679
|
</xsl:choose>
|
|
2680
2680
|
|
|
@@ -3189,7 +3189,7 @@
|
|
|
3189
3189
|
<xsl:param name="colwidths"/>
|
|
3190
3190
|
<xsl:param name="colgroup"/>
|
|
3191
3191
|
|
|
3192
|
-
<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']"/>
|
|
3192
|
+
<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']"/>
|
|
3193
3193
|
|
|
3194
3194
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
3195
3195
|
|
|
@@ -3262,6 +3262,7 @@
|
|
|
3262
3262
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
|
3263
3263
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
|
3264
3264
|
<xsl:apply-templates select="../*[local-name()='note']"/>
|
|
3265
|
+
<xsl:apply-templates select="../*[local-name()='example']"/>
|
|
3265
3266
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
|
3266
3267
|
|
|
3267
3268
|
<xsl:variable name="isDisplayRowSeparator">
|
|
@@ -3270,7 +3271,7 @@
|
|
|
3270
3271
|
|
|
3271
3272
|
<!-- horizontal row separator -->
|
|
3272
3273
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
|
3273
|
-
<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
|
|
3274
|
+
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
|
3274
3275
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
|
3275
3276
|
|
|
3276
3277
|
<xsl:call-template name="setBordersTableArray"/>
|
|
@@ -3535,13 +3536,13 @@
|
|
|
3535
3536
|
</fo:table-cell>
|
|
3536
3537
|
</xsl:template> <!-- td -->
|
|
3537
3538
|
|
|
3538
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
|
|
3539
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
|
3539
3540
|
|
|
3540
3541
|
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
3541
3542
|
|
|
3542
3543
|
<xsl:call-template name="refine_table-note-style"/>
|
|
3543
3544
|
|
|
3544
|
-
<!-- Table's note name (NOTE, for example) -->
|
|
3545
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
3545
3546
|
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
3546
3547
|
|
|
3547
3548
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
@@ -3555,7 +3556,7 @@
|
|
|
3555
3556
|
|
|
3556
3557
|
</xsl:template> <!-- table/note -->
|
|
3557
3558
|
|
|
3558
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
|
|
3559
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
|
|
3559
3560
|
<xsl:apply-templates/>
|
|
3560
3561
|
</xsl:template>
|
|
3561
3562
|
|
|
@@ -4621,10 +4622,15 @@
|
|
|
4621
4622
|
<!-- ========================= -->
|
|
4622
4623
|
<xsl:template match="*[local-name()='em']">
|
|
4623
4624
|
<fo:inline font-style="italic">
|
|
4625
|
+
<xsl:call-template name="refine_italic_style"/>
|
|
4624
4626
|
<xsl:apply-templates/>
|
|
4625
4627
|
</fo:inline>
|
|
4626
4628
|
</xsl:template>
|
|
4627
4629
|
|
|
4630
|
+
<xsl:template name="refine_italic_style">
|
|
4631
|
+
|
|
4632
|
+
</xsl:template>
|
|
4633
|
+
|
|
4628
4634
|
<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
|
|
4629
4635
|
<xsl:param name="split_keep-within-line"/>
|
|
4630
4636
|
<fo:inline font-weight="bold">
|
|
@@ -8495,6 +8501,12 @@
|
|
|
8495
8501
|
|
|
8496
8502
|
</xsl:template>
|
|
8497
8503
|
|
|
8504
|
+
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
|
8505
|
+
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
8506
|
+
<xsl:apply-templates/>
|
|
8507
|
+
</fo:inline>
|
|
8508
|
+
</xsl:template>
|
|
8509
|
+
|
|
8498
8510
|
<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
|
|
8499
8511
|
<xsl:param name="fo_element">block</xsl:param>
|
|
8500
8512
|
|
|
@@ -9071,6 +9083,9 @@
|
|
|
9071
9083
|
<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
|
|
9072
9084
|
</xsl:choose>
|
|
9073
9085
|
</xsl:when>
|
|
9086
|
+
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
|
9087
|
+
<xsl:value-of select="@label"/>
|
|
9088
|
+
</xsl:when>
|
|
9074
9089
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
|
9075
9090
|
|
|
9076
9091
|
<!-- Example: for BSI <?list-start 2?> -->
|
|
@@ -9128,10 +9143,10 @@
|
|
|
9128
9143
|
<xsl:when test="$type = 'arabic'">
|
|
9129
9144
|
1.
|
|
9130
9145
|
</xsl:when>
|
|
9131
|
-
<xsl:when test="$type = 'alphabet'">
|
|
9146
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
|
9132
9147
|
a)
|
|
9133
9148
|
</xsl:when>
|
|
9134
|
-
<xsl:when test="$type = 'alphabet_upper'">
|
|
9149
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
|
9135
9150
|
A.
|
|
9136
9151
|
</xsl:when>
|
|
9137
9152
|
<xsl:when test="$type = 'roman'">
|
|
@@ -2630,7 +2630,7 @@
|
|
|
2630
2630
|
</xsl:attribute>
|
|
2631
2631
|
</xsl:for-each>
|
|
2632
2632
|
|
|
2633
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2633
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2634
2634
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
2635
2635
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
|
2636
2636
|
</xsl:if>
|
|
@@ -2674,7 +2674,7 @@
|
|
|
2674
2674
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
2675
2675
|
</xsl:when>
|
|
2676
2676
|
<xsl:otherwise>
|
|
2677
|
-
<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 -->
|
|
2677
|
+
<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 -->
|
|
2678
2678
|
</xsl:otherwise>
|
|
2679
2679
|
</xsl:choose>
|
|
2680
2680
|
|
|
@@ -3189,7 +3189,7 @@
|
|
|
3189
3189
|
<xsl:param name="colwidths"/>
|
|
3190
3190
|
<xsl:param name="colgroup"/>
|
|
3191
3191
|
|
|
3192
|
-
<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']"/>
|
|
3192
|
+
<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']"/>
|
|
3193
3193
|
|
|
3194
3194
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
3195
3195
|
|
|
@@ -3262,6 +3262,7 @@
|
|
|
3262
3262
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
|
3263
3263
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
|
3264
3264
|
<xsl:apply-templates select="../*[local-name()='note']"/>
|
|
3265
|
+
<xsl:apply-templates select="../*[local-name()='example']"/>
|
|
3265
3266
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
|
3266
3267
|
|
|
3267
3268
|
<xsl:variable name="isDisplayRowSeparator">
|
|
@@ -3270,7 +3271,7 @@
|
|
|
3270
3271
|
|
|
3271
3272
|
<!-- horizontal row separator -->
|
|
3272
3273
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
|
3273
|
-
<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
|
|
3274
|
+
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
|
3274
3275
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
|
3275
3276
|
|
|
3276
3277
|
<xsl:call-template name="setBordersTableArray"/>
|
|
@@ -3535,13 +3536,13 @@
|
|
|
3535
3536
|
</fo:table-cell>
|
|
3536
3537
|
</xsl:template> <!-- td -->
|
|
3537
3538
|
|
|
3538
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
|
|
3539
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
|
3539
3540
|
|
|
3540
3541
|
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
3541
3542
|
|
|
3542
3543
|
<xsl:call-template name="refine_table-note-style"/>
|
|
3543
3544
|
|
|
3544
|
-
<!-- Table's note name (NOTE, for example) -->
|
|
3545
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
3545
3546
|
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
3546
3547
|
|
|
3547
3548
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
@@ -3555,7 +3556,7 @@
|
|
|
3555
3556
|
|
|
3556
3557
|
</xsl:template> <!-- table/note -->
|
|
3557
3558
|
|
|
3558
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
|
|
3559
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
|
|
3559
3560
|
<xsl:apply-templates/>
|
|
3560
3561
|
</xsl:template>
|
|
3561
3562
|
|
|
@@ -4621,10 +4622,15 @@
|
|
|
4621
4622
|
<!-- ========================= -->
|
|
4622
4623
|
<xsl:template match="*[local-name()='em']">
|
|
4623
4624
|
<fo:inline font-style="italic">
|
|
4625
|
+
<xsl:call-template name="refine_italic_style"/>
|
|
4624
4626
|
<xsl:apply-templates/>
|
|
4625
4627
|
</fo:inline>
|
|
4626
4628
|
</xsl:template>
|
|
4627
4629
|
|
|
4630
|
+
<xsl:template name="refine_italic_style">
|
|
4631
|
+
|
|
4632
|
+
</xsl:template>
|
|
4633
|
+
|
|
4628
4634
|
<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
|
|
4629
4635
|
<xsl:param name="split_keep-within-line"/>
|
|
4630
4636
|
<fo:inline font-weight="bold">
|
|
@@ -8495,6 +8501,12 @@
|
|
|
8495
8501
|
|
|
8496
8502
|
</xsl:template>
|
|
8497
8503
|
|
|
8504
|
+
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
|
8505
|
+
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
8506
|
+
<xsl:apply-templates/>
|
|
8507
|
+
</fo:inline>
|
|
8508
|
+
</xsl:template>
|
|
8509
|
+
|
|
8498
8510
|
<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
|
|
8499
8511
|
<xsl:param name="fo_element">block</xsl:param>
|
|
8500
8512
|
|
|
@@ -9071,6 +9083,9 @@
|
|
|
9071
9083
|
<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
|
|
9072
9084
|
</xsl:choose>
|
|
9073
9085
|
</xsl:when>
|
|
9086
|
+
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
|
9087
|
+
<xsl:value-of select="@label"/>
|
|
9088
|
+
</xsl:when>
|
|
9074
9089
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
|
9075
9090
|
|
|
9076
9091
|
<!-- Example: for BSI <?list-start 2?> -->
|
|
@@ -9128,10 +9143,10 @@
|
|
|
9128
9143
|
<xsl:when test="$type = 'arabic'">
|
|
9129
9144
|
1.
|
|
9130
9145
|
</xsl:when>
|
|
9131
|
-
<xsl:when test="$type = 'alphabet'">
|
|
9146
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
|
9132
9147
|
a)
|
|
9133
9148
|
</xsl:when>
|
|
9134
|
-
<xsl:when test="$type = 'alphabet_upper'">
|
|
9149
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
|
9135
9150
|
A.
|
|
9136
9151
|
</xsl:when>
|
|
9137
9152
|
<xsl:when test="$type = 'roman'">
|
|
@@ -2763,7 +2763,7 @@
|
|
|
2763
2763
|
</xsl:attribute>
|
|
2764
2764
|
</xsl:for-each>
|
|
2765
2765
|
|
|
2766
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2766
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2767
2767
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
2768
2768
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
|
2769
2769
|
</xsl:if>
|
|
@@ -2807,7 +2807,7 @@
|
|
|
2807
2807
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
2808
2808
|
</xsl:when>
|
|
2809
2809
|
<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 -->
|
|
2810
|
+
<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
2811
|
</xsl:otherwise>
|
|
2812
2812
|
</xsl:choose>
|
|
2813
2813
|
|
|
@@ -3322,7 +3322,7 @@
|
|
|
3322
3322
|
<xsl:param name="colwidths"/>
|
|
3323
3323
|
<xsl:param name="colgroup"/>
|
|
3324
3324
|
|
|
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']"/>
|
|
3325
|
+
<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
3326
|
|
|
3327
3327
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
3328
3328
|
|
|
@@ -3395,6 +3395,7 @@
|
|
|
3395
3395
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
|
3396
3396
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
|
3397
3397
|
<xsl:apply-templates select="../*[local-name()='note']"/>
|
|
3398
|
+
<xsl:apply-templates select="../*[local-name()='example']"/>
|
|
3398
3399
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
|
3399
3400
|
|
|
3400
3401
|
<xsl:variable name="isDisplayRowSeparator">
|
|
@@ -3403,7 +3404,7 @@
|
|
|
3403
3404
|
|
|
3404
3405
|
<!-- horizontal row separator -->
|
|
3405
3406
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
|
3406
|
-
<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
|
|
3407
|
+
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
|
3407
3408
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
|
3408
3409
|
|
|
3409
3410
|
<xsl:call-template name="setBordersTableArray"/>
|
|
@@ -3664,13 +3665,13 @@
|
|
|
3664
3665
|
</fo:table-cell>
|
|
3665
3666
|
</xsl:template> <!-- td -->
|
|
3666
3667
|
|
|
3667
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
|
|
3668
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
|
3668
3669
|
|
|
3669
3670
|
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
3670
3671
|
|
|
3671
3672
|
<xsl:call-template name="refine_table-note-style"/>
|
|
3672
3673
|
|
|
3673
|
-
<!-- Table's note name (NOTE, for example) -->
|
|
3674
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
3674
3675
|
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
3675
3676
|
|
|
3676
3677
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
@@ -3684,7 +3685,7 @@
|
|
|
3684
3685
|
|
|
3685
3686
|
</xsl:template> <!-- table/note -->
|
|
3686
3687
|
|
|
3687
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
|
|
3688
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
|
|
3688
3689
|
<xsl:apply-templates/>
|
|
3689
3690
|
</xsl:template>
|
|
3690
3691
|
|
|
@@ -4750,10 +4751,15 @@
|
|
|
4750
4751
|
<!-- ========================= -->
|
|
4751
4752
|
<xsl:template match="*[local-name()='em']">
|
|
4752
4753
|
<fo:inline font-style="italic">
|
|
4754
|
+
<xsl:call-template name="refine_italic_style"/>
|
|
4753
4755
|
<xsl:apply-templates/>
|
|
4754
4756
|
</fo:inline>
|
|
4755
4757
|
</xsl:template>
|
|
4756
4758
|
|
|
4759
|
+
<xsl:template name="refine_italic_style">
|
|
4760
|
+
|
|
4761
|
+
</xsl:template>
|
|
4762
|
+
|
|
4757
4763
|
<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
|
|
4758
4764
|
<xsl:param name="split_keep-within-line"/>
|
|
4759
4765
|
<fo:inline font-weight="bold">
|
|
@@ -8624,6 +8630,12 @@
|
|
|
8624
8630
|
|
|
8625
8631
|
</xsl:template>
|
|
8626
8632
|
|
|
8633
|
+
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
|
8634
|
+
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
8635
|
+
<xsl:apply-templates/>
|
|
8636
|
+
</fo:inline>
|
|
8637
|
+
</xsl:template>
|
|
8638
|
+
|
|
8627
8639
|
<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
|
|
8628
8640
|
<xsl:param name="fo_element">block</xsl:param>
|
|
8629
8641
|
|
|
@@ -9200,6 +9212,9 @@
|
|
|
9200
9212
|
<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
|
|
9201
9213
|
</xsl:choose>
|
|
9202
9214
|
</xsl:when>
|
|
9215
|
+
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
|
9216
|
+
<xsl:value-of select="@label"/>
|
|
9217
|
+
</xsl:when>
|
|
9203
9218
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
|
9204
9219
|
|
|
9205
9220
|
<!-- Example: for BSI <?list-start 2?> -->
|
|
@@ -9257,10 +9272,10 @@
|
|
|
9257
9272
|
<xsl:when test="$type = 'arabic'">
|
|
9258
9273
|
1)
|
|
9259
9274
|
</xsl:when>
|
|
9260
|
-
<xsl:when test="$type = 'alphabet'">
|
|
9275
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
|
9261
9276
|
a)
|
|
9262
9277
|
</xsl:when>
|
|
9263
|
-
<xsl:when test="$type = 'alphabet_upper'">
|
|
9278
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
|
9264
9279
|
A.
|
|
9265
9280
|
</xsl:when>
|
|
9266
9281
|
<xsl:when test="$type = 'roman'">
|
data/lib/metanorma/un/isodoc.rng
CHANGED
|
@@ -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>
|
data/lib/metanorma/un/version.rb
CHANGED
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.
|
|
4
|
+
version: 0.10.10
|
|
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
|
|
11
|
+
date: 2023-06-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: iso-639
|