metanorma-iso 2.8.9 → 2.9.0

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

@@ -3731,6 +3731,21 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="iso:copyright-statement/iso:clause" priority="3">
+		<fo:block role="SKIP">
+			<xsl:if test="@id = 'boilerplate-copyright-default' and ../iso:clause[not(@id = 'boilerplate-copyright-default')]">
+				<xsl:attribute name="color">blue</xsl:attribute>
+				<xsl:attribute name="border">1pt solid blue</xsl:attribute>
+				<xsl:attribute name="padding">1mm</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(@id = 'boilerplate-copyright-default') and preceding-sibling::iso:clause">
+				<xsl:attribute name="margin-top">5mm</xsl:attribute>
+			</xsl:if>
+			<xsl:copy-of select="@id"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="iso:copyright-statement//iso:p" priority="2">
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'">
@@ -3777,7 +3792,7 @@
 						<xsl:attribute name="margin-left">0.5mm</xsl:attribute>
 						<xsl:attribute name="margin-right">0.5mm</xsl:attribute>
 					</xsl:if>
-					<xsl:if test="contains(@id, 'address')">
+					<xsl:if test="contains(@id, 'address') or contains(normalize-space(), 'Tel:') or contains(normalize-space(), 'Phone:')">
 						<xsl:attribute name="margin-left">4.5mm</xsl:attribute>
 					</xsl:if>
 					<xsl:apply-templates/>
@@ -4415,6 +4430,8 @@
 				</xsl:if>
 			</xsl:if>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:call-template name="processElementContent"/>
 		</fo:block>
 	</xsl:template>
@@ -4431,6 +4448,8 @@
 
 			<xsl:call-template name="refine_clause_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:call-template name="processElementContent"/>
 
 		</fo:block>
@@ -9357,6 +9376,11 @@
 
 								<xsl:value-of select="@reference"/>
 
+								<!-- commented https://github.com/metanorma/isodoc/issues/614 -->
+								<!-- <xsl:if test="$namespace = 'itu'">
+									<xsl:text>)</xsl:text>
+								</xsl:if> -->
+
 							</fo:inline>
 							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
 								<xsl:copy-of select="./node()"/>
@@ -9366,7 +9390,7 @@
 
 			</xsl:if>
 		</xsl:for-each>
-	</xsl:template>
+	</xsl:template> <!-- table_fn_display -->
 
 	<xsl:template name="create_fn">
 		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -9394,8 +9418,10 @@
 	<!-- EMD table's footnotes rendering -->
 	<!-- ============================ -->
 
+	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
-	<xsl:template name="fn_display_figure">
+	<!-- ============================ -->
+	<xsl:template name="fn_display_figure"> <!-- figure_fn_display -->
 
 		<!-- current figure id -->
 		<xsl:variable name="figure_id_">
@@ -9508,9 +9534,28 @@
 
 			</fo:block>
 		</xsl:if>
-
 	</xsl:template> <!-- fn_display_figure -->
 
+	<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+	<!-- figure's footnote label -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'dl'][@key = 'true']/*[local-name() = 'dt']/     *[local-name() = 'p'][count(node()[normalize-space() != '']) = 1]/*[local-name() = 'sup']" priority="3">
+		<xsl:variable name="key_iso">
+			true
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+
+		</xsl:if>
+		<fo:inline xsl:use-attribute-sets="figure-fn-number-style"> <!-- id="{@id}"  -->
+			<!-- <xsl:value-of select="@reference"/> -->
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
+	<!-- ============================ -->
+	<!-- END: figure's footnotes rendering -->
+	<!-- ============================ -->
+
 	<!-- fn reference in the text rendering (for instance, 'some text 1) some text' ) -->
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
@@ -9526,6 +9571,10 @@
 
 				<xsl:value-of select="@reference"/>
 
+				<!-- commented, https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:if test="$namespace = 'jis'">
+					<fo:inline font-weight="normal">)</fo:inline>
+				</xsl:if> -->
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template>
@@ -9656,17 +9705,22 @@
 						</fo:block>
 					</xsl:when>  <!-- END: a few components -->
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
-						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
+						<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
 
-							<xsl:call-template name="refine_figure_key_style"/>
+									<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 
-							<xsl:variable name="title-key">
-								<xsl:call-template name="getLocalizedString">
-									<xsl:with-param name="key">key</xsl:with-param>
-								</xsl:call-template>
-							</xsl:variable>
-							<xsl:value-of select="$title-key"/>
-						</fo:block>
+										<xsl:call-template name="refine_figure_key_style"/>
+
+										<xsl:variable name="title-key">
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">key</xsl:with-param>
+											</xsl:call-template>
+										</xsl:variable>
+										<xsl:value-of select="$title-key"/>
+									</fo:block>
+
+						</xsl:if>
 					</xsl:when>  <!-- END: definition list in a figure -->
 				</xsl:choose>
 
@@ -9856,6 +9910,14 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
+		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
+			<xsl:call-template name="refine_figure_key_style"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template name="refine_dl_formula_where_style">
 
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -11988,6 +12050,39 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="mathml_linebreak">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="mathml_linebreak"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- split math into two math -->
+	<xsl:template match="mathml:mo[@linebreak] | mathml:mspace[@linebreak]" mode="mathml_linebreak">
+		<xsl:variable name="math_elements_tree_">
+			<xsl:for-each select="ancestor::*[ancestor-or-self::mathml:math]">
+				<element pos="{position()}">
+					<xsl:copy-of select="@*[local-name() != 'id']"/>
+					<xsl:value-of select="name()"/>
+				</element>
+			</xsl:for-each>
+		</xsl:variable>
+
+		<xsl:variable name="math_elements_tree" select="xalan:nodeset($math_elements_tree_)"/>
+
+		<xsl:call-template name="insertClosingElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+		</xsl:call-template>
+
+		<xsl:element name="br" namespace="{$namespace_full}"/>
+
+		<xsl:call-template name="insertOpeningElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+			<xsl:with-param name="xmlns">http://www.w3.org/1998/Math/MathML</xsl:with-param>
+			<xsl:with-param name="add_continue">false</xsl:with-param>
+		</xsl:call-template>
+
+	</xsl:template>
+
 	<!-- Examples: 
 		<stem type="AsciiMath">x = 1</stem> 
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -12241,9 +12336,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<xsl:if test="normalize-space() != ''">
-			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
-		</xsl:if>
+			<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
+		</xsl:if> -->
+		<xsl:apply-templates/>
 	</xsl:template>
 
 	<!-- stem inside formula with name (with formula's number) -->
@@ -12422,10 +12519,21 @@
 				</xsl:when>
 				<xsl:otherwise>
 
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece'  or $namespace = 'rsd'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
+
 						<xsl:if test="$layoutVersion = '1987' and . = translate(.,'1234567890','')"> <!-- NOTE without number -->
 							<xsl:text> — </xsl:text>
 						</xsl:if>
 
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -12444,8 +12552,16 @@
 				</xsl:when>
 				<xsl:otherwise>
 
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'iso' or $namespace = 'iec' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' or $namespace = 'rsd' or $namespace = 'jcgm'">
 						<xsl:text>:</xsl:text>
-
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp' or $namespace = 'unece-rec' or $namespace = 'unece'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -14615,7 +14731,7 @@
 		<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/>
+				<xsl:apply-templates/> <!-- commented $namespace = 'ieee', https://github.com/metanorma/isodoc/issues/614-->
 			</fo:inline>
 		</xsl:if>
 	</xsl:template>
@@ -14782,7 +14898,7 @@
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
 					<xsl:call-template name="refine_example-name-style"/>
-					<xsl:apply-templates/>
+					<xsl:apply-templates/> <!-- $namespace = 'ieee', see https://github.com/metanorma/isodoc/issues/614  -->
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -14974,15 +15090,17 @@
 
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block role="BlockQuote">
-							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
+							<xsl:apply-templates select="./node()[not(local-name() = 'author') and         not(local-name() = 'source') and         not(local-name() = 'attribution')]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
-				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
+				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source'] or *[local-name() = 'attribution']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
 						<xsl:apply-templates select="*[local-name() = 'author']"/>
 						<xsl:apply-templates select="*[local-name() = 'source']"/>
+						<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:apply-templates select="*[local-name() = 'attribution']/*[local-name() = 'p']/node()"/>
 					</fo:block>
 				</xsl:if>
 
@@ -15004,9 +15122,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'author']">
-		<xsl:text>— </xsl:text>
+		<xsl:if test="local-name(..) = 'quote'"> <!-- for old Presentation XML, https://github.com/metanorma/isodoc/issues/607 -->
+			<xsl:text>— </xsl:text>
+		</xsl:if>
 		<xsl:apply-templates/>
 	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'quote']//*[local-name() = 'referenceFrom']"/>
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -15187,8 +15309,12 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'domain']">
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
-		<xsl:text> </xsl:text>
+		<xsl:text> </xsl:text> -->
+		<xsl:if test="not(@hidden = 'true')">
+			<xsl:apply-templates/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'admitted']">
@@ -15236,6 +15362,29 @@
 	<!-- END definition -->
 	<!-- ========== -->
 
+	<xsl:variable name="reviews_">
+		<xsl:for-each select="//*[local-name() = 'review'][@from]">
+			<xsl:copy>
+				<xsl:copy-of select="@from"/>
+				<xsl:copy-of select="@id"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
+
+	<xsl:template name="addReviewHelper">
+		<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
+		<xsl:variable name="curr_id" select="@id"/>
+		<xsl:variable name="review_id" select="normalize-space($reviews//*[local-name() = 'review'][@from = $curr_id]/@id)"/>
+		<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
+			<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		</xsl:if>
+		<!-- <fo:block>
+			<curr_id><xsl:value-of select="$curr_id"/></curr_id>
+			<xsl:copy-of select="$reviews"/>
+		</fo:block> -->
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
 
@@ -15244,6 +15393,8 @@
 
 			<xsl:call-template name="sections_element_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 
@@ -15290,6 +15441,7 @@
 
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -15326,6 +15478,8 @@
 
 			<xsl:call-template name="refine_clause_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -15378,6 +15532,23 @@
 
 		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
 
+		<xsl:if test="1 = 1">
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		</xsl:if>
+
+    <xsl:if test="1 = 2">
 		<xsl:choose>
 			<!-- if there isn't the attribute '@from', then -->
 			<xsl:when test="$id_from = ''">
@@ -15391,6 +15562,7 @@
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
+    </xsl:if>
 
 	</xsl:template>
 
@@ -16545,9 +16717,9 @@
 					</xsl:if>
 
 						<xsl:if test="@type != 'editorial'">
-							<xsl:call-template name="displayAdmonitionName">
-								<xsl:with-param name="sep"> — </xsl:with-param>
-							</xsl:call-template>
+							<xsl:call-template name="displayAdmonitionName"/>
+								<!-- https://github.com/metanorma/isodoc/issues/614 -->
+								<!-- <xsl:with-param name="sep"> — </xsl:with-param> -->
 						</xsl:if>
 
 					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -16805,7 +16977,7 @@
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/>
 
-	<xsl:template match="*[local-name() = 'stem'] |        *[local-name() = 'image'] |        *[local-name() = 'sourcecode'] |        *[local-name() = 'bibdata'] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -16871,6 +17043,22 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:variable name="regex_passthrough">.*\bpdf\b.*</xsl:variable>
+	<xsl:template match="*[local-name() = 'passthrough']" mode="update_xml_step1">
+		<!-- <xsl:if test="contains(@formats, ' pdf ')"> -->
+		<xsl:if test="normalize-space(java:matches(java:java.lang.String.new(@formats), $regex_passthrough)) = 'true'">
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:if>
+	</xsl:template>
+
+	<!-- split math by element with @linebreak into maths -->
+	<xsl:template match="mathml:math[.//mathml:mo[@linebreak] or .//mathml:mspace[@linebreak]]" mode="update_xml_step1">
+		<xsl:variable name="maths">
+			<xsl:apply-templates select="." mode="mathml_linebreak"/>
+		</xsl:variable>
+		<xsl:copy-of select="$maths"/>
+	</xsl:template>
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->
@@ -16974,6 +17162,8 @@
 
 	<xsl:template name="insertOpeningElements">
 		<xsl:param name="tree"/>
+		<xsl:param name="xmlns"/>
+		<xsl:param name="add_continue">true</xsl:param>
 		<xsl:for-each select="$tree//element">
 			<xsl:text disable-output-escaping="yes">&lt;</xsl:text>
 				<xsl:value-of select="."/>
@@ -16984,7 +17174,8 @@
 					<xsl:value-of select="."/>
 					<xsl:text>"</xsl:text>
 				</xsl:for-each>
-				<xsl:if test="position() = 1"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $add_continue = 'true'"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $xmlns != ''"> xmlns="<xsl:value-of select="$xmlns"/>"</xsl:if>
 			<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
 			<xsl:if test="$debug = 'true'">
 				<xsl:message>&lt;<xsl:value-of select="."/>&gt;</xsl:message>

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -32,7 +32,7 @@ module IsoDoc
         ret = "<review date='#{Date.today}' reviewer='Metanorma' id='_#{id}'>" \
               "<p><strong>Metadata warnings:<strong></p> #{ret}</review>"
         ins = docxml.at(ns("//sections//title")) or return
-        ins.children.first.previous = ret
+        ins.add_first_child ret
       end
 
       def editorialgroup_identifier(docxml)

data/lib/isodoc/iso/presentation_terms.rb

@@ -52,19 +52,6 @@ module IsoDoc
                      node.children)
       end
 
-      def termdefinition1(elem)
-        prefix_domain_to_definition(elem)
-        super
-      end
-
-      def prefix_domain_to_definition(elem)
-        ((d = elem.at(ns("./domain"))) &&
-          (v = elem.at(ns("./definition/verbal-definition"))) &&
-          v.elements.first.name == "p") or return
-        v.elements.first.children.first.previous =
-          "<#{to_xml(d.remove.children)}> "
-      end
-
       def insertall_after_here(node, insert, name)
         node.children.each do |n|
           n.name == name or next

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -31,6 +31,7 @@ module IsoDoc
         admonition docxml
         source docxml
         ol docxml
+        quote docxml
         permission docxml
         requirement docxml
         recommendation docxml
@@ -38,6 +39,8 @@ module IsoDoc
         @xrefs.anchors_previous = @xrefs.anchors.dup # store old xrefs of reqts
         @xrefs.parse docxml
         table docxml # have table include requirements newly converted to tables
+        # table feeds dl
+        dl docxml
         example docxml
         note docxml
       end
@@ -52,6 +55,8 @@ module IsoDoc
       end
 
       def figure1(node)
+        figure_fn(node)
+        figure_key(node.at(ns("./dl")))
         lbl = @xrefs.anchor(node["id"], :label, false) or return
         figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
         conn = node.parent.name == "figure" ? "  " : " — "
@@ -97,7 +102,6 @@ module IsoDoc
 
       def admonition1(elem)
         super
-        admonition_inline_name(elem)
         admonition_outside_clauses(elem)
       end
 
@@ -113,17 +117,6 @@ module IsoDoc
         cell.children.each { |p| wrap_in_bold(p) }
       end
 
-      def admonition_inline_name(elem)
-        n = elem.at(ns("./name")) or return
-        if (p = n.next_element) && p&.name == "p"
-          p.children.first.previous = admonition_name(to_xml(n.remove.children))
-        end
-      end
-
-      def admonition_name(xml)
-        "#{xml} — "
-      end
-
       def bibrender_formattedref(formattedref, xml)
         %w(techreport standard).include? xml["type"] and return
         super
@@ -146,10 +139,9 @@ module IsoDoc
 
       def formula_where(dlist)
         dlist.nil? and return
-        return super unless dlist.xpath(ns("./dt")).size == 1 &&
+        dlist.xpath(ns("./dt")).size == 1 &&
           dlist.at(ns("./dd"))&.elements&.size == 1 &&
-          dlist.at(ns("./dd/p"))
-
+          dlist.at(ns("./dd/p")) or return super
         formula_where_one(dlist)
       end
 
@@ -162,7 +154,7 @@ module IsoDoc
 
       def table1(elem)
         elem.xpath(ns(".//dl[@key = 'true'][not(./name)]")).each do |dl|
-          dl.children.first.previous = "<name>#{@i18n.key}</name>"
+          dl.add_first_child "<name>#{@i18n.key}</name>"
         end
         super
       end
@@ -177,7 +169,7 @@ module IsoDoc
           return
         s = docxml.at(ns("//sections")) or return
         ret = "#{middle_title_main}#{middle_title_amd}"
-        s.children.first.previous = ret
+        s.add_first_child ret
       end
 
       def middle_title_main
@@ -214,9 +206,7 @@ module IsoDoc
       end
 
       def move_norm_ref_to_sections(docxml)
-        if amd?(docxml)
-        else super
-        end
+        amd?(docxml) or super
       end
 
       def twitter_cldr_localiser_symbols
@@ -224,6 +214,25 @@ module IsoDoc
           fraction_group_digits: 3 }
       end
 
+      def implicit_reference(bib)
+        bib.at(ns("./docidentifier"))&.text == "IEV" and return true
+        super
+      end
+
+      def render_identifier(ident)
+        ret = super
+        ret[:sdo] = std_docid_semantic(ret[:sdo])
+        ret
+      end
+
+      def admonition_delim(elem)
+        if elem.at("./*[not(self::xmlns:name)]")&.name == "p"
+          " &#x2014; "
+        else
+          ""
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/presentation_xref.rb

@@ -130,6 +130,8 @@ module IsoDoc
       end
 
       def expand_citeas(text)
+        ret = super or return
+        ret.include?("<span") and return ret
         std_docid_semantic(super)
       end
 

data/lib/isodoc/iso/sections.rb

@@ -12,7 +12,7 @@ module IsoDoc
         @foreword = true
         page_break(out)
         out.div **attr_code(id: clause["id"]) do |s|
-          clause_name(nil, clause.at(ns("./title")) || @i18n.foreword, s,
+          clause_name(nil, clause.at(ns("./title")), s,
                       { class: "ForewordTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end

data/lib/metanorma/iso/front.rb

@@ -21,6 +21,7 @@ module Metanorma
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
         a = node.attr("fast-track") and xml.send "fast-track", a != "false"
+        a = node.attr("price-code") and xml.price_code a
       end
 
       STAGE_ERROR = [Pubid::Core::Errors::HarmonizedStageCodeInvalidError,

data/lib/metanorma/iso/front_contributor.rb

@@ -54,12 +54,10 @@ module Metanorma
       def contrib_committee_build(xml, agency, committee)
         name = org_abbrev.invert[agency] and agency = name
         xml.name agency
-        xml.subdivision do |s|
-          s.organization do |o|
+        xml.subdivision do |o|
             o.name committee[:name]
             committee[:abbr] and o.abbreviation committee[:abbr]
             committee[:ident] and o.identifier committee[:ident]
-          end
         end
       end