metanorma-ribose 1.7.9 → 1.7.10
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/asciidoctor/ribose/isodoc.rng +23 -9
- data/lib/isodoc/ribose/ribose.standard.xsl +208 -76
- 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: 0ef596b5a39002271360480b7fe72428622f287897ee30a74cafe2ec21bd9044
|
|
4
|
+
data.tar.gz: b3ad1bdeeacec3faf30a3f6a6f96f2dc65bd5866fcf84319da29db0edb20d14e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1905e2a9d7fe40aa447af402505200d72de9b4639e9daf9ff7b730faca33d2d98216d78727660234de3ca960742c82668ffc581fb9c52e5d442dd2f57ea9f78b
|
|
7
|
+
data.tar.gz: c3daed1a3d6dd5387f01d926f677f590ae32917aebb4d67f07e3a857cba626270594ec7b6cfec26eba5f9bb071b171c2d12e85f87ef41f0f1f6faf1ebb2cd04e
|
|
@@ -32,6 +32,18 @@
|
|
|
32
32
|
<ref name="DocumentType"/>
|
|
33
33
|
</element>
|
|
34
34
|
</define>
|
|
35
|
+
<define name="section-title">
|
|
36
|
+
<element name="title">
|
|
37
|
+
<zeroOrMore>
|
|
38
|
+
<ref name="TextElement"/>
|
|
39
|
+
</zeroOrMore>
|
|
40
|
+
</element>
|
|
41
|
+
<zeroOrMore>
|
|
42
|
+
<element name="variant-title">
|
|
43
|
+
<ref name="TypedTitleString"/>
|
|
44
|
+
</element>
|
|
45
|
+
</zeroOrMore>
|
|
46
|
+
</define>
|
|
35
47
|
<define name="hyperlink">
|
|
36
48
|
<element name="link">
|
|
37
49
|
<attribute name="target">
|
|
@@ -158,15 +170,17 @@
|
|
|
158
170
|
<data type="boolean"/>
|
|
159
171
|
</attribute>
|
|
160
172
|
</optional>
|
|
161
|
-
<
|
|
162
|
-
<
|
|
163
|
-
<
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
173
|
+
<optional>
|
|
174
|
+
<attribute name="type">
|
|
175
|
+
<choice>
|
|
176
|
+
<value>roman</value>
|
|
177
|
+
<value>alphabet</value>
|
|
178
|
+
<value>arabic</value>
|
|
179
|
+
<value>roman_upper</value>
|
|
180
|
+
<value>alphabet_upper</value>
|
|
181
|
+
</choice>
|
|
182
|
+
</attribute>
|
|
183
|
+
</optional>
|
|
170
184
|
<oneOrMore>
|
|
171
185
|
<ref name="li"/>
|
|
172
186
|
</oneOrMore>
|
|
@@ -397,7 +397,7 @@
|
|
|
397
397
|
<xsl:if test="string-length($title) > 80">
|
|
398
398
|
<xsl:attribute name="margin-right">-30mm</xsl:attribute>
|
|
399
399
|
</xsl:if>
|
|
400
|
-
<fo:block font-size="27pt" font-weight="bold">
|
|
400
|
+
<fo:block font-size="27pt" font-weight="bold" role="H1">
|
|
401
401
|
<xsl:apply-templates select="/rsd:rsd-standard/rsd:bibdata/rsd:title[@language = $lang]" mode="cover_page"/>
|
|
402
402
|
</fo:block>
|
|
403
403
|
<fo:block space-before="9pt" font-size="16.8pt" font-weight="600">
|
|
@@ -413,49 +413,50 @@
|
|
|
413
413
|
<xsl:call-template name="insertHeaderFooter"/>
|
|
414
414
|
<fo:flow flow-name="xsl-region-body">
|
|
415
415
|
<xsl:if test="xalan:nodeset($contents)//item[@display = 'true']">
|
|
416
|
-
|
|
417
|
-
<fo:block
|
|
418
|
-
<
|
|
419
|
-
<xsl:
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
<fo:block-container margin-left="
|
|
426
|
-
<
|
|
427
|
-
<
|
|
428
|
-
<
|
|
429
|
-
<xsl:if test="
|
|
430
|
-
<xsl:
|
|
416
|
+
<fo:block role="TOC">
|
|
417
|
+
<!-- <fo:block-container absolute-position="fixed" left="13mm" top="15mm"> -->
|
|
418
|
+
<fo:block font-size="27pt" font-weight="bold" color="black" margin-left="-15mm" margin-bottom="13mm" role="H1">
|
|
419
|
+
<xsl:call-template name="getLocalizedString">
|
|
420
|
+
<xsl:with-param name="key">table_of_contents</xsl:with-param>
|
|
421
|
+
</xsl:call-template>
|
|
422
|
+
</fo:block>
|
|
423
|
+
<!-- </fo:block-container> -->
|
|
424
|
+
|
|
425
|
+
<fo:block-container margin-left="32mm" margin-right="-17mm">
|
|
426
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
427
|
+
<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
|
|
428
|
+
<fo:block font-size="13pt" role="TOCI">
|
|
429
|
+
<xsl:if test="@level = 1">
|
|
430
|
+
<xsl:if test="preceding-sibling::item[@display = 'true' and @level = 1]">
|
|
431
|
+
<xsl:attribute name="space-before">16pt</xsl:attribute>
|
|
432
|
+
</xsl:if>
|
|
433
|
+
<xsl:attribute name="space-after">4pt</xsl:attribute>
|
|
434
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
435
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
436
|
+
<xsl:attribute name="color">black</xsl:attribute>
|
|
431
437
|
</xsl:if>
|
|
432
|
-
<xsl:
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
<fo:leader leader-pattern="rule" rule-thickness="0.2mm"/>
|
|
450
|
-
<fo:inline padding-left="2mm"><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
451
|
-
</fo:inline>
|
|
452
|
-
</fo:basic-link>
|
|
438
|
+
<xsl:if test="@level = 2">
|
|
439
|
+
<xsl:attribute name="margin-left">16.5mm</xsl:attribute>
|
|
440
|
+
<xsl:attribute name="space-before">4pt</xsl:attribute>
|
|
441
|
+
<xsl:attribute name="space-after">5pt</xsl:attribute>
|
|
442
|
+
</xsl:if>
|
|
443
|
+
<fo:block text-align-last="justify">
|
|
444
|
+
<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
|
|
445
|
+
<xsl:value-of select="@section"/>
|
|
446
|
+
<xsl:text> </xsl:text>
|
|
447
|
+
<xsl:apply-templates select="title"/>
|
|
448
|
+
<xsl:text> </xsl:text>
|
|
449
|
+
<fo:inline>
|
|
450
|
+
<fo:leader leader-pattern="rule" rule-thickness="0.2mm"/>
|
|
451
|
+
<fo:inline padding-left="2mm"><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
452
|
+
</fo:inline>
|
|
453
|
+
</fo:basic-link>
|
|
454
|
+
</fo:block>
|
|
453
455
|
</fo:block>
|
|
454
|
-
</
|
|
455
|
-
</
|
|
456
|
+
</xsl:for-each>
|
|
457
|
+
</fo:block-container>
|
|
456
458
|
</fo:block-container>
|
|
457
|
-
</fo:block
|
|
458
|
-
|
|
459
|
+
</fo:block>
|
|
459
460
|
<fo:block break-after="page"/>
|
|
460
461
|
</xsl:if>
|
|
461
462
|
<fo:block margin-bottom="12pt"> </fo:block>
|
|
@@ -591,7 +592,10 @@
|
|
|
591
592
|
</xsl:template>
|
|
592
593
|
|
|
593
594
|
<xsl:template match="rsd:license-statement//rsd:title">
|
|
594
|
-
<
|
|
595
|
+
<xsl:variable name="level">
|
|
596
|
+
<xsl:call-template name="getLevel"/>
|
|
597
|
+
</xsl:variable>
|
|
598
|
+
<fo:block text-align="center" font-weight="normal" margin-top="4pt" role="H{$level}">
|
|
595
599
|
<xsl:apply-templates/>
|
|
596
600
|
</fo:block>
|
|
597
601
|
</xsl:template>
|
|
@@ -614,7 +618,10 @@
|
|
|
614
618
|
</xsl:template>
|
|
615
619
|
|
|
616
620
|
<xsl:template match="rsd:copyright-statement//rsd:title">
|
|
617
|
-
<
|
|
621
|
+
<xsl:variable name="level">
|
|
622
|
+
<xsl:call-template name="getLevel"/>
|
|
623
|
+
</xsl:variable>
|
|
624
|
+
<fo:block font-weight="normal" text-align="center" role="H{$level}">
|
|
618
625
|
<xsl:apply-templates/>
|
|
619
626
|
</fo:block>
|
|
620
627
|
</xsl:template>
|
|
@@ -638,7 +645,10 @@
|
|
|
638
645
|
</xsl:template>
|
|
639
646
|
|
|
640
647
|
<xsl:template match="rsd:legal-statement//rsd:title">
|
|
641
|
-
<
|
|
648
|
+
<xsl:variable name="level">
|
|
649
|
+
<xsl:call-template name="getLevel"/>
|
|
650
|
+
</xsl:variable>
|
|
651
|
+
<fo:block font-weight="normal" padding-top="2mm" margin-bottom="6pt" role="H{$level}">
|
|
642
652
|
<xsl:apply-templates/>
|
|
643
653
|
</fo:block>
|
|
644
654
|
</xsl:template>
|
|
@@ -728,6 +738,7 @@
|
|
|
728
738
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
729
739
|
<xsl:attribute name="color"><xsl:value-of select="$color"/></xsl:attribute>
|
|
730
740
|
<xsl:attribute name="line-height">125%</xsl:attribute>
|
|
741
|
+
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
|
731
742
|
|
|
732
743
|
<xsl:choose>
|
|
733
744
|
<xsl:when test="$level = 1">
|
|
@@ -746,6 +757,7 @@
|
|
|
746
757
|
<fo:table-cell>
|
|
747
758
|
<fo:block>
|
|
748
759
|
<xsl:call-template name="extractTitle"/> <!-- section title -->
|
|
760
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
|
749
761
|
</fo:block>
|
|
750
762
|
</fo:table-cell>
|
|
751
763
|
</fo:table-row>
|
|
@@ -756,6 +768,7 @@
|
|
|
756
768
|
</xsl:when>
|
|
757
769
|
<xsl:otherwise>
|
|
758
770
|
<xsl:apply-templates/>
|
|
771
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
|
759
772
|
</xsl:otherwise>
|
|
760
773
|
</xsl:choose>
|
|
761
774
|
|
|
@@ -1080,7 +1093,10 @@
|
|
|
1080
1093
|
<xsl:otherwise>12pt</xsl:otherwise>
|
|
1081
1094
|
</xsl:choose>
|
|
1082
1095
|
</xsl:variable>
|
|
1083
|
-
<
|
|
1096
|
+
<xsl:variable name="levelTerm">
|
|
1097
|
+
<xsl:call-template name="getLevelTermName"/>
|
|
1098
|
+
</xsl:variable>
|
|
1099
|
+
<fo:block font-weight="bold" color="black" font-size="{$font-size}" keep-with-next="always" role="H{$levelTerm}"> <!-- 600 - semibold -->
|
|
1084
1100
|
<xsl:if test="preceding-sibling::*[1][self::rsd:name]">
|
|
1085
1101
|
<xsl:attribute name="space-before">11mm</xsl:attribute>
|
|
1086
1102
|
<fo:inline padding-right="1mm">
|
|
@@ -1130,7 +1146,7 @@
|
|
|
1130
1146
|
<fo:table-header>
|
|
1131
1147
|
<fo:table-row>
|
|
1132
1148
|
<fo:table-cell text-align="left">
|
|
1133
|
-
<fo:block margin-left="-15mm"> <!-- Bibliography section title -->
|
|
1149
|
+
<fo:block margin-left="-15mm" role="H1"> <!-- Bibliography section title -->
|
|
1134
1150
|
<xsl:attribute name="font-size">22pt</xsl:attribute>
|
|
1135
1151
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1136
1152
|
<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
|
|
@@ -1266,28 +1282,28 @@
|
|
|
1266
1282
|
<xsl:variable name="top_top">-25.75</xsl:variable>
|
|
1267
1283
|
<xsl:variable name="top_bottom">194</xsl:variable>
|
|
1268
1284
|
<!-- Yellow -->
|
|
1269
|
-
<fo:static-content flow-name="header-LT-yellow">
|
|
1285
|
+
<fo:static-content flow-name="header-LT-yellow" role="artifact">
|
|
1270
1286
|
<fo:block-container absolute-position="fixed" left="{$left_left}mm" top="{$top_top}mm" font-size="0">
|
|
1271
1287
|
<fo:block>
|
|
1272
1288
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-yellow-left))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1273
1289
|
</fo:block>
|
|
1274
1290
|
</fo:block-container>
|
|
1275
1291
|
</fo:static-content>
|
|
1276
|
-
<fo:static-content flow-name="header-RT-yellow">
|
|
1292
|
+
<fo:static-content flow-name="header-RT-yellow" role="artifact">
|
|
1277
1293
|
<fo:block-container absolute-position="fixed" left="{$left_right}mm" top="{$top_top}mm" font-size="0">
|
|
1278
1294
|
<fo:block>
|
|
1279
1295
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-yellow-right))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1280
1296
|
</fo:block>
|
|
1281
1297
|
</fo:block-container>
|
|
1282
1298
|
</fo:static-content>
|
|
1283
|
-
<fo:static-content flow-name="header-LB-yellow">
|
|
1299
|
+
<fo:static-content flow-name="header-LB-yellow" role="artifact">
|
|
1284
1300
|
<fo:block-container absolute-position="fixed" left="{$left_left}mm" top="{$top_bottom}mm" font-size="0">
|
|
1285
1301
|
<fo:block>
|
|
1286
1302
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-yellow-left))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1287
1303
|
</fo:block>
|
|
1288
1304
|
</fo:block-container>
|
|
1289
1305
|
</fo:static-content>
|
|
1290
|
-
<fo:static-content flow-name="header-RB-yellow">
|
|
1306
|
+
<fo:static-content flow-name="header-RB-yellow" role="artifact">
|
|
1291
1307
|
<fo:block-container absolute-position="fixed" left="{$left_right}mm" top="{$top_bottom}mm" font-size="0">
|
|
1292
1308
|
<fo:block>
|
|
1293
1309
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-yellow-right))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
@@ -1295,28 +1311,28 @@
|
|
|
1295
1311
|
</fo:block-container>
|
|
1296
1312
|
</fo:static-content>
|
|
1297
1313
|
<!-- Blue -->
|
|
1298
|
-
<fo:static-content flow-name="header-LT-blue">
|
|
1314
|
+
<fo:static-content flow-name="header-LT-blue" role="artifact">
|
|
1299
1315
|
<fo:block-container absolute-position="fixed" left="{$left_left}mm" top="{$top_top}mm" font-size="0">
|
|
1300
1316
|
<fo:block>
|
|
1301
1317
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-blue-left))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1302
1318
|
</fo:block>
|
|
1303
1319
|
</fo:block-container>
|
|
1304
1320
|
</fo:static-content>
|
|
1305
|
-
<fo:static-content flow-name="header-RT-blue">
|
|
1321
|
+
<fo:static-content flow-name="header-RT-blue" role="artifact">
|
|
1306
1322
|
<fo:block-container absolute-position="fixed" left="{$left_right}mm" top="{$top_top}mm" font-size="0">
|
|
1307
1323
|
<fo:block>
|
|
1308
1324
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-blue-right))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1309
1325
|
</fo:block>
|
|
1310
1326
|
</fo:block-container>
|
|
1311
1327
|
</fo:static-content>
|
|
1312
|
-
<fo:static-content flow-name="header-LB-blue">
|
|
1328
|
+
<fo:static-content flow-name="header-LB-blue" role="artifact">
|
|
1313
1329
|
<fo:block-container absolute-position="fixed" left="{$left_left}mm" top="{$top_bottom}mm" font-size="0">
|
|
1314
1330
|
<fo:block>
|
|
1315
1331
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-blue-left))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1316
1332
|
</fo:block>
|
|
1317
1333
|
</fo:block-container>
|
|
1318
1334
|
</fo:static-content>
|
|
1319
|
-
<fo:static-content flow-name="header-RB-blue">
|
|
1335
|
+
<fo:static-content flow-name="header-RB-blue" role="artifact">
|
|
1320
1336
|
<fo:block-container absolute-position="fixed" left="{$left_right}mm" top="{$top_bottom}mm" font-size="0">
|
|
1321
1337
|
<fo:block>
|
|
1322
1338
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-blue-right))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
@@ -1324,28 +1340,28 @@
|
|
|
1324
1340
|
</fo:block-container>
|
|
1325
1341
|
</fo:static-content>
|
|
1326
1342
|
<!-- Orange -->
|
|
1327
|
-
<fo:static-content flow-name="header-LT-orange">
|
|
1343
|
+
<fo:static-content flow-name="header-LT-orange" role="artifact">
|
|
1328
1344
|
<fo:block-container absolute-position="fixed" left="{$left_left}mm" top="{$top_top}mm" font-size="0">
|
|
1329
1345
|
<fo:block>
|
|
1330
1346
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-orange-left))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1331
1347
|
</fo:block>
|
|
1332
1348
|
</fo:block-container>
|
|
1333
1349
|
</fo:static-content>
|
|
1334
|
-
<fo:static-content flow-name="header-RT-orange">
|
|
1350
|
+
<fo:static-content flow-name="header-RT-orange" role="artifact">
|
|
1335
1351
|
<fo:block-container absolute-position="fixed" left="{$left_right}mm" top="{$top_top}mm" font-size="0">
|
|
1336
1352
|
<fo:block>
|
|
1337
1353
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-orange-right))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1338
1354
|
</fo:block>
|
|
1339
1355
|
</fo:block-container>
|
|
1340
1356
|
</fo:static-content>
|
|
1341
|
-
<fo:static-content flow-name="header-LB-orange">
|
|
1357
|
+
<fo:static-content flow-name="header-LB-orange" role="artifact">
|
|
1342
1358
|
<fo:block-container absolute-position="fixed" left="{$left_left}mm" top="{$top_bottom}mm" font-size="0">
|
|
1343
1359
|
<fo:block>
|
|
1344
1360
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-orange-left))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
1345
1361
|
</fo:block>
|
|
1346
1362
|
</fo:block-container>
|
|
1347
1363
|
</fo:static-content>
|
|
1348
|
-
<fo:static-content flow-name="header-RB-orange">
|
|
1364
|
+
<fo:static-content flow-name="header-RB-orange" role="artifact">
|
|
1349
1365
|
<fo:block-container absolute-position="fixed" left="{$left_right}mm" top="{$top_bottom}mm" font-size="0">
|
|
1350
1366
|
<fo:block>
|
|
1351
1367
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Page-Background-orange-right))}" content-width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Page"/>
|
|
@@ -1365,7 +1381,7 @@
|
|
|
1365
1381
|
<xsl:with-param name="str" select="/rsd:rsd-standard/rsd:bibdata/rsd:ext/rsd:doctype"/>
|
|
1366
1382
|
</xsl:call-template>
|
|
1367
1383
|
</xsl:variable>
|
|
1368
|
-
<fo:static-content flow-name="footer-odd">
|
|
1384
|
+
<fo:static-content flow-name="footer-odd" role="artifact">
|
|
1369
1385
|
<fo:block-container font-size="8pt" height="100%" color="black">
|
|
1370
1386
|
<fo:block text-align-last="justify" margin-right="1mm">
|
|
1371
1387
|
<fo:inline padding-right="11mm"><fo:page-number/></fo:inline>
|
|
@@ -1377,7 +1393,7 @@
|
|
|
1377
1393
|
</fo:block>
|
|
1378
1394
|
</fo:block-container>
|
|
1379
1395
|
</fo:static-content>
|
|
1380
|
-
<fo:static-content flow-name="footer-even">
|
|
1396
|
+
<fo:static-content flow-name="footer-even" role="artifact">
|
|
1381
1397
|
<fo:block-container font-size="8pt" height="100%" color="black">
|
|
1382
1398
|
<fo:block text-align-last="justify" margin-right="1mm">
|
|
1383
1399
|
<fo:inline padding-right="11mm"><fo:page-number/></fo:inline>
|
|
@@ -1638,6 +1654,7 @@
|
|
|
1638
1654
|
</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
|
|
1639
1655
|
<xsl:attribute name="white-space">pre</xsl:attribute>
|
|
1640
1656
|
<xsl:attribute name="wrap-option">wrap</xsl:attribute>
|
|
1657
|
+
<xsl:attribute name="role">Code</xsl:attribute>
|
|
1641
1658
|
|
|
1642
1659
|
|
|
1643
1660
|
<xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
|
|
@@ -1664,8 +1681,13 @@
|
|
|
1664
1681
|
|
|
1665
1682
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
|
1666
1683
|
|
|
1667
|
-
</xsl:attribute-set><xsl:attribute-set name="
|
|
1668
|
-
</xsl:attribute-set><xsl:attribute-set name="
|
|
1684
|
+
</xsl:attribute-set><xsl:attribute-set name="subject-style">
|
|
1685
|
+
</xsl:attribute-set><xsl:attribute-set name="inherit-style">
|
|
1686
|
+
</xsl:attribute-set><xsl:attribute-set name="description-style">
|
|
1687
|
+
</xsl:attribute-set><xsl:attribute-set name="specification-style">
|
|
1688
|
+
</xsl:attribute-set><xsl:attribute-set name="measurement-target-style">
|
|
1689
|
+
</xsl:attribute-set><xsl:attribute-set name="verification-style">
|
|
1690
|
+
</xsl:attribute-set><xsl:attribute-set name="import-style">
|
|
1669
1691
|
</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
|
|
1670
1692
|
|
|
1671
1693
|
|
|
@@ -1889,7 +1911,8 @@
|
|
|
1889
1911
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
1890
1912
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
1891
1913
|
|
|
1892
|
-
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
|
1914
|
+
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
|
1915
|
+
<xsl:attribute name="role">BlockQuote</xsl:attribute>
|
|
1893
1916
|
|
|
1894
1917
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
1895
1918
|
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
|
@@ -2108,7 +2131,9 @@
|
|
|
2108
2131
|
|
|
2109
2132
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
2110
2133
|
|
|
2111
|
-
|
|
2134
|
+
|
|
2135
|
+
|
|
2136
|
+
|
|
2112
2137
|
|
|
2113
2138
|
|
|
2114
2139
|
|
|
@@ -4000,16 +4025,68 @@
|
|
|
4000
4025
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
4001
4026
|
</xsl:call-template>
|
|
4002
4027
|
|
|
4028
|
+
|
|
4029
|
+
|
|
4003
4030
|
<xsl:variable name="mathml">
|
|
4004
4031
|
<xsl:apply-templates select="." mode="mathml"/>
|
|
4005
4032
|
</xsl:variable>
|
|
4006
4033
|
<fo:instream-foreign-object fox:alt-text="Math">
|
|
4007
4034
|
|
|
4008
4035
|
|
|
4036
|
+
<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
|
|
4037
|
+
<xsl:variable name="comment_text_">
|
|
4038
|
+
<xsl:choose>
|
|
4039
|
+
<xsl:when test="normalize-space($comment_text_following) != ''">
|
|
4040
|
+
<xsl:value-of select="$comment_text_following"/>
|
|
4041
|
+
</xsl:when>
|
|
4042
|
+
<xsl:otherwise>
|
|
4043
|
+
<xsl:value-of select="normalize-space(translate(.,' ',' '))"/>
|
|
4044
|
+
</xsl:otherwise>
|
|
4045
|
+
</xsl:choose>
|
|
4046
|
+
</xsl:variable>
|
|
4047
|
+
<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
|
|
4048
|
+
|
|
4049
|
+
<xsl:if test="normalize-space($comment_text) != ''">
|
|
4050
|
+
<!-- put Mathin Alternate Text -->
|
|
4051
|
+
<xsl:attribute name="fox:alt-text">
|
|
4052
|
+
<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
|
|
4053
|
+
</xsl:attribute>
|
|
4054
|
+
</xsl:if>
|
|
4055
|
+
|
|
4056
|
+
<xsl:variable name="mathml_content">
|
|
4057
|
+
<xsl:apply-templates select="." mode="mathml_actual_text"/>
|
|
4058
|
+
</xsl:variable>
|
|
4059
|
+
<!-- put MathML in Actual Text -->
|
|
4060
|
+
<xsl:attribute name="fox:actual-text">
|
|
4061
|
+
<xsl:value-of select="$mathml_content"/>
|
|
4062
|
+
</xsl:attribute>
|
|
4063
|
+
|
|
4064
|
+
|
|
4009
4065
|
<!-- <xsl:copy-of select="."/> -->
|
|
4010
4066
|
<xsl:copy-of select="xalan:nodeset($mathml)"/>
|
|
4011
4067
|
</fo:instream-foreign-object>
|
|
4012
4068
|
</fo:inline>
|
|
4069
|
+
</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
|
|
4070
|
+
<!-- <xsl:text>a+b</xsl:text> -->
|
|
4071
|
+
<xsl:text><</xsl:text>
|
|
4072
|
+
<xsl:value-of select="local-name()"/>
|
|
4073
|
+
<xsl:if test="local-name() = 'math'">
|
|
4074
|
+
<xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text>
|
|
4075
|
+
</xsl:if>
|
|
4076
|
+
<xsl:for-each select="@*">
|
|
4077
|
+
<xsl:text> </xsl:text>
|
|
4078
|
+
<xsl:value-of select="local-name()"/>
|
|
4079
|
+
<xsl:text>="</xsl:text>
|
|
4080
|
+
<xsl:value-of select="."/>
|
|
4081
|
+
<xsl:text>"</xsl:text>
|
|
4082
|
+
</xsl:for-each>
|
|
4083
|
+
<xsl:text>></xsl:text>
|
|
4084
|
+
<xsl:apply-templates mode="mathml_actual_text"/>
|
|
4085
|
+
<xsl:text></</xsl:text>
|
|
4086
|
+
<xsl:value-of select="local-name()"/>
|
|
4087
|
+
<xsl:text>></xsl:text>
|
|
4088
|
+
</xsl:template><xsl:template match="text()" mode="mathml_actual_text">
|
|
4089
|
+
<xsl:value-of select="normalize-space()"/>
|
|
4013
4090
|
</xsl:template><xsl:template match="@*|node()" mode="mathml">
|
|
4014
4091
|
<xsl:copy>
|
|
4015
4092
|
<xsl:apply-templates select="@*|node()" mode="mathml"/>
|
|
@@ -4077,7 +4154,10 @@
|
|
|
4077
4154
|
</fo:block>
|
|
4078
4155
|
<xsl:apply-templates/>
|
|
4079
4156
|
</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
|
|
4080
|
-
<
|
|
4157
|
+
<xsl:variable name="level">
|
|
4158
|
+
<xsl:call-template name="getLevel"/>
|
|
4159
|
+
</xsl:variable>
|
|
4160
|
+
<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
|
|
4081
4161
|
</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
|
|
4082
4162
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
|
|
4083
4163
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
@@ -4112,9 +4192,10 @@
|
|
|
4112
4192
|
|
|
4113
4193
|
</xsl:variable>
|
|
4114
4194
|
|
|
4195
|
+
<xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
|
|
4115
4196
|
<xsl:choose>
|
|
4116
|
-
<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
|
|
4117
|
-
<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
|
|
4197
|
+
<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
|
|
4198
|
+
<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
|
|
4118
4199
|
</xsl:choose>
|
|
4119
4200
|
<xsl:apply-templates/>
|
|
4120
4201
|
</xsl:template><xsl:template match="*[local-name() = 'xref']">
|
|
@@ -4267,7 +4348,10 @@
|
|
|
4267
4348
|
</fo:block>
|
|
4268
4349
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
4269
4350
|
<xsl:if test="normalize-space() != ''">
|
|
4270
|
-
<
|
|
4351
|
+
<xsl:variable name="level">
|
|
4352
|
+
<xsl:call-template name="getLevelTermName"/>
|
|
4353
|
+
</xsl:variable>
|
|
4354
|
+
<fo:inline role="H{$level}">
|
|
4271
4355
|
<xsl:apply-templates/>
|
|
4272
4356
|
<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
|
|
4273
4357
|
<xsl:text>.</xsl:text>
|
|
@@ -4907,6 +4991,7 @@
|
|
|
4907
4991
|
</xsl:when>
|
|
4908
4992
|
<xsl:otherwise>
|
|
4909
4993
|
<xsl:apply-templates/>
|
|
4994
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
|
4910
4995
|
</xsl:otherwise>
|
|
4911
4996
|
</xsl:choose>
|
|
4912
4997
|
</fo:block>
|
|
@@ -5047,14 +5132,6 @@
|
|
|
5047
5132
|
<fo:block>
|
|
5048
5133
|
<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
|
|
5049
5134
|
</fo:block>
|
|
5050
|
-
</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
|
|
5051
|
-
<fo:block xsl:use-attribute-sets="requirement-subject-style">
|
|
5052
|
-
<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
|
|
5053
|
-
</fo:block>
|
|
5054
|
-
</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
|
|
5055
|
-
<fo:block xsl:use-attribute-sets="requirement-inherit-style">
|
|
5056
|
-
<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
|
|
5057
|
-
</fo:block>
|
|
5058
5135
|
</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
|
|
5059
5136
|
<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
|
|
5060
5137
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
@@ -5071,6 +5148,38 @@
|
|
|
5071
5148
|
<fo:block xsl:use-attribute-sets="recommendation-label-style">
|
|
5072
5149
|
<xsl:apply-templates/>
|
|
5073
5150
|
</fo:block>
|
|
5151
|
+
</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
|
|
5152
|
+
<fo:block xsl:use-attribute-sets="subject-style">
|
|
5153
|
+
<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
|
|
5154
|
+
</fo:block>
|
|
5155
|
+
</xsl:template><xsl:template match="*[local-name() = 'subject']">
|
|
5156
|
+
<fo:block xsl:use-attribute-sets="subject-style">
|
|
5157
|
+
<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
|
|
5158
|
+
</fo:block>
|
|
5159
|
+
</xsl:template><xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
|
|
5160
|
+
<fo:block xsl:use-attribute-sets="inherit-style">
|
|
5161
|
+
<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
|
|
5162
|
+
</fo:block>
|
|
5163
|
+
</xsl:template><xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
|
|
5164
|
+
<fo:block xsl:use-attribute-sets="description-style">
|
|
5165
|
+
<xsl:apply-templates/>
|
|
5166
|
+
</fo:block>
|
|
5167
|
+
</xsl:template><xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
|
|
5168
|
+
<fo:block xsl:use-attribute-sets="specification-style">
|
|
5169
|
+
<xsl:apply-templates/>
|
|
5170
|
+
</fo:block>
|
|
5171
|
+
</xsl:template><xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
|
|
5172
|
+
<fo:block xsl:use-attribute-sets="measurement-target-style">
|
|
5173
|
+
<xsl:apply-templates/>
|
|
5174
|
+
</fo:block>
|
|
5175
|
+
</xsl:template><xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
|
|
5176
|
+
<fo:block xsl:use-attribute-sets="verification-style">
|
|
5177
|
+
<xsl:apply-templates/>
|
|
5178
|
+
</fo:block>
|
|
5179
|
+
</xsl:template><xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
|
|
5180
|
+
<fo:block xsl:use-attribute-sets="import-style">
|
|
5181
|
+
<xsl:apply-templates/>
|
|
5182
|
+
</fo:block>
|
|
5074
5183
|
</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
5075
5184
|
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
|
5076
5185
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
@@ -5948,6 +6057,9 @@
|
|
|
5948
6057
|
<fo:block-container border="1pt solid black" width="50%">
|
|
5949
6058
|
<fo:block> </fo:block>
|
|
5950
6059
|
</fo:block-container>
|
|
6060
|
+
</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
|
|
6061
|
+
<fo:inline padding-right="5mm"> </fo:inline>
|
|
6062
|
+
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
5951
6063
|
</xsl:template><xsl:template name="convertDate">
|
|
5952
6064
|
<xsl:param name="date"/>
|
|
5953
6065
|
<xsl:param name="format" select="'short'"/>
|
|
@@ -6186,6 +6298,26 @@
|
|
|
6186
6298
|
<xsl:value-of select="$level"/>
|
|
6187
6299
|
</xsl:otherwise>
|
|
6188
6300
|
</xsl:choose>
|
|
6301
|
+
</xsl:template><xsl:template name="getLevelTermName">
|
|
6302
|
+
<xsl:choose>
|
|
6303
|
+
<xsl:when test="normalize-space(../@depth) != ''">
|
|
6304
|
+
<xsl:value-of select="../@depth"/>
|
|
6305
|
+
</xsl:when>
|
|
6306
|
+
<xsl:otherwise>
|
|
6307
|
+
<xsl:variable name="title_level_">
|
|
6308
|
+
<xsl:for-each select="../preceding-sibling::*[local-name() = 'title'][1]">
|
|
6309
|
+
<xsl:call-template name="getLevel"/>
|
|
6310
|
+
</xsl:for-each>
|
|
6311
|
+
</xsl:variable>
|
|
6312
|
+
<xsl:variable name="title_level" select="normalize-space($title_level_)"/>
|
|
6313
|
+
<xsl:choose>
|
|
6314
|
+
<xsl:when test="$title_level != ''"><xsl:value-of select="$title_level + 1"/></xsl:when>
|
|
6315
|
+
<xsl:otherwise>
|
|
6316
|
+
<xsl:call-template name="getLevel"/>
|
|
6317
|
+
</xsl:otherwise>
|
|
6318
|
+
</xsl:choose>
|
|
6319
|
+
</xsl:otherwise>
|
|
6320
|
+
</xsl:choose>
|
|
6189
6321
|
</xsl:template><xsl:template name="split">
|
|
6190
6322
|
<xsl:param name="pText" select="."/>
|
|
6191
6323
|
<xsl:param name="sep" select="','"/>
|
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.10
|
|
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-08-
|
|
11
|
+
date: 2021-08-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|