metanorma-un 0.6.8 → 0.6.9

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: aebf3c6706cfb9ddeb3383122c3024ce95df446858775f8054c293a9906c02cc
4
- data.tar.gz: 0d6826ce4771d8d6b5d235308026177ce41888a8dfc21349bd2b3a0aeb227a7e
3
+ metadata.gz: bebff59ec3ff854c555b92c957234f6741e6bf178b8b88f849a9a1984eee4bf0
4
+ data.tar.gz: e1c6234c1e97e715eb0162a12af1671aa095bec3ea184641c09e0ed27e80bfb9
5
5
  SHA512:
6
- metadata.gz: 25c47d32f0deeddaad8160e391f5c421c6cfffc555cbaa0239682c75a3c798ea484e154ffe11d9a5696e32bbc16ab587eaec2b1bfc6ab27af470fae824481f35
7
- data.tar.gz: d5ecc5209fee4731f50317763bff7d327bf794032ae3bef01fdddedc23ab40b6dc20a9ab281d4d86126103578a880ca8b25d8b6c6e869860e950eaa81a6f2295
6
+ metadata.gz: 9845dc890c962b26f7f28a73cd8acddc2631b2656f9cbd66ff23715b7b5077087838f7948c23b770c6006f001f49c71097fde08def137e725437fa3ca9f73bb1
7
+ data.tar.gz: c80f23d647165a1c4ad89bc7f7efed18f4c484ccbf495a9ef0a4a3a53bde0d68c241cb877c6ee093995987b90effeaab8ab3d7029c23aaea71a670bac2fb2d50
@@ -64,9 +64,9 @@
64
64
  <optional>
65
65
  <ref name="label"/>
66
66
  </optional>
67
- <optional>
67
+ <zeroOrMore>
68
68
  <ref name="subject"/>
69
- </optional>
69
+ </zeroOrMore>
70
70
  <zeroOrMore>
71
71
  <ref name="reqinherit"/>
72
72
  </zeroOrMore>
@@ -80,6 +80,7 @@
80
80
  <ref name="verification"/>
81
81
  <ref name="import"/>
82
82
  <ref name="description"/>
83
+ <ref name="component"/>
83
84
  </choice>
84
85
  </zeroOrMore>
85
86
  <optional>
@@ -105,12 +106,16 @@
105
106
  </define>
106
107
  <define name="subject">
107
108
  <element name="subject">
108
- <text/>
109
+ <oneOrMore>
110
+ <ref name="TextElement"/>
111
+ </oneOrMore>
109
112
  </element>
110
113
  </define>
111
114
  <define name="reqinherit">
112
115
  <element name="inherit">
113
- <text/>
116
+ <oneOrMore>
117
+ <ref name="TextElement"/>
118
+ </oneOrMore>
114
119
  </element>
115
120
  </define>
116
121
  <define name="measurementtarget">
@@ -138,6 +143,12 @@
138
143
  <ref name="RequirementSubpart"/>
139
144
  </element>
140
145
  </define>
146
+ <define name="component">
147
+ <element name="component">
148
+ <attribute name="class"/>
149
+ <ref name="RequirementSubpart"/>
150
+ </element>
151
+ </define>
141
152
  <define name="reqt_references">
142
153
  <element name="references">
143
154
  <oneOrMore>
@@ -1276,7 +1276,7 @@
1276
1276
 
1277
1277
 
1278
1278
 
1279
- <xsl:attribute name="font-family">Courier</xsl:attribute>
1279
+ <xsl:attribute name="font-family">Courier New</xsl:attribute>
1280
1280
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
1281
1281
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1282
1282
 
@@ -1365,6 +1365,7 @@
1365
1365
 
1366
1366
 
1367
1367
 
1368
+
1368
1369
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1369
1370
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1370
1371
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1816,6 +1817,8 @@
1816
1817
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1817
1818
  </xsl:if>
1818
1819
 
1820
+
1821
+
1819
1822
  <xsl:choose>
1820
1823
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1821
1824
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2100,9 +2103,9 @@
2100
2103
  <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2101
2104
  <xsl:with-param name="continued">true</xsl:with-param>
2102
2105
  </xsl:apply-templates>
2103
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
2104
- <xsl:call-template name="fn_name_display"/>
2105
- </xsl:for-each>
2106
+
2107
+
2108
+
2106
2109
 
2107
2110
  </fo:table-cell>
2108
2111
  </fo:table-row>
@@ -2184,7 +2187,11 @@
2184
2187
 
2185
2188
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2186
2189
 
2187
- <xsl:if test="$isNoteOrFnExist = 'true'">
2190
+ <xsl:variable name="isNoteOrFnExistShowAfterTable">
2191
+
2192
+ </xsl:variable>
2193
+
2194
+ <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
2188
2195
 
2189
2196
  <xsl:variable name="cols-count">
2190
2197
  <xsl:choose>
@@ -2325,6 +2332,19 @@
2325
2332
 
2326
2333
  </fo:table-body>
2327
2334
 
2335
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2336
+ <xsl:choose>
2337
+ <xsl:when test="substring-after(., '—') != ''">
2338
+ <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2339
+ </xsl:when>
2340
+ <xsl:otherwise>
2341
+ <xsl:value-of select="."/>
2342
+ </xsl:otherwise>
2343
+ </xsl:choose>
2344
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2345
+ <xsl:apply-templates mode="presentation_name"/>
2346
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2347
+ <xsl:apply-templates select="."/>
2328
2348
  </xsl:template><xsl:template match="*[local-name()='tr']">
2329
2349
  <xsl:variable name="parent-name" select="local-name(..)"/>
2330
2350
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2529,14 +2549,12 @@
2529
2549
  <xsl:apply-templates/>
2530
2550
  </xsl:template><xsl:template name="fn_display">
2531
2551
  <xsl:variable name="references">
2552
+
2532
2553
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
2533
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2534
-
2535
-
2536
- <xsl:apply-templates/>
2537
- </fn>
2554
+ <xsl:call-template name="create_fn"/>
2538
2555
  </xsl:for-each>
2539
2556
  </xsl:variable>
2557
+
2540
2558
  <xsl:for-each select="xalan:nodeset($references)//fn">
2541
2559
  <xsl:variable name="reference" select="@reference"/>
2542
2560
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -2572,6 +2590,12 @@
2572
2590
  </fo:block>
2573
2591
  </xsl:if>
2574
2592
  </xsl:for-each>
2593
+ </xsl:template><xsl:template name="create_fn">
2594
+ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2595
+
2596
+
2597
+ <xsl:apply-templates/>
2598
+ </fn>
2575
2599
  </xsl:template><xsl:template name="fn_name_display">
2576
2600
  <!-- <xsl:variable name="references">
2577
2601
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -3570,19 +3594,6 @@
3570
3594
  <!-- replace start and end spaces to non-break space -->
3571
3595
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
3572
3596
  </xsl:copy>
3573
- </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
3574
- <xsl:copy>
3575
- <xsl:apply-templates select="@*|node()" mode="mathml"/>
3576
- </xsl:copy>
3577
- <xsl:choose>
3578
- <!-- if in msub, then don't add space -->
3579
- <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
3580
- <!-- if next char in digit, don't add space -->
3581
- <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
3582
- <xsl:otherwise>
3583
- <mathml:mspace width="0.5ex"/>
3584
- </xsl:otherwise>
3585
- </xsl:choose>
3586
3597
  </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">
3587
3598
  <xsl:variable name="target">
3588
3599
  <xsl:choose>
@@ -4775,7 +4786,19 @@
4775
4786
  </fo:inline>
4776
4787
  </xsl:if>
4777
4788
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
4778
- <fo:inline><xsl:apply-templates/></fo:inline>
4789
+ <xsl:variable name="element">inline
4790
+
4791
+ </xsl:variable>
4792
+ <xsl:choose>
4793
+ <xsl:when test="contains($element, 'block')">
4794
+ <fo:block xsl:use-attribute-sets="example-p-style">
4795
+ <xsl:apply-templates/>
4796
+ </fo:block>
4797
+ </xsl:when>
4798
+ <xsl:otherwise>
4799
+ <fo:inline><xsl:apply-templates/></fo:inline>
4800
+ </xsl:otherwise>
4801
+ </xsl:choose>
4779
4802
  </xsl:template><xsl:template match="*[local-name() = 'example']">
4780
4803
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
4781
4804
 
@@ -5355,7 +5378,6 @@
5355
5378
  </xsl:template><xsl:template name="processBibitem">
5356
5379
 
5357
5380
 
5358
- <!-- end BIPM bibitem processing-->
5359
5381
 
5360
5382
 
5361
5383
 
@@ -1276,7 +1276,7 @@
1276
1276
 
1277
1277
 
1278
1278
 
1279
- <xsl:attribute name="font-family">Courier</xsl:attribute>
1279
+ <xsl:attribute name="font-family">Courier New</xsl:attribute>
1280
1280
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
1281
1281
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1282
1282
 
@@ -1365,6 +1365,7 @@
1365
1365
 
1366
1366
 
1367
1367
 
1368
+
1368
1369
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1369
1370
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1370
1371
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1816,6 +1817,8 @@
1816
1817
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1817
1818
  </xsl:if>
1818
1819
 
1820
+
1821
+
1819
1822
  <xsl:choose>
1820
1823
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1821
1824
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2100,9 +2103,9 @@
2100
2103
  <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2101
2104
  <xsl:with-param name="continued">true</xsl:with-param>
2102
2105
  </xsl:apply-templates>
2103
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
2104
- <xsl:call-template name="fn_name_display"/>
2105
- </xsl:for-each>
2106
+
2107
+
2108
+
2106
2109
 
2107
2110
  </fo:table-cell>
2108
2111
  </fo:table-row>
@@ -2184,7 +2187,11 @@
2184
2187
 
2185
2188
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2186
2189
 
2187
- <xsl:if test="$isNoteOrFnExist = 'true'">
2190
+ <xsl:variable name="isNoteOrFnExistShowAfterTable">
2191
+
2192
+ </xsl:variable>
2193
+
2194
+ <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
2188
2195
 
2189
2196
  <xsl:variable name="cols-count">
2190
2197
  <xsl:choose>
@@ -2325,6 +2332,19 @@
2325
2332
 
2326
2333
  </fo:table-body>
2327
2334
 
2335
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2336
+ <xsl:choose>
2337
+ <xsl:when test="substring-after(., '—') != ''">
2338
+ <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2339
+ </xsl:when>
2340
+ <xsl:otherwise>
2341
+ <xsl:value-of select="."/>
2342
+ </xsl:otherwise>
2343
+ </xsl:choose>
2344
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2345
+ <xsl:apply-templates mode="presentation_name"/>
2346
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2347
+ <xsl:apply-templates select="."/>
2328
2348
  </xsl:template><xsl:template match="*[local-name()='tr']">
2329
2349
  <xsl:variable name="parent-name" select="local-name(..)"/>
2330
2350
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2529,14 +2549,12 @@
2529
2549
  <xsl:apply-templates/>
2530
2550
  </xsl:template><xsl:template name="fn_display">
2531
2551
  <xsl:variable name="references">
2552
+
2532
2553
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
2533
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2534
-
2535
-
2536
- <xsl:apply-templates/>
2537
- </fn>
2554
+ <xsl:call-template name="create_fn"/>
2538
2555
  </xsl:for-each>
2539
2556
  </xsl:variable>
2557
+
2540
2558
  <xsl:for-each select="xalan:nodeset($references)//fn">
2541
2559
  <xsl:variable name="reference" select="@reference"/>
2542
2560
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -2572,6 +2590,12 @@
2572
2590
  </fo:block>
2573
2591
  </xsl:if>
2574
2592
  </xsl:for-each>
2593
+ </xsl:template><xsl:template name="create_fn">
2594
+ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2595
+
2596
+
2597
+ <xsl:apply-templates/>
2598
+ </fn>
2575
2599
  </xsl:template><xsl:template name="fn_name_display">
2576
2600
  <!-- <xsl:variable name="references">
2577
2601
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -3570,19 +3594,6 @@
3570
3594
  <!-- replace start and end spaces to non-break space -->
3571
3595
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
3572
3596
  </xsl:copy>
3573
- </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
3574
- <xsl:copy>
3575
- <xsl:apply-templates select="@*|node()" mode="mathml"/>
3576
- </xsl:copy>
3577
- <xsl:choose>
3578
- <!-- if in msub, then don't add space -->
3579
- <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
3580
- <!-- if next char in digit, don't add space -->
3581
- <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
3582
- <xsl:otherwise>
3583
- <mathml:mspace width="0.5ex"/>
3584
- </xsl:otherwise>
3585
- </xsl:choose>
3586
3597
  </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">
3587
3598
  <xsl:variable name="target">
3588
3599
  <xsl:choose>
@@ -4775,7 +4786,19 @@
4775
4786
  </fo:inline>
4776
4787
  </xsl:if>
4777
4788
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
4778
- <fo:inline><xsl:apply-templates/></fo:inline>
4789
+ <xsl:variable name="element">inline
4790
+
4791
+ </xsl:variable>
4792
+ <xsl:choose>
4793
+ <xsl:when test="contains($element, 'block')">
4794
+ <fo:block xsl:use-attribute-sets="example-p-style">
4795
+ <xsl:apply-templates/>
4796
+ </fo:block>
4797
+ </xsl:when>
4798
+ <xsl:otherwise>
4799
+ <fo:inline><xsl:apply-templates/></fo:inline>
4800
+ </xsl:otherwise>
4801
+ </xsl:choose>
4779
4802
  </xsl:template><xsl:template match="*[local-name() = 'example']">
4780
4803
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
4781
4804
 
@@ -5355,7 +5378,6 @@
5355
5378
  </xsl:template><xsl:template name="processBibitem">
5356
5379
 
5357
5380
 
5358
- <!-- end BIPM bibitem processing-->
5359
5381
 
5360
5382
 
5361
5383
 
@@ -1232,7 +1232,7 @@
1232
1232
 
1233
1233
 
1234
1234
 
1235
- <xsl:attribute name="font-family">Courier</xsl:attribute>
1235
+ <xsl:attribute name="font-family">Courier New</xsl:attribute>
1236
1236
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
1237
1237
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1238
1238
 
@@ -1321,6 +1321,7 @@
1321
1321
 
1322
1322
 
1323
1323
 
1324
+
1324
1325
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1325
1326
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1326
1327
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1778,6 +1779,8 @@
1778
1779
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1779
1780
  </xsl:if>
1780
1781
 
1782
+
1783
+
1781
1784
  <xsl:choose>
1782
1785
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1783
1786
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2062,9 +2065,9 @@
2062
2065
  <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2063
2066
  <xsl:with-param name="continued">true</xsl:with-param>
2064
2067
  </xsl:apply-templates>
2065
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
2066
- <xsl:call-template name="fn_name_display"/>
2067
- </xsl:for-each>
2068
+
2069
+
2070
+
2068
2071
 
2069
2072
  </fo:table-cell>
2070
2073
  </fo:table-row>
@@ -2146,7 +2149,11 @@
2146
2149
 
2147
2150
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2148
2151
 
2149
- <xsl:if test="$isNoteOrFnExist = 'true'">
2152
+ <xsl:variable name="isNoteOrFnExistShowAfterTable">
2153
+
2154
+ </xsl:variable>
2155
+
2156
+ <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
2150
2157
 
2151
2158
  <xsl:variable name="cols-count">
2152
2159
  <xsl:choose>
@@ -2287,6 +2294,19 @@
2287
2294
 
2288
2295
  </fo:table-body>
2289
2296
 
2297
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2298
+ <xsl:choose>
2299
+ <xsl:when test="substring-after(., '—') != ''">
2300
+ <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2301
+ </xsl:when>
2302
+ <xsl:otherwise>
2303
+ <xsl:value-of select="."/>
2304
+ </xsl:otherwise>
2305
+ </xsl:choose>
2306
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2307
+ <xsl:apply-templates mode="presentation_name"/>
2308
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2309
+ <xsl:apply-templates select="."/>
2290
2310
  </xsl:template><xsl:template match="*[local-name()='tr']">
2291
2311
  <xsl:variable name="parent-name" select="local-name(..)"/>
2292
2312
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2491,14 +2511,12 @@
2491
2511
  <xsl:apply-templates/>
2492
2512
  </xsl:template><xsl:template name="fn_display">
2493
2513
  <xsl:variable name="references">
2514
+
2494
2515
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
2495
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2496
-
2497
-
2498
- <xsl:apply-templates/>
2499
- </fn>
2516
+ <xsl:call-template name="create_fn"/>
2500
2517
  </xsl:for-each>
2501
2518
  </xsl:variable>
2519
+
2502
2520
  <xsl:for-each select="xalan:nodeset($references)//fn">
2503
2521
  <xsl:variable name="reference" select="@reference"/>
2504
2522
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -2534,6 +2552,12 @@
2534
2552
  </fo:block>
2535
2553
  </xsl:if>
2536
2554
  </xsl:for-each>
2555
+ </xsl:template><xsl:template name="create_fn">
2556
+ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2557
+
2558
+
2559
+ <xsl:apply-templates/>
2560
+ </fn>
2537
2561
  </xsl:template><xsl:template name="fn_name_display">
2538
2562
  <!-- <xsl:variable name="references">
2539
2563
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -3532,19 +3556,6 @@
3532
3556
  <!-- replace start and end spaces to non-break space -->
3533
3557
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
3534
3558
  </xsl:copy>
3535
- </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
3536
- <xsl:copy>
3537
- <xsl:apply-templates select="@*|node()" mode="mathml"/>
3538
- </xsl:copy>
3539
- <xsl:choose>
3540
- <!-- if in msub, then don't add space -->
3541
- <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
3542
- <!-- if next char in digit, don't add space -->
3543
- <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
3544
- <xsl:otherwise>
3545
- <mathml:mspace width="0.5ex"/>
3546
- </xsl:otherwise>
3547
- </xsl:choose>
3548
3559
  </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">
3549
3560
  <xsl:variable name="target">
3550
3561
  <xsl:choose>
@@ -4746,7 +4757,19 @@
4746
4757
  </fo:inline>
4747
4758
  </xsl:if>
4748
4759
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
4749
- <fo:inline><xsl:apply-templates/></fo:inline>
4760
+ <xsl:variable name="element">inline
4761
+
4762
+ </xsl:variable>
4763
+ <xsl:choose>
4764
+ <xsl:when test="contains($element, 'block')">
4765
+ <fo:block xsl:use-attribute-sets="example-p-style">
4766
+ <xsl:apply-templates/>
4767
+ </fo:block>
4768
+ </xsl:when>
4769
+ <xsl:otherwise>
4770
+ <fo:inline><xsl:apply-templates/></fo:inline>
4771
+ </xsl:otherwise>
4772
+ </xsl:choose>
4750
4773
  </xsl:template><xsl:template match="*[local-name() = 'example']">
4751
4774
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
4752
4775
 
@@ -5326,7 +5349,6 @@
5326
5349
  </xsl:template><xsl:template name="processBibitem">
5327
5350
 
5328
5351
 
5329
- <!-- end BIPM bibitem processing-->
5330
5352
 
5331
5353
 
5332
5354
 
@@ -22,10 +22,11 @@ module Metanorma
22
22
  {
23
23
  "Arial" => nil,
24
24
  "Arial Black" => nil,
25
- "Courier" => nil,
25
+ "Courier New" => nil,
26
26
  "Times New Roman" => nil,
27
27
  "STIX Two Math" => nil,
28
28
  "Source Han Sans" => nil,
29
+ "Source Han Sans Normal" => nil,
29
30
  }
30
31
  end
31
32
 
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.6.8".freeze
3
+ VERSION = "0.6.9".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.6.8
4
+ version: 0.6.9
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-08-02 00:00:00.000000000 Z
11
+ date: 2021-08-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639