isodoc 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d6f17f0d5291c6c067bfc6a3a476885b80f128bdc9c4e3e3d8356c6af30482
-  data.tar.gz: 2710c48aa2fb9eeee44b586107b07884d52802a53fec81d69c0f3fb68fa988ed
+  metadata.gz: 6d2aca20ce5f2e96df3da6fbb1a8e675e3b2393f51720bac2bdc760e6e9c09a5
+  data.tar.gz: 6f83efeb115dbbb30f928d99e8f8c6da4172fc2a17d1792607d2cd38d6b5833c
 SHA512:
-  metadata.gz: 1c38cb43027aa1a056d465660449a4a58e1a5b78474a5f0184fca4164f2af2480720329e5a7181fcc1731151ef15db71019aa9fc34175b779de517006bf85fa6
-  data.tar.gz: '09503b88edfb1db0b3def003bca81c356b40790014953a9bc08de680af8db75222ded714f43a1f6820ec30dbaa2e3f83ac2a5e386f3c757f0d639f086e0b4b2c'
+  metadata.gz: f3e63f2f2f04dea86c5b716be19385eec4273bdd57870ee1215f441e2b6494ea25c8c52c3edf40b8b657ed8d081667356b003e68ded049605f2985450e903649
+  data.tar.gz: a1f408ba884174786963f38a5912ec128a94223b5f9f66fb28662398a6785bb2b54a42554fc3c2bb004230d443a6a38b8d771a1cdf64ec12447ea4e132b46a2c

data/isodoc.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.0.0"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
-  spec.add_dependency "sassc", "~> 2.2.1"
+  spec.add_dependency "sassc", "~> 2.4.0"
   spec.add_dependency "metanorma", "~> 1.0.0"
   spec.add_dependency "rake", "~> 12.0"
 

data/lib/isodoc/function/blocks.rb

@@ -141,7 +141,7 @@ module IsoDoc::Function
     def admonition_parse(node, out)
       type = node["type"]
       name = admonition_name(node, type)
-      out.div **{ class: admonition_class(node) } do |t|
+      out.div **{ id: node["id"], class: admonition_class(node) } do |t|
         admonition_name_parse(node, t, name) if name
         node.children.each { |n| parse(n, t) unless n.name == "name" }
       end

data/lib/isodoc/function/cleanup.rb

@@ -1,16 +1,20 @@
 module IsoDoc::Function
   module Cleanup
     def textcleanup(docxml)
-      docxml = passthrough_cleanup(docxml)
+      docxml = termref_cleanup(passthrough_cleanup(docxml))
+    end
+
+    def termref_cleanup(docxml)
       docxml.
+        gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
         gsub(/\[TERMREF\]\s*/, l10n("[#{@source_lbl}: ")).
         gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@modified_lbl} [/TERMREF]")).
-        gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).
+        gsub(%r{\s*\[\/TERMREF\]\s*}, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} &mdash; "))
     end
 
     def passthrough_cleanup(docxml)
-      docxml = docxml.split(%r{(<passthrough>|</passthrough>)}).each_slice(4).map do |a|
+      docxml.split(%r{(<passthrough>|</passthrough>)}).each_slice(4).map do |a|
         a.size > 2 and a[2] = HTMLEntities.new.decode(a[2])
         [a[0], a[2]]
       end.join
@@ -126,7 +130,7 @@ module IsoDoc::Function
     end
 
     def footnote_cleanup(docxml)
-      docxml.xpath('//a[@epub:type = "footnote"]/sup').each_with_index do |x, i|
+      docxml.xpath('//a[@class = "FootnoteRef"]/sup').each_with_index do |x, i|
         x.content = (i + 1).to_s
       end
       docxml

data/lib/isodoc/function/inline.rb

@@ -1,28 +1,7 @@
+require_relative "inline_simple"
+
 module IsoDoc::Function
   module Inline
-    def section_break(body)
-      body.br
-    end
-
-    def page_break(out)
-      out.br
-    end
-
-    def pagebreak_parse(_node, out)
-      out.br
-    end
-
-    def hr_parse(node, out)
-      out.hr
-    end
-
-    def br_parse(node, out)
-      out.br
-    end
-
-    def index_parse(node, out)
-    end
-
     def link_parse(node, out)
       out.a **attr_code(href: node["target"], title: node["alt"]) do |l|
         if node.text.empty?
@@ -50,17 +29,39 @@ module IsoDoc::Function
         (container && get_note_container_id(node) != container &&
          @anchors[node["target"]]) &&
         linkend = prefix_container(container, linkend, node["target"])
+        linkend = capitalise_xref(node, linkend)
       end
       linkend || "???"
     end
 
+    def capitalise_xref(node, linkend)
+      return linkend unless %w(Latn Cyrl Grek).include? @script
+      return linkend&.capitalize if node["case"] == "capital"
+      return linkend&.downcase if node["case"] == "lowercase"
+      return linkend if linkend[0,1].match(/\p{Upper}/)
+      prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
+        node.xpath("./preceding::text()")
+      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?
+        linkend&.capitalize : linkend
+    end
+
+    def nearest_block_parent(node)
+      until %w(p title td th name formula 
+        li dt dd sourcecode pre).include?(node.name)
+        node = node.parent
+      end
+      node
+    end
+
     def get_linkend(node)
-      contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }.
-        select { |c| !c.text? || /\S/.match(c) }
+      contents = node.children.select do |c|
+        !%w{locality localityStack}.include? c.name 
+      end.select { |c| !c.text? || /\S/.match(c) }
       !contents.empty? and
         return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link + eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
+      link + eref_localities(node.xpath(ns("./locality | ./localityStack")),
+                             link)
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
       # <locality type="section"><reference>3.1</reference></locality></origin>
     end
@@ -83,7 +84,7 @@ module IsoDoc::Function
           end
         else
           ret += eref_localities0(r, i, target, delim)
-          end
+        end
       end
       ret
     end
@@ -120,8 +121,9 @@ module IsoDoc::Function
     end
 
     def concept_parse(node, out)
-      content = node.first_element_child.children.select { |c| !%w{locality localityStack}.include? c.name }.
-        select { |c| !c.text? || /\S/.match(c) }
+      content = node.first_element_child.children.select do |c|
+        !%w{locality localityStack}.include? c.name 
+      end.select { |c| !c.text? || /\S/.match(c) }
       if content.empty?
         out << "[Term defined in "
         parse(node.first_element_child, out)
@@ -133,7 +135,8 @@ module IsoDoc::Function
 
     def stem_parse(node, out)
       ooml = if node["type"] == "AsciiMath"
-               "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}#{@closemathdelim}"
+               "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
+                 "#{@closemathdelim}"
              elsif node["type"] == "MathML" then node.first_element_child.to_s
              else
                HTMLEntities.new.encode(node.text)
@@ -175,52 +178,6 @@ module IsoDoc::Function
       out << text
     end
 
-    def bookmark_parse(node, out)
-      out.a **attr_code(id: node["id"])
-    end
-
-    def keyword_parse(node, out)
-      out.span **{ class: "keyword" } do |s|
-        node.children.each { |n| parse(n, s) }
-      end
-    end
-
-    def em_parse(node, out)
-      out.i do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def strong_parse(node, out)
-      out.b do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def sup_parse(node, out)
-      out.sup do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def sub_parse(node, out)
-      out.sub do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def tt_parse(node, out)
-      out.tt do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def strike_parse(node, out)
-      out.s do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
     def error_parse(node, out)
       text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       out.para do |p|
@@ -232,14 +189,20 @@ module IsoDoc::Function
       if node["lang"] == @lang && node["script"] == @script
         node.children.each { |n| parse(n, out) }
       else
-        prev = node.xpath("./preceding-sibling::xmlns:variant")
-        foll = node.xpath("./following-sibling::xmlns:variant")
-        found = false
-        (prev + foll).each { |n| found = true if n["lang"] == @lang && n["script"] == @script }
-        return if found
-        return unless prev.empty?
+        return if found_matching_variant_sibling(node)
+        return unless !node.at("./preceding-sibling::xmlns:variant")
         node.children.each { |n| parse(n, out) }
       end
     end
+
+    def found_matching_variant_sibling(node)
+      prev = node.xpath("./preceding-sibling::xmlns:variant")
+      foll = node.xpath("./following-sibling::xmlns:variant")
+      found = false
+      (prev + foll).each do |n|
+        found = true if n["lang"] == @lang && n["script"] == @script
+      end
+      found
+    end
   end
 end

data/lib/isodoc/function/inline_simple.rb

@@ -0,0 +1,72 @@
+module IsoDoc::Function
+  module Inline
+    def section_break(body)
+      body.br
+    end
+
+    def page_break(out)
+      out.br
+    end
+
+    def pagebreak_parse(_node, out)
+      out.br
+    end
+
+    def hr_parse(node, out)
+      out.hr
+    end
+
+    def br_parse(node, out)
+      out.br
+    end
+
+    def index_parse(node, out)
+    end
+
+        def bookmark_parse(node, out)
+      out.a **attr_code(id: node["id"])
+    end
+
+    def keyword_parse(node, out)
+      out.span **{ class: "keyword" } do |s|
+        node.children.each { |n| parse(n, s) }
+      end
+    end
+
+    def em_parse(node, out)
+      out.i do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def strong_parse(node, out)
+      out.b do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def sup_parse(node, out)
+      out.sup do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def sub_parse(node, out)
+      out.sub do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def tt_parse(node, out)
+      out.tt do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def strike_parse(node, out)
+      out.s do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+  end
+end

data/lib/isodoc/function/references.rb

@@ -5,7 +5,7 @@ module IsoDoc::Function
     # references anyway; keeping here instead of in IsoDoc::Iso for now
     def docid_l10n(x)
       return x if x.nil?
-      x.gsub(/All Parts/i, @all_parts_lbl.downcase)
+      x.gsub(/All Parts/i, @all_parts_lbl.downcase) if @all_parts_lbl
     end
 
     # TODO generate formatted ref if not present
@@ -84,7 +84,7 @@ module IsoDoc::Function
 
     def omit_docid_prefix(prefix)
       return true if prefix.nil? || prefix.empty?
-      return %w(ISO IEC ITU metanorma).include? prefix
+      return %w(ISO IEC ITU W3C metanorma).include? prefix
     end
 
     def date_note_process(b, ref)

data/lib/isodoc/function/section.rb

@@ -16,6 +16,7 @@ module IsoDoc::Function
             clausedelimspace(out)
           end
           c1&.children&.each { |c2| parse(c2, b) }
+          clausedelimspace(out) if /\S/.match(c1&.text)
         end
       end
     end

data/lib/isodoc/function/to_word_html.rb

@@ -79,7 +79,7 @@ module IsoDoc::Function
 
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
-                  boilerplate docxml, div3
+        boilerplate docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3
@@ -102,6 +102,7 @@ module IsoDoc::Function
       @meta.relations isoxml, out
       @meta.version isoxml, out
       @meta.url isoxml, out
+      @meta.keywords isoxml, out
       @meta.get
     end
 
@@ -109,8 +110,15 @@ module IsoDoc::Function
       out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
     end
 
+    def middle_admonitions(isoxml, out)
+      isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+        parse(x, out)
+      end
+    end
+
     def middle(isoxml, out)
       middle_title(out)
+      middle_admonitions(isoxml, out)
       i = scope isoxml, out, 0
       i = norm_ref isoxml, out, i
       i = terms_defs isoxml, out, i
@@ -120,20 +128,20 @@ module IsoDoc::Function
       bibliography isoxml, out
     end
 
-      def boilerplate(node, out)
-        boilerplate = node.at(ns("//boilerplate")) or return
-        out.div **{class: "authority"} do |s|
-          boilerplate.children.each do |n|
-            if n.name == "title"
-              s.h1 do |h|
-                n.children.each { |nn| parse(nn, h) }
-              end
-            else
-              parse(n, s)
+    def boilerplate(node, out)
+      boilerplate = node.at(ns("//boilerplate")) or return
+      out.div **{class: "authority"} do |s|
+        boilerplate.children.each do |n|
+          if n.name == "title"
+            s.h1 do |h|
+              n.children.each { |nn| parse(nn, h) }
             end
+          else
+            parse(n, s)
           end
         end
       end
+    end
 
     def parse(node, out)
       if node.text?

data/lib/isodoc/function/utils.rb

@@ -121,7 +121,7 @@ module IsoDoc::Function
       h1.traverse do |x|
         x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])
         x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-        x.remove if x.name == "a" && x["epub:type"] == "footnote"
+        x.remove if x.name == "a" && x["class"] == "FootnoteRef"
         x.remove if x.name == "span" && /mso-bookmark/.match(x["style"])
         x.replace(x.children) if x.name == "a"
       end

data/lib/isodoc/html_function/footnotes.rb

@@ -65,7 +65,7 @@ module IsoDoc::HtmlFunction
        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
       fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-      attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
+      attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
       out.a **attrs do |a|
         a.sup { |sup| sup << fn }
       end

data/lib/isodoc/html_function/html.rb

@@ -3,6 +3,18 @@ require "base64"
 
 module IsoDoc::HtmlFunction
   module Html
+    def convert1(docxml, filename, dir)
+      anchor_names docxml
+      noko do |xml|
+        xml.html **{ lang: "#{@lang}" } do |html|
+          info docxml, nil
+          populate_css()
+          html.head { |head| define_head head, filename, dir }
+          make_body(html, docxml)
+        end
+      end.join("\n")
+    end
+
     def make_body1(body, _docxml)
       body.div **{ class: "title-section" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder