metanorma-ieee 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 801b502833c67f60c19cdc1f9001296d80366f8685ff7766f81f6803d32af790
-  data.tar.gz: 93a7ac02afbd124377b1dbbcb44cf3afb511bfc20f066ec497cf925e84683ea9
+  metadata.gz: 82137fa7e1e6eb0c4f40b23a8e0c62a597e8943cebb27665598dfaded221ab30
+  data.tar.gz: 94d546f26e65755a9f9d3cf70ecbc1feb97a5fad68f1ada22184e2edd4f6c1a2
 SHA512:
-  metadata.gz: 65e1510b100c4e47212732bd1cad5a43035dde919b60e65d15c7b57d92a64db1b2ab3f4a7f0cc7191da413ba53f7bcc561ec1328946e89deb24c45a260d97e81
-  data.tar.gz: bc45ccdfdbe71458065930eaf4bb3f8a9089c51f63d2b77067cf8bcb6ab75ce6f367a9b9d6bbe142ffd914b55da99d53a8e1c2179d39feb671b269e3a52734c1
+  metadata.gz: fa81b9d4e96409b12e3a8079dd5e342ddf1b933a3b8544a10c9d8b536c2521623abc1504ee290061e30bec1838180828fea94c72a1872009993f47238ab7b116
+  data.tar.gz: 900bc942fa1bbbbba7113eb4f97385d325ae835dfbf7d5179ea8d6a37ca7f8542237beb528b2751f7313d61ee6026bbb92b89d598d23666e830e02a0f9c89ca8

data/lib/isodoc/ieee/base_convert.rb

@@ -34,29 +34,6 @@ module IsoDoc
         super.merge(type: node["type"])
       end
 
-#TODO kill
-      def note_p_parsex(node, div)
-        name = node&.at(ns("./fmt-name"))&.remove
-        div.p do |p|
-          name and p.span class: "note_label" do |s|
-            name.children.each { |n| parse(n, s) }
-          end
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..-1].each { |n| parse(n, div) }
-      end
-
-#TODO kill
-      def note_parse1x(node, div)
-        name = node&.at(ns("./name"))&.remove
-        name and div.p do |p|
-          p.span class: "note_label" do |s|
-            name.children.each { |n| parse(n, s) }
-          end
-        end
-        node.children.each { |n| parse(n, div) }
-      end
-
       def example_label(_node, div, name)
         return if name.nil?
 
@@ -65,7 +42,7 @@ module IsoDoc
         end
       end
 
-       def span_parse(node, out)
+      def span_parse(node, out)
         node["class"] == "fmt-obligation" and
           node["class"] = "obligation"
         super

data/lib/isodoc/ieee/html/ieee.css

@@ -2773,7 +2773,8 @@ div.WordSection1 {
   mso-footer-margin: 36pt;
   mso-line-numbers-count-by: 1;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+  /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
   mso-paper-source: 0;
 }
@@ -2784,7 +2785,8 @@ div.WordSection1 {
   mso-footer-margin: 36pt;
   mso-line-numbers-count-by: 1;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1l;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
+  /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
   mso-paper-source: 0;
 }
@@ -2795,7 +2797,8 @@ div.WordSection1 {
   mso-footer-margin: 36pt;
   mso-line-numbers-count-by: 1;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+  /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
   mso-paper-source: 0;
 }
@@ -2811,7 +2814,8 @@ div.WordSection2 {
   mso-footer-margin: 36pt;
   mso-line-numbers-count-by: 1;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+  /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
   mso-paper-source: 0;
 }
@@ -2822,7 +2826,8 @@ div.WordSection2 {
   mso-footer-margin: 36pt;
   mso-line-numbers-count-by: 1;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+  /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
   mso-paper-source: 0;
 }
@@ -2833,7 +2838,8 @@ div.WordSection2 {
   mso-footer-margin: 36pt;
   mso-line-numbers-count-by: 1;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1l;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
+  /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
   mso-paper-source: 0;
 }

data/lib/isodoc/ieee/html/ieee.scss

@@ -2512,7 +2512,8 @@ div.WordSection1
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+	/*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
 	mso-paper-source:0;}
 @page WordSection2L
@@ -2522,7 +2523,8 @@ div.WordSection1
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
+	/*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
 	mso-paper-source:0;}
 @page WordSection2P
@@ -2532,7 +2534,8 @@ div.WordSection1
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+	/*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
 	mso-paper-source:0;}
 div.WordSection2
@@ -2545,7 +2548,8 @@ div.WordSection2
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+	/*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
 	mso-paper-source:0;}
 @page WordSection3P
@@ -2555,7 +2559,8 @@ div.WordSection2
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
+	/*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
 	mso-paper-source:0;}
 @page WordSection3L
@@ -2565,7 +2570,8 @@ div.WordSection2
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
+	/*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
 	mso-paper-source:0;}
 div.WordSection3

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -127,7 +127,15 @@
 			<!-- IEEE cover page -->
 
 			<!-- IEEE standard cover page -->
-			<fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+				<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
+				<fo:region-before region-name="header" extent="62mm" precedence="true"/>
+				<fo:region-after region-name="footer" extent="25mm"/>
+				<fo:region-start region-name="left-region" extent="21.2mm"/>
+				<fo:region-end region-name="right-region" extent="25mm"/>
+			</fo:simple-page-master>
+			<!-- IEEE standard back page -->
+			<fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
 				<fo:region-before region-name="header" extent="62mm" precedence="true"/>
 				<fo:region-after region-name="footer" extent="25mm"/>
@@ -256,7 +264,7 @@
 			<!-- ======================= -->
 
 			<!-- Index pages -->
-			<fo:simple-page-master master-name="page-index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
 				<fo:region-before region-name="header" extent="{$marginTop}mm"/>
 				<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
@@ -903,7 +911,7 @@
 								<xsl:attribute name="initial-page-number">1</xsl:attribute>
 							</xsl:if> -->
 							<xsl:if test=".//mn:indexsect">
-								<xsl:attribute name="master-reference">page-index</xsl:attribute>
+								<xsl:attribute name="master-reference">index</xsl:attribute>
 							</xsl:if>
 
 							<xsl:call-template name="insertFootnoteSeparator"/>
@@ -3339,7 +3347,7 @@
 		<xsl:param name="cutoff_date"/>
 		<xsl:param name="expiration_date"/>
 
-		<fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
+		<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
 
 			<fo:static-content flow-name="header" role="artifact">
 				<fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -3666,7 +3674,7 @@
 	</xsl:template> <!-- END: back-page -->
 
 	<xsl:template name="insertBackPage_Standard">
-		<fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
+		<fo:page-sequence master-reference="back-page" force-page-count="no-force">
 
 			<fo:static-content flow-name="header" role="artifact">
 				<fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -8963,6 +8971,16 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
+			<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
+			<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
+				<style name="border-top">none</style>
+				<style name="border-right">none</style>
+				<style name="border-left">none</style>
+				<style name="border-bottom">none</style>
+				<style name="color">inherit</style>
+				<style name="background-color">transparent</style>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -10960,7 +10978,10 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:if test="not(parent::mn:references)">
+				<xsl:copy-of select="@id"/>
+			</xsl:if>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -13697,8 +13718,8 @@
 	</xsl:template> <!-- bibitem -->
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
-		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+		<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 --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 		<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 		<xsl:call-template name="setNamedDestination"/>
@@ -13761,7 +13782,7 @@
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
+		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -13778,8 +13799,26 @@
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
 		<!-- end bibitem processing -->
+
+		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<xsl:template name="processBibliographyNote">
+		<xsl:if test="self::mn:note">
+			<xsl:variable name="note_node">
+				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
+					<xsl:copy> <!-- skip @id -->
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:element>
+			</xsl:variable>
+			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
+				<xsl:call-template name="note"/>
+			</xsl:for-each> -->
+			<xsl:call-template name="note"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:title" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
@@ -14325,6 +14364,48 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-title-page-style">
+	</xsl:attribute-set> <!-- toc-title-page-style -->
+
+	<xsl:attribute-set name="toc-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-item-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-item-style -->
+
+	<xsl:template name="refine_toc-item-style">
+	</xsl:template> <!-- END: refine_toc-item-style -->
+
+	<xsl:attribute-set name="toc-leader-style">
+	</xsl:attribute-set> <!-- END: toc-leader-style -->
+
+	<xsl:attribute-set name="toc-pagenumber-style">
+	</xsl:attribute-set>
+
+	<!-- List of Figures, Tables -->
+	<xsl:attribute-set name="toc-listof-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -127,7 +127,15 @@
 			<!-- IEEE cover page -->
 
 			<!-- IEEE standard cover page -->
-			<fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+				<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
+				<fo:region-before region-name="header" extent="62mm" precedence="true"/>
+				<fo:region-after region-name="footer" extent="25mm"/>
+				<fo:region-start region-name="left-region" extent="21.2mm"/>
+				<fo:region-end region-name="right-region" extent="25mm"/>
+			</fo:simple-page-master>
+			<!-- IEEE standard back page -->
+			<fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
 				<fo:region-before region-name="header" extent="62mm" precedence="true"/>
 				<fo:region-after region-name="footer" extent="25mm"/>
@@ -256,7 +264,7 @@
 			<!-- ======================= -->
 
 			<!-- Index pages -->
-			<fo:simple-page-master master-name="page-index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
 				<fo:region-before region-name="header" extent="{$marginTop}mm"/>
 				<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
@@ -903,7 +911,7 @@
 								<xsl:attribute name="initial-page-number">1</xsl:attribute>
 							</xsl:if> -->
 							<xsl:if test=".//mn:indexsect">
-								<xsl:attribute name="master-reference">page-index</xsl:attribute>
+								<xsl:attribute name="master-reference">index</xsl:attribute>
 							</xsl:if>
 
 							<xsl:call-template name="insertFootnoteSeparator"/>
@@ -3339,7 +3347,7 @@
 		<xsl:param name="cutoff_date"/>
 		<xsl:param name="expiration_date"/>
 
-		<fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
+		<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
 
 			<fo:static-content flow-name="header" role="artifact">
 				<fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -3666,7 +3674,7 @@
 	</xsl:template> <!-- END: back-page -->
 
 	<xsl:template name="insertBackPage_Standard">
-		<fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
+		<fo:page-sequence master-reference="back-page" force-page-count="no-force">
 
 			<fo:static-content flow-name="header" role="artifact">
 				<fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -8963,6 +8971,16 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
+			<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
+			<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
+				<style name="border-top">none</style>
+				<style name="border-right">none</style>
+				<style name="border-left">none</style>
+				<style name="border-bottom">none</style>
+				<style name="color">inherit</style>
+				<style name="background-color">transparent</style>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -10960,7 +10978,10 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:if test="not(parent::mn:references)">
+				<xsl:copy-of select="@id"/>
+			</xsl:if>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -13697,8 +13718,8 @@
 	</xsl:template> <!-- bibitem -->
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
-		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+		<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 --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 		<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 		<xsl:call-template name="setNamedDestination"/>
@@ -13761,7 +13782,7 @@
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
+		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -13778,8 +13799,26 @@
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
 		<!-- end bibitem processing -->
+
+		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<xsl:template name="processBibliographyNote">
+		<xsl:if test="self::mn:note">
+			<xsl:variable name="note_node">
+				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
+					<xsl:copy> <!-- skip @id -->
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:element>
+			</xsl:variable>
+			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
+				<xsl:call-template name="note"/>
+			</xsl:for-each> -->
+			<xsl:call-template name="note"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:title" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
@@ -14325,6 +14364,48 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-title-page-style">
+	</xsl:attribute-set> <!-- toc-title-page-style -->
+
+	<xsl:attribute-set name="toc-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-item-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-item-style -->
+
+	<xsl:template name="refine_toc-item-style">
+	</xsl:template> <!-- END: refine_toc-item-style -->
+
+	<xsl:attribute-set name="toc-leader-style">
+	</xsl:attribute-set> <!-- END: toc-leader-style -->
+
+	<xsl:attribute-set name="toc-pagenumber-style">
+	</xsl:attribute-set>
+
+	<!-- List of Figures, Tables -->
+	<xsl:attribute-set name="toc-listof-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">

data/lib/isodoc/ieee/presentation_concepts.rb

@@ -38,15 +38,13 @@ module IsoDoc
         ret = [[coll[0]]]
         coll[1..-1].each do |r|
           if ret[-1][0]["type"] != r["type"]
-            ret << [r]
-            next
+            ret << [r] and next
           end
+
           ret[-1] << r
         end
         ret.map do |x|
-          x.map do |y|
-            to_xml(y)
-          end.join("; ")
+          x.map { |y| to_xml(y) }.join("; ")
         end.map { |x| "<p>#{x}</p>" }.join("\n")
       end
 
@@ -86,11 +84,13 @@ module IsoDoc
 
       def admitted_to_related(docxml)
         docxml.xpath(ns("//term")).each do |t|
-          t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx")).each_with_index do |a, i|
+          t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx"))
+            .each_with_index do |a, i|
             orig = semx_orig(a)
             (i.zero? ||
              orig.at(ns("./abbreviation-type | ./graphical-symbol"))) and next
-            out = t.at(ns("./fmt-related")) || t.at(ns("./definition")).before("<fmt-related/>").previous
+            out = t.at(ns("./fmt-related")) || t.at(ns("./definition"))
+              .before("<fmt-related/>").previous
             admitted_to_related1(a, t.at(ns("./fmt-preferred/semx")), out)
             a.parent.name == "fmt-preferred" and a.remove
           end
@@ -133,7 +133,8 @@ module IsoDoc
         if desgn["element"] == "preferred"
           f = orig.parent.xpath(ns("./domain | ./subject"))
             .map { |u| to_xml(semx_fmt_dup(u)) }.join(", ")
-          name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>" unless f.empty?
+          f.empty? or
+            name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
         end
         super
       end

data/lib/metanorma/ieee/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>

data/lib/metanorma/ieee/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -735,6 +735,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.5.0".freeze
+    VERSION = "1.5.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc