metanorma-ribose 1.7.7 → 1.7.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ribose/isodoc.rng +12 -0
- data/lib/isodoc/ribose/ribose.standard.xsl +87 -13
- data/lib/metanorma/ribose/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: 13c502cc2b485ec326c7754ec74c5b027b7784b1e4b93bc5fd57c8fab7149bc5
|
4
|
+
data.tar.gz: c91633207ba8b86bea110f065170429a4ecb5b68a6772980b555938de961e028
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 05e28341855a1f67a318dd4695c55e35e1de9722c64c6d65a7a80b6fe54f2cca44228ba4463d30d6f6667e7e1baaa701da0c185ae08d04b8e356092155221f85
|
7
|
+
data.tar.gz: 928d5362fa061f59ce0c0f2eaaa51fc7c3bb26c0f4335f10649139260943a46c83be7a65b78d999d99935c3c98406f4deca7d184f74e52a92e91e5813552fcdd
|
@@ -1011,8 +1011,14 @@
|
|
1011
1011
|
<ref name="imagemap"/>
|
1012
1012
|
<ref name="svgmap"/>
|
1013
1013
|
<ref name="inputform"/>
|
1014
|
+
<ref name="toc"/>
|
1014
1015
|
</choice>
|
1015
1016
|
</define>
|
1017
|
+
<define name="toc">
|
1018
|
+
<element name="toc">
|
1019
|
+
<ref name="ul"/>
|
1020
|
+
</element>
|
1021
|
+
</define>
|
1016
1022
|
<define name="inputform">
|
1017
1023
|
<element name="form">
|
1018
1024
|
<attribute name="id">
|
@@ -1254,6 +1260,12 @@
|
|
1254
1260
|
<optional>
|
1255
1261
|
<attribute name="type"/>
|
1256
1262
|
</optional>
|
1263
|
+
<optional>
|
1264
|
+
<attribute name="identifier"/>
|
1265
|
+
</optional>
|
1266
|
+
<optional>
|
1267
|
+
<attribute name="prefix"/>
|
1268
|
+
</optional>
|
1257
1269
|
<text/>
|
1258
1270
|
</define>
|
1259
1271
|
<define name="ics">
|
@@ -1752,7 +1752,9 @@
|
|
1752
1752
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
1753
1753
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
1754
1754
|
|
1755
|
-
</xsl:attribute-set><xsl:
|
1755
|
+
</xsl:attribute-set><xsl:variable name="table-border_">
|
1756
|
+
|
1757
|
+
</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
|
1756
1758
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1757
1759
|
|
1758
1760
|
|
@@ -2099,6 +2101,8 @@
|
|
2099
2101
|
<fo:block> </fo:block>
|
2100
2102
|
</xsl:if> -->
|
2101
2103
|
|
2104
|
+
|
2105
|
+
<!-- Display table's name before table as standalone block -->
|
2102
2106
|
<!-- $namespace = 'iso' or -->
|
2103
2107
|
|
2104
2108
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -2176,6 +2180,12 @@
|
|
2176
2180
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
2177
2181
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
2178
2182
|
|
2183
|
+
|
2184
|
+
|
2185
|
+
|
2186
|
+
<!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
|
2187
|
+
|
2188
|
+
|
2179
2189
|
<xsl:variable name="table_width">
|
2180
2190
|
<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
|
2181
2191
|
100%
|
@@ -2194,6 +2204,7 @@
|
|
2194
2204
|
|
2195
2205
|
|
2196
2206
|
|
2207
|
+
|
2197
2208
|
|
2198
2209
|
|
2199
2210
|
|
@@ -2620,6 +2631,8 @@
|
|
2620
2631
|
</xsl:choose>
|
2621
2632
|
</xsl:for-each>
|
2622
2633
|
|
2634
|
+
|
2635
|
+
|
2623
2636
|
<xsl:choose>
|
2624
2637
|
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
2625
2638
|
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
@@ -2658,6 +2671,7 @@
|
|
2658
2671
|
|
2659
2672
|
|
2660
2673
|
|
2674
|
+
|
2661
2675
|
<!-- for BSI (not PAS) display Notes before footnotes -->
|
2662
2676
|
|
2663
2677
|
|
@@ -2743,9 +2757,11 @@
|
|
2743
2757
|
|
2744
2758
|
|
2745
2759
|
|
2746
|
-
|
2747
|
-
|
2748
|
-
|
2760
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
2761
|
+
<xsl:attribute name="color">black</xsl:attribute>
|
2762
|
+
|
2763
|
+
|
2764
|
+
|
2749
2765
|
</xsl:if>
|
2750
2766
|
<xsl:if test="$parent-name = 'tfoot'">
|
2751
2767
|
|
@@ -2772,6 +2788,8 @@
|
|
2772
2788
|
|
2773
2789
|
|
2774
2790
|
|
2791
|
+
|
2792
|
+
|
2775
2793
|
<!-- <xsl:if test="$namespace = 'bipm'">
|
2776
2794
|
<xsl:attribute name="height">8mm</xsl:attribute>
|
2777
2795
|
</xsl:if> -->
|
@@ -4320,7 +4338,24 @@
|
|
4320
4338
|
</fo:instream-foreign-object>
|
4321
4339
|
</xsl:when>
|
4322
4340
|
<xsl:otherwise>
|
4323
|
-
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"
|
4341
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
4342
|
+
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
4343
|
+
|
4344
|
+
<xsl:variable name="img_src">
|
4345
|
+
<xsl:choose>
|
4346
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
4347
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
4348
|
+
</xsl:choose>
|
4349
|
+
</xsl:variable>
|
4350
|
+
|
4351
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
|
4352
|
+
<xsl:if test="number($scale) < 100">
|
4353
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
4354
|
+
</xsl:if>
|
4355
|
+
|
4356
|
+
</xsl:if>
|
4357
|
+
|
4358
|
+
</fo:external-graphic>
|
4324
4359
|
</xsl:otherwise>
|
4325
4360
|
</xsl:choose>
|
4326
4361
|
|
@@ -4491,11 +4526,13 @@
|
|
4491
4526
|
<xsl:attribute name="width">100%</xsl:attribute>
|
4492
4527
|
<xsl:attribute name="content-height">100%</xsl:attribute>
|
4493
4528
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
4529
|
+
<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
|
4530
|
+
<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
|
4494
4531
|
<!-- effective height 297 - 27.4 - 13 = 256.6 -->
|
4495
4532
|
<!-- effective width 210 - 12.5 - 25 = 172.5 -->
|
4496
4533
|
<!-- effective height / width = 1.48, 1.4 - with title -->
|
4497
|
-
<xsl:if test="
|
4498
|
-
<xsl:variable name="width" select="((
|
4534
|
+
<xsl:if test="$svg_height > ($svg_width * 1.4)"> <!-- for images with big height -->
|
4535
|
+
<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
|
4499
4536
|
<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
|
4500
4537
|
</xsl:if>
|
4501
4538
|
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
@@ -4512,6 +4549,23 @@
|
|
4512
4549
|
<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
|
4513
4550
|
<xsl:value-of select="."/>
|
4514
4551
|
</xsl:attribute>
|
4552
|
+
</xsl:template><xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
|
4553
|
+
<xsl:copy>
|
4554
|
+
<xsl:apply-templates select="@*" mode="svg_update"/>
|
4555
|
+
<xsl:variable name="viewbox">
|
4556
|
+
<xsl:call-template name="split">
|
4557
|
+
<xsl:with-param name="pText" select="@viewBox"/>
|
4558
|
+
<xsl:with-param name="sep" select="' '"/>
|
4559
|
+
</xsl:call-template>
|
4560
|
+
</xsl:variable>
|
4561
|
+
<xsl:attribute name="width">
|
4562
|
+
<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
|
4563
|
+
</xsl:attribute>
|
4564
|
+
<xsl:attribute name="height">
|
4565
|
+
<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
|
4566
|
+
</xsl:attribute>
|
4567
|
+
<xsl:apply-templates mode="svg_update"/>
|
4568
|
+
</xsl:copy>
|
4515
4569
|
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
4516
4570
|
<xsl:variable name="svg_content" select="document(@src)"/>
|
4517
4571
|
<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
|
@@ -6207,20 +6261,40 @@
|
|
6207
6261
|
</xsl:call-template>
|
6208
6262
|
</xsl:if>
|
6209
6263
|
</xsl:template><xsl:template name="getLocalizedString">
|
6210
|
-
<xsl:param name="key"/>
|
6264
|
+
<xsl:param name="key"/>
|
6265
|
+
<xsl:param name="formatted">false</xsl:param>
|
6211
6266
|
|
6212
6267
|
<xsl:variable name="curr_lang">
|
6213
6268
|
<xsl:call-template name="getLang"/>
|
6214
6269
|
</xsl:variable>
|
6215
6270
|
|
6216
|
-
<xsl:variable name="data_value"
|
6271
|
+
<xsl:variable name="data_value">
|
6272
|
+
<xsl:choose>
|
6273
|
+
<xsl:when test="$formatted = 'true'">
|
6274
|
+
<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6275
|
+
</xsl:when>
|
6276
|
+
<xsl:otherwise>
|
6277
|
+
<xsl:value-of select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
|
6278
|
+
</xsl:otherwise>
|
6279
|
+
</xsl:choose>
|
6280
|
+
</xsl:variable>
|
6217
6281
|
|
6218
6282
|
<xsl:choose>
|
6219
|
-
<xsl:when test="$data_value != ''">
|
6220
|
-
<xsl:
|
6283
|
+
<xsl:when test="normalize-space($data_value) != ''">
|
6284
|
+
<xsl:choose>
|
6285
|
+
<xsl:when test="$formatted = 'true'"><xsl:copy-of select="$data_value"/></xsl:when>
|
6286
|
+
<xsl:otherwise><xsl:value-of select="$data_value"/></xsl:otherwise>
|
6287
|
+
</xsl:choose>
|
6221
6288
|
</xsl:when>
|
6222
6289
|
<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
|
6223
|
-
<xsl:
|
6290
|
+
<xsl:choose>
|
6291
|
+
<xsl:when test="$formatted = 'true'">
|
6292
|
+
<xsl:apply-templates select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6293
|
+
</xsl:when>
|
6294
|
+
<xsl:otherwise>
|
6295
|
+
<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6296
|
+
</xsl:otherwise>
|
6297
|
+
</xsl:choose>
|
6224
6298
|
</xsl:when>
|
6225
6299
|
<xsl:otherwise>
|
6226
6300
|
<xsl:variable name="key_">
|
@@ -6231,7 +6305,7 @@
|
|
6231
6305
|
<xsl:value-of select="$key_"/>
|
6232
6306
|
</xsl:otherwise>
|
6233
6307
|
</xsl:choose>
|
6234
|
-
|
6308
|
+
|
6235
6309
|
</xsl:template><xsl:template name="setTrackChangesStyles">
|
6236
6310
|
<xsl:param name="isAdded"/>
|
6237
6311
|
<xsl:param name="isDeleted"/>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-ribose
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.8
|
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-
|
11
|
+
date: 2021-08-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|