metanorma-ribose 1.6.12 → 1.6.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aa8a5850aab200ce451f3f80eb1c469938c22d51116cf7eba406868b678b5277
4
- data.tar.gz: 1b79657578876f5241a5ce3bd1a84d8bfdb0abbf2733c8c95c4b25691da28536
3
+ metadata.gz: 2a362d9e16323023ed5eed26c77862e19e8dd23bb2566fbb4ab3f837ed03413a
4
+ data.tar.gz: 01e2d3d7b50694039ac3e1ab4dccb00817e2f4d431f04b115575ed50db5a7426
5
5
  SHA512:
6
- metadata.gz: 024526b40521713d0b975f3e1fd480bdea460294fe37630f43a6fcc02b04a26f677c31118c385c2cf14dc701461822ac676b54fda28b0d14a1b9de7791c7c142
7
- data.tar.gz: 68cdf413a3c7540df45f7410c9e4949ceec2d816475a1150cd1ac93d9595b9c27536633ba3ccbcd076e816c8cf0252d14d7a371fa0f9d23c966efabf117aed26
6
+ metadata.gz: 697924bc19eafb371b4932ba7e06d7aa288bcbf8a50a4a70676dc23b314e9ab91199f0c095602d9df14a6c39b54b86102b84e4268e2aaa5dfdf8e6293e1c7dab
7
+ data.tar.gz: 9cfdd155e4b15f87d0da8eb64389a2dce0aef3d093a506aa2e8d0bb1f4cec36d59c9e32416c383217ad4569118dfe284a70f9235563e5ff9dc4098bbe347aca3
@@ -812,6 +812,8 @@
812
812
  <ref name="requirement"/>
813
813
  <ref name="recommendation"/>
814
814
  <ref name="permission"/>
815
+ <ref name="imagemap"/>
816
+ <ref name="svgmap"/>
815
817
  </choice>
816
818
  </define>
817
819
  <define name="bibliography">
@@ -1635,4 +1637,65 @@
1635
1637
  <text/>
1636
1638
  </element>
1637
1639
  </define>
1640
+ <define name="imagemap">
1641
+ <element name="imagemap">
1642
+ <ref name="figure"/>
1643
+ <zeroOrMore>
1644
+ <element name="area">
1645
+ <attribute name="type">
1646
+ <choice>
1647
+ <value>rect</value>
1648
+ <value>circle</value>
1649
+ <value>ellipse</value>
1650
+ <value>poly</value>
1651
+ </choice>
1652
+ </attribute>
1653
+ <choice>
1654
+ <ref name="xref"/>
1655
+ <ref name="hyperlink"/>
1656
+ <ref name="eref"/>
1657
+ </choice>
1658
+ <oneOrMore>
1659
+ <element name="coords">
1660
+ <attribute name="x">
1661
+ <data type="float"/>
1662
+ </attribute>
1663
+ <attribute name="y">
1664
+ <data type="float"/>
1665
+ </attribute>
1666
+ </element>
1667
+ </oneOrMore>
1668
+ <optional>
1669
+ <element name="radius">
1670
+ <attribute name="x">
1671
+ <data type="float"/>
1672
+ </attribute>
1673
+ <optional>
1674
+ <attribute name="y">
1675
+ <data type="float"/>
1676
+ </attribute>
1677
+ </optional>
1678
+ </element>
1679
+ </optional>
1680
+ </element>
1681
+ </zeroOrMore>
1682
+ </element>
1683
+ </define>
1684
+ <define name="svgmap">
1685
+ <element name="svgmap">
1686
+ <ref name="figure"/>
1687
+ <zeroOrMore>
1688
+ <element name="target">
1689
+ <attribute name="href">
1690
+ <data type="anyURI"/>
1691
+ </attribute>
1692
+ <choice>
1693
+ <ref name="xref"/>
1694
+ <ref name="hyperlink"/>
1695
+ <ref name="eref"/>
1696
+ </choice>
1697
+ </element>
1698
+ </zeroOrMore>
1699
+ </element>
1700
+ </define>
1638
1701
  </grammar>
@@ -1443,191 +1443,225 @@
1443
1443
  <xsl:call-template name="add-zero-spaces-java"/>
1444
1444
  </xsl:template><xsl:template match="*[local-name()='table']" name="table">
1445
1445
 
1446
- <xsl:variable name="simple-table">
1447
- <xsl:call-template name="getSimpleTable"/>
1448
- </xsl:variable>
1446
+ <xsl:variable name="table">
1449
1447
 
1450
-
1451
-
1452
-
1453
-
1454
- <!-- <xsl:if test="$namespace = 'bipm'">
1455
- <fo:block>&#xA0;</fo:block>
1456
- </xsl:if> -->
1457
-
1458
- <!-- $namespace = 'iso' or -->
1459
-
1460
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
1461
-
1462
-
1448
+ <xsl:variable name="simple-table">
1449
+ <xsl:call-template name="getSimpleTable"/>
1450
+ </xsl:variable>
1463
1451
 
1464
1452
 
1465
-
1466
- <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
1467
-
1468
- <!-- <xsl:variable name="cols-count">
1469
- <xsl:choose>
1470
- <xsl:when test="*[local-name()='thead']">
1471
- <xsl:call-template name="calculate-columns-numbers">
1472
- <xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
1473
- </xsl:call-template>
1474
- </xsl:when>
1475
- <xsl:otherwise>
1476
- <xsl:call-template name="calculate-columns-numbers">
1477
- <xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
1478
- </xsl:call-template>
1479
- </xsl:otherwise>
1480
- </xsl:choose>
1481
- </xsl:variable> -->
1482
- <!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
1483
- <!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
1484
-
1485
-
1486
-
1487
- <xsl:variable name="colwidths">
1488
- <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1489
- <xsl:call-template name="calculate-column-widths">
1490
- <xsl:with-param name="cols-count" select="$cols-count"/>
1491
- <xsl:with-param name="table" select="$simple-table"/>
1492
- </xsl:call-template>
1493
- </xsl:if>
1494
- </xsl:variable>
1495
- <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1496
-
1497
- <!-- <xsl:variable name="colwidths2">
1498
- <xsl:call-template name="calculate-column-widths">
1499
- <xsl:with-param name="cols-count" select="$cols-count"/>
1500
- </xsl:call-template>
1501
- </xsl:variable> -->
1502
-
1503
- <!-- cols-count=<xsl:copy-of select="$cols-count"/>
1504
- colwidthsNew=<xsl:copy-of select="$colwidths"/>
1505
- colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
1506
-
1507
- <xsl:variable name="margin-left">
1508
- <xsl:choose>
1509
- <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
1510
- <xsl:otherwise>0</xsl:otherwise>
1511
- </xsl:choose>
1512
- </xsl:variable>
1513
-
1514
- <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
1515
1453
 
1516
1454
 
1517
-
1518
-
1519
-
1520
1455
 
1456
+ <!-- <xsl:if test="$namespace = 'bipm'">
1457
+ <fo:block>&#xA0;</fo:block>
1458
+ </xsl:if> -->
1521
1459
 
1522
-
1460
+ <!-- $namespace = 'iso' or -->
1523
1461
 
1462
+ <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
1524
1463
 
1464
+
1525
1465
 
1466
+
1526
1467
 
1468
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
1527
1469
 
1470
+ <!-- <xsl:variable name="cols-count">
1471
+ <xsl:choose>
1472
+ <xsl:when test="*[local-name()='thead']">
1473
+ <xsl:call-template name="calculate-columns-numbers">
1474
+ <xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
1475
+ </xsl:call-template>
1476
+ </xsl:when>
1477
+ <xsl:otherwise>
1478
+ <xsl:call-template name="calculate-columns-numbers">
1479
+ <xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
1480
+ </xsl:call-template>
1481
+ </xsl:otherwise>
1482
+ </xsl:choose>
1483
+ </xsl:variable> -->
1484
+ <!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
1485
+ <!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
1528
1486
 
1529
1487
 
1530
- <xsl:variable name="table_attributes">
1531
- <attribute name="table-layout">fixed</attribute>
1532
- <attribute name="width">
1533
- <xsl:choose>
1534
- <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
1535
- <xsl:otherwise>100%</xsl:otherwise>
1536
- </xsl:choose>
1537
- </attribute>
1538
- <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1539
- <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1488
+
1489
+ <xsl:variable name="colwidths">
1490
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1491
+ <xsl:call-template name="calculate-column-widths">
1492
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1493
+ <xsl:with-param name="table" select="$simple-table"/>
1494
+ </xsl:call-template>
1495
+ </xsl:if>
1496
+ </xsl:variable>
1497
+ <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1498
+
1499
+ <!-- <xsl:variable name="colwidths2">
1500
+ <xsl:call-template name="calculate-column-widths">
1501
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1502
+ </xsl:call-template>
1503
+ </xsl:variable> -->
1504
+
1505
+ <!-- cols-count=<xsl:copy-of select="$cols-count"/>
1506
+ colwidthsNew=<xsl:copy-of select="$colwidths"/>
1507
+ colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
1508
+
1509
+ <xsl:variable name="margin-left">
1510
+ <xsl:choose>
1511
+ <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
1512
+ <xsl:otherwise>0</xsl:otherwise>
1513
+ </xsl:choose>
1514
+ </xsl:variable>
1515
+
1516
+ <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
1540
1517
 
1541
1518
 
1519
+
1520
+
1521
+
1542
1522
 
1543
1523
 
1544
-
1545
-
1546
-
1524
+
1547
1525
 
1548
-
1549
1526
 
1550
- </xsl:variable>
1551
-
1552
-
1553
- <fo:table id="{@id}" table-omit-footer-at-break="true">
1554
1527
 
1555
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1556
- <xsl:attribute name="{@name}">
1557
- <xsl:value-of select="."/>
1558
- </xsl:attribute>
1559
- </xsl:for-each>
1560
1528
 
1561
- <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
1562
- <xsl:if test="$isNoteOrFnExist = 'true'">
1563
- <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1564
- </xsl:if>
1565
1529
 
1566
- <xsl:choose>
1567
- <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1568
- <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1569
- <fo:table-column column-width="{@width}"/>
1570
- </xsl:for-each>
1571
- </xsl:when>
1572
- <xsl:otherwise>
1573
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1574
- <xsl:choose>
1575
- <xsl:when test=". = 1 or . = 0">
1576
- <fo:table-column column-width="proportional-column-width(2)"/>
1577
- </xsl:when>
1578
- <xsl:otherwise>
1579
- <fo:table-column column-width="proportional-column-width({.})"/>
1580
- </xsl:otherwise>
1581
- </xsl:choose>
1582
- </xsl:for-each>
1583
- </xsl:otherwise>
1584
- </xsl:choose>
1585
1530
 
1586
- <xsl:choose>
1587
- <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
1588
- <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
1589
- </xsl:when>
1590
- <xsl:otherwise>
1591
- <xsl:apply-templates/>
1592
- </xsl:otherwise>
1593
- </xsl:choose>
1531
+ <xsl:variable name="table_width">
1532
+ <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
1533
+ 100%
1534
+
1535
+
1536
+ </xsl:variable>
1594
1537
 
1595
- </fo:table>
1596
-
1597
- <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1598
- <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1599
- <xsl:call-template name="insertTableFooterInSeparateTable">
1600
- <xsl:with-param name="table_attributes" select="$table_attributes"/>
1601
- <xsl:with-param name="colwidths" select="$colwidths"/>
1602
- <xsl:with-param name="colgroup" select="$colgroup"/>
1603
- </xsl:call-template>
1604
- </xsl:for-each>
1605
-
1606
- <!-- insert footer as table -->
1607
- <!-- <fo:table>
1608
- <xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
1609
- <xsl:attribute name="{@name}">
1610
- <xsl:value-of select="."/>
1611
- </xsl:attribute>
1612
- </xsl:for-each>
1538
+ <xsl:variable name="table_attributes">
1539
+ <attribute name="table-layout">fixed</attribute>
1540
+ <attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
1541
+ <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1542
+ <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1543
+
1544
+
1545
+
1546
+
1547
+
1548
+
1549
+
1550
+
1551
+
1552
+
1553
+ </xsl:variable>
1613
1554
 
1614
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1555
+
1556
+ <fo:table id="{@id}" table-omit-footer-at-break="true">
1557
+
1558
+ <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1559
+ <xsl:attribute name="{@name}">
1560
+ <xsl:value-of select="."/>
1561
+ </xsl:attribute>
1562
+ </xsl:for-each>
1563
+
1564
+ <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
1565
+ <xsl:if test="$isNoteOrFnExist = 'true'">
1566
+ <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1567
+ </xsl:if>
1568
+
1615
1569
  <xsl:choose>
1616
- <xsl:when test=". = 1 or . = 0">
1617
- <fo:table-column column-width="proportional-column-width(2)"/>
1570
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1571
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1572
+ <fo:table-column column-width="{@width}"/>
1573
+ </xsl:for-each>
1618
1574
  </xsl:when>
1619
1575
  <xsl:otherwise>
1620
- <fo:table-column column-width="proportional-column-width({.})"/>
1576
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1577
+ <xsl:choose>
1578
+ <xsl:when test=". = 1 or . = 0">
1579
+ <fo:table-column column-width="proportional-column-width(2)"/>
1580
+ </xsl:when>
1581
+ <xsl:otherwise>
1582
+ <fo:table-column column-width="proportional-column-width({.})"/>
1583
+ </xsl:otherwise>
1584
+ </xsl:choose>
1585
+ </xsl:for-each>
1586
+ </xsl:otherwise>
1587
+ </xsl:choose>
1588
+
1589
+ <xsl:choose>
1590
+ <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
1591
+ <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
1592
+ </xsl:when>
1593
+ <xsl:otherwise>
1594
+ <xsl:apply-templates/>
1621
1595
  </xsl:otherwise>
1622
1596
  </xsl:choose>
1597
+
1598
+ </fo:table>
1599
+
1600
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1601
+ <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1602
+ <xsl:call-template name="insertTableFooterInSeparateTable">
1603
+ <xsl:with-param name="table_attributes" select="$table_attributes"/>
1604
+ <xsl:with-param name="colwidths" select="$colwidths"/>
1605
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1606
+ </xsl:call-template>
1623
1607
  </xsl:for-each>
1624
- </fo:table>-->
1625
-
1626
-
1627
-
1628
-
1629
-
1630
- </fo:block-container>
1608
+
1609
+ <!-- insert footer as table -->
1610
+ <!-- <fo:table>
1611
+ <xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
1612
+ <xsl:attribute name="{@name}">
1613
+ <xsl:value-of select="."/>
1614
+ </xsl:attribute>
1615
+ </xsl:for-each>
1616
+
1617
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1618
+ <xsl:choose>
1619
+ <xsl:when test=". = 1 or . = 0">
1620
+ <fo:table-column column-width="proportional-column-width(2)"/>
1621
+ </xsl:when>
1622
+ <xsl:otherwise>
1623
+ <fo:table-column column-width="proportional-column-width({.})"/>
1624
+ </xsl:otherwise>
1625
+ </xsl:choose>
1626
+ </xsl:for-each>
1627
+ </fo:table>-->
1628
+
1629
+
1630
+
1631
+
1632
+
1633
+ </fo:block-container>
1634
+ </xsl:variable>
1635
+
1636
+
1637
+
1638
+ <xsl:choose>
1639
+ <xsl:when test="@width">
1640
+
1641
+ <!-- centered table when table name is centered (see table-name-style) -->
1642
+
1643
+ <fo:table table-layout="fixed" width="100%">
1644
+ <fo:table-column column-width="proportional-column-width(1)"/>
1645
+ <fo:table-column column-width="{@width}"/>
1646
+ <fo:table-column column-width="proportional-column-width(1)"/>
1647
+ <fo:table-body>
1648
+ <fo:table-row>
1649
+ <fo:table-cell column-number="2">
1650
+ <fo:block><xsl:copy-of select="$table"/></fo:block>
1651
+ </fo:table-cell>
1652
+ </fo:table-row>
1653
+ </fo:table-body>
1654
+ </fo:table>
1655
+
1656
+
1657
+
1658
+
1659
+ </xsl:when>
1660
+ <xsl:otherwise>
1661
+ <xsl:copy-of select="$table"/>
1662
+ </xsl:otherwise>
1663
+ </xsl:choose>
1664
+
1631
1665
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
1632
1666
  <xsl:if test="normalize-space() != ''">
1633
1667
  <fo:block xsl:use-attribute-sets="table-name-style">
@@ -2438,7 +2472,7 @@
2438
2472
  <xsl:with-param name="table" select="$html-table"/>
2439
2473
  </xsl:call-template>
2440
2474
  </xsl:variable>
2441
- <!-- colwidths=<xsl:value-of select="$colwidths"/> -->
2475
+ <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2442
2476
  <xsl:variable name="maxlength_dt">
2443
2477
  <xsl:call-template name="getMaxLength_dt"/>
2444
2478
  </xsl:variable>
@@ -2467,13 +2501,22 @@
2467
2501
  </xsl:when>
2468
2502
  <xsl:otherwise>
2469
2503
  <xsl:choose>
2504
+ <!-- to set width check most wide chars like `W` -->
2470
2505
  <xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 2"> <!-- if dt contains short text like t90, a, etc -->
2471
- <fo:table-column column-width="5%"/>
2472
- <fo:table-column column-width="95%"/>
2506
+ <fo:table-column column-width="7%"/>
2507
+ <fo:table-column column-width="93%"/>
2508
+ </xsl:when>
2509
+ <xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like ABC, etc -->
2510
+ <fo:table-column column-width="15%"/>
2511
+ <fo:table-column column-width="85%"/>
2473
2512
  </xsl:when>
2474
- <xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like t90, a, etc -->
2475
- <fo:table-column column-width="10%"/>
2476
- <fo:table-column column-width="90%"/>
2513
+ <xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 7"> <!-- if dt contains short text like ABCDEF, etc -->
2514
+ <fo:table-column column-width="20%"/>
2515
+ <fo:table-column column-width="80%"/>
2516
+ </xsl:when>
2517
+ <xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 10"> <!-- if dt contains short text like ABCDEFEF, etc -->
2518
+ <fo:table-column column-width="25%"/>
2519
+ <fo:table-column column-width="75%"/>
2477
2520
  </xsl:when>
2478
2521
  <!-- <xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.7">
2479
2522
  <fo:table-column column-width="60%"/>
@@ -2782,6 +2825,10 @@
2782
2825
  <xsl:param name="text" select="."/>
2783
2826
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
2784
2827
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
2828
+ </xsl:template><xsl:template name="add-zero-spaces-link-java">
2829
+ <xsl:param name="text" select="."/>
2830
+ <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
2831
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
2785
2832
  </xsl:template><xsl:template name="add-zero-spaces">
2786
2833
  <xsl:param name="text" select="."/>
2787
2834
  <xsl:variable name="zero-space-after-chars">-</xsl:variable>
@@ -3042,6 +3089,11 @@
3042
3089
  <!-- replace start and end spaces to non-break space -->
3043
3090
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
3044
3091
  </xsl:copy>
3092
+ </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
3093
+ <xsl:copy>
3094
+ <xsl:apply-templates select="@*|node()" mode="mathml"/>
3095
+ </xsl:copy>
3096
+ <mathml:mspace width="0.5ex"/>
3045
3097
  </xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
3046
3098
  <xsl:variable name="target">
3047
3099
  <xsl:choose>
@@ -3063,7 +3115,10 @@
3063
3115
  <fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
3064
3116
  <xsl:choose>
3065
3117
  <xsl:when test="normalize-space(.) = ''">
3066
- <xsl:value-of select="$target"/>
3118
+ <!-- <xsl:value-of select="$target"/> -->
3119
+ <xsl:call-template name="add-zero-spaces-link-java">
3120
+ <xsl:with-param name="text" select="$target"/>
3121
+ </xsl:call-template>
3067
3122
  </xsl:when>
3068
3123
  <xsl:otherwise>
3069
3124
  <xsl:apply-templates/>
@@ -3542,6 +3597,8 @@
3542
3597
  <xsl:copy>
3543
3598
  <xsl:apply-templates mode="contents_item"/>
3544
3599
  </xsl:copy>
3600
+ </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents_item">
3601
+ <xsl:copy-of select="."/>
3545
3602
  </xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
3546
3603
  <xsl:text> </xsl:text>
3547
3604
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -3948,11 +4005,13 @@
3948
4005
  </xsl:if>
3949
4006
  </xsl:if>
3950
4007
 
4008
+
3951
4009
  <fo:block-container margin-left="0mm">
3952
4010
 
3953
4011
  <fo:block xsl:use-attribute-sets="quote-style">
3954
4012
  <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
3955
- <xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
4013
+
4014
+ <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
3956
4015
  </fo:block>
3957
4016
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
3958
4017
  <fo:block xsl:use-attribute-sets="quote-source-style">
@@ -4362,7 +4421,7 @@
4362
4421
  <xsl:param name="charDelim" select="', '"/>
4363
4422
  <xsl:choose>
4364
4423
  <xsl:when test="$sorting = 'true' or $sorting = 'yes'">
4365
- <xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
4424
+ <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
4366
4425
  <xsl:sort data-type="text" order="ascending"/>
4367
4426
  <xsl:call-template name="insertKeyword">
4368
4427
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
@@ -4371,7 +4430,7 @@
4371
4430
  </xsl:for-each>
4372
4431
  </xsl:when>
4373
4432
  <xsl:otherwise>
4374
- <xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
4433
+ <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
4375
4434
  <xsl:call-template name="insertKeyword">
4376
4435
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
4377
4436
  <xsl:with-param name="charDelim" select="$charDelim"/>
@@ -4388,6 +4447,9 @@
4388
4447
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
4389
4448
  </xsl:choose>
4390
4449
  </xsl:template><xsl:template name="addPDFUAmeta">
4450
+ <xsl:variable name="lang">
4451
+ <xsl:call-template name="getLang"/>
4452
+ </xsl:variable>
4391
4453
  <fo:declarations>
4392
4454
  <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
4393
4455
  <pdf:dictionary type="normal" key="ViewerPreferences">
@@ -4400,13 +4462,16 @@
4400
4462
  <!-- Dublin Core properties go here -->
4401
4463
  <dc:title>
4402
4464
  <xsl:variable name="title">
4403
-
4404
-
4405
-
4406
- <xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en']"/>
4407
-
4408
-
4409
-
4465
+ <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
4466
+
4467
+
4468
+
4469
+
4470
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
4471
+
4472
+
4473
+
4474
+ </xsl:for-each>
4410
4475
  </xsl:variable>
4411
4476
  <xsl:choose>
4412
4477
  <xsl:when test="normalize-space($title) != ''">
@@ -4418,17 +4483,21 @@
4418
4483
  </xsl:choose>
4419
4484
  </dc:title>
4420
4485
  <dc:creator>
4421
-
4422
-
4423
-
4424
- </dc:creator>
4425
- <dc:description>
4426
- <xsl:variable name="abstract">
4486
+ <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
4487
+
4488
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
4489
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
4490
+ <xsl:if test="position() != last()">; </xsl:if>
4491
+ </xsl:for-each>
4427
4492
 
4428
4493
 
4429
4494
 
4495
+ </xsl:for-each>
4496
+ </dc:creator>
4497
+ <dc:description>
4498
+ <xsl:variable name="abstract">
4430
4499
 
4431
- <xsl:copy-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'abstract']//text()"/>
4500
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
4432
4501
 
4433
4502
 
4434
4503
  </xsl:variable>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "1.6.12"
3
+ VERSION = "1.6.13"
4
4
  end
5
5
  end
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.12
4
+ version: 1.6.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-25 00:00:00.000000000 Z
11
+ date: 2021-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
244
244
  - !ruby/object:Gem::Version
245
245
  version: '0'
246
246
  requirements: []
247
- rubygems_version: 3.0.3
247
+ rubygems_version: 3.1.4
248
248
  signing_key:
249
249
  specification_version: 4
250
250
  summary: metanorma-ribose lets you write Ribose standards in AsciiDoc.