metanorma-iho 1.1.2 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/iho/html/htmlstyle.css +7 -0
- data/lib/isodoc/iho/iho.specification.xsl +144 -34
- data/lib/isodoc/iho/iho.standard.xsl +144 -34
- data/lib/metanorma/iho/basicdoc.rng +34 -27
- data/lib/metanorma/iho/isodoc.rng +28 -1
- 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: b7aab0def165548d9913faf4dc35a745021c97717b11d47c95b0257569c018f0
|
4
|
+
data.tar.gz: db48fe4820c18f1ed018030c215ed3e5f0ca9078ea5c4892691b04c5c579b702
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cccba76137ef87797a3cbabbd67edadf2eb1fc7a43d56329993d649ace1dd2360f550310dcb9070431e11b8d09da55c818f3d85e744613d2829006580e84474f
|
7
|
+
data.tar.gz: 88d5e48019a6db41fcb87439fdd71b136f032e10806b725eae8091eca189a5fd1b7631a56f913468ff16a10230bd4eca83517595b8c45f923df37a1f213f8431
|
@@ -4224,6 +4224,8 @@
|
|
4224
4224
|
|
4225
4225
|
<xsl:template name="setTableRowAttributes">
|
4226
4226
|
|
4227
|
+
<xsl:call-template name="setColors"/>
|
4228
|
+
|
4227
4229
|
</xsl:template> <!-- setTableRowAttributes -->
|
4228
4230
|
<!-- ===================== -->
|
4229
4231
|
<!-- END Table's row processing -->
|
@@ -4275,6 +4277,7 @@
|
|
4275
4277
|
</xsl:attribute>
|
4276
4278
|
</xsl:if>
|
4277
4279
|
<xsl:call-template name="display-align"/>
|
4280
|
+
<xsl:call-template name="setColors"/>
|
4278
4281
|
</xsl:template>
|
4279
4282
|
|
4280
4283
|
<xsl:template name="display-align">
|
@@ -4290,6 +4293,29 @@
|
|
4290
4293
|
</xsl:if>
|
4291
4294
|
</xsl:template>
|
4292
4295
|
|
4296
|
+
<xsl:template name="setColors">
|
4297
|
+
<xsl:variable name="styles__">
|
4298
|
+
<xsl:call-template name="split">
|
4299
|
+
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
4300
|
+
<xsl:with-param name="sep" select="';'"/>
|
4301
|
+
</xsl:call-template>
|
4302
|
+
</xsl:variable>
|
4303
|
+
<xsl:variable name="quot">"</xsl:variable>
|
4304
|
+
<xsl:variable name="styles_">
|
4305
|
+
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
4306
|
+
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
4307
|
+
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
4308
|
+
<xsl:if test="$key = 'color' or $key = 'background-color'">
|
4309
|
+
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
4310
|
+
</xsl:if>
|
4311
|
+
</xsl:for-each>
|
4312
|
+
</xsl:variable>
|
4313
|
+
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
4314
|
+
<xsl:for-each select="$styles/style">
|
4315
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
4316
|
+
</xsl:for-each>
|
4317
|
+
</xsl:template>
|
4318
|
+
|
4293
4319
|
<!-- cell in table body, footer -->
|
4294
4320
|
<xsl:template match="*[local-name()='td']" name="td">
|
4295
4321
|
<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
|
@@ -4301,12 +4327,12 @@
|
|
4301
4327
|
|
4302
4328
|
<xsl:call-template name="refine_table-cell-style"/>
|
4303
4329
|
|
4330
|
+
<xsl:call-template name="setTableCellAttributes"/>
|
4331
|
+
|
4304
4332
|
<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
|
4305
4333
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
4306
4334
|
</xsl:if>
|
4307
4335
|
|
4308
|
-
<xsl:call-template name="setTableCellAttributes"/>
|
4309
|
-
|
4310
4336
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
4311
4337
|
<xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width -->
|
4312
4338
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
@@ -6166,7 +6192,7 @@
|
|
6166
6192
|
<xsl:choose>
|
6167
6193
|
<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
|
6168
6194
|
<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
|
6169
|
-
<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
|
6195
|
+
<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
6170
6196
|
</xsl:when>
|
6171
6197
|
<xsl:otherwise>
|
6172
6198
|
<xsl:apply-templates/>
|
@@ -6174,7 +6200,7 @@
|
|
6174
6200
|
</xsl:choose>
|
6175
6201
|
</xsl:template>
|
6176
6202
|
<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
|
6177
|
-
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
|
6203
|
+
<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:value-of select="."/></fo:inline>
|
6178
6204
|
</xsl:template>
|
6179
6205
|
|
6180
6206
|
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
|
@@ -7214,24 +7240,26 @@
|
|
7214
7240
|
<xsl:apply-templates select="." mode="mathml"/>
|
7215
7241
|
</xsl:variable>
|
7216
7242
|
|
7217
|
-
<fo:instream-foreign-object fox:alt-text="Math">
|
7243
|
+
<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
|
7218
7244
|
|
7219
7245
|
<xsl:call-template name="refine_mathml_insteam_object_style"/>
|
7220
7246
|
|
7221
|
-
|
7222
|
-
|
7223
|
-
|
7224
|
-
<xsl:
|
7225
|
-
|
7226
|
-
|
7227
|
-
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
7228
|
-
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
7229
|
-
<!-- put Mathin Alternate Text -->
|
7230
|
-
<xsl:attribute name="fox:alt-text">
|
7231
|
-
<xsl:value-of select="$asciimath_text_"/>
|
7247
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
7248
|
+
<!-- put MathML in Actual Text -->
|
7249
|
+
<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
|
7250
|
+
<xsl:attribute name="fox:actual-text">
|
7251
|
+
<xsl:value-of select="$mathml_content"/>
|
7232
7252
|
</xsl:attribute>
|
7253
|
+
|
7254
|
+
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
7255
|
+
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
7256
|
+
<!-- put Mathin Alternate Text -->
|
7257
|
+
<xsl:attribute name="fox:alt-text">
|
7258
|
+
<xsl:value-of select="$asciimath_text_"/>
|
7259
|
+
</xsl:attribute>
|
7260
|
+
</xsl:if>
|
7261
|
+
<!-- </xsl:if> -->
|
7233
7262
|
</xsl:if>
|
7234
|
-
<!-- </xsl:if> -->
|
7235
7263
|
|
7236
7264
|
<xsl:copy-of select="xalan:nodeset($mathml)"/>
|
7237
7265
|
|
@@ -8987,6 +9015,8 @@
|
|
8987
9015
|
<xsl:template match="*[local-name() = 'origin']" mode="contents"/>
|
8988
9016
|
<xsl:template match="*[local-name() = 'erefstack ']" mode="contents"/>
|
8989
9017
|
|
9018
|
+
<xsl:template match="*[local-name() = 'requirement'] | *[local-name() = 'recommendation'] | *[local-name() = 'permission']" mode="contents" priority="3"/>
|
9019
|
+
|
8990
9020
|
<xsl:template match="*[local-name() = 'stem']" mode="bookmarks"/>
|
8991
9021
|
<xsl:template match="*[local-name() = 'fmt-stem']" mode="bookmarks">
|
8992
9022
|
<xsl:apply-templates mode="bookmarks"/>
|
@@ -9008,6 +9038,8 @@
|
|
9008
9038
|
<xsl:template match="*[local-name() = 'origin']" mode="bookmarks"/>
|
9009
9039
|
<xsl:template match="*[local-name() = 'erefstack ']" mode="bookmarks"/>
|
9010
9040
|
|
9041
|
+
<xsl:template match="*[local-name() = 'requirement'] | *[local-name() = 'recommendation'] | *[local-name() = 'permission']" mode="bookmarks" priority="3"/>
|
9042
|
+
|
9011
9043
|
<!-- Bookmarks -->
|
9012
9044
|
<xsl:template name="addBookmarks">
|
9013
9045
|
<xsl:param name="contents"/>
|
@@ -10886,21 +10918,32 @@
|
|
10886
10918
|
<!-- ========== -->
|
10887
10919
|
|
10888
10920
|
<xsl:variable name="reviews_">
|
10889
|
-
<xsl:for-each select="//*[local-name() = 'review'][@from]">
|
10921
|
+
<xsl:for-each select="//*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])][@from]">
|
10890
10922
|
<xsl:copy>
|
10891
10923
|
<xsl:copy-of select="@from"/>
|
10892
10924
|
<xsl:copy-of select="@id"/>
|
10893
10925
|
</xsl:copy>
|
10894
10926
|
</xsl:for-each>
|
10927
|
+
<xsl:for-each select="//*[local-name() = 'fmt-review-start'][@source]">
|
10928
|
+
<xsl:copy>
|
10929
|
+
<xsl:copy-of select="@source"/>
|
10930
|
+
<xsl:copy-of select="@id"/>
|
10931
|
+
</xsl:copy>
|
10932
|
+
</xsl:for-each>
|
10895
10933
|
</xsl:variable>
|
10896
10934
|
<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
|
10897
10935
|
|
10898
10936
|
<xsl:template name="addReviewHelper">
|
10899
|
-
|
10900
|
-
|
10901
|
-
|
10902
|
-
|
10903
|
-
<
|
10937
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
10938
|
+
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
10939
|
+
<xsl:variable name="curr_id" select="@id"/>
|
10940
|
+
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
10941
|
+
<xsl:for-each select="$reviews//*[local-name() = 'review'][@from = $curr_id]"> <!-- $reviews//*[local-name() = 'fmt-review-start'][@source = $curr_id] -->
|
10942
|
+
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
10943
|
+
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
10944
|
+
<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
10945
|
+
</xsl:if>
|
10946
|
+
</xsl:for-each>
|
10904
10947
|
</xsl:if>
|
10905
10948
|
<!-- <fo:block>
|
10906
10949
|
<curr_id><xsl:value-of select="$curr_id"/></curr_id>
|
@@ -11037,14 +11080,61 @@
|
|
11037
11080
|
|
11038
11081
|
</xsl:template>
|
11039
11082
|
|
11040
|
-
|
11083
|
+
<!-- document text (not figures, or tables) footnotes -->
|
11084
|
+
<xsl:variable name="reviews_container_">
|
11085
|
+
<xsl:for-each select="//*[local-name() = 'review-container']/*[local-name() = 'fmt-review-body']">
|
11086
|
+
<xsl:variable name="update_xml_step1">
|
11087
|
+
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
11088
|
+
</xsl:variable>
|
11089
|
+
<xsl:apply-templates select="xalan:nodeset($update_xml_step1)" mode="update_xml_enclose_keep-together_within-line"/>
|
11090
|
+
</xsl:for-each>
|
11091
|
+
</xsl:variable>
|
11092
|
+
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
11093
|
+
|
11094
|
+
<xsl:template match="*[local-name() = 'review-container']"/>
|
11095
|
+
|
11096
|
+
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
11097
|
+
<xsl:template match="*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
11098
|
+
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
11099
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
11100
|
+
<xsl:choose>
|
11101
|
+
<!-- if there isn't the attribute '@from', then -->
|
11102
|
+
<xsl:when test="$id_from = ''">
|
11103
|
+
<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11104
|
+
</xsl:when>
|
11105
|
+
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
11106
|
+
<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
|
11107
|
+
<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11108
|
+
</xsl:when>
|
11109
|
+
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
11110
|
+
<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11111
|
+
</xsl:when>
|
11112
|
+
</xsl:choose>
|
11113
|
+
</xsl:if>
|
11114
|
+
</xsl:template>
|
11115
|
+
|
11116
|
+
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
11117
|
+
<xsl:template match="*[local-name() = 'fmt-review-start']" name="fmt-review-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
11041
11118
|
<!-- comment 2019-11-29 -->
|
11042
11119
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
11043
11120
|
<xsl:apply-templates /> -->
|
11044
11121
|
|
11045
|
-
<xsl:variable name="id_from" select="normalize-space(current()/@
|
11122
|
+
<xsl:variable name="id_from" select="normalize-space(current()/@source)"/>
|
11046
11123
|
|
11047
|
-
<xsl:
|
11124
|
+
<xsl:variable name="source" select="normalize-space(@source)"/>
|
11125
|
+
|
11126
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
11127
|
+
<!-- <xsl:variable name="id_from" select="normalize-space(current()/@from)"/> -->
|
11128
|
+
|
11129
|
+
<!-- <xsl:if test="@source = @end"> -->
|
11130
|
+
<!-- following-sibling::node()[1][local-name() = 'bookmark'][@id = $source] and
|
11131
|
+
following-sibling::node()[2][local-name() = 'fmt-review-end'][@source = $source] -->
|
11132
|
+
<!-- <fo:block id="{$source}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$source}" fox:alt-text="Annot___{$source}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block> -->
|
11133
|
+
<fo:block id="{@id}" font-size="1pt" role="SKIP" keep-with-next="always" line-height="0.1"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11134
|
+
<!-- </xsl:if> -->
|
11135
|
+
</xsl:if>
|
11136
|
+
|
11137
|
+
<xsl:if test="1 = 2">
|
11048
11138
|
<xsl:choose>
|
11049
11139
|
<!-- if there isn't the attribute '@from', then -->
|
11050
11140
|
<xsl:when test="$id_from = ''">
|
@@ -11052,10 +11142,10 @@
|
|
11052
11142
|
</xsl:when>
|
11053
11143
|
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
11054
11144
|
<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
|
11055
|
-
<fo:block id="{
|
11145
|
+
<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11056
11146
|
</xsl:when>
|
11057
11147
|
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
11058
|
-
<fo:block id="{
|
11148
|
+
<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11059
11149
|
</xsl:when>
|
11060
11150
|
</xsl:choose>
|
11061
11151
|
</xsl:if>
|
@@ -11107,16 +11197,21 @@
|
|
11107
11197
|
<xsl:variable name="list_level">
|
11108
11198
|
<xsl:choose>
|
11109
11199
|
<xsl:when test="$list_level_ <= 3"><xsl:value-of select="$list_level_"/></xsl:when>
|
11110
|
-
<xsl:
|
11200
|
+
<xsl:when test="$ul_labels/label[@level = 3]"><xsl:value-of select="$list_level_ mod 3"/></xsl:when>
|
11201
|
+
<xsl:when test="$list_level_ mod 2 = 0">2</xsl:when>
|
11202
|
+
<xsl:otherwise><xsl:value-of select="$list_level_ mod 2"/></xsl:otherwise>
|
11111
11203
|
</xsl:choose>
|
11112
11204
|
</xsl:variable>
|
11113
11205
|
<xsl:choose>
|
11114
11206
|
<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
|
11115
11207
|
<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
|
11116
11208
|
</xsl:when>
|
11117
|
-
<xsl:when test="$list_level mod 3 = 0">
|
11209
|
+
<xsl:when test="$list_level mod 3 = 0 and $ul_labels/label[@level = 3]">
|
11118
11210
|
<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
|
11119
11211
|
</xsl:when>
|
11212
|
+
<xsl:when test="$list_level mod 3 = 0">
|
11213
|
+
<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
|
11214
|
+
</xsl:when>
|
11120
11215
|
<xsl:when test="$list_level mod 2 = 0">
|
11121
11216
|
<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
|
11122
11217
|
</xsl:when>
|
@@ -11659,10 +11754,22 @@
|
|
11659
11754
|
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/>
|
11660
11755
|
|
11661
11756
|
<xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
11662
|
-
|
11663
|
-
<
|
11664
|
-
|
11665
|
-
|
11757
|
+
<xsl:variable name="bookmark_id" select="@id"/>
|
11758
|
+
<xsl:choose>
|
11759
|
+
<!-- Example:
|
11760
|
+
<fmt-review-start id="_7ef81cf7-3f6c-4ed4-9c1f-1ba092052bbd" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" end="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/>
|
11761
|
+
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
11762
|
+
<fmt-review-end id="_f336a8d0-08a8-4b7f-a1aa-b04688ed40c1" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" start="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/> -->
|
11763
|
+
<xsl:when test="1 = 2 and preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]">
|
11764
|
+
<!-- skip here, see the template 'fmt-review-start' -->
|
11765
|
+
</xsl:when>
|
11766
|
+
<xsl:otherwise>
|
11767
|
+
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
11768
|
+
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
|
11769
|
+
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
11770
|
+
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
11771
|
+
</xsl:otherwise>
|
11772
|
+
</xsl:choose>
|
11666
11773
|
</xsl:template>
|
11667
11774
|
<!-- =================== -->
|
11668
11775
|
<!-- End of Index processing -->
|
@@ -13012,6 +13119,9 @@
|
|
13012
13119
|
<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_step1"/>
|
13013
13120
|
<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_pres"/>
|
13014
13121
|
|
13122
|
+
<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_step1"/>
|
13123
|
+
<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_pres"/>
|
13124
|
+
|
13015
13125
|
<!-- END: update new Presentation XML -->
|
13016
13126
|
|
13017
13127
|
<!-- =========================================================================== -->
|
@@ -4224,6 +4224,8 @@
|
|
4224
4224
|
|
4225
4225
|
<xsl:template name="setTableRowAttributes">
|
4226
4226
|
|
4227
|
+
<xsl:call-template name="setColors"/>
|
4228
|
+
|
4227
4229
|
</xsl:template> <!-- setTableRowAttributes -->
|
4228
4230
|
<!-- ===================== -->
|
4229
4231
|
<!-- END Table's row processing -->
|
@@ -4275,6 +4277,7 @@
|
|
4275
4277
|
</xsl:attribute>
|
4276
4278
|
</xsl:if>
|
4277
4279
|
<xsl:call-template name="display-align"/>
|
4280
|
+
<xsl:call-template name="setColors"/>
|
4278
4281
|
</xsl:template>
|
4279
4282
|
|
4280
4283
|
<xsl:template name="display-align">
|
@@ -4290,6 +4293,29 @@
|
|
4290
4293
|
</xsl:if>
|
4291
4294
|
</xsl:template>
|
4292
4295
|
|
4296
|
+
<xsl:template name="setColors">
|
4297
|
+
<xsl:variable name="styles__">
|
4298
|
+
<xsl:call-template name="split">
|
4299
|
+
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
4300
|
+
<xsl:with-param name="sep" select="';'"/>
|
4301
|
+
</xsl:call-template>
|
4302
|
+
</xsl:variable>
|
4303
|
+
<xsl:variable name="quot">"</xsl:variable>
|
4304
|
+
<xsl:variable name="styles_">
|
4305
|
+
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
4306
|
+
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
4307
|
+
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
4308
|
+
<xsl:if test="$key = 'color' or $key = 'background-color'">
|
4309
|
+
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
4310
|
+
</xsl:if>
|
4311
|
+
</xsl:for-each>
|
4312
|
+
</xsl:variable>
|
4313
|
+
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
4314
|
+
<xsl:for-each select="$styles/style">
|
4315
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
4316
|
+
</xsl:for-each>
|
4317
|
+
</xsl:template>
|
4318
|
+
|
4293
4319
|
<!-- cell in table body, footer -->
|
4294
4320
|
<xsl:template match="*[local-name()='td']" name="td">
|
4295
4321
|
<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
|
@@ -4301,12 +4327,12 @@
|
|
4301
4327
|
|
4302
4328
|
<xsl:call-template name="refine_table-cell-style"/>
|
4303
4329
|
|
4330
|
+
<xsl:call-template name="setTableCellAttributes"/>
|
4331
|
+
|
4304
4332
|
<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
|
4305
4333
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
4306
4334
|
</xsl:if>
|
4307
4335
|
|
4308
|
-
<xsl:call-template name="setTableCellAttributes"/>
|
4309
|
-
|
4310
4336
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
4311
4337
|
<xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width -->
|
4312
4338
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
@@ -6166,7 +6192,7 @@
|
|
6166
6192
|
<xsl:choose>
|
6167
6193
|
<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
|
6168
6194
|
<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
|
6169
|
-
<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
|
6195
|
+
<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
6170
6196
|
</xsl:when>
|
6171
6197
|
<xsl:otherwise>
|
6172
6198
|
<xsl:apply-templates/>
|
@@ -6174,7 +6200,7 @@
|
|
6174
6200
|
</xsl:choose>
|
6175
6201
|
</xsl:template>
|
6176
6202
|
<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
|
6177
|
-
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
|
6203
|
+
<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:value-of select="."/></fo:inline>
|
6178
6204
|
</xsl:template>
|
6179
6205
|
|
6180
6206
|
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
|
@@ -7214,24 +7240,26 @@
|
|
7214
7240
|
<xsl:apply-templates select="." mode="mathml"/>
|
7215
7241
|
</xsl:variable>
|
7216
7242
|
|
7217
|
-
<fo:instream-foreign-object fox:alt-text="Math">
|
7243
|
+
<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
|
7218
7244
|
|
7219
7245
|
<xsl:call-template name="refine_mathml_insteam_object_style"/>
|
7220
7246
|
|
7221
|
-
|
7222
|
-
|
7223
|
-
|
7224
|
-
<xsl:
|
7225
|
-
|
7226
|
-
|
7227
|
-
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
7228
|
-
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
7229
|
-
<!-- put Mathin Alternate Text -->
|
7230
|
-
<xsl:attribute name="fox:alt-text">
|
7231
|
-
<xsl:value-of select="$asciimath_text_"/>
|
7247
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
7248
|
+
<!-- put MathML in Actual Text -->
|
7249
|
+
<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
|
7250
|
+
<xsl:attribute name="fox:actual-text">
|
7251
|
+
<xsl:value-of select="$mathml_content"/>
|
7232
7252
|
</xsl:attribute>
|
7253
|
+
|
7254
|
+
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
7255
|
+
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
7256
|
+
<!-- put Mathin Alternate Text -->
|
7257
|
+
<xsl:attribute name="fox:alt-text">
|
7258
|
+
<xsl:value-of select="$asciimath_text_"/>
|
7259
|
+
</xsl:attribute>
|
7260
|
+
</xsl:if>
|
7261
|
+
<!-- </xsl:if> -->
|
7233
7262
|
</xsl:if>
|
7234
|
-
<!-- </xsl:if> -->
|
7235
7263
|
|
7236
7264
|
<xsl:copy-of select="xalan:nodeset($mathml)"/>
|
7237
7265
|
|
@@ -8987,6 +9015,8 @@
|
|
8987
9015
|
<xsl:template match="*[local-name() = 'origin']" mode="contents"/>
|
8988
9016
|
<xsl:template match="*[local-name() = 'erefstack ']" mode="contents"/>
|
8989
9017
|
|
9018
|
+
<xsl:template match="*[local-name() = 'requirement'] | *[local-name() = 'recommendation'] | *[local-name() = 'permission']" mode="contents" priority="3"/>
|
9019
|
+
|
8990
9020
|
<xsl:template match="*[local-name() = 'stem']" mode="bookmarks"/>
|
8991
9021
|
<xsl:template match="*[local-name() = 'fmt-stem']" mode="bookmarks">
|
8992
9022
|
<xsl:apply-templates mode="bookmarks"/>
|
@@ -9008,6 +9038,8 @@
|
|
9008
9038
|
<xsl:template match="*[local-name() = 'origin']" mode="bookmarks"/>
|
9009
9039
|
<xsl:template match="*[local-name() = 'erefstack ']" mode="bookmarks"/>
|
9010
9040
|
|
9041
|
+
<xsl:template match="*[local-name() = 'requirement'] | *[local-name() = 'recommendation'] | *[local-name() = 'permission']" mode="bookmarks" priority="3"/>
|
9042
|
+
|
9011
9043
|
<!-- Bookmarks -->
|
9012
9044
|
<xsl:template name="addBookmarks">
|
9013
9045
|
<xsl:param name="contents"/>
|
@@ -10886,21 +10918,32 @@
|
|
10886
10918
|
<!-- ========== -->
|
10887
10919
|
|
10888
10920
|
<xsl:variable name="reviews_">
|
10889
|
-
<xsl:for-each select="//*[local-name() = 'review'][@from]">
|
10921
|
+
<xsl:for-each select="//*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])][@from]">
|
10890
10922
|
<xsl:copy>
|
10891
10923
|
<xsl:copy-of select="@from"/>
|
10892
10924
|
<xsl:copy-of select="@id"/>
|
10893
10925
|
</xsl:copy>
|
10894
10926
|
</xsl:for-each>
|
10927
|
+
<xsl:for-each select="//*[local-name() = 'fmt-review-start'][@source]">
|
10928
|
+
<xsl:copy>
|
10929
|
+
<xsl:copy-of select="@source"/>
|
10930
|
+
<xsl:copy-of select="@id"/>
|
10931
|
+
</xsl:copy>
|
10932
|
+
</xsl:for-each>
|
10895
10933
|
</xsl:variable>
|
10896
10934
|
<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
|
10897
10935
|
|
10898
10936
|
<xsl:template name="addReviewHelper">
|
10899
|
-
|
10900
|
-
|
10901
|
-
|
10902
|
-
|
10903
|
-
<
|
10937
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
10938
|
+
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
10939
|
+
<xsl:variable name="curr_id" select="@id"/>
|
10940
|
+
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
10941
|
+
<xsl:for-each select="$reviews//*[local-name() = 'review'][@from = $curr_id]"> <!-- $reviews//*[local-name() = 'fmt-review-start'][@source = $curr_id] -->
|
10942
|
+
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
10943
|
+
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
10944
|
+
<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
10945
|
+
</xsl:if>
|
10946
|
+
</xsl:for-each>
|
10904
10947
|
</xsl:if>
|
10905
10948
|
<!-- <fo:block>
|
10906
10949
|
<curr_id><xsl:value-of select="$curr_id"/></curr_id>
|
@@ -11037,14 +11080,61 @@
|
|
11037
11080
|
|
11038
11081
|
</xsl:template>
|
11039
11082
|
|
11040
|
-
|
11083
|
+
<!-- document text (not figures, or tables) footnotes -->
|
11084
|
+
<xsl:variable name="reviews_container_">
|
11085
|
+
<xsl:for-each select="//*[local-name() = 'review-container']/*[local-name() = 'fmt-review-body']">
|
11086
|
+
<xsl:variable name="update_xml_step1">
|
11087
|
+
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
11088
|
+
</xsl:variable>
|
11089
|
+
<xsl:apply-templates select="xalan:nodeset($update_xml_step1)" mode="update_xml_enclose_keep-together_within-line"/>
|
11090
|
+
</xsl:for-each>
|
11091
|
+
</xsl:variable>
|
11092
|
+
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
11093
|
+
|
11094
|
+
<xsl:template match="*[local-name() = 'review-container']"/>
|
11095
|
+
|
11096
|
+
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
11097
|
+
<xsl:template match="*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
11098
|
+
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
11099
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
11100
|
+
<xsl:choose>
|
11101
|
+
<!-- if there isn't the attribute '@from', then -->
|
11102
|
+
<xsl:when test="$id_from = ''">
|
11103
|
+
<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11104
|
+
</xsl:when>
|
11105
|
+
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
11106
|
+
<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
|
11107
|
+
<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11108
|
+
</xsl:when>
|
11109
|
+
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
11110
|
+
<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11111
|
+
</xsl:when>
|
11112
|
+
</xsl:choose>
|
11113
|
+
</xsl:if>
|
11114
|
+
</xsl:template>
|
11115
|
+
|
11116
|
+
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
11117
|
+
<xsl:template match="*[local-name() = 'fmt-review-start']" name="fmt-review-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
11041
11118
|
<!-- comment 2019-11-29 -->
|
11042
11119
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
11043
11120
|
<xsl:apply-templates /> -->
|
11044
11121
|
|
11045
|
-
<xsl:variable name="id_from" select="normalize-space(current()/@
|
11122
|
+
<xsl:variable name="id_from" select="normalize-space(current()/@source)"/>
|
11046
11123
|
|
11047
|
-
<xsl:
|
11124
|
+
<xsl:variable name="source" select="normalize-space(@source)"/>
|
11125
|
+
|
11126
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
11127
|
+
<!-- <xsl:variable name="id_from" select="normalize-space(current()/@from)"/> -->
|
11128
|
+
|
11129
|
+
<!-- <xsl:if test="@source = @end"> -->
|
11130
|
+
<!-- following-sibling::node()[1][local-name() = 'bookmark'][@id = $source] and
|
11131
|
+
following-sibling::node()[2][local-name() = 'fmt-review-end'][@source = $source] -->
|
11132
|
+
<!-- <fo:block id="{$source}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$source}" fox:alt-text="Annot___{$source}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block> -->
|
11133
|
+
<fo:block id="{@id}" font-size="1pt" role="SKIP" keep-with-next="always" line-height="0.1"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11134
|
+
<!-- </xsl:if> -->
|
11135
|
+
</xsl:if>
|
11136
|
+
|
11137
|
+
<xsl:if test="1 = 2">
|
11048
11138
|
<xsl:choose>
|
11049
11139
|
<!-- if there isn't the attribute '@from', then -->
|
11050
11140
|
<xsl:when test="$id_from = ''">
|
@@ -11052,10 +11142,10 @@
|
|
11052
11142
|
</xsl:when>
|
11053
11143
|
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
11054
11144
|
<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
|
11055
|
-
<fo:block id="{
|
11145
|
+
<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11056
11146
|
</xsl:when>
|
11057
11147
|
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
11058
|
-
<fo:block id="{
|
11148
|
+
<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
11059
11149
|
</xsl:when>
|
11060
11150
|
</xsl:choose>
|
11061
11151
|
</xsl:if>
|
@@ -11107,16 +11197,21 @@
|
|
11107
11197
|
<xsl:variable name="list_level">
|
11108
11198
|
<xsl:choose>
|
11109
11199
|
<xsl:when test="$list_level_ <= 3"><xsl:value-of select="$list_level_"/></xsl:when>
|
11110
|
-
<xsl:
|
11200
|
+
<xsl:when test="$ul_labels/label[@level = 3]"><xsl:value-of select="$list_level_ mod 3"/></xsl:when>
|
11201
|
+
<xsl:when test="$list_level_ mod 2 = 0">2</xsl:when>
|
11202
|
+
<xsl:otherwise><xsl:value-of select="$list_level_ mod 2"/></xsl:otherwise>
|
11111
11203
|
</xsl:choose>
|
11112
11204
|
</xsl:variable>
|
11113
11205
|
<xsl:choose>
|
11114
11206
|
<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
|
11115
11207
|
<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
|
11116
11208
|
</xsl:when>
|
11117
|
-
<xsl:when test="$list_level mod 3 = 0">
|
11209
|
+
<xsl:when test="$list_level mod 3 = 0 and $ul_labels/label[@level = 3]">
|
11118
11210
|
<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
|
11119
11211
|
</xsl:when>
|
11212
|
+
<xsl:when test="$list_level mod 3 = 0">
|
11213
|
+
<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
|
11214
|
+
</xsl:when>
|
11120
11215
|
<xsl:when test="$list_level mod 2 = 0">
|
11121
11216
|
<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
|
11122
11217
|
</xsl:when>
|
@@ -11659,10 +11754,22 @@
|
|
11659
11754
|
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/>
|
11660
11755
|
|
11661
11756
|
<xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
11662
|
-
|
11663
|
-
<
|
11664
|
-
|
11665
|
-
|
11757
|
+
<xsl:variable name="bookmark_id" select="@id"/>
|
11758
|
+
<xsl:choose>
|
11759
|
+
<!-- Example:
|
11760
|
+
<fmt-review-start id="_7ef81cf7-3f6c-4ed4-9c1f-1ba092052bbd" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" end="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/>
|
11761
|
+
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
11762
|
+
<fmt-review-end id="_f336a8d0-08a8-4b7f-a1aa-b04688ed40c1" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" start="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/> -->
|
11763
|
+
<xsl:when test="1 = 2 and preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]">
|
11764
|
+
<!-- skip here, see the template 'fmt-review-start' -->
|
11765
|
+
</xsl:when>
|
11766
|
+
<xsl:otherwise>
|
11767
|
+
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
11768
|
+
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
|
11769
|
+
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
11770
|
+
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
11771
|
+
</xsl:otherwise>
|
11772
|
+
</xsl:choose>
|
11666
11773
|
</xsl:template>
|
11667
11774
|
<!-- =================== -->
|
11668
11775
|
<!-- End of Index processing -->
|
@@ -13012,6 +13119,9 @@
|
|
13012
13119
|
<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_step1"/>
|
13013
13120
|
<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_pres"/>
|
13014
13121
|
|
13122
|
+
<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_step1"/>
|
13123
|
+
<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_pres"/>
|
13124
|
+
|
13015
13125
|
<!-- END: update new Presentation XML -->
|
13016
13126
|
|
13017
13127
|
<!-- =========================================================================== -->
|
@@ -382,33 +382,7 @@ in a document (e.g. sourcecode annotations)</a:documentation>
|
|
382
382
|
<a:documentation>Block intended to capture reviewer comments about some text in the document</a:documentation>
|
383
383
|
<element name="review">
|
384
384
|
<ref name="RequiredId"/>
|
385
|
-
<
|
386
|
-
<a:documentation>The party who has offered the comment</a:documentation>
|
387
|
-
</attribute>
|
388
|
-
<optional>
|
389
|
-
<attribute name="type">
|
390
|
-
<a:documentation>The type of reviewer comment</a:documentation>
|
391
|
-
</attribute>
|
392
|
-
</optional>
|
393
|
-
<optional>
|
394
|
-
<attribute name="date">
|
395
|
-
<a:documentation>The date when the comment was made</a:documentation>
|
396
|
-
<data type="dateTime"/>
|
397
|
-
</attribute>
|
398
|
-
</optional>
|
399
|
-
<optional>
|
400
|
-
<attribute name="from">
|
401
|
-
<a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
|
402
|
-
If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
|
403
|
-
<data type="IDREF"/>
|
404
|
-
</attribute>
|
405
|
-
</optional>
|
406
|
-
<optional>
|
407
|
-
<attribute name="to">
|
408
|
-
<a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
|
409
|
-
<data type="IDREF"/>
|
410
|
-
</attribute>
|
411
|
-
</optional>
|
385
|
+
<ref name="ReviewAttributes"/>
|
412
386
|
<oneOrMore>
|
413
387
|
<ref name="paragraph">
|
414
388
|
<a:documentation>Reviewer comments content</a:documentation>
|
@@ -416,6 +390,35 @@ If not provided, the comment applies in the vicinity of the place it has been in
|
|
416
390
|
</oneOrMore>
|
417
391
|
</element>
|
418
392
|
</define>
|
393
|
+
<define name="ReviewAttributes">
|
394
|
+
<attribute name="reviewer">
|
395
|
+
<a:documentation>The party who has offered the comment</a:documentation>
|
396
|
+
</attribute>
|
397
|
+
<optional>
|
398
|
+
<attribute name="type">
|
399
|
+
<a:documentation>The type of reviewer comment</a:documentation>
|
400
|
+
</attribute>
|
401
|
+
</optional>
|
402
|
+
<optional>
|
403
|
+
<attribute name="date">
|
404
|
+
<a:documentation>The date when the comment was made</a:documentation>
|
405
|
+
<data type="dateTime"/>
|
406
|
+
</attribute>
|
407
|
+
</optional>
|
408
|
+
<optional>
|
409
|
+
<attribute name="from">
|
410
|
+
<a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
|
411
|
+
If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
|
412
|
+
<data type="IDREF"/>
|
413
|
+
</attribute>
|
414
|
+
</optional>
|
415
|
+
<optional>
|
416
|
+
<attribute name="to">
|
417
|
+
<a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
|
418
|
+
<data type="IDREF"/>
|
419
|
+
</attribute>
|
420
|
+
</optional>
|
421
|
+
</define>
|
419
422
|
<define name="NumberingAttributes">
|
420
423
|
<optional>
|
421
424
|
<attribute name="unnumbered">
|
@@ -857,6 +860,7 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
|
|
857
860
|
<define name="tr">
|
858
861
|
<a:documentation>Sequence of cells to be displayed as a row in a table</a:documentation>
|
859
862
|
<element name="tr">
|
863
|
+
<ref name="TrAttributes"/>
|
860
864
|
<oneOrMore>
|
861
865
|
<choice>
|
862
866
|
<ref name="td">
|
@@ -869,6 +873,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
|
|
869
873
|
</oneOrMore>
|
870
874
|
</element>
|
871
875
|
</define>
|
876
|
+
<define name="TrAttributes">
|
877
|
+
<empty/>
|
878
|
+
</define>
|
872
879
|
<define name="tr-no-id">
|
873
880
|
<a:documentation>Sequence of cells to be displayed as a row in a table: optional ID attributes recursively (for use in Relaton, metadata)</a:documentation>
|
874
881
|
<element name="tr">
|
@@ -17,7 +17,7 @@
|
|
17
17
|
these elements; we just want one namespace for any child grammars
|
18
18
|
of this.
|
19
19
|
-->
|
20
|
-
<!-- VERSION v2.0.
|
20
|
+
<!-- VERSION v2.0.2 -->
|
21
21
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
22
22
|
<include href="reqt.rng"/>
|
23
23
|
<include href="basicdoc.rng">
|
@@ -423,6 +423,21 @@ normative or informative references, some split references into sections organiz
|
|
423
423
|
</oneOrMore>
|
424
424
|
</choice>
|
425
425
|
</define>
|
426
|
+
<define name="TdAttributes" combine="interleave">
|
427
|
+
<attribute name="style">
|
428
|
+
<a:documentation>CSS style: only background-color supported</a:documentation>
|
429
|
+
</attribute>
|
430
|
+
</define>
|
431
|
+
<define name="ThAttributes" combine="interleave">
|
432
|
+
<attribute name="style">
|
433
|
+
<a:documentation>CSS style: only background-color supported</a:documentation>
|
434
|
+
</attribute>
|
435
|
+
</define>
|
436
|
+
<define name="TrAttributes">
|
437
|
+
<attribute name="style">
|
438
|
+
<a:documentation>CSS style: only background-color supported</a:documentation>
|
439
|
+
</attribute>
|
440
|
+
</define>
|
426
441
|
<define name="table-note">
|
427
442
|
<element name="note">
|
428
443
|
<ref name="OptionalId"/>
|
@@ -1272,6 +1287,11 @@ numbers</a:documentation>
|
|
1272
1287
|
<a:documentation>Colophon or postface material</a:documentation>
|
1273
1288
|
</ref>
|
1274
1289
|
</optional>
|
1290
|
+
<optional>
|
1291
|
+
<ref name="review-container">
|
1292
|
+
<a:documentation>Annotations to the document</a:documentation>
|
1293
|
+
</ref>
|
1294
|
+
</optional>
|
1275
1295
|
</element>
|
1276
1296
|
</define>
|
1277
1297
|
<define name="misccontainer">
|
@@ -1282,6 +1302,13 @@ numbers</a:documentation>
|
|
1282
1302
|
</oneOrMore>
|
1283
1303
|
</element>
|
1284
1304
|
</define>
|
1305
|
+
<define name="review-container">
|
1306
|
+
<element name="review-container">
|
1307
|
+
<oneOrMore>
|
1308
|
+
<ref name="review"/>
|
1309
|
+
</oneOrMore>
|
1310
|
+
</element>
|
1311
|
+
</define>
|
1285
1312
|
<define name="preface">
|
1286
1313
|
<element name="preface">
|
1287
1314
|
<oneOrMore>
|
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.1.
|
4
|
+
version: 1.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-03-
|
11
|
+
date: 2025-03-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|