isodoc 1.7.6.1 → 1.8.2

data/spec/isodoc/xslfo_convert_spec.rb

@@ -5,10 +5,10 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-      }
+      },
     )
 
-    expect(convert.pdf_options(nil)).to eq("")
+    expect(convert.pdf_options(nil)).to eq({})
   end
 
   it "test empty pdf_options for nil font_manifest_file" do
@@ -18,22 +18,47 @@ RSpec.describe IsoDoc do
         IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => nil,
         },
-      }
+      },
     )
 
-    expect(convert.pdf_options(nil)).to eq("")
+    expect(convert.pdf_options(nil)).to eq({})
   end
 
   it "test --font-manifest pdf_options" do
+    mn2pdf_opts = {
+      IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => "/tmp/manifest.yml",
+    }
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
-          IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => "/tmp/manifest.yml",
-        },
-      }
+        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => mn2pdf_opts,
+      },
+    )
+
+    expect(convert.pdf_options(nil)).to eq(mn2pdf_opts)
+  end
+
+  it "test --param align-cross-elements pdf_options" do
+    convert = IsoDoc::XslfoPdfConvert.new(
+      {
+        datauriimage: false,
+        aligncrosselements: "clause table note",
+      },
+    )
+
+    expect(convert.pdf_options(nil))
+      .to eq({ "--param align-cross-elements=" => "clause table note" })
+  end
+
+  it "test --baseassetpath pdf_options" do
+    convert = IsoDoc::XslfoPdfConvert.new(
+      {
+        datauriimage: false,
+        baseassetpath: "ABC",
+      },
     )
 
-    expect(convert.pdf_options(nil)).to eq("--font-manifest /tmp/manifest.yml")
+    expect(convert.pdf_options(nil))
+      .to eq({ "--param baseassetpath=" => "ABC" })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.6.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -446,11 +446,11 @@ files:
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
-- lib/isodoc/presentation_function/concept.rb
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
 - lib/isodoc/presentation_function/section.rb
+- lib/isodoc/presentation_function/terms.rb
 - lib/isodoc/presentation_xml_convert.rb
 - lib/isodoc/sassc_importer.rb
 - lib/isodoc/version.rb
@@ -509,6 +509,7 @@ files:
 - spec/isodoc/section_spec.rb
 - spec/isodoc/table_spec.rb
 - spec/isodoc/terms_spec.rb
+- spec/isodoc/xref_numbering_spec.rb
 - spec/isodoc/xref_spec.rb
 - spec/isodoc/xslfo_convert_spec.rb
 - spec/spec_helper.rb
@@ -531,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.

data/lib/isodoc/presentation_function/concept.rb

@@ -1,68 +0,0 @@
-module IsoDoc
-  class PresentationXMLConvert < ::IsoDoc::Convert
-    def concept(docxml)
-      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
-    end
-
-    def concept1(node)
-      xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, ital: node["ital"] || "true",
-                                    ref: node["ref"] || "true",
-                                    linkref: node["linkref"] || "true",
-                                    linkmention: node["linkmention"] || "false")
-      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, ital: node["ital"] || "false",
-                             ref: node["ref"] || "false",
-                             linkref: node["linkref"] || "true",
-                             linkmention: node["linkmention"] || "false")
-      else concept_render(node, ital: node["ital"] || "true",
-                                ref: node["ref"] || "true",
-                                linkref: node["linkref"] || "true",
-                                linkmention: node["linkmention"] || "false")
-      end
-    end
-
-    def concept_render(node, opts)
-      node&.at(ns("./refterm"))&.remove
-      r = node.at(ns("./renderterm"))
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      ref && opts[:ref] != "false" and r&.next = " "
-      opts[:ital] == "true" and r&.name = "em"
-      if opts[:linkmention] == "true" && !r.nil? && !ref.nil?
-        ref2 = ref.clone
-        r2 = r.clone
-        r.replace(ref2).children = r2
-      end
-      concept1_ref(node, ref, opts)
-      if opts[:ital] == "false"
-        r = node.at(ns(".//renderterm"))
-        r&.replace(r&.children)
-      end
-      node.replace(node.children)
-    end
-
-    def concept1_ref(_node, ref, opts)
-      ref.nil? and return
-      return ref.remove if opts[:ref] == "false"
-
-      r = concept1_ref_content(ref)
-      ref = r.at("./descendant-or-self::xmlns:xref | "\
-                 "./descendant-or-self::xmlns:eref | "\
-                 "./descendant-or-self::xmlns:termref")
-      %w(xref eref).include? ref&.name and get_linkend(ref)
-      if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
-        ref.replace(ref.children)
-      end
-    end
-
-    def concept1_ref_content(ref)
-      if non_locality_elems(ref).select do |c|
-           !c.text? || /\S/.match(c)
-         end.empty?
-        ref.replace(@i18n.term_defined_in.sub(/%/,
-                                              ref.to_xml))
-      else ref.replace("[#{ref.to_xml}]")
-      end
-    end
-  end
-end