metanorma-iho 1.0.5 → 1.0.6
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/iho/iho.specification.xsl +53 -30
- data/lib/isodoc/iho/iho.standard.xsl +53 -30
- data/lib/isodoc/iho/xref.rb +2 -2
- data/lib/metanorma/iho/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: 1232f18a324da91bff7e2c7b8bda8a80fed2b5237591baff5a3dc5d4086b7d4e
|
4
|
+
data.tar.gz: 747ba7e3ffc91a4d7f0313a1e63e95f2ed1a8031b389dc0b1bc569faf87d6478
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5f1aa2e3f3043c5b81a5606d0fe8ba6fafdd531b2db3064ffc69c82d4e9f8dec7f5f9bd50759c06c2dd319f34023014ecaf21badb895beeb643524efc679b773
|
7
|
+
data.tar.gz: 21597d42272c6c7ccdfbf6d5f60f58aa4c2a5a29f0645fe2c045526434e8e1fec1ade84ac6a409e03ef969ce58c8761372a547f2f48b470937c94948075c9ace
|
@@ -4237,10 +4237,14 @@
|
|
4237
4237
|
<xsl:variable name="fn_styles">
|
4238
4238
|
<xsl:choose>
|
4239
4239
|
<xsl:when test="ancestor::*[local-name() = 'bibitem']">
|
4240
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"
|
4240
|
+
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
4241
|
+
|
4242
|
+
</fn_styles>
|
4241
4243
|
</xsl:when>
|
4242
4244
|
<xsl:otherwise>
|
4243
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style"
|
4245
|
+
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
4246
|
+
|
4247
|
+
</fn_styles>
|
4244
4248
|
</xsl:otherwise>
|
4245
4249
|
</xsl:choose>
|
4246
4250
|
</xsl:variable>
|
@@ -7179,6 +7183,7 @@
|
|
7179
7183
|
<xsl:if test="string-length(normalize-space()) < 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
|
7180
7184
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
7181
7185
|
</xsl:if>
|
7186
|
+
|
7182
7187
|
<xsl:if test="parent::*[local-name() = 'add']">
|
7183
7188
|
<xsl:call-template name="append_add-style"/>
|
7184
7189
|
</xsl:if>
|
@@ -7287,44 +7292,44 @@
|
|
7287
7292
|
|
7288
7293
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
7289
7294
|
|
7290
|
-
|
7295
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
7291
7296
|
|
7292
|
-
|
7297
|
+
<xsl:call-template name="setBlockSpanAll"/>
|
7293
7298
|
|
7294
|
-
|
7299
|
+
<xsl:call-template name="refine_note-style"/>
|
7295
7300
|
|
7296
|
-
|
7301
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
7297
7302
|
|
7298
|
-
|
7303
|
+
<fo:block>
|
7299
7304
|
|
7300
|
-
|
7305
|
+
<xsl:call-template name="refine_note_block_style"/>
|
7301
7306
|
|
7302
|
-
|
7307
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
7303
7308
|
|
7304
|
-
|
7309
|
+
<xsl:call-template name="refine_note-name-style"/>
|
7305
7310
|
|
7306
|
-
|
7307
|
-
|
7308
|
-
|
7309
|
-
|
7310
|
-
|
7311
|
+
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
7312
|
+
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
7313
|
+
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
7314
|
+
<xsl:call-template name="append_add-style"/>
|
7315
|
+
</xsl:if>
|
7311
7316
|
|
7312
|
-
|
7313
|
-
|
7314
|
-
|
7315
|
-
|
7316
|
-
|
7317
|
-
|
7317
|
+
<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
|
7318
|
+
<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
7319
|
+
<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
7320
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
7321
|
+
</xsl:apply-templates>
|
7322
|
+
</xsl:if>
|
7318
7323
|
|
7319
|
-
|
7324
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
7320
7325
|
|
7321
|
-
|
7326
|
+
</fo:inline>
|
7322
7327
|
|
7323
|
-
|
7324
|
-
|
7328
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
7329
|
+
</fo:block>
|
7325
7330
|
|
7326
|
-
|
7327
|
-
|
7331
|
+
</fo:block-container>
|
7332
|
+
</fo:block-container>
|
7328
7333
|
|
7329
7334
|
</xsl:template>
|
7330
7335
|
|
@@ -9727,6 +9732,7 @@
|
|
9727
9732
|
</xsl:when>
|
9728
9733
|
<xsl:when test="contains(normalize-space($fo_element), 'block')">
|
9729
9734
|
<fo:block xsl:use-attribute-sets="example-name-style">
|
9735
|
+
|
9730
9736
|
<xsl:apply-templates/>
|
9731
9737
|
</fo:block>
|
9732
9738
|
</xsl:when>
|
@@ -9742,6 +9748,7 @@
|
|
9742
9748
|
|
9743
9749
|
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
9744
9750
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
9751
|
+
|
9745
9752
|
<xsl:apply-templates/>
|
9746
9753
|
</fo:inline>
|
9747
9754
|
</xsl:template>
|
@@ -10114,12 +10121,14 @@
|
|
10114
10121
|
|
10115
10122
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
|
10116
10123
|
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
10124
|
+
|
10117
10125
|
<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
|
10118
10126
|
</fo:block>
|
10119
10127
|
</xsl:if>
|
10120
10128
|
|
10121
10129
|
<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
|
10122
10130
|
<xsl:call-template name="setStyle_preferred"/>
|
10131
|
+
|
10123
10132
|
<xsl:apply-templates/>
|
10124
10133
|
</fo:block>
|
10125
10134
|
</fo:block>
|
@@ -13072,9 +13081,10 @@
|
|
13072
13081
|
<xsl:template name="insertBackgroundPageImage">
|
13073
13082
|
<xsl:param name="number">1</xsl:param>
|
13074
13083
|
<xsl:param name="name">coverpage-image</xsl:param>
|
13084
|
+
<xsl:param name="suffix"/>
|
13075
13085
|
<xsl:variable name="num" select="number($number)"/>
|
13076
13086
|
<!-- background image -->
|
13077
|
-
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="
|
13087
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
|
13078
13088
|
<fo:block>
|
13079
13089
|
<xsl:for-each select="/*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = $name][1]/*[local-name() = 'value']/*[local-name() = 'image'][$num]">
|
13080
13090
|
<xsl:choose>
|
@@ -13140,16 +13150,29 @@
|
|
13140
13150
|
|
13141
13151
|
<!-- END: insert cover page image -->
|
13142
13152
|
|
13153
|
+
<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
|
13143
13154
|
<xsl:template name="insertVerticalChar">
|
13144
13155
|
<xsl:param name="str"/>
|
13156
|
+
<xsl:param name="writing-mode">lr-tb</xsl:param>
|
13157
|
+
<xsl:param name="reference-orientation">90</xsl:param>
|
13145
13158
|
<xsl:if test="string-length($str) > 0">
|
13146
|
-
<fo:inline-container
|
13159
|
+
<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
|
13160
|
+
<xsl:if test="normalize-space($writing-mode) != ''">
|
13161
|
+
<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
|
13162
|
+
<xsl:attribute name="reference-orientation">90</xsl:attribute>
|
13163
|
+
</xsl:if>
|
13164
|
+
<xsl:variable name="char" select="substring($str,1,1)"/>
|
13165
|
+
<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
|
13166
|
+
<xsl:attribute name="reference-orientation">0</xsl:attribute>
|
13167
|
+
</xsl:if>
|
13147
13168
|
<fo:block-container width="1em">
|
13148
|
-
<fo:block line-height="1em"><xsl:value-of select="
|
13169
|
+
<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
|
13149
13170
|
</fo:block-container>
|
13150
13171
|
</fo:inline-container>
|
13151
13172
|
<xsl:call-template name="insertVerticalChar">
|
13152
13173
|
<xsl:with-param name="str" select="substring($str, 2)"/>
|
13174
|
+
<xsl:with-param name="writing-mode" select="$writing-mode"/>
|
13175
|
+
<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
|
13153
13176
|
</xsl:call-template>
|
13154
13177
|
</xsl:if>
|
13155
13178
|
</xsl:template>
|
@@ -4237,10 +4237,14 @@
|
|
4237
4237
|
<xsl:variable name="fn_styles">
|
4238
4238
|
<xsl:choose>
|
4239
4239
|
<xsl:when test="ancestor::*[local-name() = 'bibitem']">
|
4240
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"
|
4240
|
+
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
4241
|
+
|
4242
|
+
</fn_styles>
|
4241
4243
|
</xsl:when>
|
4242
4244
|
<xsl:otherwise>
|
4243
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style"
|
4245
|
+
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
4246
|
+
|
4247
|
+
</fn_styles>
|
4244
4248
|
</xsl:otherwise>
|
4245
4249
|
</xsl:choose>
|
4246
4250
|
</xsl:variable>
|
@@ -7179,6 +7183,7 @@
|
|
7179
7183
|
<xsl:if test="string-length(normalize-space()) < 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
|
7180
7184
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
7181
7185
|
</xsl:if>
|
7186
|
+
|
7182
7187
|
<xsl:if test="parent::*[local-name() = 'add']">
|
7183
7188
|
<xsl:call-template name="append_add-style"/>
|
7184
7189
|
</xsl:if>
|
@@ -7287,44 +7292,44 @@
|
|
7287
7292
|
|
7288
7293
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
7289
7294
|
|
7290
|
-
|
7295
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
7291
7296
|
|
7292
|
-
|
7297
|
+
<xsl:call-template name="setBlockSpanAll"/>
|
7293
7298
|
|
7294
|
-
|
7299
|
+
<xsl:call-template name="refine_note-style"/>
|
7295
7300
|
|
7296
|
-
|
7301
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
7297
7302
|
|
7298
|
-
|
7303
|
+
<fo:block>
|
7299
7304
|
|
7300
|
-
|
7305
|
+
<xsl:call-template name="refine_note_block_style"/>
|
7301
7306
|
|
7302
|
-
|
7307
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
7303
7308
|
|
7304
|
-
|
7309
|
+
<xsl:call-template name="refine_note-name-style"/>
|
7305
7310
|
|
7306
|
-
|
7307
|
-
|
7308
|
-
|
7309
|
-
|
7310
|
-
|
7311
|
+
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
7312
|
+
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
7313
|
+
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
7314
|
+
<xsl:call-template name="append_add-style"/>
|
7315
|
+
</xsl:if>
|
7311
7316
|
|
7312
|
-
|
7313
|
-
|
7314
|
-
|
7315
|
-
|
7316
|
-
|
7317
|
-
|
7317
|
+
<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
|
7318
|
+
<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
7319
|
+
<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
7320
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
7321
|
+
</xsl:apply-templates>
|
7322
|
+
</xsl:if>
|
7318
7323
|
|
7319
|
-
|
7324
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
7320
7325
|
|
7321
|
-
|
7326
|
+
</fo:inline>
|
7322
7327
|
|
7323
|
-
|
7324
|
-
|
7328
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
7329
|
+
</fo:block>
|
7325
7330
|
|
7326
|
-
|
7327
|
-
|
7331
|
+
</fo:block-container>
|
7332
|
+
</fo:block-container>
|
7328
7333
|
|
7329
7334
|
</xsl:template>
|
7330
7335
|
|
@@ -9727,6 +9732,7 @@
|
|
9727
9732
|
</xsl:when>
|
9728
9733
|
<xsl:when test="contains(normalize-space($fo_element), 'block')">
|
9729
9734
|
<fo:block xsl:use-attribute-sets="example-name-style">
|
9735
|
+
|
9730
9736
|
<xsl:apply-templates/>
|
9731
9737
|
</fo:block>
|
9732
9738
|
</xsl:when>
|
@@ -9742,6 +9748,7 @@
|
|
9742
9748
|
|
9743
9749
|
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
9744
9750
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
9751
|
+
|
9745
9752
|
<xsl:apply-templates/>
|
9746
9753
|
</fo:inline>
|
9747
9754
|
</xsl:template>
|
@@ -10114,12 +10121,14 @@
|
|
10114
10121
|
|
10115
10122
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
|
10116
10123
|
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
10124
|
+
|
10117
10125
|
<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
|
10118
10126
|
</fo:block>
|
10119
10127
|
</xsl:if>
|
10120
10128
|
|
10121
10129
|
<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
|
10122
10130
|
<xsl:call-template name="setStyle_preferred"/>
|
10131
|
+
|
10123
10132
|
<xsl:apply-templates/>
|
10124
10133
|
</fo:block>
|
10125
10134
|
</fo:block>
|
@@ -13072,9 +13081,10 @@
|
|
13072
13081
|
<xsl:template name="insertBackgroundPageImage">
|
13073
13082
|
<xsl:param name="number">1</xsl:param>
|
13074
13083
|
<xsl:param name="name">coverpage-image</xsl:param>
|
13084
|
+
<xsl:param name="suffix"/>
|
13075
13085
|
<xsl:variable name="num" select="number($number)"/>
|
13076
13086
|
<!-- background image -->
|
13077
|
-
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="
|
13087
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
|
13078
13088
|
<fo:block>
|
13079
13089
|
<xsl:for-each select="/*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = $name][1]/*[local-name() = 'value']/*[local-name() = 'image'][$num]">
|
13080
13090
|
<xsl:choose>
|
@@ -13140,16 +13150,29 @@
|
|
13140
13150
|
|
13141
13151
|
<!-- END: insert cover page image -->
|
13142
13152
|
|
13153
|
+
<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
|
13143
13154
|
<xsl:template name="insertVerticalChar">
|
13144
13155
|
<xsl:param name="str"/>
|
13156
|
+
<xsl:param name="writing-mode">lr-tb</xsl:param>
|
13157
|
+
<xsl:param name="reference-orientation">90</xsl:param>
|
13145
13158
|
<xsl:if test="string-length($str) > 0">
|
13146
|
-
<fo:inline-container
|
13159
|
+
<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
|
13160
|
+
<xsl:if test="normalize-space($writing-mode) != ''">
|
13161
|
+
<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
|
13162
|
+
<xsl:attribute name="reference-orientation">90</xsl:attribute>
|
13163
|
+
</xsl:if>
|
13164
|
+
<xsl:variable name="char" select="substring($str,1,1)"/>
|
13165
|
+
<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
|
13166
|
+
<xsl:attribute name="reference-orientation">0</xsl:attribute>
|
13167
|
+
</xsl:if>
|
13147
13168
|
<fo:block-container width="1em">
|
13148
|
-
<fo:block line-height="1em"><xsl:value-of select="
|
13169
|
+
<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
|
13149
13170
|
</fo:block-container>
|
13150
13171
|
</fo:inline-container>
|
13151
13172
|
<xsl:call-template name="insertVerticalChar">
|
13152
13173
|
<xsl:with-param name="str" select="substring($str, 2)"/>
|
13174
|
+
<xsl:with-param name="writing-mode" select="$writing-mode"/>
|
13175
|
+
<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
|
13153
13176
|
</xsl:call-template>
|
13154
13177
|
</xsl:if>
|
13155
13178
|
</xsl:template>
|
data/lib/isodoc/iho/xref.rb
CHANGED
@@ -94,7 +94,7 @@ module IsoDoc
|
|
94
94
|
@anchors[clause["id"]] =
|
95
95
|
{ label: num, xref: l10n("#{lbl} #{num}"),
|
96
96
|
level: level, type: "clause" }
|
97
|
-
i = Counter.new(0, prefix:
|
97
|
+
i = Counter.new(0, prefix: num)
|
98
98
|
clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
|
99
99
|
.each do |c|
|
100
100
|
annex_names1(c, i.increment(c).print, level + 1)
|
@@ -117,7 +117,7 @@ module IsoDoc
|
|
117
117
|
{ label: num, level: level,
|
118
118
|
xref: l10n("#{@labels['subclause']} #{num}"),
|
119
119
|
type: "clause", elem: @labels["subclause"] }
|
120
|
-
i = Counter.new(0, prefix:
|
120
|
+
i = Counter.new(0, prefix: num)
|
121
121
|
clause.xpath(ns(SUBCLAUSES)).each do |c|
|
122
122
|
section_names1(c, i.increment(c).print, level + 1)
|
123
123
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-iho
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.6
|
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-10-
|
11
|
+
date: 2024-10-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|