metanorma 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd771e6d08104e0da071e1a9326ebdd909565d6e53b5393b4375dde3507e157
-  data.tar.gz: ff4931bf6d1fd1bbed2ffb47b4dbf6dbda95027caff1d24f388f881e4827da65
+  metadata.gz: 504b901a50469dec68785b7c3cb207e287757a7b2a86394843210dd90b8703ed
+  data.tar.gz: '097ecbfebaa22181ecbb33330d4d5a8b609a24bf56d3df882a4a50504324ba17'
 SHA512:
-  metadata.gz: 55f9e339d45f4cd40e6666660fdd2ad2c52b85332c07b64b66f59208cabd703e79ac38dda55070c99cd79a45b09199fb487b7aa5701553e1599d8239f8a50959
-  data.tar.gz: ba2ccbb163a0bad558a56680a8bf66d112ca3cc0f72fb87772b678b029d3c8ac3e27152f28442c5cade32149ab86a09e1ebebe19786e1a770c53f85036f3723e
+  metadata.gz: dc055a69f2d0ab1e130ea9692e438df7e8547529191b601581ae7547b410c03e2cd35b54fb1f574dfad9795c4e3113f2e60dea924a16be4537a30c6dd6d13cd1
+  data.tar.gz: 609f4b00335d2ded1b480edf5839518c3b2ee7d857a063a1b5dab8dc0a0d5a2b2232b6ae5502b92593c51bbb5cb53d3c969f86edfac804dc6e6aff24aa4cc1e1

data/lib/metanorma/input/asciidoc.rb

@@ -60,7 +60,7 @@ module Metanorma
         %w(htmlstylesheet htmlcoverpage htmlintropage scripts
            scripts-override scripts-pdf wordstylesheet i18nyaml
            standardstylesheet header wordcoverpage wordintropage
-           ulstyle olstyle htmlstylesheet-override bare
+           ulstyle olstyle htmlstylesheet-override bare toclevels
            htmltoclevels doctoclevels sectionsplit base-asset-path
            body-font header-font monospace-font title-font
            align-cross-elements wordstylesheet-override ieee-dtd
@@ -68,39 +68,50 @@ module Metanorma
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
-           toc-figures toc-tables toc-recommendations fonts
-           font-license-agreement pdf-allow-access-content
+           fonts font-license-agreement pdf-allow-access-content
            pdf-encrypt-metadata iso-word-template document-scheme
            localize-number iso-word-bg-strip-color
            modspec-identifier-base).freeze
 
+      EMPTY_ADOC_OPTIONS_DEFAULT_TRUE =
+        %w(data-uri-image suppress-asciimath-dup use-xinclude).freeze
+
+      EMPTY_ADOC_OPTIONS_DEFAULT_FALSE =
+        %w(hierarchical-assets break-up-urls-in-tables toc-figures
+           toc-tables toc-recommendations).freeze
+
+      def attr_name_normalise(name)
+        name.gsub(/-/, "").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
+          .to_sym
+      end
+
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")
         ret = ADOC_OPTIONS.each_with_object({}) do |w, acc|
           m = /\n:#{w}: ([^\n]+)\n/.match(header) or next
-          acc[w.gsub(/-/, "").sub(/override$/, "_override")
-            .sub(/pdf$/, "_pdf").to_sym] = m[1]
+          acc[attr_name_normalise(w)] = m[1]
         end
-        /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ header
-        /\n:(?<hier_assets>hierarchical-assets:[^\n]*)\n/ =~ header
-        /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ header
-        /\n:(?<break_up>break-up-urls-in-tables:[^\n]*)\n/ =~ header
-        /\n:suppress-asciimath-dup: (?<suppress_asciimath_dup>[^\n]+)\n/ =~ header
-
-        defined?(hier_assets) and
-          hier_assets = empty_attr(hier_assets, "hierarchical-assets")
-        defined?(use_xinclude) and
-          use_xinclude = empty_attr(use_xinclude, "use-xinclude")
-        defined?(break_up) and
-          break_up = empty_attr(break_up, "break-up-urls-in-tables")
-        ret.merge(
-          datauriimage: defined?(datauriimage) ? datauriimage != "false" : true,
-          suppressasciimathdup: defined?(suppress_asciimath_dup) ? suppress_asciimath_dup != "false" : nil,
-          hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
-          use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
-          break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
-        ).compact
+        ret2 = EMPTY_ADOC_OPTIONS_DEFAULT_TRUE.each_with_object({}) do |w, acc|
+          m = /\n:#{w}:([^\n]*)\n/.match(header) || [nil, "true"]
+          #require "debug" binding.b if w == "break-up-urls-in-tables"
+          acc[attr_name_normalise(w)] = (m[1].strip != "false")
+        end
+        ret3 = EMPTY_ADOC_OPTIONS_DEFAULT_FALSE.each_with_object({}) do |w, acc|
+          m = /\n:#{w}:([^\n]*)\n/.match(header) || [nil, "false"]
+          #require "debug" binding.b if w == "break-up-urls-in-tables"
+          acc[attr_name_normalise(w)] = !["false"].include?(m[1].strip)
+        end
+        ret.merge(ret2).merge(ret3).compact
       end
+
+      #         ret.merge(
+      #           datauriimage: defined?(datauriimage) ? datauriimage != "false" : true,
+      #           suppressasciimathdup: defined?(suppress_asciimath_dup) ? suppress_asciimath_dup != "false" : nil,
+      #           hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
+      #           use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
+      #           break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
+      #         ).compact
+      #       end
     end
   end
 end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.2".freeze
+  VERSION = "1.5.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor