isodoc 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2aca20ce5f2e96df3da6fbb1a8e675e3b2393f51720bac2bdc760e6e9c09a5
-  data.tar.gz: 6f83efeb115dbbb30f928d99e8f8c6da4172fc2a17d1792607d2cd38d6b5833c
+  metadata.gz: 56ed930565ee3a3bbb9649d61e3b552f6a13de3bb66cbf6f0e134d341c457386
+  data.tar.gz: ee72443f7f96082b52b60bd525cb54d14088f0776c60bd88456bd5796de9d7a9
 SHA512:
-  metadata.gz: f3e63f2f2f04dea86c5b716be19385eec4273bdd57870ee1215f441e2b6494ea25c8c52c3edf40b8b657ed8d081667356b003e68ded049605f2985450e903649
-  data.tar.gz: a1f408ba884174786963f38a5912ec128a94223b5f9f66fb28662398a6785bb2b54a42554fc3c2bb004230d443a6a38b8d771a1cdf64ec12447ea4e132b46a2c
+  metadata.gz: 8effb0abf7faf7a63a40a3cee55465290e5d156be8af54f16b36283e191f52ff3cba4443cce54f95c6b38a86c951656d78179cb02b4010c98a6bea8d80c97501
+  data.tar.gz: 15c19b41ec493b97cc0ed06fbfe161f1d39f99e069f6d760a20858330f676c2bd35a60fe04f83b88569e6c61238090d0e2c336129f9665f6b695882fc75801d3

data/.github/workflows/macos.yml

@@ -1,5 +1,3 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: macos
 
 on:
@@ -41,6 +39,10 @@ jobs:
       - name: Install Puppeteer
         run: |
           npm install -g puppeteer@3.0.1
+      - name: Install Inkscape
+        run: |
+          brew cask install inkscape
+          inkscape --version
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,5 +1,3 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
@@ -43,6 +41,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install libgbm1
           npm install -g puppeteer@3.0.1
+      - name: Install Inkscape
+        run: |
+          sudo add-apt-repository ppa:inkscape.dev/stable
+          sudo apt update
+          sudo apt install inkscape
+          inkscape --version
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -1,5 +1,3 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: windows
 
 on:
@@ -43,6 +41,10 @@ jobs:
       - name: Install Puppeteer
         run: |
           npm install -g puppeteer@3.0.1
+      - name: Install Inkscape
+        run: |
+          choco install --no-progress -y inkscape
+          inkscape --version
       - name: Run specs
         run: |
           bundle exec rake

data/lib/isodoc/function/blocks.rb

@@ -1,45 +1,9 @@
-require_relative "blocks_example"
+require_relative "blocks_example_note"
 
 module IsoDoc::Function
   module Blocks
     @annotation = false
 
-    def note_label(node)
-      n = get_anchors[node["id"]]
-      return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
-      l10n("#{@note_lbl} #{n[:label]}")
-    end
-
-    def note_p_parse(node, div)
-      div.p do |p|
-        p.span **{ class: "note_label" } do |s|
-          s << note_label(node)
-        end
-        insert_tab(p, 1)
-        node.first_element_child.children.each { |n| parse(n, p) }
-      end
-      node.element_children[1..-1].each { |n| parse(n, div) }
-    end
-
-    def note_parse1(node, div)
-      div.p do |p|
-        p.span **{ class: "note_label" } do |s|
-          s << note_label(node)
-        end
-        insert_tab(p, 1)
-      end
-      node.children.each { |n| parse(n, div) }
-    end
-
-    def note_parse(node, out)
-      @note = true
-      out.div **{ id: node["id"], class: "Note" } do |div|
-        node.first_element_child.name == "p" ?
-          note_p_parse(node, div) : note_parse1(node, div)
-      end
-      @note = false
-    end
-
     def figure_name_parse(node, div, name)
       return if name.nil? && node.at(ns("./figure"))
       lbl = anchor(node['id'], :label, false)
@@ -58,11 +22,15 @@ module IsoDoc::Function
       end
     end
 
+    def figure_attrs(node)
+      attr_code(id: node["id"], class: "figure", style: keep_style(node))
+    end
+
     def figure_parse(node, out)
       return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
         node["type"] == "pseudocode"
       @in_figure = true
-      out.div **attr_code(id: node["id"], class: "figure") do |div|
+      out.div **figure_attrs(node) do |div|
         node.children.each do |n|
           figure_key(out) if n.name == "dl"
           parse(n, div) unless n.name == "name"
@@ -72,10 +40,14 @@ module IsoDoc::Function
       @in_figure = false
     end
 
+    def pseudocode_attrs(node)
+      attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
+    end
+
     def pseudocode_parse(node, out)
       @in_figure = true
       name = node.at(ns("./name"))
-      out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
+      out.div **pseudocode_attrs(node) do |div|
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         sourcecode_name_parse(node, div, name)
       end
@@ -101,9 +73,13 @@ module IsoDoc::Function
       end
     end
 
+    def sourcecode_attrs(node)
+      attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
+    end
+
     def sourcecode_parse(node, out)
       name = node.at(ns("./name"))
-      out.p **attr_code(id: node["id"], class: "Sourcecode") do |div|
+      out.p **sourcecode_attrs(node) do |div|
         @sourcecode = true
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
@@ -138,10 +114,15 @@ module IsoDoc::Function
       name
     end
 
+    def admonition_attrs(node)
+      attr_code(id: node["id"], class: admonition_class(node),
+                style: keep_style(node))
+    end
+
     def admonition_parse(node, out)
       type = node["type"]
       name = admonition_name(node, type)
-      out.div **{ id: node["id"], class: admonition_class(node) } do |t|
+      out.div **admonition_attrs(node) do |t|
         admonition_name_parse(node, t, name) if name
         node.children.each { |n| parse(n, t) unless n.name == "name" }
       end
@@ -157,7 +138,7 @@ module IsoDoc::Function
     end
 
     def formula_parse1(node, out)
-      out.div **attr_code(id: node["id"], class: "formula") do |div|
+      out.div **attr_code(class: "formula") do |div|
         div.p do |p|
           parse(node.at(ns("./stem")), div)
           lbl = anchor(node['id'], :label, false)
@@ -169,12 +150,18 @@ module IsoDoc::Function
       end
     end
 
+    def formula_attrs(node)
+      attr_code(id: node["id"], style: keep_style(node))
+    end
+
     def formula_parse(node, out)
-      formula_parse1(node, out)
-      formula_where(node.at(ns("./dl")), out)
-      node.children.each do |n|
-        next if %w(stem dl).include? n.name
-        parse(n, out)
+      out.div **formula_attrs(node) do |div|
+        formula_parse1(node, div)
+        formula_where(node.at(ns("./dl")), div)
+        node.children.each do |n|
+          next if %w(stem dl).include? n.name
+          parse(n, div)
+        end
       end
     end
 
@@ -187,8 +174,9 @@ module IsoDoc::Function
 
     def para_attrs(node)
       attrs = { class: para_class(node), id: node["id"] }
-      node["align"].nil? or
-        attrs[:style] = "text-align:#{node['align']};"
+      s = node["align"].nil? ? "" : "text-align:#{node['align']};"
+      s = "#{s}#{keep_style(node)}"
+      attrs[:style] = s unless s.empty?
       attrs
     end
 
@@ -224,7 +212,8 @@ module IsoDoc::Function
     end
 
     def passthrough_parse(node, out)
-      return if node["format"] and !(node["format"].split(/,/).include? @format.to_s)
+      return if node["format"] and
+        !(node["format"].split(/,/).include? @format.to_s)
       out.passthrough node.text
     end
   end

data/lib/isodoc/function/{blocks_example.rb → blocks_example_note.rb}

@@ -15,9 +15,13 @@ module IsoDoc::Function
       { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
         margin-left:0pt;vertical-align:top;" }.freeze
 
+    def example_div_attr(node)
+      attr_code(id: node["id"], class: "example", style: keep_style(node))
+    end
+
     # used if we are boxing examples
     def example_div_parse(node, out)
-      out.div **attr_code(id: node["id"], class: "example") do |div|
+      out.div **example_div_attr(node) do |div|
         example_label(node, div, node.at(ns("./name")))
         node.children.each do |n|
           parse(n, div) unless n.name == "name"
@@ -27,7 +31,8 @@ module IsoDoc::Function
 
     def example_table_attr(node)
       attr_code(id: node["id"], class: "example",
-                style: "border-collapse:collapse;border-spacing:0;" )
+                style: "border-collapse:collapse;border-spacing:0;"\
+                "#{keep_style(node)}" )
     end
 
     EXAMPLE_TD_ATTR =
@@ -49,5 +54,55 @@ module IsoDoc::Function
     def example_parse(node, out)
       example_div_parse(node, out)
     end
+
+    def note_label(node)
+      n = get_anchors[node["id"]]
+      return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
+      l10n("#{@note_lbl} #{n[:label]}")
+    end
+
+    def note_p_parse(node, div)
+      div.p do |p|
+        p.span **{ class: "note_label" } do |s|
+          s << note_label(node)
+        end
+        insert_tab(p, 1)
+        node.first_element_child.children.each { |n| parse(n, p) }
+      end
+      node.element_children[1..-1].each { |n| parse(n, div) }
+    end
+
+    def note_parse1(node, div)
+      div.p do |p|
+        p.span **{ class: "note_label" } do |s|
+          s << note_label(node)
+        end
+        insert_tab(p, 1)
+      end
+      node.children.each { |n| parse(n, div) }
+    end
+
+    def keep_style(node)
+      ret = ""
+      node["keep-with-next"] == "true" and
+        ret += "page-break-after: avoid;"
+      node["keep-lines-together"] == "true" and
+        ret += "page-break-inside: avoid;"
+      return nil if ret.empty?
+      ret
+    end
+
+    def note_attrs(node)
+      attr_code(id: node["id"], class: "Note", style: keep_style(node))
+    end
+
+    def note_parse(node, out)
+      @note = true
+      out.div **note_attrs(node) do |div|
+        node.first_element_child.name == "p" ?
+          note_p_parse(node, div) : note_parse1(node, div)
+      end
+      @note = false
+    end
   end
 end

data/lib/isodoc/function/i18n.rb

@@ -87,6 +87,7 @@ module IsoDoc::Function
 
     # TODO: move to localization file
     def eref_localities1(target, type, from, to, delim, lang = "en")
+      return "" if type == "anchor"
       return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
       ret = delim
       loc = @locality[type] || type.sub(/^locality:/, "").capitalize

data/lib/isodoc/function/inline.rb

@@ -90,21 +90,38 @@ module IsoDoc::Function
     end
 
     def eref_localities0(r, i, target, delim)
-      if r["type"] == "whole" then l10n("#{delim} #{@whole_of_text}")
+      if r["type"] == "whole" then l10n("#{delim} #{@wholeoftext_lbl}")
       else
         eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
                          r.at(ns("./referenceTo")), delim, @lang)
       end
     end
 
+    def suffix_url(url)
+      return url if %r{^http[s]?://}.match(url)
+      url.sub(/#{File.extname(url)}$/, ".html")
+    end
+
+    def eref_target(node)
+      href = "#" + node["bibitemid"]
+      url = node.at(ns("//bibitem[@id = '#{node['bibitemid']}']/"\
+                       "uri[@type = 'citation']"))
+      return href unless url
+      href = suffix_url(url.text)
+      anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text
+      anchor and href += "##{anchor}"
+      href
+    end
+
     def eref_parse(node, out)
       linkend = get_linkend(node)
+      href = eref_target(node)
       if node["type"] == "footnote"
         out.sup do |s|
-          s.a(**{ "href": "#" + node["bibitemid"] }) { |l| l << linkend }
+          s.a(**{ "href": href }) { |l| l << linkend }
         end
       else
-        out.a(**{ "href": "#" + node["bibitemid"] }) { |l| l << linkend }
+        out.a(**{ "href": href }) { |l| l << linkend }
       end
     end
 

data/lib/isodoc/function/lists.rb

@@ -1,8 +1,11 @@
 module IsoDoc::Function
   module Lists
+    def ul_attrs(node)
+      { id: node["id"], style: keep_style(node) }
+    end
 
     def ul_parse(node, out)
-      out.ul **attr_code(id: node["id"]) do |ul|
+      out.ul **attr_code(ul_attrs(node)) do |ul|
         node.children.each { |n| parse(n, ul) }
       end
     end
@@ -34,9 +37,12 @@ module IsoDoc::Function
       ol_style(type)
     end
 
+    def ol_attrs(node)
+      { type: ol_depth(node), id: node["id"], style: keep_style(node) }
+    end
+
     def ol_parse(node, out)
-      style = ol_depth(node)
-      out.ol **attr_code(type: style, id: node["id"] ) do |ol|
+      out.ol **attr_code(ol_attrs(node)) do |ol|
         node.children.each { |n| parse(n, ol) }
       end
     end
@@ -67,12 +73,12 @@ module IsoDoc::Function
       %w{dt dd}.include? n.name
     end
 
-    def dl_attr(node)
-      attr_code(id: node["id"])
+    def dl_attrs(node)
+      attr_code(id: node["id"], style: keep_style(node))
     end
 
     def dl_parse(node, out)
-      out.dl  **dl_attr(node) do |v|
+      out.dl  **dl_attrs(node) do |v|
         node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
           v.dt **attr_code(id: dt["id"]) do |term|
             dt_parse(dt, term) 

data/lib/isodoc/function/references.rb

@@ -6,6 +6,7 @@ module IsoDoc::Function
     def docid_l10n(x)
       return x if x.nil?
       x.gsub(/All Parts/i, @all_parts_lbl.downcase) if @all_parts_lbl
+      x
     end
 
     # TODO generate formatted ref if not present
@@ -88,9 +89,8 @@ module IsoDoc::Function
     end
 
     def date_note_process(b, ref)
-      date_note = b.at(ns("./note[text()][contains(.,'ISO DATE:')]"))
+      date_note = b.at(ns("./note[@type = 'ISO DATE']"))
       return if date_note.nil?
-      date_note.content = date_note.content.gsub(/ISO DATE: /, "")
       date_note.children.first.replace("<p>#{date_note.content}</p>")
       footnote_parse(date_note, ref)
     end

data/lib/isodoc/function/reqt.rb

@@ -60,8 +60,12 @@ module IsoDoc::Function
       %w(label title subject classification tag value inherit).include? n.name
     end
 
+    def reqt_attrs(node, klass)
+      attr_code(class: klass, id: node["id"], style: keep_style(node))
+    end
+
     def recommendation_parse(node, out)
-      out.div **{ class: "recommend" } do |t|
+      out.div **reqt_attrs(node, "recommend") do |t|
         recommendation_name(node, t, @recommendation_lbl)
         recommendation_attributes(node, out)
         node.children.each do |n|
@@ -71,7 +75,7 @@ module IsoDoc::Function
     end
 
     def requirement_parse(node, out)
-      out.div **{ class: "require" } do |t|
+      out.div **reqt_attrs(node, "require") do |t|
         recommendation_name(node, t, @requirement_lbl)
         recommendation_attributes(node, out)
         node.children.each do |n|
@@ -81,7 +85,7 @@ module IsoDoc::Function
     end
 
     def permission_parse(node, out)
-      out.div **{ class: "permission" } do |t|
+      out.div **reqt_attrs(node, "permission") do |t|
         recommendation_name(node, t, @permission_lbl)
         recommendation_attributes(node, out)
         node.children.each do |n|
@@ -90,9 +94,14 @@ module IsoDoc::Function
       end
     end
 
+    def reqt_component_attrs(node)
+      attr_code(class: "requirement-" + node.name,
+                style: keep_style(node))
+    end
+
     def requirement_component_parse(node, out)
       return if node["exclude"] == "true"
-      out.div **{ class: "requirement-" + node.name } do |div|
+      out.div **reqt_component_attrs(node) do |div|
         node.children.each do |n|
           parse(n, div)
         end