isodoc 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46206b47756f66c1927ca1810020fbe63141a27f6ad000e95b7938f5b2f8cdcc
-  data.tar.gz: bbce350ccfa6c97bff0c45cccdc15febde0a2c17b1e415fb8132f205ba202d85
+  metadata.gz: 691e16d8f19de5c4008d22686af0f70594dea57d039e7d4e265763a02cc8eea3
+  data.tar.gz: 4aca2f6a4b06fa9c6dd3235ee8581e94060f47eb3fe8dc9de9a6b6aa5ee356f2
 SHA512:
-  metadata.gz: 7679fe14d35c348ffc9fcda332f27bf39e898337ae5c0cd7a8638e74f1d26a77ca528cad7d210b82f546336b80e0115c4131c49d9cec1ae82a8174d34002ead3
-  data.tar.gz: 20ca1c4d733511fa7f5dc5fe28295c754803b20167e3ae8d39209b1c2d3f63fc064308668a7c23cf834a6a1d93e46ec486931d2c189c0e47210507b32c0291a2
+  metadata.gz: 1ac28f83694610bab479de1bed5921c3d5807ab337dd2926555b66a7e5c1f5912c320a335089a4c7a617e816f1d8957bf923c986813e3374316ef472f825f7c2
+  data.tar.gz: d472986686451eab5674ce530a2a8fb2a82660d345280ae4ce57425c8920f135a789536ae4d0b05b952a8ea44efcaaf5122bc266cb6f17aee2fb6b4d79d1ca79

data/.github/workflows/rake.yml

@@ -16,17 +16,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
     steps:
@@ -35,49 +35,19 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
-
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
-
-      - name: Install Inkscape macOS
-        if: matrix.os == 'macos-latest'
-        run: |
-          brew cask install inkscape
-          inkscape --version
-
-      - name: Install Inkscape Ubuntu
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo add-apt-repository ppa:inkscape.dev/stable
-          sudo apt update
-          sudo apt install inkscape
-          inkscape --version
-
-      - name: Install Inkscape Windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          choco install --no-progress -y inkscape
-          inkscape --version
+      - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@master
 
       - run: bundle exec rake
 
   tests-passed:
     needs: rake
     runs-on: ubuntu-latest
-    continue-on-error: true
     steps:
-      - name: Trigger tests passed event
-        uses: Sibz/github-status-action@v1
+      - uses: peter-evans/repository-dispatch@v1
         with:
-          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          context: 'tests-passed-successfully'
-          description: 'Tests passed successfully'
-          state: 'success'
-          sha: ${{ github.event.pull_request.head.sha || github.sha }}
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: notify
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/isodoc.gemspec

@@ -50,4 +50,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "rexml"
 end

data/lib/isodoc/function/inline.rb

@@ -39,7 +39,7 @@ module IsoDoc::Function
                        "uri[@type = 'citation']"))
       return href unless url
       href = suffix_url(url.text)
-      anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text
+      anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text&.strip
       anchor and href += "##{anchor}"
       href
     end

data/lib/isodoc/presentation_function/block.rb

@@ -9,6 +9,12 @@ module IsoDoc
       docxml.xpath(ns("//figure")).each do |f|
         figure1(f)
       end
+      docxml.xpath(ns("//svgmap")).each do |s|
+        if f = s.at(ns("./figure")) then s.replace(f)
+        else
+          s.remove
+        end
+      end
     end
 
     def figure1(f)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.5.0".freeze
+  VERSION = "1.5.1".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -2687,7 +2687,7 @@ expect(( File.read("test.html").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h
     expect(File.exist?("test.html.err")).to be true
   end
 
-     it "ignore passthrough with incompatible format" do
+     it "ignores passthrough with incompatible format" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -2707,6 +2707,62 @@ expect(( File.read("test.html").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h
     OUTPUT
   end
 
+it "processes svgmap" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~INPUT, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(<<~OUTPUT)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+  <svgmap id='_'>
+    <target href='http://www.example.com'>
+      <xref target='ref1'>Computer</xref>
+    </target>
+  </svgmap>
+  <figure id='_'>
+  <image src='action_schemaexpg1.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto'/>
+</figure>
+<svgmap id='_'>
+  <figure id='_'>
+    <image src='action_schemaexpg2.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto' alt='Workmap'/>
+  </figure>
+    <target href='mn://support_resource_schema'>
+      <eref bibitemid='express_action_schema' citeas=''>
+        <localityStack>
+          <locality type='anchor'>
+            <referenceFrom>action_schema.basic</referenceFrom>
+          </locality>
+        </localityStack>
+        Coffee
+      </eref>
+    </target>
+  </svgmap>
+</sections>
+<bibliography>
+  <references hidden='true' normative='false'>
+    <bibitem id='express_action_schema' type='internal'>
+      <docidentifier type='repository'>express/action_schema</docidentifier>
+    </bibitem>
+  </references>
+</bibliography>
+</iso-standard>
+INPUT
+<iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <sections>
+           <figure id='_'>
+             <image src='action_schemaexpg1.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto'/>
+           </figure>
+           <figure id='_'>
+             <image src='action_schemaexpg2.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto' alt='Workmap'/>
+           </figure>
+         </sections>
+         <bibliography>
+           <references hidden='true' normative='false'>
+             <bibitem id='express_action_schema' type='internal'>
+               <docidentifier type='repository'>express/action_schema</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
+OUTPUT
 
+end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -304,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   isodoc converts documents in the IsoDoc document model into
   Microsoft Word and HTML.
@@ -454,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.