metanorma-itu 2.6.2 → 2.6.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/itu/html/_coverpage.css +7 -0
- data/lib/isodoc/itu/html/htmlstyle.css +14 -6
- data/lib/isodoc/itu/html/htmlstyle.scss +2 -0
- data/lib/isodoc/itu/itu.implementers-guide.xsl +144 -34
- data/lib/isodoc/itu/itu.in-force.xsl +144 -34
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +144 -34
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +144 -34
- data/lib/isodoc/itu/itu.recommendation.xsl +144 -34
- data/lib/isodoc/itu/itu.resolution.xsl +144 -34
- data/lib/isodoc/itu/itu.service-publication.xsl +144 -34
- data/lib/isodoc/itu/itu.technical-paper.xsl +144 -34
- data/lib/isodoc/itu/itu.technical-report.xsl +144 -34
- data/lib/metanorma/itu/basicdoc.rng +34 -27
- data/lib/metanorma/itu/isodoc.rng +28 -1
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
@@ -6338,6 +6338,8 @@
|
|
6338
6338
|
<xsl:attribute name="min-height">5mm</xsl:attribute>
|
6339
6339
|
</xsl:if>
|
6340
6340
|
|
6341
|
+
<xsl:call-template name="setColors"/>
|
6342
|
+
|
6341
6343
|
</xsl:template> <!-- setTableRowAttributes -->
|
6342
6344
|
<!-- ===================== -->
|
6343
6345
|
<!-- END Table's row processing -->
|
@@ -6389,6 +6391,7 @@
|
|
6389
6391
|
</xsl:attribute>
|
6390
6392
|
</xsl:if>
|
6391
6393
|
<xsl:call-template name="display-align"/>
|
6394
|
+
<xsl:call-template name="setColors"/>
|
6392
6395
|
</xsl:template>
|
6393
6396
|
|
6394
6397
|
<xsl:template name="display-align">
|
@@ -6404,6 +6407,29 @@
|
|
6404
6407
|
</xsl:if>
|
6405
6408
|
</xsl:template>
|
6406
6409
|
|
6410
|
+
<xsl:template name="setColors">
|
6411
|
+
<xsl:variable name="styles__">
|
6412
|
+
<xsl:call-template name="split">
|
6413
|
+
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
6414
|
+
<xsl:with-param name="sep" select="';'"/>
|
6415
|
+
</xsl:call-template>
|
6416
|
+
</xsl:variable>
|
6417
|
+
<xsl:variable name="quot">"</xsl:variable>
|
6418
|
+
<xsl:variable name="styles_">
|
6419
|
+
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
6420
|
+
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
6421
|
+
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
6422
|
+
<xsl:if test="$key = 'color' or $key = 'background-color'">
|
6423
|
+
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
6424
|
+
</xsl:if>
|
6425
|
+
</xsl:for-each>
|
6426
|
+
</xsl:variable>
|
6427
|
+
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
6428
|
+
<xsl:for-each select="$styles/style">
|
6429
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
6430
|
+
</xsl:for-each>
|
6431
|
+
</xsl:template>
|
6432
|
+
|
6407
6433
|
<!-- cell in table body, footer -->
|
6408
6434
|
<xsl:template match="*[local-name()='td']" name="td">
|
6409
6435
|
<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
|
@@ -6415,12 +6441,12 @@
|
|
6415
6441
|
|
6416
6442
|
<xsl:call-template name="refine_table-cell-style"/>
|
6417
6443
|
|
6444
|
+
<xsl:call-template name="setTableCellAttributes"/>
|
6445
|
+
|
6418
6446
|
<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
|
6419
6447
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
6420
6448
|
</xsl:if>
|
6421
6449
|
|
6422
|
-
<xsl:call-template name="setTableCellAttributes"/>
|
6423
|
-
|
6424
6450
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
6425
6451
|
<xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width -->
|
6426
6452
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
@@ -8250,7 +8276,7 @@
|
|
8250
8276
|
<xsl:choose>
|
8251
8277
|
<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
|
8252
8278
|
<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
|
8253
|
-
<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
|
8279
|
+
<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
8254
8280
|
</xsl:when>
|
8255
8281
|
<xsl:otherwise>
|
8256
8282
|
<xsl:apply-templates/>
|
@@ -8258,7 +8284,7 @@
|
|
8258
8284
|
</xsl:choose>
|
8259
8285
|
</xsl:template>
|
8260
8286
|
<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">
|
8261
|
-
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
|
8287
|
+
<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:value-of select="."/></fo:inline>
|
8262
8288
|
</xsl:template>
|
8263
8289
|
|
8264
8290
|
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
|
@@ -9298,24 +9324,26 @@
|
|
9298
9324
|
<xsl:apply-templates select="." mode="mathml"/>
|
9299
9325
|
</xsl:variable>
|
9300
9326
|
|
9301
|
-
<fo:instream-foreign-object fox:alt-text="Math">
|
9327
|
+
<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
|
9302
9328
|
|
9303
9329
|
<xsl:call-template name="refine_mathml_insteam_object_style"/>
|
9304
9330
|
|
9305
|
-
|
9306
|
-
|
9307
|
-
|
9308
|
-
<xsl:
|
9309
|
-
|
9310
|
-
|
9311
|
-
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
9312
|
-
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
9313
|
-
<!-- put Mathin Alternate Text -->
|
9314
|
-
<xsl:attribute name="fox:alt-text">
|
9315
|
-
<xsl:value-of select="$asciimath_text_"/>
|
9331
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
9332
|
+
<!-- put MathML in Actual Text -->
|
9333
|
+
<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
|
9334
|
+
<xsl:attribute name="fox:actual-text">
|
9335
|
+
<xsl:value-of select="$mathml_content"/>
|
9316
9336
|
</xsl:attribute>
|
9337
|
+
|
9338
|
+
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
9339
|
+
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
9340
|
+
<!-- put Mathin Alternate Text -->
|
9341
|
+
<xsl:attribute name="fox:alt-text">
|
9342
|
+
<xsl:value-of select="$asciimath_text_"/>
|
9343
|
+
</xsl:attribute>
|
9344
|
+
</xsl:if>
|
9345
|
+
<!-- </xsl:if> -->
|
9317
9346
|
</xsl:if>
|
9318
|
-
<!-- </xsl:if> -->
|
9319
9347
|
|
9320
9348
|
<xsl:copy-of select="xalan:nodeset($mathml)"/>
|
9321
9349
|
|
@@ -11075,6 +11103,8 @@
|
|
11075
11103
|
<xsl:template match="*[local-name() = 'origin']" mode="contents"/>
|
11076
11104
|
<xsl:template match="*[local-name() = 'erefstack ']" mode="contents"/>
|
11077
11105
|
|
11106
|
+
<xsl:template match="*[local-name() = 'requirement'] | *[local-name() = 'recommendation'] | *[local-name() = 'permission']" mode="contents" priority="3"/>
|
11107
|
+
|
11078
11108
|
<xsl:template match="*[local-name() = 'stem']" mode="bookmarks"/>
|
11079
11109
|
<xsl:template match="*[local-name() = 'fmt-stem']" mode="bookmarks">
|
11080
11110
|
<xsl:apply-templates mode="bookmarks"/>
|
@@ -11096,6 +11126,8 @@
|
|
11096
11126
|
<xsl:template match="*[local-name() = 'origin']" mode="bookmarks"/>
|
11097
11127
|
<xsl:template match="*[local-name() = 'erefstack ']" mode="bookmarks"/>
|
11098
11128
|
|
11129
|
+
<xsl:template match="*[local-name() = 'requirement'] | *[local-name() = 'recommendation'] | *[local-name() = 'permission']" mode="bookmarks" priority="3"/>
|
11130
|
+
|
11099
11131
|
<!-- Bookmarks -->
|
11100
11132
|
<xsl:template name="addBookmarks">
|
11101
11133
|
<xsl:param name="contents"/>
|
@@ -12972,21 +13004,32 @@
|
|
12972
13004
|
<!-- ========== -->
|
12973
13005
|
|
12974
13006
|
<xsl:variable name="reviews_">
|
12975
|
-
<xsl:for-each select="//*[local-name() = 'review'][@from]">
|
13007
|
+
<xsl:for-each select="//*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])][@from]">
|
12976
13008
|
<xsl:copy>
|
12977
13009
|
<xsl:copy-of select="@from"/>
|
12978
13010
|
<xsl:copy-of select="@id"/>
|
12979
13011
|
</xsl:copy>
|
12980
13012
|
</xsl:for-each>
|
13013
|
+
<xsl:for-each select="//*[local-name() = 'fmt-review-start'][@source]">
|
13014
|
+
<xsl:copy>
|
13015
|
+
<xsl:copy-of select="@source"/>
|
13016
|
+
<xsl:copy-of select="@id"/>
|
13017
|
+
</xsl:copy>
|
13018
|
+
</xsl:for-each>
|
12981
13019
|
</xsl:variable>
|
12982
13020
|
<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
|
12983
13021
|
|
12984
13022
|
<xsl:template name="addReviewHelper">
|
12985
|
-
|
12986
|
-
|
12987
|
-
|
12988
|
-
|
12989
|
-
<
|
13023
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
13024
|
+
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
13025
|
+
<xsl:variable name="curr_id" select="@id"/>
|
13026
|
+
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
13027
|
+
<xsl:for-each select="$reviews//*[local-name() = 'review'][@from = $curr_id]"> <!-- $reviews//*[local-name() = 'fmt-review-start'][@source = $curr_id] -->
|
13028
|
+
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
13029
|
+
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
13030
|
+
<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>
|
13031
|
+
</xsl:if>
|
13032
|
+
</xsl:for-each>
|
12990
13033
|
</xsl:if>
|
12991
13034
|
<!-- <fo:block>
|
12992
13035
|
<curr_id><xsl:value-of select="$curr_id"/></curr_id>
|
@@ -13134,14 +13177,61 @@
|
|
13134
13177
|
|
13135
13178
|
</xsl:template>
|
13136
13179
|
|
13137
|
-
|
13180
|
+
<!-- document text (not figures, or tables) footnotes -->
|
13181
|
+
<xsl:variable name="reviews_container_">
|
13182
|
+
<xsl:for-each select="//*[local-name() = 'review-container']/*[local-name() = 'fmt-review-body']">
|
13183
|
+
<xsl:variable name="update_xml_step1">
|
13184
|
+
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
13185
|
+
</xsl:variable>
|
13186
|
+
<xsl:apply-templates select="xalan:nodeset($update_xml_step1)" mode="update_xml_enclose_keep-together_within-line"/>
|
13187
|
+
</xsl:for-each>
|
13188
|
+
</xsl:variable>
|
13189
|
+
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
13190
|
+
|
13191
|
+
<xsl:template match="*[local-name() = 'review-container']"/>
|
13192
|
+
|
13193
|
+
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
13194
|
+
<xsl:template match="*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
13195
|
+
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
13196
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
13197
|
+
<xsl:choose>
|
13198
|
+
<!-- if there isn't the attribute '@from', then -->
|
13199
|
+
<xsl:when test="$id_from = ''">
|
13200
|
+
<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>
|
13201
|
+
</xsl:when>
|
13202
|
+
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
13203
|
+
<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
|
13204
|
+
<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>
|
13205
|
+
</xsl:when>
|
13206
|
+
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
13207
|
+
<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>
|
13208
|
+
</xsl:when>
|
13209
|
+
</xsl:choose>
|
13210
|
+
</xsl:if>
|
13211
|
+
</xsl:template>
|
13212
|
+
|
13213
|
+
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
13214
|
+
<xsl:template match="*[local-name() = 'fmt-review-start']" name="fmt-review-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
13138
13215
|
<!-- comment 2019-11-29 -->
|
13139
13216
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
13140
13217
|
<xsl:apply-templates /> -->
|
13141
13218
|
|
13142
|
-
<xsl:variable name="id_from" select="normalize-space(current()/@
|
13219
|
+
<xsl:variable name="id_from" select="normalize-space(current()/@source)"/>
|
13143
13220
|
|
13144
|
-
<xsl:
|
13221
|
+
<xsl:variable name="source" select="normalize-space(@source)"/>
|
13222
|
+
|
13223
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
13224
|
+
<!-- <xsl:variable name="id_from" select="normalize-space(current()/@from)"/> -->
|
13225
|
+
|
13226
|
+
<!-- <xsl:if test="@source = @end"> -->
|
13227
|
+
<!-- following-sibling::node()[1][local-name() = 'bookmark'][@id = $source] and
|
13228
|
+
following-sibling::node()[2][local-name() = 'fmt-review-end'][@source = $source] -->
|
13229
|
+
<!-- <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> -->
|
13230
|
+
<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>
|
13231
|
+
<!-- </xsl:if> -->
|
13232
|
+
</xsl:if>
|
13233
|
+
|
13234
|
+
<xsl:if test="1 = 2">
|
13145
13235
|
<xsl:choose>
|
13146
13236
|
<!-- if there isn't the attribute '@from', then -->
|
13147
13237
|
<xsl:when test="$id_from = ''">
|
@@ -13149,10 +13239,10 @@
|
|
13149
13239
|
</xsl:when>
|
13150
13240
|
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
13151
13241
|
<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
|
13152
|
-
<fo:block id="{
|
13242
|
+
<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>
|
13153
13243
|
</xsl:when>
|
13154
13244
|
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
13155
|
-
<fo:block id="{
|
13245
|
+
<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>
|
13156
13246
|
</xsl:when>
|
13157
13247
|
</xsl:choose>
|
13158
13248
|
</xsl:if>
|
@@ -13203,16 +13293,21 @@
|
|
13203
13293
|
<xsl:variable name="list_level">
|
13204
13294
|
<xsl:choose>
|
13205
13295
|
<xsl:when test="$list_level_ <= 3"><xsl:value-of select="$list_level_"/></xsl:when>
|
13206
|
-
<xsl:
|
13296
|
+
<xsl:when test="$ul_labels/label[@level = 3]"><xsl:value-of select="$list_level_ mod 3"/></xsl:when>
|
13297
|
+
<xsl:when test="$list_level_ mod 2 = 0">2</xsl:when>
|
13298
|
+
<xsl:otherwise><xsl:value-of select="$list_level_ mod 2"/></xsl:otherwise>
|
13207
13299
|
</xsl:choose>
|
13208
13300
|
</xsl:variable>
|
13209
13301
|
<xsl:choose>
|
13210
13302
|
<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
|
13211
13303
|
<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
|
13212
13304
|
</xsl:when>
|
13213
|
-
<xsl:when test="$list_level mod 3 = 0">
|
13305
|
+
<xsl:when test="$list_level mod 3 = 0 and $ul_labels/label[@level = 3]">
|
13214
13306
|
<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
|
13215
13307
|
</xsl:when>
|
13308
|
+
<xsl:when test="$list_level mod 3 = 0">
|
13309
|
+
<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
|
13310
|
+
</xsl:when>
|
13216
13311
|
<xsl:when test="$list_level mod 2 = 0">
|
13217
13312
|
<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
|
13218
13313
|
</xsl:when>
|
@@ -13755,10 +13850,22 @@
|
|
13755
13850
|
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/>
|
13756
13851
|
|
13757
13852
|
<xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
13758
|
-
|
13759
|
-
<
|
13760
|
-
|
13761
|
-
|
13853
|
+
<xsl:variable name="bookmark_id" select="@id"/>
|
13854
|
+
<xsl:choose>
|
13855
|
+
<!-- Example:
|
13856
|
+
<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"/>
|
13857
|
+
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
13858
|
+
<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"/> -->
|
13859
|
+
<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]">
|
13860
|
+
<!-- skip here, see the template 'fmt-review-start' -->
|
13861
|
+
</xsl:when>
|
13862
|
+
<xsl:otherwise>
|
13863
|
+
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
13864
|
+
<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>
|
13865
|
+
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
13866
|
+
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
13867
|
+
</xsl:otherwise>
|
13868
|
+
</xsl:choose>
|
13762
13869
|
</xsl:template>
|
13763
13870
|
<!-- =================== -->
|
13764
13871
|
<!-- End of Index processing -->
|
@@ -15144,6 +15251,9 @@
|
|
15144
15251
|
<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_step1"/>
|
15145
15252
|
<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_pres"/>
|
15146
15253
|
|
15254
|
+
<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_step1"/>
|
15255
|
+
<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_pres"/>
|
15256
|
+
|
15147
15257
|
<!-- END: update new Presentation XML -->
|
15148
15258
|
|
15149
15259
|
<!-- =========================================================================== -->
|
@@ -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-itu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.6.
|
4
|
+
version: 2.6.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-standoc
|