metanorma-ribose 1.6.4 → 1.6.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/ribose/isodoc.rng +0 -1
- data/lib/isodoc/ribose/html/html_rsd_titlepage.html +5 -2
- data/lib/isodoc/ribose/html/htmlstyle.css +1 -1
- data/lib/isodoc/ribose/html/word_rsd_titlepage.html +4 -4
- data/lib/isodoc/ribose/rsd.standard.xsl +258 -42
- 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: 76c92e3101791882684034ffa9ec62ee39a2838a14fdda750cb37f7272446e00
|
4
|
+
data.tar.gz: ff0e212e1398c0de4ef6afba3ef4c6c7af882f0ca1e8aec0b4f1a99796211a7c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bc8cbb2fbda9c61fe7def3e027bbd0af199cd93578fe5d07526993410181a060b926670d3fbf36099d2e9983295a59208582e99fb5859212560e13f195034d47
|
7
|
+
data.tar.gz: 5c52d881e32cbb5adda06fe28f2c96185cc0937e1fd0421a97f3e8c31ae385fdae956dd21a49ddd31368adbcffefc431994babed20c92ddb64fcc41b0341beb1
|
@@ -52,8 +52,11 @@
|
|
52
52
|
Published {{ publisheddate -}}
|
53
53
|
{%- endif -%}
|
54
54
|
{%- endif -%}</span></p>
|
55
|
-
{% if security %}
|
56
|
-
<p><span class="coverpage-maturity">Classification: {{
|
55
|
+
{% if metadata_extensions["security"] %}
|
56
|
+
<p><span class="coverpage-maturity">Classification: {{ metadata_extensions["security"] }}</span></p>
|
57
|
+
{% endif %}
|
58
|
+
{% if metadata_extensions["recipient"] %}
|
59
|
+
<p><span class="coverpage-maturity">Recipient: {{ metadata_extensions["recipient"] }}</span></p>
|
57
60
|
{% endif %}
|
58
61
|
</div>
|
59
62
|
|
@@ -16,7 +16,7 @@ fieldset, form, label, legend,
|
|
16
16
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
17
17
|
article, aside, canvas, details, embed,
|
18
18
|
figure, figcaption, footer, header, hgroup,
|
19
|
-
menu,
|
19
|
+
menu, output, ruby, section, summary,
|
20
20
|
time, mark, audio, video {
|
21
21
|
margin: 0;
|
22
22
|
padding: 0; }
|
@@ -54,16 +54,16 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
|
|
54
54
|
{{ revdate_MMMddyyyy || circulateddate }}</p>
|
55
55
|
{% endif %}
|
56
56
|
|
57
|
-
{% if security %}
|
57
|
+
{% if metadata_extensions["security"] %}
|
58
58
|
<p class="MsoNormal"> </p>
|
59
59
|
|
60
|
-
<p class="MsoNormal"><i> {{ security
|
60
|
+
<p class="MsoNormal"><i> {{ metadata_extensions["security"] }}</i></p>
|
61
61
|
{% endif %}
|
62
62
|
|
63
|
-
{% if recipient
|
63
|
+
{% if metadata_extensions["recipient"] %}
|
64
64
|
<p class="MsoNormal"> </p>
|
65
65
|
|
66
|
-
<p class="MsoNormal">Recipient: {{ recipient }}</p>
|
66
|
+
<p class="MsoNormal">Recipient: {{ metadata_extensions["recipient"] }}</p>
|
67
67
|
{% endif %}
|
68
68
|
|
69
69
|
<div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
|
@@ -55,7 +55,7 @@
|
|
55
55
|
|
56
56
|
<xsl:template match="/">
|
57
57
|
<xsl:call-template name="namespaceCheck"/>
|
58
|
-
<fo:root font-family="SourceSansPro-Light,
|
58
|
+
<fo:root font-family="SourceSansPro-Light, STIX Two Math" font-size="10.5pt" xml:lang="{$lang}">
|
59
59
|
<fo:layout-master-set>
|
60
60
|
|
61
61
|
<fo:simple-page-master master-name="odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
@@ -925,7 +925,12 @@
|
|
925
925
|
|
926
926
|
|
927
927
|
</title-toc>
|
928
|
-
<title-toc lang="fr">
|
928
|
+
<title-toc lang="fr">
|
929
|
+
|
930
|
+
<xsl:text>Sommaire</xsl:text>
|
931
|
+
|
932
|
+
|
933
|
+
</title-toc>
|
929
934
|
|
930
935
|
<title-toc lang="zh">Contents</title-toc>
|
931
936
|
|
@@ -1013,10 +1018,19 @@
|
|
1013
1018
|
|
1014
1019
|
</xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
|
1015
1020
|
<xsl:param name="name"/>
|
1016
|
-
<xsl:
|
1017
|
-
|
1021
|
+
<xsl:param name="lang"/>
|
1022
|
+
<xsl:variable name="lang_">
|
1023
|
+
<xsl:choose>
|
1024
|
+
<xsl:when test="$lang != ''">
|
1025
|
+
<xsl:value-of select="$lang"/>
|
1026
|
+
</xsl:when>
|
1027
|
+
<xsl:otherwise>
|
1028
|
+
<xsl:call-template name="getLang"/>
|
1029
|
+
</xsl:otherwise>
|
1030
|
+
</xsl:choose>
|
1018
1031
|
</xsl:variable>
|
1019
|
-
<xsl:variable name="
|
1032
|
+
<xsl:variable name="language" select="normalize-space($lang_)"/>
|
1033
|
+
<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
|
1020
1034
|
<xsl:choose>
|
1021
1035
|
<xsl:when test="normalize-space($title_) != ''">
|
1022
1036
|
<xsl:value-of select="$title_"/>
|
@@ -1167,6 +1181,7 @@
|
|
1167
1181
|
|
1168
1182
|
|
1169
1183
|
|
1184
|
+
|
1170
1185
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1171
1186
|
|
1172
1187
|
|
@@ -1425,6 +1440,8 @@
|
|
1425
1440
|
|
1426
1441
|
|
1427
1442
|
|
1443
|
+
|
1444
|
+
|
1428
1445
|
<!-- $namespace = 'iso' or -->
|
1429
1446
|
|
1430
1447
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -1460,6 +1477,7 @@
|
|
1460
1477
|
<xsl:with-param name="table" select="$simple-table"/>
|
1461
1478
|
</xsl:call-template>
|
1462
1479
|
</xsl:variable>
|
1480
|
+
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
1463
1481
|
|
1464
1482
|
<!-- <xsl:variable name="colwidths2">
|
1465
1483
|
<xsl:call-template name="calculate-column-widths">
|
@@ -1481,27 +1499,49 @@
|
|
1481
1499
|
<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
|
1482
1500
|
|
1483
1501
|
|
1502
|
+
|
1503
|
+
|
1504
|
+
|
1484
1505
|
|
1485
1506
|
|
1507
|
+
|
1486
1508
|
|
1487
|
-
|
1488
1509
|
|
1489
1510
|
|
1490
1511
|
|
1491
|
-
|
1492
|
-
|
1493
|
-
|
1494
|
-
|
1495
|
-
|
1496
|
-
|
1512
|
+
|
1513
|
+
|
1514
|
+
|
1515
|
+
<xsl:variable name="table_attributes">
|
1516
|
+
<attribute name="table-layout">fixed</attribute>
|
1517
|
+
<attribute name="width">100%</attribute>
|
1518
|
+
<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1519
|
+
<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1497
1520
|
|
1498
1521
|
|
1499
1522
|
|
1500
1523
|
|
1524
|
+
|
1525
|
+
|
1526
|
+
|
1501
1527
|
|
1528
|
+
|
1502
1529
|
|
1530
|
+
</xsl:variable>
|
1531
|
+
|
1532
|
+
|
1533
|
+
<fo:table id="{@id}" table-omit-footer-at-break="true">
|
1503
1534
|
|
1535
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1536
|
+
<xsl:attribute name="{@name}">
|
1537
|
+
<xsl:value-of select="."/>
|
1538
|
+
</xsl:attribute>
|
1539
|
+
</xsl:for-each>
|
1504
1540
|
|
1541
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1542
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1543
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
1544
|
+
</xsl:if>
|
1505
1545
|
|
1506
1546
|
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1507
1547
|
<xsl:choose>
|
@@ -1525,6 +1565,33 @@
|
|
1525
1565
|
|
1526
1566
|
</fo:table>
|
1527
1567
|
|
1568
|
+
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
1569
|
+
<xsl:call-template name="insertTableFooterInSeparateTable">
|
1570
|
+
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
1571
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
1572
|
+
</xsl:call-template>
|
1573
|
+
</xsl:for-each>
|
1574
|
+
|
1575
|
+
<!-- insert footer as table -->
|
1576
|
+
<!-- <fo:table>
|
1577
|
+
<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
|
1578
|
+
<xsl:attribute name="{@name}">
|
1579
|
+
<xsl:value-of select="."/>
|
1580
|
+
</xsl:attribute>
|
1581
|
+
</xsl:for-each>
|
1582
|
+
|
1583
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1584
|
+
<xsl:choose>
|
1585
|
+
<xsl:when test=". = 1 or . = 0">
|
1586
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1587
|
+
</xsl:when>
|
1588
|
+
<xsl:otherwise>
|
1589
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1590
|
+
</xsl:otherwise>
|
1591
|
+
</xsl:choose>
|
1592
|
+
</xsl:for-each>
|
1593
|
+
</fo:table>-->
|
1594
|
+
|
1528
1595
|
|
1529
1596
|
|
1530
1597
|
|
@@ -1589,6 +1656,13 @@
|
|
1589
1656
|
<xsl:for-each select="xalan:nodeset($table)//tr">
|
1590
1657
|
<xsl:variable name="td_text">
|
1591
1658
|
<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
|
1659
|
+
|
1660
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1661
|
+
<xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
|
1662
|
+
<word><xsl:value-of select="normalize-space(.)"/></word>
|
1663
|
+
</xsl:for-each>
|
1664
|
+
</xsl:if> -->
|
1665
|
+
|
1592
1666
|
</xsl:variable>
|
1593
1667
|
<xsl:variable name="words">
|
1594
1668
|
<xsl:variable name="string_with_added_zerospaces">
|
@@ -1648,11 +1722,14 @@
|
|
1648
1722
|
<xsl:value-of select="*[local-name()='origin']/@citeas"/>
|
1649
1723
|
</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
|
1650
1724
|
<xsl:value-of select="@target"/>
|
1725
|
+
</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
|
1726
|
+
<xsl:variable name="math_text" select="normalize-space(.)"/>
|
1727
|
+
<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
|
1651
1728
|
</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
|
1652
1729
|
<xsl:param name="cols-count"/>
|
1653
1730
|
<!-- font-weight="bold" -->
|
1654
1731
|
<fo:table-header>
|
1655
|
-
|
1732
|
+
|
1656
1733
|
<xsl:apply-templates/>
|
1657
1734
|
</fo:table-header>
|
1658
1735
|
</xsl:template><xsl:template name="table-header-title">
|
@@ -1677,6 +1754,13 @@
|
|
1677
1754
|
</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
|
1678
1755
|
<xsl:apply-templates/>
|
1679
1756
|
</xsl:template><xsl:template name="insertTableFooter">
|
1757
|
+
<xsl:param name="cols-count"/>
|
1758
|
+
<xsl:if test="../*[local-name()='tfoot']">
|
1759
|
+
<fo:table-footer>
|
1760
|
+
<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
|
1761
|
+
</fo:table-footer>
|
1762
|
+
</xsl:if>
|
1763
|
+
</xsl:template><xsl:template name="insertTableFooter2">
|
1680
1764
|
<xsl:param name="cols-count"/>
|
1681
1765
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1682
1766
|
<xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
|
@@ -1698,11 +1782,15 @@
|
|
1698
1782
|
<!-- fn will be processed inside 'note' processing -->
|
1699
1783
|
|
1700
1784
|
|
1701
|
-
|
1785
|
+
|
1786
|
+
<!-- except gb and bipm -->
|
1702
1787
|
|
1703
1788
|
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1704
1789
|
|
1705
1790
|
|
1791
|
+
|
1792
|
+
|
1793
|
+
|
1706
1794
|
<!-- horizontal row separator -->
|
1707
1795
|
|
1708
1796
|
|
@@ -1716,6 +1804,84 @@
|
|
1716
1804
|
</fo:table-footer>
|
1717
1805
|
|
1718
1806
|
</xsl:if>
|
1807
|
+
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
1808
|
+
<xsl:param name="table_attributes"/>
|
1809
|
+
<xsl:param name="colwidths"/>
|
1810
|
+
|
1811
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1812
|
+
|
1813
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1814
|
+
|
1815
|
+
<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
|
1816
|
+
|
1817
|
+
<fo:table keep-with-previous="always">
|
1818
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1819
|
+
<xsl:choose>
|
1820
|
+
<xsl:when test="@name = 'border-top'">
|
1821
|
+
<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
|
1822
|
+
</xsl:when>
|
1823
|
+
<xsl:when test="@name = 'border'">
|
1824
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
1825
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
1826
|
+
</xsl:when>
|
1827
|
+
<xsl:otherwise>
|
1828
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
1829
|
+
</xsl:otherwise>
|
1830
|
+
</xsl:choose>
|
1831
|
+
</xsl:for-each>
|
1832
|
+
|
1833
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1834
|
+
<xsl:choose>
|
1835
|
+
<xsl:when test=". = 1 or . = 0">
|
1836
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1837
|
+
</xsl:when>
|
1838
|
+
<xsl:otherwise>
|
1839
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1840
|
+
</xsl:otherwise>
|
1841
|
+
</xsl:choose>
|
1842
|
+
</xsl:for-each>
|
1843
|
+
|
1844
|
+
<fo:table-body>
|
1845
|
+
<fo:table-row>
|
1846
|
+
<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
|
1847
|
+
|
1848
|
+
|
1849
|
+
|
1850
|
+
<!-- fn will be processed inside 'note' processing -->
|
1851
|
+
|
1852
|
+
|
1853
|
+
|
1854
|
+
<!-- except gb and bipm -->
|
1855
|
+
|
1856
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1857
|
+
|
1858
|
+
|
1859
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1860
|
+
<xsl:choose>
|
1861
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
1862
|
+
show Note under table in preface (ex. abstract) sections
|
1863
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1864
|
+
</xsl:when>
|
1865
|
+
<xsl:otherwise>
|
1866
|
+
empty, because notes show at page side in main sections
|
1867
|
+
<fo:block/>
|
1868
|
+
</xsl:otherwise>
|
1869
|
+
</xsl:choose>
|
1870
|
+
</xsl:if> -->
|
1871
|
+
|
1872
|
+
|
1873
|
+
<!-- horizontal row separator -->
|
1874
|
+
|
1875
|
+
|
1876
|
+
<!-- fn processing -->
|
1877
|
+
<xsl:call-template name="fn_display"/>
|
1878
|
+
|
1879
|
+
</fo:table-cell>
|
1880
|
+
</fo:table-row>
|
1881
|
+
</fo:table-body>
|
1882
|
+
|
1883
|
+
</fo:table>
|
1884
|
+
</xsl:if>
|
1719
1885
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
1720
1886
|
|
1721
1887
|
<xsl:variable name="cols-count">
|
@@ -1768,8 +1934,8 @@
|
|
1768
1934
|
|
1769
1935
|
</xsl:if>
|
1770
1936
|
|
1771
|
-
|
1772
|
-
|
1937
|
+
|
1938
|
+
|
1773
1939
|
|
1774
1940
|
<xsl:apply-templates/>
|
1775
1941
|
</fo:table-row>
|
@@ -1793,6 +1959,7 @@
|
|
1793
1959
|
|
1794
1960
|
|
1795
1961
|
|
1962
|
+
|
1796
1963
|
<xsl:if test="@colspan">
|
1797
1964
|
<xsl:attribute name="number-columns-spanned">
|
1798
1965
|
<xsl:value-of select="@colspan"/>
|
@@ -1832,7 +1999,8 @@
|
|
1832
1999
|
|
1833
2000
|
|
1834
2001
|
|
1835
|
-
|
2002
|
+
|
2003
|
+
|
1836
2004
|
|
1837
2005
|
|
1838
2006
|
|
@@ -1862,14 +2030,17 @@
|
|
1862
2030
|
|
1863
2031
|
|
1864
2032
|
|
2033
|
+
|
2034
|
+
|
1865
2035
|
<fo:inline padding-right="2mm">
|
1866
2036
|
|
1867
2037
|
|
1868
2038
|
|
1869
|
-
|
2039
|
+
|
1870
2040
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
1871
2041
|
|
1872
2042
|
</fo:inline>
|
2043
|
+
|
1873
2044
|
<xsl:apply-templates mode="process"/>
|
1874
2045
|
</fo:block>
|
1875
2046
|
|
@@ -1893,6 +2064,7 @@
|
|
1893
2064
|
|
1894
2065
|
|
1895
2066
|
|
2067
|
+
|
1896
2068
|
<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
|
1897
2069
|
|
1898
2070
|
|
@@ -1900,12 +2072,15 @@
|
|
1900
2072
|
|
1901
2073
|
|
1902
2074
|
|
2075
|
+
|
1903
2076
|
<xsl:value-of select="@reference"/>
|
1904
2077
|
|
2078
|
+
|
1905
2079
|
</fo:inline>
|
1906
2080
|
<fo:inline>
|
1907
2081
|
|
1908
|
-
<xsl:apply-templates/>
|
2082
|
+
<!-- <xsl:apply-templates /> -->
|
2083
|
+
<xsl:copy-of select="./node()"/>
|
1909
2084
|
</fo:inline>
|
1910
2085
|
</fo:block>
|
1911
2086
|
</xsl:if>
|
@@ -1942,7 +2117,20 @@
|
|
1942
2117
|
<xsl:variable name="following_dl_colwidths">
|
1943
2118
|
<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
|
1944
2119
|
<xsl:variable name="html-table">
|
1945
|
-
<xsl:variable name="
|
2120
|
+
<xsl:variable name="doc_ns">
|
2121
|
+
|
2122
|
+
</xsl:variable>
|
2123
|
+
<xsl:variable name="ns">
|
2124
|
+
<xsl:choose>
|
2125
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2126
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2127
|
+
</xsl:when>
|
2128
|
+
<xsl:otherwise>
|
2129
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2130
|
+
</xsl:otherwise>
|
2131
|
+
</xsl:choose>
|
2132
|
+
</xsl:variable>
|
2133
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
1946
2134
|
<xsl:element name="{$ns}:table">
|
1947
2135
|
<xsl:for-each select="*[local-name() = 'dl'][1]">
|
1948
2136
|
<tbody>
|
@@ -2007,7 +2195,8 @@
|
|
2007
2195
|
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
2008
2196
|
</xsl:if>
|
2009
2197
|
|
2010
|
-
<xsl:apply-templates/>
|
2198
|
+
<!-- <xsl:apply-templates /> -->
|
2199
|
+
<xsl:copy-of select="./node()"/>
|
2011
2200
|
</fo:block>
|
2012
2201
|
</fo:table-cell>
|
2013
2202
|
</fo:table-row>
|
@@ -2026,9 +2215,12 @@
|
|
2026
2215
|
|
2027
2216
|
|
2028
2217
|
|
2218
|
+
|
2029
2219
|
<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
|
2030
2220
|
|
2221
|
+
|
2031
2222
|
<xsl:value-of select="@reference"/>
|
2223
|
+
|
2032
2224
|
</fo:basic-link>
|
2033
2225
|
</fo:inline>
|
2034
2226
|
</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
|
@@ -2126,7 +2318,20 @@
|
|
2126
2318
|
</xsl:choose>
|
2127
2319
|
<!-- create virtual html table for dl/[dt and dd] -->
|
2128
2320
|
<xsl:variable name="html-table">
|
2129
|
-
<xsl:variable name="
|
2321
|
+
<xsl:variable name="doc_ns">
|
2322
|
+
|
2323
|
+
</xsl:variable>
|
2324
|
+
<xsl:variable name="ns">
|
2325
|
+
<xsl:choose>
|
2326
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2327
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2328
|
+
</xsl:when>
|
2329
|
+
<xsl:otherwise>
|
2330
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2331
|
+
</xsl:otherwise>
|
2332
|
+
</xsl:choose>
|
2333
|
+
</xsl:variable>
|
2334
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2130
2335
|
<xsl:element name="{$ns}:table">
|
2131
2336
|
<tbody>
|
2132
2337
|
<xsl:apply-templates mode="dl"/>
|
@@ -2270,6 +2475,7 @@
|
|
2270
2475
|
|
2271
2476
|
|
2272
2477
|
|
2478
|
+
|
2273
2479
|
<xsl:apply-templates/>
|
2274
2480
|
<!-- <xsl:if test="$namespace = 'gb'">
|
2275
2481
|
<xsl:if test="ancestor::*[local-name()='formula']">
|
@@ -2336,18 +2542,18 @@
|
|
2336
2542
|
</xsl:template><xsl:template match="*[local-name()='tt']">
|
2337
2543
|
<fo:inline xsl:use-attribute-sets="tt-style">
|
2338
2544
|
<xsl:variable name="_font-size">
|
2339
|
-
|
2340
|
-
|
2341
|
-
|
2342
2545
|
|
2343
2546
|
|
2344
2547
|
|
2345
2548
|
|
2346
2549
|
|
2347
2550
|
|
2348
|
-
|
2349
2551
|
|
2350
|
-
|
2552
|
+
|
2553
|
+
|
2554
|
+
|
2555
|
+
|
2556
|
+
|
2351
2557
|
10
|
2352
2558
|
|
2353
2559
|
</xsl:variable>
|
@@ -2685,7 +2891,7 @@
|
|
2685
2891
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
|
2686
2892
|
<xsl:value-of select="substring($str, 2)"/>
|
2687
2893
|
</xsl:template><xsl:template match="mathml:math">
|
2688
|
-
<fo:inline font-family="
|
2894
|
+
<fo:inline font-family="STIX Two Math"> <!-- -->
|
2689
2895
|
<xsl:variable name="mathml">
|
2690
2896
|
<xsl:apply-templates select="." mode="mathml"/>
|
2691
2897
|
</xsl:variable>
|
@@ -2779,7 +2985,7 @@
|
|
2779
2985
|
<xsl:apply-templates/>
|
2780
2986
|
</xsl:template><xsl:template match="*[local-name() = 'xref']">
|
2781
2987
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
2782
|
-
|
2988
|
+
|
2783
2989
|
<xsl:apply-templates/>
|
2784
2990
|
</fo:basic-link>
|
2785
2991
|
</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
|
@@ -2993,18 +3199,9 @@
|
|
2993
3199
|
<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
|
2994
3200
|
<fo:bookmark-title>
|
2995
3201
|
<xsl:variable name="bookmark-title_">
|
2996
|
-
<xsl:
|
2997
|
-
<xsl:
|
2998
|
-
|
2999
|
-
|
3000
|
-
</xsl:when>
|
3001
|
-
<xsl:when test="@lang = 'fr'">
|
3002
|
-
|
3003
|
-
|
3004
|
-
</xsl:when>
|
3005
|
-
<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
|
3006
|
-
<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
|
3007
|
-
</xsl:choose>
|
3202
|
+
<xsl:call-template name="getLangVersion">
|
3203
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3204
|
+
</xsl:call-template>
|
3008
3205
|
</xsl:variable>
|
3009
3206
|
<xsl:choose>
|
3010
3207
|
<xsl:when test="normalize-space($bookmark-title_) != ''">
|
@@ -3046,6 +3243,20 @@
|
|
3046
3243
|
|
3047
3244
|
</fo:bookmark-tree>
|
3048
3245
|
</xsl:if>
|
3246
|
+
</xsl:template><xsl:template name="getLangVersion">
|
3247
|
+
<xsl:param name="lang"/>
|
3248
|
+
<xsl:choose>
|
3249
|
+
<xsl:when test="$lang = 'en'">
|
3250
|
+
|
3251
|
+
|
3252
|
+
</xsl:when>
|
3253
|
+
<xsl:when test="$lang = 'fr'">
|
3254
|
+
|
3255
|
+
|
3256
|
+
</xsl:when>
|
3257
|
+
<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
|
3258
|
+
<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
|
3259
|
+
</xsl:choose>
|
3049
3260
|
</xsl:template><xsl:template match="item" mode="bookmark">
|
3050
3261
|
<fo:bookmark internal-destination="{@id}" starting-state="hide">
|
3051
3262
|
<fo:bookmark-title>
|
@@ -3060,7 +3271,7 @@
|
|
3060
3271
|
</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">
|
3061
3272
|
<xsl:if test="normalize-space() != ''">
|
3062
3273
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
3063
|
-
|
3274
|
+
|
3064
3275
|
<xsl:apply-templates/>
|
3065
3276
|
</fo:block>
|
3066
3277
|
</xsl:if>
|
@@ -3692,6 +3903,7 @@
|
|
3692
3903
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
3693
3904
|
<fo:block>
|
3694
3905
|
<xsl:call-template name="setId"/>
|
3906
|
+
|
3695
3907
|
<xsl:apply-templates/>
|
3696
3908
|
</fo:block>
|
3697
3909
|
</xsl:template><xsl:template match="*[local-name() = 'definitions']">
|
@@ -3727,6 +3939,7 @@
|
|
3727
3939
|
</xsl:choose>
|
3728
3940
|
</xsl:attribute>
|
3729
3941
|
|
3942
|
+
|
3730
3943
|
<fo:block-container margin-left="0mm">
|
3731
3944
|
<fo:block>
|
3732
3945
|
<xsl:apply-templates select="." mode="ul_ol"/>
|
@@ -3908,6 +4121,7 @@
|
|
3908
4121
|
<dc:title>
|
3909
4122
|
<xsl:variable name="title">
|
3910
4123
|
|
4124
|
+
|
3911
4125
|
|
3912
4126
|
<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en']"/>
|
3913
4127
|
|
@@ -3926,6 +4140,7 @@
|
|
3926
4140
|
<dc:creator>
|
3927
4141
|
|
3928
4142
|
|
4143
|
+
|
3929
4144
|
</dc:creator>
|
3930
4145
|
<dc:description>
|
3931
4146
|
<xsl:variable name="abstract">
|
@@ -3935,6 +4150,7 @@
|
|
3935
4150
|
|
3936
4151
|
<xsl:copy-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'abstract']//text()"/>
|
3937
4152
|
|
4153
|
+
|
3938
4154
|
</xsl:variable>
|
3939
4155
|
<xsl:value-of select="normalize-space($abstract)"/>
|
3940
4156
|
</dc:description>
|
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.6.
|
4
|
+
version: 1.6.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: isodoc
|