metanorma-standoc 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 804da6a0cd7fbb0bf6fb9ec3b96f2ebdfba1c2c2cfe495a0f8163a7aa00ba2b6
-  data.tar.gz: a83e9da845f9a0424e1d357238ad8729aa5f6a4a846582b7536f23df90f92410
+  metadata.gz: 4e95a39bfddb66aa733baf30ef52d730d91ba27bcea85511287d665481d84aae
+  data.tar.gz: 6c462647a07e2f004a1df85c343f4a2a6a53aac7e0aa3eea9a47aed46e7a5e1e
 SHA512:
-  metadata.gz: dd5460a4a0f27b5e4452f71f3444092e81e45187b5011e7e6d815f80594957f1e3aa9851adee53bcfa7047066ed945c7f46f0c0b8c7645e153682491319070c8
-  data.tar.gz: 11f9fdee478b91fca447bc75fd6da139a836ab39c5e66c5d1c90f0ab50ca359d9fc52191c6ce8e1d5c743a605b9b184ea2d0e709f5a4fe2d36fca023a0b045d3
+  metadata.gz: 392c83c6672ec4ecf4cf245649edd9be86af018bcc5f03c2206159577100224a01f6067289a85da0d2730c13706eacd8b3397ab97eb8a5069539d6d8e16985d8
+  data.tar.gz: 05af317f628941fc049c0bc9a0c470ed437eff7d76568d42ef0948434f2311661d904810b73e0ebf38e6773aa0af805e5efb3fbe27da121b7a0aff20a89c40fd

data/.github/workflows/ubuntu.yml

@@ -29,7 +29,6 @@ jobs:
       - name: Install LaTeXML
         run: |
           sudo snap install latexml
-          sudo snap alias latexml.math latexmlmath
       - name: Install PlantUML
         run: |
           curl -L https://raw.githubusercontent.com/metanorma/plantuml-install/master/ubuntu.sh | sudo bash

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.3.6)
-      asciidoctor (~> 1.5.7)
+    metanorma-standoc (1.3.7)
+      asciidoctor (~> 2.0.0)
       concurrent-ruby
       html2doc (~> 0.9.0)
       iev (~> 0.2.1)
@@ -19,7 +19,7 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    asciidoctor (1.5.8)
+    asciidoctor (2.0.10)
     asciimath (1.0.9)
     ast (2.4.0)
     byebug (11.0.1)
@@ -37,7 +37,7 @@ GEM
     ffi (1.11.1)
     formatador (0.2.5)
     gb-agencies (0.0.6)
-    guard (2.15.1)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -52,7 +52,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (1.0.0)
-    html2doc (0.9.0)
+    html2doc (0.9.1)
       asciimath (~> 1.0.9)
       htmlentities (~> 4.3.4)
       image_size
@@ -64,7 +64,7 @@ GEM
     iev (0.2.3)
       nokogiri (>= 1.10.4)
     image_size (2.0.2)
-    isodoc (1.0.6)
+    isodoc (1.0.7)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -83,7 +83,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
-    metanorma (0.3.15)
+    metanorma (0.3.16)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -94,7 +94,7 @@ GEM
     mini_portile2 (2.4.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -113,7 +113,8 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.9)
+    relaton (0.5.11)
+      relaton-calconnect (~> 0.1.0)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
       relaton-ietf (~> 0.6.0)
@@ -121,33 +122,36 @@ GEM
       relaton-itu (~> 0.3.0)
       relaton-nist (~> 0.3.0)
       relaton-ogc (~> 0.1.0)
-    relaton-bib (0.3.11)
+    relaton-bib (0.3.12)
       addressable
       nokogiri
-    relaton-gb (0.6.6)
+    relaton-calconnect (0.1.0)
+      faraday
+      relaton-iso-bib (~> 0.3.0)
+    relaton-gb (0.6.7)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.9)
+    relaton-iec (0.4.10)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.7)
+    relaton-ietf (0.6.9)
       relaton-bib (~> 0.3.0)
     relaton-iev (0.1.1)
       relaton (~> 0.5.0)
-    relaton-iso (0.6.8)
+    relaton-iso (0.6.9)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.11)
+    relaton-iso-bib (0.3.12)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.6)
+    relaton-itu (0.3.7)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.7)
+    relaton-nist (0.3.8)
       relaton-bib (~> 0.3.0)
       rubyzip
-    relaton-ogc (0.1.3)
+    relaton-ogc (0.1.4)
       faraday
       relaton-iso-bib (~> 0.3.0)
     roman-numerals (0.3.0)

data/README.adoc

@@ -1,11 +1,11 @@
 = Metanorma-standoc
 
 image:https://img.shields.io/gem/v/metanorma-standoc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-standoc"]
-image:https://img.shields.io/travis/metanorma/metanorma-standoc/master.svg["Build Status", link="https://travis-ci.org/metanorma/metanorma-standoc"]
+image:https://travis-ci.com/metanorma/metanorma-standoc.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-standoc"]
+image:https://ci.appveyor.com/api/projects/status/dbt5mjpe69whcvpb?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-standoc"]
 image:https://codeclimate.com/github/metanorma/metanorma-standoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-standoc"]
-image:https://ci.appveyor.com/api/projects/status/qdadxv7rqfy33p66?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-standoc"]
-
-WARNING: This gem is still under development.
+image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-standoc.svg["Pull Requests", link="https://github.com/metanorma/metanorma-standoc/pulls"]
+image:https://img.shields.io/github/commits-since/metanorma/metanorma-standoc/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-standoc/releases"]
 
 Gem for serialising the https://github.com/metanorma/metanorma-model-standoc[Metanorma Standoc] model. 
 

data/lib/asciidoctor/standoc/base.rb

@@ -20,6 +20,7 @@ module Asciidoctor
         block Asciidoctor::Standoc::ToDoAdmonitionBlock
         treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
+        block Asciidoctor::Standoc::PseudocodeBlockMacro
       end
 
       def content(node)

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -341,11 +341,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="tclass">
-    <element name="name">
-      <text/>
-    </element>
-  </define>
   <define name="thead">
     <element name="thead">
       <ref name="tr"/>
@@ -515,19 +510,22 @@
         <attribute name="subsequence"/>
       </optional>
       <optional>
-        <ref name="source"/>
+        <attribute name="class"/>
       </optional>
       <optional>
-        <ref name="tname"/>
+        <ref name="source"/>
       </optional>
       <optional>
-        <ref name="tclass"/>
+        <ref name="tname"/>
       </optional>
       <choice>
         <ref name="image"/>
         <ref name="video"/>
         <ref name="audio"/>
         <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>

data/lib/asciidoctor/standoc/blocks.rb

@@ -147,6 +147,21 @@ module Asciidoctor
         role = node.role || node.attr("style")
         %w(recommendation requirement permission).include?(role) and
           return requirement(node, role)
+        return pseudocode_example(node) if role == "pseudocode"
+        example_proper(node)
+      end
+
+      def pseudocode_example(node)
+        noko do |xml|
+          xml.figure **{id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node),
+                        class: "pseudocode"} do |ex|
+            figure_title(node, ex)
+            wrap_in_para(node, ex)
+          end
+        end.join("\n")
+      end
+
+      def example_proper(node)
         noko do |xml|
           xml.example **id_unnum_attr(node) do |ex|
             node.title.nil? or ex.name { |name| name << node.title }

data/lib/asciidoctor/standoc/cleanup.rb

@@ -1,9 +1,7 @@
-require "date"
 require "nokogiri"
 require "pathname"
 require "open-uri"
 require "html2doc"
-require "pp"
 require_relative "./cleanup_block.rb"
 require_relative "./cleanup_footnotes.rb"
 require_relative "./cleanup_ref.rb"
@@ -16,8 +14,6 @@ module Asciidoctor
       def textcleanup(result)
         text = result.flatten.map { |l| l.sub(/\s*$/, "") }  * "\n"
         if !@keepasciimath
-          #text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>}m,
-                           #'<amathstem>\1</amathstem>')
           text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>}m) do |m|
             "<amathstem>#{HTMLEntities.new.decode($1)}</amathstem>"
           end
@@ -66,11 +62,14 @@ module Asciidoctor
       end
 
       def smartquotes_cleanup(xmldoc)
-        return unless @smartquotes
         xmldoc.traverse do |n|
           next unless n.text?
-          next unless n.ancestors("pre, tt, sourcecode, bibdata, on").empty?
-          n.replace(Utils::smartformat(n.text))
+          if @smartquotes
+            next unless n.ancestors("pre, tt, sourcecode, bibdata, on").empty?
+            n.replace(Utils::smartformat(n.text))
+          else
+            n.replace(n.text.gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'"))
+          end
         end
         xmldoc
       end
@@ -89,9 +88,7 @@ module Asciidoctor
       # because of its use in HTML. Bad nokogiri. Undoing that, since we use
       # script as a normal tag
       def script_cleanup(xmldoc)
-        xmldoc.xpath("//script").each do |x|
-          x.content = x.to_str
-        end
+        xmldoc.xpath("//script").each { |x| x.content = x.to_str }
       end
 
       def empty_element_cleanup(xmldoc)
@@ -177,9 +174,7 @@ module Asciidoctor
       end
 
       def termdef_subclause_cleanup(xmldoc)
-        xmldoc.xpath("//terms[terms]").each do |t|
-          t.name = "clause"
-        end
+        xmldoc.xpath("//terms[terms]").each { |t| t.name = "clause" }
       end
 
       def termdocsource_cleanup(xmldoc)
@@ -212,9 +207,7 @@ module Asciidoctor
 
       def empty_text_before_first_element(x)
         x.children.each do |c|
-          if c.text?
-            return false if /\S/.match(c.text)
-          end
+          return false if c.text? and /\S/.match(c.text)
           return true if c.element?
         end
         true

data/lib/asciidoctor/standoc/inline.rb

@@ -52,9 +52,10 @@ module Asciidoctor
       end
 
       def inline_anchor_bibref(node)
-        eref_contents = node.target == node.text ? nil : node.text
-        eref_attributes = { id: node.target }
-        @refids << node.target
+        eref_contents = (node.text || node.target || node.id)&.
+          sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
+        eref_attributes = { id: node.target || node.id }
+        @refids << (node.target || node.id)
         noko do |xml|
           xml.ref **attr_code(eref_attributes) do |r|
             r << eref_contents

data/lib/asciidoctor/standoc/macros.rb

@@ -40,6 +40,24 @@ module Asciidoctor
       end
     end
 
+    class PseudocodeBlockMacro < Asciidoctor::Extensions::BlockProcessor
+      use_dsl
+      named :pseudocode
+      on_context :example, :sourcecode
+
+      def init_indent(s)
+        /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ s
+        prefix = prefix.gsub(/\t/, "\u00a0\u00a0\u00a0\u00a0").gsub(/ /, "\u00a0")
+        prefix + suffix
+      end
+
+      def process parent, reader, attrs
+        attrs['role'] = 'pseudocode'
+        create_block parent, :example, reader.lines.map { |m| init_indent(m) }, attrs,
+          content_model: :compound
+      end
+    end
+
     class HTML5RubyMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :ruby
@@ -48,8 +66,8 @@ module Asciidoctor
       option :pos_attrs, %w(rpbegin rt rpend)
 
       def process(parent, target, attributes)
-          rpbegin = '('
-          rpend = ')'
+        rpbegin = '('
+        rpend = ')'
         if attributes.size == 1 and attributes.key?("text")
           rt = attributes["text"]
         elsif attributes.size == 2 and attributes.key?(1) and attributes.key?("rpbegin")

data/lib/asciidoctor/standoc/ref.rb

@@ -42,20 +42,26 @@ module Asciidoctor
       end
 
       def docid(t, code)
-        type, code1 = /^\[\d+\]$|^\(.+\)$/.match(code) ? 
+        type, code1 = /^\[\d+\]$|^\(.+\)$/.match(code) ?
           ["metanorma", code.sub(/^\(/, "[").sub(/\)$/, "]")] :
           @bibdb&.docid_type(code) || [nil, code]
         t.docidentifier code1, **attr_code(type: type)
       end
 
+      def norm_year(yr)
+        return "--" if /^\&\#821[12];$/.match yr
+        yr
+      end
+
       def isorefmatches(xml, m)
-        ref = fetch_ref xml, m[:code], m[:year], title: m[:text]
+        yr = norm_year(m[:year])
+        ref = fetch_ref xml, m[:code], yr, title: m[:text]
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          docid(t, id_and_year(m[:code], m[:year]))
-          m[:year] and t.date **{ type: "published" } do |d|
-            set_date_range(d, m[:year])
+          docid(t, id_and_year(m[:code], yr))
+          yr and t.date **{ type: "published" } do |d|
+            set_date_range(d, yr)
           end
           iso_publisher(t, m[:code])
         end
@@ -69,10 +75,10 @@ module Asciidoctor
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           docid(t, id_and_year(m[:code], "--"))
           t.date **{ type: "published" } do |d|
-            d.on "--" 
+            d.on "--"
           end
           iso_publisher(t, m[:code])
-          t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" }
+          m[:fn].nil? or t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" }
         end
       end
 
@@ -81,20 +87,21 @@ module Asciidoctor
           t.date(**{ type: "published" }) do |d|
           if noyr then d.on "--"
           else
-            set_date_range(d, m[:year])
+            set_date_range(d, norm_year(m[:year]))
           end
         end
       end
 
       def isorefmatches3(xml, m)
-        hasyr =  m.names.include?("year") && m[:year] != "--"
-        noyr =  m.names.include?("year") && m[:year] == "--"
-        ref = fetch_ref xml, m[:code], hasyr ? m[:year] : nil, 
+        yr = norm_year(m[:year])
+        hasyr =  m.names.include?("year") && yr != "--"
+        noyr =  m.names.include?("year") && yr == "--"
+        ref = fetch_ref xml, m[:code], hasyr ? yr : nil,
           all_parts: true, no_year: noyr, text: m[:text]
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          docid(t, id_and_year(m[:code], m[:year]) + " (all parts)")
+          docid(t, id_and_year(m[:code], yr) + " (all parts)")
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
           m.names.include?("fn") && m[:fn] and
@@ -107,7 +114,7 @@ module Asciidoctor
 
       def fetch_ref(xml, code, year, **opts)
         return nil if opts[:no_year]
-        hit = @bibdb&.fetch(code, year, opts) 
+        hit = @bibdb&.fetch(code, year, opts)
         return nil if hit.nil?
         xml.parent.add_child(Utils::smart_render_xml(hit, code, opts[:title]))
         xml
@@ -125,14 +132,19 @@ module Asciidoctor
         end
       end
 
+      MALFORMED_REF = 
+        "no anchor on reference, markup may be malformed: "\
+        "see https://www.metanorma.com/author/topics/document-format/bibliography/ , "\
+        "https://www.metanorma.com/author/iso/topics/markup/#bibliographies".freeze
+
       # TODO: alternative where only title is available
       def refitem(xml, item, node)
         unless m = NON_ISO_REF.match(item)
-          Utils::warning(node, "no anchor on reference", item) 
+          Utils::warning(node, MALFORMED_REF, item)
           return
         end
         unless m[:code] && /^\d+$/.match(m[:code])
-          ref = fetch_ref xml, m[:code], 
+          ref = fetch_ref xml, m[:code],
             m.names.include?("year") ? m[:year] : nil, { title: m[:text] }
           return use_my_anchor(ref, m[:anchor]) if ref
         end
@@ -154,63 +166,63 @@ module Asciidoctor
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
-      (:(?<year>[0-9][0-9-]+))?\]</ref>,?\s
-      (?<text>.*)$}xm
-
-      ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):--\]</ref>,?\s?
-      <fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?(?<text>.*)$}xm
-
-      ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>--|[0-9][0-9-]+))?\s
-      \(all\sparts\)\]</ref>,?\s
-      (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
-
-      NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s
-      (?<text>.*)$}xm
-
-      # @param item [String]
-      # @return [Array<MatchData>]
-      def reference1_matches(item)
-        matched = ISO_REF.match item
-        matched2 = ISO_REF_NO_YEAR.match item
-        matched3 = ISO_REF_ALL_PARTS.match item
-        [matched, matched2, matched3]
-      end
-
-      # @param node [Asciidoctor::List]
-      # @param item [String]
-      # @param xml [Nokogiri::XML::Builder]
-      def reference1(node, item, xml)
-        matched, matched2, matched3 = reference1_matches(item)
-        if matched3.nil? && matched2.nil? && matched.nil?
-          refitem(xml, item, node)
-          # elsif fetch_ref(matched3 || matched2 || matched, xml)
-        elsif !matched.nil? then isorefmatches(xml, matched)
-        elsif !matched2.nil? then isorefmatches2(xml, matched2)
-        elsif !matched3.nil? then isorefmatches3(xml, matched3)
+      (:(?<year>[0-9][0-9-]+))?\]</ref>,?\s*
+        (?<text>.*)$}xm
+
+        ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
+      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):(--|\&\#821[12]\;)\]</ref>,?\s*
+        (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?,?\s?(?<text>.*)$}xm
+
+        ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
+        \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>--|\&\#821[12]\;|[0-9][0-9-]+))?\s
+        \(all\sparts\)\]</ref>,?\s*
+          (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
+
+          NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
+        \[(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s*
+          (?<text>.*)$}xm
+
+          # @param item [String]
+          # @return [Array<MatchData>]
+          def reference1_matches(item)
+            matched = ISO_REF.match item
+            matched2 = ISO_REF_NO_YEAR.match item
+            matched3 = ISO_REF_ALL_PARTS.match item
+            [matched, matched2, matched3]
         end
-      end
 
-      def reference(node)
-        noko do |xml|
-          node.items.each do |item|
-            reference1(node, item.text, xml)
+        # @param node [Asciidoctor::List]
+        # @param item [String]
+        # @param xml [Nokogiri::XML::Builder]
+        def reference1(node, item, xml)
+          matched, matched2, matched3 = reference1_matches(item)
+          if matched3.nil? && matched2.nil? && matched.nil?
+            refitem(xml, item, node)
+            # elsif fetch_ref(matched3 || matched2 || matched, xml)
+          elsif !matched.nil? then isorefmatches(xml, matched)
+          elsif !matched2.nil? then isorefmatches2(xml, matched2)
+          elsif !matched3.nil? then isorefmatches3(xml, matched3)
           end
-        end.join("\n")
-      end
+        end
 
-      def global_ievcache_name
-        "#{Dir.home}/.iev/cache"
-      end
+        def reference(node)
+          noko do |xml|
+            node.items.each do |item|
+              reference1(node, item.text, xml)
+            end
+          end.join("\n")
+        end
 
-      def local_ievcache_name(cachename)
-        return nil if cachename.nil?
-        cachename += "_iev" unless cachename.empty?
-        cachename = "iev" if cachename.empty?
-        "#{cachename}/cache"
-      end
+        def global_ievcache_name
+          "#{Dir.home}/.iev/cache"
+        end
+
+        def local_ievcache_name(cachename)
+          return nil if cachename.nil?
+          cachename += "_iev" unless cachename.empty?
+          cachename = "iev" if cachename.empty?
+          "#{cachename}/cache"
+        end
     end
   end
 end