metanorma-m3d 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eea55d65f6aa596e1a3dc63aec7f0096a50d4992e8fba2837885e8dd08d1c572
-  data.tar.gz: 9cc10f954832573d6ccb424d5223319d5faf1f1e01e807b2125c46eebb6a75f7
+  metadata.gz: 5056c09788ea53275b308cfb538c05ce31ba4d4ee88bf7cb68d91744a7723c9e
+  data.tar.gz: 26ea48724ad868a6186c78c478e4900e0ece5e7aea44c214e966b8f81447983a
 SHA512:
-  metadata.gz: aa0dfeaf79115cec35344aec9cd3ce72e6391cf2ad83a1301e5186b5feb8766b76202bf2587190f5c7c65f08dee7ef9eaf089678f494870863c0349d6c704f0c
-  data.tar.gz: fb1ad009eb9102b5c8ea2f90000e43b3b7849396a64652da45728640b60face4baeae887a022cbefbccf1df17883211cf97b9ae891d1bcccfb0fb162c5578711
+  metadata.gz: d009e382ab635a00798a378fdee7ffa5e40e66304f5fe7017968d8d9b98049dffeebfbbf2143cdf15eba984d1e202206a442171ba416ee31ef1ae365ce87b05a
+  data.tar.gz: 064f51ec0de5e2b2d92a34fea258a61f9662269b576237483e8071942138e6f4bf28a848f66686ca131148a0bde15d8f9a1bc1f2eefcfdccf25ed581428320ce

data/lib/asciidoctor/m3d/converter.rb

@@ -15,21 +15,6 @@ module Asciidoctor
 
       register_for "m3d"
 
-      def metadata(node, xml)
-        title node, xml
-        metadata_source(node, xml)
-        metadata_id(node, xml)
-        metadata_date(node, xml)
-        metadata_author(node, xml)
-        metadata_publisher(node, xml)
-        xml.language node.attr("language")
-        xml.script (node.attr("script") || "Latn")
-        metadata_status(node, xml)
-        metadata_copyright(node, xml)
-        metadata_committee(node, xml)
-        metadata_ics(node, xml)
-      end
-
       def metadata_author(node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }
@@ -138,15 +123,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "m3d.rng"))
       end
 
-      def literal(node)
-        noko do |xml|
-          xml.figure **id_attr(node) do |f|
-            figure_title(node, f)
-            f.pre node.lines.join("\n")
-          end
-        end
-      end
-
       def sections_cleanup(x)
         super
         x.xpath("//*[@inline-header]").each do |h|
@@ -169,29 +145,6 @@ module Asciidoctor
       def pdf_converter(node)
         IsoDoc::M3d::PdfConvert.new(html_extract_attributes(node))
       end
-
-      def inline_quoted(node)
-        noko do |xml|
-          case node.type
-          when :emphasis then xml.em node.text
-          when :strong then xml.strong node.text
-          when :monospaced then xml.tt node.text
-          when :double then xml << "\"#{node.text}\""
-          when :single then xml << "'#{node.text}'"
-          when :superscript then xml.sup node.text
-          when :subscript then xml.sub node.text
-          when :asciimath then stem_parse(node.text, xml)
-          else
-            case node.role
-            when "strike" then xml.strike node.text
-            when "smallcap" then xml.smallcap node.text
-            when "keyword" then xml.keyword node.text
-            else
-              xml << node.text
-            end
-          end
-        end.join
-      end
     end
   end
 end

data/lib/asciidoctor/m3d/isodoc.rng

@@ -384,6 +384,7 @@
       <ref name="sourcecode"/>
       <ref name="example"/>
       <ref name="review"/>
+      <ref name="pre"/>
     </choice>
   </define>
   <define name="paragraph">
@@ -540,6 +541,20 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pre">
+    <element name="pre">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <ref name="tname"/>
+      </optional>
+      <text/>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="table">
     <element name="table">
       <attribute name="id">
@@ -710,6 +725,7 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -735,6 +751,7 @@
       <ref name="sub"/>
       <ref name="sup"/>
       <ref name="tt"/>
+      <ref name="keyword"/>
       <ref name="strike"/>
       <ref name="smallcap"/>
       <ref name="xref"/>
@@ -765,6 +782,11 @@
       <text/>
     </element>
   </define>
+  <define name="keyword">
+    <element name="keyword">
+      <text/>
+    </element>
+  </define>
   <define name="sub">
     <element name="sub">
       <text/>

data/lib/asciidoctor/m3d/m3d.rng

@@ -73,28 +73,6 @@
         </choice>
       </element>
     </define>
-    <!-- TextElement |= keyword -->
-    <define name="TextElement">
-      <choice>
-        <text/>
-        <ref name="em"/>
-        <ref name="eref"/>
-        <ref name="strong"/>
-        <ref name="stem"/>
-        <ref name="sub"/>
-        <ref name="sup"/>
-        <ref name="tt"/>
-        <ref name="strike"/>
-        <ref name="smallcap"/>
-        <ref name="xref"/>
-        <ref name="br"/>
-        <ref name="hyperlink"/>
-        <ref name="hr"/>
-        <ref name="pagebreak"/>
-        <ref name="bookmark"/>
-        <ref name="keyword"/>
-      </choice>
-    </define>
     <define name="BibItemType" combine="choice">
       <choice>
         <value>guidance</value>
@@ -127,16 +105,6 @@
       <text/>
     </element>
   </define>
-  <define name="pre">
-    <element name="pre">
-      <text/>
-    </element>
-  </define>
-  <define name="keyword">
-    <element name="keyword">
-      <text/>
-    </element>
-  </define>
   <define name="m3d-standard">
     <element name="m3d-standard">
       <ref name="bibdata"/>

data/lib/isodoc/m3d/m3dhtmlrender.rb

@@ -13,10 +13,6 @@ module IsoDoc
         end
       end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
       def term_defs_boilerplate(div, source, term, preface)
         if source.empty? && term.nil?
           div << @no_terms_boilerplate
@@ -30,18 +26,6 @@ module IsoDoc
         @annex_lbl = "Appendix"
       end
 
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "pre"
-          pre_parse(node, out)
-        when "keyword"
-          out.span node.text, **{ class: "keyword" }
-        else
-          super
-        end
-      end
-
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end

data/lib/isodoc/m3d/m3dpdfrender.rb

@@ -13,10 +13,6 @@ module IsoDoc
         end
       end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
       def term_defs_boilerplate(div, source, term, preface)
         if source.empty? && term.nil?
           div << @no_terms_boilerplate
@@ -30,18 +26,6 @@ module IsoDoc
         @annex_lbl = "Appendix"
       end
 
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "pre"
-          pre_parse(node, out)
-        when "keyword"
-          out.span node.text, **{ class: "keyword" }
-        else
-          super
-        end
-      end
-
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end

data/lib/isodoc/m3d/m3wordrender.rb

@@ -13,10 +13,6 @@ module IsoDoc
         end
       end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
       def term_defs_boilerplate(div, source, term, preface)
         if source.empty? && term.nil?
           div << @no_terms_boilerplate
@@ -30,18 +26,6 @@ module IsoDoc
         @annex_lbl = "Appendix"
       end
 
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "pre"
-          pre_parse(node, out)
-        when "keyword"
-          out.span node.text, **{ class: "keyword" }
-        else
-          super
-        end
-      end
-
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/metanorma-m3d.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
+  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 "metanorma", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -280,16 +280,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement