metanorma-jis 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6e117f7c38d6edc51ff9dd73cc5b0351e59feb650433e988522cea8cfcf833
-  data.tar.gz: 7df7f525180c68a19b4ec860876e6bc4cc88f41189c8cf4faf005b97b22479a3
+  metadata.gz: 55df8821b6b10d957c78661a28310229a211e2f436fe83a46d40aa62d8bc7f79
+  data.tar.gz: 804934a1f4bfb4c2d2a3abad4ea557b5daa7c7eb827484c8a3c5d094f5387e1d
 SHA512:
-  metadata.gz: 006ec681b6147de22e10aaf358727baa96fe03eb8527eb620bdaa526db68445e577c89e8ac4c0ffd5fb36b642d59c0e92f79b67ee3640d92459fe617146c07f6
-  data.tar.gz: 9cc0e00996862955967ccff203e5cbe11fceb2dec7e7b417988e736a741a518015bdadce4894ee42fa67877da013277c96873e70dc729f454fcac6357a731e8b
+  metadata.gz: 0bb172cb26ce8d5896cd4efa7111a432e86f9ed7c0c50cfdd26a0f0f60d53e0fd77d6f03dd93d7981920b54b8db151f38cdf6232f8ab5edd6ea0c06704742427
+  data.tar.gz: f4fb40e409e343dce9282c43cc0297a692c3221cfbce756c972301de289742489a9788d0821462e2a87e52c9b4358124b5740ba0d7ca8b56a6592045d03c41d3

data/lib/isodoc/jis/base_convert.rb

@@ -89,10 +89,11 @@ module IsoDoc
         end
       end
 
-         # table name footnote is formatted like other footnotes, since table name
+      # table name footnote is formatted like other footnotes, since table name
       # is a table row.
       def footnote_parse(node, out)
         return table_footnote_parse(node, out) if @in_table
+
         super
       end
     end

data/lib/isodoc/jis/html_convert.rb

@@ -35,20 +35,6 @@ module IsoDoc
         }
       end
 
-      # TODO to Presentation XML
-      # KILL
-      def make_table_footnote_targetx(out, fnid, fnref)
-        attrs = { id: fnid, class: "TableFootnoteRef" }
-        out.span do |s|
-         # TODO to Presentation XML
-          s << @i18n.table_footnote
-          out.span **attrs do |a|
-            a << fnref
-          end
-          insert_tab(s, 1)
-        end
-      end
-
       include BaseConvert
       include Init
     end

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

@@ -6267,6 +6267,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="text-align">center</xsl:attribute>
@@ -6276,6 +6277,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="not($vertical_layout = 'true')">
 				<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
@@ -8147,7 +8151,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"/>
@@ -8157,14 +8161,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">
@@ -8205,11 +8209,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"/>
@@ -8686,7 +8691,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>
@@ -8717,9 +8722,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"/>
 
@@ -9114,6 +9119,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_">
@@ -9212,7 +9218,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"/>
@@ -9691,39 +9697,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() -->
@@ -13762,6 +13780,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"/>
@@ -13985,7 +14010,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>
@@ -13994,6 +14020,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="''"/>
@@ -15961,9 +16007,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"/>
@@ -16088,7 +16140,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>
@@ -16245,6 +16297,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"/>
@@ -17661,6 +17718,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"/>
@@ -18582,6 +18649,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/jis/presentation_list.rb

@@ -0,0 +1,72 @@
+module IsoDoc
+  module Jis
+    class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def ol_depth(node)
+        depth == 1 and return :alphabet
+        :arabic
+      end
+
+         def ol_depth(node)
+      depth = node.ancestors("ol").size + 1
+      @counter.ol_type(node, depth) # defined in Xref::Counter
+    end
+
+         def ul_label_list(_elem)
+      %w(&#xFF0D; &#x30FB;)
+    end
+
+    def ul_label_value(elem)
+      depth = elem.ancestors("ul").size
+      val = ul_label_list(elem)
+      val[(depth - 1) % val.size]
+    end
+
+      # TODO: move the table/figure key processing to Word, not Presentation XML
+      def dl(docxml)
+        super
+        docxml.xpath(ns("//table//dl | //figure//dl")).each do |l|
+          l.at(ns("./dl")) || l.at("./ancestor::xmlns:dl") and next
+          dl_to_para(l)
+        end
+      end
+
+      def dt_dd?(node)
+        %w{dt dd}.include? node.name
+      end
+
+      def dl_to_para(node)
+        ret = dl_to_para_name(node)
+        ret += dl_to_para_terms(node)
+        node.elements.reject { |n| %w(dt dd name fmt-name).include?(n.name) }
+          .each do |x|
+          ret += x.to_xml
+        end
+        dl_id_insert(node, ret)
+      end
+
+      def dl_id_insert(node, ret)
+        a = node.replace(ret)
+        p = a.at("./descendant-or-self::xmlns:p")
+        node["id"] and p << "<bookmark id='#{node['id']}'/>"
+        a.xpath("./descendant-or-self::*[@id = '']").each { |x| x.delete("id") }
+      end
+
+      def dl_to_para_name(node)
+        e = node.at(ns("./fmt-name")) or return ""
+        node.parent.parent["type"] == "participants" and return ""
+        "<p class='ListTitle'>#{e.children.to_xml}</p>"
+      end
+
+      def dl_to_para_terms(node)
+        ret = ""
+        node.elements.select { |n| dt_dd?(n) }.each_slice(2) do |dt, dd|
+          term = strip_para(dt)
+          defn = strip_para(dd)
+          bkmk = dd["id"] ? "<bookmark id='#{dd['id']}'/>" : ""
+          ret += "<p class='dl' id='#{dt['id']}'>#{term}: #{bkmk}#{defn}</p>"
+        end
+        ret
+      end
+    end
+  end
+end

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "init"
 require "isodoc"
 require_relative "presentation_section"
+require_relative "presentation_list"
 require_relative "../../relaton/render-jis/general"
 
 module IsoDoc
@@ -35,65 +36,12 @@ module IsoDoc
         ret
       end
 
-      def ol_depth(node)
-        depth = node.ancestors("ol").size + 1
-        depth == 1 and return :alphabet
-        :arabic
-      end
-
       def admits(elem)
         elem.xpath(ns(".//semx[@element = 'admitted']")).each do |t|
           t.previous = @i18n.l10n("#{@i18n.admitted}: ")
         end
       end
 
-      # TODO: move the table/figure key processing to Word, not Presentation XML
-      def dl(docxml)
-        super
-        docxml.xpath(ns("//table//dl | //figure//dl")).each do |l|
-          l.at(ns("./dl")) || l.at("./ancestor::xmlns:dl") and next
-          dl_to_para(l)
-        end
-      end
-
-      def dt_dd?(node)
-        %w{dt dd}.include? node.name
-      end
-
-      def dl_to_para(node)
-        ret = dl_to_para_name(node)
-        ret += dl_to_para_terms(node)
-        node.elements.reject { |n| %w(dt dd name fmt-name).include?(n.name) }
-          .each do |x|
-          ret += x.to_xml
-        end
-        dl_id_insert(node, ret)
-      end
-
-      def dl_id_insert(node, ret)
-        a = node.replace(ret)
-        p = a.at("./descendant-or-self::xmlns:p")
-        node["id"] and p << "<bookmark id='#{node['id']}'/>"
-        a.xpath("./descendant-or-self::*[@id = '']").each { |x| x.delete("id") }
-      end
-
-      def dl_to_para_name(node)
-        e = node.at(ns("./fmt-name")) or return ""
-        node.parent.parent["type"] == "participants" and return ""
-        "<p class='ListTitle'>#{e.children.to_xml}</p>"
-      end
-
-      def dl_to_para_terms(node)
-        ret = ""
-        node.elements.select { |n| dt_dd?(n) }.each_slice(2) do |dt, dd|
-          term = strip_para(dt)
-          defn = strip_para(dd)
-          bkmk = dd["id"] ? "<bookmark id='#{dd['id']}'/>" : ""
-          ret += "<p class='dl' id='#{dt['id']}'>#{term}: #{bkmk}#{defn}</p>"
-        end
-        ret
-      end
-
       def strip_para(node)
         node.children.to_xml.gsub(%r{</?p( [^>]*)?>}, "")
       end

data/lib/isodoc/jis/table.rb

@@ -1,18 +1,6 @@
 module IsoDoc
   module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
-      # KILL
-      def make_table_footnote_targetx(out, fnid, fnref)
-        attrs = { id: fnid, class: "TableFootnoteRef" }
-        out.span do |s|
-          s << @i18n.table_footnote
-          out.span **attrs do |a|
-            a << fnref.sub(/(?!<\))$/, ")") # TODO TO Presentation XML
-          end
-          insert_tab(s, 1)
-        end
-      end
-
       def table_title_parse(node, out); end
 
       def table_attrs(node)

data/lib/isodoc/jis/word_convert.rb

@@ -109,26 +109,6 @@ module IsoDoc
         end
       end
 
-      # KILL
-      def footnote_parsex(node, out)
-        return table_footnote_parse(node, out) if @in_table || @in_figure # &&
-
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-        return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
-
-        @fn_bookmarks[fn] = bookmarkid
-        out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}" do |s|
-          s.a class: "FootnoteRef", "epub:type": "footnote",
-              href: "#ftn#{fn}" do |a|
-            a.sup { |sup| sup << fn }
-          end
-        end
-        @in_footnote = true
-        @footnotes << make_generic_footnote_text(node, fn)
-        @in_footnote = false
-        @seen_footnote << fn
-      end
-
       def annex(node, out)
         node["commentary"] == "true" and return commentary(node, out)
         amd?(node.document.root) and