metanorma-itu 2.7.0 → 2.7.2

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.
@@ -132,13 +132,13 @@
132
132
  <fo:region-start region-name="left-region" extent="19.2mm"/>
133
133
  <fo:region-end region-name="right-region" extent="19.2mm"/>
134
134
  </fo:simple-page-master>
135
- <fo:page-sequence-master master-name="document-preface">
135
+ <fo:page-sequence-master master-name="preface">
136
136
  <fo:repeatable-page-master-alternatives>
137
137
  <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-preface"/>
138
138
  <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-preface"/>
139
139
  </fo:repeatable-page-master-alternatives>
140
140
  </fo:page-sequence-master>
141
- <fo:page-sequence-master master-name="document-preface-landscape">
141
+ <fo:page-sequence-master master-name="preface-landscape">
142
142
  <fo:repeatable-page-master-alternatives>
143
143
  <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-preface-landscape"/>
144
144
  <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-preface-landscape"/>
@@ -321,7 +321,6 @@
321
321
  </xsl:variable>
322
322
 
323
323
  <xsl:variable name="i18n_keywords"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">keywords</xsl:with-param><xsl:with-param name="bibdata_updated" select="/*/mn:bibdata"/></xsl:call-template></xsl:variable>
324
- <xsl:variable name="i18n_page"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">Page.sg</xsl:with-param><xsl:with-param name="bibdata_updated" select="/*/mn:bibdata"/></xsl:call-template></xsl:variable>
325
324
 
326
325
  <xsl:call-template name="cover-page">
327
326
  <xsl:with-param name="num" select="$num"/>
@@ -345,7 +344,7 @@
345
344
 
346
345
  <xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
347
346
 
348
- <fo:page-sequence master-reference="document-preface" format="i" force-page-count="no-force">
347
+ <fo:page-sequence master-reference="preface" format="i" force-page-count="no-force">
349
348
 
350
349
  <xsl:if test="$doctype = 'resolution'">
351
350
  <xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -356,7 +355,7 @@
356
355
  </xsl:if>
357
356
 
358
357
  <xsl:attribute name="master-reference">
359
- <xsl:text>document-preface</xsl:text>
358
+ <xsl:text>preface</xsl:text>
360
359
  <xsl:call-template name="getPageSequenceOrientation"/>
361
360
  </xsl:attribute>
362
361
 
@@ -1827,27 +1826,27 @@
1827
1826
 
1828
1827
  <xsl:template name="insertListOf_Title">
1829
1828
  <xsl:param name="title"/>
1830
- <fo:block space-before="36pt" text-align="center" font-weight="bold" keep-with-next="always">
1829
+ <fo:block xsl:use-attribute-sets="toc-listof-title-style">
1831
1830
  <xsl:value-of select="$title"/>
1832
1831
  </fo:block>
1833
1832
  </xsl:template>
1834
1833
 
1835
1834
  <xsl:template name="insertListOf_Item">
1836
- <fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
1835
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
1837
1836
  <fo:basic-link internal-destination="{@id}">
1838
1837
  <xsl:call-template name="setAltText">
1839
1838
  <xsl:with-param name="value" select="@alt-text"/>
1840
1839
  </xsl:call-template>
1841
1840
  <xsl:apply-templates select="." mode="contents"/>
1842
1841
  <fo:inline keep-together.within-line="always">
1843
- <fo:leader leader-pattern="dots"/>
1842
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
1844
1843
  <fo:page-number-citation ref-id="{@id}"/>
1845
1844
  </fo:inline>
1846
1845
  </fo:basic-link>
1847
1846
  </fo:block>
1848
1847
  </xsl:template>
1849
1848
 
1850
- <xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
1849
+ <xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
1851
1850
  <xsl:param name="process">false</xsl:param>
1852
1851
  <xsl:param name="num"/>
1853
1852
 
@@ -1864,14 +1863,11 @@
1864
1863
  <xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
1865
1864
 
1866
1865
  <xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true']">
1867
- <fo:block role="TOCI">
1868
- <xsl:if test="@level = 1">
1869
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
1870
- </xsl:if>
1871
- <xsl:if test="@level &gt;= 2">
1872
- <xsl:attribute name="margin-top">4pt</xsl:attribute>
1873
- <!-- <xsl:attribute name="margin-left">12mm</xsl:attribute> -->
1874
- </xsl:if>
1866
+
1867
+ <fo:block xsl:use-attribute-sets="toc-item-style">
1868
+
1869
+ <xsl:call-template name="refine_toc-item-style"/>
1870
+
1875
1871
  <fo:list-block provisional-label-separation="3mm">
1876
1872
  <xsl:attribute name="provisional-distance-between-starts">
1877
1873
  <xsl:choose>
@@ -1885,7 +1881,7 @@
1885
1881
  </xsl:choose>
1886
1882
  </xsl:if>
1887
1883
  <xsl:if test="@level &gt;= 2"><xsl:value-of select="(@level - 1) * 26"/>mm</xsl:if>
1888
- </xsl:when> <!-- -->
1884
+ </xsl:when>
1889
1885
  <xsl:otherwise>0mm</xsl:otherwise>
1890
1886
  </xsl:choose>
1891
1887
  </xsl:attribute>
@@ -1905,7 +1901,7 @@
1905
1901
  <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
1906
1902
  <xsl:apply-templates select="mnx:title"/>
1907
1903
  <fo:inline keep-together.within-line="always">
1908
- <fo:leader leader-pattern="dots"/>
1904
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
1909
1905
  <fo:page-number-citation ref-id="{@id}"/>
1910
1906
  </fo:inline>
1911
1907
  </fo:basic-link>
@@ -1919,34 +1915,30 @@
1919
1915
  <xsl:variable name="i18n_page"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">Page.sg</xsl:with-param><xsl:with-param name="bibdata_updated" select="/*/mn:bibdata"/></xsl:call-template></xsl:variable>
1920
1916
 
1921
1917
  <!-- List of Tables -->
1922
- <xsl:if test="$contents//mnx:tables/mnx:table">
1923
- <xsl:call-template name="insertListOf_Title">
1924
- <xsl:with-param name="title" select="$title-list-tables"/>
1925
- </xsl:call-template>
1926
- <fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
1927
- <xsl:value-of select="$i18n_page"/>
1928
- </fo:block>
1929
- <fo:block-container>
1930
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
1931
- <xsl:call-template name="insertListOf_Item"/>
1932
- </xsl:for-each>
1933
- </fo:block-container>
1934
- </xsl:if>
1918
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
1919
+ <xsl:if test="position() = 1">
1920
+ <xsl:call-template name="insertListOf_Title">
1921
+ <xsl:with-param name="title" select="$title-list-tables"/>
1922
+ </xsl:call-template>
1923
+ <fo:block xsl:use-attribute-sets="toc-title-page-style">
1924
+ <xsl:value-of select="$i18n_page"/>
1925
+ </fo:block>
1926
+ </xsl:if>
1927
+ <xsl:call-template name="insertListOf_Item"/>
1928
+ </xsl:for-each>
1935
1929
 
1936
1930
  <!-- List of Figures -->
1937
- <xsl:if test="$contents//mnx:figures/mnx:figure">
1938
- <xsl:call-template name="insertListOf_Title">
1939
- <xsl:with-param name="title" select="$title-list-figures"/>
1940
- </xsl:call-template>
1941
- <fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
1942
- <xsl:value-of select="$i18n_page"/>
1943
- </fo:block>
1944
- <fo:block-container>
1945
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1946
- <xsl:call-template name="insertListOf_Item"/>
1947
- </xsl:for-each>
1948
- </fo:block-container>
1949
- </xsl:if>
1931
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1932
+ <xsl:if test="position() = 1">
1933
+ <xsl:call-template name="insertListOf_Title">
1934
+ <xsl:with-param name="title" select="$title-list-figures"/>
1935
+ </xsl:call-template>
1936
+ <fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
1937
+ <xsl:value-of select="$i18n_page"/>
1938
+ </fo:block>
1939
+ </xsl:if>
1940
+ <xsl:call-template name="insertListOf_Item"/>
1941
+ </xsl:for-each>
1950
1942
 
1951
1943
  </xsl:if>
1952
1944
  </fo:block>
@@ -1956,15 +1948,11 @@
1956
1948
  </xsl:template>
1957
1949
 
1958
1950
  <xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="4">
1959
- <fo:block margin-top="6pt" text-align="center" font-weight="bold" role="H1">
1960
- <!-- <xsl:call-template name="getLocalizedString">
1961
- <xsl:with-param name="key">table_of_contents</xsl:with-param>
1962
- </xsl:call-template> -->
1951
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1963
1952
  <xsl:apply-templates/>
1964
1953
  </fo:block>
1965
- <fo:block margin-top="6pt" text-align="end" font-weight="bold">
1966
- <xsl:variable name="i18n_page"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">Page.sg</xsl:with-param><xsl:with-param name="bibdata_updated" select="/*/mn:bibdata"/></xsl:call-template></xsl:variable>
1967
- <xsl:value-of select="$i18n_page"/>
1954
+ <fo:block xsl:use-attribute-sets="toc-title-page-style">
1955
+ <xsl:call-template name="getLocalizedString"><xsl:with-param name="key">Page.sg</xsl:with-param><xsl:with-param name="bibdata_updated" select="/*/mn:bibdata"/></xsl:call-template>
1968
1956
  </fo:block>
1969
1957
  </xsl:template>
1970
1958
 
@@ -8120,6 +8108,16 @@
8120
8108
  </xsl:variable>
8121
8109
  <xsl:variable name="quot">"</xsl:variable>
8122
8110
  <xsl:variable name="styles_">
8111
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
8112
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
8113
+ <style name="border-top">none</style>
8114
+ <style name="border-right">none</style>
8115
+ <style name="border-left">none</style>
8116
+ <style name="border-bottom">none</style>
8117
+ <style name="color">inherit</style>
8118
+ <style name="background-color">transparent</style>
8119
+ </xsl:if>
8120
+
8123
8121
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
8124
8122
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8125
8123
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -10152,7 +10150,10 @@
10152
10150
 
10153
10151
  <xsl:call-template name="setNamedDestination"/>
10154
10152
 
10155
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
10153
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
10154
+ <xsl:if test="not(parent::mn:references)">
10155
+ <xsl:copy-of select="@id"/>
10156
+ </xsl:if>
10156
10157
 
10157
10158
  <xsl:call-template name="setBlockSpanAll"/>
10158
10159
 
@@ -12606,7 +12607,7 @@
12606
12607
 
12607
12608
  <xsl:template name="insertFootnoteSeparatorCommon">
12608
12609
  <xsl:param name="leader_length">30%</xsl:param>
12609
- <fo:static-content flow-name="xsl-footnote-separator">
12610
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
12610
12611
  <fo:block>
12611
12612
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
12612
12613
  </fo:block>
@@ -12848,8 +12849,8 @@
12848
12849
  </xsl:template> <!-- bibitem -->
12849
12850
 
12850
12851
  <!-- Bibliography (non-normative references) -->
12851
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
12852
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
12852
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
12853
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
12853
12854
  <xsl:choose>
12854
12855
  <xsl:when test="$skip = 'true'"><!-- skip bibitem --></xsl:when>
12855
12856
  <xsl:otherwise>
@@ -12887,7 +12888,7 @@
12887
12888
  </fo:list-item>
12888
12889
  </xsl:otherwise>
12889
12890
  </xsl:choose>
12890
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
12891
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
12891
12892
  <xsl:with-param name="skip">false</xsl:with-param>
12892
12893
  </xsl:apply-templates>
12893
12894
  </xsl:template>
@@ -12955,8 +12956,25 @@
12955
12956
  </xsl:choose>
12956
12957
  <!-- end ITU bibitem processing -->
12957
12958
 
12959
+ <xsl:call-template name="processBibliographyNote"/>
12958
12960
  </xsl:template> <!-- processBibitem (bibitem) -->
12959
12961
 
12962
+ <xsl:template name="processBibliographyNote">
12963
+ <xsl:if test="self::mn:note">
12964
+ <xsl:variable name="note_node">
12965
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
12966
+ <xsl:copy> <!-- skip @id -->
12967
+ <xsl:copy-of select="node()"/>
12968
+ </xsl:copy>
12969
+ </xsl:element>
12970
+ </xsl:variable>
12971
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
12972
+ <xsl:call-template name="note"/>
12973
+ </xsl:for-each> -->
12974
+ <xsl:call-template name="note"/>
12975
+ </xsl:if>
12976
+ </xsl:template>
12977
+
12960
12978
  <xsl:template match="mn:title" mode="title">
12961
12979
  <fo:inline><xsl:apply-templates/></fo:inline>
12962
12980
  </xsl:template>
@@ -13502,6 +13520,79 @@
13502
13520
  <!-- End Form's elements processing -->
13503
13521
  <!-- =================== -->
13504
13522
 
13523
+ <xsl:attribute-set name="toc-style">
13524
+ </xsl:attribute-set>
13525
+
13526
+ <xsl:template name="refine_toc-style">
13527
+ </xsl:template>
13528
+
13529
+ <xsl:attribute-set name="toc-title-style">
13530
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
13531
+ <xsl:attribute name="text-align">center</xsl:attribute>
13532
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
13533
+ <xsl:attribute name="role">H1</xsl:attribute>
13534
+ </xsl:attribute-set>
13535
+
13536
+ <xsl:template name="refine_toc-title-style">
13537
+ </xsl:template>
13538
+
13539
+ <xsl:attribute-set name="toc-title-page-style">
13540
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
13541
+ <xsl:attribute name="text-align">end</xsl:attribute>
13542
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
13543
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
13544
+ </xsl:attribute-set> <!-- toc-title-page-style -->
13545
+
13546
+ <xsl:template name="refine_toc-title-page-style">
13547
+ </xsl:template>
13548
+
13549
+ <xsl:attribute-set name="toc-item-block-style">
13550
+ </xsl:attribute-set>
13551
+
13552
+ <xsl:template name="refine_toc-item-block-style">
13553
+ </xsl:template>
13554
+
13555
+ <xsl:attribute-set name="toc-item-style">
13556
+ <xsl:attribute name="role">TOCI</xsl:attribute>
13557
+ </xsl:attribute-set> <!-- END: toc-item-style -->
13558
+
13559
+ <xsl:template name="refine_toc-item-style">
13560
+ <xsl:if test="@level = 1">
13561
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
13562
+ </xsl:if>
13563
+ <xsl:if test="@level &gt;= 2">
13564
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
13565
+ <!-- <xsl:attribute name="margin-left">12mm</xsl:attribute> -->
13566
+ </xsl:if>
13567
+ </xsl:template> <!-- END: refine_toc-item-style -->
13568
+
13569
+ <xsl:attribute-set name="toc-leader-style">
13570
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
13571
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
13572
+
13573
+ <xsl:attribute-set name="toc-pagenumber-style">
13574
+ </xsl:attribute-set>
13575
+
13576
+ <!-- List of Figures, Tables -->
13577
+ <xsl:attribute-set name="toc-listof-title-style">
13578
+ <xsl:attribute name="space-before">36pt</xsl:attribute>
13579
+ <xsl:attribute name="text-align">center</xsl:attribute>
13580
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
13581
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
13582
+ </xsl:attribute-set>
13583
+
13584
+ <xsl:template name="refine_toc-listof-title-style">
13585
+ </xsl:template>
13586
+
13587
+ <xsl:attribute-set name="toc-listof-item-block-style">
13588
+ </xsl:attribute-set>
13589
+
13590
+ <xsl:attribute-set name="toc-listof-item-style">
13591
+ <xsl:attribute name="role">TOCI</xsl:attribute>
13592
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
13593
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
13594
+ </xsl:attribute-set>
13595
+
13505
13596
  <xsl:template name="processPrefaceSectionsDefault_Contents">
13506
13597
  <xsl:variable name="nodes_preface_">
13507
13598
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -13839,7 +13930,7 @@
13839
13930
  </xsl:if>
13840
13931
 
13841
13932
  <xsl:for-each select="$contents_nodes/mnx:doc">
13842
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
13933
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
13843
13934
  <xsl:if test="@bundle = 'true'">
13844
13935
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
13845
13936
  </xsl:if>
@@ -13873,7 +13964,7 @@
13873
13964
  </xsl:choose>
13874
13965
  </fo:bookmark-title>
13875
13966
 
13876
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
13967
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
13877
13968
 
13878
13969
  <xsl:call-template name="insertFigureBookmarks">
13879
13970
  <xsl:with-param name="contents" select="mnx:contents"/>
@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
198
198
  </zeroOrMore>
199
199
  </element>
200
200
  </optional>
201
- <optional>
201
+ <zeroOrMore>
202
202
  <element name="description">
203
- <a:documentation>Description of the change described in this block</a:documentation>
204
- <zeroOrMore>
203
+ <a:documentation>Description(s) of the change described in this block</a:documentation>
204
+ <oneOrMore>
205
205
  <ref name="BasicBlock"/>
206
- </zeroOrMore>
206
+ </oneOrMore>
207
207
  </element>
208
- </optional>
208
+ </zeroOrMore>
209
209
  <optional>
210
210
  <element name="newcontent">
211
211
  <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
1291
1291
  <ref name="pure_strike"/>
1292
1292
  <ref name="pure_smallcap"/>
1293
1293
  <ref name="br"/>
1294
+ <ref name="stem"/>
1294
1295
  </choice>
1295
1296
  </define>
1296
1297
  <define name="NestedTextElement">
1297
1298
  <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
1298
1299
  <choice>
1299
1300
  <ref name="PureTextElement"/>
1300
- <ref name="stem"/>
1301
1301
  <ref name="eref"/>
1302
1302
  <ref name="xref"/>
1303
1303
  <ref name="hyperlink"/>
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <!-- VERSION v2.0.8 -->
3
+ <!-- VERSION v2.1.0 -->
4
4
 
5
5
  <!--
6
6
  ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
42
42
  but to `@anchor`, the user-supplied cross-reference</a:documentation>
43
43
  <text/>
44
44
  </define>
45
- <define name="index-primary">
46
- <element name="primary">
47
- <oneOrMore>
48
- <choice>
49
- <ref name="PureTextElement"/>
50
- <ref name="stem"/>
51
- </choice>
52
- </oneOrMore>
53
- </element>
54
- </define>
55
- <define name="index-secondary">
56
- <element name="secondary">
57
- <oneOrMore>
58
- <choice>
59
- <ref name="PureTextElement"/>
60
- <ref name="stem"/>
61
- </choice>
62
- </oneOrMore>
63
- </element>
64
- </define>
65
- <define name="index-tertiary">
66
- <element name="tertiary">
67
- <oneOrMore>
68
- <choice>
69
- <ref name="PureTextElement"/>
70
- <ref name="stem"/>
71
- </choice>
72
- </oneOrMore>
73
- </element>
74
- </define>
75
45
  <define name="review">
76
46
  <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
77
47
  the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
592
562
  </oneOrMore>
593
563
  </element>
594
564
  </define>
595
- <define name="sub">
596
- <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
597
- <element name="sub">
598
- <zeroOrMore>
599
- <choice>
600
- <ref name="PureTextElement"/>
601
- <ref name="stem"/>
602
- </choice>
603
- </zeroOrMore>
604
- </element>
605
- </define>
606
- <define name="sup">
607
- <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
608
- <element name="sup">
609
- <zeroOrMore>
610
- <choice>
611
- <ref name="PureTextElement"/>
612
- <ref name="stem"/>
613
- </choice>
614
- </zeroOrMore>
615
- </element>
616
- </define>
617
565
  <define name="pagebreak">
618
566
  <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
619
567
  <element name="pagebreak">
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
735
683
  <ref name="BlockAttributes"/>
736
684
  </define>
737
685
  <define name="TableAttributes" combine="interleave">
686
+ <optional>
687
+ <attribute name="plain">
688
+ <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
689
+ <data type="boolean"/>
690
+ </attribute>
691
+ </optional>
738
692
  <optional>
739
693
  <attribute name="width">
740
694
  <a:documentation>Width of the table block in rendering</a:documentation>
@@ -1088,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
1088
1042
  <zeroOrMore>
1089
1043
  <choice>
1090
1044
  <ref name="PureTextElement"/>
1091
- <ref name="stem"/>
1092
1045
  <ref name="index"/>
1093
1046
  <ref name="index-xref"/>
1094
1047
  </choice>
@@ -1101,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
1101
1054
  <zeroOrMore>
1102
1055
  <choice>
1103
1056
  <ref name="PureTextElement"/>
1104
- <ref name="stem"/>
1105
1057
  <ref name="index"/>
1106
1058
  <ref name="index-xref"/>
1107
1059
  </choice>
@@ -2019,10 +1971,7 @@ used in document amendments</a:documentation>
2019
1971
  <element name="name">
2020
1972
  <a:documentation>The symbolic form of the designation</a:documentation>
2021
1973
  <oneOrMore>
2022
- <choice>
2023
- <ref name="PureTextElement"/>
2024
- <ref name="stem"/>
2025
- </choice>
1974
+ <ref name="PureTextElement"/>
2026
1975
  </oneOrMore>
2027
1976
  </element>
2028
1977
  </element>
@@ -2075,7 +2024,6 @@ used in document amendments</a:documentation>
2075
2024
  <zeroOrMore>
2076
2025
  <choice>
2077
2026
  <ref name="PureTextElement"/>
2078
- <ref name="stem"/>
2079
2027
  <ref name="index"/>
2080
2028
  <ref name="index-xref"/>
2081
2029
  </choice>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Itu
3
- VERSION = "2.7.0".freeze
3
+ VERSION = "2.7.2".freeze
4
4
  end
5
5
  end
@@ -42,5 +42,5 @@ spec.add_development_dependency "rubocop-performance"
42
42
  spec.add_development_dependency "simplecov", "~> 0.15"
43
43
  spec.add_development_dependency "timecop", "~> 0.9"
44
44
  spec.add_development_dependency "webmock"
45
- spec.add_development_dependency "xml-c14n"
45
+ spec.add_development_dependency "canon"
46
46
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-itu
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.0
4
+ version: 2.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-07-05 00:00:00.000000000 Z
11
+ date: 2025-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -235,7 +235,7 @@ dependencies:
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  - !ruby/object:Gem::Dependency
238
- name: xml-c14n
238
+ name: canon
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
241
  - - ">="