isodoc 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 645650786b21ed611b894e1e0f2be09efbb300f62997e021d331168b32488699
-  data.tar.gz: 9dc2ae2007b764bf33f2d406c55a666533f411e057a22eb58bb9b90cb279fe09
+  metadata.gz: 1a9645f7c8069398010a6b360e94069382fec990f4d8c2563e2c35ccde801b45
+  data.tar.gz: 3209942625f1f64ba90e9de9dfd1780de61368d227830cbdc36e65046697eb06
 SHA512:
-  metadata.gz: f70dccf7ad11c7563a0ed9dad4d7c90b9ca104ca3c46ffbd290544cc31206a9dce2597acafd01a4a5f8ff84c433d430d06c27b96b5b961a76cbe22d204fbc629
-  data.tar.gz: e000fe9d824d2e8825d1656d52395120373a6e6d40386ca67802337174e3dfaa762d8a3573b21f3418efeaecc81cc9350e0f6ac84024e6b235a8aebb4324f3d5
+  metadata.gz: cdee63b9b9d3e2b0b4b4fa7b1dea74f5faa50c07d5ed3637744f5f52521821554513f3f4812bd57e5de9c0f6c61c4e73005be0d46127f39347f0f19e5912915c
+  data.tar.gz: 4d01286691c228c29100d79f78bb7f819a832fe05a730f56a8416422a1e59eb70c6a900242fb41fd631a63592600f3950e8dbe8079f1731754738a0aed8d6d4c

data/lib/isodoc/presentation_function/image.rb

@@ -65,15 +65,14 @@ module IsoDoc
       uri = svg_to_emf_uri(node)
       ret = svg_to_emf_filename(uri)
       File.exists?(ret) and return ret
-      exe = inkscape_installed? or return nil
+      exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
+                                         "to convert EMF to SVG. Aborting."
       uri = Metanorma::Utils::external_path uri
       exe = Metanorma::Utils::external_path exe
       system(%(#{exe} --export-type="emf" #{uri})) and
         return Metanorma::Utils::datauri(ret)
 
-      warn %(Fail on #{exe} --export-type="emf" #{uri})
-
-      nil
+      raise %(Fail on #{exe} --export-type="emf" #{uri})
     end
 
     def svg_to_emf_uri(node)

data/lib/isodoc/presentation_function/inline.rb

@@ -69,7 +69,8 @@ module IsoDoc
       c1 = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
       return unless c1.empty?
 
-      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+      link = anchor_linkend(node, docid_l10n(node["target"] ||
+                                             expand_citeas(node["citeas"])))
       link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
                               link, node)
       non_locality_elems(node).each(&:remove)
@@ -78,6 +79,11 @@ module IsoDoc
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
+    def expand_citeas(text)
+      text.nil? and return text
+      HTMLEntities.new.decode(text.gsub(/&amp;#x/, "&#"))
+    end
+
     def eref_localities(refs, target, node)
       ret = ""
       refs.each_with_index do |r, i|

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.4".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -925,87 +925,23 @@ RSpec.describe IsoDoc do
         .to receive(:inkscape_installed?)
 
       input = <<~INPUT
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <figure id="figureA-1">
-          <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
-          <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
-          <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
-        </figure>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-      presxml = <<~OUTPUT
-              <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface>
-            <foreword displayorder='1'>
-              <figure id='figureA-1'>
-                <name>Figure 1</name>
-                <image src='spec/assets/odf.svg' mimetype='image/svg+xml'>
-                  <emf src='spec/assets/odf.emf'/>
-                </image>
-                <image src='spec/assets/odf1.svg' mimetype='image/svg+xml'/>
-                <image src='' id='_d3731866-1a07-435a-a6c2-1acd41023a4e' mimetype='image/svg+xml' height='auto' width='auto'>
-                  <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>
-                </image>
+            <foreword>
+              <figure id="figureA-1">
+                <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
+                <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
+                <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
               </figure>
             </foreword>
           </preface>
         </iso-standard>
-      OUTPUT
-      output = <<~OUTPUT
-         <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-        <head>
-        <style>
-                </style>
-          </head>
-          <body lang='EN-US' link='blue' vlink='#954F72'>
-            <div class='WordSection1'>
-              <p>&#160;</p>
-            </div>
-            <p>
-              <br clear='all' class='section'/>
-            </p>
-            <div class='WordSection2'>
-              <p>
-                <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-              </p>
-              <div>
-                <h1 class='ForewordTitle'>Foreword</h1>
-                <div id='figureA-1' class='figure'>
-                  <img src='spec/assets/odf.emf'/>
-                  <img src='spec/assets/odf1.svg'/>
-                  <img src='' height='auto' width='auto'/>
-                  <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
-                </div>
-              </div>
-              <p>&#160;</p>
-            </div>
-            <p>
-              <br clear='all' class='section'/>
-            </p>
-            <div class='WordSection3'>
-              <p class='zzSTDTitle1'/>
-            </div>
-          </body>
-        </html>
-      OUTPUT
-      expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-       .convert("test", input, true)
-       .gsub(/&lt;/, "&#x3c;")
-        .gsub(%r{data:application/x-msmetafile[^"']+},
-              "data:application/x-msmetafile")))
-        .to be_equivalent_to xmlpp(presxml
-        .gsub(%r{data:application/x-msmetafile[^"']+},
-              "data:application/x-msmetafile"))
-      expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-        .convert("test", presxml, true)
-        .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'")
-        .gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref"))))
-        .to be_equivalent_to xmlpp(output)
+      INPUT
+      expect do
+        IsoDoc::PresentationXMLConvert.new({})
+          .convert("test", input, true)
+      end.to raise_error("Inkscape missing in PATH, unable" \
+                         "to convert EMF to SVG. Aborting.")
     end
   end
 

data/spec/isodoc/inline_spec.rb

@@ -1782,4 +1782,41 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
+
+  it "processes formatting in eref/@citeas" do
+    input = <<~INPUT
+      <itu-standard xmlns="https://www.calconnect.org/standards/itu">
+               <preface>
+           <foreword id='_' obligation='informative'>
+             <title>Foreword</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso124' citeas='[&amp;#x3c;strong&amp;#x3e;A&amp;#x3c;/strong&amp;#x3e;.&amp;#x3c;fn reference=&amp;#x22;1&amp;#x22;&amp;#x3e;&amp;#xa;  &amp;#x3c;p&amp;#x3e;hello&amp;#x3c;/p&amp;#x3e;&amp;#xa;&amp;#x3c;/fn&amp;#x3e;]'/>
+             </p>
+           </foreword>
+         </preface>
+      </itu-standard>
+    INPUT
+    output = <<~OUTPUT
+      <itu-standard xmlns='https://www.calconnect.org/standards/itu' type='presentation'>
+         <preface>
+           <foreword id='_' obligation='informative' displayorder='1'>
+             <title>Foreword</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso124' citeas='[&amp;#x3c;strong&amp;#x3e;A&amp;#x3c;/strong&amp;#x3e;.&amp;#x3c;fn reference=&amp;#x22;1&amp;#x22;&amp;#x3e;&amp;#xa;  &amp;#x3c;p&amp;#x3e;hello&amp;#x3c;/p&amp;#x3e;&amp;#xa;&amp;#x3c;/fn&amp;#x3e;]'>
+                 [
+                 <strong>A</strong>
+                 .
+                 <fn reference='1'>
+                   <p>hello</p>
+                 </fn>
+                 ]
+               </eref>
+             </p>
+           </foreword>
+         </preface>
+       </itu-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath