metanorma-ieee 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d83608460dd4f0a8b91f963553c4f9a319fe1264259f4cd51c4eaa783b2d95
-  data.tar.gz: 7016563f5ae5736a84f1a4266d3c893ed15682e079eed0df3768b81dce174f18
+  metadata.gz: 403a80a30d2fd43432e4750b237712b71ad5f2af3823137d4f49b87150a67b0f
+  data.tar.gz: 0d98ce2b578daaa75b06800371ef595d3a11ce4a931bc267edeb63dfa17faed9
 SHA512:
-  metadata.gz: 7a83703e3591664c3bba95732da262a9e8242fe834c223757ee52c21532c7c66e47af14d5b0d2824e22c590e134f43afbd59643749f459c3e725d78d5d30f098
-  data.tar.gz: 2469ed39262d09ccaef4cbe0cd156453a10822156f00dc30e8717b54379b84a13e442390cf84b4f1fcd8de6616656deca4616bdd2ceca6d3c1f71cbcecabf461
+  metadata.gz: 4cedea29e69e7fbad2b3007b6a70f7257e0ec117b685c342a83b683c44aecf882a28774d325a163244ed74f51d93654b726704be7376a683995ab17a19785fee
+  data.tar.gz: 98a404455147da1f4f3ccd736218be6d6d00d69af9daddd013d82f8ec9e94a95994b9539e9826a71ef292b9c0795eebe311ac0d1d6eb5bd7ae4ad11fea6c8456

data/lib/isodoc/ieee/html_convert.rb

@@ -67,7 +67,7 @@ module IsoDoc
       def para_to_tr(para)
         ret = para.children.each_with_object([[]]) do |c, m|
           if c.name == "tab" then m << []
-          else m[-1] << c.to_xml
+          else m[-1] << to_xml(c)
           end
         end.map { |c| "<td>#{c.join}</td>" }
         "<tr>#{ret.join}</tr>"

data/lib/isodoc/ieee/i18n.rb

@@ -3,7 +3,7 @@ module IsoDoc
     class I18n < IsoDoc::I18n
       def load_yaml2x(str)
         ::YAML.load_file(File.join(File.dirname(__FILE__),
-                                 "i18n-#{str}.yaml"))
+                                   "i18n-#{str}.yaml"))
       end
 
       def load_yaml1(lang, script)

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

@@ -77,7 +77,7 @@
 	<xsl:variable name="current_template">
 		<xsl:choose>
 			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and $stage = 'draft'">draft</xsl:when>
-			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and $stage = 'published'">standard</xsl:when>
+			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and ($stage = 'published' or $stage = 'approved')">standard</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$doctype"/></xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -768,7 +768,7 @@
 									</fo:block>
 								</fo:flow>
 							</fo:page-sequence>
-						</xsl:when> <!-- $stage = 'published' -->
+						</xsl:when> <!-- $current_template = 'standard' -->
 
 						<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
 							<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force" font-family="Calibri Light">
@@ -873,7 +873,7 @@
 									</fo:block>
 
 									<fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
-										<xsl:if test="$stage = 'published'">
+										<xsl:if test="$stage = 'published' or $stage = 'approved'">
 											<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 										</xsl:if>
 										<!-- Contents -->
@@ -944,7 +944,7 @@
 
 												</xsl:when> <!-- $stage = 'draft' -->
 
-												<xsl:when test="$stage = 'published'">
+												<xsl:when test="$stage = 'published' or $stage = 'approved'">
 
 													<xsl:variable name="provisional-distance-between-starts">10</xsl:variable>
 
@@ -1016,7 +1016,7 @@
 														</xsl:for-each>
 													</xsl:if>
 
-												</xsl:when> <!-- $stage = 'published' -->
+												</xsl:when> <!-- $stage = 'published' or 'approved' -->
 											</xsl:choose>
 
 										</xsl:if>
@@ -1513,15 +1513,15 @@
 					</fo:table>
 				</fo:block>
 
-				<xsl:if test="following-sibling::*[not(@type = 'officemember' or @type = 'emeritus_sign')]">
-					<fo:block font-size="10pt" space-after="12pt"> </fo:block>
+				<xsl:if test="following-sibling::*[1][not(@type = 'officemember' or @type = 'emeritus_sign')]">
+					<fo:block font-size="10pt" space-after="12pt" keep-with-previous="always"> </fo:block>
 				</xsl:if>
 			</xsl:when> <!-- @type = 'officemember' -->
 
 			<xsl:when test="@type = 'officemember' and preceding-sibling::*[1][self::ieee:p][@type = 'officemember']"><!-- skip --></xsl:when>
 
 			<xsl:when test="@type = 'emeritus_sign'">
-				<fo:block font-size="9pt" margin-left="9.4mm">
+				<fo:block font-size="9pt" margin-left="9.4mm" space-before="6pt" space-after="12pt" keep-with-previous="always">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -6406,6 +6406,10 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
+				<xsl:if test="following-sibling::*[1][local-name() = 'fn']">
+					<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>
@@ -7563,6 +7567,23 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 
+	<!-- Don't break standard's numbers -->
+	<!-- Example : <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
+	<xsl:template match="*[local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" priority="2">
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
+			<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
+				<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and   following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
+		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -7958,7 +7979,7 @@
 		<xsl:choose>
 			<xsl:when test="@colspan">
 				<xsl:variable name="td">
-					<xsl:element name="td">
+					<xsl:element name="{local-name()}">
 						<xsl:attribute name="divide"><xsl:value-of select="@colspan"/></xsl:attribute>
 						<xsl:if test="local-name()='th'">
 							<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -7973,7 +7994,7 @@
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:element name="td">
+				<xsl:element name="{local-name()}">
 					<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
 					<xsl:if test="local-name()='th'">
 						<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -8040,7 +8061,7 @@
 		<xsl:variable name="currentRow" select="."/>
 
 		<xsl:variable name="normalizedTDs">
-				<xsl:for-each select="xalan:nodeset($previousRow)//td">
+				<xsl:for-each select="xalan:nodeset($previousRow)//*[self::td or self::th]">
 						<xsl:choose>
 								<xsl:when test="@rowspan &gt; 1">
 										<xsl:copy>
@@ -8052,7 +8073,7 @@
 										</xsl:copy>
 								</xsl:when>
 								<xsl:otherwise>
-										<xsl:copy-of select="$currentRow/td[1 + count(current()/preceding-sibling::td[not(@rowspan) or (@rowspan = 1)])]"/>
+										<xsl:copy-of select="$currentRow/*[self::td or self::th][1 + count(current()/preceding-sibling::*[self::td or self::th][not(@rowspan) or (@rowspan = 1)])]"/>
 								</xsl:otherwise>
 						</xsl:choose>
 				</xsl:for-each>
@@ -8736,12 +8757,6 @@
 
 			<fo:block-container margin-left="0mm">
 
-				<!-- <xsl:if test="$namespace = 'iho'">
-					<xsl:if test="ancestor::iho:td">
-						<xsl:attribute name="font-size">12pt</xsl:attribute>
-					</xsl:if>
-				</xsl:if> -->
-
 						<fo:block>
 
 							<fo:inline xsl:use-attribute-sets="note-name-style">
@@ -9249,6 +9264,31 @@
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
 	</xsl:template>
+
+	<!-- regex for 'display: inline-block;' -->
+	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
+	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), $regex_svg_style_notsupported, '')"/>
+	</xsl:template>
+
+	<!-- replace
+			stroke="rgba(r, g, b, alpha)" to 
+			stroke="rgb(r,g,b)" stroke-opacity="alpha", and
+			fill="rgba(r, g, b, alpha)" to 
+			fill="rgb(r,g,b)" fill-opacity="alpha" -->
+	<xsl:template match="@*[local-name() = 'stroke' or local-name() = 'fill'][starts-with(normalize-space(.), 'rgba')]" mode="svg_update">
+		<xsl:variable name="components_">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-before(substring-after(., '('), ')')"/>
+				<xsl:with-param name="sep" select="','"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="components" select="xalan:nodeset($components_)"/>
+		<xsl:variable name="att_name" select="local-name()"/>
+		<xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
+		<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
+	</xsl:template>
+
 	<!-- ============== -->
 	<!-- END: svg_update -->
 	<!-- ============== -->
@@ -12257,7 +12297,9 @@
 	<!-- Update xml -->
 	<!-- ===================================== -->
 	<!-- =========================================================================== -->
-	<!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!-- STEP1:  -->
+	<!--   - Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!--   - Ignore 'span' without style -->
 	<!-- =========================================================================== -->
 	<xsl:template match="@*|node()" mode="update_xml_step1">
 		<xsl:copy>
@@ -12340,7 +12382,8 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'span'][@style]" mode="update_xml_step1" priority="2">
+	<!-- Example with 'class': <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
+	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

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

@@ -77,7 +77,7 @@
 	<xsl:variable name="current_template">
 		<xsl:choose>
 			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and $stage = 'draft'">draft</xsl:when>
-			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and $stage = 'published'">standard</xsl:when>
+			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and ($stage = 'published' or $stage = 'approved')">standard</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$doctype"/></xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -768,7 +768,7 @@
 									</fo:block>
 								</fo:flow>
 							</fo:page-sequence>
-						</xsl:when> <!-- $stage = 'published' -->
+						</xsl:when> <!-- $current_template = 'standard' -->
 
 						<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
 							<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force" font-family="Calibri Light">
@@ -873,7 +873,7 @@
 									</fo:block>
 
 									<fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
-										<xsl:if test="$stage = 'published'">
+										<xsl:if test="$stage = 'published' or $stage = 'approved'">
 											<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 										</xsl:if>
 										<!-- Contents -->
@@ -944,7 +944,7 @@
 
 												</xsl:when> <!-- $stage = 'draft' -->
 
-												<xsl:when test="$stage = 'published'">
+												<xsl:when test="$stage = 'published' or $stage = 'approved'">
 
 													<xsl:variable name="provisional-distance-between-starts">10</xsl:variable>
 
@@ -1016,7 +1016,7 @@
 														</xsl:for-each>
 													</xsl:if>
 
-												</xsl:when> <!-- $stage = 'published' -->
+												</xsl:when> <!-- $stage = 'published' or 'approved' -->
 											</xsl:choose>
 
 										</xsl:if>
@@ -1513,15 +1513,15 @@
 					</fo:table>
 				</fo:block>
 
-				<xsl:if test="following-sibling::*[not(@type = 'officemember' or @type = 'emeritus_sign')]">
-					<fo:block font-size="10pt" space-after="12pt"> </fo:block>
+				<xsl:if test="following-sibling::*[1][not(@type = 'officemember' or @type = 'emeritus_sign')]">
+					<fo:block font-size="10pt" space-after="12pt" keep-with-previous="always"> </fo:block>
 				</xsl:if>
 			</xsl:when> <!-- @type = 'officemember' -->
 
 			<xsl:when test="@type = 'officemember' and preceding-sibling::*[1][self::ieee:p][@type = 'officemember']"><!-- skip --></xsl:when>
 
 			<xsl:when test="@type = 'emeritus_sign'">
-				<fo:block font-size="9pt" margin-left="9.4mm">
+				<fo:block font-size="9pt" margin-left="9.4mm" space-before="6pt" space-after="12pt" keep-with-previous="always">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -6406,6 +6406,10 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
+				<xsl:if test="following-sibling::*[1][local-name() = 'fn']">
+					<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>
@@ -7563,6 +7567,23 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 
+	<!-- Don't break standard's numbers -->
+	<!-- Example : <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
+	<xsl:template match="*[local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" priority="2">
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
+			<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
+				<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and   following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
+		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -7958,7 +7979,7 @@
 		<xsl:choose>
 			<xsl:when test="@colspan">
 				<xsl:variable name="td">
-					<xsl:element name="td">
+					<xsl:element name="{local-name()}">
 						<xsl:attribute name="divide"><xsl:value-of select="@colspan"/></xsl:attribute>
 						<xsl:if test="local-name()='th'">
 							<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -7973,7 +7994,7 @@
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:element name="td">
+				<xsl:element name="{local-name()}">
 					<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
 					<xsl:if test="local-name()='th'">
 						<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -8040,7 +8061,7 @@
 		<xsl:variable name="currentRow" select="."/>
 
 		<xsl:variable name="normalizedTDs">
-				<xsl:for-each select="xalan:nodeset($previousRow)//td">
+				<xsl:for-each select="xalan:nodeset($previousRow)//*[self::td or self::th]">
 						<xsl:choose>
 								<xsl:when test="@rowspan &gt; 1">
 										<xsl:copy>
@@ -8052,7 +8073,7 @@
 										</xsl:copy>
 								</xsl:when>
 								<xsl:otherwise>
-										<xsl:copy-of select="$currentRow/td[1 + count(current()/preceding-sibling::td[not(@rowspan) or (@rowspan = 1)])]"/>
+										<xsl:copy-of select="$currentRow/*[self::td or self::th][1 + count(current()/preceding-sibling::*[self::td or self::th][not(@rowspan) or (@rowspan = 1)])]"/>
 								</xsl:otherwise>
 						</xsl:choose>
 				</xsl:for-each>
@@ -8736,12 +8757,6 @@
 
 			<fo:block-container margin-left="0mm">
 
-				<!-- <xsl:if test="$namespace = 'iho'">
-					<xsl:if test="ancestor::iho:td">
-						<xsl:attribute name="font-size">12pt</xsl:attribute>
-					</xsl:if>
-				</xsl:if> -->
-
 						<fo:block>
 
 							<fo:inline xsl:use-attribute-sets="note-name-style">
@@ -9249,6 +9264,31 @@
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
 	</xsl:template>
+
+	<!-- regex for 'display: inline-block;' -->
+	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
+	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), $regex_svg_style_notsupported, '')"/>
+	</xsl:template>
+
+	<!-- replace
+			stroke="rgba(r, g, b, alpha)" to 
+			stroke="rgb(r,g,b)" stroke-opacity="alpha", and
+			fill="rgba(r, g, b, alpha)" to 
+			fill="rgb(r,g,b)" fill-opacity="alpha" -->
+	<xsl:template match="@*[local-name() = 'stroke' or local-name() = 'fill'][starts-with(normalize-space(.), 'rgba')]" mode="svg_update">
+		<xsl:variable name="components_">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-before(substring-after(., '('), ')')"/>
+				<xsl:with-param name="sep" select="','"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="components" select="xalan:nodeset($components_)"/>
+		<xsl:variable name="att_name" select="local-name()"/>
+		<xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
+		<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
+	</xsl:template>
+
 	<!-- ============== -->
 	<!-- END: svg_update -->
 	<!-- ============== -->
@@ -12257,7 +12297,9 @@
 	<!-- Update xml -->
 	<!-- ===================================== -->
 	<!-- =========================================================================== -->
-	<!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!-- STEP1:  -->
+	<!--   - Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!--   - Ignore 'span' without style -->
 	<!-- =========================================================================== -->
 	<xsl:template match="@*|node()" mode="update_xml_step1">
 		<xsl:copy>
@@ -12340,7 +12382,8 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'span'][@style]" mode="update_xml_step1" priority="2">
+	<!-- Example with 'class': <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
+	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/ieee/metadata.rb

@@ -94,7 +94,7 @@ module IsoDoc
         set(:full_doctitle, fulltitle(@metadata[:doctype], draft))
         set(:abbrev_doctitle, fulltitle(@metadata[:doctype_abbrev], draft))
         prov = isoxml&.at(ns("//bibdata/title[@type='provenance']")) and
-          set(:provenance_doctitle, prov.children.to_xml)
+          set(:provenance_doctitle, Common::to_xml(prov.children))
       end
 
       def fulltitle(type, draft)

data/lib/isodoc/ieee/presentation_terms.rb

@@ -26,19 +26,19 @@ module IsoDoc
         if coll.all? do |c|
              c.elements.size == 1 && c.elements.first.name == "p"
            end
-          ret = coll.map { |c| c.elements.first.children.to_xml }
+          ret = coll.map { |c| to_xml(c.elements.first.children) }
           return "<p>#{ret.join}</p>"
         end
-        coll.map { |c| c.children.to_xml }.join
+        coll.map { |c| to_xml(c.children) }.join
       end
 
       def unwrap_definition(docxml)
-        docxml.xpath(ns("//definition/verbal-definition")).each do |v|
+        docxml.xpath(ns(".//definition/verbal-definition")).each do |v|
           next unless v.elements.all? { |e| %w(termsource p).include?(e.name) }
 
           p = v.xpath(ns("./p"))
           v.children =
-            "<p>#{p.map(&:children).map(&:to_xml).join("\n")}</p>" \
+            "<p>#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}</p>" \
             "#{v.xpath(ns('./termsource')).to_xml}"
         end
         super
@@ -60,8 +60,8 @@ module IsoDoc
             prev = i and next
           end
 
-          coll[prev].at(ns("./preferred")) << "; #{r.at(ns('./preferred'))
-              .children.to_xml}"
+          coll[prev].at(ns("./preferred")) << "; #{to_xml(r.at(ns('./preferred'))
+              .children)}"
           r.remove
         end
       end
@@ -129,10 +129,10 @@ module IsoDoc
         new = adm.dup
         adm["type"] = "equivalent"
         adm.name = "related"
-        adm.children = "<preferred>#{adm.children.to_xml}</preferred>"
+        adm.children = "<preferred>#{to_xml(adm.children)}</preferred>"
         adm.parent.next = <<~TERM
-          <term><preferred>#{new.children.to_xml}</preferred>
-          <related type='see'><preferred>#{pref.children.to_xml}</preferred></related></term>
+          <term><preferred>#{to_xml(new.children)}</preferred>
+          <related type='see'><preferred>#{to_xml(pref.children)}</preferred></related></term>
         TERM
       end
 
@@ -172,8 +172,8 @@ module IsoDoc
       def collapse_term_related(rels)
         ret = rels.map do |r|
           p = r.at(ns("./preferred"))
-          "<em>#{@i18n.relatedterms[r['type']]}:</em> " \
-            "#{p&.children&.to_xml || '**RELATED TERM NOT FOUND**'}"
+          rel = p ? to_xml(p.children) : "**RELATED TERM NOT FOUND**"
+          "<em>#{@i18n.relatedterms[r['type']]}:</em> #{rel}"
         end.join(". ")
         ret += "." unless ret.empty?
         ret
@@ -182,10 +182,10 @@ module IsoDoc
       def collapse_term_template(opt)
         defn = collapse_unwrap_definition(opt[:def])
         src = nil
-        opt[:source] and src = "(#{opt[:source].remove.children.to_xml.strip})"
+        opt[:source] and src = "(#{to_xml(opt[:source].remove.children).strip})"
+        t = opt[:pref] ? to_xml(opt[:pref].children) : "**TERM NOT FOUND**"
         <<~TERM
-          <p>#{opt[:pref]&.children&.to_xml || '**TERM NOT FOUND**'}: #{defn}
-          #{collapse_term_related(opt[:rels])} #{src}</p>
+          <p>#{t}: #{defn} #{collapse_term_related(opt[:rels])} #{src}</p>
         TERM
       end
 
@@ -194,7 +194,8 @@ module IsoDoc
 
         s = defn.remove.xpath(ns("./termsource"))
         p = defn.at(ns("./p"))
-        !s.empty? && p and p << s.map(&:remove).map(&:children).map(&:to_xml).join
+        !s.empty? && p and p << s.map(&:remove).map(&:children)
+          .map { |x| to_xml(x) }.join
         if defn.elements.size == 1 && defn.elements.first.name == "p"
           defn.elements.first.children
         else defn.elements
@@ -203,10 +204,10 @@ module IsoDoc
 
       def termsource1(elem)
         while elem&.next_element&.name == "termsource"
-          elem << "; #{elem.next_element.remove.children.to_xml}"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
         adapt = termsource_adapt(elem["status"]) and
-          elem.children = l10n("#{adapt}#{elem.children.to_xml.strip}")
+          elem.children = l10n("#{adapt}#{to_xml(elem.children).strip}")
       end
 
       def termsource_adapt(status)
@@ -218,7 +219,7 @@ module IsoDoc
       def designation_field(desgn, name)
         if desgn.name == "preferred"
           f = desgn.xpath(ns("./../domain | ./../subject")).map(&:remove)
-            .map { |u| u.children.to_xml }.join(", ")
+            .map { |u| to_xml(u.children) }.join(", ")
           name << ", &#x3c;#{f}&#x3e;" unless f.empty?
         end
         super
@@ -231,7 +232,7 @@ module IsoDoc
                           "./admitted[expression/name][abbreviation-type]"))
         (pref && !x.empty?) or return
         tail = x.map do |p|
-          p.remove.at(ns("./expression/name")).children.to_xml.strip
+          to_xml(p.remove.at(ns("./expression/name")).children).strip
         end.join(", ")
         pref << " (#{tail})"
       end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -17,9 +17,10 @@ module IsoDoc
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                             node))
         node["droploc"] = droploc
-        eref_localities1(target,
-                         prefix_clause(target, refs.first.at(ns("./locality"))),
-                         l10n(ret[1..-1].join), nil, node, @lang)
+        eref_localities1({ target: target, number: "pl",
+                           type: prefix_clause(target, refs.first.at(ns("./locality"))),
+                           from: l10n(ret[1..-1].join), node: node,
+                           lang: @lang })
       end
 
       def prefix_clause(target, loc)
@@ -37,20 +38,18 @@ module IsoDoc
           target&.gsub(/<[^>]+>/, "")&.match(/^IEV$|^IEC 60050-/)
       end
 
-      def eref_localities1(target, type, from, upto, node, lang = "en")
-        return nil if type == "anchor"
+      def eref_localities1(opt)
+        return nil if opt[:type] == "anchor"
 
-        type = type.downcase
-        lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, upto,
-                                          node))
+        opt[:type] = opt[:type].downcase
+        opt[:lang] == "zh" and return l10n(eref_localities1_zh(opt))
         ret = ""
-        node["droploc"] != "true" && !subclause?(target, type,
-                                                 from) and
-          ret = eref_locality_populate(type, node)
-        ret += " #{from}" if from
-        ret += "&#x2013;#{upto}" if upto
-        ret += ")" if type == "list"
+        opt[:node]["droploc"] != "true" &&
+          !subclause?(opt[:target], opt[:type], opt[:from]) and
+          ret = eref_locality_populate(opt[:type], opt[:node], opt[:number])
+        ret += " #{opt[:from]}" if opt[:from]
+        ret += "&#x2013;#{opt[:upto]}" if opt[:upto]
+        ret += ")" if opt[:type] == "list"
         l10n(ret)
       end
 
@@ -85,7 +84,7 @@ module IsoDoc
         i = display_order_xpath(docxml, "//preface/*", i)
         i = display_order_at(docxml, "//clause[@type = 'overview']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | "\
+        i = display_order_at(docxml, "//sections/terms | " \
                                      "//sections/clause[descendant::terms]", i)
         i = display_order_at(docxml, "//sections/definitions", i)
         i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
@@ -97,7 +96,7 @@ module IsoDoc
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         if t = elem.at(ns("./title"))
-          t.children = "<strong>#{t.children.to_xml}</strong>"
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
         end
         prefix_name(elem, "<br/>", lbl, "title")
       end
@@ -132,7 +131,7 @@ module IsoDoc
 
       def amend1(elem)
         elem.xpath(ns("./description/p")).each do |p|
-          p.children = p.children.to_xml.strip
+          p.children = to_xml(p.children).strip
           amend_format(p)
         end
         super
@@ -144,7 +143,7 @@ module IsoDoc
             %(em strong).include?(para.children.first.name) and
             para.children = para.elements.first.children
         end
-        para.children = "<strong><em>#{para.children.to_xml}</em></strong>"
+        para.children = "<strong><em>#{to_xml(para.children)}</em></strong>"
       end
 
       def section(docxml)
@@ -153,7 +152,7 @@ module IsoDoc
       end
 
       def boilerplate(docxml)
-        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/"\
+        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/" \
                         "clause/title")).each(&:remove)
         docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/clause"))
           .each do |clause|
@@ -211,7 +210,7 @@ module IsoDoc
       def participant_officeholder_para(map, name, idx)
         name = "<strong>#{name}</strong>" if idx.zero?
         br = map["role"].size > 30 ? "<br/>" : ""
-        "<p type='officeholder' align='center'>#{name}, #{br}"\
+        "<p type='officeholder' align='center'>#{name}, #{br}" \
           "<em>#{map['role']}</em></p>"
       end
 

data/lib/isodoc/ieee/word_authority.rb

@@ -15,7 +15,7 @@ module IsoDoc
         feedback_table(docxml)
         f = docxml.at("//div[@class = 'boilerplate-feedback']") or return
         docxml.at("//aside").previous = <<~FN
-          <aside id="ftn0">#{f.remove.to_xml}</aside>
+          <aside id="ftn0">#{to_xml(f.remove)}</aside>
         FN
       end
 
@@ -103,7 +103,7 @@ module IsoDoc
         div.xpath(".//div").each { |d| d.replace(d.children) }
         div.elements.each_with_object([[]]) do |e, m|
           member = e.name == "p" && e["type"] == "officemember"
-          (prev == member and m[-1] << e.to_xml) or m << [e.to_xml]
+          (prev == member and m[-1] << to_xml(e)) or m << [to_xml(e)]
           prev = member
         end.map(&:join)
       end
@@ -143,7 +143,7 @@ module IsoDoc
           i.zero? or div.elements.first.previous = "<p>&#xa0;</p>"
           i == 4 and
             div.xpath(".//p[br]").each do |p|
-              p.replace(p.to_xml.gsub(%r{<br/>}, "</p><p>"))
+              p.replace(to_xml(p).gsub(%r{<br/>}, "</p><p>"))
             end
           feedback_style1(div, i)
         end

data/lib/isodoc/ieee/word_cleanup_blocks.rb

@@ -28,7 +28,7 @@ module IsoDoc
               end
             else
               t.children =
-                "<p class='IEEEStdsTableColumnHead'>#{t.children.to_xml}</p>"
+                "<p class='IEEEStdsTableColumnHead'>#{to_xml(t.children)}</p>"
             end
           end
         end
@@ -45,9 +45,9 @@ module IsoDoc
 
       def tbody_head_cleanup(cell)
         cell.at("./p") or
-          cell.children = "<p>#{cell.children.to_xml}</p>"
+          cell.children = "<p>#{to_xml(cell.children)}</p>"
         cell.xpath("./p").each do |p|
-          p.replace p.to_xml.gsub(%r{<br/>}, "</p><p>")
+          p.replace to_xml(p).gsub(%r{<br/>}, "</p><p>")
         end
       end
 
@@ -58,7 +58,7 @@ module IsoDoc
           end
         else
           cell.children =
-            "<p class='#{td_style(cell, 0)}'>#{cell.children.to_xml}</p>"
+            "<p class='#{td_style(cell, 0)}'>#{to_xml(cell.children)}</p>"
         end
       end
 
@@ -80,28 +80,28 @@ module IsoDoc
 
       def table_caption(docxml)
         docxml.xpath("//p[@class = 'TableTitle']").each do |s|
-          s.children = s.children.to_xml
+          s.children = to_xml(s.children)
             .sub(/^#{@i18n.table}(\s+[A-Z0-9.]+)?/, "")
         end
       end
 
       def figure_caption(docxml)
         docxml.xpath("//p[@class = 'FigureTitle']").each do |s|
-          s.children = s.children.to_xml
+          s.children = to_xml(s.children)
             .sub(/^#{@i18n.figure}(\s+[A-Z0-9.]+)?/, "")
         end
       end
 
       def example_caption(docxml)
         docxml.xpath("//p[@class = 'example-title']").each do |s|
-          s.children = "<em>#{s.children.to_xml}</em>"
+          s.children = "<em>#{to_xml(s.children)}</em>"
           s["class"] = "IEEEStdsParagraph"
         end
       end
 
       def sourcecode_cleanup(docxml)
         docxml.xpath("//p[@class = 'Sourcecode']").each do |s|
-          s.replace(s.to_xml.gsub(%r{<br/>}, "</p><p class='Sourcecode'>"))
+          s.replace(to_xml(s).gsub(%r{<br/>}, "</p><p class='Sourcecode'>"))
         end
       end
 

data/lib/metanorma/ieee/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/ieee/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/ieee/isodoc.rng

@@ -2653,6 +2653,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <value>modspec</value>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "0.1.3".freeze
+    VERSION = "1.0.0".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.0"
   spec.add_dependency "mnconvert", "~> 1.20"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Metanorma for the IEEE