metanorma-iso 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63f76b4a2d9cc268099b20ca2fa32965d1baa2573dbd696170412ba717ae726b
-  data.tar.gz: 4d7c46a0cedf41d5466030d6e4e5ea8956cdce2081d4d24be581eafae3a71c4d
+  metadata.gz: 6efbdfac921fca07cbdb4d753e847a89c54f8347df0c17b6618688c40e8003d9
+  data.tar.gz: 1b7120befb99cc66e1a2e3daf5c80bdfb52758c3f79467ea869cb142462dccc8
 SHA512:
-  metadata.gz: 1651fd7ed1c7216292a542dd4a1e5be937807afe1728675633287e507100b0c9979fd58afb682e6ba271d0021313ef1e92f04dc8a14f6d9ad2778fc6cd7eed2a
-  data.tar.gz: 5c195c5207ca60ea89789d9ba82723788f01e85ac9e576d03d27c2449a2fe6ee1bf2fd479809a7813865821e1107b257cc64cdf0f7bb6e59603696602bc30b28
+  metadata.gz: 022e4216384f835d28245833db63f4bb2c6c69a92117187d29649146aace5c86c7221c10b48c235d80a86928725fd04bc50ca8c81f3bafc88acfe8d97324697a
+  data.tar.gz: 9dd817c38bae0befa1929aeb4447850b1f030d2e9084aa6432192efdbad0bb1f8c6f8c8e820587f19faefa7da2877be91911b26957f708de651e9e95a9d6c4a7

data/lib/isodoc/iso/base_convert.rb

@@ -183,13 +183,19 @@ module IsoDoc
         measurement_units(node, out)
         out.table **table_attrs(node) do |t|
           table_parse_core(node, t)
-          (dl = node.at(ns("./dl"))) && parse(dl, out)
-          node.xpath(ns("./note[not(@type = 'units')]"))
-            .each { |n| parse(n, out) }
+          table_parse_tail(node, t)
         end
         @in_table = false
       end
 
+      def table_parse_tail(node, out)
+        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./note[not(@type = 'units')]")).each do |n|
+          parse(n, out)
+        end
+      end
+
       def figure_parse1(node, out)
         measurement_units(node, out)
         out.div **figure_attrs(node) do |div|

data/lib/isodoc/iso/html/html_iso_intro.html

@@ -2,7 +2,6 @@
 
 <nav>
 
-  <h1 id="content">{{ labels["table_of_contents"] }}</h1>
   <div id="toc"></div>
 
 </nav>

data/lib/isodoc/iso/html/word_iso_intro-dis.html

@@ -3,7 +3,5 @@
 
 <div id="boilerplate-copyright-destination"/>
 
-<p class="zzContents"><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
 
-WORDTOC
 {% endif %}

data/lib/isodoc/iso/html/word_iso_intro.html

@@ -8,7 +8,5 @@ margin-left:5.1pt;margin-right:5.1pt'>
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 {% else %}
 
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
 
-WORDTOC
 {% endif %}