metanorma-cc 2.0.2 → 2.0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 53f1af93e381db0210b7022f002cc5eb940ef7c5c5ae80dad112daf746fe1701
4
- data.tar.gz: 28c11bc2a0aa389821dbcbb7c379bbefebe41a85f79790f9ea73181e722f3eed
3
+ metadata.gz: ef0fd91d519b9fe14815625ea6ffa60d78f42364526c3be6a7db6df46090d7d2
4
+ data.tar.gz: 559c1a98a9b8debdcb5d4e12f5f1e7d4eae6726c44b0161ff6c364e2039b8c35
5
5
  SHA512:
6
- metadata.gz: f439fef05db79df3cf840a5673e58f6e8863a5720bd8a2a4533685f09abb0265867e44a5ab516443caab0f6f1607cc23b921f9f6ffbeeae9db66829124f6028e
7
- data.tar.gz: 475ec99f5577c78a7d5ef2d41782fe4cb3443b080b5128a79a747458788d34fb32125e5b768371d2283ade446d44aeec45cd9da5971dfac2fb7c58bc131a7bdb
6
+ metadata.gz: 15b5c82d08344592ac04f77cef3a91be1f9addb7c65e5698b29d644fcb1e89b7112438ed429719c8f8fc09fdf958da627f162c794dd33beaabed9194a7dfe101
7
+ data.tar.gz: 8f78b869337c0376ab1c6dc7ed4e3697040132892ac63dcebde610a268aaaff57551d749d8ec6f29f6617d84f830344ae50f31e4b3d3f206f81461d30f26932e
@@ -1,20 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
2
2
 
3
3
  <xsl:output version="1.0" method="xml" encoding="UTF-8" indent="no"/>
4
-
5
- <xsl:param name="svg_images"/>
6
- <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
7
- <xsl:variable name="images" select="document($svg_images)"/>
8
- <xsl:param name="basepath"/>
9
4
 
10
5
  <xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
11
6
 
12
- <xsl:variable name="marginLeftRight1" select="19"/>
13
- <xsl:variable name="marginLeftRight2" select="19"/>
14
- <xsl:variable name="marginTop" select="20.2"/>
15
- <xsl:variable name="marginBottom" select="20.3"/>
16
-
17
-
18
7
 
19
8
 
20
9
  <xsl:variable name="debug">false</xsl:variable>
@@ -38,9 +27,6 @@
38
27
  </contents>
39
28
  </xsl:variable>
40
29
 
41
- <xsl:variable name="lang">
42
- <xsl:call-template name="getLang"/>
43
- </xsl:variable>
44
30
 
45
31
  <xsl:template match="/">
46
32
  <xsl:call-template name="namespaceCheck"/>
@@ -452,77 +438,7 @@
452
438
  <xsl:apply-templates/>
453
439
  </xsl:template>
454
440
 
455
-
456
-
457
- <xsl:template match="csd:ul | csd:ol" mode="ul_ol">
458
- <fo:list-block provisional-distance-between-starts="6.5mm" margin-bottom="12pt">
459
- <xsl:if test="ancestor::csd:ol">
460
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
461
- </xsl:if>
462
- <xsl:apply-templates/>
463
- </fo:list-block>
464
- </xsl:template>
465
-
466
- <xsl:template match="csd:li">
467
- <fo:list-item>
468
- <fo:list-item-label end-indent="label-end()">
469
- <fo:block>
470
- <xsl:choose>
471
- <xsl:when test="local-name(..) = 'ul'">
472
- <xsl:call-template name="setULLabel"/>
473
- </xsl:when>
474
- <xsl:otherwise> <!-- for ordered lists -->
475
- <xsl:choose>
476
- <xsl:when test="../@type = 'arabic'">
477
- <xsl:number format="a)" lang="en"/>
478
- </xsl:when>
479
- <xsl:when test="../@type = 'alphabet'">
480
- <xsl:number format="1)"/>
481
- </xsl:when>
482
- <xsl:otherwise>
483
- <xsl:number format="1."/>
484
- </xsl:otherwise>
485
- </xsl:choose>
486
- </xsl:otherwise>
487
- </xsl:choose>
488
- </fo:block>
489
- </fo:list-item-label>
490
- <fo:list-item-body start-indent="body-start()">
491
- <fo:block>
492
- <xsl:apply-templates/>
493
- </fo:block>
494
- </fo:list-item-body>
495
- </fo:list-item>
496
- </xsl:template>
497
441
 
498
-
499
- <xsl:template match="csd:preferred">
500
- <xsl:variable name="level">
501
- <xsl:call-template name="getLevel"/>
502
- </xsl:variable>
503
- <xsl:variable name="font-size">
504
- <xsl:choose>
505
- <xsl:when test="$level &gt;= 3">11pt</xsl:when>
506
- <xsl:otherwise>12pt</xsl:otherwise>
507
- </xsl:choose>
508
- </xsl:variable>
509
- <xsl:variable name="levelTerm">
510
- <xsl:call-template name="getLevelTermName"/>
511
- </xsl:variable>
512
- <fo:block font-size="{$font-size}" line-height="1.1" role="H{$levelTerm}">
513
- <fo:block font-weight="bold" keep-with-next="always">
514
- <xsl:apply-templates select="ancestor::csd:term[1]/csd:name"/>
515
- </fo:block>
516
- <fo:block font-weight="bold" keep-with-next="always">
517
- <xsl:call-template name="setStyle_preferred"/>
518
- <xsl:apply-templates/>
519
- </fo:block>
520
- </fo:block>
521
- </xsl:template>
522
-
523
-
524
-
525
-
526
442
  <xsl:template match="csd:xref" priority="2">
527
443
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
528
444
  <xsl:if test="not(starts-with(text(), 'Figure') or starts-with(text(), 'Table'))">
@@ -533,31 +449,6 @@
533
449
  </fo:basic-link>
534
450
  </xsl:template>
535
451
 
536
-
537
- <xsl:template match="csd:formula/csd:stem">
538
- <fo:block margin-top="6pt" margin-bottom="12pt">
539
- <fo:table table-layout="fixed" width="100%">
540
- <fo:table-column column-width="95%"/>
541
- <fo:table-column column-width="5%"/>
542
- <fo:table-body>
543
- <fo:table-row>
544
- <fo:table-cell display-align="center">
545
- <fo:block text-align="left" margin-left="5mm">
546
- <xsl:apply-templates/>
547
- </fo:block>
548
- </fo:table-cell>
549
- <fo:table-cell display-align="center">
550
- <fo:block text-align="right">
551
- <xsl:apply-templates select="../csd:name" mode="formula_number"/>
552
- </fo:block>
553
- </fo:table-cell>
554
- </fo:table-row>
555
- </fo:table-body>
556
- </fo:table>
557
- </fo:block>
558
- </xsl:template>
559
-
560
-
561
452
 
562
453
  <xsl:template name="insertHeaderFooter">
563
454
  <fo:static-content flow-name="header-even" role="artifact">
@@ -613,11 +504,21 @@
613
504
  </xsl:template>
614
505
 
615
506
 
616
- <xsl:variable name="pageWidth_">
507
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
508
+ <xsl:call-template name="getLang"/>
509
+ </xsl:variable><xsl:variable name="pageWidth_">
617
510
  210
618
511
  </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
619
512
  297
620
- </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
513
+ </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
514
+ 19
515
+ </xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
516
+ 19
517
+ </xsl:variable><xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/><xsl:variable name="marginTop_">
518
+ 20.2
519
+ </xsl:variable><xsl:variable name="marginTop" select="normalize-space($marginTop_)"/><xsl:variable name="marginBottom_">
520
+ 20.3
521
+ </xsl:variable><xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/><xsl:variable name="titles_">
621
522
 
622
523
  <title-edition lang="en">
623
524
 
@@ -679,7 +580,7 @@
679
580
  </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
680
581
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
681
582
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
682
- </xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
583
+ </xsl:variable><xsl:variable name="linebreak">&#8232;</xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space">​</xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
683
584
  <xsl:param name="name"/>
684
585
  <xsl:param name="lang"/>
685
586
  <xsl:variable name="lang_">
@@ -702,7 +603,7 @@
702
603
  <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
703
604
  </xsl:otherwise>
704
605
  </xsl:choose>
705
- </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="'&#8232;'"/><xsl:attribute-set name="root-style">
606
+ </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:attribute-set name="root-style">
706
607
 
707
608
 
708
609
 
@@ -867,9 +768,9 @@
867
768
 
868
769
 
869
770
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
870
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
871
771
 
872
-
772
+
773
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
873
774
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
874
775
  <xsl:attribute name="font-weight">bold</xsl:attribute>
875
776
 
@@ -882,6 +783,7 @@
882
783
 
883
784
 
884
785
 
786
+
885
787
 
886
788
 
887
789
 
@@ -1240,12 +1142,11 @@
1240
1142
 
1241
1143
 
1242
1144
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1243
- <xsl:attribute name="role">BlockQuote</xsl:attribute>
1145
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
1146
+ <xsl:attribute name="margin-right">12mm</xsl:attribute>
1244
1147
 
1245
1148
 
1246
1149
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1247
- <xsl:attribute name="margin-left">12mm</xsl:attribute>
1248
- <xsl:attribute name="margin-right">12mm</xsl:attribute>
1249
1150
 
1250
1151
 
1251
1152
 
@@ -1253,10 +1154,8 @@
1253
1154
 
1254
1155
 
1255
1156
  </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1157
+ <xsl:attribute name="text-align">right</xsl:attribute>
1256
1158
 
1257
-
1258
- <xsl:attribute name="text-align">right</xsl:attribute>
1259
-
1260
1159
 
1261
1160
  </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1262
1161
 
@@ -1279,6 +1178,9 @@
1279
1178
 
1280
1179
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1281
1180
 
1181
+ </xsl:attribute-set><xsl:attribute-set name="term-name-style">
1182
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1183
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1282
1184
  </xsl:attribute-set><xsl:attribute-set name="figure-style">
1283
1185
 
1284
1186
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
@@ -1309,6 +1211,36 @@
1309
1211
 
1310
1212
 
1311
1213
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
1214
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1215
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1216
+
1217
+
1218
+
1219
+
1220
+
1221
+
1222
+ </xsl:attribute-set><xsl:attribute-set name="formula-stem-block-style">
1223
+ <xsl:attribute name="text-align">center</xsl:attribute>
1224
+
1225
+
1226
+
1227
+ <xsl:attribute name="text-align">left</xsl:attribute>
1228
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
1229
+
1230
+
1231
+
1232
+
1233
+
1234
+
1235
+
1236
+
1237
+
1238
+ </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
1239
+ <xsl:attribute name="text-align">right</xsl:attribute>
1240
+
1241
+
1242
+
1243
+
1312
1244
 
1313
1245
  </xsl:attribute-set><xsl:attribute-set name="image-style">
1314
1246
  <xsl:attribute name="text-align">center</xsl:attribute>
@@ -1344,6 +1276,20 @@
1344
1276
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1345
1277
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1346
1278
 
1279
+ </xsl:attribute-set><xsl:attribute-set name="preferred-block-style">
1280
+
1281
+ <xsl:attribute name="line-height">1.1</xsl:attribute>
1282
+
1283
+
1284
+
1285
+
1286
+
1287
+
1288
+ </xsl:attribute-set><xsl:attribute-set name="preferred-term-style">
1289
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1290
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1291
+
1292
+
1347
1293
  </xsl:attribute-set><xsl:attribute-set name="domain-style">
1348
1294
 
1349
1295
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
@@ -1379,6 +1325,36 @@
1379
1325
 
1380
1326
  </xsl:attribute-set><xsl:attribute-set name="list-style">
1381
1327
 
1328
+
1329
+
1330
+ <xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
1331
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1332
+
1333
+
1334
+
1335
+
1336
+
1337
+
1338
+
1339
+
1340
+
1341
+
1342
+
1343
+
1344
+
1345
+
1346
+
1347
+ </xsl:attribute-set><xsl:attribute-set name="list-item-style">
1348
+
1349
+
1350
+ </xsl:attribute-set><xsl:attribute-set name="list-item-label-style">
1351
+
1352
+
1353
+
1354
+ </xsl:attribute-set><xsl:attribute-set name="list-item-body-style">
1355
+
1356
+
1357
+
1382
1358
  </xsl:attribute-set><xsl:attribute-set name="toc-style">
1383
1359
  <xsl:attribute name="line-height">135%</xsl:attribute>
1384
1360
  </xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
@@ -1645,6 +1621,111 @@
1645
1621
 
1646
1622
 
1647
1623
 
1624
+ </xsl:attribute-set><xsl:attribute-set name="hljs-doctag">
1625
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1626
+ </xsl:attribute-set><xsl:attribute-set name="hljs-keyword">
1627
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1628
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-keyword">
1629
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1630
+ </xsl:attribute-set><xsl:attribute-set name="hljs-template-tag">
1631
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1632
+ </xsl:attribute-set><xsl:attribute-set name="hljs-template-variable">
1633
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1634
+ </xsl:attribute-set><xsl:attribute-set name="hljs-type">
1635
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1636
+ </xsl:attribute-set><xsl:attribute-set name="hljs-variable_and_language_">
1637
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1638
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title">
1639
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1640
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class_">
1641
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1642
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class__and_inherited__">
1643
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1644
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_function_">
1645
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1646
+ </xsl:attribute-set><xsl:attribute-set name="hljs-attr">
1647
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1648
+ </xsl:attribute-set><xsl:attribute-set name="hljs-attribute">
1649
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1650
+ </xsl:attribute-set><xsl:attribute-set name="hljs-literal">
1651
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1652
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta">
1653
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1654
+ </xsl:attribute-set><xsl:attribute-set name="hljs-number">
1655
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1656
+ </xsl:attribute-set><xsl:attribute-set name="hljs-operator">
1657
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1658
+ </xsl:attribute-set><xsl:attribute-set name="hljs-variable">
1659
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1660
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-attr">
1661
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1662
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-class">
1663
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1664
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-id">
1665
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1666
+ </xsl:attribute-set><xsl:attribute-set name="hljs-regexp">
1667
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1668
+ </xsl:attribute-set><xsl:attribute-set name="hljs-string">
1669
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1670
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-string">
1671
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1672
+ </xsl:attribute-set><xsl:attribute-set name="hljs-built_in">
1673
+ <xsl:attribute name="color">#e36209</xsl:attribute>
1674
+ </xsl:attribute-set><xsl:attribute-set name="hljs-symbol">
1675
+ <xsl:attribute name="color">#e36209</xsl:attribute>
1676
+ </xsl:attribute-set><xsl:attribute-set name="hljs-comment">
1677
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1678
+ </xsl:attribute-set><xsl:attribute-set name="hljs-code">
1679
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1680
+ </xsl:attribute-set><xsl:attribute-set name="hljs-formula">
1681
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1682
+ </xsl:attribute-set><xsl:attribute-set name="hljs-name">
1683
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1684
+ </xsl:attribute-set><xsl:attribute-set name="hljs-quote">
1685
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1686
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-tag">
1687
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1688
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-pseudo">
1689
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1690
+ </xsl:attribute-set><xsl:attribute-set name="hljs-subst">
1691
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1692
+ </xsl:attribute-set><xsl:attribute-set name="hljs-section">
1693
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1694
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1695
+ </xsl:attribute-set><xsl:attribute-set name="hljs-bullet">
1696
+ <xsl:attribute name="color">#735c0f</xsl:attribute>
1697
+ </xsl:attribute-set><xsl:attribute-set name="hljs-emphasis">
1698
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1699
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1700
+ </xsl:attribute-set><xsl:attribute-set name="hljs-strong">
1701
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1702
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1703
+ </xsl:attribute-set><xsl:attribute-set name="hljs-addition">
1704
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1705
+ <xsl:attribute name="background-color">#f0fff4</xsl:attribute>
1706
+ </xsl:attribute-set><xsl:attribute-set name="hljs-deletion">
1707
+ <xsl:attribute name="color">#b31d28</xsl:attribute>
1708
+ <xsl:attribute name="background-color">#ffeef0</xsl:attribute>
1709
+ </xsl:attribute-set><xsl:attribute-set name="hljs-char_and_escape_">
1710
+ </xsl:attribute-set><xsl:attribute-set name="hljs-link">
1711
+ </xsl:attribute-set><xsl:attribute-set name="hljs-params">
1712
+ </xsl:attribute-set><xsl:attribute-set name="hljs-property">
1713
+ </xsl:attribute-set><xsl:attribute-set name="hljs-punctuation">
1714
+ </xsl:attribute-set><xsl:attribute-set name="hljs-tag">
1715
+ </xsl:attribute-set><xsl:attribute-set name="indexsect-title-style">
1716
+ <xsl:attribute name="role">H1</xsl:attribute>
1717
+
1718
+
1719
+
1720
+
1721
+
1722
+ </xsl:attribute-set><xsl:attribute-set name="indexsect-clause-title-style">
1723
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1724
+
1725
+
1726
+
1727
+
1728
+
1648
1729
  </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:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
1649
1730
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1650
1731
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -1731,9 +1812,12 @@
1731
1812
 
1732
1813
 
1733
1814
  </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
1815
+ <xsl:param name="margin"/>
1734
1816
 
1735
1817
  <!-- process in the template 'paragraph' -->
1736
- <xsl:call-template name="paragraph"/>
1818
+ <xsl:call-template name="paragraph">
1819
+ <xsl:with-param name="margin" select="$margin"/>
1820
+ </xsl:call-template>
1737
1821
 
1738
1822
  </xsl:template><xsl:template match="*[local-name()='feedback-statement']">
1739
1823
  <fo:block xsl:use-attribute-sets="feedback-statement-style">
@@ -1745,9 +1829,12 @@
1745
1829
  <xsl:call-template name="title"/>
1746
1830
 
1747
1831
  </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
1832
+ <xsl:param name="margin"/>
1748
1833
 
1749
1834
  <!-- process in the template 'paragraph' -->
1750
- <xsl:call-template name="paragraph"/>
1835
+ <xsl:call-template name="paragraph">
1836
+ <xsl:with-param name="margin" select="$margin"/>
1837
+ </xsl:call-template>
1751
1838
 
1752
1839
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
1753
1840
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
@@ -2093,8 +2180,7 @@
2093
2180
  </xsl:call-template>
2094
2181
  </xsl:if>
2095
2182
  </xsl:template><xsl:template match="text()" mode="td_text">
2096
- <xsl:variable name="zero-space">​</xsl:variable>
2097
- <xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
2183
+ <xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
2098
2184
  </xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
2099
2185
  <xsl:value-of select="*[local-name()='origin']/@citeas"/>
2100
2186
  </xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
@@ -3064,20 +3150,44 @@
3064
3150
  <fo:inline text-decoration="underline">
3065
3151
  <xsl:apply-templates/>
3066
3152
  </fo:inline>
3067
- </xsl:template><xsl:template match="*[local-name()='add']">
3153
+ </xsl:template><xsl:template match="*[local-name()='add']" name="tag_add">
3068
3154
  <xsl:param name="skip">true</xsl:param>
3155
+ <xsl:param name="block">false</xsl:param>
3156
+ <xsl:param name="type"/>
3157
+ <xsl:param name="text-align"/>
3069
3158
  <xsl:choose>
3070
3159
  <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
3071
3160
  <xsl:choose>
3072
- <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab'])) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3161
+ <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or local-name(..) = 'formattedref' and not(preceding-sibling::node())) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3073
3162
  <xsl:otherwise>
3074
- <fo:inline>
3163
+ <xsl:variable name="tag">
3075
3164
  <xsl:call-template name="insertTag">
3076
- <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3165
+ <xsl:with-param name="type">
3166
+ <xsl:choose>
3167
+ <xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
3168
+ <xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
3169
+ </xsl:choose>
3170
+ </xsl:with-param>
3077
3171
  <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3078
3172
  <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3079
3173
  </xsl:call-template>
3080
- </fo:inline>
3174
+ </xsl:variable>
3175
+ <xsl:choose>
3176
+ <xsl:when test="$block = 'false'">
3177
+ <fo:inline>
3178
+ <xsl:copy-of select="$tag"/>
3179
+ </fo:inline>
3180
+ </xsl:when>
3181
+ <xsl:otherwise>
3182
+ <fo:block> <!-- for around figures -->
3183
+ <xsl:if test="$text-align != ''">
3184
+ <xsl:attribute name="text-align"><xsl:value-of select="$text-align"/></xsl:attribute>
3185
+ </xsl:if>
3186
+ <xsl:copy-of select="$tag"/>
3187
+ </fo:block>
3188
+ </xsl:otherwise>
3189
+ </xsl:choose>
3190
+
3081
3191
  </xsl:otherwise>
3082
3192
  </xsl:choose>
3083
3193
  </xsl:when>
@@ -3436,17 +3546,21 @@
3436
3546
  </xsl:apply-templates>
3437
3547
  </xsl:template><xsl:template name="getLang">
3438
3548
  <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3439
- <xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3440
3549
  <xsl:variable name="language">
3441
3550
  <xsl:choose>
3442
3551
  <xsl:when test="$language_current != ''">
3443
3552
  <xsl:value-of select="$language_current"/>
3444
3553
  </xsl:when>
3445
- <xsl:when test="$language_current_2 != ''">
3446
- <xsl:value-of select="$language_current_2"/>
3447
- </xsl:when>
3448
3554
  <xsl:otherwise>
3449
- <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3555
+ <xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3556
+ <xsl:choose>
3557
+ <xsl:when test="$language_current_2 != ''">
3558
+ <xsl:value-of select="$language_current_2"/>
3559
+ </xsl:when>
3560
+ <xsl:otherwise>
3561
+ <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3562
+ </xsl:otherwise>
3563
+ </xsl:choose>
3450
3564
  </xsl:otherwise>
3451
3565
  </xsl:choose>
3452
3566
  </xsl:variable>
@@ -3663,8 +3777,8 @@
3663
3777
 
3664
3778
  </xsl:if>
3665
3779
  <fo:block-container margin-left="0mm">
3666
- <fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
3667
- <xsl:apply-templates/>
3780
+ <fo:block id="{@id}">
3781
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
3668
3782
  </fo:block>
3669
3783
  </fo:block-container>
3670
3784
  </fo:block-container>
@@ -3676,10 +3790,43 @@
3676
3790
  <fo:inline>
3677
3791
  <xsl:apply-templates/>
3678
3792
  </fo:inline>
3679
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
3793
+ </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
3680
3794
  <xsl:if test="normalize-space() != ''">
3681
3795
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
3682
3796
  </xsl:if>
3797
+ </xsl:template><xsl:template match="*[local-name() = 'formula'][*[local-name() = 'name']]/*[local-name() = 'stem']">
3798
+ <fo:block xsl:use-attribute-sets="formula-style">
3799
+
3800
+
3801
+
3802
+ <fo:table table-layout="fixed" width="100%">
3803
+ <fo:table-column column-width="95%"/>
3804
+ <fo:table-column column-width="5%"/>
3805
+ <fo:table-body>
3806
+ <fo:table-row>
3807
+ <fo:table-cell display-align="center">
3808
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
3809
+
3810
+
3811
+
3812
+ <xsl:apply-templates/>
3813
+ </fo:block>
3814
+ </fo:table-cell>
3815
+ <fo:table-cell display-align="center">
3816
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style">
3817
+ <xsl:apply-templates select="../*[local-name() = 'name']"/>
3818
+ </fo:block>
3819
+ </fo:table-cell>
3820
+ </fo:table-row>
3821
+ </fo:table-body>
3822
+ </fo:table>
3823
+ </fo:block>
3824
+ </xsl:template><xsl:template match="*[local-name() = 'formula'][not(*[local-name() = 'name'])]/*[local-name() = 'stem']">
3825
+ <fo:block xsl:use-attribute-sets="formula-style">
3826
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
3827
+ <xsl:apply-templates/>
3828
+ </fo:block>
3829
+ </fo:block>
3683
3830
  </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
3684
3831
 
3685
3832
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
@@ -4625,12 +4772,140 @@
4625
4772
  </fo:block-container>
4626
4773
  </fo:block-container>
4627
4774
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
4628
- <xsl:variable name="text">
4775
+ <xsl:choose>
4776
+ <xsl:when test="normalize-space($syntax-highlight) = 'true' and normalize-space(../@lang) != ''"> <!-- condition for turn on of highlighting -->
4777
+ <xsl:variable name="syntax" select="java:org.metanorma.fop.Util.syntaxHighlight(., ../@lang)"/>
4778
+ <xsl:choose>
4779
+ <xsl:when test="normalize-space($syntax) != ''"><!-- if there is highlighted result -->
4780
+ <xsl:apply-templates select="xalan:nodeset($syntax)" mode="syntax_highlight"/> <!-- process span tags -->
4781
+ </xsl:when>
4782
+ <xsl:otherwise> <!-- if case of non-succesfull syntax highlight (for instance, unknown lang), process without highlighting -->
4783
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4784
+ </xsl:otherwise>
4785
+ </xsl:choose>
4786
+ </xsl:when>
4787
+ <xsl:otherwise>
4788
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4789
+ </xsl:otherwise>
4790
+ </xsl:choose>
4791
+
4792
+ </xsl:template><xsl:template name="add_spaces_to_sourcecode">
4793
+ <xsl:variable name="text_step1">
4629
4794
  <xsl:call-template name="add-zero-spaces-equal"/>
4630
4795
  </xsl:variable>
4631
- <xsl:call-template name="add-zero-spaces-java">
4632
- <xsl:with-param name="text" select="$text"/>
4633
- </xsl:call-template>
4796
+ <xsl:variable name="text_step2">
4797
+ <xsl:call-template name="add-zero-spaces-java">
4798
+ <xsl:with-param name="text" select="$text_step1"/>
4799
+ </xsl:call-template>
4800
+ </xsl:variable>
4801
+ <xsl:value-of select="$text_step2"/>
4802
+ </xsl:template><xsl:template match="*" mode="syntax_highlight">
4803
+ <xsl:apply-templates mode="syntax_highlight"/>
4804
+ </xsl:template><xsl:variable name="syntax_highlight_styles_">
4805
+ <style class="hljs-addition" xsl:use-attribute-sets="hljs-addition"/>
4806
+ <style class="hljs-attr" xsl:use-attribute-sets="hljs-attr"/>
4807
+ <style class="hljs-attribute" xsl:use-attribute-sets="hljs-attribute"/>
4808
+ <style class="hljs-built_in" xsl:use-attribute-sets="hljs-built_in"/>
4809
+ <style class="hljs-bullet" xsl:use-attribute-sets="hljs-bullet"/>
4810
+ <style class="hljs-char_and_escape_" xsl:use-attribute-sets="hljs-char_and_escape_"/>
4811
+ <style class="hljs-code" xsl:use-attribute-sets="hljs-code"/>
4812
+ <style class="hljs-comment" xsl:use-attribute-sets="hljs-comment"/>
4813
+ <style class="hljs-deletion" xsl:use-attribute-sets="hljs-deletion"/>
4814
+ <style class="hljs-doctag" xsl:use-attribute-sets="hljs-doctag"/>
4815
+ <style class="hljs-emphasis" xsl:use-attribute-sets="hljs-emphasis"/>
4816
+ <style class="hljs-formula" xsl:use-attribute-sets="hljs-formula"/>
4817
+ <style class="hljs-keyword" xsl:use-attribute-sets="hljs-keyword"/>
4818
+ <style class="hljs-link" xsl:use-attribute-sets="hljs-link"/>
4819
+ <style class="hljs-literal" xsl:use-attribute-sets="hljs-literal"/>
4820
+ <style class="hljs-meta" xsl:use-attribute-sets="hljs-meta"/>
4821
+ <style class="hljs-meta_hljs-string" xsl:use-attribute-sets="hljs-meta_hljs-string"/>
4822
+ <style class="hljs-meta_hljs-keyword" xsl:use-attribute-sets="hljs-meta_hljs-keyword"/>
4823
+ <style class="hljs-name" xsl:use-attribute-sets="hljs-name"/>
4824
+ <style class="hljs-number" xsl:use-attribute-sets="hljs-number"/>
4825
+ <style class="hljs-operator" xsl:use-attribute-sets="hljs-operator"/>
4826
+ <style class="hljs-params" xsl:use-attribute-sets="hljs-params"/>
4827
+ <style class="hljs-property" xsl:use-attribute-sets="hljs-property"/>
4828
+ <style class="hljs-punctuation" xsl:use-attribute-sets="hljs-punctuation"/>
4829
+ <style class="hljs-quote" xsl:use-attribute-sets="hljs-quote"/>
4830
+ <style class="hljs-regexp" xsl:use-attribute-sets="hljs-regexp"/>
4831
+ <style class="hljs-section" xsl:use-attribute-sets="hljs-section"/>
4832
+ <style class="hljs-selector-attr" xsl:use-attribute-sets="hljs-selector-attr"/>
4833
+ <style class="hljs-selector-class" xsl:use-attribute-sets="hljs-selector-class"/>
4834
+ <style class="hljs-selector-id" xsl:use-attribute-sets="hljs-selector-id"/>
4835
+ <style class="hljs-selector-pseudo" xsl:use-attribute-sets="hljs-selector-pseudo"/>
4836
+ <style class="hljs-selector-tag" xsl:use-attribute-sets="hljs-selector-tag"/>
4837
+ <style class="hljs-string" xsl:use-attribute-sets="hljs-string"/>
4838
+ <style class="hljs-strong" xsl:use-attribute-sets="hljs-strong"/>
4839
+ <style class="hljs-subst" xsl:use-attribute-sets="hljs-subst"/>
4840
+ <style class="hljs-symbol" xsl:use-attribute-sets="hljs-symbol"/>
4841
+ <style class="hljs-tag" xsl:use-attribute-sets="hljs-tag"/>
4842
+ <!-- <style class="hljs-tag_hljs-attr" xsl:use-attribute-sets="hljs-tag_hljs-attr"></style> -->
4843
+ <!-- <style class="hljs-tag_hljs-name" xsl:use-attribute-sets="hljs-tag_hljs-name"></style> -->
4844
+ <style class="hljs-template-tag" xsl:use-attribute-sets="hljs-template-tag"/>
4845
+ <style class="hljs-template-variable" xsl:use-attribute-sets="hljs-template-variable"/>
4846
+ <style class="hljs-title" xsl:use-attribute-sets="hljs-title"/>
4847
+ <style class="hljs-title_and_class_" xsl:use-attribute-sets="hljs-title_and_class_"/>
4848
+ <style class="hljs-title_and_class__and_inherited__" xsl:use-attribute-sets="hljs-title_and_class__and_inherited__"/>
4849
+ <style class="hljs-title_and_function_" xsl:use-attribute-sets="hljs-title_and_function_"/>
4850
+ <style class="hljs-type" xsl:use-attribute-sets="hljs-type"/>
4851
+ <style class="hljs-variable" xsl:use-attribute-sets="hljs-variable"/>
4852
+ <style class="hljs-variable_and_language_" xsl:use-attribute-sets="hljs-variable_and_language_"/>
4853
+ </xsl:variable><xsl:variable name="syntax_highlight_styles" select="xalan:nodeset($syntax_highlight_styles_)"/><xsl:template match="span" mode="syntax_highlight" priority="2">
4854
+ <!-- <fo:inline color="green" font-style="italic"><xsl:apply-templates mode="syntax_highlight"/></fo:inline> -->
4855
+ <fo:inline>
4856
+ <xsl:variable name="classes_">
4857
+ <xsl:call-template name="split">
4858
+ <xsl:with-param name="pText" select="@class"/>
4859
+ <xsl:with-param name="sep" select="' '"/>
4860
+ </xsl:call-template>
4861
+ <!-- a few classes together (_and_ suffix) -->
4862
+ <xsl:if test="contains(@class, 'hljs-char') and contains(@class, 'escape_')">
4863
+ <item>hljs-char_and_escape_</item>
4864
+ </xsl:if>
4865
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_')">
4866
+ <item>hljs-title_and_class_</item>
4867
+ </xsl:if>
4868
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_') and contains(@class, 'inherited__')">
4869
+ <item>hljs-title_and_class__and_inherited__</item>
4870
+ </xsl:if>
4871
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'function_')">
4872
+ <item>hljs-title_and_function_</item>
4873
+ </xsl:if>
4874
+ <xsl:if test="contains(@class, 'hljs-variable') and contains(@class, 'language_')">
4875
+ <item>hljs-variable_and_language_</item>
4876
+ </xsl:if>
4877
+ <!-- with parent classes (_ suffix) -->
4878
+ <xsl:if test="contains(@class, 'hljs-keyword') and contains(ancestor::*/@class, 'hljs-meta')">
4879
+ <item>hljs-meta_hljs-keyword</item>
4880
+ </xsl:if>
4881
+ <xsl:if test="contains(@class, 'hljs-string') and contains(ancestor::*/@class, 'hljs-meta')">
4882
+ <item>hljs-meta_hljs-string</item>
4883
+ </xsl:if>
4884
+ </xsl:variable>
4885
+ <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
4886
+
4887
+ <xsl:for-each select="$classes/item">
4888
+ <xsl:variable name="class_name" select="."/>
4889
+ <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
4890
+ <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
4891
+ </xsl:for-each>
4892
+ </xsl:for-each>
4893
+
4894
+ <!-- <xsl:variable name="class_name">
4895
+ <xsl:choose>
4896
+ <xsl:when test="@class = 'hljs-attr' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-attr</xsl:when>
4897
+ <xsl:when test="@class = 'hljs-name' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-name</xsl:when>
4898
+ <xsl:when test="@class = 'hljs-string' and ancestor::*/@class = 'hljs-meta'">hljs-meta_hljs-string</xsl:when>
4899
+ <xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
4900
+ </xsl:choose>
4901
+ </xsl:variable>
4902
+ <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
4903
+ <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
4904
+ </xsl:for-each> -->
4905
+
4906
+ <xsl:apply-templates mode="syntax_highlight"/></fo:inline>
4907
+ </xsl:template><xsl:template match="text()" mode="syntax_highlight" priority="2">
4908
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4634
4909
  </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
4635
4910
  <xsl:if test="normalize-space() != ''">
4636
4911
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
@@ -5001,11 +5276,14 @@
5001
5276
 
5002
5277
 
5003
5278
  <fo:block-container margin-left="0mm">
5004
-
5005
- <fo:block xsl:use-attribute-sets="quote-style">
5279
+ <fo:block-container xsl:use-attribute-sets="quote-style">
5006
5280
 
5007
- <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5008
- </fo:block>
5281
+ <fo:block-container margin-left="0mm" margin-right="0mm">
5282
+ <fo:block role="BlockQuote">
5283
+ <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5284
+ </fo:block>
5285
+ </fo:block-container>
5286
+ </fo:block-container>
5009
5287
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
5010
5288
  <fo:block xsl:use-attribute-sets="quote-source-style">
5011
5289
  <!-- — ISO, ISO 7301:2011, Clause 1 -->
@@ -5154,6 +5432,36 @@
5154
5432
  <xsl:with-param name="count" select="$count - 1"/>
5155
5433
  </xsl:call-template>
5156
5434
  </xsl:if>
5435
+ </xsl:template><xsl:template match="*[local-name() = 'preferred']">
5436
+ <xsl:variable name="level">
5437
+ <xsl:call-template name="getLevel"/>
5438
+ </xsl:variable>
5439
+ <xsl:variable name="font-size">
5440
+
5441
+ <xsl:choose>
5442
+ <xsl:when test="$level &gt;= 3">11pt</xsl:when>
5443
+ <xsl:otherwise>12pt</xsl:otherwise>
5444
+ </xsl:choose>
5445
+
5446
+ </xsl:variable>
5447
+ <xsl:variable name="levelTerm">
5448
+ <xsl:call-template name="getLevelTermName"/>
5449
+ </xsl:variable>
5450
+ <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
5451
+
5452
+
5453
+
5454
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
5455
+ <fo:block xsl:use-attribute-sets="term-name-style">
5456
+ <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
5457
+ </fo:block>
5458
+ </xsl:if>
5459
+
5460
+ <fo:block xsl:use-attribute-sets="preferred-term-style">
5461
+ <xsl:call-template name="setStyle_preferred"/>
5462
+ <xsl:apply-templates/>
5463
+ </fo:block>
5464
+ </fo:block>
5157
5465
  </xsl:template><xsl:template match="*[local-name() = 'domain']">
5158
5466
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
5159
5467
  <xsl:text> </xsl:text>
@@ -5242,24 +5550,8 @@
5242
5550
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5243
5551
  </xsl:template><xsl:variable name="ul_labels_">
5244
5552
 
5245
-
5246
-
5247
-
5248
- <label>—</label> <!-- em dash -->
5249
-
5250
-
5251
-
5252
-
5253
-
5254
-
5255
-
5256
-
5257
-
5258
-
5259
-
5260
-
5261
-
5262
-
5553
+ <label>—</label> <!-- em dash -->
5554
+
5263
5555
  </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5264
5556
  <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5265
5557
  <xsl:variable name="list_level">
@@ -5285,6 +5577,91 @@
5285
5577
  </xsl:template><xsl:template match="label" mode="ul_labels">
5286
5578
  <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5287
5579
  <xsl:value-of select="."/>
5580
+ </xsl:template><xsl:template name="getListItemFormat">
5581
+ <!-- Example: for BSI <?list-type loweralpha?> -->
5582
+ <xsl:variable name="processing_instruction_type" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-type'))"/>
5583
+ <xsl:choose>
5584
+ <xsl:when test="local-name(..) = 'ul'">
5585
+ <xsl:choose>
5586
+ <xsl:when test="normalize-space($processing_instruction_type) = 'simple'"/>
5587
+ <xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
5588
+ </xsl:choose>
5589
+ </xsl:when>
5590
+ <xsl:otherwise> <!-- for ordered lists 'ol' -->
5591
+
5592
+ <!-- Example: for BSI <?list-start 2?> -->
5593
+ <xsl:variable name="processing_instruction_start" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-start'))"/>
5594
+
5595
+ <xsl:variable name="start_value">
5596
+ <xsl:choose>
5597
+ <xsl:when test="normalize-space($processing_instruction_start) != ''">
5598
+ <xsl:value-of select="number($processing_instruction_start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
5599
+ </xsl:when>
5600
+ <xsl:when test="normalize-space(../@start) != ''">
5601
+ <xsl:value-of select="number(../@start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
5602
+ </xsl:when>
5603
+ <xsl:otherwise>0</xsl:otherwise>
5604
+ </xsl:choose>
5605
+ </xsl:variable>
5606
+
5607
+ <xsl:variable name="curr_value"><xsl:number/></xsl:variable>
5608
+
5609
+ <xsl:variable name="type">
5610
+ <xsl:choose>
5611
+ <xsl:when test="normalize-space($processing_instruction_type) != ''"><xsl:value-of select="$processing_instruction_type"/></xsl:when>
5612
+ <xsl:when test="normalize-space(../@type) != ''"><xsl:value-of select="../@type"/></xsl:when>
5613
+
5614
+ <xsl:otherwise> <!-- if no @type or @class = 'steps' -->
5615
+
5616
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5617
+ <xsl:variable name="list_level">
5618
+ <xsl:choose>
5619
+ <xsl:when test="$list_level_ &lt;= 5"><xsl:value-of select="$list_level_"/></xsl:when>
5620
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 5"/></xsl:otherwise>
5621
+ </xsl:choose>
5622
+ </xsl:variable>
5623
+
5624
+ <xsl:choose>
5625
+ <xsl:when test="$list_level mod 5 = 0">roman_upper</xsl:when> <!-- level 5 -->
5626
+ <xsl:when test="$list_level mod 4 = 0">alphabet_upper</xsl:when> <!-- level 4 -->
5627
+ <xsl:when test="$list_level mod 3 = 0">roman</xsl:when> <!-- level 3 -->
5628
+ <xsl:when test="$list_level mod 2 = 0 and ancestor::*/@class = 'steps'">alphabet</xsl:when> <!-- level 2 and @class = 'steps'-->
5629
+ <xsl:when test="$list_level mod 2 = 0">arabic</xsl:when> <!-- level 2 -->
5630
+ <xsl:otherwise> <!-- level 1 -->
5631
+ <xsl:choose>
5632
+ <xsl:when test="ancestor::*/@class = 'steps'">arabic</xsl:when>
5633
+ <xsl:otherwise>alphabet</xsl:otherwise>
5634
+ </xsl:choose>
5635
+ </xsl:otherwise>
5636
+ </xsl:choose>
5637
+
5638
+ </xsl:otherwise>
5639
+ </xsl:choose>
5640
+ </xsl:variable>
5641
+
5642
+ <xsl:variable name="format">
5643
+ <xsl:choose>
5644
+ <xsl:when test="$type = 'arabic'">
5645
+ 1)
5646
+ </xsl:when>
5647
+ <xsl:when test="$type = 'alphabet'">
5648
+ a)
5649
+ </xsl:when>
5650
+ <xsl:when test="$type = 'alphabet_upper'">
5651
+ A.
5652
+ </xsl:when>
5653
+ <xsl:when test="$type = 'roman'">
5654
+ i)
5655
+ </xsl:when>
5656
+ <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
5657
+ <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
5658
+ </xsl:choose>
5659
+ </xsl:variable>
5660
+
5661
+ <xsl:number value="$start_value + $curr_value" format="{normalize-space($format)}" lang="en"/>
5662
+
5663
+ </xsl:otherwise>
5664
+ </xsl:choose>
5288
5665
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5289
5666
  <xsl:choose>
5290
5667
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5300,18 +5677,70 @@
5300
5677
 
5301
5678
  <fo:block-container margin-left="0mm">
5302
5679
  <fo:block>
5303
- <xsl:apply-templates select="." mode="ul_ol"/>
5680
+ <xsl:apply-templates select="." mode="list"/>
5304
5681
  </fo:block>
5305
5682
  </fo:block-container>
5306
5683
  </fo:block-container>
5307
5684
  </xsl:when>
5308
5685
  <xsl:otherwise>
5309
5686
  <fo:block>
5310
- <xsl:apply-templates select="." mode="ul_ol"/>
5687
+ <xsl:apply-templates select="." mode="list"/>
5311
5688
  </fo:block>
5312
5689
  </xsl:otherwise>
5313
5690
  </xsl:choose>
5314
- </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
5691
+ </xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
5692
+ <fo:list-block xsl:use-attribute-sets="list-style">
5693
+
5694
+
5695
+ <xsl:if test="ancestor::csd:ol">
5696
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
5697
+ </xsl:if>
5698
+
5699
+
5700
+
5701
+
5702
+
5703
+
5704
+
5705
+
5706
+ <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
5707
+ </fo:list-block>
5708
+ <!-- <xsl:for-each select="./iho:note">
5709
+ <xsl:call-template name="note"/>
5710
+ </xsl:for-each> -->
5711
+ <xsl:apply-templates select="./*[local-name() = 'note']"/>
5712
+ </xsl:template><xsl:template match="*[local-name()='li']">
5713
+ <fo:list-item xsl:use-attribute-sets="list-item-style">
5714
+ <xsl:copy-of select="@id"/>
5715
+
5716
+
5717
+
5718
+ <fo:list-item-label end-indent="label-end()">
5719
+ <fo:block xsl:use-attribute-sets="list-item-label-style">
5720
+
5721
+
5722
+
5723
+ <xsl:call-template name="getListItemFormat"/>
5724
+ </fo:block>
5725
+ </fo:list-item-label>
5726
+ <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
5727
+ <fo:block>
5728
+
5729
+
5730
+
5731
+
5732
+
5733
+ <xsl:apply-templates/>
5734
+
5735
+ <!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
5736
+
5737
+ <xsl:for-each select="./bsi:note">
5738
+ <xsl:call-template name="note"/>
5739
+ </xsl:for-each> -->
5740
+ </fo:block>
5741
+ </fo:list-item-body>
5742
+ </fo:list-item>
5743
+ </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="bookmark_in_fn">
5315
5744
  <xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
5316
5745
  <bookmark><xsl:value-of select="@id"/></bookmark>
5317
5746
  </xsl:for-each>
@@ -5333,7 +5762,7 @@
5333
5762
  <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
5334
5763
  <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
5335
5764
  <xsl:if test="@to">
5336
- <xsl:value-of select="$dash"/>
5765
+ <xsl:value-of select="$en_dash"/>
5337
5766
  <xsl:copy>
5338
5767
  <xsl:copy-of select="@*"/>
5339
5768
  <xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
@@ -5358,7 +5787,7 @@
5358
5787
  <xsl:param name="target"/>
5359
5788
  <!-- <node></node> -->
5360
5789
  <xsl:choose>
5361
- <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
5790
+ <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $en_dash) and $remove = 'true'">
5362
5791
  <!-- skip text (i.e. remove it) and process next element -->
5363
5792
  <!-- [removed_<xsl:value-of select="."/>] -->
5364
5793
  <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
@@ -5442,12 +5871,22 @@
5442
5871
  </xsl:variable>
5443
5872
  <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
5444
5873
  <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
5874
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
5875
+ <fo:block xsl:use-attribute-sets="indexsect-title-style">
5876
+ <!-- Index -->
5877
+ <xsl:apply-templates/>
5878
+ </fo:block>
5879
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']/*[local-name() = 'title']" priority="4">
5880
+ <!-- Letter A, B, C, ... -->
5881
+ <fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
5882
+ <xsl:apply-templates/>
5883
+ </fo:block>
5445
5884
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
5446
5885
  <xsl:apply-templates/>
5447
5886
  <fo:block>
5448
- <xsl:if test="following-sibling::*[local-name() = 'clause']">
5449
- <fo:block> </fo:block>
5450
- </xsl:if>
5887
+ <xsl:if test="following-sibling::*[local-name() = 'clause']">
5888
+ <fo:block> </fo:block>
5889
+ </xsl:if>
5451
5890
  </fo:block>
5452
5891
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
5453
5892
  <xsl:apply-templates/>
@@ -5457,6 +5896,9 @@
5457
5896
 
5458
5897
  <xsl:apply-templates/>
5459
5898
  </fo:block>
5899
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
5900
+ <!-- to split by '_' and other chars -->
5901
+ <xsl:call-template name="add-zero-spaces-java"/>
5460
5902
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
5461
5903
  <fo:inline id="{@id}" font-size="1pt"/>
5462
5904
  </xsl:template><xsl:template match="*[local-name() = 'errata']">
@@ -5796,7 +6238,7 @@
5796
6238
  </fo:table-body>
5797
6239
  </fo:table>
5798
6240
  </fo:block>
5799
- </xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
6241
+ </xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']" priority="2">
5800
6242
  <fo:table-row min-height="5mm">
5801
6243
  <xsl:apply-templates/>
5802
6244
  </fo:table-row>
@@ -6023,9 +6465,6 @@
6023
6465
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
6024
6466
  </xsl:choose>
6025
6467
  </xsl:template><xsl:template name="addPDFUAmeta">
6026
- <xsl:variable name="lang">
6027
- <xsl:call-template name="getLang"/>
6028
- </xsl:variable>
6029
6468
  <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
6030
6469
  <pdf:dictionary type="normal" key="ViewerPreferences">
6031
6470
  <pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
@@ -6253,10 +6692,12 @@
6253
6692
  <xsl:param name="key"/>
6254
6693
  <xsl:param name="formatted">false</xsl:param>
6255
6694
  <xsl:param name="lang"/>
6695
+ <xsl:param name="returnEmptyIfNotFound">false</xsl:param>
6256
6696
 
6257
6697
  <xsl:variable name="curr_lang">
6258
6698
  <xsl:choose>
6259
6699
  <xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
6700
+ <xsl:when test="$returnEmptyIfNotFound = 'true'"/>
6260
6701
  <xsl:otherwise>
6261
6702
  <xsl:call-template name="getLang"/>
6262
6703
  </xsl:otherwise>
@@ -6291,6 +6732,7 @@
6291
6732
  </xsl:otherwise>
6292
6733
  </xsl:choose>
6293
6734
  </xsl:when>
6735
+ <xsl:when test="$returnEmptyIfNotFound = 'true'"/>
6294
6736
  <xsl:otherwise>
6295
6737
  <xsl:variable name="key_">
6296
6738
  <xsl:call-template name="capitalize">
@@ -787,8 +787,7 @@ div.example p.MsoListParagraph {
787
787
  font-size: {{smallerfontsize}}; }
788
788
 
789
789
  div.Note p.MsoListParagraph {
790
- font-size: {{smallerfontsize}};
791
- margin-left: 1.0cm; }
790
+ font-size: {{smallerfontsize}}; }
792
791
 
793
792
  div.Note span.stem {
794
793
  font-size: {{smallerfontsize}}; }
@@ -747,7 +747,6 @@ div.example p.MsoListParagraph {
747
747
 
748
748
  div.Note p.MsoListParagraph {
749
749
  font-size: $smallerfontsize;
750
- margin-left: 1.0cm;
751
750
  }
752
751
 
753
752
  div.Note span.stem {
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
@@ -209,9 +209,6 @@
209
209
  <zeroOrMore>
210
210
  <ref name="contact"/>
211
211
  </zeroOrMore>
212
- <zeroOrMore>
213
- <ref name="uri"/>
214
- </zeroOrMore>
215
212
  </element>
216
213
  </define>
217
214
  <define name="fullname">
@@ -828,6 +825,11 @@
828
825
  <optional>
829
826
  <attribute name="scope"/>
830
827
  </optional>
828
+ <optional>
829
+ <attribute name="primary">
830
+ <data type="boolean"/>
831
+ </attribute>
832
+ </optional>
831
833
  <text/>
832
834
  </element>
833
835
  </define>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "2.0.2".freeze
3
+ VERSION = "2.0.3".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-cc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 2.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-01-22 00:00:00.000000000 Z
11
+ date: 2022-02-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic