metanorma-m3aawg 1.7.4 → 1.7.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +1 -1
- data/lib/isodoc/m3aawg/m3aawg.policy.xsl +65 -11
- data/lib/isodoc/m3aawg/m3aawg.report.xsl +65 -11
- data/lib/metanorma/m3aawg/version.rb +1 -1
- data/metanorma-m3d.gemspec +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0d95848b94791a3a1ec260709272d02fb57cf356ab5b856be428c4ba937cfe00
|
4
|
+
data.tar.gz: 4c69d81d994cf5602854c9c37e5c51fd1a91a2b4e5e7d564a351e412ad535ac6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e99643ec9118b7e52e12939cb1107faf81cd9d17e33a6982f296e1a43a2f640e23dc6b6fec462725e3d7e01a7b932ce69e7d395fbcdb7311cc6eca54e37cf5fb
|
7
|
+
data.tar.gz: f25efedcac4967fc897ac457ae4987146c6be348e5610d3943379fd07e427101399c544b09d6286a64a650f977527991078f5b450262bc4138bf8642ef8ccabb
|
data/.rubocop.yml
CHANGED
@@ -1107,7 +1107,7 @@
|
|
1107
1107
|
<xsl:attribute name="text-align">justify</xsl:attribute>
|
1108
1108
|
|
1109
1109
|
|
1110
|
-
|
1110
|
+
|
1111
1111
|
</xsl:attribute-set><xsl:attribute-set name="example-style">
|
1112
1112
|
|
1113
1113
|
|
@@ -1174,6 +1174,7 @@
|
|
1174
1174
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
1175
1175
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
1176
1176
|
|
1177
|
+
|
1177
1178
|
</xsl:attribute-set><xsl:attribute-set name="table-name-style">
|
1178
1179
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1179
1180
|
|
@@ -1194,6 +1195,8 @@
|
|
1194
1195
|
|
1195
1196
|
|
1196
1197
|
|
1198
|
+
</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
|
1199
|
+
|
1197
1200
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1198
1201
|
|
1199
1202
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -1244,6 +1247,7 @@
|
|
1244
1247
|
|
1245
1248
|
|
1246
1249
|
|
1250
|
+
|
1247
1251
|
</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
|
1248
1252
|
|
1249
1253
|
|
@@ -1285,10 +1289,12 @@
|
|
1285
1289
|
|
1286
1290
|
|
1287
1291
|
|
1292
|
+
|
1288
1293
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1289
1294
|
|
1290
1295
|
|
1291
1296
|
|
1297
|
+
|
1292
1298
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1293
1299
|
|
1294
1300
|
|
@@ -1343,6 +1349,7 @@
|
|
1343
1349
|
|
1344
1350
|
|
1345
1351
|
|
1352
|
+
|
1346
1353
|
|
1347
1354
|
|
1348
1355
|
|
@@ -1415,6 +1422,8 @@
|
|
1415
1422
|
<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
|
1416
1423
|
|
1417
1424
|
|
1425
|
+
</xsl:attribute-set><xsl:attribute-set name="list-style">
|
1426
|
+
|
1418
1427
|
</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">
|
1419
1428
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
|
1420
1429
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
|
@@ -1472,11 +1481,11 @@
|
|
1472
1481
|
<xsl:variable name="table">
|
1473
1482
|
|
1474
1483
|
<xsl:variable name="simple-table">
|
1475
|
-
<xsl:call-template name="getSimpleTable"/>
|
1484
|
+
<xsl:call-template name="getSimpleTable"/>
|
1476
1485
|
</xsl:variable>
|
1477
1486
|
|
1478
1487
|
<!-- <xsl:if test="$namespace = 'bipm'">
|
1479
|
-
<fo:block> </fo:block>
|
1488
|
+
<fo:block> </fo:block>
|
1480
1489
|
</xsl:if> -->
|
1481
1490
|
|
1482
1491
|
<!-- $namespace = 'iso' or -->
|
@@ -1578,6 +1587,7 @@
|
|
1578
1587
|
|
1579
1588
|
|
1580
1589
|
|
1590
|
+
|
1581
1591
|
</xsl:variable>
|
1582
1592
|
|
1583
1593
|
|
@@ -1719,6 +1729,9 @@
|
|
1719
1729
|
<fo:block xsl:use-attribute-sets="table-name-style">
|
1720
1730
|
|
1721
1731
|
|
1732
|
+
|
1733
|
+
|
1734
|
+
|
1722
1735
|
<xsl:choose>
|
1723
1736
|
<xsl:when test="$continued = 'true'">
|
1724
1737
|
<!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
|
@@ -1866,6 +1879,7 @@
|
|
1866
1879
|
<!-- font-weight="bold" -->
|
1867
1880
|
<fo:table-header>
|
1868
1881
|
|
1882
|
+
|
1869
1883
|
<xsl:apply-templates/>
|
1870
1884
|
</fo:table-header>
|
1871
1885
|
</xsl:template><xsl:template name="table-header-title">
|
@@ -2111,6 +2125,10 @@
|
|
2111
2125
|
|
2112
2126
|
|
2113
2127
|
|
2128
|
+
|
2129
|
+
|
2130
|
+
|
2131
|
+
|
2114
2132
|
<!-- <xsl:if test="$namespace = 'bipm'">
|
2115
2133
|
<xsl:attribute name="height">8mm</xsl:attribute>
|
2116
2134
|
</xsl:if> -->
|
@@ -2196,6 +2214,9 @@
|
|
2196
2214
|
|
2197
2215
|
|
2198
2216
|
|
2217
|
+
|
2218
|
+
|
2219
|
+
|
2199
2220
|
<xsl:if test=".//*[local-name() = 'table']">
|
2200
2221
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2201
2222
|
</xsl:if>
|
@@ -2411,6 +2432,7 @@
|
|
2411
2432
|
|
2412
2433
|
|
2413
2434
|
|
2435
|
+
|
2414
2436
|
<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
|
2415
2437
|
|
2416
2438
|
|
@@ -2713,6 +2735,7 @@
|
|
2713
2735
|
|
2714
2736
|
<fo:table-row>
|
2715
2737
|
|
2738
|
+
|
2716
2739
|
<fo:table-cell>
|
2717
2740
|
|
2718
2741
|
<fo:block margin-top="6pt">
|
@@ -2728,6 +2751,7 @@
|
|
2728
2751
|
|
2729
2752
|
|
2730
2753
|
|
2754
|
+
|
2731
2755
|
<xsl:apply-templates/>
|
2732
2756
|
<!-- <xsl:if test="$namespace = 'gb'">
|
2733
2757
|
<xsl:if test="ancestor::*[local-name()='formula']">
|
@@ -3280,7 +3304,15 @@
|
|
3280
3304
|
<xsl:copy>
|
3281
3305
|
<xsl:apply-templates select="@*|node()" mode="mathml"/>
|
3282
3306
|
</xsl:copy>
|
3283
|
-
<
|
3307
|
+
<xsl:choose>
|
3308
|
+
<!-- if in msub, then don't add space -->
|
3309
|
+
<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
|
3310
|
+
<!-- if next char in digit, don't add space -->
|
3311
|
+
<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
|
3312
|
+
<xsl:otherwise>
|
3313
|
+
<mathml:mspace width="0.5ex"/>
|
3314
|
+
</xsl:otherwise>
|
3315
|
+
</xsl:choose>
|
3284
3316
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
3285
3317
|
<xsl:variable name="target">
|
3286
3318
|
<xsl:choose>
|
@@ -3304,6 +3336,7 @@
|
|
3304
3336
|
</xsl:variable>
|
3305
3337
|
<fo:inline xsl:use-attribute-sets="link-style">
|
3306
3338
|
|
3339
|
+
|
3307
3340
|
<xsl:choose>
|
3308
3341
|
<xsl:when test="$target_text = ''">
|
3309
3342
|
<xsl:apply-templates/>
|
@@ -3455,6 +3488,7 @@
|
|
3455
3488
|
</xsl:choose>
|
3456
3489
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']">
|
3457
3490
|
<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
|
3491
|
+
|
3458
3492
|
<fo:inline xsl:use-attribute-sets="termnote-name-style">
|
3459
3493
|
|
3460
3494
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
@@ -3534,6 +3568,7 @@
|
|
3534
3568
|
</xsl:call-template>
|
3535
3569
|
|
3536
3570
|
<fo:block>
|
3571
|
+
|
3537
3572
|
<xsl:apply-templates/>
|
3538
3573
|
</fo:block>
|
3539
3574
|
<xsl:call-template name="fn_display_figure"/>
|
@@ -3818,6 +3853,7 @@
|
|
3818
3853
|
<xsl:if test="normalize-space() != ''">
|
3819
3854
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
3820
3855
|
|
3856
|
+
|
3821
3857
|
<xsl:apply-templates/>
|
3822
3858
|
</fo:block>
|
3823
3859
|
</xsl:if>
|
@@ -3898,6 +3934,7 @@
|
|
3898
3934
|
|
3899
3935
|
<fo:block-container margin-left="0mm">
|
3900
3936
|
<xsl:copy-of select="@id"/>
|
3937
|
+
|
3901
3938
|
<xsl:if test="parent::*[local-name() = 'note']">
|
3902
3939
|
<xsl:attribute name="margin-left">
|
3903
3940
|
<xsl:choose>
|
@@ -3908,7 +3945,9 @@
|
|
3908
3945
|
|
3909
3946
|
</xsl:if>
|
3910
3947
|
<fo:block-container margin-left="0mm">
|
3911
|
-
|
3948
|
+
|
3949
|
+
|
3950
|
+
|
3912
3951
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
3913
3952
|
<xsl:variable name="_font-size">
|
3914
3953
|
|
@@ -3937,10 +3976,14 @@
|
|
3937
3976
|
</xsl:choose>
|
3938
3977
|
</xsl:attribute>
|
3939
3978
|
</xsl:if>
|
3940
|
-
|
3941
|
-
|
3979
|
+
|
3980
|
+
<xsl:apply-templates/>
|
3981
|
+
</fo:block>
|
3982
|
+
|
3983
|
+
|
3942
3984
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
3943
3985
|
|
3986
|
+
|
3944
3987
|
</fo:block-container>
|
3945
3988
|
</fo:block-container>
|
3946
3989
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
@@ -4508,6 +4551,7 @@
|
|
4508
4551
|
<xsl:call-template name="setId"/>
|
4509
4552
|
|
4510
4553
|
|
4554
|
+
|
4511
4555
|
<xsl:apply-templates/>
|
4512
4556
|
</fo:block>
|
4513
4557
|
</xsl:template><xsl:template match="*[local-name() = 'definitions']">
|
@@ -4754,17 +4798,17 @@
|
|
4754
4798
|
<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
|
4755
4799
|
<xsl:choose>
|
4756
4800
|
<xsl:when test="normalize-space($_doc_ident) != ''">
|
4757
|
-
<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
|
4801
|
+
<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
|
4758
4802
|
<xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
|
4759
4803
|
<xsl:value-of select="$type"/><xsl:text> </xsl:text>
|
4760
|
-
</xsl:if>
|
4804
|
+
</xsl:if> -->
|
4761
4805
|
<xsl:value-of select="$_doc_ident"/>
|
4762
4806
|
</xsl:when>
|
4763
4807
|
<xsl:otherwise>
|
4764
|
-
<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
|
4808
|
+
<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
|
4765
4809
|
<xsl:if test="$type != ''">
|
4766
4810
|
<xsl:value-of select="$type"/><xsl:text> </xsl:text>
|
4767
|
-
</xsl:if>
|
4811
|
+
</xsl:if> -->
|
4768
4812
|
<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
|
4769
4813
|
</xsl:otherwise>
|
4770
4814
|
</xsl:choose>
|
@@ -5270,4 +5314,14 @@
|
|
5270
5314
|
<xsl:value-of select="$align"/>
|
5271
5315
|
</xsl:when>
|
5272
5316
|
</xsl:choose>
|
5317
|
+
</xsl:template><xsl:template name="setTextAlignment">
|
5318
|
+
<xsl:param name="default">left</xsl:param>
|
5319
|
+
<xsl:attribute name="text-align">
|
5320
|
+
<xsl:choose>
|
5321
|
+
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
5322
|
+
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
5323
|
+
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
5324
|
+
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
5325
|
+
</xsl:choose>
|
5326
|
+
</xsl:attribute>
|
5273
5327
|
</xsl:template></xsl:stylesheet>
|
@@ -1107,7 +1107,7 @@
|
|
1107
1107
|
<xsl:attribute name="text-align">justify</xsl:attribute>
|
1108
1108
|
|
1109
1109
|
|
1110
|
-
|
1110
|
+
|
1111
1111
|
</xsl:attribute-set><xsl:attribute-set name="example-style">
|
1112
1112
|
|
1113
1113
|
|
@@ -1174,6 +1174,7 @@
|
|
1174
1174
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
1175
1175
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
1176
1176
|
|
1177
|
+
|
1177
1178
|
</xsl:attribute-set><xsl:attribute-set name="table-name-style">
|
1178
1179
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1179
1180
|
|
@@ -1194,6 +1195,8 @@
|
|
1194
1195
|
|
1195
1196
|
|
1196
1197
|
|
1198
|
+
</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
|
1199
|
+
|
1197
1200
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1198
1201
|
|
1199
1202
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -1244,6 +1247,7 @@
|
|
1244
1247
|
|
1245
1248
|
|
1246
1249
|
|
1250
|
+
|
1247
1251
|
</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
|
1248
1252
|
|
1249
1253
|
|
@@ -1285,10 +1289,12 @@
|
|
1285
1289
|
|
1286
1290
|
|
1287
1291
|
|
1292
|
+
|
1288
1293
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1289
1294
|
|
1290
1295
|
|
1291
1296
|
|
1297
|
+
|
1292
1298
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1293
1299
|
|
1294
1300
|
|
@@ -1343,6 +1349,7 @@
|
|
1343
1349
|
|
1344
1350
|
|
1345
1351
|
|
1352
|
+
|
1346
1353
|
|
1347
1354
|
|
1348
1355
|
|
@@ -1415,6 +1422,8 @@
|
|
1415
1422
|
<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
|
1416
1423
|
|
1417
1424
|
|
1425
|
+
</xsl:attribute-set><xsl:attribute-set name="list-style">
|
1426
|
+
|
1418
1427
|
</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">
|
1419
1428
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
|
1420
1429
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
|
@@ -1472,11 +1481,11 @@
|
|
1472
1481
|
<xsl:variable name="table">
|
1473
1482
|
|
1474
1483
|
<xsl:variable name="simple-table">
|
1475
|
-
<xsl:call-template name="getSimpleTable"/>
|
1484
|
+
<xsl:call-template name="getSimpleTable"/>
|
1476
1485
|
</xsl:variable>
|
1477
1486
|
|
1478
1487
|
<!-- <xsl:if test="$namespace = 'bipm'">
|
1479
|
-
<fo:block> </fo:block>
|
1488
|
+
<fo:block> </fo:block>
|
1480
1489
|
</xsl:if> -->
|
1481
1490
|
|
1482
1491
|
<!-- $namespace = 'iso' or -->
|
@@ -1578,6 +1587,7 @@
|
|
1578
1587
|
|
1579
1588
|
|
1580
1589
|
|
1590
|
+
|
1581
1591
|
</xsl:variable>
|
1582
1592
|
|
1583
1593
|
|
@@ -1719,6 +1729,9 @@
|
|
1719
1729
|
<fo:block xsl:use-attribute-sets="table-name-style">
|
1720
1730
|
|
1721
1731
|
|
1732
|
+
|
1733
|
+
|
1734
|
+
|
1722
1735
|
<xsl:choose>
|
1723
1736
|
<xsl:when test="$continued = 'true'">
|
1724
1737
|
<!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
|
@@ -1866,6 +1879,7 @@
|
|
1866
1879
|
<!-- font-weight="bold" -->
|
1867
1880
|
<fo:table-header>
|
1868
1881
|
|
1882
|
+
|
1869
1883
|
<xsl:apply-templates/>
|
1870
1884
|
</fo:table-header>
|
1871
1885
|
</xsl:template><xsl:template name="table-header-title">
|
@@ -2111,6 +2125,10 @@
|
|
2111
2125
|
|
2112
2126
|
|
2113
2127
|
|
2128
|
+
|
2129
|
+
|
2130
|
+
|
2131
|
+
|
2114
2132
|
<!-- <xsl:if test="$namespace = 'bipm'">
|
2115
2133
|
<xsl:attribute name="height">8mm</xsl:attribute>
|
2116
2134
|
</xsl:if> -->
|
@@ -2196,6 +2214,9 @@
|
|
2196
2214
|
|
2197
2215
|
|
2198
2216
|
|
2217
|
+
|
2218
|
+
|
2219
|
+
|
2199
2220
|
<xsl:if test=".//*[local-name() = 'table']">
|
2200
2221
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2201
2222
|
</xsl:if>
|
@@ -2411,6 +2432,7 @@
|
|
2411
2432
|
|
2412
2433
|
|
2413
2434
|
|
2435
|
+
|
2414
2436
|
<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
|
2415
2437
|
|
2416
2438
|
|
@@ -2713,6 +2735,7 @@
|
|
2713
2735
|
|
2714
2736
|
<fo:table-row>
|
2715
2737
|
|
2738
|
+
|
2716
2739
|
<fo:table-cell>
|
2717
2740
|
|
2718
2741
|
<fo:block margin-top="6pt">
|
@@ -2728,6 +2751,7 @@
|
|
2728
2751
|
|
2729
2752
|
|
2730
2753
|
|
2754
|
+
|
2731
2755
|
<xsl:apply-templates/>
|
2732
2756
|
<!-- <xsl:if test="$namespace = 'gb'">
|
2733
2757
|
<xsl:if test="ancestor::*[local-name()='formula']">
|
@@ -3280,7 +3304,15 @@
|
|
3280
3304
|
<xsl:copy>
|
3281
3305
|
<xsl:apply-templates select="@*|node()" mode="mathml"/>
|
3282
3306
|
</xsl:copy>
|
3283
|
-
<
|
3307
|
+
<xsl:choose>
|
3308
|
+
<!-- if in msub, then don't add space -->
|
3309
|
+
<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
|
3310
|
+
<!-- if next char in digit, don't add space -->
|
3311
|
+
<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
|
3312
|
+
<xsl:otherwise>
|
3313
|
+
<mathml:mspace width="0.5ex"/>
|
3314
|
+
</xsl:otherwise>
|
3315
|
+
</xsl:choose>
|
3284
3316
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
3285
3317
|
<xsl:variable name="target">
|
3286
3318
|
<xsl:choose>
|
@@ -3304,6 +3336,7 @@
|
|
3304
3336
|
</xsl:variable>
|
3305
3337
|
<fo:inline xsl:use-attribute-sets="link-style">
|
3306
3338
|
|
3339
|
+
|
3307
3340
|
<xsl:choose>
|
3308
3341
|
<xsl:when test="$target_text = ''">
|
3309
3342
|
<xsl:apply-templates/>
|
@@ -3455,6 +3488,7 @@
|
|
3455
3488
|
</xsl:choose>
|
3456
3489
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']">
|
3457
3490
|
<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
|
3491
|
+
|
3458
3492
|
<fo:inline xsl:use-attribute-sets="termnote-name-style">
|
3459
3493
|
|
3460
3494
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
@@ -3534,6 +3568,7 @@
|
|
3534
3568
|
</xsl:call-template>
|
3535
3569
|
|
3536
3570
|
<fo:block>
|
3571
|
+
|
3537
3572
|
<xsl:apply-templates/>
|
3538
3573
|
</fo:block>
|
3539
3574
|
<xsl:call-template name="fn_display_figure"/>
|
@@ -3818,6 +3853,7 @@
|
|
3818
3853
|
<xsl:if test="normalize-space() != ''">
|
3819
3854
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
3820
3855
|
|
3856
|
+
|
3821
3857
|
<xsl:apply-templates/>
|
3822
3858
|
</fo:block>
|
3823
3859
|
</xsl:if>
|
@@ -3898,6 +3934,7 @@
|
|
3898
3934
|
|
3899
3935
|
<fo:block-container margin-left="0mm">
|
3900
3936
|
<xsl:copy-of select="@id"/>
|
3937
|
+
|
3901
3938
|
<xsl:if test="parent::*[local-name() = 'note']">
|
3902
3939
|
<xsl:attribute name="margin-left">
|
3903
3940
|
<xsl:choose>
|
@@ -3908,7 +3945,9 @@
|
|
3908
3945
|
|
3909
3946
|
</xsl:if>
|
3910
3947
|
<fo:block-container margin-left="0mm">
|
3911
|
-
|
3948
|
+
|
3949
|
+
|
3950
|
+
|
3912
3951
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
3913
3952
|
<xsl:variable name="_font-size">
|
3914
3953
|
|
@@ -3937,10 +3976,14 @@
|
|
3937
3976
|
</xsl:choose>
|
3938
3977
|
</xsl:attribute>
|
3939
3978
|
</xsl:if>
|
3940
|
-
|
3941
|
-
|
3979
|
+
|
3980
|
+
<xsl:apply-templates/>
|
3981
|
+
</fo:block>
|
3982
|
+
|
3983
|
+
|
3942
3984
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
3943
3985
|
|
3986
|
+
|
3944
3987
|
</fo:block-container>
|
3945
3988
|
</fo:block-container>
|
3946
3989
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
@@ -4508,6 +4551,7 @@
|
|
4508
4551
|
<xsl:call-template name="setId"/>
|
4509
4552
|
|
4510
4553
|
|
4554
|
+
|
4511
4555
|
<xsl:apply-templates/>
|
4512
4556
|
</fo:block>
|
4513
4557
|
</xsl:template><xsl:template match="*[local-name() = 'definitions']">
|
@@ -4754,17 +4798,17 @@
|
|
4754
4798
|
<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
|
4755
4799
|
<xsl:choose>
|
4756
4800
|
<xsl:when test="normalize-space($_doc_ident) != ''">
|
4757
|
-
<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
|
4801
|
+
<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
|
4758
4802
|
<xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
|
4759
4803
|
<xsl:value-of select="$type"/><xsl:text> </xsl:text>
|
4760
|
-
</xsl:if>
|
4804
|
+
</xsl:if> -->
|
4761
4805
|
<xsl:value-of select="$_doc_ident"/>
|
4762
4806
|
</xsl:when>
|
4763
4807
|
<xsl:otherwise>
|
4764
|
-
<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
|
4808
|
+
<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
|
4765
4809
|
<xsl:if test="$type != ''">
|
4766
4810
|
<xsl:value-of select="$type"/><xsl:text> </xsl:text>
|
4767
|
-
</xsl:if>
|
4811
|
+
</xsl:if> -->
|
4768
4812
|
<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
|
4769
4813
|
</xsl:otherwise>
|
4770
4814
|
</xsl:choose>
|
@@ -5270,4 +5314,14 @@
|
|
5270
5314
|
<xsl:value-of select="$align"/>
|
5271
5315
|
</xsl:when>
|
5272
5316
|
</xsl:choose>
|
5317
|
+
</xsl:template><xsl:template name="setTextAlignment">
|
5318
|
+
<xsl:param name="default">left</xsl:param>
|
5319
|
+
<xsl:attribute name="text-align">
|
5320
|
+
<xsl:choose>
|
5321
|
+
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
5322
|
+
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
5323
|
+
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
5324
|
+
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
5325
|
+
</xsl:choose>
|
5326
|
+
</xsl:attribute>
|
5273
5327
|
</xsl:template></xsl:stylesheet>
|
data/metanorma-m3d.gemspec
CHANGED
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
|
|
26
26
|
spec.bindir = "exe"
|
27
27
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
28
28
|
spec.require_paths = ["lib"]
|
29
|
-
spec.required_ruby_version = Gem::Requirement.new(">= 2.
|
29
|
+
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
30
30
|
|
31
31
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
32
32
|
spec.add_dependency "thread_safe"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-m3aawg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.5
|
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-06-
|
11
|
+
date: 2021-06-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: htmlentities
|
@@ -270,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
270
270
|
requirements:
|
271
271
|
- - ">="
|
272
272
|
- !ruby/object:Gem::Version
|
273
|
-
version: 2.
|
273
|
+
version: 2.5.0
|
274
274
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
275
275
|
requirements:
|
276
276
|
- - ">="
|