metanorma-iec 2.4.4 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983a0ecfbb9268e7428c55b36574bc046a2fc4ce749aa93dce9ecef035ae4e5a
-  data.tar.gz: 64ec2813deda8032f200ca67b359e287bd7db20000efde215b3add5fb1f2c498
+  metadata.gz: f05fbbfe3bd0f60dd7207637f0df64d3ef07bc8b5adac8fb9594f594ff0034b2
+  data.tar.gz: 38d920ff2f0793ad5f2e5a7da698a41a4f53cf76c0afb71dfe9e850de5335b1a
 SHA512:
-  metadata.gz: ed8a99a03048f7ec0da59e21bfd1be59b06e0d21c03f95d38ca27f88330d6e01b9199f62f8f978ffc2af820cafd7e6345510ad6a126cf0285e523acd77336928
-  data.tar.gz: 3d08b38772898074098c9b0af578a875ce435dce0c490d37f4361326fbacb35ef9901188c8e4461148a8ce81c381056a673324e3c4cd5b362b07ff21287325c6
+  metadata.gz: 442d16114c39c832a4ae7afeae6fa53d211eea474a99e80e8861604f6e3cb4185e3b7eee10bcb815fc20a5e7720f9e74afefd94ec27bc15b1ba60c26597de3d8
+  data.tar.gz: a3d068fd26a0a4207e8bd37c0f59bce555f9afe87aeebec4fc1d5a66a7cb84fefa12c9f38b80590f8559fc9b600950993363833d6b402d15c9963c94044dfa39

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

@@ -2123,17 +2123,30 @@
 	<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
 
 	<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
-	<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
+	<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
 	<!-- Example: <tables>
-			<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF 
-				<tbody>
-					<tr>
-						<td id="tab-symdu_1_1">
-							<p_len>6</p_len>
-							<p_len>100</p_len>  for 2nd paragraph
-							<word_len>6</word_len>
-							<word_len>20</word_len>
-						...
+		<table page-width="509103" id="table1" width_max="223561" width_min="223560">
+			<column width_max="39354" width_min="39354"/>
+			<column width_max="75394" width_min="75394"/>
+			<column width_max="108813" width_min="108813"/>
+			<tbody>
+				<tr>
+					<td width_max="39354" width_min="39354">
+						<p_len>39354</p_len>
+						<word_len>39354</word_len>
+					</td>
+					
+		OLD:
+			<tables>
+					<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF 
+						<tbody>
+							<tr>
+								<td id="tab-symdu_1_1">
+									<p_len>6</p_len>
+									<p_len>100</p_len>  for 2nd paragraph
+									<word_len>6</word_len>
+									<word_len>20</word_len>
+								...
 	-->
 
 	<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
@@ -2358,6 +2371,10 @@
 	<xsl:variable name="zero_width_space">​</xsl:variable>
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
+	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="cr">&#13;</xsl:variable>
+	<xsl:variable name="lf">
+</xsl:variable>
 
 	<xsl:template name="getTitle">
 		<xsl:param name="name"/>
@@ -2680,6 +2697,10 @@
 
 	</xsl:attribute-set> <!-- example-name-style -->
 
+	<xsl:template name="refine_example-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-p-style">
 
 			<xsl:attribute name="margin-top">5pt</xsl:attribute>
@@ -2696,6 +2717,10 @@
 
 	</xsl:attribute-set> <!-- termexample-name-style -->
 
+	<xsl:template name="refine_termexample-name-style">
+
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- Table styles -->
 	<!-- ========================== -->
@@ -2904,6 +2929,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-style -->
 
+	<xsl:template name="refine_table-fn-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -2913,6 +2942,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-container-body-style">
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
@@ -4067,6 +4100,20 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
+
+	<xsl:template match="*[local-name()='table']" priority="2">
+		<xsl:choose>
+			<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
+				<xsl:call-template name="table"/>
+			</xsl:when>
+			<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="table"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='table']" name="table">
 
 		<xsl:variable name="table-preamble">
@@ -4076,9 +4123,11 @@
 		<xsl:variable name="table">
 
 			<xsl:variable name="simple-table">
-				<xsl:call-template name="getSimpleTable">
-					<xsl:with-param name="id" select="@id"/>
-				</xsl:call-template>
+				<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
+					<xsl:call-template name="getSimpleTable">
+						<xsl:with-param name="id" select="@id"/>
+					</xsl:call-template>
+				</xsl:if>
 			</xsl:variable>
 			<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
 
@@ -4174,9 +4223,9 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'][not(@type = 'units')] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
-						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
+						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
 					</xsl:if>
 
 					<xsl:choose>
@@ -4261,6 +4310,7 @@
 				<!-- centered table when table name is centered (see table-name-style) -->
 
 					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
+
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
@@ -4343,9 +4393,28 @@
 
 					</fo:block>
 
+					<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+					<xsl:if test="$continued = 'true'">
+						<fo:block text-align="right">
+							<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+						</fo:block>
+					</xsl:if>
+					<!-- </xsl:if> -->
+
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
 
+	<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
+	<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
+		<xsl:choose>
+			<xsl:when test="preceding-sibling::*[local-name() = 'br']">
+				<!-- remove CR or LF at start -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^(&#13;&#10;|&#13;|&#10;)', '')"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- SOURCE: ... -->
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
 		<xsl:call-template name="termsource"/>
@@ -4765,7 +4834,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -4831,7 +4900,7 @@
 
 								<!-- fn will be processed inside 'note' processing -->
 
-									<xsl:if test="../*[local-name()='note']">
+									<xsl:if test="../*[local-name()='note'][not(@type = 'units')]">
 										<fo:block margin-bottom="6pt" role="SKIP"> </fo:block>
 									</xsl:if>
 
@@ -4841,7 +4910,7 @@
 
 										<xsl:apply-templates select="../*[local-name()='p']"/>
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
-										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
 										<xsl:apply-templates select="../*[local-name()='example']"/>
 										<xsl:apply-templates select="../*[local-name()='source']"/>
 
@@ -4852,7 +4921,7 @@
 
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
-									<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
+									<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 
 											<xsl:call-template name="setBordersTableArray"/>
@@ -5375,8 +5444,9 @@
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 
 						<fo:block xsl:use-attribute-sets="table-fn-style">
-
+							<xsl:call-template name="refine_table-fn-style"/>
 							<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+								<xsl:call-template name="refine_table-fn-number-style"/>
 
 								<xsl:value-of select="@reference"/>
 
@@ -5560,7 +5630,20 @@
 	<!-- Definition List -->
 	<!-- ===================== -->
 
-	<xsl:template match="*[local-name()='dl']">
+	<!-- for table auto-layout algorithm -->
+	<xsl:template match="*[local-name()='dl']" priority="2">
+		<xsl:choose>
+			<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
+				<xsl:call-template name="dl"/>
+			</xsl:when>
+			<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="dl"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="*[local-name()='dl']" name="dl">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
@@ -6528,11 +6611,16 @@
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
 		<xsl:variable name="text" select="."/>
-		<fo:inline font-size="75%" role="SKIP">
+		<xsl:variable name="ratio_">
+			0.75
+		</xsl:variable>
+		<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
+		<fo:inline font-size="{$ratio * 100}%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
 						<xsl:call-template name="recursiveSmallCaps">
 							<xsl:with-param name="text" select="$text"/>
+							<xsl:with-param name="ratio" select="$ratio"/>
 						</xsl:call-template>
 					</xsl:variable>
 					<!-- merge neighboring fo:inline -->
@@ -6569,12 +6657,13 @@
 
 	<xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
+    <xsl:param name="ratio"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
     <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
 		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
-        <fo:inline font-size="{100 div 0.75}%" role="SKIP">
+        <fo:inline font-size="{100 div $ratio}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -6585,6 +6674,7 @@
     <xsl:if test="string-length($text) &gt; 1">
       <xsl:call-template name="recursiveSmallCaps">
         <xsl:with-param name="text" select="substring($text,2)"/>
+        <xsl:with-param name="ratio" select="$ratio"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
@@ -6692,6 +6782,9 @@
 				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
+				<xsl:if test="$key = 'text-indent'">
+					<style name="padding-left"><xsl:value-of select="$value"/></style>
+				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -7564,7 +7657,13 @@
 							<xsl:value-of select="$language_current_2"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+							<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
+							<xsl:choose>
+								<xsl:when test="$language_current_3 != ''">
+									<xsl:value-of select="$language_current_3"/>
+								</xsl:when>
+								<xsl:otherwise>en</xsl:otherwise>
+							</xsl:choose>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:otherwise>
@@ -8094,6 +8193,11 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<!-- command between two xref points to non-standard bibitem -->
+	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -8464,7 +8568,7 @@
 						</xsl:when>
 						<xsl:otherwise>
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
-								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
+								<xsl:if test="not(@mimetype = 'image/svg+xml') and (../*[local-name() = 'name'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
 
 									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
@@ -8799,6 +8903,8 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
+
 	<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
@@ -8817,7 +8923,8 @@
 
 			<xsl:attribute name="width">
 				<xsl:choose>
-					<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+					<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -8826,7 +8933,8 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
-					<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+					<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -8843,7 +8951,7 @@
 		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
 		<xsl:attribute name="width">
 			<xsl:choose>
-				<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
@@ -8854,7 +8962,7 @@
 		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
 		<xsl:attribute name="height">
 			<xsl:choose>
-				<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
@@ -10328,6 +10436,7 @@
 	<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
+				<xsl:call-template name="refine_termexample-name-style"/>
 				<xsl:apply-templates/>
 			</fo:inline>
 		</xsl:if>
@@ -10484,6 +10593,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
+					<xsl:call-template name="refine_example-name-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:otherwise>
@@ -11698,6 +11808,7 @@
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
 
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
+
 					<xsl:call-template name="processBibitem"/>
 				</fo:block>
 
@@ -11739,6 +11850,7 @@
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">

data/lib/metanorma/iec/biblio.rng

@@ -208,7 +208,9 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="person">
@@ -333,7 +335,9 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="organization">
@@ -897,7 +901,9 @@
   </define>
   <define name="formattedref">
     <element name="formattedref">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="license">
@@ -942,7 +948,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="FormattedString"/>
+    <zeroOrMore>
+      <ref name="TextElement"/>
+    </zeroOrMore>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
@@ -1042,7 +1050,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="docnumber">
@@ -1267,12 +1277,16 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="copyright">
@@ -1377,7 +1391,9 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="FormattedString"/>
+          <oneOrMore>
+            <ref name="TextElement"/>
+          </oneOrMore>
         </element>
       </optional>
       <element name="bibitem">

data/lib/metanorma/iec/boilerplate-en.adoc

@@ -0,0 +1,110 @@
+== copyright-statement
+=== {blank}
+{% if unpublished %}
+*Copyright © {{ docyear }} International Electrotechnical Commission, IEC.*
+All rights reserved. It is permitted to download this electronic file, to make a copy and to
+print out the content for the sole purpose of preparing National Committee positions. You
+may not copy or "mirror" the file or printed version of the document, or any part of it,
+for any other purpose without permission in writing from IEC.
+{% else %}
+[[boilerplate-year]]
+Copyright © {{ docyear }} {{ agency }}, Geneva, Switzerland
+
+[[boilerplate-message]]
+All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
+or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
+either IEC or IEC's member National Committee in the country of the requester. If you have any questions about
+{{ agency }} copyright or have an enquiry about obtaining additional rights to this publication, please contact the address
+below or your local IEC member National Committee for further information.
+
+[[boilerplate-name]]
+IEC Central Office
+
+[[boilerplate-address]]
+[align=left]
+3, rue de Varembé +
+CH-1211 Geneva 20 +
+Switzerland +
+Tel.: +41 22 919 02 11 +
+link:mailto:info@iec.ch[info@iec.ch] +
+link:https://www.iec.ch[www.iec.ch]
+{% endif %}
+
+== legal-statement
+=== {blank}
+
+[arabic]
+. The International Electrotechnical Commission (IEC) is a worldwide organization for standardization comprising all national electrotechnical committees (IEC National Committees). The object of IEC is to promote international co-operation on all questions concerning standardization in the electrical and electronic fields. To this end and in addition to other activities, IEC publishes International Standards, Technical Specifications, Technical Reports, Publicly Available Specifications (PAS) and Guides (hereafter referred to as “IEC Publication(s)”). Their preparation is entrusted to technical committees; any IEC National Committee interested in the subject dealt with may participate in this preparatory work. International, governmental and non-governmental organizations liaising with the IEC also participate in this preparation. IEC collaborates closely with the International Organization for Standardization (ISO) in accordance with conditions determined by agreement between the two organizations.
+. The formal decisions or agreements of IEC on technical matters express, as nearly as possible, an international consensus of opinion on the relevant subjects since each technical committee has representation from all interested IEC National Committees.
+. IEC Publications have the form of recommendations for international use and are accepted by IEC National Committees in that sense. While all reasonable efforts are made to ensure that the technical content of IEC Publications is accurate, IEC cannot be held responsible for the way in which they are used or for any misinterpretation by any end user.
+. In order to promote international uniformity, IEC National Committees undertake to apply IEC Publications transparently to the maximum extent possible in their national and regional publications. Any divergence between any IEC Publication and the corresponding national or regional publication shall be clearly indicated in the latter.
+. IEC itself does not provide any attestation of conformity. Independent certification bodies provide conformity assessment services and, in some areas, access to IEC marks of conformity. IEC is not responsible for any services carried out by independent certification bodies.
+. All users should ensure that they have the latest edition of this publication.
+. No liability shall attach to IEC or its directors, employees, servants or agents including individual experts and members of its technical committees and IEC National Committees for any personal injury, property damage or other damage of any nature whatsoever, whether direct or indirect, or for costs (including legal fees) and expenses arising out of the publication, use of, or reliance upon, this IEC Publication or any other IEC Publications.
+. Attention is drawn to the Normative references cited in this publication. Use of the referenced publications is indispensable for the correct application of this publication.
+. Attention is drawn to the possibility that some of the elements of this IEC Publication may be the subject of patent rights. IEC shall not be held responsible for identifying any or all such patent rights.
+
+{% if unpublished %}
+== license-statement
+=== {blank}
+{% if stage_int < 50 %}
+This document is still under study and subject to change. It should not be used for reference purposes.
+until published as such.
+{% endif %}
+
+{% if stage_int >= 50 %}
+This document is a draft distributed for approval. It may not be referred to as an International Standard
+until published as such.
+{% endif %}
+
+{% if stage_int >= 50 %}
+In addition to their evaluation as being acceptable for industrial, technological, commercial and user
+purposes, Final Draft International Standards may on occasion have to be considered in the light of their
+potential to become standards to which reference may be made in national regulations.
+{% endif %}
+
+Recipients of this document are invited to submit, with their comments, notification of any relevant
+patent rights of which they are aware and to provide supporting documentation.
+{% endif %}
+
+== feedback-statement
+{% if unpublished %}
+[[boilerplate-cenelec-attention]]
+=== Attention IEC-CENELEC parallel voting
+
+The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
+{% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
+{% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
+{% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
+({{ stageabbr }})
+is submitted for parallel voting.
+
+The CENELEC members are invited to vote through the CENELEC voting system.
+{% else %}
+=== About the IEC
+The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes International Standards for all electrical, electronic and related technologies.
+
+=== About IEC publications
+The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the latest edition, a corrigenda or an amendment might have been published.
+
+=== {blank}
+==== IEC Catalogue - https://webstore.iec.ch/catalogue:[webstore.iec.ch/catalogue]
+
+The stand-alone application for consulting the entire bibliographical information on IEC International Standards, Technical Specifications, Technical Reports and other documents. Available for PC, Mac OS, Android Tablets and iPad.
+
+==== IEC publications search - https://www.iec.ch/searchpub:[www.iec.ch/searchpub]
+The advanced search enables to find IEC publications by a variety of criteria (reference number, text, technical committee,...). It also gives information on projects, replaced and withdrawn publications.
+
+==== IEC Just Published - https://webstore.iec.ch/justpublished:[webstore.iec.ch/justpublished]
+Stay up to date on all new IEC publications. Just Published details all new publications released. Available online and also once a month by email.
+
+==== Electropedia - http://www.electropedia.org:[www.electropedia.org]
+The world's leading online dictionary of electronic and electrical terms containing more than 30 000 terms and definitions in English and French, with equivalent terms in 14 additional languages. Also known as the International Electrotechnical Vocabulary (IEV) online.
+
+==== IEC Glossary - http://std.iec.ch/glossary:[std.iec.ch/glossary]
+More than 55 000 electrotechnical terminology entries in English and French extracted from the Terms and Definitions clause of IEC publications issued since 2002. Some entries have been collected from earlier publications of IEC TC 37, 77, 86 and CISPR.
+
+==== IEC Customer Service Centre - https://webstore.iec.ch/csc:[webstore.iec.ch/csc]
+If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: link:mailto:csc@iec.ch[csc@iec.ch].
+{% endif %}
+

data/lib/metanorma/iec/boilerplate-fr.adoc

@@ -0,0 +1,111 @@
+== copyright-statement
+=== {blank} 
+{% if unpublished %}
+*Copyright © {{ docyear }} Commission électrotechnique internationale, IEC.*
+Tous droits réservés. Il est permis de télécharger ce fichier électronique, d'en faire une copie et de
+imprimer le contenu dans le seul but de préparer les positions du Comité national. Toi
+ne peut pas copier ou « refléter » le fichier ou la version imprimée du document, ou toute partie de celui-ci,
+à toute autre fin sans autorisation écrite de la IEC.
+{% else %}
+[[boilerplate-year]]
+Copyright © {{ docyear }} {{ agency }}, Genève, Suisse
+
+
+[[boilerplate-message]]
+Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
+ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
+et les microfilms, sans l'accord écrit de l'IEC ou du Comité national de l'IEC du pays du demandeur. Si vous avez des
+questions sur le copyright de l'{{ agency }} ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
+les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence.
+
+[[boilerplate-name]]
+IEC Central Office 
+
+[[boilerplate-address]]
+[align=left]
+3, rue de Varembé +
+CH-1211 Geneva 20 +
+Switzerland +
+Tel.: +41 22 919 02 11 + 
+link:mailto:info@iec.ch[info@iec.ch] +
+link:https://www.iec.ch[www.iec.ch]
+{% endif %}
+
+== legal-statement
+=== {blank}
+
+[arabic]
+. La Commission Electrotechnique Internationale (IEC) est une organisation mondiale de normalisation composée de l'ensemble des comités électrotechniques nationaux (Comités nationaux de l’IEC). L’IEC a pour objet de favoriser la coopération internationale pour toutes les questions de normalisation dans les domaines de l'électricité et de l'électronique. A cet effet, l’IEC – entre autres activités – publie des Normes internationales, des Spécifications techniques, des Rapports techniques, des Spécifications accessibles au public (PAS) et des Guides (ci-après dénommés "Publication(s) de l’IEC"). Leur élaboration est confiée à des comités d'études, aux travaux desquels tout Comité national intéressé par le sujet traité peut participer. Les organisations internationales, gouvernementales et non gouvernementales, en liaison avec l’IEC, participent également aux travaux. L’IEC collabore étroitement avec l'Organisation Internationale de Normalisation (ISO), selon des conditions fixées par accord entre les deux organisations.
+. Les décisions ou accords officiels de l’IEC concernant les questions techniques représentent, dans la mesure du possible, un accord international sur les sujets étudiés, étant donné que les Comités nationaux de l’IEC intéressés sont représentés dans chaque comité d’études.
+. Les Publications de l’IEC se présentent sous la forme de recommandations internationales et sont agréées comme telles par les Comités nationaux de l’IEC. Tous les efforts raisonnables sont entrepris afin que l’IEC s'assure de l'exactitude du contenu technique de ses publications; l’IEC ne peut pas être tenue responsable de l'éventuelle mauvaise utilisation ou interprétation qui en est faite par un quelconque utilisateur final.
+. Dans le but d'encourager l'uniformité internationale, les Comités nationaux de l’IEC s'engagent, dans toute la mesure possible, à appliquer de façon transparente les Publications de l’IEC dans leurs publications nationales et régionales. Toutes divergences entre toutes Publications de l’IEC et toutes publications nationales ou régionales correspondantes doivent être indiquées en termes clairs dans ces dernières.
+. L’IEC elle-même ne fournit aucune attestation de conformité. Des organismes de certification indépendants fournissent des services d'évaluation de conformité et, dans certains secteurs, accèdent aux marques de conformité de l’IEC. L’IEC n'est responsable d'aucun des services effectués par les organismes de certification indépendants.
+. Tous les utilisateurs doivent s'assurer qu'ils sont en possession de la dernière édition de cette publication.
+. Aucune responsabilité ne doit être imputée à l’IEC, à ses administrateurs, employés, auxiliaires ou mandataires, y compris ses experts particuliers et les membres de ses comités d'études et des Comités nationaux de l’IEC, pour tout préjudice causé en cas de dommages corporels et matériels, ou de tout autre dommage de quelque nature que ce soit, directe ou indirecte, ou pour supporter les coûts (y compris les frais de justice) et les dépenses découlant de la publication ou de l'utilisation de cette Publication de l’IEC ou de toute autre Publication de l’IEC, ou au crédit qui lui est accordé.
+. L'attention est attirée sur les références normatives citées dans cette publication. L'utilisation de publications référencées est obligatoire pour une application correcte de la présente publication.
+. L’attention est attirée sur le fait que certains des éléments de la présente Publication de l’IEC peuvent faire l’objet de droits de brevet. L’IEC ne saurait être tenue pour responsable de ne pas avoir identifié de tels droits de brevets et de ne pas avoir signalé leur existence.
+
+{% if unpublished %}
+== license-statement
+=== {blank}
+{% if stage_int < 50 %}
+Ce document est encore à l'étude et susceptible d'être modifié. Il ne doit pas être utilisé à des fins de référence.
+jusqu'à ce qu'il soit publié comme tel.
+{% endif %}
+
+{% if stage_int >= 50 %}
+Ce document est une ébauche distribuée pour approbation. Il ne peut pas être qualifié de Norme internationale
+jusqu'à ce qu'il soit publié comme tel.
+{% endif %}
+
+{% if stage_int >= 50 %} 
+En plus de leur évaluation comme étant acceptable pour les industriels, technologiques, commerciaux et utilisateurs
+À ces fins, les projets finaux de Normes internationales peuvent parfois devoir être examinés à la lumière de leur
+susceptibles de devenir des normes auxquelles il pourra être fait référence dans les réglementations nationales.
+{% endif %}
+
+Les destinataires de ce document sont invités à soumettre, avec leurs commentaires, notification de tout
+droits de brevet dont ils ont connaissance et de fournir les pièces justificatives.
+{% endif %}
+
+== feedback-statement
+{% if unpublished %}
+[[boilerplate-cenelec-attention]]
+=== Attention vote parallèle IEC-CENELEC
+
+L'attention des Comités Nationaux de la CEI, membres du CENELEC, est attirée sur le fait que ce
+{% if stage_int >= 30 and stage_int < 40 %}Brouillon du comité{% endif %}
+{% if stage_int >= 40 and stage_int < 50 %}Brouillon du comité pour vote{% endif %}
+{% if stage_int >= 50 and stage_int < 60 %}Brouillon final de norme internationale{% endif %}
+({{ stageabbr }})
+est soumis au vote parallèle.
+
+Les membres du CENELEC sont invités à voter via le système de vote du CENELEC.
+
+{% else %}
+=== A propos de l'IEC
+La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.
+
+=== A propos des publications IEC
+Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la plus récente, un corrigendum ou amendement peut avoir été publié.
+
+=== {blank}
+==== Catalogue IEC - https://webstore.iec.ch/catalogue:[webstore.iec.ch/catalogue]
+Application autonome pour consulter tous les renseignements bibliographiques sur les Normes internationales, Spécifications techniques, Rapports techniques et autres documents de l'IEC. Disponible pour PC, Mac OS, tablettes Android et iPad.
+
+==== Recherche de publications IEC - https://www.iec.ch/searchpub:[www.iec.ch/searchpub]
+La recherche avancée permet de trouver des publications IEC en utilisant différents critères (numéro de référence, texte, comité d’études,...). Elle donne aussi des informations sur les projets et les publications remplacées ou retirées.
+
+==== IEC Just Published - https://webstore.iec.ch/justpublished:[webstore.iec.ch/justpublished]
+Restez informé sur les nouvelles publications IEC. Just Published détaille les nouvelles publications parues. Disponible en ligne et aussi une fois par mois par email.
+
+==== Electropedia - http://www.electropedia.org:[www.electropedia.org]
+Le premier dictionnaire en ligne de termes électroniques et électriques. Il contient plus de 30 000 termes et définitions en anglais et en français, ainsi que les termes équivalents dans 14 langues additionnelles. Egalement appelé Vocabulaire Electrotechnique International (IEV) en ligne.
+
+==== Glossaire IEC - http://std.iec.ch/glossary:[std.iec.ch/glossary]
+Plus de 55 000 entrées terminologiques électrotechniques, en anglais et en français, extraites des articles Termes et Définitions des publications IEC parues depuis 2002. Plus certaines entrées antérieures extraites des publications des CE 37, 77, 86 et CISPR de l'IEC.
+
+==== Service Clients - https://webstore.iec.ch/csc:[webstore.iec.ch/csc]
+Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: link:mailto:csc@iec.ch[csc@iec.ch].
+{% endif %}
+

data/lib/metanorma/iec/converter.rb

@@ -25,7 +25,7 @@ module Metanorma
                else
                  "en"
                end
-        File.join(@libdir, "iec_intro_#{lang}.xml")
+        File.join(@libdir, "boilerplate-#{lang}.adoc")
       end
 
       def id_prefix(_prefix, id)
@@ -83,20 +83,34 @@ module Metanorma
         else
           IsoDoc::Iec::PresentationXMLConvert
             .new(doc_extract_attributes(node)
-            .merge(output_formats: ::Metanorma::Iec::Processor.new.output_formats))
+            .merge(output_formats: ::Metanorma::Iec::Processor
+            .new.output_formats))
         end
       end
 
       def term_defs_boilerplate(div, source, term, preface, isodoc)
-        return super unless @is_iev
+        super unless @is_iev
       end
 
-      def sections_names_cleanup(xml)
+      def sections_names_pref_cleanup(xml)
         super
         @is_iev and replace_title(xml, "//introduction",
                                   @i18n&.introduction_iev)
       end
 
+      # preserve ol/@type within boilerplate, not elsewhere in doc
+      def ol_cleanup(doc)
+        if doc.at("//metanorma-extension/semantic-metadata/" \
+               "headless[text() = 'true']")
+          doc.xpath("//ol[@explicit-type]").each do |x|
+            x["type"] = x["explicit-type"]
+            x.delete("explicit-type")
+          end
+        end
+        ::Metanorma::Standoc::Converter.instance_method(:ol_cleanup).bind(self)
+          .call(doc)
+      end
+
       def note(note)
         if note.title == "Note from TC/SC Officers"
           noko do |xml|
@@ -137,12 +151,6 @@ module Metanorma
         end
       end
 
-      def ol_attrs(node)
-        attr_code(keep_attrs(node)
-                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
-                         "explicit-type": olist_style(node.attributes[1])))
-      end
-
       # TODO remove when I adopt pubid-iec
       #
       def get_id_prefix(xmldoc)

data/lib/metanorma/iec/front.rb

@@ -89,7 +89,7 @@ module Metanorma
 
       def iso_id_out_common(xml, params, _with_prf)
         xml.docidentifier iso_id_default(params).to_s,
-                          **attr_code(type: "ISO")
+                          **attr_code(type: "ISO", primary: "true")
         xml.docidentifier iso_id_reference(params).to_s,
                           **attr_code(type: "iso-reference")
         @id_revdate and

data/lib/metanorma/iec/isodoc.rng

@@ -156,44 +156,7 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <attribute name="target">
-          <data type="string">
-            <param name="pattern">\i\c*|\c+#\c+</param>
-          </data>
-        </attribute>
-        <optional>
-          <attribute name="to">
-            <data type="string">
-              <param name="pattern">\i\c*|\c+#\c+</param>
-            </data>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="type">
-            <ref name="ReferenceFormat"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="case">
-            <choice>
-              <value>capital</value>
-              <value>lowercase</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="droploc">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="style">
-            <ref name="XrefStyleType"/>
-          </attribute>
-        </optional>
+        <ref name="XrefAttributes"/>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -407,23 +370,7 @@
     </define>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
+        <ref name="FigureAttributes"/>
         <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
@@ -2450,6 +2397,49 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefAttributes">
+    <attribute name="target">
+      <data type="string">
+        <param name="pattern">\i\c*|\c+#\c+</param>
+      </data>
+    </attribute>
+    <optional>
+      <attribute name="to">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="case">
+        <choice>
+          <value>capital</value>
+          <value>lowercase</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="droploc">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <ref name="XrefStyleType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
   <define name="XrefBody">
     <zeroOrMore>
       <ref name="XrefTarget"/>
@@ -2528,6 +2518,28 @@
       <attribute name="columns"/>
     </optional>
   </define>
+  <define name="FigureAttributes">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.4.4".freeze
+    VERSION = "2.4.6".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-iso", "~> 2.7.3"
-  spec.add_dependency "pubid-iec"
-  spec.add_dependency "ruby-jing"
+  spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.3
 - !ruby/object:Gem::Dependency
-  name: pubid-iec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -254,11 +240,11 @@ files:
 - lib/metanorma/iec/basicdoc.rng
 - lib/metanorma/iec/biblio-standoc.rng
 - lib/metanorma/iec/biblio.rng
+- lib/metanorma/iec/boilerplate-en.adoc
+- lib/metanorma/iec/boilerplate-fr.adoc
 - lib/metanorma/iec/converter.rb
 - lib/metanorma/iec/front.rb
 - lib/metanorma/iec/iec.rng
-- lib/metanorma/iec/iec_intro_en.xml
-- lib/metanorma/iec/iec_intro_fr.xml
 - lib/metanorma/iec/isodoc.rng
 - lib/metanorma/iec/isostandard.rng
 - lib/metanorma/iec/processor.rb

data/lib/metanorma/iec/iec_intro_en.xml

@@ -1,114 +0,0 @@
-<boilerplate>
-  <copyright-statement>
-    <clause>  
-      {% if unpublished %}
-      <p><strong>Copyright © {{ docyear }} International Electrotechnical Commission, IEC.</strong>
-        All rights reserved. It is permitted to download this electronic file, to make a copy and to
-        print out the content for the sole purpose of preparing National Committee positions. You
-        may not copy or "mirror" the file or printed version of the document, or any part of it,
-        for any other purpose without permission in writing from IEC.
-      {% else %}
-      <p id="boilerplate-year">
-        Copyright © {{ docyear }} {{ agency }}, Geneva, Switzerland
-      </p>
-      <p id="boilerplate-message">
-        All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
-        or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
-        either IEC or IEC's member National Committee in the country of the requester. If you have any questions about
-        {{ agency }} copyright or have an enquiry about obtaining additional rights to this publication, please contact the address
-        below or your local IEC member National Committee for further information.
-      </p>
-      <p id="boilerplate-name">IEC Central Office</p>
-      <p id="boilerplate-address" align="left">
-        3, rue de Varembé<br/>
-        CH-1211 Geneva 20<br/>
-        Switzerland<br/>
-        Tel.:&#xa0;+41 22 919 02 11<br/>
-        <link target="mailto:info@iec.ch">info@iec.ch</link><br/>
-        <link target="https://www.iec.ch">www.iec.ch</link>
-      {% endif %}
-      </p>
-    </clause>
-  </copyright-statement>
-  <legal-statement>
-    <clause>
-      <ol>
-        <li><p>The International Electrotechnical Commission (IEC) is a worldwide organization for standardization comprising all national electrotechnical committees (IEC National Committees). The object of IEC is to promote international co-operation on all questions concerning standardization in the electrical and electronic fields. To this end and in addition to other activities, IEC publishes International Standards, Technical Specifications, Technical Reports, Publicly Available Specifications (PAS) and Guides (hereafter referred to as “IEC Publication(s)”). Their preparation is entrusted to technical committees; any IEC National Committee interested in the subject dealt with may participate in this preparatory work. International, governmental and non-governmental organizations liaising with the IEC also participate in this preparation. IEC collaborates closely with the International Organization for Standardization (ISO) in accordance with conditions determined by agreement between the two organizations.</p></li>
-        <li><p>The formal decisions or agreements of IEC on technical matters express, as nearly as possible, an international consensus of opinion on the relevant subjects since each technical committee has representation from all interested IEC National Committees.</p></li>
-        <li><p>IEC Publications have the form of recommendations for international use and are accepted by IEC National Committees in that sense. While all reasonable efforts are made to ensure that the technical content of IEC Publications is accurate, IEC cannot be held responsible for the way in which they are used or for any misinterpretation by any end user.</p></li>
-        <li><p>In order to promote international uniformity, IEC National Committees undertake to apply IEC Publications transparently to the maximum extent possible in their national and regional publications. Any divergence between any IEC Publication and the corresponding national or regional publication shall be clearly indicated in the latter.</p></li>
-        <li><p>IEC itself does not provide any attestation of conformity. Independent certification bodies provide conformity assessment services and, in some areas, access to IEC marks of conformity. IEC is not responsible for any services carried out by independent certification bodies.</p></li>
-        <li><p>All users should ensure that they have the latest edition of this publication.</p></li>
-        <li><p>No liability shall attach to IEC or its directors, employees, servants or agents including individual experts and members of its technical committees and IEC National Committees for any personal injury, property damage or other damage of any nature whatsoever, whether direct or indirect, or for costs (including legal fees) and expenses arising out of the publication, use of, or reliance upon, this IEC Publication or any other IEC Publications.</p></li>
-        <li><p>Attention is drawn to the Normative references cited in this publication. Use of the referenced publications is indispensable for the correct application of this publication.</p></li>
-        <li><p>Attention is drawn to the possibility that some of the elements of this IEC Publication may be the subject of patent rights. IEC shall not be held responsible for identifying any or all such patent rights.</p></li>
-      </ol>
-    </clause>
-  </legal-statement>
-  {% if unpublished %}
-  <license-statement>
-    <clause>
-      {% if stage_int < 50 %}
-      <p>This document is still under study and subject to change. It should not be used for reference purposes.
-      until published as such.</p>
-    {% endif %}
-      {% if stage_int >= 50 %}
-      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
-        until published as such.</p>
-      {% endif %}
-      {% if stage_int >= 50 %}
-      <p>In addition to their evaluation as being acceptable for industrial, technological, commercial and user
-        purposes, Final Draft International Standards may on occasion have to be considered in the light of their
-        potential to become standards to which reference may be made in national regulations.</p>
-      {% endif %}
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant
-        patent rights of which they are aware and to provide supporting documentation.</p>
-    </clause>
-  </license-statement>
-  {% endif %}
-  <feedback-statement>
-    {% if unpublished %}
-    <clause id="boilerplate-cenelec-attention">
-      <title>Attention IEC-CENELEC parallel voting</title>
-      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
-        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
-        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
-        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
-        ({{ stageabbr }})
-        is submitted for parallel voting.</p>
-      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
-    </clause>
-    {% else %}
-    <clause>
-      <title>About the IEC</title>
-      <p>The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes International Standards for all electrical, electronic and related technologies.</p>
-    </clause>
-    <clause>
-      <title>About IEC publications</title>
-      <p>The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the latest edition, a corrigenda or an amendment might have been published.</p>
-    </clause>
-    <clause>
-      <clause>
-        <title>IEC Catalogue - <link target="https://webstore.iec.ch/catalogue">webstore.iec.ch/catalogue</link></title>
-        <p>The stand-alone application for consulting the entire bibliographical information on IEC International Standards, Technical Specifications, Technical Reports and other documents. Available for PC, Mac OS, Android Tablets and iPad.</p>
-      </clause>
-      <clause><title>IEC publications search - <link target="https://www.iec.ch/searchpub">www.iec.ch/searchpub</link></title>
-        <p>The advanced search enables to find IEC publications by a variety of criteria (reference number, text, technical committee,...). It also gives information on projects, replaced and withdrawn publications.</p>
-      </clause>
-      <clause><title>IEC Just Published - <link target="https://webstore.iec.ch/justpublished">webstore.iec.ch/justpublished</link></title>
-        <p>Stay up to date on all new IEC publications. Just Published details all new publications released. Available online and also once a month by email.</p>
-      </clause>
-      <clause><title>Electropedia - <link target="http://www.electropedia.org">www.electropedia.org</link></title>
-        <p>The world's leading online dictionary of electronic and electrical terms containing more than 30 000 terms and definitions in English and French, with equivalent terms in 14 additional languages. Also known as the International Electrotechnical Vocabulary (IEV) online.</p>
-      </clause>
-      <clause><title>IEC Glossary - <link target="http://std.iec.ch/glossary">std.iec.ch/glossary</link></title>
-        <p>More than 55 000 electrotechnical terminology entries in English and French extracted from the Terms and Definitions clause of IEC publications issued since 2002. Some entries have been collected from earlier publications of IEC TC 37, 77, 86 and CISPR.</p>
-      </clause>
-      <clause><title>IEC Customer Service Centre - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
-        <p>If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: <link target="mailto:csc@iec.ch">csc@iec.ch</link>.</p>
-      </clause>
-    </clause>
-    {% endif %}
-  </feedback-statement>
-</boilerplate>
-

data/lib/metanorma/iec/iec_intro_fr.xml

@@ -1,117 +0,0 @@
-<boilerplate>
-  <copyright-statement>
-    <clause>
-      {% if unpublished %}
-      <p><strong>Copyright © {{ docyear }} International Electrotechnical Commission, IEC.</strong>
-        All rights reserved. It is permitted to download this electronic file, to make a copy and to
-        print out the content for the sole purpose of preparing National Committee positions. You
-        may not copy or "mirror" the file or printed version of the document, or any part of it,
-        for any other purpose without permission in writing from IEC.
-      {% else %}
-      <p id="boilerplate-year">
-    Copyright © {{ docyear }} {{ agency }}, Geneva, Switzerland
-  </p>
-
-  <p id="boilerplate-message">
-Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
-ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
-et les microfilms, sans l'accord écrit de l'IEC ou du Comité national de l'IEC du pays du demandeur. Si vous avez des
-questions sur le copyright de l'{{ agency }} ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
-les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence.
-  </p>
-
-  <p id="boilerplate-name">IEC Central Office</p>
-
-  <p id="boilerplate-address" align="left">
-    3, rue de Varembé<br/>
-    CH-1211 Geneva 20<br/>
-    Switzerland<br/>
-    Tel.:&#xa0;+41 22 919 02 11<br/>
-    <link target="mailto:info@iec.ch">info@iec.ch</link><br/>
-    <link target="https://www.iec.ch">www.iec.ch</link>
-  </p>
-  {% endif %}
-</clause>
-</copyright-statement>
-<legal-statement>
-  <clause>
-    <ol>
-      <li><p>La Commission Electrotechnique Internationale (IEC) est une organisation mondiale de normalisation composée de l'ensemble des comités électrotechniques nationaux (Comités nationaux de l’IEC). L’IEC a pour objet de favoriser la coopération internationale pour toutes les questions de normalisation dans les domaines de l'électricité et de l'électronique. A cet effet, l’IEC – entre autres activités – publie des Normes internationales, des Spécifications techniques, des Rapports techniques, des Spécifications accessibles au public (PAS) et des Guides (ci-après dénommés "Publication(s) de l’IEC"). Leur élaboration est confiée à des comités d'études, aux travaux desquels tout Comité national intéressé par le sujet traité peut participer. Les organisations internationales, gouvernementales et non gouvernementales, en liaison avec l’IEC, participent également aux travaux. L’IEC collabore étroitement avec l'Organisation Internationale de Normalisation (ISO), selon des conditions fixées par accord entre les deux organisations.</p></li>
-      <li><p>Les décisions ou accords officiels de l’IEC concernant les questions techniques représentent, dans la mesure du possible, un accord international sur les sujets étudiés, étant donné que les Comités nationaux de l’IEC intéressés sont représentés dans chaque comité d’études.</p></li>
-      <li><p>Les Publications de l’IEC se présentent sous la forme de recommandations internationales et sont agréées comme telles par les Comités nationaux de l’IEC. Tous les efforts raisonnables sont entrepris afin que l’IEC s'assure de l'exactitude du contenu technique de ses publications; l’IEC ne peut pas être tenue responsable de l'éventuelle mauvaise utilisation ou interprétation qui en est faite par un quelconque utilisateur final.</p></li>
-      <li><p>Dans le but d'encourager l'uniformité internationale, les Comités nationaux de l’IEC s'engagent, dans toute la mesure possible, à appliquer de façon transparente les Publications de l’IEC dans leurs publications nationales et régionales. Toutes divergences entre toutes Publications de l’IEC et toutes publications nationales ou régionales correspondantes doivent être indiquées en termes clairs dans ces dernières.</p></li>
-      <li><p>L’IEC elle-même ne fournit aucune attestation de conformité. Des organismes de certification indépendants fournissent des services d'évaluation de conformité et, dans certains secteurs, accèdent aux marques de conformité de l’IEC. L’IEC n'est responsable d'aucun des services effectués par les organismes de certification indépendants.</p></li>
-      <li><p>Tous les utilisateurs doivent s'assurer qu'ils sont en possession de la dernière édition de cette publication.</p></li>
-      <li><p>Aucune responsabilité ne doit être imputée à l’IEC, à ses administrateurs, employés, auxiliaires ou mandataires, y compris ses experts particuliers et les membres de ses comités d'études et des Comités nationaux de l’IEC, pour tout préjudice causé en cas de dommages corporels et matériels, ou de tout autre dommage de quelque nature que ce soit, directe ou indirecte, ou pour supporter les coûts (y compris les frais de justice) et les dépenses découlant de la publication ou de l'utilisation de cette Publication de l’IEC ou de toute autre Publication de l’IEC, ou au crédit qui lui est accordé.</p></li>
-      <li><p>L'attention est attirée sur les références normatives citées dans cette publication. L'utilisation de publications référencées est obligatoire pour une application correcte de la présente publication.</p></li>
-      <li><p>L’attention est attirée sur le fait que certains des éléments de la présente Publication de l’IEC peuvent faire l’objet de droits de brevet. L’IEC ne saurait être tenue pour responsable de ne pas avoir identifié de tels droits de brevets et de ne pas avoir signalé leur existence.</p></li>
-    </ol>
-  </clause>
-</legal-statement>
- {% if unpublished %}
-<license-statement>
-    <clause>
-      {% if stage_int < 40 %}
-      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
-      until published as such.</p>
-    {% endif %}
-      {% if stage_int >= 40 %}
-      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
-        until published as such.</p>
-      {% endif %}
-      {% if stage_int >= 50 %}
-      <p>In addition to their evaluation as being acceptable for industrial, technological, commercial and user
-        purposes, Final Draft International Standards may on occasion have to be considered in the light of their
-        potential to become standards to which reference may be made in national regulations.</p>
-      {% endif %}
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant
-        patent rights of which they are aware and to provide supporting documentation.</p>
-    </clause>
-</license-statement>
-{% endif %}
-<feedback-statement>
-  {% if unpublished %}
-    <clause id="boilerplate-cenelec-attention">
-      <title>Attention IEC-CENELEC parallel voting</title>
-      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
-        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
-        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
-        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
-        ({{ stageabbr }})
-        is submitted for parallel voting.</p>
-      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
-    </clause>
-    {% else %}
-<clause>
-  <title>A propos de l'IEC</title>
-  <p>La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</p>
-</clause>
-<clause>
-  <title>A propos des publications IEC</title>
-  <p>Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la plus récente, un corrigendum ou amendement peut avoir été publié.</p>
-</clause>
-<clause>
-  <clause>
-    <title>Catalogue IEC - <link target="https://webstore.iec.ch/catalogue">webstore.iec.ch/catalogue</link></title>
-    <p>Application autonome pour consulter tous les renseignements bibliographiques sur les Normes internationales, Spécifications techniques, Rapports techniques et autres documents de l'IEC. Disponible pour PC, Mac OS, tablettes Android et iPad.</p>
-  </clause>
-  <clause><title>Recherche de publications IEC - <link target="https://www.iec.ch/searchpub">www.iec.ch/searchpub</link></title>
-    <p>La recherche avancée permet de trouver des publications IEC en utilisant différents critères (numéro de référence, texte, comité d’études,...). Elle donne aussi des informations sur les projets et les publications remplacées ou retirées.</p>
-  </clause>
-  <clause><title>IEC Just Published - <link target="https://webstore.iec.ch/justpublished">webstore.iec.ch/justpublished</link></title>
-    <p>Restez informé sur les nouvelles publications IEC. Just Published détaille les nouvelles publications parues. Disponible en ligne et aussi une fois par mois par email.</p>
-  </clause>
-  <clause><title>Electropedia - <link target="http://www.electropedia.org">www.electropedia.org</link></title>
-    <p>Le premier dictionnaire en ligne de termes électroniques et électriques. Il contient plus de 30 000 termes et définitions en anglais et en français, ainsi que les termes équivalents dans 14 langues additionnelles. Egalement appelé Vocabulaire Electrotechnique International (IEV) en ligne.</p>
-  </clause>
-  <clause><title>Glossaire IEC - <link target="http://std.iec.ch/glossary">std.iec.ch/glossary</link></title>
-    <p>Plus de 55 000 entrées terminologiques électrotechniques, en anglais et en français, extraites des articles Termes et Définitions des publications IEC parues depuis 2002. Plus certaines entrées antérieures extraites des publications des CE 37, 77, 86 et CISPR de l'IEC.</p>
-  </clause>
-  <clause><title>Service Clients - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
-    <p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto:csc@iec.ch">csc@iec.ch</link>.</p>
-  </clause>
-</clause>
-{% endif %}
-</feedback-statement>
-</boilerplate>
-