metanorma-iec 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f6bc14680c197555785231faaa0869ab871b4512a7ccbd70b777496a6bba0e
-  data.tar.gz: 67a8eec620949d8ab8cf051ed565c841062dc65257abaccb641cd5b4f6cf4926
+  metadata.gz: 582be39d0a34200cdd7f77519d2366e23bfa3c07bb5e9c23ffb5dae558f5796b
+  data.tar.gz: c5d650ca2ccab49fd4719ff61f52781fe21f0f530d564412a3b08ac7a747baba
 SHA512:
-  metadata.gz: e07e419fb0656fff285c3026ff77faff0e0bca0f26f18a8666ac748f651fec0dd140cce944e10a20b9c3929988c27ae8740e456ece5774d66bba658c1564e6c4
-  data.tar.gz: 7438d74061aa138779b8d307379dc88dedbf6fa0de91fec335e7dcd54409ae7e7d9ff177b172940ea46072e81491c2ae81f2fe20856e550fb12a2636a5f7e31c
+  metadata.gz: 3c97a5a76d0bfb9986ccb5bdc05d81464dbb807fd4a3cbf717438b92ae774893b9bc27e05fabde23a7461ef042a01a8767a422ed91bd913925ef74d45978fd41
+  data.tar.gz: dcd178a0bcc682a0ab14b02bb29b8c031bc75983f5f799786dbfc9a238e842f7678527e39e040f82c284a22bf4ec82a2226cbce0c3d33a0df503b113ec75b064

data/lib/isodoc/iec/base_convert.rb

@@ -8,32 +8,13 @@ module IsoDoc
         # processed in foreword instead
       end
 
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword"))
-        b = isoxml.at(ns("//boilerplate/legal-statement"))
-        page_break(out)
-        iec_orgname(out)
-        middle_title(isoxml, out)
-        foreword1(f, b, out)
-      end
-
-      def foreword1(sect, boilerplate, out)
+      def foreword(sect, out)
         out.div **attr_code(id: sect ? sect["id"] : "") do |s|
           s.h1(class: "ForewordTitle") { |h1| h1 << @i18n.foreword }
-          @meta.get[:doctype] == "Amendment" or
-            s.div **attr_code(class: "boilerplate_legal") do |s1|
-              boilerplate&.elements&.each { |e| parse(e, s1) }
-            end
           sect&.elements&.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
-      def iec_orgname(out)
-        out.p(class: "zzSTDTitle1") { |p| p << @i18n.get["IEC"] }
-        out.p(class: "zzSTDTitle1") { |p| p << "____________" }
-        out.p(class: "zzSTDTitle1") { |p| p << "&#xa0;" }
-      end
-
       def middle_title(_isoxml, out)
         title1, title2 = middle_title_parts(out)
         out.p(class: "zzSTDTitle1") do |p|
@@ -94,6 +75,19 @@ module IsoDoc
       def set_termdomain(termdomain)
         return super unless @is_iev
       end
+
+      def para_class(node)
+        case node["class"]
+        when "zzSTDTitle1", "zzSTDTitle2" then "zzSTDTitle1"
+        else super
+        end
+      end
+
+      def clause_attrs(node)
+        ret = super
+        node["type"] == "boilerplate_legal" and ret["class"] = "boilerplate_legal"
+        ret
+      end
     end
   end
 end

data/lib/isodoc/iec/html/html_iec_intro.html

@@ -2,7 +2,6 @@
 
 <nav>
 
-  <h1 id="content">{{ labels["table_of_contents"] }}</h1>
   <div id="toc"></div>
 
 </nav>

data/lib/isodoc/iec/html/word_iec_intro.html

@@ -1,3 +0,0 @@
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
-
-WORDTOC

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -452,10 +452,10 @@
 								</fo:block>
 								<fo:block-container margin-left="1.5mm">
 									<fo:block-container margin-left="0mm">
-										<fo:block-container border="0.5pt solid black" font-size="10pt" margin-top="8mm" font-weight="bold" padding-left="1.5mm" padding-top="0.5mm" width="102%" height="11mm" display-align="center">
-											<fo:block margin-left="2mm">Warning! Make sure that you obtained this publication from an authorized distributor.</fo:block>
+										<fo:block-container border="0.5pt solid black" font-size="10pt" margin-top="8mm" font-weight="bold" padding-left="1.5mm" padding-top="0.5mm" width="102%" height="11mm" display-align="center" id="__internal_layout__warning_block">
+											<fo:block margin-left="1mm">Warning! Make sure that you obtained this publication from an authorized distributor.</fo:block>
 											<xsl:if test="//iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
-												<fo:block margin-left="2mm" margin-top="3pt">Attention! Veuillez vous assurer que vous avez obtenu cette publication via un distributeur agréé.</fo:block>
+												<fo:block margin-left="1mm" margin-top="3pt">Attention! Veuillez vous assurer que vous avez obtenu cette publication via un distributeur agréé.</fo:block>
 											</xsl:if>
 										</fo:block-container>
 									</fo:block-container>
@@ -869,9 +869,9 @@
 
 					<xsl:for-each select="xalan:nodeset($current_document)">
 
-						<xsl:variable name="docid">
+						<!-- <xsl:variable name="docid">
 							<xsl:call-template name="getDocumentId"/>
-						</xsl:variable>
+						</xsl:variable> -->
 
 						<fo:page-sequence master-reference="document" format="1" force-page-count="no-force"> <!-- initial-page-number="2"   -->
 
@@ -883,17 +883,22 @@
 							</xsl:if>
 
 							<xsl:call-template name="insertHeaderFooter"/>
-								<fo:flow flow-name="xsl-region-body">
+							<fo:flow flow-name="xsl-region-body">
+
+								<xsl:call-template name="processPrefaceSectionsDefault"/>
 
+								<!--
 								<xsl:call-template name="insertTOCpages">
 									<xsl:with-param name="contents" select="$contents/doc[@id = $docid]"/>
 								</xsl:call-template>
-
+								
 								<xsl:call-template name="insertPrefacepages">
 									<xsl:with-param name="lang" select="$lang"/>
 								</xsl:call-template>
+								-->
 
-								</fo:flow>
+								<fo:block/> <!-- for prevent empty preface -->
+							</fo:flow>
 						</fo:page-sequence>
 
 						<xsl:call-template name="insertBodypages">
@@ -1191,7 +1196,7 @@
 
 	<xsl:template name="insertTOCpages">
 		<xsl:param name="contents"/>
-		<fo:block-container>
+		<!-- <fo:block-container>
 			<fo:block role="TOC">
 				<fo:block font-size="12pt" text-align="center" margin-bottom="22pt" role="H1">
 					<xsl:variable name="title-toc">
@@ -1202,90 +1207,90 @@
 					<xsl:call-template name="addLetterSpacing">
 						<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
 					</xsl:call-template>
-				</fo:block>
-
-				<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [@display = 'true']
-																																											[@level &lt;= 3]
-																																											[not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
-					<fo:block text-align-last="justify" role="TOCI">
-						<xsl:if test="@level = 1">
-							<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@level = 2">
-							<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@level &gt;= 3">
-							<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@type = 'indexsect'">
-							<xsl:attribute name="space-before">16pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@type = 'references'">
-							<xsl:attribute name="space-before">5pt</xsl:attribute>
-						</xsl:if>
-
-						<fo:list-block>
-							<xsl:attribute name="margin-left">
-								<xsl:choose>
-									<xsl:when test="title/@variant-title = 'true'">0mm</xsl:when>
-									<xsl:when test="@level = 2">8mm</xsl:when>
-									<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
-									<xsl:otherwise>0mm</xsl:otherwise>
-								</xsl:choose>
-							</xsl:attribute>
-							<xsl:attribute name="provisional-distance-between-starts">
-								<xsl:choose>
-									<xsl:when test="@section = ''">0mm</xsl:when>
-									<xsl:when test="@level = 1">8mm</xsl:when>
-									<xsl:when test="@level = 2">15mm</xsl:when>
-									<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 19"/>mm</xsl:when>
-									<xsl:otherwise>0mm</xsl:otherwise>
-								</xsl:choose>
-							</xsl:attribute>
-							<fo:list-item>
-								<fo:list-item-label end-indent="label-end()">
-									<fo:block>
-										<xsl:value-of select="@section"/>
-									</fo:block>
-								</fo:list-item-label>
-								<fo:list-item-body start-indent="body-start()">
-									<fo:block text-align-last="justify">
-										<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-											<xsl:variable name="title">
-												<xsl:apply-templates select="title"/>
-											</xsl:variable>
-											<xsl:call-template name="addLetterSpacing">
-												<xsl:with-param name="text" select="$title"/>
-											</xsl:call-template>
-											<xsl:text> </xsl:text>
-											<fo:inline keep-together.within-line="always">
-												<fo:leader leader-pattern="dots"/>
-												<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-											</fo:inline>
-										</fo:basic-link>
-									</fo:block>
-								</fo:list-item-body>
-							</fo:list-item>
-						</fo:list-block>
-					</fo:block>
-				</xsl:for-each>
-
-				<xsl:if test="$contents//figures/figure">
-					<fo:block margin-bottom="5pt"> </fo:block>
-					<xsl:for-each select="$contents//figures/figure">
-						<xsl:call-template name="insertListOf_Item"/>
-					</xsl:for-each>
+				</fo:block> -->
+
+		<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [@display = 'true']
+																																									[@level &lt;= 3]
+																																									[not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+			<fo:block text-align-last="justify" role="TOCI">
+				<xsl:if test="@level = 1">
+					<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
 				</xsl:if>
-
-				<xsl:if test="$contents//tables/table">
-					<fo:block margin-bottom="5pt"> </fo:block>
-					<xsl:for-each select="$contents//tables/table">
-						<xsl:call-template name="insertListOf_Item"/>
-					</xsl:for-each>
+				<xsl:if test="@level = 2">
+					<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@level &gt;= 3">
+					<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@type = 'indexsect'">
+					<xsl:attribute name="space-before">16pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@type = 'references'">
+					<xsl:attribute name="space-before">5pt</xsl:attribute>
 				</xsl:if>
 
+				<fo:list-block>
+					<xsl:attribute name="margin-left">
+						<xsl:choose>
+							<xsl:when test="title/@variant-title = 'true'">0mm</xsl:when>
+							<xsl:when test="@level = 2">8mm</xsl:when>
+							<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
+							<xsl:otherwise>0mm</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<xsl:attribute name="provisional-distance-between-starts">
+						<xsl:choose>
+							<xsl:when test="@section = ''">0mm</xsl:when>
+							<xsl:when test="@level = 1">8mm</xsl:when>
+							<xsl:when test="@level = 2">15mm</xsl:when>
+							<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 19"/>mm</xsl:when>
+							<xsl:otherwise>0mm</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<fo:list-item>
+						<fo:list-item-label end-indent="label-end()">
+							<fo:block>
+								<xsl:value-of select="@section"/>
+							</fo:block>
+						</fo:list-item-label>
+						<fo:list-item-body start-indent="body-start()">
+							<fo:block text-align-last="justify">
+								<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
+									<xsl:variable name="title">
+										<xsl:apply-templates select="title"/>
+									</xsl:variable>
+									<xsl:call-template name="addLetterSpacing">
+										<xsl:with-param name="text" select="$title"/>
+									</xsl:call-template>
+									<xsl:text> </xsl:text>
+									<fo:inline keep-together.within-line="always">
+										<fo:leader leader-pattern="dots"/>
+										<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+									</fo:inline>
+								</fo:basic-link>
+							</fo:block>
+						</fo:list-item-body>
+					</fo:list-item>
+				</fo:list-block>
 			</fo:block>
-		</fo:block-container>
+		</xsl:for-each>
+
+		<xsl:if test="$contents//figures/figure">
+			<fo:block margin-bottom="5pt"> </fo:block>
+			<xsl:for-each select="$contents//figures/figure">
+				<xsl:call-template name="insertListOf_Item"/>
+			</xsl:for-each>
+		</xsl:if>
+
+		<xsl:if test="$contents//tables/table">
+			<fo:block margin-bottom="5pt"> </fo:block>
+			<xsl:for-each select="$contents//tables/table">
+				<xsl:call-template name="insertListOf_Item"/>
+			</xsl:for-each>
+		</xsl:if>
+
+			<!-- </fo:block>
+		</fo:block-container> -->
 	</xsl:template>
 
 	<xsl:template name="insertListOf_Item">
@@ -1300,6 +1305,49 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="iec:preface/iec:clause[@type = 'toc']" priority="3">
+		<fo:block-container>
+			<fo:block role="TOC">
+				<xsl:apply-templates/>
+
+				<xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
+					<xsl:variable name="docid">
+						<xsl:call-template name="getDocumentId"/>
+					</xsl:variable>
+					<xsl:call-template name="insertTOCpages">
+						<xsl:with-param name="contents" select="$contents/doc[@id = $docid]"/>
+					</xsl:call-template>
+				</xsl:if>
+			</fo:block>
+		</fo:block-container>
+	</xsl:template>
+
+	<xsl:template match="iec:preface/iec:clause[@type = 'toc']/iec:title" priority="3">
+		<fo:block font-size="12pt" text-align="center" margin-bottom="22pt" role="H1">
+			<xsl:call-template name="addLetterSpacing">
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(.))"/>
+			</xsl:call-template>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iec:preface/iec:pagebreak" priority="3">
+		<fo:block break-after="page"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/iec:p[starts-with(@class, 'zzSTDTitle')]" priority="3">
+		<fo:block-container font-size="12pt" text-align="center">
+			<xsl:if test="following-sibling::*[1][not(self::iec:p[starts-with(@class, 'zzSTDTitle')])]">
+				<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+			</xsl:if>
+			<fo:block>
+				<xsl:if test="iec:strong"> <!-- title -->
+					<xsl:attribute name="role">H1</xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates/>
+			</fo:block>
+		</fo:block-container>
+	</xsl:template>
+
 	<xsl:template name="insertPrefacepages">
 		<xsl:param name="lang" select="$lang"/>
 		<fo:block break-after="page"/>
@@ -1622,14 +1670,21 @@
 				<xsl:with-param name="text" select="iec:title"/>
 			</xsl:call-template>
 		</fo:block>
-		<fo:block font-size="8.2pt" text-align="justify"> <!--  margin-left="6.3mm" -->
+		<!--  margin-left="6.3mm" -->
+		<!-- <fo:block font-size="8.2pt" text-align="justify">
 			<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:legal-statement/*"/>
-		</fo:block>
+		</fo:block> -->
 		<fo:block>
 			<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="iec:clause[@type = 'boilerplate_legal']" priority="3">
+		<fo:block font-size="8.2pt" text-align="justify">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="iec:annex//iec:clause" priority="2">
 		<fo:block id="{@id}" margin-top="5pt" margin-bottom="10pt" text-align="justify">
 			<xsl:apply-templates/>
@@ -1806,7 +1861,7 @@
 			<xsl:if test="ancestor::iec:ul">
 				<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="ancestor::iec:legal-statement">
+			<xsl:if test="ancestor::iec:legal-statement or ancestor::iec:clause[@type = 'boilerplate_legal']">
 				<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
 			</xsl:if>
 			<xsl:apply-templates/>
@@ -1844,14 +1899,18 @@
 	</xsl:template>
 
 	<xsl:template match="iec:xref[@pagenumber = 'true']" priority="2">
-		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
-			<fo:inline>
-				<xsl:if test="@id">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-				</xsl:if>
-				<fo:page-number-citation ref-id="{@target}"/>
-			</fo:inline>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+					<fo:inline>
+						<xsl:if test="@id">
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+						</xsl:if>
+						<fo:page-number-citation ref-id="{@target}"/>
+					</fo:inline>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 
 	<!-- =================== -->
@@ -2764,6 +2823,7 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="xref-style">
+		<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -4862,9 +4922,13 @@
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if>
 
-				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
-					<xsl:value-of select="$current_fn_number_text"/>
-				</fo:basic-link>
+				<xsl:call-template name="insert_basic_link">
+					<xsl:with-param name="element">
+						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
+							<xsl:value-of select="$current_fn_number_text"/>
+						</fo:basic-link>
+					</xsl:with-param>
+				</xsl:call-template>
 			</fo:inline>
 		</xsl:variable>
 
@@ -5210,7 +5274,7 @@
 									<xsl:apply-templates select="*[local-name()='dt']/*"/>
 
 									<xsl:text> </xsl:text>
-									<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
+									<xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
 								</fo:block>
 
 					</xsl:when> <!-- END: only one component -->
@@ -5704,8 +5768,18 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
-		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
+	<xsl:template match="*[local-name()='dd']/*" mode="inline">
+		<xsl:variable name="is_inline_element_after_where">
+			<xsl:if test="(local-name() = 'p') and not(preceding-sibling::node()[normalize-space() != ''])">true</xsl:if>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$is_inline_element_after_where = 'true'">
+				<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<!-- virtual html table for dl/[dt and dd] for IF (Intermediate Format) -->
@@ -7206,6 +7280,79 @@
 		<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
 	</xsl:template>
 
+	<!-- special case for:
+		<math xmlns="http://www.w3.org/1998/Math/MathML">
+			<mstyle displaystyle="true">
+				<msup>
+					<mi color="#00000000">C</mi>
+					<mtext>R</mtext>
+				</msup>
+				<msubsup>
+					<mtext>C</mtext>
+					<mi>n</mi>
+					<mi>k</mi>
+				</msubsup>
+			</mstyle>
+		</math>
+	-->
+	<xsl:template match="mathml:msup/mathml:mi[. = '‌' or . = ''][not(preceding-sibling::*)][following-sibling::mathml:mtext]" mode="mathml">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:variable name="next_mtext" select="ancestor::mathml:msup/following-sibling::*[1][self::mathml:msubsup or self::mathml:msub or self::mathml:msup]/mathml:mtext"/>
+			<xsl:if test="string-length($next_mtext) != ''">
+				<xsl:attribute name="color">#00000000</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+			<xsl:value-of select="$next_mtext"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- special case for:
+				<msup>
+					<mtext/>
+					<mn>1</mn>
+				</msup>
+		convert to (add mspace after mtext and enclose them into mrow):
+			<msup>
+				<mrow>
+					<mtext/>
+					<mspace height="1.47ex"/>
+				</mrow>
+				<mn>1</mn>
+			</msup>
+	-->
+	<xsl:template match="mathml:msup/mathml:mtext[not(preceding-sibling::*)]" mode="mathml">
+		<mathml:mrow>
+			<xsl:copy-of select="."/>
+			<mathml:mspace height="1.47ex"/>
+		</mathml:mrow>
+	</xsl:template>
+
+	<!-- add space around vertical line -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '|']" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@lspace)">
+				<xsl:attribute name="lspace">0.4em</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(@rspace)">
+				<xsl:attribute name="rspace">0.4em</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- decrease fontsize for 'Circled Times' char -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '⊗']" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@fontsize)">
+				<xsl:attribute name="fontsize">55%</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- Examples: 
 		<stem type="AsciiMath">x = 1</stem> 
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -7267,19 +7414,23 @@
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
-						<xsl:choose>
-							<xsl:when test="normalize-space(.) = ''">
-								<xsl:call-template name="add-zero-spaces-link-java">
-									<xsl:with-param name="text" select="$target_text"/>
-								</xsl:call-template>
-							</xsl:when>
-							<xsl:otherwise>
-								<!-- output text from <link>text</link> -->
-								<xsl:apply-templates/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</fo:basic-link>
+					<xsl:call-template name="insert_basic_link">
+						<xsl:with-param name="element">
+							<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
+								<xsl:choose>
+									<xsl:when test="normalize-space(.) = ''">
+										<xsl:call-template name="add-zero-spaces-link-java">
+											<xsl:with-param name="text" select="$target_text"/>
+										</xsl:call-template>
+									</xsl:when>
+									<xsl:otherwise>
+										<!-- output text from <link>text</link> -->
+										<xsl:apply-templates/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:inline>
@@ -7342,12 +7493,16 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']">
-		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
-			<xsl:if test="parent::*[local-name() = 'add']">
-				<xsl:call-template name="append_add-style"/>
-			</xsl:if>
-			<xsl:apply-templates/>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+					<xsl:if test="parent::*[local-name() = 'add']">
+						<xsl:call-template name="append_add-style"/>
+					</xsl:if>
+					<xsl:apply-templates/>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 
 	<!-- ====== -->
@@ -7732,7 +7887,7 @@
 				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+				<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -7754,7 +7909,7 @@
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
 				<xsl:variable name="src">
-					<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+					<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
 				</xsl:variable>
 				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -8140,15 +8295,19 @@
 		<xsl:param name="dest"/>
 		<fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px">
 		 <fo:block font-size="1pt">
-			<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
-				<fo:inline-container inline-progression-dimension="100%">
-					<fo:block-container height="{$height - 1}px" width="100%">
-						<!-- DEBUG <xsl:if test="local-name()='polygon'">
-							<xsl:attribute name="background-color">magenta</xsl:attribute>
-						</xsl:if> -->
-					<fo:block> </fo:block></fo:block-container>
-				</fo:inline-container>
-			</fo:basic-link>
+			<xsl:call-template name="insert_basic_link">
+				<xsl:with-param name="element">
+					<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
+						<fo:inline-container inline-progression-dimension="100%">
+							<fo:block-container height="{$height - 1}px" width="100%">
+								<!-- DEBUG <xsl:if test="local-name()='polygon'">
+									<xsl:attribute name="background-color">magenta</xsl:attribute>
+								</xsl:if> -->
+							<fo:block> </fo:block></fo:block-container>
+						</fo:inline-container>
+					</fo:basic-link>
+				</xsl:with-param>
+			</xsl:call-template>
 		 </fo:block>
 	  </fo:block-container>
 	</xsl:template>
@@ -9711,14 +9870,18 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'origin']">
-		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:if test="normalize-space(@citeas) = ''">
-				<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
-			</xsl:if>
-			<fo:inline xsl:use-attribute-sets="origin-style">
-				<xsl:apply-templates/>
-			</fo:inline>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+					<xsl:if test="normalize-space(@citeas) = ''">
+						<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
+					</xsl:if>
+					<fo:inline xsl:use-attribute-sets="origin-style">
+						<xsl:apply-templates/>
+					</fo:inline>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 
 	<!-- not using, see https://github.com/glossarist/iev-document/issues/23 -->
@@ -9792,9 +9955,13 @@
 		<xsl:if test="../*[local-name() = 'author']">
 			<xsl:text>, </xsl:text>
 		</xsl:if>
-		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:apply-templates/>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+					<xsl:apply-templates/>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'author']">
@@ -9843,25 +10010,29 @@
 					<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
 					<xsl:variable name="text" select="normalize-space()"/>
 
-					<fo:basic-link fox:alt-text="{@citeas}">
-						<xsl:if test="normalize-space(@citeas) = ''">
-							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@type = 'inline'">
+					<xsl:call-template name="insert_basic_link">
+						<xsl:with-param name="element">
+							<fo:basic-link fox:alt-text="{@citeas}">
+								<xsl:if test="normalize-space(@citeas) = ''">
+									<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+								</xsl:if>
+								<xsl:if test="@type = 'inline'">
 
-						</xsl:if>
+								</xsl:if>
 
-						<xsl:choose>
-							<xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
-								<xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
-							</xsl:otherwise>
-						</xsl:choose>
+								<xsl:choose>
+									<xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
+										<xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
+									</xsl:otherwise>
+								</xsl:choose>
 
-						<xsl:apply-templates/>
-					</fo:basic-link>
+								<xsl:apply-templates/>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 
 				</fo:inline>
 			</xsl:when>
@@ -10104,7 +10275,10 @@
 	<xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
 
 	<xsl:template name="setULLabel">
-		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level__">
+			<xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		</xsl:variable>
+		<xsl:variable name="list_level_" select="number($list_level__)"/>
 		<xsl:variable name="list_level">
 			<xsl:choose>
 				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
@@ -10237,9 +10411,11 @@
 				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block>
-					<xsl:apply-templates select="." mode="list"/>
-				</fo:block>
+
+						<fo:block>
+							<xsl:apply-templates select="." mode="list"/>
+						</fo:block>
+
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -10255,7 +10431,7 @@
 			<xsl:variable name="provisional_distance_between_starts_">
 				<attributes xsl:use-attribute-sets="list-style">
 
-						<xsl:if test="ancestor::iec:legal-statement">
+						<xsl:if test="ancestor::iec:legal-statement or ancestor::iec:clause[@type = 'boilerplate_legal']">
 							<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
 						</xsl:if>
 
@@ -10936,24 +11112,32 @@
 		<xsl:for-each select="*[local-name() = 'tab']">
 			<xsl:variable name="current_id" select="generate-id()"/>
 			<fo:table-cell>
-				<fo:block>
-					<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
-						<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
-							<xsl:choose>
-								<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
-								<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
-					</fo:basic-link>
+				<fo:block line-height-shift-adjustment="disregard-shifts">
+					<xsl:call-template name="insert_basic_link">
+						<xsl:with-param name="element">
+							<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+								<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+									<xsl:choose>
+										<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+										<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:for-each>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 				</fo:block>
 			</fo:table-cell>
 		</xsl:for-each>
 		<!-- last column - for page numbers -->
 		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
 			<fo:block>
-				<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
-					<fo:page-number-citation ref-id="{$target}"/>
-				</fo:basic-link>
+				<xsl:call-template name="insert_basic_link">
+					<xsl:with-param name="element">
+						<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+							<fo:page-number-citation ref-id="{$target}"/>
+						</fo:basic-link>
+					</xsl:with-param>
+				</xsl:call-template>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template>
@@ -10995,6 +11179,27 @@
 	<!-- End Table of Contents (ToC) processing -->
 	<!-- =================== -->
 
+	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
+	<xsl:template name="insert_basic_link">
+		<xsl:param name="element"/>
+		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
+		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
+		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
+		<xsl:choose>
+			<xsl:when test="$external-destination = 'true' or $internal-destination = 'true'">
+				<xsl:copy-of select="$element_node"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline>
+					<xsl:for-each select="$element_node/fo:basic-link/@*[local-name() != 'external-destination' and local-name() != 'internal-destination' and local-name() != 'alt-text']">
+						<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
+					</xsl:for-each>
+					<xsl:copy-of select="$element_node/fo:basic-link/node()"/>
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'variant-title']"/> <!-- [@type = 'sub'] -->
 	<xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -28,9 +28,8 @@ module IsoDoc
       end
 
       def termclause1(elem)
-        return clause1(elem) unless @is_iev
-        return if @suppressheadingnumbers || elem["unnumbered"]
-
+        @is_iev or return clause1(elem)
+        @suppressheadingnumbers || elem["unnumbered"] and return
         lbl = @xrefs.anchor(elem["id"], :label, true) or return
         prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
       end
@@ -88,8 +87,7 @@ module IsoDoc
       end
 
       def merge_fr_into_en_term(docxml)
-        return unless @is_iev
-
+        @is_iev or return
         docxml.xpath(ns("//term[@language = 'en'][@tag]")).each do |en|
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
@@ -108,8 +106,7 @@ module IsoDoc
       end
 
       def otherlang_designations(docxml)
-        return unless @is_iev
-
+        @is_iev or return
         docxml.xpath(ns("//term")).each do |t|
           otherlang_designations1(t, t["language"]&.split(/,/) || %w(en fr))
         end
@@ -133,8 +130,7 @@ module IsoDoc
         script = Metanorma::Utils.default_script(lang)
         c = HTMLEntities.new
         xml.traverse do |x|
-          next unless x.text?
-
+          x.text? or next
           text = c.encode(c.decode(x.text), :hexadecimal)
           x.replace(cleanup_entities(l10n(text, lang, script), is_xml: false))
         end
@@ -155,8 +151,7 @@ module IsoDoc
         pr = merge_otherlang_designations(
           extract_otherlang_designations(term, lgs),
         )
-        return if pr.empty?
-
+        pr.empty? and return
         prefs = pr.map do |p|
           "<dt>#{p[:lang]}</dt>" \
             "<dd language='#{p[:lang]}' script='#{p[:script]}'>" \
@@ -239,6 +234,59 @@ module IsoDoc
                                             i18nhash: @i18n.get)
       end
 
+      def rearrange_clauses(docxml)
+        insert_foreword(docxml) # feeds preface_rearrange
+        super
+        insert_middle_title(docxml)
+      end
+
+      def insert_foreword(docxml)
+        @meta.get[:doctype] == "Amendment" and return
+        b = docxml.at(ns("//boilerplate/legal-statement")) or return
+        unless f = docxml.at(ns("//preface/foreword"))
+          ins = toc_title_insert_pt(docxml)
+          f = ins.before(<<~CLAUSE).previous_element
+            <foreword id='_#{UUIDTools::UUID.random_create}'> </foreword>
+          CLAUSE
+        end
+        f.children.empty? and f.children = " "
+        ins = f.at(ns("./title")) || f.children.first.before(" ").previous
+        ins.next =
+          "<clause type='boilerplate_legal'>#{to_xml(b.children)}</clause>"
+      end
+
+      def insert_middle_title(docxml)
+        ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
+        title1, title2 = middle_title_parts(nil)
+        title2out = ""
+        title2 and title2out = <<~OUTPUT
+          <p class="zzSTDTitle1">&#xa0;</p>
+          <p class="zzSTDTitle2"><strong>#{title2}</strong></p>
+        OUTPUT
+        ins.next = <<~OUTPUT
+          <pagebreak/>
+          <p class="zzSTDTitle1">#{@i18n.get['IEC']}</p>
+          <p class="zzSTDTitle1">____________</p>
+          <p class="zzSTDTitle1">&#xa0;</p>
+          <p class="zzSTDTitle1"><strong>#{title1.upcase}</strong></p>#{title2out}
+          <p class="zzSTDTitle1">&#xa0;</p>
+        OUTPUT
+      end
+
+      def middle_title_parts(_out)
+        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
+        @meta.get[:doctitleintro] and
+          title1 = "#{@meta.get[:doctitleintro]} \u2014 #{title1}"
+        title2 = nil
+        if @meta.get[:doctitlepart]
+          title1 += " \u2014"
+          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
+          @meta.get[:doctitlepartlabel] and
+            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
+        end
+        [title1, title2]
+      end
+
       include Init
     end
   end

data/lib/isodoc/iec/word_convert.rb

@@ -13,16 +13,16 @@ module IsoDoc
 
       def convert(input_filename, file = nil, debug = false,
                 output_filename = nil)
-      file = File.read(input_filename, encoding: "utf-8") if file.nil?
-      @openmathdelim, @closemathdelim = extract_delims(file)
-      docxml, filename, dir = convert_init(file, input_filename, debug)
-      result = convert1(docxml, filename, dir)
-      return result if debug
-
-      output_filename ||= "#{filename}.#{@suffix}"
-      postprocess(result, output_filename, dir)
-      FileUtils.rm_rf dir
-    end
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        @openmathdelim, @closemathdelim = extract_delims(file)
+        docxml, filename, dir = convert_init(file, input_filename, debug)
+        result = convert1(docxml, filename, dir)
+        return result if debug
+
+        output_filename ||= "#{filename}.#{@suffix}"
+        postprocess(result, output_filename, dir)
+        FileUtils.rm_rf dir
+      end
 
       def font_choice(options)
         if options[:script] == "Hans" then '"Source Han Sans",serif'
@@ -169,8 +169,8 @@ module IsoDoc
         docxml.xpath("//div[@class = 'boilerplate_legal']//li").each do |l|
           l.replace(l.children)
         end
-        b = docxml.at("div[@class = 'boilerplate_legal']")
-        b.replace(b.children)
+        b = docxml.at("//div[@class = 'boilerplate_legal']")
+        b and b.replace(b.children)
       end
 
       def authority_cleanup(docxml)
@@ -202,11 +202,15 @@ module IsoDoc
         { class: "TableTitle", style: "text-align:center;" }
       end
 
-      def para_class(_node)
-        classtype = nil
-        classtype = "MsoCommentText" if @in_comment
-        classtype = "Sourcecode" if @annotation
-        classtype
+      def para_class(node)
+        case node["class"]
+        when "zzSTDTitle1", "zzSTDTitle2" then node["class"]
+        else
+          classtype = nil
+          classtype = "MsoCommentText" if @in_comment
+          classtype = "Sourcecode" if @annotation
+          classtype
+        end
       end
 
       def annex_name(_annex, name, div)

data/lib/metanorma/iec/iec.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iec" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace = "https://www.metanorma.com/ns/iec" -->
+<grammar ns='https://www.metanorma.org/ns/iec' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    VERSION v1.2.1
+    default namespace = "https://www.metanorma.com/ns/iec"
+  -->
   <include href="relaton-iec.rng"/>
   <include href="isostandard.rng">
     <start>
@@ -55,13 +58,7 @@
   -->
   <define name="iec-standard">
     <element name="iec-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/iec/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.1 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1349,15 +1350,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>

data/lib/metanorma/iec/isostandard.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+  <!--
+    VERSION v1.2.1
+    default namespace isostandard = "https://www.metanorma.com/ns/iso"
+  -->
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>
@@ -240,13 +243,7 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.2.8".freeze
+    VERSION = "2.2.9".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso