metanorma-bipm 2.6.3 → 2.6.5

data/lib/isodoc/bipm/jcgm.standard.xsl

@@ -2617,6 +2617,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-size">11pt</xsl:attribute>
@@ -2628,6 +2629,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:template> <!-- refine_table-name-style -->
 
@@ -4430,7 +4434,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"/>
@@ -4440,14 +4444,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">
@@ -4488,11 +4492,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"/>
@@ -4984,7 +4989,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>
@@ -5015,9 +5020,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"/>
 
@@ -5090,7 +5095,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>
@@ -5456,6 +5461,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_">
@@ -5521,7 +5527,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"/>
@@ -5930,39 +5936,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() -->
@@ -9980,6 +9998,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"/>
@@ -10203,7 +10228,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>
@@ -10212,6 +10238,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="''"/>
@@ -12228,9 +12274,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"/>
@@ -12355,7 +12407,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>
@@ -12487,6 +12539,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"/>
@@ -13893,6 +13950,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"/>
@@ -14707,6 +14774,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) != ''])"/>
 		<xsl:text> </xsl:text>

data/lib/isodoc/bipm/presentation_blocks.rb

@@ -6,15 +6,6 @@ module IsoDoc
         @iso.middle_title(docxml)
       end
 
-      # KILL
-      def table1x(elem)
-        table_fn(elem)
-        labelled_ancestor(elem) || elem["unnumbered"] and return
-        n = @xrefs.anchor(elem["id"], :label, false)
-        prefix_name(elem, ".<tab/>",
-                    l10n("#{@i18n.table.capitalize} #{n}"), "name")
-      end
-
       def table_delim
         l10n("x.<tab/>").sub("x", "") # force French " .</tab>"
       end
@@ -46,6 +37,46 @@ module IsoDoc
         else @i18n.prefacenote
         end
       end
+
+      def termsource_label(elem, sources)
+        elem.replace(l10n("[#{termsource_adapt(elem['status'])} #{sources}]"))
+      end
+
+      def termsource_adapt(status)
+        case status
+        when "adapted" then @i18n.adapted_from
+        when "modified" then @i18n.modified_from
+        else ""
+        end
+      end
+
+      def termsource(docxml)
+        termsource_insert_empty_modification(docxml)
+        super
+      end
+
+      def termsource_insert_empty_modification(docxml)
+        docxml.xpath("//xmlns:termsource[@status = 'modified']" \
+                     "[not(xmlns:modification)]").each do |f|
+          f << "<modification/>"
+        end
+      end
+
+      def termsource_modification(elem)
+        termsource_add_modification_text(elem.at(ns("./modification")))
+      end
+
+      def ul_label_list(_elem)
+        %w(&#x2022; &#x2212; &#x6f;)
+      end
+
+      def ol_label_template(_elem)
+        super
+          .merge({
+                   roman: %{<span class="fmt-label-delim">(</span>%<span class="fmt-label-delim">)</span>},
+                   arabic: %{%<span class="fmt-label-delim">.</span>},
+                 })
+      end
     end
   end
 end

data/lib/isodoc/bipm/presentation_footnotes.rb

@@ -0,0 +1,112 @@
+module IsoDoc
+  module Bipm
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      def fn_label_brackets(fnote)
+        "<sup><span class='fmt-label-delim'>(</span>" \
+        "#{fn_label(fnote)}" \
+          "<span class='fmt-label-delim'>)</span></sup>"
+      end
+
+      def fn_ref_label(fnote)
+        if @jcgm then iso_fn_ref_label(fnote)
+        else fn_label_brackets(fnote)
+        end
+      end
+
+      # copied from ISO
+      def iso_fn_ref_label(fnote)
+        if fnote.ancestors("table, figure").empty? ||
+            !fnote.ancestors("name, fmt-name").empty?
+          "<sup>#{fn_label(fnote)}" \
+            "<span class='fmt-label-delim'>)</span></sup>"
+        else
+          "<sup>#{fn_label(fnote)}</sup>"
+        end
+      end
+
+      def fn_body_label(fnote)
+        if @jcgm then super
+        else fn_label_brackets(fnote)
+        end
+      end
+
+      # explode out all the subclauses into separate entries
+      # assume no hanging clauses
+      def sort_footnote_sections(docxml)
+        ret = super
+        ret.flat_map do |x|
+          explode_subclauses(x)
+        end
+      end
+
+      def explode_subclauses(clause)
+        clause.at(ns(".//clause")) or return [clause]
+        (clause.xpath(ns(".//clause")) - clause.xpath(ns(".//clause//clause")))
+          .map { |x| explode_subclauses(x) }
+          .flatten.unshift(clause)
+      end
+
+      # quote/table/fn references are not unique within quote
+      # if there are multiple tables
+      def renumber_document_footnote_key(fnote)
+        key = fnote["reference"]
+        !@jcgm && (t = fnote.at("./ancestor::xmlns:table")) and
+          key = "#{t['id']} #{key}"
+        key
+      end
+
+      def renumber_document_footnote(fnote, idx, seen)
+        fnote["original-reference"] = fnote["reference"]
+        key = renumber_document_footnote_key(fnote)
+        if seen[key]
+          fnote["reference"] = seen[fnote["reference"]]
+        else
+          seen[key] = idx
+          fnote["reference"] = idx
+          idx += 1
+        end
+        idx
+      end
+
+      def document_footnotes(docxml)
+        @jcgm and return super
+        sects = sort_footnote_sections(docxml)
+        excl = non_document_footnotes(docxml)
+        fns = filter_document_footnotes(sects, excl)
+        sects.each_with_index do |s, i|
+          ret = footnote_collect(renumber_document_footnotes(fns[i], 1))
+          f = footnote_container(fns[i], ret) and s << f
+        end
+      end
+
+      def filter_document_footnotes(sects, excl)
+        sects.each_with_object([]) do |s, m|
+          docfns = s.xpath(ns(".//fn")) - excl - s.xpath(ns(".//clause//fn"))
+          m << docfns
+        end
+      end
+
+      def renumber_document_footnotes(fns, idx)
+        @jcgm and return super
+        fns.each_with_object({}) do |f, seen|
+          idx = renumber_document_footnote(f, idx, seen)
+        end
+        fns
+      end
+
+      def table_fn(elem)
+        !@jcgm && !elem.ancestors("quote").empty? and return
+        super
+      end
+
+      def non_document_footnotes(docxml)
+        table_fns = docxml.xpath(ns("//table//fn")) -
+          docxml.xpath(ns("//table/name//fn"))
+        @jcgm or table_fns -= docxml.xpath(ns("//quote//table//fn"))
+        fig_fns = docxml.xpath(ns("//figure//fn")) -
+          docxml.xpath(ns("//figure/name//fn"))
+        table_fns + fig_fns
+      end
+    end
+  end
+end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -6,6 +6,7 @@ require_relative "doccontrol"
 require_relative "../../relaton/render/general"
 require_relative "presentation_blocks"
 require_relative "presentation_biblio"
+require_relative "presentation_footnotes"
 
 module IsoDoc
   module Bipm
@@ -139,34 +140,6 @@ module IsoDoc
         end
       end
 
-      def termsource_label(elem, sources)
-        elem.replace(l10n("[#{termsource_adapt(elem['status'])} #{sources}]"))
-      end
-
-      def termsource_adapt(status)
-        case status
-        when "adapted" then @i18n.adapted_from
-        when "modified" then @i18n.modified_from
-        else ""
-        end
-      end
-
-      def termsource(docxml)
-        termsource_insert_empty_modification(docxml)
-        super
-      end
-
-      def termsource_insert_empty_modification(docxml)
-        docxml.xpath("//xmlns:termsource[@status = 'modified']" \
-                     "[not(xmlns:modification)]").each do |f|
-          f << "<modification/>"
-        end
-      end
-
-      def termsource_modification(elem)
-        termsource_add_modification_text(elem.at(ns("./modification")))
-      end
-
       def enable_indexsect
         true
       end
@@ -185,101 +158,6 @@ module IsoDoc
         @xrefs.bookmark_anchor_names(docxml)
       end
 
-      def fn_label_brackets(fnote)
-        "<sup><span class='fmt-label-delim'>(</span>" \
-        "#{fn_label(fnote)}" \
-          "<span class='fmt-label-delim'>)</span></sup>"
-      end
-
-      def fn_ref_label(fnote)
-        if @jcgm then iso_fn_ref_label(fnote)
-        else fn_label_brackets(fnote)
-        end
-      end
-
-      # copied from ISO
-      def iso_fn_ref_label(fnote)
-        if fnote.ancestors("table, figure").empty? ||
-            !fnote.ancestors("name, fmt-name").empty?
-          "<sup>#{fn_label(fnote)}" \
-            "<span class='fmt-label-delim'>)</span></sup>"
-        else
-          "<sup>#{fn_label(fnote)}</sup>"
-        end
-      end
-
-      def fn_body_label(fnote)
-        if @jcgm then super
-        else fn_label_brackets(fnote)
-        end
-      end
-
-      # explode out all the subclauses into separate entries
-      # assume no hanging clauses
-      def sort_footnote_sections(docxml)
-        ret = super
-        ret.flat_map do |x|
-          clauses = x.xpath(ns(".//clause[not(./clause)]"))
-          clauses.empty? ? [x] : clauses.to_a
-        end
-      end
-
-      # quote/table/fn references are not unique within quote
-      # if there are multiple tables
-      def renumber_document_footnote_key(fnote)
-        key = fnote["reference"]
-        !@jcgm && (t = fnote.at("./ancestor::xmlns:table")) and
-          key = "#{t['id']} #{key}"
-        key
-      end
-
-      def renumber_document_footnote(fnote, idx, seen)
-        fnote["original-reference"] = fnote["reference"]
-        key = renumber_document_footnote_key(fnote)
-        if seen[key]
-          fnote["reference"] = seen[fnote["reference"]]
-        else
-          seen[key] = idx
-          fnote["reference"] = idx
-          idx += 1
-        end
-        idx
-      end
-
-      def document_footnotes(docxml)
-        @jcgm and return super
-        sects = sort_footnote_sections(docxml)
-        excl = non_document_footnotes(docxml)
-        fns = filter_document_footnotes(sects, excl)
-        #sects.select { |s| s.at(ns(".//fn")) }.each_with_index do |s, i|
-        sects.each_with_index do |s, i|
-          ret = footnote_collect(renumber_document_footnotes(fns[i], 1))
-          f = footnote_container(fns[i], ret) and s << f
-        end
-      end
-
-      def renumber_document_footnotes(fns, idx)
-        @jcgm and return super
-        fns.each_with_object({}) do |f, seen|
-          idx = renumber_document_footnote(f, idx, seen)
-        end
-        fns
-      end
-
-      def table_fn(elem)
-        !@jcgm && !elem.ancestors("quote").empty? and return
-        super
-      end
-
-      def non_document_footnotes(docxml)
-        table_fns = docxml.xpath(ns("//table//fn")) -
-          docxml.xpath(ns("//table/name//fn"))
-        @jcgm or table_fns -= docxml.xpath(ns("//quote//table//fn"))
-        fig_fns = docxml.xpath(ns("//figure//fn")) -
-          docxml.xpath(ns("//figure/name//fn"))
-        table_fns + fig_fns
-      end
-
       include Init
     end
   end