metanorma-cc 1.5.4 → 1.5.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/cc/isodoc.rng +0 -1
- data/lib/isodoc/cc/csd.standard.xsl +260 -44
- data/lib/isodoc/cc/html/_coverpage.css +1 -1
- data/lib/isodoc/cc/html/htmlstyle.css +2 -2
- data/lib/metanorma/cc/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: 941c50863de4016c3c72a513676f9e955e9afa7caf0bf09cfb01dc2176041e2f
|
4
|
+
data.tar.gz: 84c80743bd6df2db228c5289f6b95f174f2242c9747e5aed127bd77685c687c0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 976210e1d2c6308cb2206a234a194d11f63b4b5924fc65e4e36461fe7417b978983a76909a3427bf25fd069fc6f56aebb16b2bdbf8740bbf30976bfc45ca826a
|
7
|
+
data.tar.gz: 89f6d272ce0827c1f083fe4c774be2b93f01cbc534b69e769f711832088a83740d35e2dcd91d4363d55e170950c585804def03825c1db4fcd23690647afaac97
|
@@ -37,7 +37,7 @@
|
|
37
37
|
|
38
38
|
<xsl:template match="/">
|
39
39
|
<xsl:call-template name="namespaceCheck"/>
|
40
|
-
<fo:root font-family="SourceSansPro,
|
40
|
+
<fo:root font-family="SourceSansPro, STIX Two Math, HanSans" font-size="10.5pt" xml:lang="{$lang}">
|
41
41
|
<fo:layout-master-set>
|
42
42
|
<!-- Cover page -->
|
43
43
|
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
@@ -828,7 +828,12 @@
|
|
828
828
|
|
829
829
|
|
830
830
|
</title-toc>
|
831
|
-
<title-toc lang="fr">
|
831
|
+
<title-toc lang="fr">
|
832
|
+
|
833
|
+
<xsl:text>Sommaire</xsl:text>
|
834
|
+
|
835
|
+
|
836
|
+
</title-toc>
|
832
837
|
|
833
838
|
<title-toc lang="zh">Contents</title-toc>
|
834
839
|
|
@@ -916,10 +921,19 @@
|
|
916
921
|
|
917
922
|
</xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
|
918
923
|
<xsl:param name="name"/>
|
919
|
-
<xsl:
|
920
|
-
|
924
|
+
<xsl:param name="lang"/>
|
925
|
+
<xsl:variable name="lang_">
|
926
|
+
<xsl:choose>
|
927
|
+
<xsl:when test="$lang != ''">
|
928
|
+
<xsl:value-of select="$lang"/>
|
929
|
+
</xsl:when>
|
930
|
+
<xsl:otherwise>
|
931
|
+
<xsl:call-template name="getLang"/>
|
932
|
+
</xsl:otherwise>
|
933
|
+
</xsl:choose>
|
921
934
|
</xsl:variable>
|
922
|
-
<xsl:variable name="
|
935
|
+
<xsl:variable name="language" select="normalize-space($lang_)"/>
|
936
|
+
<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
|
923
937
|
<xsl:choose>
|
924
938
|
<xsl:when test="normalize-space($title_) != ''">
|
925
939
|
<xsl:value-of select="$title_"/>
|
@@ -1069,6 +1083,7 @@
|
|
1069
1083
|
|
1070
1084
|
|
1071
1085
|
|
1086
|
+
|
1072
1087
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1073
1088
|
|
1074
1089
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -1312,6 +1327,8 @@
|
|
1312
1327
|
|
1313
1328
|
|
1314
1329
|
|
1330
|
+
|
1331
|
+
|
1315
1332
|
<!-- $namespace = 'iso' or -->
|
1316
1333
|
|
1317
1334
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -1349,6 +1366,7 @@
|
|
1349
1366
|
<xsl:with-param name="table" select="$simple-table"/>
|
1350
1367
|
</xsl:call-template>
|
1351
1368
|
</xsl:variable>
|
1369
|
+
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
1352
1370
|
|
1353
1371
|
<!-- <xsl:variable name="colwidths2">
|
1354
1372
|
<xsl:call-template name="calculate-column-widths">
|
@@ -1369,30 +1387,52 @@
|
|
1369
1387
|
|
1370
1388
|
<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
|
1371
1389
|
|
1390
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1372
1391
|
|
1373
1392
|
|
1393
|
+
|
1394
|
+
|
1395
|
+
|
1374
1396
|
|
1375
1397
|
|
1376
|
-
|
1398
|
+
|
1377
1399
|
|
1378
1400
|
|
1379
1401
|
|
1380
|
-
|
1381
|
-
|
1382
|
-
|
1383
|
-
|
1384
|
-
|
1385
|
-
|
1386
|
-
|
1402
|
+
|
1403
|
+
|
1404
|
+
|
1405
|
+
|
1406
|
+
<xsl:variable name="table_attributes">
|
1407
|
+
<attribute name="table-layout">fixed</attribute>
|
1408
|
+
<attribute name="width">100%</attribute>
|
1409
|
+
<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1410
|
+
<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1387
1411
|
|
1388
1412
|
|
1389
1413
|
|
1390
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1391
1414
|
|
1415
|
+
|
1416
|
+
|
1417
|
+
|
1392
1418
|
|
1419
|
+
|
1393
1420
|
|
1421
|
+
</xsl:variable>
|
1422
|
+
|
1423
|
+
|
1424
|
+
<fo:table id="{@id}" table-omit-footer-at-break="true">
|
1394
1425
|
|
1426
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1427
|
+
<xsl:attribute name="{@name}">
|
1428
|
+
<xsl:value-of select="."/>
|
1429
|
+
</xsl:attribute>
|
1430
|
+
</xsl:for-each>
|
1395
1431
|
|
1432
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1433
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1434
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
1435
|
+
</xsl:if>
|
1396
1436
|
|
1397
1437
|
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1398
1438
|
<xsl:choose>
|
@@ -1416,6 +1456,33 @@
|
|
1416
1456
|
|
1417
1457
|
</fo:table>
|
1418
1458
|
|
1459
|
+
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
1460
|
+
<xsl:call-template name="insertTableFooterInSeparateTable">
|
1461
|
+
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
1462
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
1463
|
+
</xsl:call-template>
|
1464
|
+
</xsl:for-each>
|
1465
|
+
|
1466
|
+
<!-- insert footer as table -->
|
1467
|
+
<!-- <fo:table>
|
1468
|
+
<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
|
1469
|
+
<xsl:attribute name="{@name}">
|
1470
|
+
<xsl:value-of select="."/>
|
1471
|
+
</xsl:attribute>
|
1472
|
+
</xsl:for-each>
|
1473
|
+
|
1474
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1475
|
+
<xsl:choose>
|
1476
|
+
<xsl:when test=". = 1 or . = 0">
|
1477
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1478
|
+
</xsl:when>
|
1479
|
+
<xsl:otherwise>
|
1480
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1481
|
+
</xsl:otherwise>
|
1482
|
+
</xsl:choose>
|
1483
|
+
</xsl:for-each>
|
1484
|
+
</fo:table>-->
|
1485
|
+
|
1419
1486
|
|
1420
1487
|
|
1421
1488
|
|
@@ -1480,6 +1547,13 @@
|
|
1480
1547
|
<xsl:for-each select="xalan:nodeset($table)//tr">
|
1481
1548
|
<xsl:variable name="td_text">
|
1482
1549
|
<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
|
1550
|
+
|
1551
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1552
|
+
<xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
|
1553
|
+
<word><xsl:value-of select="normalize-space(.)"/></word>
|
1554
|
+
</xsl:for-each>
|
1555
|
+
</xsl:if> -->
|
1556
|
+
|
1483
1557
|
</xsl:variable>
|
1484
1558
|
<xsl:variable name="words">
|
1485
1559
|
<xsl:variable name="string_with_added_zerospaces">
|
@@ -1539,11 +1613,14 @@
|
|
1539
1613
|
<xsl:value-of select="*[local-name()='origin']/@citeas"/>
|
1540
1614
|
</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
|
1541
1615
|
<xsl:value-of select="@target"/>
|
1616
|
+
</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
|
1617
|
+
<xsl:variable name="math_text" select="normalize-space(.)"/>
|
1618
|
+
<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
|
1542
1619
|
</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
|
1543
1620
|
<xsl:param name="cols-count"/>
|
1544
1621
|
<!-- font-weight="bold" -->
|
1545
1622
|
<fo:table-header>
|
1546
|
-
|
1623
|
+
|
1547
1624
|
<xsl:apply-templates/>
|
1548
1625
|
</fo:table-header>
|
1549
1626
|
</xsl:template><xsl:template name="table-header-title">
|
@@ -1568,6 +1645,13 @@
|
|
1568
1645
|
</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
|
1569
1646
|
<xsl:apply-templates/>
|
1570
1647
|
</xsl:template><xsl:template name="insertTableFooter">
|
1648
|
+
<xsl:param name="cols-count"/>
|
1649
|
+
<xsl:if test="../*[local-name()='tfoot']">
|
1650
|
+
<fo:table-footer>
|
1651
|
+
<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
|
1652
|
+
</fo:table-footer>
|
1653
|
+
</xsl:if>
|
1654
|
+
</xsl:template><xsl:template name="insertTableFooter2">
|
1571
1655
|
<xsl:param name="cols-count"/>
|
1572
1656
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1573
1657
|
<xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
|
@@ -1589,11 +1673,15 @@
|
|
1589
1673
|
<!-- fn will be processed inside 'note' processing -->
|
1590
1674
|
|
1591
1675
|
|
1592
|
-
|
1676
|
+
|
1677
|
+
<!-- except gb and bipm -->
|
1593
1678
|
|
1594
1679
|
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1595
1680
|
|
1596
1681
|
|
1682
|
+
|
1683
|
+
|
1684
|
+
|
1597
1685
|
<!-- horizontal row separator -->
|
1598
1686
|
|
1599
1687
|
|
@@ -1607,6 +1695,84 @@
|
|
1607
1695
|
</fo:table-footer>
|
1608
1696
|
|
1609
1697
|
</xsl:if>
|
1698
|
+
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
1699
|
+
<xsl:param name="table_attributes"/>
|
1700
|
+
<xsl:param name="colwidths"/>
|
1701
|
+
|
1702
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1703
|
+
|
1704
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1705
|
+
|
1706
|
+
<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
|
1707
|
+
|
1708
|
+
<fo:table keep-with-previous="always">
|
1709
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1710
|
+
<xsl:choose>
|
1711
|
+
<xsl:when test="@name = 'border-top'">
|
1712
|
+
<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
|
1713
|
+
</xsl:when>
|
1714
|
+
<xsl:when test="@name = 'border'">
|
1715
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
1716
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
1717
|
+
</xsl:when>
|
1718
|
+
<xsl:otherwise>
|
1719
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
1720
|
+
</xsl:otherwise>
|
1721
|
+
</xsl:choose>
|
1722
|
+
</xsl:for-each>
|
1723
|
+
|
1724
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1725
|
+
<xsl:choose>
|
1726
|
+
<xsl:when test=". = 1 or . = 0">
|
1727
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1728
|
+
</xsl:when>
|
1729
|
+
<xsl:otherwise>
|
1730
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1731
|
+
</xsl:otherwise>
|
1732
|
+
</xsl:choose>
|
1733
|
+
</xsl:for-each>
|
1734
|
+
|
1735
|
+
<fo:table-body>
|
1736
|
+
<fo:table-row>
|
1737
|
+
<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
|
1738
|
+
|
1739
|
+
|
1740
|
+
|
1741
|
+
<!-- fn will be processed inside 'note' processing -->
|
1742
|
+
|
1743
|
+
|
1744
|
+
|
1745
|
+
<!-- except gb and bipm -->
|
1746
|
+
|
1747
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1748
|
+
|
1749
|
+
|
1750
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1751
|
+
<xsl:choose>
|
1752
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
1753
|
+
show Note under table in preface (ex. abstract) sections
|
1754
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1755
|
+
</xsl:when>
|
1756
|
+
<xsl:otherwise>
|
1757
|
+
empty, because notes show at page side in main sections
|
1758
|
+
<fo:block/>
|
1759
|
+
</xsl:otherwise>
|
1760
|
+
</xsl:choose>
|
1761
|
+
</xsl:if> -->
|
1762
|
+
|
1763
|
+
|
1764
|
+
<!-- horizontal row separator -->
|
1765
|
+
|
1766
|
+
|
1767
|
+
<!-- fn processing -->
|
1768
|
+
<xsl:call-template name="fn_display"/>
|
1769
|
+
|
1770
|
+
</fo:table-cell>
|
1771
|
+
</fo:table-row>
|
1772
|
+
</fo:table-body>
|
1773
|
+
|
1774
|
+
</fo:table>
|
1775
|
+
</xsl:if>
|
1610
1776
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
1611
1777
|
|
1612
1778
|
<xsl:variable name="cols-count">
|
@@ -1659,8 +1825,8 @@
|
|
1659
1825
|
|
1660
1826
|
</xsl:if>
|
1661
1827
|
|
1662
|
-
|
1663
|
-
|
1828
|
+
|
1829
|
+
|
1664
1830
|
|
1665
1831
|
<xsl:apply-templates/>
|
1666
1832
|
</fo:table-row>
|
@@ -1684,6 +1850,7 @@
|
|
1684
1850
|
|
1685
1851
|
|
1686
1852
|
|
1853
|
+
|
1687
1854
|
<xsl:if test="@colspan">
|
1688
1855
|
<xsl:attribute name="number-columns-spanned">
|
1689
1856
|
<xsl:value-of select="@colspan"/>
|
@@ -1723,7 +1890,8 @@
|
|
1723
1890
|
|
1724
1891
|
|
1725
1892
|
|
1726
|
-
|
1893
|
+
|
1894
|
+
|
1727
1895
|
|
1728
1896
|
|
1729
1897
|
|
@@ -1753,14 +1921,17 @@
|
|
1753
1921
|
|
1754
1922
|
|
1755
1923
|
|
1924
|
+
|
1925
|
+
|
1756
1926
|
<fo:inline padding-right="2mm">
|
1757
1927
|
|
1758
1928
|
|
1759
1929
|
|
1760
|
-
|
1930
|
+
|
1761
1931
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
1762
1932
|
|
1763
1933
|
</fo:inline>
|
1934
|
+
|
1764
1935
|
<xsl:apply-templates mode="process"/>
|
1765
1936
|
</fo:block>
|
1766
1937
|
|
@@ -1784,6 +1955,7 @@
|
|
1784
1955
|
|
1785
1956
|
|
1786
1957
|
|
1958
|
+
|
1787
1959
|
<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
|
1788
1960
|
|
1789
1961
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
@@ -1793,12 +1965,15 @@
|
|
1793
1965
|
|
1794
1966
|
|
1795
1967
|
|
1968
|
+
|
1796
1969
|
<xsl:value-of select="@reference"/>
|
1797
1970
|
|
1971
|
+
|
1798
1972
|
</fo:inline>
|
1799
1973
|
<fo:inline>
|
1800
1974
|
|
1801
|
-
<xsl:apply-templates/>
|
1975
|
+
<!-- <xsl:apply-templates /> -->
|
1976
|
+
<xsl:copy-of select="./node()"/>
|
1802
1977
|
</fo:inline>
|
1803
1978
|
</fo:block>
|
1804
1979
|
</xsl:if>
|
@@ -1835,7 +2010,20 @@
|
|
1835
2010
|
<xsl:variable name="following_dl_colwidths">
|
1836
2011
|
<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
|
1837
2012
|
<xsl:variable name="html-table">
|
1838
|
-
<xsl:variable name="
|
2013
|
+
<xsl:variable name="doc_ns">
|
2014
|
+
|
2015
|
+
</xsl:variable>
|
2016
|
+
<xsl:variable name="ns">
|
2017
|
+
<xsl:choose>
|
2018
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2019
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2020
|
+
</xsl:when>
|
2021
|
+
<xsl:otherwise>
|
2022
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2023
|
+
</xsl:otherwise>
|
2024
|
+
</xsl:choose>
|
2025
|
+
</xsl:variable>
|
2026
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
1839
2027
|
<xsl:element name="{$ns}:table">
|
1840
2028
|
<xsl:for-each select="*[local-name() = 'dl'][1]">
|
1841
2029
|
<tbody>
|
@@ -1900,7 +2088,8 @@
|
|
1900
2088
|
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
1901
2089
|
</xsl:if>
|
1902
2090
|
|
1903
|
-
<xsl:apply-templates/>
|
2091
|
+
<!-- <xsl:apply-templates /> -->
|
2092
|
+
<xsl:copy-of select="./node()"/>
|
1904
2093
|
</fo:block>
|
1905
2094
|
</fo:table-cell>
|
1906
2095
|
</fo:table-row>
|
@@ -1919,9 +2108,12 @@
|
|
1919
2108
|
|
1920
2109
|
|
1921
2110
|
|
2111
|
+
|
1922
2112
|
<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
|
1923
2113
|
|
2114
|
+
|
1924
2115
|
<xsl:value-of select="@reference"/>
|
2116
|
+
|
1925
2117
|
</fo:basic-link>
|
1926
2118
|
</fo:inline>
|
1927
2119
|
</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
|
@@ -2019,7 +2211,20 @@
|
|
2019
2211
|
</xsl:choose>
|
2020
2212
|
<!-- create virtual html table for dl/[dt and dd] -->
|
2021
2213
|
<xsl:variable name="html-table">
|
2022
|
-
<xsl:variable name="
|
2214
|
+
<xsl:variable name="doc_ns">
|
2215
|
+
|
2216
|
+
</xsl:variable>
|
2217
|
+
<xsl:variable name="ns">
|
2218
|
+
<xsl:choose>
|
2219
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2220
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2221
|
+
</xsl:when>
|
2222
|
+
<xsl:otherwise>
|
2223
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2224
|
+
</xsl:otherwise>
|
2225
|
+
</xsl:choose>
|
2226
|
+
</xsl:variable>
|
2227
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2023
2228
|
<xsl:element name="{$ns}:table">
|
2024
2229
|
<tbody>
|
2025
2230
|
<xsl:apply-templates mode="dl"/>
|
@@ -2165,6 +2370,7 @@
|
|
2165
2370
|
|
2166
2371
|
|
2167
2372
|
|
2373
|
+
|
2168
2374
|
<xsl:apply-templates/>
|
2169
2375
|
<!-- <xsl:if test="$namespace = 'gb'">
|
2170
2376
|
<xsl:if test="ancestor::*[local-name()='formula']">
|
@@ -2231,18 +2437,18 @@
|
|
2231
2437
|
</xsl:template><xsl:template match="*[local-name()='tt']">
|
2232
2438
|
<fo:inline xsl:use-attribute-sets="tt-style">
|
2233
2439
|
<xsl:variable name="_font-size">
|
2234
|
-
|
2235
|
-
10
|
2236
|
-
|
2440
|
+
|
2441
|
+
10
|
2442
|
+
|
2443
|
+
|
2444
|
+
|
2237
2445
|
|
2238
2446
|
|
2239
2447
|
|
2240
2448
|
|
2241
2449
|
|
2242
2450
|
|
2243
|
-
|
2244
2451
|
|
2245
|
-
|
2246
2452
|
|
2247
2453
|
|
2248
2454
|
</xsl:variable>
|
@@ -2580,7 +2786,7 @@
|
|
2580
2786
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
|
2581
2787
|
<xsl:value-of select="substring($str, 2)"/>
|
2582
2788
|
</xsl:template><xsl:template match="mathml:math">
|
2583
|
-
<fo:inline font-family="
|
2789
|
+
<fo:inline font-family="STIX Two Math"> <!-- -->
|
2584
2790
|
<xsl:variable name="mathml">
|
2585
2791
|
<xsl:apply-templates select="." mode="mathml"/>
|
2586
2792
|
</xsl:variable>
|
@@ -2674,7 +2880,7 @@
|
|
2674
2880
|
<xsl:apply-templates/>
|
2675
2881
|
</xsl:template><xsl:template match="*[local-name() = 'xref']">
|
2676
2882
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
2677
|
-
|
2883
|
+
|
2678
2884
|
<xsl:apply-templates/>
|
2679
2885
|
</fo:basic-link>
|
2680
2886
|
</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
|
@@ -2880,18 +3086,9 @@
|
|
2880
3086
|
<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
|
2881
3087
|
<fo:bookmark-title>
|
2882
3088
|
<xsl:variable name="bookmark-title_">
|
2883
|
-
<xsl:
|
2884
|
-
<xsl:
|
2885
|
-
|
2886
|
-
|
2887
|
-
</xsl:when>
|
2888
|
-
<xsl:when test="@lang = 'fr'">
|
2889
|
-
|
2890
|
-
|
2891
|
-
</xsl:when>
|
2892
|
-
<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
|
2893
|
-
<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
|
2894
|
-
</xsl:choose>
|
3089
|
+
<xsl:call-template name="getLangVersion">
|
3090
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3091
|
+
</xsl:call-template>
|
2895
3092
|
</xsl:variable>
|
2896
3093
|
<xsl:choose>
|
2897
3094
|
<xsl:when test="normalize-space($bookmark-title_) != ''">
|
@@ -2933,6 +3130,20 @@
|
|
2933
3130
|
|
2934
3131
|
</fo:bookmark-tree>
|
2935
3132
|
</xsl:if>
|
3133
|
+
</xsl:template><xsl:template name="getLangVersion">
|
3134
|
+
<xsl:param name="lang"/>
|
3135
|
+
<xsl:choose>
|
3136
|
+
<xsl:when test="$lang = 'en'">
|
3137
|
+
|
3138
|
+
|
3139
|
+
</xsl:when>
|
3140
|
+
<xsl:when test="$lang = 'fr'">
|
3141
|
+
|
3142
|
+
|
3143
|
+
</xsl:when>
|
3144
|
+
<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
|
3145
|
+
<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
|
3146
|
+
</xsl:choose>
|
2936
3147
|
</xsl:template><xsl:template match="item" mode="bookmark">
|
2937
3148
|
<fo:bookmark internal-destination="{@id}" starting-state="hide">
|
2938
3149
|
<fo:bookmark-title>
|
@@ -2947,7 +3158,7 @@
|
|
2947
3158
|
</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
|
2948
3159
|
<xsl:if test="normalize-space() != ''">
|
2949
3160
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
2950
|
-
|
3161
|
+
|
2951
3162
|
<xsl:apply-templates/>
|
2952
3163
|
</fo:block>
|
2953
3164
|
</xsl:if>
|
@@ -3588,6 +3799,7 @@
|
|
3588
3799
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
3589
3800
|
<fo:block>
|
3590
3801
|
<xsl:call-template name="setId"/>
|
3802
|
+
|
3591
3803
|
<xsl:apply-templates/>
|
3592
3804
|
</fo:block>
|
3593
3805
|
</xsl:template><xsl:template match="*[local-name() = 'definitions']">
|
@@ -3623,6 +3835,7 @@
|
|
3623
3835
|
</xsl:choose>
|
3624
3836
|
</xsl:attribute>
|
3625
3837
|
|
3838
|
+
|
3626
3839
|
<fo:block-container margin-left="0mm">
|
3627
3840
|
<fo:block>
|
3628
3841
|
<xsl:apply-templates select="." mode="ul_ol"/>
|
@@ -3804,6 +4017,7 @@
|
|
3804
4017
|
<dc:title>
|
3805
4018
|
<xsl:variable name="title">
|
3806
4019
|
|
4020
|
+
|
3807
4021
|
|
3808
4022
|
<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en']"/>
|
3809
4023
|
|
@@ -3822,6 +4036,7 @@
|
|
3822
4036
|
<dc:creator>
|
3823
4037
|
|
3824
4038
|
|
4039
|
+
|
3825
4040
|
</dc:creator>
|
3826
4041
|
<dc:description>
|
3827
4042
|
<xsl:variable name="abstract">
|
@@ -3831,6 +4046,7 @@
|
|
3831
4046
|
|
3832
4047
|
|
3833
4048
|
|
4049
|
+
|
3834
4050
|
</xsl:variable>
|
3835
4051
|
<xsl:value-of select="normalize-space($abstract)"/>
|
3836
4052
|
</dc:description>
|
@@ -9,7 +9,7 @@ fieldset, form, label, legend,
|
|
9
9
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
10
10
|
article, aside, canvas, details, embed,
|
11
11
|
figure, figcaption, footer, header, hgroup,
|
12
|
-
menu,
|
12
|
+
menu, output, ruby, section, summary,
|
13
13
|
time, mark, audio, video {
|
14
14
|
margin: 0;
|
15
15
|
padding: 0; }
|
@@ -9,7 +9,7 @@ fieldset, form, label, legend,
|
|
9
9
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
10
10
|
article, aside, canvas, details, embed,
|
11
11
|
figure, figcaption, footer, header, hgroup,
|
12
|
-
menu,
|
12
|
+
menu, output, ruby, section, summary,
|
13
13
|
time, mark, audio, video {
|
14
14
|
margin: 0;
|
15
15
|
padding: 0; }
|
@@ -679,7 +679,7 @@ fieldset, form, label, legend,
|
|
679
679
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
680
680
|
article, aside, canvas, details, embed,
|
681
681
|
figure, figcaption, footer, header, hgroup,
|
682
|
-
menu,
|
682
|
+
menu, output, ruby, section, summary,
|
683
683
|
time, mark, audio, video {
|
684
684
|
margin: 0;
|
685
685
|
padding: 0; }
|
data/lib/metanorma/cc/version.rb
CHANGED
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: 1.5.
|
4
|
+
version: 1.5.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: 2020-
|
11
|
+
date: 2020-10-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-standoc
|