metanorma-iso 1.10.0 → 1.10.1

data/lib/isodoc/iso/word_cleanup.rb

@@ -0,0 +1,94 @@
+module IsoDoc
+  module Iso
+    class WordConvert < IsoDoc::WordConvert
+      def figure_cleanup(xml)
+        super
+        xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
+          t["class"] = "figdl"
+          d = t.add_previous_sibling("<div class='figdl' "\
+                                     "style='page-break-after:avoid;'/>")
+          t.parent = d.first
+        end
+      end
+
+      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h#{lvl}Annex"
+        end
+      end
+
+      def word_annex_cleanup(docxml)
+        (2..6).each { |i| word_annex_cleanup1(docxml, i) }
+      end
+
+      def word_annex_cleanup_h1(docxml)
+        docxml.xpath("//h1[@class = 'Annex']").each do |h|
+          h.name = "p"
+          h["class"] = "ANNEX"
+        end
+        %w(BiblioTitle ForewordTitle IntroTitle).each do |s|
+          docxml.xpath("//*[@class = '#{s}']").each do |h|
+            h.name = "p"
+          end
+        end
+      end
+
+      def style_cleanup(docxml)
+        word_annex_cleanup_h1(docxml)
+        style_cleanup1(docxml)
+      end
+
+      def style_cleanup1(docxml)
+        docxml.xpath("//*[@class = 'example']").each do |p|
+          p["class"] = "Example"
+        end
+      end
+
+      def authority_hdr_cleanup(docxml)
+        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
+          d.xpath(".//h1").each do |p|
+            p.name = "p"
+            p["class"] = "zzWarningHdr"
+          end
+        end
+        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
+          d.xpath(".//h1").each do |p|
+            p.name = "p"
+            p["class"] = "zzCopyrightHdr"
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
+        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
+        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
+        auth and insert.children = auth
+        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
+        auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
+        auth&.xpath(".//p[not(@class)]")&.each do |p|
+          p["class"] = "zzCopyright"
+        end
+        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each do |p|
+          p["class"] = "zzCopyright1"
+        end
+        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each do |p|
+          p["class"] = "zzAddress"
+        end
+        auth&.xpath(".//p[@id = 'boilerplate-place']")&.each do |p|
+          p["class"] = "zzCopyright1"
+        end
+        auth and insert.children = auth
+      end
+
+      def word_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
+        super
+        style_cleanup(docxml)
+        docxml
+      end
+    end
+  end
+end

data/lib/isodoc/iso/word_convert.rb

@@ -1,6 +1,7 @@
 require_relative "base_convert"
 require "isodoc"
 require_relative "init"
+require_relative "word_cleanup"
 
 module IsoDoc
   module Iso
@@ -59,92 +60,11 @@ module IsoDoc
         return if !stage.nil? && stage < 60
 
         body.br **{ clear: "all", style: "page-break-before:left;"\
-                    "mso-break-type:section-break" }
+                                         "mso-break-type:section-break" }
         body.div **{ class: "colophon" } do |div|
         end
       end
 
-      def figure_cleanup(xml)
-        super
-        xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
-          t["class"] = "figdl"
-          d = t.add_previous_sibling("<div class='figdl' "\
-                                     "style='page-break-after:avoid;'/>")
-          t.parent = d.first
-        end
-      end
-
-      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
-      def word_annex_cleanup1(docxml, lvl)
-        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
-          h2.name = "p"
-          h2["class"] = "h#{lvl}Annex"
-        end
-      end
-
-      def word_annex_cleanup(docxml)
-        (2..6).each { |i| word_annex_cleanup1(docxml, i) }
-      end
-
-      def word_annex_cleanup_h1(docxml)
-        docxml.xpath("//h1[@class = 'Annex']").each do |h|
-          h.name = "p"
-          h["class"] = "ANNEX"
-        end
-        %w(BiblioTitle ForewordTitle IntroTitle).each do |s|
-          docxml.xpath("//*[@class = '#{s}']").each do |h|
-            h.name = "p"
-          end
-        end
-      end
-
-      def style_cleanup(docxml)
-        word_annex_cleanup_h1(docxml)
-        style_cleanup1(docxml)
-      end
-
-      def style_cleanup1(docxml)
-        docxml.xpath("//*[@class = 'example']").each do |p|
-          p["class"] = "Example"
-        end
-      end
-
-      def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzWarningHdr"
-          end
-        end
-        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzCopyrightHdr"
-          end
-        end
-      end
-
-      def authority_cleanup(docxml)
-        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
-        auth and insert.children = auth
-        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzCopyright" }
-        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each { |p| p["class"] = "zzCopyright1" }
-        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each { |p| p["class"] = "zzAddress" }
-        auth&.xpath(".//p[@id = 'boilerplate-place']")&.each { |p| p["class"] = "zzCopyright1" }
-        auth and insert.children = auth
-      end
-
-      def word_cleanup(docxml)
-        authority_hdr_cleanup(docxml)
-        super
-        style_cleanup(docxml)
-        docxml
-      end
-
       def word_toc_preface(level)
         <<~TOC.freeze
           <span lang="EN-GB"><span
@@ -166,7 +86,7 @@ module IsoDoc
       end
 
       def bibliography(xml, out)
-        f = xml.at(ns(bibliography_xpath)) and f["hidden"] != "true" or return
+        (f = xml.at(ns(bibliography_xpath)) and f["hidden"] != "true") or return
         page_break(out)
         out.div do |div|
           div.h1 **bibliography_attrs do |h1|
@@ -185,13 +105,16 @@ module IsoDoc
         end
       end
 
+      def definition_parse(node, out)
+        @definition = true
+        super
+        @definition = false
+      end
+
       def para_class(node)
-        if !node.ancestors("definition").empty? && !@in_footnote
-          "Definition"
-        elsif !node.ancestors("foreword").empty? && !@in_footnote
-          "ForewordText"
-        else
-          super
+        if @definition && !@in_footnote then "Definition"
+        elsif @foreword && !@in_footnote then "ForewordText"
+        else super
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.10.0".freeze
+    VERSION = "1.10.1".freeze
   end
 end