metanorma-ogc 1.2.4 → 1.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ogc/boilerplate.xml +1 -1
  3. data/lib/asciidoctor/ogc/converter.rb +25 -1
  4. data/lib/asciidoctor/ogc/isodoc.rng +0 -1
  5. data/lib/asciidoctor/ogc/validate.rb +1 -1
  6. data/lib/isodoc/ogc/html/_coverpage.css +6 -0
  7. data/lib/isodoc/ogc/html/_coverpage.scss +8 -0
  8. data/lib/isodoc/ogc/html/html_ogc_titlepage.html +3 -3
  9. data/lib/isodoc/ogc/html/htmlstyle.css +7 -1
  10. data/lib/isodoc/ogc/html/word_ogc_titlepage.html +1 -1
  11. data/lib/isodoc/ogc/html_convert.rb +1 -0
  12. data/lib/isodoc/ogc/i18n-en.yaml +10 -0
  13. data/lib/isodoc/ogc/init.rb +1 -1
  14. data/lib/isodoc/ogc/metadata.rb +1 -1
  15. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +314 -63
  16. data/lib/isodoc/ogc/ogc.best-practice.xsl +314 -63
  17. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +314 -63
  18. data/lib/isodoc/ogc/ogc.community-practice.xsl +314 -63
  19. data/lib/isodoc/ogc/ogc.community-standard.xsl +314 -63
  20. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +314 -63
  21. data/lib/isodoc/ogc/ogc.engineering-report.xsl +314 -63
  22. data/lib/isodoc/ogc/ogc.other.xsl +314 -63
  23. data/lib/isodoc/ogc/ogc.policy.xsl +314 -63
  24. data/lib/isodoc/ogc/ogc.reference-model.xsl +314 -63
  25. data/lib/isodoc/ogc/ogc.release-notes.xsl +314 -63
  26. data/lib/isodoc/ogc/ogc.standard.xsl +314 -63
  27. data/lib/isodoc/ogc/ogc.test-suite.xsl +314 -63
  28. data/lib/isodoc/ogc/ogc.user-guide.xsl +314 -63
  29. data/lib/isodoc/ogc/ogc.white-paper.xsl +281 -46
  30. data/lib/isodoc/ogc/presentation_xml_convert.rb +12 -0
  31. data/lib/isodoc/ogc/sections.rb +6 -1
  32. data/lib/isodoc/ogc/word_convert.rb +1 -0
  33. data/lib/isodoc/ogc/xref.rb +30 -5
  34. data/lib/metanorma/ogc/version.rb +1 -1
  35. metadata +2 -2
@@ -91,7 +91,7 @@
91
91
 
92
92
  <xsl:template match="/">
93
93
  <xsl:call-template name="namespaceCheck"/>
94
- <fo:root font-family="Arial, STIX2Math, HanSans" font-size="11pt" xml:lang="{$lang}">
94
+ <fo:root font-family="Arial, STIX Two Math, HanSans" font-size="11pt" xml:lang="{$lang}">
95
95
  <fo:layout-master-set>
96
96
 
97
97
  <!-- Document pages -->
@@ -269,6 +269,25 @@
269
269
  </fo:root>
270
270
  </xsl:template>
271
271
 
272
+
273
+ <xsl:variable name="thinspace" select="' '"/>
274
+
275
+ <!-- Lato font doesn't contain 'thin space' glyph -->
276
+ <xsl:template match="text()" priority="1">
277
+ <xsl:value-of select="translate(., $thinspace, ' ')"/>
278
+ </xsl:template>
279
+
280
+ <xsl:template match="text()" priority="3" mode="contents">
281
+ <xsl:value-of select="translate(., $thinspace, ' ')"/>
282
+ </xsl:template>
283
+
284
+ <xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text()" priority="2">
285
+ <xsl:variable name="content">
286
+ <xsl:call-template name="add-zero-spaces"/>
287
+ </xsl:variable>
288
+ <xsl:value-of select="translate($content, $thinspace, ' ')"/>
289
+ </xsl:template>
290
+
272
291
  <xsl:template match="node()">
273
292
  <xsl:apply-templates/>
274
293
  </xsl:template>
@@ -864,7 +883,12 @@
864
883
 
865
884
 
866
885
  </title-toc>
867
- <title-toc lang="fr">Sommaire</title-toc>
886
+ <title-toc lang="fr">
887
+
888
+ <xsl:text>Sommaire</xsl:text>
889
+
890
+
891
+ </title-toc>
868
892
 
869
893
  <title-toc lang="zh">Contents</title-toc>
870
894
 
@@ -952,10 +976,19 @@
952
976
 
953
977
  </xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
954
978
  <xsl:param name="name"/>
955
- <xsl:variable name="lang">
956
- <xsl:call-template name="getLang"/>
979
+ <xsl:param name="lang"/>
980
+ <xsl:variable name="lang_">
981
+ <xsl:choose>
982
+ <xsl:when test="$lang != ''">
983
+ <xsl:value-of select="$lang"/>
984
+ </xsl:when>
985
+ <xsl:otherwise>
986
+ <xsl:call-template name="getLang"/>
987
+ </xsl:otherwise>
988
+ </xsl:choose>
957
989
  </xsl:variable>
958
- <xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $lang]"/>
990
+ <xsl:variable name="language" select="normalize-space($lang_)"/>
991
+ <xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
959
992
  <xsl:choose>
960
993
  <xsl:when test="normalize-space($title_) != ''">
961
994
  <xsl:value-of select="$title_"/>
@@ -1153,6 +1186,7 @@
1153
1186
 
1154
1187
 
1155
1188
 
1189
+
1156
1190
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1157
1191
 
1158
1192
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1414,6 +1448,8 @@
1414
1448
 
1415
1449
 
1416
1450
 
1451
+
1452
+
1417
1453
  <!-- $namespace = 'iso' or -->
1418
1454
 
1419
1455
 
@@ -1449,6 +1485,7 @@
1449
1485
  <xsl:with-param name="table" select="$simple-table"/>
1450
1486
  </xsl:call-template>
1451
1487
  </xsl:variable>
1488
+ <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1452
1489
 
1453
1490
  <!-- <xsl:variable name="colwidths2">
1454
1491
  <xsl:call-template name="calculate-column-widths">
@@ -1469,37 +1506,59 @@
1469
1506
 
1470
1507
  <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
1471
1508
 
1509
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1472
1510
 
1473
1511
 
1512
+
1513
+
1514
+
1474
1515
 
1475
1516
 
1476
1517
 
1477
1518
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1478
1519
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1479
1520
  <xsl:attribute name="space-after">12pt</xsl:attribute>
1480
-
1521
+
1481
1522
 
1482
1523
 
1483
1524
 
1484
- <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
1485
-
1486
-
1487
-
1488
-
1489
-
1490
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
1491
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
1492
-
1525
+
1526
+
1527
+
1528
+
1529
+ <xsl:variable name="table_attributes">
1530
+ <attribute name="table-layout">fixed</attribute>
1531
+ <attribute name="width">100%</attribute>
1532
+ <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1533
+ <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1493
1534
 
1494
1535
 
1495
1536
 
1496
1537
 
1497
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1498
1538
 
1539
+ <attribute name="margin-left">0mm</attribute>
1540
+ <attribute name="margin-right">0mm</attribute>
1541
+
1542
+
1543
+
1499
1544
 
1545
+
1500
1546
 
1547
+ </xsl:variable>
1548
+
1549
+
1550
+ <fo:table id="{@id}" table-omit-footer-at-break="true">
1501
1551
 
1552
+ <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1553
+ <xsl:attribute name="{@name}">
1554
+ <xsl:value-of select="."/>
1555
+ </xsl:attribute>
1556
+ </xsl:for-each>
1502
1557
 
1558
+ <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
1559
+ <xsl:if test="$isNoteOrFnExist = 'true'">
1560
+ <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1561
+ </xsl:if>
1503
1562
 
1504
1563
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
1505
1564
  <xsl:choose>
@@ -1523,6 +1582,33 @@
1523
1582
 
1524
1583
  </fo:table>
1525
1584
 
1585
+ <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1586
+ <xsl:call-template name="insertTableFooterInSeparateTable">
1587
+ <xsl:with-param name="table_attributes" select="$table_attributes"/>
1588
+ <xsl:with-param name="colwidths" select="$colwidths"/>
1589
+ </xsl:call-template>
1590
+ </xsl:for-each>
1591
+
1592
+ <!-- insert footer as table -->
1593
+ <!-- <fo:table>
1594
+ <xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
1595
+ <xsl:attribute name="{@name}">
1596
+ <xsl:value-of select="."/>
1597
+ </xsl:attribute>
1598
+ </xsl:for-each>
1599
+
1600
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1601
+ <xsl:choose>
1602
+ <xsl:when test=". = 1 or . = 0">
1603
+ <fo:table-column column-width="proportional-column-width(2)"/>
1604
+ </xsl:when>
1605
+ <xsl:otherwise>
1606
+ <fo:table-column column-width="proportional-column-width({.})"/>
1607
+ </xsl:otherwise>
1608
+ </xsl:choose>
1609
+ </xsl:for-each>
1610
+ </fo:table>-->
1611
+
1526
1612
 
1527
1613
 
1528
1614
 
@@ -1589,6 +1675,13 @@
1589
1675
  <xsl:for-each select="xalan:nodeset($table)//tr">
1590
1676
  <xsl:variable name="td_text">
1591
1677
  <xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
1678
+
1679
+ <!-- <xsl:if test="$namespace = 'bipm'">
1680
+ <xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
1681
+ <word><xsl:value-of select="normalize-space(.)"/></word>
1682
+ </xsl:for-each>
1683
+ </xsl:if> -->
1684
+
1592
1685
  </xsl:variable>
1593
1686
  <xsl:variable name="words">
1594
1687
  <xsl:variable name="string_with_added_zerospaces">
@@ -1648,11 +1741,14 @@
1648
1741
  <xsl:value-of select="*[local-name()='origin']/@citeas"/>
1649
1742
  </xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
1650
1743
  <xsl:value-of select="@target"/>
1744
+ </xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
1745
+ <xsl:variable name="math_text" select="normalize-space(.)"/>
1746
+ <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
1651
1747
  </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
1652
1748
  <xsl:param name="cols-count"/>
1653
1749
  <!-- font-weight="bold" -->
1654
1750
  <fo:table-header>
1655
-
1751
+
1656
1752
  <xsl:apply-templates/>
1657
1753
  </fo:table-header>
1658
1754
  </xsl:template><xsl:template name="table-header-title">
@@ -1677,6 +1773,13 @@
1677
1773
  </xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
1678
1774
  <xsl:apply-templates/>
1679
1775
  </xsl:template><xsl:template name="insertTableFooter">
1776
+ <xsl:param name="cols-count"/>
1777
+ <xsl:if test="../*[local-name()='tfoot']">
1778
+ <fo:table-footer>
1779
+ <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
1780
+ </fo:table-footer>
1781
+ </xsl:if>
1782
+ </xsl:template><xsl:template name="insertTableFooter2">
1680
1783
  <xsl:param name="cols-count"/>
1681
1784
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1682
1785
  <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
@@ -1698,11 +1801,15 @@
1698
1801
  <!-- fn will be processed inside 'note' processing -->
1699
1802
 
1700
1803
 
1701
- <!-- except gb -->
1804
+
1805
+ <!-- except gb and bipm -->
1702
1806
 
1703
1807
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1704
1808
 
1705
1809
 
1810
+
1811
+
1812
+
1706
1813
  <!-- horizontal row separator -->
1707
1814
 
1708
1815
 
@@ -1716,6 +1823,84 @@
1716
1823
  </fo:table-footer>
1717
1824
 
1718
1825
  </xsl:if>
1826
+ </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1827
+ <xsl:param name="table_attributes"/>
1828
+ <xsl:param name="colwidths"/>
1829
+
1830
+ <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1831
+
1832
+ <xsl:if test="$isNoteOrFnExist = 'true'">
1833
+
1834
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1835
+
1836
+ <fo:table keep-with-previous="always">
1837
+ <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1838
+ <xsl:choose>
1839
+ <xsl:when test="@name = 'border-top'">
1840
+ <xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
1841
+ </xsl:when>
1842
+ <xsl:when test="@name = 'border'">
1843
+ <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
1844
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
1845
+ </xsl:when>
1846
+ <xsl:otherwise>
1847
+ <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
1848
+ </xsl:otherwise>
1849
+ </xsl:choose>
1850
+ </xsl:for-each>
1851
+
1852
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1853
+ <xsl:choose>
1854
+ <xsl:when test=". = 1 or . = 0">
1855
+ <fo:table-column column-width="proportional-column-width(2)"/>
1856
+ </xsl:when>
1857
+ <xsl:otherwise>
1858
+ <fo:table-column column-width="proportional-column-width({.})"/>
1859
+ </xsl:otherwise>
1860
+ </xsl:choose>
1861
+ </xsl:for-each>
1862
+
1863
+ <fo:table-body>
1864
+ <fo:table-row>
1865
+ <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
1866
+
1867
+
1868
+
1869
+ <!-- fn will be processed inside 'note' processing -->
1870
+
1871
+
1872
+
1873
+ <!-- except gb and bipm -->
1874
+
1875
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1876
+
1877
+
1878
+ <!-- <xsl:if test="$namespace = 'bipm'">
1879
+ <xsl:choose>
1880
+ <xsl:when test="ancestor::*[local-name()='preface']">
1881
+ show Note under table in preface (ex. abstract) sections
1882
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1883
+ </xsl:when>
1884
+ <xsl:otherwise>
1885
+ empty, because notes show at page side in main sections
1886
+ <fo:block/>
1887
+ </xsl:otherwise>
1888
+ </xsl:choose>
1889
+ </xsl:if> -->
1890
+
1891
+
1892
+ <!-- horizontal row separator -->
1893
+
1894
+
1895
+ <!-- fn processing -->
1896
+ <xsl:call-template name="fn_display"/>
1897
+
1898
+ </fo:table-cell>
1899
+ </fo:table-row>
1900
+ </fo:table-body>
1901
+
1902
+ </fo:table>
1903
+ </xsl:if>
1719
1904
  </xsl:template><xsl:template match="*[local-name()='tbody']">
1720
1905
 
1721
1906
  <xsl:variable name="cols-count">
@@ -1768,8 +1953,8 @@
1768
1953
 
1769
1954
  </xsl:if>
1770
1955
 
1771
-
1772
-
1956
+
1957
+
1773
1958
 
1774
1959
  <xsl:apply-templates/>
1775
1960
  </fo:table-row>
@@ -1799,6 +1984,7 @@
1799
1984
 
1800
1985
 
1801
1986
 
1987
+
1802
1988
  <xsl:if test="@colspan">
1803
1989
  <xsl:attribute name="number-columns-spanned">
1804
1990
  <xsl:value-of select="@colspan"/>
@@ -1838,7 +2024,7 @@
1838
2024
 
1839
2025
 
1840
2026
 
1841
-
2027
+
1842
2028
 
1843
2029
 
1844
2030
 
@@ -1849,6 +2035,7 @@
1849
2035
 
1850
2036
 
1851
2037
 
2038
+
1852
2039
  <xsl:if test="@colspan">
1853
2040
  <xsl:attribute name="number-columns-spanned">
1854
2041
  <xsl:value-of select="@colspan"/>
@@ -1872,14 +2059,17 @@
1872
2059
 
1873
2060
 
1874
2061
 
2062
+
2063
+
1875
2064
  <fo:inline padding-right="2mm">
1876
2065
 
1877
2066
 
1878
2067
 
1879
-
2068
+
1880
2069
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
1881
2070
 
1882
2071
  </fo:inline>
2072
+
1883
2073
  <xsl:apply-templates mode="process"/>
1884
2074
  </fo:block>
1885
2075
 
@@ -1909,6 +2099,7 @@
1909
2099
 
1910
2100
 
1911
2101
 
2102
+
1912
2103
  <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
1913
2104
 
1914
2105
  <xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -1918,12 +2109,15 @@
1918
2109
 
1919
2110
 
1920
2111
 
2112
+
1921
2113
  <xsl:value-of select="@reference"/>
1922
2114
 
2115
+
1923
2116
  </fo:inline>
1924
2117
  <fo:inline>
1925
2118
 
1926
- <xsl:apply-templates/>
2119
+ <!-- <xsl:apply-templates /> -->
2120
+ <xsl:copy-of select="./node()"/>
1927
2121
  </fo:inline>
1928
2122
  </fo:block>
1929
2123
  </xsl:if>
@@ -1960,7 +2154,20 @@
1960
2154
  <xsl:variable name="following_dl_colwidths">
1961
2155
  <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
1962
2156
  <xsl:variable name="html-table">
1963
- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
2157
+ <xsl:variable name="doc_ns">
2158
+
2159
+ </xsl:variable>
2160
+ <xsl:variable name="ns">
2161
+ <xsl:choose>
2162
+ <xsl:when test="normalize-space($doc_ns) != ''">
2163
+ <xsl:value-of select="normalize-space($doc_ns)"/>
2164
+ </xsl:when>
2165
+ <xsl:otherwise>
2166
+ <xsl:value-of select="substring-before(name(/*), '-')"/>
2167
+ </xsl:otherwise>
2168
+ </xsl:choose>
2169
+ </xsl:variable>
2170
+ <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
1964
2171
  <xsl:element name="{$ns}:table">
1965
2172
  <xsl:for-each select="*[local-name() = 'dl'][1]">
1966
2173
  <tbody>
@@ -2025,7 +2232,8 @@
2025
2232
  <xsl:attribute name="margin-bottom">0</xsl:attribute>
2026
2233
  </xsl:if>
2027
2234
 
2028
- <xsl:apply-templates/>
2235
+ <!-- <xsl:apply-templates /> -->
2236
+ <xsl:copy-of select="./node()"/>
2029
2237
  </fo:block>
2030
2238
  </fo:table-cell>
2031
2239
  </fo:table-row>
@@ -2049,6 +2257,7 @@
2049
2257
 
2050
2258
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
2051
2259
 
2260
+
2052
2261
  <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
2053
2262
 
2054
2263
  <xsl:attribute name="internal-destination">
@@ -2056,7 +2265,9 @@
2056
2265
  <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
2057
2266
  </xsl:attribute>
2058
2267
 
2268
+
2059
2269
  <xsl:value-of select="@reference"/>
2270
+
2060
2271
  </fo:basic-link>
2061
2272
  </fo:inline>
2062
2273
  </xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -2154,7 +2365,20 @@
2154
2365
  </xsl:choose>
2155
2366
  <!-- create virtual html table for dl/[dt and dd] -->
2156
2367
  <xsl:variable name="html-table">
2157
- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
2368
+ <xsl:variable name="doc_ns">
2369
+
2370
+ </xsl:variable>
2371
+ <xsl:variable name="ns">
2372
+ <xsl:choose>
2373
+ <xsl:when test="normalize-space($doc_ns) != ''">
2374
+ <xsl:value-of select="normalize-space($doc_ns)"/>
2375
+ </xsl:when>
2376
+ <xsl:otherwise>
2377
+ <xsl:value-of select="substring-before(name(/*), '-')"/>
2378
+ </xsl:otherwise>
2379
+ </xsl:choose>
2380
+ </xsl:variable>
2381
+ <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
2158
2382
  <xsl:element name="{$ns}:table">
2159
2383
  <tbody>
2160
2384
  <xsl:apply-templates mode="dl"/>
@@ -2301,6 +2525,7 @@
2301
2525
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
2302
2526
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2303
2527
 
2528
+
2304
2529
  <xsl:apply-templates/>
2305
2530
  <!-- <xsl:if test="$namespace = 'gb'">
2306
2531
  <xsl:if test="ancestor::*[local-name()='formula']">
@@ -2367,18 +2592,18 @@
2367
2592
  </xsl:template><xsl:template match="*[local-name()='tt']">
2368
2593
  <fo:inline xsl:use-attribute-sets="tt-style">
2369
2594
  <xsl:variable name="_font-size">
2370
-
2371
-
2372
-
2373
2595
 
2374
2596
 
2375
2597
 
2376
2598
 
2377
2599
 
2378
2600
 
2379
-
2380
2601
 
2381
- 10
2602
+
2603
+
2604
+
2605
+
2606
+ 10
2382
2607
 
2383
2608
 
2384
2609
  </xsl:variable>
@@ -2716,7 +2941,7 @@
2716
2941
  <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
2717
2942
  <xsl:value-of select="substring($str, 2)"/>
2718
2943
  </xsl:template><xsl:template match="mathml:math">
2719
- <fo:inline font-family="STIX2Math">
2944
+ <fo:inline font-family="STIX Two Math"> <!-- -->
2720
2945
  <xsl:variable name="mathml">
2721
2946
  <xsl:apply-templates select="." mode="mathml"/>
2722
2947
  </xsl:variable>
@@ -2810,7 +3035,7 @@
2810
3035
  <xsl:apply-templates/>
2811
3036
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
2812
3037
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
2813
-
3038
+
2814
3039
  <xsl:apply-templates/>
2815
3040
  </fo:basic-link>
2816
3041
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3022,18 +3247,9 @@
3022
3247
  <fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
3023
3248
  <fo:bookmark-title>
3024
3249
  <xsl:variable name="bookmark-title_">
3025
- <xsl:choose>
3026
- <xsl:when test="@lang = 'en'">
3027
-
3028
-
3029
- </xsl:when>
3030
- <xsl:when test="@lang = 'fr'">
3031
-
3032
-
3033
- </xsl:when>
3034
- <xsl:when test="@lang = 'de'">Deutsche</xsl:when>
3035
- <xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
3036
- </xsl:choose>
3250
+ <xsl:call-template name="getLangVersion">
3251
+ <xsl:with-param name="lang" select="@lang"/>
3252
+ </xsl:call-template>
3037
3253
  </xsl:variable>
3038
3254
  <xsl:choose>
3039
3255
  <xsl:when test="normalize-space($bookmark-title_) != ''">
@@ -3086,6 +3302,20 @@
3086
3302
 
3087
3303
  </fo:bookmark-tree>
3088
3304
  </xsl:if>
3305
+ </xsl:template><xsl:template name="getLangVersion">
3306
+ <xsl:param name="lang"/>
3307
+ <xsl:choose>
3308
+ <xsl:when test="$lang = 'en'">
3309
+
3310
+
3311
+ </xsl:when>
3312
+ <xsl:when test="$lang = 'fr'">
3313
+
3314
+
3315
+ </xsl:when>
3316
+ <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
3317
+ <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
3318
+ </xsl:choose>
3089
3319
  </xsl:template><xsl:template match="item" mode="bookmark">
3090
3320
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
3091
3321
  <fo:bookmark-title>
@@ -3100,7 +3330,7 @@
3100
3330
  </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">
3101
3331
  <xsl:if test="normalize-space() != ''">
3102
3332
  <fo:block xsl:use-attribute-sets="figure-name-style">
3103
-
3333
+
3104
3334
  <xsl:apply-templates/>
3105
3335
  </fo:block>
3106
3336
  </xsl:if>
@@ -3752,6 +3982,7 @@
3752
3982
  </xsl:template><xsl:template match="*[local-name() = 'clause']">
3753
3983
  <fo:block>
3754
3984
  <xsl:call-template name="setId"/>
3985
+
3755
3986
  <xsl:apply-templates/>
3756
3987
  </fo:block>
3757
3988
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -3787,6 +4018,7 @@
3787
4018
  </xsl:choose>
3788
4019
  </xsl:attribute>
3789
4020
 
4021
+
3790
4022
  <fo:block-container margin-left="0mm">
3791
4023
  <fo:block>
3792
4024
  <xsl:apply-templates select="." mode="ul_ol"/>
@@ -4108,6 +4340,7 @@
4108
4340
  <dc:title>
4109
4341
  <xsl:variable name="title">
4110
4342
 
4343
+
4111
4344
 
4112
4345
  <xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en']"/>
4113
4346
 
@@ -4126,6 +4359,7 @@
4126
4359
  <dc:creator>
4127
4360
 
4128
4361
 
4362
+
4129
4363
  </dc:creator>
4130
4364
  <dc:description>
4131
4365
  <xsl:variable name="abstract">
@@ -4135,6 +4369,7 @@
4135
4369
 
4136
4370
  <xsl:copy-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'abstract']//text()"/>
4137
4371
 
4372
+
4138
4373
  </xsl:variable>
4139
4374
  <xsl:value-of select="normalize-space($abstract)"/>
4140
4375
  </dc:description>