metanorma-ribose 1.7.0 → 1.7.1
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/boilerplate.xml +6 -6
- data/lib/isodoc/ribose/html/header.html +10 -10
- data/lib/isodoc/ribose/html/html_rsd_titlepage.html +6 -6
- data/lib/isodoc/ribose/html/word_rsd_intro.html +1 -1
- data/lib/isodoc/ribose/ribose.standard.xsl +283 -31
- 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: 925018e056fa43a11378e6b304090504f13d5042254583ac4c4953f418f8ac40
|
4
|
+
data.tar.gz: 80308a8aa53fe8110b8e8d5367b75f8bb367410a459d3b971d8765e296881366
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 39f6df5375f989766daf8e1f95bfb51138c38bdec2c9ecc2d6f89c33aa132741b158adfb520a4c832e97ce700c7f6f5e75b8945729a0dde73bd2088028a26e71
|
7
|
+
data.tar.gz: d4dc7b1a585cbb029e2fe7273c42cb175bd0c6230aa84d0525bb89bb2281fec63771a6c12e5dd696f87cc51242255b960812ec935a5d90b849ac4868db194ad1
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<boilerplate>
|
2
2
|
<copyright-statement>
|
3
3
|
<clause>
|
4
|
-
<p> ©
|
4
|
+
<p> © {{ publisher }} {{ docyear }}</p>
|
5
5
|
</clause>
|
6
6
|
</copyright-statement>
|
7
7
|
{% if unpublished %}
|
@@ -31,15 +31,15 @@
|
|
31
31
|
<feedback-statement>
|
32
32
|
<clause>
|
33
33
|
<p align="left" id="boilerplate-name">
|
34
|
-
Ribose Group Inc.
|
34
|
+
{% if publisher %}{{ publisher }}{% else %}Ribose Group Inc.{% endif %}
|
35
35
|
</p>
|
36
|
-
<p align="left" id="boilerplate-address">Suite 1, 8/F, New Henry House<br/>
|
36
|
+
<p align="left" id="boilerplate-address">{% if pub_address %}{{ pub_address }}{% else %}Suite 1, 8/F, New Henry House<br/>
|
37
37
|
10 Ice House Street<br/>
|
38
38
|
Central<br/>
|
39
|
-
Hong Kong<br/>
|
39
|
+
Hong Kong{% endif %}<br/>
|
40
40
|
<br />
|
41
|
-
<link target="mailto:copyright@ribose.com">copyright@ribose.com</link
|
42
|
-
<link target="https://www.ribose.com">www.ribose.com</link>
|
41
|
+
{% if pub_email %}<link target="mailto:{{ pub_email }}">{{ pub_email }}</link>{% else %}<link target="mailto:copyright@ribose.com">copyright@ribose.com</link>{% endif %}<br />
|
42
|
+
{% if pub_uri %}<link target="{{ pub_uri }}">{{ pub_uri }}</link>{% else %}<link target="https://www.ribose.com">www.ribose.com</link>{% endif %}
|
43
43
|
</p>
|
44
44
|
</clause>
|
45
45
|
</feedback-statement>
|
@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>RR {{ docnumber }}:{{ docyea
|
|
74
74
|
|
75
75
|
<p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
|
76
76
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
|
77
|
-
|
77
|
+
{{ publisher }} {{ docyear }} – All rights reserved</span><span lang=EN-GB
|
78
78
|
style='font-weight:normal'><o:p></o:p></span></p>
|
79
79
|
|
80
80
|
</div>
|
@@ -93,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
93
93
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
94
94
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
95
95
|
style='mso-tab-count:1'> </span>©
|
96
|
-
|
96
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
97
97
|
|
98
98
|
</div>
|
99
99
|
|
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
129
129
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
130
130
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
131
131
|
1'> </span>©
|
132
|
-
|
132
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
133
133
|
</div>
|
134
134
|
|
135
135
|
<div style='mso-element:footer' id=ef2l>
|
@@ -144,12 +144,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
144
144
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
145
145
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
146
146
|
1'> </span>©
|
147
|
-
|
147
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
148
148
|
</div>
|
149
149
|
|
150
150
|
<div style='mso-element:footer' id=f2>
|
151
151
|
<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
|
152
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
152
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
153
153
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
154
154
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
155
155
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
@@ -163,7 +163,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
|
|
163
163
|
|
164
164
|
<div style='mso-element:footer' id=f2l>
|
165
165
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
166
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
166
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
167
167
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
168
168
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
169
169
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
@@ -188,7 +188,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
188
188
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
189
189
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
190
190
|
style='mso-tab-count:1'> </span>©
|
191
|
-
|
191
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
192
192
|
</div>
|
193
193
|
|
194
194
|
<div style='mso-element:footer' id=ef3l>
|
@@ -204,12 +204,12 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
204
204
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
205
205
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
206
206
|
style='mso-tab-count:1'> </span>©
|
207
|
-
|
207
|
+
{{ Publisher }} {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
208
208
|
</div>
|
209
209
|
|
210
210
|
<div style='mso-element:footer' id=f3>
|
211
211
|
<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
|
212
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
212
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
213
213
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
214
214
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
215
215
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|
@@ -224,7 +224,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
|
|
224
224
|
|
225
225
|
<div style='mso-element:footer' id=f3l>
|
226
226
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
227
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
|
227
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }} {{ docyear }} – All
|
228
228
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
229
229
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
230
230
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|
@@ -76,16 +76,16 @@
|
|
76
76
|
<div id="boilerplate-copyright-destination"/>
|
77
77
|
</div>
|
78
78
|
|
79
|
-
<div class="message">
|
80
|
-
<div id="boilerplate-legal-destination"/>
|
81
|
-
</div>
|
82
|
-
|
83
79
|
<div class="contact-info">
|
84
80
|
<div id="boilerplate-feedback-destination"/>
|
85
|
-
</div>
|
86
81
|
</div>
|
87
82
|
|
88
|
-
<div class="
|
83
|
+
<div class="message">
|
84
|
+
<div id="boilerplate-legal-destination"/>
|
85
|
+
</div>
|
86
|
+
</div>
|
87
|
+
|
88
|
+
<div class="rule"></div>
|
89
89
|
</div>
|
90
90
|
</div>
|
91
91
|
|
@@ -214,6 +214,8 @@
|
|
214
214
|
|
215
215
|
<xsl:apply-templates select="/rsd:rsd-standard/rsd:boilerplate/rsd:legal-statement"/>
|
216
216
|
|
217
|
+
<xsl:apply-templates select="/rsd:rsd-standard/rsd:boilerplate/rsd:feedback-statement"/>
|
218
|
+
|
217
219
|
</fo:flow>
|
218
220
|
</fo:page-sequence>
|
219
221
|
|
@@ -347,9 +349,11 @@
|
|
347
349
|
</xsl:template>
|
348
350
|
|
349
351
|
<xsl:template match="rsd:feedback-statement">
|
350
|
-
<fo:block
|
351
|
-
<
|
352
|
-
|
352
|
+
<fo:block-container border="1pt solid black" padding="1mm" padding-left="2mm">
|
353
|
+
<fo:block>
|
354
|
+
<xsl:apply-templates/>
|
355
|
+
</fo:block>
|
356
|
+
</fo:block-container>
|
353
357
|
</xsl:template>
|
354
358
|
|
355
359
|
<xsl:template match="rsd:copyright-statement//rsd:title">
|
@@ -478,6 +482,7 @@
|
|
478
482
|
<xsl:attribute name="space-after">
|
479
483
|
<xsl:choose>
|
480
484
|
<xsl:when test="ancestor::rsd:li">0pt</xsl:when>
|
485
|
+
<xsl:when test="ancestor::rsd:feedback-statement and not(following-sibling::rsd:p)">0pt</xsl:when>
|
481
486
|
<xsl:otherwise>12pt</xsl:otherwise>
|
482
487
|
</xsl:choose>
|
483
488
|
</xsl:attribute>
|
@@ -1054,6 +1059,7 @@
|
|
1054
1059
|
</xsl:choose>
|
1055
1060
|
</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'
'"/><xsl:attribute-set name="root-style">
|
1056
1061
|
|
1062
|
+
|
1057
1063
|
</xsl:attribute-set><xsl:attribute-set name="link-style">
|
1058
1064
|
|
1059
1065
|
<xsl:attribute name="color">blue</xsl:attribute>
|
@@ -1403,13 +1409,25 @@
|
|
1403
1409
|
<xsl:attribute name="space-after">6pt</xsl:attribute>
|
1404
1410
|
|
1405
1411
|
|
1406
|
-
</xsl:attribute-set><xsl:
|
1412
|
+
</xsl:attribute-set><xsl:variable name="color-added-text">
|
1413
|
+
<xsl:text>rgb(0, 255, 0)</xsl:text>
|
1414
|
+
</xsl:variable><xsl:attribute-set name="add-style">
|
1407
1415
|
<xsl:attribute name="color">red</xsl:attribute>
|
1408
1416
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
1409
|
-
|
1410
|
-
<xsl:attribute name="color"
|
1417
|
+
<!-- <xsl:attribute name="color">black</xsl:attribute>
|
1418
|
+
<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
|
1419
|
+
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
1420
|
+
<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
|
1421
|
+
</xsl:attribute-set><xsl:variable name="color-deleted-text">
|
1422
|
+
<xsl:text>red</xsl:text>
|
1423
|
+
</xsl:variable><xsl:attribute-set name="del-style">
|
1424
|
+
<xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
|
1411
1425
|
<xsl:attribute name="text-decoration">line-through</xsl:attribute>
|
1412
|
-
</xsl:attribute-set><xsl:
|
1426
|
+
</xsl:attribute-set><xsl:attribute-set name="mathml-style">
|
1427
|
+
<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
|
1428
|
+
|
1429
|
+
|
1430
|
+
</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
|
1413
1431
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
|
1414
1432
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
|
1415
1433
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
|
@@ -1454,16 +1472,17 @@
|
|
1454
1472
|
<xsl:call-template name="add-zero-spaces-java"/>
|
1455
1473
|
</xsl:template><xsl:template match="*[local-name()='table']" name="table">
|
1456
1474
|
|
1475
|
+
<xsl:variable name="table-preamble">
|
1476
|
+
|
1477
|
+
|
1478
|
+
</xsl:variable>
|
1479
|
+
|
1457
1480
|
<xsl:variable name="table">
|
1458
1481
|
|
1459
1482
|
<xsl:variable name="simple-table">
|
1460
1483
|
<xsl:call-template name="getSimpleTable"/>
|
1461
1484
|
</xsl:variable>
|
1462
1485
|
|
1463
|
-
|
1464
|
-
|
1465
|
-
|
1466
|
-
|
1467
1486
|
<!-- <xsl:if test="$namespace = 'bipm'">
|
1468
1487
|
<fo:block> </fo:block>
|
1469
1488
|
</xsl:if> -->
|
@@ -1476,7 +1495,7 @@
|
|
1476
1495
|
|
1477
1496
|
|
1478
1497
|
|
1479
|
-
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)
|
1498
|
+
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
|
1480
1499
|
|
1481
1500
|
<!-- <xsl:variable name="cols-count">
|
1482
1501
|
<xsl:choose>
|
@@ -1495,8 +1514,6 @@
|
|
1495
1514
|
<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
|
1496
1515
|
<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
|
1497
1516
|
|
1498
|
-
|
1499
|
-
|
1500
1517
|
<xsl:variable name="colwidths">
|
1501
1518
|
<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
|
1502
1519
|
<xsl:call-template name="calculate-column-widths">
|
@@ -1524,6 +1541,7 @@
|
|
1524
1541
|
</xsl:choose>
|
1525
1542
|
</xsl:variable>
|
1526
1543
|
|
1544
|
+
|
1527
1545
|
<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
|
1528
1546
|
|
1529
1547
|
|
@@ -1555,6 +1573,7 @@
|
|
1555
1573
|
|
1556
1574
|
|
1557
1575
|
|
1576
|
+
|
1558
1577
|
|
1559
1578
|
|
1560
1579
|
|
@@ -1644,7 +1663,8 @@
|
|
1644
1663
|
</fo:block-container>
|
1645
1664
|
</xsl:variable>
|
1646
1665
|
|
1647
|
-
|
1666
|
+
<xsl:variable name="isAdded" select="@added"/>
|
1667
|
+
<xsl:variable name="isDeleted" select="@deleted"/>
|
1648
1668
|
|
1649
1669
|
<xsl:choose>
|
1650
1670
|
<xsl:when test="@width">
|
@@ -1658,7 +1678,14 @@
|
|
1658
1678
|
<fo:table-body>
|
1659
1679
|
<fo:table-row>
|
1660
1680
|
<fo:table-cell column-number="2">
|
1661
|
-
<
|
1681
|
+
<xsl:copy-of select="$table-preamble"/>
|
1682
|
+
<fo:block>
|
1683
|
+
<xsl:call-template name="setTrackChangesStyles">
|
1684
|
+
<xsl:with-param name="isAdded" select="$isAdded"/>
|
1685
|
+
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
1686
|
+
</xsl:call-template>
|
1687
|
+
<xsl:copy-of select="$table"/>
|
1688
|
+
</fo:block>
|
1662
1689
|
</fo:table-cell>
|
1663
1690
|
</fo:table-row>
|
1664
1691
|
</fo:table-body>
|
@@ -1669,7 +1696,22 @@
|
|
1669
1696
|
|
1670
1697
|
</xsl:when>
|
1671
1698
|
<xsl:otherwise>
|
1672
|
-
<xsl:
|
1699
|
+
<xsl:choose>
|
1700
|
+
<xsl:when test="$isAdded = 'true' or $isDeleted = 'true'">
|
1701
|
+
<xsl:copy-of select="$table-preamble"/>
|
1702
|
+
<fo:block>
|
1703
|
+
<xsl:call-template name="setTrackChangesStyles">
|
1704
|
+
<xsl:with-param name="isAdded" select="$isAdded"/>
|
1705
|
+
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
1706
|
+
</xsl:call-template>
|
1707
|
+
<xsl:copy-of select="$table"/>
|
1708
|
+
</fo:block>
|
1709
|
+
</xsl:when>
|
1710
|
+
<xsl:otherwise>
|
1711
|
+
<xsl:copy-of select="$table-preamble"/>
|
1712
|
+
<xsl:copy-of select="$table"/>
|
1713
|
+
</xsl:otherwise>
|
1714
|
+
</xsl:choose>
|
1673
1715
|
</xsl:otherwise>
|
1674
1716
|
</xsl:choose>
|
1675
1717
|
|
@@ -1730,7 +1772,7 @@
|
|
1730
1772
|
</xsl:for-each>
|
1731
1773
|
</xsl:when>
|
1732
1774
|
<xsl:otherwise>
|
1733
|
-
<xsl:for-each select="xalan:nodeset($table)
|
1775
|
+
<xsl:for-each select="xalan:nodeset($table)/*/tr">
|
1734
1776
|
<xsl:variable name="td_text">
|
1735
1777
|
<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
|
1736
1778
|
|
@@ -2070,7 +2112,8 @@
|
|
2070
2112
|
<xsl:attribute name="text-align">
|
2071
2113
|
<xsl:choose>
|
2072
2114
|
<xsl:when test="@align">
|
2073
|
-
<xsl:
|
2115
|
+
<xsl:call-template name="setAlignment"/>
|
2116
|
+
<!-- <xsl:value-of select="@align"/> -->
|
2074
2117
|
</xsl:when>
|
2075
2118
|
<xsl:otherwise>center</xsl:otherwise>
|
2076
2119
|
</xsl:choose>
|
@@ -2086,6 +2129,9 @@
|
|
2086
2129
|
|
2087
2130
|
|
2088
2131
|
|
2132
|
+
<xsl:if test="$lang = 'ar'">
|
2133
|
+
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2134
|
+
</xsl:if>
|
2089
2135
|
<xsl:if test="@colspan">
|
2090
2136
|
<xsl:attribute name="number-columns-spanned">
|
2091
2137
|
<xsl:value-of select="@colspan"/>
|
@@ -2117,11 +2163,15 @@
|
|
2117
2163
|
<xsl:attribute name="text-align">
|
2118
2164
|
<xsl:choose>
|
2119
2165
|
<xsl:when test="@align">
|
2120
|
-
<xsl:
|
2166
|
+
<xsl:call-template name="setAlignment"/>
|
2167
|
+
<!-- <xsl:value-of select="@align"/> -->
|
2121
2168
|
</xsl:when>
|
2122
2169
|
<xsl:otherwise>left</xsl:otherwise>
|
2123
2170
|
</xsl:choose>
|
2124
2171
|
</xsl:attribute>
|
2172
|
+
<xsl:if test="$lang = 'ar'">
|
2173
|
+
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2174
|
+
</xsl:if>
|
2125
2175
|
|
2126
2176
|
|
2127
2177
|
|
@@ -2133,6 +2183,9 @@
|
|
2133
2183
|
|
2134
2184
|
|
2135
2185
|
|
2186
|
+
<xsl:if test=".//*[local-name() = 'table']">
|
2187
|
+
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2188
|
+
</xsl:if>
|
2136
2189
|
<xsl:if test="@colspan">
|
2137
2190
|
<xsl:attribute name="number-columns-spanned">
|
2138
2191
|
<xsl:value-of select="@colspan"/>
|
@@ -2258,13 +2311,13 @@
|
|
2258
2311
|
</xsl:choose>
|
2259
2312
|
</xsl:variable>
|
2260
2313
|
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2261
|
-
<xsl:element name="{$ns}:table">
|
2314
|
+
<!-- <xsl:element name="{$ns}:table"> -->
|
2262
2315
|
<xsl:for-each select="*[local-name() = 'dl'][1]">
|
2263
2316
|
<tbody>
|
2264
2317
|
<xsl:apply-templates mode="dl"/>
|
2265
2318
|
</tbody>
|
2266
2319
|
</xsl:for-each>
|
2267
|
-
</xsl:element>
|
2320
|
+
<!-- </xsl:element> -->
|
2268
2321
|
</xsl:variable>
|
2269
2322
|
|
2270
2323
|
<xsl:call-template name="calculate-column-widths">
|
@@ -2355,6 +2408,8 @@
|
|
2355
2408
|
<xsl:apply-templates/>
|
2356
2409
|
</fo:inline>
|
2357
2410
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
2411
|
+
<xsl:variable name="isAdded" select="@added"/>
|
2412
|
+
<xsl:variable name="isDeleted" select="@deleted"/>
|
2358
2413
|
<fo:block-container>
|
2359
2414
|
|
2360
2415
|
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
@@ -2371,6 +2426,12 @@
|
|
2371
2426
|
</xsl:attribute>
|
2372
2427
|
|
2373
2428
|
</xsl:if>
|
2429
|
+
|
2430
|
+
<xsl:call-template name="setTrackChangesStyles">
|
2431
|
+
<xsl:with-param name="isAdded" select="$isAdded"/>
|
2432
|
+
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
2433
|
+
</xsl:call-template>
|
2434
|
+
|
2374
2435
|
<fo:block-container>
|
2375
2436
|
|
2376
2437
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
@@ -2478,11 +2539,11 @@
|
|
2478
2539
|
</xsl:choose>
|
2479
2540
|
</xsl:variable>
|
2480
2541
|
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2481
|
-
<xsl:element name="{$ns}:table">
|
2542
|
+
<!-- <xsl:element name="{$ns}:table"> -->
|
2482
2543
|
<tbody>
|
2483
2544
|
<xsl:apply-templates mode="dl"/>
|
2484
2545
|
</tbody>
|
2485
|
-
</xsl:element>
|
2546
|
+
<!-- </xsl:element> -->
|
2486
2547
|
</xsl:variable>
|
2487
2548
|
<!-- html-table<xsl:copy-of select="$html-table"/> -->
|
2488
2549
|
<xsl:variable name="colwidths">
|
@@ -2752,9 +2813,71 @@
|
|
2752
2813
|
<xsl:apply-templates/>
|
2753
2814
|
</fo:inline>
|
2754
2815
|
</xsl:template><xsl:template match="*[local-name()='add']">
|
2755
|
-
<
|
2756
|
-
<xsl:
|
2757
|
-
|
2816
|
+
<xsl:choose>
|
2817
|
+
<xsl:when test="@amendment">
|
2818
|
+
<fo:inline>
|
2819
|
+
<xsl:call-template name="insertTag">
|
2820
|
+
<xsl:with-param name="kind">A</xsl:with-param>
|
2821
|
+
<xsl:with-param name="value"><xsl:value-of select="@amendment"/></xsl:with-param>
|
2822
|
+
</xsl:call-template>
|
2823
|
+
<xsl:apply-templates/>
|
2824
|
+
<xsl:call-template name="insertTag">
|
2825
|
+
<xsl:with-param name="type">closing</xsl:with-param>
|
2826
|
+
<xsl:with-param name="kind">A</xsl:with-param>
|
2827
|
+
<xsl:with-param name="value"><xsl:value-of select="@amendment"/></xsl:with-param>
|
2828
|
+
</xsl:call-template>
|
2829
|
+
</fo:inline>
|
2830
|
+
</xsl:when>
|
2831
|
+
<xsl:when test="@corrigenda">
|
2832
|
+
<fo:inline>
|
2833
|
+
<xsl:call-template name="insertTag">
|
2834
|
+
<xsl:with-param name="kind">C</xsl:with-param>
|
2835
|
+
<xsl:with-param name="value"><xsl:value-of select="@corrigenda"/></xsl:with-param>
|
2836
|
+
</xsl:call-template>
|
2837
|
+
<xsl:apply-templates/>
|
2838
|
+
<xsl:call-template name="insertTag">
|
2839
|
+
<xsl:with-param name="type">closing</xsl:with-param>
|
2840
|
+
<xsl:with-param name="kind">C</xsl:with-param>
|
2841
|
+
<xsl:with-param name="value"><xsl:value-of select="@corrigenda"/></xsl:with-param>
|
2842
|
+
</xsl:call-template>
|
2843
|
+
</fo:inline>
|
2844
|
+
</xsl:when>
|
2845
|
+
<xsl:otherwise>
|
2846
|
+
<fo:inline xsl:use-attribute-sets="add-style">
|
2847
|
+
<xsl:apply-templates/>
|
2848
|
+
</fo:inline>
|
2849
|
+
</xsl:otherwise>
|
2850
|
+
</xsl:choose>
|
2851
|
+
|
2852
|
+
</xsl:template><xsl:template name="insertTag">
|
2853
|
+
<xsl:param name="type"/>
|
2854
|
+
<xsl:param name="kind"/>
|
2855
|
+
<xsl:param name="value"/>
|
2856
|
+
<xsl:variable name="add_width" select="string-length($value) * 20"/>
|
2857
|
+
<xsl:variable name="maxwidth" select="60 + $add_width"/>
|
2858
|
+
<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
|
2859
|
+
<!-- <xsl:attribute name="width">7mm</xsl:attribute>
|
2860
|
+
<xsl:attribute name="content-height">100%</xsl:attribute> -->
|
2861
|
+
<xsl:attribute name="height">5mm</xsl:attribute>
|
2862
|
+
<xsl:attribute name="content-width">100%</xsl:attribute>
|
2863
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
2864
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
2865
|
+
<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
|
2866
|
+
<g>
|
2867
|
+
<xsl:if test="$type = 'closing'">
|
2868
|
+
<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
|
2869
|
+
</xsl:if>
|
2870
|
+
<polyline points="0,0 {$maxwidth},0 {$maxwidth + 30},40 {$maxwidth},80 0,80 " stroke="black" stroke-width="5" fill="white"/>
|
2871
|
+
<line x1="0" y1="0" x2="0" y2="80" stroke="black" stroke-width="20"/>
|
2872
|
+
</g>
|
2873
|
+
<text font-family="Arial" x="15" y="57" font-size="40pt">
|
2874
|
+
<xsl:if test="$type = 'closing'">
|
2875
|
+
<xsl:attribute name="x">25</xsl:attribute>
|
2876
|
+
</xsl:if>
|
2877
|
+
<xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
|
2878
|
+
</text>
|
2879
|
+
</svg>
|
2880
|
+
</fo:instream-foreign-object>
|
2758
2881
|
</xsl:template><xsl:template match="*[local-name()='del']">
|
2759
2882
|
<fo:inline xsl:use-attribute-sets="del-style">
|
2760
2883
|
<xsl:apply-templates/>
|
@@ -3097,13 +3220,23 @@
|
|
3097
3220
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
|
3098
3221
|
<xsl:value-of select="substring($str, 2)"/>
|
3099
3222
|
</xsl:template><xsl:template match="mathml:math">
|
3100
|
-
<
|
3223
|
+
<xsl:variable name="isAdded" select="@added"/>
|
3224
|
+
<xsl:variable name="isDeleted" select="@deleted"/>
|
3225
|
+
|
3226
|
+
<fo:inline xsl:use-attribute-sets="mathml-style">
|
3227
|
+
|
3228
|
+
|
3229
|
+
<xsl:call-template name="setTrackChangesStyles">
|
3230
|
+
<xsl:with-param name="isAdded" select="$isAdded"/>
|
3231
|
+
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
3232
|
+
</xsl:call-template>
|
3101
3233
|
|
3102
3234
|
<xsl:variable name="mathml">
|
3103
3235
|
<xsl:apply-templates select="." mode="mathml"/>
|
3104
3236
|
</xsl:variable>
|
3105
3237
|
<fo:instream-foreign-object fox:alt-text="Math">
|
3106
3238
|
|
3239
|
+
|
3107
3240
|
<!-- <xsl:copy-of select="."/> -->
|
3108
3241
|
<xsl:copy-of select="xalan:nodeset($mathml)"/>
|
3109
3242
|
</fo:instream-foreign-object>
|
@@ -3355,8 +3488,15 @@
|
|
3355
3488
|
</fo:inline>
|
3356
3489
|
</xsl:if>
|
3357
3490
|
</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
|
3491
|
+
<xsl:variable name="isAdded" select="@added"/>
|
3492
|
+
<xsl:variable name="isDeleted" select="@deleted"/>
|
3358
3493
|
<fo:block-container id="{@id}">
|
3359
3494
|
|
3495
|
+
<xsl:call-template name="setTrackChangesStyles">
|
3496
|
+
<xsl:with-param name="isAdded" select="$isAdded"/>
|
3497
|
+
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
3498
|
+
</xsl:call-template>
|
3499
|
+
|
3360
3500
|
<fo:block>
|
3361
3501
|
<xsl:apply-templates/>
|
3362
3502
|
</fo:block>
|
@@ -3376,6 +3516,8 @@
|
|
3376
3516
|
<xsl:apply-templates/>
|
3377
3517
|
</fo:block>
|
3378
3518
|
</xsl:template><xsl:template match="*[local-name() = 'image']">
|
3519
|
+
<xsl:variable name="isAdded" select="../@added"/>
|
3520
|
+
<xsl:variable name="isDeleted" select="../@deleted"/>
|
3379
3521
|
<xsl:choose>
|
3380
3522
|
<xsl:when test="ancestor::*[local-name() = 'title']">
|
3381
3523
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
@@ -3391,7 +3533,26 @@
|
|
3391
3533
|
<xsl:variable name="src">
|
3392
3534
|
<xsl:call-template name="image_src"/>
|
3393
3535
|
</xsl:variable>
|
3394
|
-
|
3536
|
+
|
3537
|
+
<xsl:choose>
|
3538
|
+
<xsl:when test="$isDeleted = 'true'">
|
3539
|
+
<!-- enclose in svg -->
|
3540
|
+
<fo:instream-foreign-object fox:alt-text="Image {@alt}">
|
3541
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
3542
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
3543
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
3544
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
3545
|
+
|
3546
|
+
|
3547
|
+
<xsl:apply-templates select="." mode="cross_image"/>
|
3548
|
+
|
3549
|
+
</fo:instream-foreign-object>
|
3550
|
+
</xsl:when>
|
3551
|
+
<xsl:otherwise>
|
3552
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
|
3553
|
+
</xsl:otherwise>
|
3554
|
+
</xsl:choose>
|
3555
|
+
|
3395
3556
|
</fo:block>
|
3396
3557
|
</xsl:otherwise>
|
3397
3558
|
</xsl:choose>
|
@@ -3407,6 +3568,55 @@
|
|
3407
3568
|
<xsl:value-of select="@src"/>
|
3408
3569
|
</xsl:otherwise>
|
3409
3570
|
</xsl:choose>
|
3571
|
+
</xsl:template><xsl:template match="*[local-name() = 'image']" mode="cross_image">
|
3572
|
+
<xsl:choose>
|
3573
|
+
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
3574
|
+
<xsl:variable name="src">
|
3575
|
+
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
3576
|
+
</xsl:variable>
|
3577
|
+
<xsl:variable name="width" select="document($src)/@width"/>
|
3578
|
+
<xsl:variable name="height" select="document($src)/@height"/>
|
3579
|
+
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
|
3580
|
+
<image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{$src}" style="overflow:visible;"/>
|
3581
|
+
</svg>
|
3582
|
+
</xsl:when>
|
3583
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
3584
|
+
<xsl:variable name="src">
|
3585
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
3586
|
+
</xsl:variable>
|
3587
|
+
<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
|
3588
|
+
<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
|
3589
|
+
<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
|
3590
|
+
<xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
|
3591
|
+
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
|
3592
|
+
<image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{$src}" style="overflow:visible;"/>
|
3593
|
+
</svg>
|
3594
|
+
</xsl:when>
|
3595
|
+
<xsl:otherwise>
|
3596
|
+
<xsl:variable name="base64String" select="substring-after(@src, 'base64,')"/>
|
3597
|
+
<xsl:variable name="decoder" select="java:java.util.Base64.getDecoder()"/>
|
3598
|
+
<xsl:variable name="fileContent" select="java:decode($decoder, $base64String)"/>
|
3599
|
+
<xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/>
|
3600
|
+
<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/>
|
3601
|
+
<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
|
3602
|
+
<!-- width=<xsl:value-of select="$width"/> -->
|
3603
|
+
<xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
|
3604
|
+
<!-- height=<xsl:value-of select="$height"/> -->
|
3605
|
+
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
|
3606
|
+
<image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/>
|
3607
|
+
<xsl:call-template name="svg_cross">
|
3608
|
+
<xsl:with-param name="width" select="$width"/>
|
3609
|
+
<xsl:with-param name="height" select="$height"/>
|
3610
|
+
</xsl:call-template>
|
3611
|
+
</svg>
|
3612
|
+
</xsl:otherwise>
|
3613
|
+
</xsl:choose>
|
3614
|
+
|
3615
|
+
</xsl:template><xsl:template name="svg_cross">
|
3616
|
+
<xsl:param name="width"/>
|
3617
|
+
<xsl:param name="height"/>
|
3618
|
+
<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="0" x2="{$width}" y2="{$height}" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
|
3619
|
+
<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="{$height}" x2="{$width}" y2="0" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
|
3410
3620
|
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
3411
3621
|
<xsl:apply-templates mode="contents"/>
|
3412
3622
|
<xsl:text> </xsl:text>
|
@@ -3949,6 +4159,7 @@
|
|
3949
4159
|
<xsl:variable name="element">
|
3950
4160
|
block
|
3951
4161
|
|
4162
|
+
<xsl:if test="following-sibling::*[1][local-name() = 'table']">block</xsl:if>
|
3952
4163
|
</xsl:variable>
|
3953
4164
|
<xsl:choose>
|
3954
4165
|
<xsl:when test="ancestor::*[local-name() = 'appendix']">
|
@@ -3956,7 +4167,7 @@
|
|
3956
4167
|
<xsl:apply-templates/>
|
3957
4168
|
</fo:inline>
|
3958
4169
|
</xsl:when>
|
3959
|
-
<xsl:when test="normalize-space($element)
|
4170
|
+
<xsl:when test="contains(normalize-space($element), 'block')">
|
3960
4171
|
<fo:block xsl:use-attribute-sets="example-name-style">
|
3961
4172
|
<xsl:apply-templates/>
|
3962
4173
|
</fo:block>
|
@@ -4170,7 +4381,8 @@
|
|
4170
4381
|
</fo:inline>
|
4171
4382
|
</xsl:when>
|
4172
4383
|
<xsl:otherwise>
|
4173
|
-
<
|
4384
|
+
<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
|
4385
|
+
<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/></fo:inline>
|
4174
4386
|
</xsl:otherwise>
|
4175
4387
|
</xsl:choose>
|
4176
4388
|
|
@@ -4883,4 +5095,44 @@
|
|
4883
5095
|
<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
|
4884
5096
|
</xsl:choose>
|
4885
5097
|
|
5098
|
+
</xsl:template><xsl:template name="setTrackChangesStyles">
|
5099
|
+
<xsl:param name="isAdded"/>
|
5100
|
+
<xsl:param name="isDeleted"/>
|
5101
|
+
<xsl:choose>
|
5102
|
+
<xsl:when test="local-name() = 'math'">
|
5103
|
+
<xsl:if test="$isAdded = 'true'">
|
5104
|
+
<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
|
5105
|
+
</xsl:if>
|
5106
|
+
<xsl:if test="$isDeleted = 'true'">
|
5107
|
+
<xsl:attribute name="background-color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
|
5108
|
+
</xsl:if>
|
5109
|
+
</xsl:when>
|
5110
|
+
<xsl:otherwise>
|
5111
|
+
<xsl:if test="$isAdded = 'true'">
|
5112
|
+
<xsl:attribute name="border"><xsl:value-of select="$border-block-added"/></xsl:attribute>
|
5113
|
+
<xsl:attribute name="padding">2mm</xsl:attribute>
|
5114
|
+
</xsl:if>
|
5115
|
+
<xsl:if test="$isDeleted = 'true'">
|
5116
|
+
<xsl:attribute name="border"><xsl:value-of select="$border-block-deleted"/></xsl:attribute>
|
5117
|
+
<xsl:if test="local-name() = 'table'">
|
5118
|
+
<xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute>
|
5119
|
+
</xsl:if>
|
5120
|
+
<!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> -->
|
5121
|
+
<xsl:attribute name="padding">2mm</xsl:attribute>
|
5122
|
+
</xsl:if>
|
5123
|
+
</xsl:otherwise>
|
5124
|
+
</xsl:choose>
|
5125
|
+
</xsl:template><xsl:variable name="LRM" select="''"/><xsl:variable name="RLM" select="''"/><xsl:template name="setWritingMode">
|
5126
|
+
<xsl:if test="$lang = 'ar'">
|
5127
|
+
<xsl:attribute name="writing-mode">rl-tb</xsl:attribute>
|
5128
|
+
</xsl:if>
|
5129
|
+
</xsl:template><xsl:template name="setAlignment">
|
5130
|
+
<xsl:param name="align" select="normalize-space(@align)"/>
|
5131
|
+
<xsl:choose>
|
5132
|
+
<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
|
5133
|
+
<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
|
5134
|
+
<xsl:when test="$align != ''">
|
5135
|
+
<xsl:value-of select="$align"/>
|
5136
|
+
</xsl:when>
|
5137
|
+
</xsl:choose>
|
4886
5138
|
</xsl:template></xsl:stylesheet>
|
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.1
|
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-04-
|
11
|
+
date: 2021-04-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|