metanorma-iec 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ccd01c3f1f56470992e66fd61dd23ea52f134df9b7f0368f5373b99e3a40cf9
-  data.tar.gz: 493a899b9534db1c2282dfd12045e0feb581f7954e1bf0c5ed0caf4f18f3328c
+  metadata.gz: d645d0456c36e2e19ebbd941038de52eec9fc67290d093ff6dac57d07f405daa
+  data.tar.gz: d9e0901468f752d0de9ad4643f0cc5098f61ea729b4f88ec0af158a391ce03b3
 SHA512:
-  metadata.gz: 60b0d7a25d2c843087d1ccc701d3f48d7706563cc691851394866305d9ee3887bdc25577b9300c1cfb94c861d5bdcde300fe969758a04a5ceaeca3087bda0f65
-  data.tar.gz: c3bb3faec8bafd2ba6fc47e88bdb6584696b0ea158fdcb8e49bcf9fdf953e2fb8f8a0f9194144f2dc531583b43c246e7d681ddf54824695e852f407a7d13cd1b
+  metadata.gz: bbcb2ffa1835118482ed4887ac89e7f3ff444df83cbf3ef6a8c51b2e7e4ec4951b788b545b26bce6ff50b28bbd12791491acf147d72e0ba039b4ac89220136f4
+  data.tar.gz: e1b0276f83a63434a4dad3dbd7bfcb3854b41c37e256d1473ad61591f6e4f1dc8a484bf94e323455c04e6bf9eaf3cd2f7ca2bfdebbdeba643081bbadc820d2ef

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

@@ -2872,6 +2872,7 @@
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-name-style">
+		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -2884,6 +2885,9 @@
 
 	<xsl:template name="refine_table-name-style">
 		<xsl:param name="continued"/>
+		<xsl:if test="$continued = 'true'">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
 
 			<xsl:if test="$continued = 'true'">
 				<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -4709,7 +4713,7 @@
 				</xsl:if>
 
 			</fo:block-container>
-		</xsl:variable>
+		</xsl:variable> <!-- END: variable name="table" -->
 
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -4719,14 +4723,14 @@
 
 				<!-- 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 table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
 
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
-						<fo:table-body>
-							<fo:table-row>
-								<fo:table-cell column-number="2">
+						<fo:table-body role="SKIP">
+							<fo:table-row role="SKIP">
+								<fo:table-cell column-number="2" role="SKIP">
 									<xsl:copy-of select="$table-preamble"/>
 									<fo:block role="SKIP">
 										<xsl:call-template name="setTrackChangesStyles">
@@ -4772,11 +4776,12 @@
 
 	</xsl:template>
 
+	<!-- table/name-->
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 
-					<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
+					<fo:block xsl:use-attribute-sets="table-name-style">
 
 						<xsl:call-template name="refine_table-name-style">
 							<xsl:with-param name="continued" select="$continued"/>
@@ -5272,7 +5277,7 @@
 
 			<xsl:variable name="tableWithNotesAndFootnotes">
 
-				<fo:table keep-with-previous="always">
+				<fo:table keep-with-previous="always" role="SKIP">
 					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
 						<xsl:variable name="name" select="local-name()"/>
 						<xsl:choose>
@@ -5303,9 +5308,9 @@
 						</xsl:otherwise>
 					</xsl:choose>
 
-					<fo:table-body>
-						<fo:table-row>
-							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+					<fo:table-body role="SKIP">
+						<fo:table-row role="SKIP">
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
 
 								<xsl:call-template name="refine_table-footer-cell-style"/>
 
@@ -5383,7 +5388,7 @@
 
 			<!-- if there isn't 'thead' and there is a table's title -->
 			<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
-				<fo:table-header>
+				<fo:table-header role="Caption">
 					<xsl:call-template name="table-header-title">
 						<xsl:with-param name="cols-count" select="$cols-count"/>
 					</xsl:call-template>
@@ -5752,6 +5757,7 @@
 	<!-- footnotes in text (title, bibliography, main body), not for tables, figures and names --> <!-- table's, figure's names -->
 	<!-- fn in text -->
 	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" priority="2" name="fn">
+		<xsl:param name="footnote_body_from_table">false</xsl:param>
 
 		<!-- list of unique footnotes -->
 		<xsl:variable name="p_fn_">
@@ -5817,7 +5823,7 @@
 				<xsl:copy-of select="$footnote_inline"/>
 			</xsl:when>
 			<!-- <xsl:when test="$footnotes//*[local-name() = 'fmt-fn-body'][@id = $ref_id] or normalize-space(@skip_footnote_body) = 'false'"> -->
-			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
+			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false' or $footnote_body_from_table = 'true'">
 
 				<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
 					<xsl:copy-of select="$footnote_inline"/>
@@ -6228,39 +6234,51 @@
 	<!-- fn reference in the table rendering (for instance, 'some text 1) some text' ) -->
 	<!-- fn --> <!-- in table --> <!-- for figure see <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/> -->
 	<xsl:template match="*[local-name()='fn']">
-		<fo:inline xsl:use-attribute-sets="fn-reference-style">
-
-			<xsl:call-template name="refine_fn-reference-style"/>
+		<xsl:variable name="target" select="@target"/>
+		<xsl:choose>
+			<!-- case for footnotes in Requirement tables (https://github.com/metanorma/metanorma-ogc/issues/791) -->
+			<xsl:when test="not(ancestor::*[local-name() = 'table'][1]/*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body'][@id = $target]) and        $footnotes/*[local-name() = 'fmt-fn-body'][@id = $target]">
+				<xsl:call-template name="fn">
+					<xsl:with-param name="footnote_body_from_table">true</xsl:with-param>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise>
 
-			<!-- <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="footnote {@reference}"> --> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
-			<fo:basic-link internal-destination="{@target}" fox:alt-text="footnote {@reference}">
-				<!-- <xsl:if test="ancestor::*[local-name()='table'][1]/@id"> --> <!-- for footnotes in tables -->
-				<!-- 	<xsl:attribute name="internal-destination">
-						<xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/>
-					</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$namespace = 'ogc' or $namespace = 'ogc-white-paper'">
-					<xsl:attribute name="internal-destination">
-						<xsl:value-of select="@reference"/><xsl:text>_</xsl:text>
-						<xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
-					</xsl:attribute>
-				</xsl:if> -->
-				<!-- <xsl:if test="$namespace = 'plateau'">
-					<xsl:text>※</xsl:text>
-				</xsl:if> -->
-				<!-- <xsl:value-of select="@reference"/> -->
+				<fo:inline xsl:use-attribute-sets="fn-reference-style">
 
-						<xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
+					<xsl:call-template name="refine_fn-reference-style"/>
 
-				<!-- <xsl:if test="$namespace = 'bsi'">
-					<xsl:text>)</xsl:text>
-				</xsl:if> -->
-				<!-- 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>
+					<!-- <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="footnote {@reference}"> --> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
+					<fo:basic-link internal-destination="{@target}" fox:alt-text="footnote {@reference}">
+						<!-- <xsl:if test="ancestor::*[local-name()='table'][1]/@id"> --> <!-- for footnotes in tables -->
+						<!-- 	<xsl:attribute name="internal-destination">
+								<xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/>
+							</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="$namespace = 'ogc' or $namespace = 'ogc-white-paper'">
+							<xsl:attribute name="internal-destination">
+								<xsl:value-of select="@reference"/><xsl:text>_</xsl:text>
+								<xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
+							</xsl:attribute>
+						</xsl:if> -->
+						<!-- <xsl:if test="$namespace = 'plateau'">
+							<xsl:text>※</xsl:text>
+						</xsl:if> -->
+						<!-- <xsl:value-of select="@reference"/> -->
+
+								<xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
+
+						<!-- <xsl:if test="$namespace = 'bsi'">
+							<xsl:text>)</xsl:text>
+						</xsl:if> -->
+						<!-- 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:otherwise>
+		</xsl:choose>
 	</xsl:template> <!-- fn -->
 
 	<!-- fn/text() -->
@@ -10341,6 +10359,13 @@
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 
+	<!-- prevent missing stem for table and figures in ToC -->
+	<xsl:template match="*[local-name() = 'name' or local-name() = 'fmt-name']//*[local-name() = 'stem']" mode="contents">
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-stem'])">
+			<xsl:apply-templates select="."/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/>
 
 	<xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/>
@@ -10573,7 +10598,8 @@
 
 						<xsl:for-each select="$contents_nodes//tables/table">
 							<fo:bookmark internal-destination="{@id}">
-								<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
+								<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
+								<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
 							</fo:bookmark>
 						</xsl:for-each>
 					</fo:bookmark>
@@ -10582,6 +10608,26 @@
 	</xsl:template> <!-- insertTableBookmarks -->
 	<!-- End Bookmarks -->
 
+	<!-- ============================ -->
+	<!-- mode="bookmark_clean" -->
+	<!-- ============================ -->
+	<xsl:template match="node()" mode="bookmark_clean">
+		<xsl:apply-templates select="node()" mode="bookmark_clean"/>
+	</xsl:template>
+
+	<xsl:template match="text()" mode="bookmark_clean">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'math']" mode="bookmark_clean">
+		<xsl:value-of select="normalize-space(.)"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'asciimath']" mode="bookmark_clean"/>
+	<!-- ============================ -->
+	<!-- END: mode="bookmark_clean" -->
+	<!-- ============================ -->
+
 	<xsl:template name="getLangVersion">
 		<xsl:param name="lang"/>
 		<xsl:param name="doctype" select="''"/>
@@ -12597,9 +12643,15 @@
 			<xsl:when test="local-name(..) = 'ul'">
 				<xsl:choose>
 					<xsl:when test="normalize-space($processing_instruction_type) = 'simple'"/>
+					<!-- https://github.com/metanorma/isodoc/issues/675 -->
+					<xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
 					<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
+			<!-- https://github.com/metanorma/isodoc/issues/675 -->
+			<xsl:when test="local-name(..) = 'ol' and @label and @full = 'true'"> <!-- @full added in the template li/fmt-name -->
+				<xsl:value-of select="@label"/>
+			</xsl:when>
 			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
 
 				<xsl:variable name="type" select="../@type"/>
@@ -12724,7 +12776,7 @@
 
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template>
+	</xsl:template> <!-- getListItemFormat -->
 
 	<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:param name="indent">0</xsl:param>
@@ -12860,6 +12912,11 @@
 
 					<xsl:call-template name="refine_list-item-label-style"/>
 
+					<xsl:if test="local-name(..) = 'ul'">
+						<xsl:variable name="li_label" select="@label"/>
+						<xsl:copy-of select="$ul_labels//label[. = $li_label]/@*[not(local-name() = 'level')]"/>
+					</xsl:if>
+
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -14261,6 +14318,16 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- li/fmt-name -->
+	<xsl:template match="*[local-name() = 'li']/*[local-name() = 'fmt-name']" priority="2" mode="update_xml_step1">
+		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
+		<xsl:attribute name="full">true</xsl:attribute>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'li']/*[local-name() = 'fmt-name']" priority="2" mode="update_xml_pres">
+		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
+		<xsl:attribute name="full">true</xsl:attribute>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
 	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
@@ -15075,6 +15142,64 @@
 		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+	<!-- Ruby text (CJK languages) rendering -->
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+	<xsl:template match="*[local-name() = 'ruby']">
+		<fo:inline-container text-indent="0mm" last-line-end-indent="0mm">
+			<xsl:if test="not(ancestor::*[local-name() = 'ruby'])">
+				<xsl:attribute name="alignment-baseline">central</xsl:attribute>
+			</xsl:if>
+			<xsl:variable name="rt_text" select="*[local-name() = 'rt']"/>
+			<xsl:variable name="rb_text" select=".//*[local-name() = 'rb'][not(*[local-name() = 'ruby'])]"/>
+			<!-- Example: width="2em"  -->
+			<xsl:variable name="text_rt_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rt_text, $font_main, 6)"/>
+			<xsl:variable name="text_rb_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rb_text, $font_main, 10)"/>
+			<xsl:variable name="text_width">
+				<xsl:choose>
+					<xsl:when test="$text_rt_width &gt;= $text_rb_width"><xsl:value-of select="$text_rt_width"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$text_rb_width"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:attribute name="width"><xsl:value-of select="$text_width div 10"/>em</xsl:attribute>
+
+			<xsl:choose>
+				<xsl:when test="ancestor::*[local-name() = 'ruby']">
+					<xsl:apply-templates select="*[local-name() = 'rb']"/>
+					<xsl:apply-templates select="*[local-name() = 'rt']"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="*[local-name() = 'rt']"/>
+					<xsl:apply-templates select="*[local-name() = 'rb']"/>
+				</xsl:otherwise>
+			</xsl:choose>
+
+			<xsl:apply-templates select="node()[not(local-name() = 'rt') and not(local-name() = 'rb')]"/>
+		</fo:inline-container>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'rb']">
+		<fo:block line-height="1em" text-align="center"><xsl:apply-templates/></fo:block>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'rt']">
+		<fo:block font-size="0.5em" text-align="center" line-height="1.2em" space-before="-1.4em" space-before.conditionality="retain"> <!--  -->
+			<xsl:if test="ancestor::*[local-name() = 'ruby'][last()]//*[local-name() = 'ruby'] or      ancestor::*[local-name() = 'rb']">
+				<xsl:attribute name="space-before">0em</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+
+	</xsl:template>
+
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+	<!-- END: Ruby text (CJK languages) rendering -->
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
 

data/lib/isodoc/iec/presentation_terms.rb

@@ -4,11 +4,11 @@ module IsoDoc
       def termclause1(elem)
         @is_iev or return clause1(elem)
         @suppressheadingnumbers || elem["unnumbered"] or
-        lbl = @xrefs.anchor(elem["id"], :label, true)
+          lbl = @xrefs.anchor(elem["id"], :label, true)
         if lbl
-        prefix_name(elem, { caption: " " }, "#{lbl}#{clausedelim}", "title")
+          prefix_name(elem, { caption: " " }, "#{lbl}#{clausedelim}", "title")
         else
-        prefix_name(elem, {}, nil, "title")
+          prefix_name(elem, {}, nil, "title")
         end
       end
 
@@ -46,8 +46,8 @@ module IsoDoc
 
       def termdomain(elem, fmt_defn)
         if @is_iev
-          #d = elem.at(ns("./domain")) or return
-          #d["hidden"] = true
+          # d = elem.at(ns("./domain")) or return
+          # d["hidden"] = true
         else super
         end
       end
@@ -60,19 +60,21 @@ module IsoDoc
         end
         # renumber
         @xrefs.parse_inclusions(clauses: true).parse docxml
-        docxml.xpath(ns("//term/fmt-name | //term/fmt-xref-label")).each(&:remove)
+        docxml.xpath(ns("//term/fmt-name | //term/fmt-xref-label"))
+          .each(&:remove)
         term(docxml)
       end
 
       def merge_fr_into_en_term1(en_term, fr_term)
         dl = en_term&.at(ns("./dl[@type = 'other-lang']"))&.remove
-        #en_term << fr_term.remove.children
+        # en_term << fr_term.remove.children
         dup = semx_fmt_dup(fr_term)
         dup.xpath(ns("./fmt-name | ./fmt-xref-label")).each(&:remove)
         en_term << dup
         fr_term.xpath(ns(".//fmt-name | .//fmt-xref-label | " \
           ".//fmt-preferred | .//fmt-admitted | .//fmt-deprecates | " \
-          ".//fmt-definition | .//fmt-related | .//fmt-termsource")).each(&:remove)
+          ".//fmt-definition | .//fmt-related | .//fmt-termsource"))
+          .each(&:remove)
         fr_term["unnumbered"] = "true"
         en_term << dl if dl
         en_term["language"] = "en,fr"
@@ -89,28 +91,15 @@ module IsoDoc
       def remove_otherlang_designations(docxml)
         @is_iev or return
         docxml.xpath(ns("//term")).each do |t|
-          remove_otherlang_designations1(t, t["language"]&.split(",") || %w(en fr))
+          remove_otherlang_designations1(t,
+                                         t["language"]&.split(",") || %w(en fr))
         end
       end
 
-      # KILL
       def extract_otherlang_designations(term, lgs)
         term.xpath(ns(".//preferred/expression[@language]"))
           .each_with_object([]) do |d, m|
           lg = d["language"]
-          d.delete("language")
-          lgs.include?(lg) and next
-          p = d.parent
-          designation_annotate(p, p.at(ns("./name")))
-          m << { lang: lg, script: Metanorma::Utils.default_script(lg),
-                 designation: to_xml(l10n_recursive(p.remove, lg)).strip }
-        end
-      end
-
-      def extract_otherlang_designations(term, lgs)
-        term.xpath(ns(".//preferred/expression[@language]"))
-          .each_with_object([]) do |d, m|
-            lg = d["language"]
           lgs.include?(lg) and next
           p = semx_fmt_dup(d.parent)
           e = p.at(ns("./expression"))
@@ -156,52 +145,32 @@ module IsoDoc
       end
 
       def remove_otherlang_designations1(term, lgs)
-        term.xpath(ns(".//fmt-preferred/p/semx[@element = 'preferred']")).each do |s|
+        term.xpath(ns(".//fmt-preferred/p/semx[@element = 'preferred']"))
+          .each do |s|
           p = semx_orig(s, term)
           lg = p.at(ns("./expression/@language"))&.text or next
           lgs.include?(lg) and next
           s.parent.remove
-      end
+        end
       end
 
       def related(docxml)
-        #docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
         super
         docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
       end
 
-      # KILL
-            def move_related(term)
-        defn = term.at(ns("./definition")) or return
-        term.xpath(ns("./related")).reverse_each do |r|
-          defn.next = r.remove
-        end
-      end
-
       def move_related(term)
         defn = term.at(ns("./fmt-definition")) or return
         rel = term.at(ns("./fmt-related")) or return
         defn << rel.children
       end
 
-      # KILL
       def related1(node)
         lg = node.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-        p = node.at(ns("./preferred"))
-        ref = node.at(ns("./xref | ./eref | ./termref"))
-        label = @i18n.relatedterms[node["type"]].upcase
-        node.replace(l10n("<p>#{label}: " \
-                          "#{to_xml(p.children)} (#{to_xml(ref)})</p>"))
-        @i18n = @i18n_lg["default"]
-      end
-
-            def related1(node)
-        lg = node.at("./ancestor::xmlns:term/@language")&.text
-        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
         p, ref, orig = related1_prep(node)
-      label = @i18n.relatedterms[orig["type"]].upcase
-        node.children =(l10n("<p>#{label}: " \
+        label = @i18n.relatedterms[orig["type"]].upcase
+        node.children = (l10n("<p>#{label}: " \
                           "#{to_xml(p)} (#{Common::to_xml(ref)})</p>"))
         @i18n = @i18n_lg["default"]
       end
@@ -213,31 +182,13 @@ module IsoDoc
         @i18n = @i18n_lg["default"]
       end
 
-      # KILL
-      def termsource1xx(node)
-        lg = node&.at("./ancestor::xmlns:term/@language")&.text
-        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-        if @is_iev then termsource1_iev(node)
-        else super
-        end
-        @i18n = @i18n_lg["default"]
-      end
-
-      # KILL
-      def termsource1_iev(elem)
-        while elem&.next_element&.name == "termsource"
-          elem << "; #{to_xml(elem.next_element.remove.children)}"
-        end
-        elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
-      end
-
       def termsource_label(elem, sources)
         @is_iev or return super
         lg = elem&.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-      elem.replace(l10n("#{@i18n.source}: #{sources}"))
-      @i18n = @i18n_lg["default"]
-    end
+        elem.replace(l10n("#{@i18n.source}: #{sources}"))
+        @i18n = @i18n_lg["default"]
+      end
 
       def termexample(docxml)
         docxml.xpath(ns("//termexample")).each do |f|
@@ -247,7 +198,6 @@ module IsoDoc
 
       def termexample1(elem)
         lg = elem&.at("./ancestor::xmlns:term/@language")&.text
-        #require "debug"; binding.b
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
         example1(elem)
         @i18n = @i18n_lg["default"]
@@ -263,11 +213,6 @@ module IsoDoc
         @i18n = @i18n_lg["default"]
         ret
       end
-
-      def term1(elem)
-        #require 'debug'; binding.b
-        super
-      end
     end
   end
 end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -71,7 +71,7 @@ module IsoDoc
         ins = elem.at(ns("./title")) || elem.children.first.before(" ").previous
         ins.next = <<~CLAUSE
           <clause type='boilerplate_legal'>#{to_xml(boilerplate.children)}</clause>
-          CLAUSE
+        CLAUSE
       end
 
       def insert_middle_title(docxml)
@@ -124,6 +124,10 @@ module IsoDoc
         s.add_first_child ret
       end
 
+      def ul_label_list(_elem)
+        %w(&#x2022; &#x2014; &#x6f;)
+      end
+
       include Init
     end
   end

data/lib/metanorma/iec/basicdoc.rng

@@ -1701,16 +1701,22 @@ which can be bookmarks as well as block or section references</a:documentation>
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.
 The target of a footnote is the location it is embedded in within the text</a:documentation>
     <element name="fn">
-      <attribute name="reference">
-        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
-      </attribute>
-      <oneOrMore>
-        <ref name="paragraph">
-          <a:documentation>The content of the footnote</a:documentation>
-        </ref>
-      </oneOrMore>
+      <ref name="FnAttributes"/>
+      <ref name="FnBody"/>
     </element>
   </define>
+  <define name="FnBody">
+    <oneOrMore>
+      <ref name="paragraph">
+        <a:documentation>The content of the footnote</a:documentation>
+      </ref>
+    </oneOrMore>
+  </define>
+  <define name="FnAttributes">
+    <attribute name="reference">
+      <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
+    </attribute>
+  </define>
   <define name="callout">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as annotation of source code</a:documentation>
     <element name="callout">