isodoc 1.7.5 → 1.7.6

data/spec/isodoc/postproc_spec.rb

@@ -807,6 +807,44 @@ RSpec.describe IsoDoc do
       OUTPUT
   end
 
+  it "moves images in HTML" do
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_rf "test_htmlimages"
+    IsoDoc::HtmlConvert.new(
+      { baseassetpath: "spec/assets",
+        wordstylesheet: "word.css",
+        htmlstylesheet: "html.scss" },
+    ).convert("test", <<~"INPUT", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+       <figure id="_">
+       <name>Split-it-right sample divider</name>
+       <image src="rice_image1.png" id="_" mimetype="image/png"/>
+       </figure>
+      </foreword></preface>
+      </iso-standard>
+    INPUT
+    html = File.read("test.html")
+      .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
+      .sub(%r{</main>.*$}m, "</main>")
+    expect(`ls test_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+            <main class='main-section'>
+          <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
+          <br/>
+          <div>
+            <h1 class='ForewordTitle'>Foreword</h1>
+            <div id='_' class='figure'>
+              <img src='test_htmlimages/_.png' height='776' width='922'/>
+              <p class='FigureTitle' style='text-align:center;'>Split-it-right sample divider</p>
+            </div>
+          </div>
+          <p class='zzSTDTitle1'/>
+        </main>
+      OUTPUT
+  end
+
   describe "mathvariant to plain" do
     context "when `mathvariant` attr equal to `script`" do
       it "converts mathvariant text chars into associated plain chars" do

data/spec/isodoc/presentation_xml_spec.rb

@@ -762,6 +762,66 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "duplicates EMF and SVG files" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata/>
+        <sections>
+           <clause id='A' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <figure id="B">
+               <image src="spec/assets/odf.svg" mimetype="image/svg+xml" alt="1"/>
+               <image src="spec/assets/odf.emf" mimetype="image/x-emf" alt="2"/>
+               <image src="data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPjxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz48L3N2Zz4=" mimetype="image/svg+xml" alt="3"/>
+               <image src="data:application/x-msmetafile;base64,AQAAAMgAAAAAAAAAAAAAAPsEAAD7BAAAAAAAAAAAAACLCgAAiwoAACBFTUYAAAEAJAQAACgAAAACAAAALgAAAGwAAAAAAAAA3ScAAH0zAADYAAAAFwEAAAAAAAAAAAAAAAAAAMBLAwDYQQQASQBuAGsAcwBjAGEAcABlACAAMQAuADAAIAAoADQAMAAzADUAYQA0AGYALAAgADIAMAAyADAALQAwADUALQAwADEAKQAgAAAAbwBkAGYALgBlAG0AZgAAAAAAAAARAAAADAAAAAEAAAAkAAAAJAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAIAAABGAAAALAAAACAAAABTY3JlZW49MTAyMDV4MTMxODFweCwgMjE2eDI3OW1tAEYAAAAwAAAAIwAAAERyYXdpbmc9MTAwLjB4MTAwLjBweCwgMjYuNXgyNi41bW0AABIAAAAMAAAAAQAAABMAAAAMAAAAAgAAABYAAAAMAAAAGAAAABgAAAAMAAAAAAAAABQAAAAMAAAADQAAACcAAAAYAAAAAQAAAAAAAAAAAJkABgAAACUAAAAMAAAAAQAAADsAAAAIAAAAGwAAABAAAACkBAAAcQIAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAACkBAAAqAMAAKgDAACkBAAAcQIAAKQEAAAFAAAANAAAAAAAAAAAAAAA//////////8DAAAAOgEAAKQEAAA/AAAAqAMAAD8AAABxAgAABQAAADQAAAAAAAAAAAAAAP//////////AwAAAD8AAAA6AQAAOgEAAD8AAABxAgAAPwAAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAACoAwAAPwAAAKQEAAA6AQAApAQAAHECAAA9AAAACAAAADwAAAAIAAAAPgAAABgAAAAAAAAAAAAAAP//////////JQAAAAwAAAAFAACAKAAAAAwAAAABAAAAJwAAABgAAAABAAAAAAAAAP///wAGAAAAJQAAAAwAAAABAAAAOwAAAAgAAAAbAAAAEAAAAJ0BAABFAQAANgAAABAAAADPAwAARQEAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAABfBAAA7QEAAGQEAADjAgAA2wMAAJEDAAAFAAAANAAAAAAAAAAAAAAA//////////8DAAAAUgMAAD4EAABhAgAAcwQAAJ0BAAAOBAAANgAAABAAAACdAQAAyQIAADYAAAAQAAAA4gIAAMkCAAA2AAAAEAAAAOICAAAaAgAANgAAABAAAACdAQAAGgIAAD0AAAAIAAAAPAAAAAgAAAA+AAAAGAAAAAAAAAAAAAAA//////////8lAAAADAAAAAUAAIAoAAAADAAAAAEAAAAOAAAAFAAAAAAAAAAAAAAAJAQAAA==" mimetype="image/x-emf" alt="4"/>
+             </figure>
+           </clause>
+         </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <?xml version="1.0"?>
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <bibdata/>
+        <sections>
+           <clause id="A" inline-header="false" obligation="normative" displayorder="1">
+             <title depth="1">1.<tab/>Clause</title>
+             <figure id="B"><name>Figure 1</name>
+               <image src="spec/assets/odf.svg" mimetype="image/svg+xml" alt="1"><emf src="spec/assets/odf.emf"/></image>
+               <image src="" mimetype="image/svg+xml" alt="2">
+      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1275.0000" height="1275.0000">
+      <g transform="translate(-0.0000, -0.0000)">
+      <g transform="matrix(1.0000 0.0000 0.0000 1.0000 0.0000 0.0000)">
+      <path d="M 1188.0000,625.0000 C 1188.0000,936.0000 936.0000,1188.0000 625.0000,1188.0000 C 314.0000,1188.0000 63.0000,936.0000 63.0000,625.0000 C 63.0000,314.0000 314.0000,63.0000 625.0000,63.0000 C 936.0000,63.0000 1188.0000,314.0000 1188.0000,625.0000 Z " fill="#000099" stroke="none"/>
+      <path d="M 413.0000,325.0000 L 975.0000,325.0000 C 1119.0000,493.0000 1124.0000,739.0000 987.0000,913.0000 C 850.0000,1086.0000 609.0000,1139.0000 413.0000,1038.0000 L 413.0000,713.0000 L 738.0000,713.0000 L 738.0000,538.0000 L 413.0000,538.0000 Z " fill="#FFFFFF" stroke="none"/>
+      </g>
+      </g>
+      </svg>
+      <emf src="data:application/x-msmetafile;base64"/></image>
+      <image src="" mimetype="image/svg+xml" alt="3"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle fill="#009" r="45" cx="50" cy="50"/><path d="M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z" fill="#FFF"/></svg><emf src="data:application/x-msmetafile;base64"/></image>
+               <image src="" mimetype="image/svg+xml" alt="4">
+      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1275.0000" height="1275.0000">
+      <g transform="translate(-0.0000, -0.0000)">
+      <g transform="matrix(1.0000 0.0000 0.0000 1.0000 0.0000 0.0000)">
+      <path d="M 1188.0000,625.0000 C 1188.0000,936.0000 936.0000,1188.0000 625.0000,1188.0000 C 314.0000,1188.0000 63.0000,936.0000 63.0000,625.0000 C 63.0000,314.0000 314.0000,63.0000 625.0000,63.0000 C 936.0000,63.0000 1188.0000,314.0000 1188.0000,625.0000 Z " fill="#000099" stroke="none"/>
+      <path d="M 413.0000,325.0000 L 975.0000,325.0000 C 1119.0000,493.0000 1124.0000,739.0000 987.0000,913.0000 C 850.0000,1086.0000 609.0000,1139.0000 413.0000,1038.0000 L 413.0000,713.0000 L 738.0000,713.0000 L 738.0000,538.0000 L 413.0000,538.0000 Z " fill="#FFFFFF" stroke="none"/>
+      </g>
+      </g>
+      </svg>
+      <emf src="data:application/x-msmetafile;base64"/></image>
+             </figure>
+           </clause>
+         </sections>
+      </iso-standard>
+    OUTPUT
+    expect(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")
+      .gsub(%r{"data:application/x-msmetafile;base64,[^"]+"},
+            '"data:application/x-msmetafile;base64"'))
+      .to be_equivalent_to (output)
+  end
+
   private
 
   def mock_symbols

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: emf2svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: relaton-cli
+  name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: roman-numerals
+  name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+- !ruby/object:Gem::Dependency
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter_cldr
+  name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,21 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mathml2asciimath
+  name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.6.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-utils
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: metanorma-iso
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -318,20 +346,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: metanorma-iso
-  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'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -432,6 +446,8 @@ 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