rspec

metanorma · Oct 23, 2023 · 4059605 · 4059605
1 parent ef91836
commit 4059605
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 161 deletions.
diff --git a/lib/metanorma/jis/converter.rb b/lib/metanorma/jis/converter.rb
@@ -1,8 +1,8 @@
 require "asciidoctor"
 require "metanorma-iso"
-require_relative "./front"
-require_relative "./validate"
-require_relative "./cleanup"
+require_relative "front"
+require_relative "validate"
+require_relative "cleanup"
 
 module Metanorma
   module JIS
@@ -74,7 +74,9 @@ def presentation_xml_converter(node)
         if node.nil?
           IsoDoc::JIS::PresentationXMLConvert.new({})
         else
-          IsoDoc::JIS::PresentationXMLConvert.new(doc_extract_attributes(node))
+          IsoDoc::JIS::PresentationXMLConvert
+            .new(doc_extract_attributes(node)
+            .merge(output_formats: ::Metanorma::JIS::Processor.new.output_formats))
         end
       end
     end

diff --git a/lib/metanorma/jis/isodoc.rng b/lib/metanorma/jis/isodoc.rng
@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.5 -->
+<!-- VERSION v1.2.6 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1013,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>

diff --git a/lib/metanorma/jis/processor.rb b/lib/metanorma/jis/processor.rb
@@ -35,6 +35,7 @@ def version
       end
 
       def output(xml, inname, outname, format, options = {})
+        options_preprocess(options)
         case format
         when :html
           IsoDoc::JIS::HtmlConvert.new(options).convert(inname, xml, nil, outname)

diff --git a/spec/isodoc/blocks_spec.rb b/spec/isodoc/blocks_spec.rb
@@ -223,7 +223,6 @@
                <div id="figure-C" class="figure">
                  <pre>A &lt;
          B</pre>
-                 <p class="FigureTitle" style="text-align:center;"/>
                </div>
              </div>
                   <br/>

diff --git a/spec/vcr_cassettes/isobib_123_dated.yml b/spec/vcr_cassettes/isobib_123_dated.yml
diff --git a/spec/vcr_cassettes/isobib_123_mix_dated.yml b/spec/vcr_cassettes/isobib_123_mix_dated.yml
diff --git a/spec/vcr_cassettes/isobib_123_undated.yml b/spec/vcr_cassettes/isobib_123_undated.yml