asciidoctor-iso 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2119336be461ce4dcf5141195957fe0171251ada29f6735c9b9e96d61a95150
-  data.tar.gz: 7305fc72ae1e3e01b5315f6bcce6bb382922a9770ba2dc2ff2e84a345f7208d2
+  metadata.gz: fb4b3cf95879f9dbc87df7bb4ef5ef0cdd6d8a84d5c025d875686d22fbbccf81
+  data.tar.gz: 72922fb815c364609f29b030aea4349dcb8b1b2e62b2aa8a6cd1e553d077c672
 SHA512:
-  metadata.gz: 5126540df3ca9efefacd321f5508cd9b21293ecaf5b710afe242cb776261956a3d49d88c292ae45da7af7d4da405c1426294bdd9e7de99f72194e95e24a12115
-  data.tar.gz: d0d757089a00b7022d4ed69154d93bd3df75dfca1b17448f497cf2d4680d373af2e82569dfe51954929a4cd315e27f88a40da08a1ebc82f5f5438019f73048c3
+  metadata.gz: 2598a409d73c5fba6adbe2056428b2ff33c9e3d85ae5bd19a7af1caae42ec8d96716453676c98b50c237a0855108cd79ae4fdf40043f74782b551b504008f1b1
+  data.tar.gz: 006c5953314176be6f126765fb4281ffa268e4c5a8faa46470a5ee4dcafebfc888f0f8af98e4ce03360647e1c7f830e546ab278b966a094b9ecc41fd0dcff591

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.3
+  - 2.5.1
 before_install:
   - gem install bundler -v 1.16.1
   - unset _JAVA_OPTIONS

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    asciidoctor-iso (0.8.0)
+    asciidoctor-iso (0.9.0)
       asciidoctor (~> 1.5.7)
-      isobib (~> 0.1.4)
-      isodoc (~> 0.6.2)
+      iso-bib-item (~> 0.1.6)
+      isobib (~> 0.1.6)
+      isodoc (>= 0.8)
       ruby-jing
 
 GEM
   remote: https://rubygems.org/
   specs:
-    algoliasearch (1.22.0)
+    algoliasearch (1.23.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.7.1)
@@ -20,9 +21,10 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
+    duplicate (1.1.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.24)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -50,15 +52,16 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     image_size (2.0.0)
-    iso-bib-item (0.1.3)
+    iso-bib-item (0.1.6)
+      duplicate
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.4)
+    isobib (0.1.6)
       algoliasearch
       iso-bib-item (~> 0.1.2)
-    isodoc (0.6.2)
+    isodoc (0.8)
       asciimath
-      html2doc
+      html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
       image_size
       liquid
@@ -70,6 +73,7 @@ GEM
       thread_safe
       uuidtools
     isoics (0.1.6)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -83,7 +87,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -92,7 +96,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -115,7 +119,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.56.0)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -141,7 +146,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.3.3)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
 PLATFORMS

data/README.adoc

@@ -25,14 +25,19 @@ International Standards.
 as end deliverable ISO standard drafts.
 ** Microsoft Word output (`.doc`), following the style conventions of the 
 https://www.iso.org/iso-templates.html[ISO Standard Microsoft Word template]. 
-** PDF (forthcoming)
-** HTML (in development)
+** HTML. For ISO, two HTML files are generated: the `.html` file follows ISO
+conventions in rendering, which looks very similar to the Word output, while
+the `-alt.html` file has richer styling.
+** PDF. Not supported for the ISO gem, but available for other other specification,
+generated from the HTML file.
 
 This AsciiDoc syntax for writing ISO standards is hereby named "AsciiISO".
 
 This README provides an overview of the functionality of the gem; see also
 https://github.com/riboseinc/asciidoctor-iso/wiki/Guidance-for-authoring[Guidance for authoring]
-ISO standards using the gem.
+ISO standards using the gem. The 
+https://github.com/riboseinc/asciidoctor-iso/wiki/Quickstart-Guide[Quickstart guide]
+gives a summary overview.
 
 == Usage
 
@@ -331,14 +336,18 @@ consisting of a conical sample divider
 === Bibliographic details
 
 Citations can include details of where in the document the citation is located; these
-are entered by suffixing the type of locality, followed by the reference. Multiple
-instances of locality and reference can be provided, delimited by comma or colon. For
+are entered by suffixing the type of locality, then an equals sign, then the reference. 
+The word "whole" on its own is also treated as a locality. Multiple
+instances of locality and reference can be provided, delimited by comma or colon. Any trailing
+text after the sequence of locality=reference (or locality, space, reference) are treated
+as substitute text, as would occur normally in an Asciidoctor crossreference. For
 example:
 
 [source,asciidoctor]
 --
-<<ISO712,section 5, page 8-10>>         # renders as: ISO 712, Section 5, Page 8-10
-<<ISO712,section 5, page 8-10: 5:8-10>> # renders as ISO 712, 5:8-10
+<<ISO712,the foregoing reference>>     # renders as: the foregoing reference
+<<ISO712,section=5, page 8-10>>         # renders as: ISO 712, Section 5, Page 8-10
+<<ISO712,section=5, page=8-10: 5:8-10>> # renders as ISO 712, 5:8-10 ("5:8-10" treated as replacement text for all the foregoing)
 <<ISO712,whole>>                        # renders as: ISO 712, Whole of text
 --
 
@@ -349,7 +358,7 @@ A custom locality can be entered by prefixing it with `locality:`:
 
 [source,asciidoctor]
 --
-<<ISO712,locality:frontispiece 5, page 8-10>>         # renders as: ISO 712, Frontispiece 5, Page 8-10
+<<ISO712,locality:frontispiece=5, page=8-10>>         # renders as: ISO 712, Frontispiece 5, Page 8-10
 --
 
 Custom localities may not contain commas, colons, or space. Localities with the `locality:`
@@ -528,6 +537,11 @@ in the file `filename`.relaton.json. The local cache overrides entries in
 the global cache, and can be manually edited. The local cache is only used
 if the `:local-cache:` document attribute is set.
 
+If the document attribute `:no-isobib:` is set, the reference details for
+items are not looked up via `isobib`, and the `isobib` caches are not used.
+If the document attribute `:no-isobib-cache:` is set, the reference details for
+items are still looked up via `isobib`, but the `isobib` caches are not used.
+
 == Document Attributes
 
 The gem relies on Asciidoctor document attributes to provide necessary
@@ -542,6 +556,12 @@ Can be used as a command-line option (like all other document attributes):
 `:flush-caches:`:: If set, delete and reinitialise the <<cache,cache>> of `isobib` searches
 for ISO references from the ISO web site.
 
+`:no-isobib:`:: If set, do not use the `isobib` gem functionality to look up
+ISO references online, nor the <<cache,cache>> of `isobib` searches.
+
+`:no-isobib-cache:`:: If set, use the `isobib` gem functionality to look up
+ISO references online, but do not use the <<cache,cache>> of `isobib` searches.
+
 `:local-cache:`:: Use the local isobib search cache to override the global isobib search
 cache.
 

data/asciidoctor-iso.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", ">= 0.7.0"
-  spec.add_dependency "isobib", "~> 0.1.4"
+  spec.add_dependency "isodoc", ">= 0.8"
+  spec.add_dependency "isobib", "~> 0.1.6"
+  spec.add_dependency "iso-bib-item", "~> 0.1.6"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor-iso.rb

@@ -3,3 +3,7 @@ require_relative "asciidoctor/iso/converter"
 require_relative "asciidoctor/iso/version"
 require "asciidoctor/extensions"
 
+if defined? Metanorma
+  require_relative "metanorma/iso"
+  Metanorma::Registry.instance.register(Metanorma::Iso::Processor)
+end

data/lib/asciidoctor/iso/base.rb

@@ -28,22 +28,8 @@ module Asciidoctor
         nil
       end
 
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
-      def generate_css(filename, stripwordcss, fontheader)
-        stylesheet = File.read(filename, encoding: "UTF-8")
-        stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
-        engine = Sass::Engine.new(fontheader + stylesheet, syntax: :scss)
-        outname = File.basename(filename, ".*") + ".css"
-        File.open(outname, "w") { |f| f.write(engine.render) }
-        @files_to_delete << outname
-        outname
-      end
-
       def html_converter(node)
-        IsoDoc::Iso::Convert.new(
+        IsoDoc::Iso::HtmlConvert.new(
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),
@@ -53,7 +39,7 @@ module Asciidoctor
       end
 
       def html_converter_alt(node)
-        IsoDoc::Iso::Convert.new(
+        IsoDoc::Iso::HtmlConvert.new(
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),
@@ -82,8 +68,9 @@ module Asciidoctor
         @novalid = node.attr("novalid")
         @fontheader = default_fonts(node)
         @files_to_delete = []
-        @filename = node.attr("docfile") ? 
+        @filename = node.attr("docfile") ?
           node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "") : ""
+        @no_isobib_cache = node.attr("no-isobib-cache")
         @bibliodb = open_cache_biblio(node, true)
         @local_bibliodb = node.attr("local-cache") ?
           open_cache_biblio(node, false) : nil

data/lib/asciidoctor/iso/cleanup.rb

@@ -37,17 +37,32 @@ module Asciidoctor
         empty_element_cleanup(xmldoc)
         mathml_cleanup(xmldoc)
         script_cleanup(xmldoc)
+        docidentifier_cleanup(xmldoc)
         bookmark_cleanup(xmldoc)
         xmldoc
       end
 
+      def docidentifier_cleanup(xmldoc)
+        id = xmldoc.at("//bibdata/docidentifier/project-number")
+        return unless id
+
+        prefix = []
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
+                     "/organization").each do |x|
+          x1 = x.at("abbreviation")&.text || x.at("name")&.text
+          x1 == "ISO" and prefix.unshift("ISO") or prefix << x1
+        end
+
+        id.content = prefix.join("/") + " " + id.text
+      end
+
       TEXT_ELEMS =
         %w{status language script version author name callout phone
            email street city state country postcode identifier referenceFrom
            referenceTo docidentifier prefix initial addition surname forename
            title draft secretariat title-main title-intro title-part}.freeze
 
-      # it seems Nokogiri::XML is treating the content of <script> as cdata, 
+      # it seems Nokogiri::XML is treating the content of <script> as cdata,
       # because of its use in HTML. Bad nokogiri. Undoing that, since we use
       # script as a normal tag
       def script_cleanup(xmldoc)

data/lib/asciidoctor/iso/cleanup_ref.rb

@@ -6,7 +6,7 @@ module Asciidoctor
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
         ^((?<locality>section|clause|part|paragraph|chapter|page|
                       table|annex|figure|example|note|formula|
-                      locality:[^ \\t\\n\\r:,]+)\\s+
+                      locality:[^ \\t\\n\\r:,]+)(\\s+|=)
                (?<ref>[^ \\t\\n,:-]+)(-(?<to>[^ \\t\\n,:-]+))?|
           (?<locality2>whole|locality:[^ \\t\\n\\r:,]+))[,:]?\\s*
          (?<text>.*)$
@@ -107,7 +107,7 @@ module Asciidoctor
       end
 
       def reference_names(xmldoc)
-        xmldoc.xpath("//bibitem").each do |ref|
+        xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier")
           date = ref.at("./date[@type = 'published']")

data/lib/asciidoctor/iso/front.rb

@@ -99,7 +99,11 @@ module Asciidoctor
 
       def metadata_ics(node, xml)
         ics = node.attr("library-ics")
-        ics && ics.split(/,\s*/).each { |i| xml.ics i }
+        ics && ics.split(/,\s*/).each do |i|
+          xml.ics do |ics|
+            ics.code i
+          end
+        end
       end
 
       def metadata(node, xml)

data/lib/asciidoctor/iso/isostandard.rng

@@ -114,6 +114,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
     <define name="BibData">
       <optional>
@@ -165,6 +168,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -852,6 +858,11 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="allParts">
+    <element name="allParts">
+      <data type="boolean"/>
+    </element>
+  </define>
   <define name="clause-hanging-paragraph-with-footnote">
     <element name="clause">
       <optional>
@@ -905,7 +916,12 @@
   </define>
   <define name="ics">
     <element name="ics">
-      <text/>
+      <element name="code">
+        <text/>
+      </element>
+      <element name="text">
+        <text/>
+      </element>
     </element>
   </define>
   <define name="term-clause">

data/lib/asciidoctor/iso/ref.rb

@@ -71,80 +71,147 @@ module Asciidoctor
         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]) }
-          t.docidentifier "#{m[:code]}:All Parts"
+          t.docidentifier "#{m[:code]}"
           if m.named_captures.has_key?("year")
             t.date(**{ type: "published" }) { |d| set_date_range(d, m[:year]) }
           end
           iso_publisher(t, m[:code])
+          t.allParts "true"
         end
       end
 
-      def fetch_year_check(hit, code, year, opts)
-        ret =nil
-        if year.nil? || year.to_i == hit.hit["year"]
-          ret = hit.to_xml opts
-          @bibliodb[code] = ret if @bibliodb
-          @local_bibliodb[code] = ret if @local_bibliodb
+# --- ISOBIB
+      def fetch_ref_err(code, year, missed_years)
+        id = year ? "#{code}:#{year}" : code
+        warn "WARNING: no match found on the ISO website for #{id}. "\
+          "The code must be exactly like it is on the website."
+        warn "(There was no match for #{year}, though there were matches "\
+          "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
+        if /\d-\d/.match? code
+          warn "The provided document part may not exist, or the document "\
+            "may no longer be published in parts."
         else
-          warn "WARNING: cited year #{year} does not match year "\
-            "#{hit.hit['year']} found on the ISO website for #{code}"
+          warn "If you wanted to cite all document parts for the reference, "\
+            "use \"#{code} (all parts)\".\nIf the document is not a standard, "\
+            "use its document type abbreviation (TS, TR, PAS, Guide)."
         end
-        ret
+        nil
       end
 
-      def first_with_title(result)
-        result.first.each do |x|
-          next unless x.hit["title"]
-          return x
-        end
-        return nil
+      def fetch_pages(s, n)
+        workers = WorkersPool.new n
+        workers.worker { |w| { i: w[:i], hit: w[:hit].fetch } }
+        s.each_with_index { |hit, i| workers << { i: i, hit: hit } }
+        workers.end
+        workers.result.sort { |x, y| x[:i] <=> y[:i] }.map { |x| x[:hit] }
       end
 
-      def first_year_match_hit(result, code, year)
-        return first_with_title(result) if year.nil?
-        return nil unless result.first && result.first.is_a?(Array)
-        coderegex = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+}
-        result.first.each do |x|
-          next unless x.hit["title"]
-          return x if x.hit["title"].match(coderegex).to_s == code &&
-            year.to_i == x.hit["year"]
-        end
-        return first_with_title(result)
+      def isobib_search_filter(code)
+      docidrx = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+}
+      corrigrx = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+:[0-9]+/}
+        warn "fetching #{code}..."
+        result = Isobib::IsoBibliography.search(code)
+        result.first.select do |i| 
+          i.hit["title"] &&
+          i.hit["title"].match(docidrx).to_s == code &&
+            !corrigrx.match?(i.hit["title"])
+        end 
       end
 
-      def fetch_ref_err(code)
-        warn "WARNING: no match found on the ISO website for #{code}."
-        if /\d-\d/.match? code
-          warn "The provided document part may not exist, or the document may no longer be published in parts."
-        else
-          warn "If you wanted to cite all document parts for the reference, use #{code}:All Parts"
-        end
+      def iev
+        Nokogiri::XML.fragment(<<~"END")
+          <bibitem type="international-standard" id="IEV">
+  <title format="text/plain" language="en" script="Latn">Electropedia: 
+  The World's Online Electrotechnical Vocabulary</title>
+  <source type="src">http://www.electropedia.org</source>
+  <docidentifier>IEV</docidentifier>
+  <date type="published"> <on>#{Date.today.year}</on> </date>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+      <uri>www.iec.ch</uri>
+    </organization>
+  </contributor>
+  <language>en</language> <language>fr</language>
+  <script>Latn</script>
+  <copyright>
+    <from>#{Date.today.year}</from>
+    <owner>
+      <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+      <uri>www.iec.ch</uri>
+      </organization>
+    </owner>
+  </copyright>
+  <relation type="updates">
+    <bibitem>
+      <formattedref>IEC 60050</formattedref>
+    </bibitem>
+  </relation>
+</bibitem>
+        END
       end
 
-      def fetch_ref2(code, year, opts)
-        result = Isobib::IsoBibliography.search(code)
-        ret = nil
-        hit = first_year_match_hit(result, code, year)
-        coderegex = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+}
-        if hit && hit.hit["title"]&.match(coderegex)&.to_s == code
-          ret = fetch_year_check(hit, code, year, opts)
-        else
-          fetch_ref_err(code)
+      # Sort through the results from Isobib, fetching them three at a time,
+      # and return the first result that matches the code,
+      # matches the year (if provided), and which # has a title (amendments do not).
+      # Only expects the first page of results to be populated.
+      # Does not match corrigenda etc (e.g. ISO 3166-1:2006/Cor 1:2007)
+      # If no match, returns any years which caused mismatch, for error reporting
+      def isobib_results_filter(result, year)
+        missed_years = []
+        result.each_slice(3) do |s| # ISO website only allows 3 connections
+          fetch_pages(s, 3).each_with_index do |r, i|
+            return { ret: r } if !year
+            r.dates.select { |d| d.type == "published" }.each do |d|
+              return { ret: r } if year.to_i == d.on.year
+              missed_years << d.on.year
+            end
+          end
         end
+        { years: missed_years }
+      end
+
+      def isobib_get1(code, year, opts)
+        return iev if code.casecmp? "IEV"
+        result = isobib_search_filter(code) or return nil
+        ret = isobib_results_filter(result, year)
+        return ret[:ret] if ret[:ret]
+        fetch_ref_err(code, year, ret[:years])
+      end
+
+      def isobib_get(code, year, opts)
+        code += "-1" if opts[:all_parts]
+        ret = isobib_get1(code, year, opts)
+        return nil if ret.nil?
+        ret.to_most_recent_reference if !year
+        ret.to_all_parts if opts[:all_parts]
+        ret.to_xml
+      end
+
+      # --- ISOBIB
+
+      def iso_id(code, year, all_parts)
+        ret = code
+        ret += ":#{year}" if year
+        ret += " (all parts)" if all_parts
         ret
       end
 
       def fetch_ref1(code, year, opts)
+        id = iso_id(code, year, opts[:all_parts])
         return nil if @bibliodb.nil? # signals we will not be using isobib
-        @bibliodb[code] = fetch_ref2(code, year, opts) unless @bibliodb[code]
-        @local_bibliodb[code] = @bibliodb[code] if !@local_bibliodb.nil? &&
-          !@local_bibliodb[code]
-        return @local_bibliodb[code] unless @local_bibliodb.nil?
-        @bibliodb[code]
+        @bibliodb[id] = isobib_get(code, year, opts) unless @bibliodb[id]
+        @local_bibliodb[id] = @bibliodb[id] if !@local_bibliodb.nil? &&
+          !@local_bibliodb[id]
+        return @local_bibliodb[id] unless @local_bibliodb.nil?
+        @bibliodb[id]
       end
 
       def fetch_ref(xml, code, year, **opts)
-        warn "fetching #{code}..."
         hit = fetch_ref1(code, year, opts)
         return nil if hit.nil?
         xml.parent.add_child(hit)
@@ -181,7 +248,8 @@ module Asciidoctor
       end
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+)(:(?<year>[0-9][0-9-]+))?\]</ref>,?\s
+      \[(?<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>[^"]+)">
@@ -235,9 +303,11 @@ module Asciidoctor
 
       # if returns nil, then biblio caching is disabled, and so is use of isobib
       def open_cache_biblio(node, global)
-        return nil # disabling for now
+        # return nil # disabling for now
+        return nil if node.attr("no-isobib")
+        return {} if @no_isobib_cache
         filename = bibliocache_name(global)
-        system("rm -f #{filename}") if node.attr("flush-caches") == "true"
+        system("rm -f #{filename}") if node.attr("flush-caches")
         biblio = {}
         if Pathname.new(filename).file?
           File.open(filename, "r") do |f|
@@ -248,7 +318,7 @@ module Asciidoctor
       end
 
       def save_cache_biblio(biblio, global)
-        return if biblio.nil?
+        return if biblio.nil? || @no_isobib_cache
         filename = bibliocache_name(global)
         File.open(filename, "w") do |b|
           b << biblio.to_json