metanorma-rsd 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d283e879af320fbad1196dcbeb2e0ae38e43e8bfeda40e717ee706e299c70b6
-  data.tar.gz: 5e9262876f2f6cff2d7073328ff53963a15aa1f302968e3084af87d7a0d7ec9a
+  metadata.gz: 3c75985bbd80812519a605420d59f996f00bc7087b1faa601d19cd04ed79e920
+  data.tar.gz: b14bff4bfa91304dcb9a5310f309857e526b37b0ae4cd6486d1255bb1956f41d
 SHA512:
-  metadata.gz: d94b8321b4574dde4deab096345db7b665504ddaa3ed583331510f58f6e9a70067aa97e9ba4f3ca6b05315563cceb91ef5a4b57b20c43684394509761cec4625
-  data.tar.gz: 257bccd37f3322c2115bb4cef92e1e1e40c74b8255c18ae12ad07fd6cbcab84c734ea6c9cc734dee345153ef0190578ea23479ad213fb1c089c985d1d9961cea
+  metadata.gz: ce2e6bd40650ab5e001914fff7dbc63560003d917d696523dd11b8809a49423d857498435ae8598d95a4b9f136a75e5c3b6866fbdd5a6eefd5fe73da3f7cd7be
+  data.tar.gz: d75888935fa5b0004e4c132bda759c7b4be64aa7e6237db91fb155b4c832056f15ac5be8ec3a96160d215ea7bc55a4765de40891b40c05fe84d69f1c2902a622

data/lib/asciidoctor/rsd/converter.rb

@@ -150,15 +150,6 @@ module Asciidoctor
         File.join(File.dirname(__FILE__), File.join("html", file))
       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|
@@ -177,29 +168,6 @@ module Asciidoctor
       def word_converter(node)
         IsoDoc::Rsd::WordConvert.new(doc_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/rsd/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/rsd/rsd.rng

@@ -81,28 +81,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>policy-and-procedures</value>
@@ -191,16 +169,6 @@
       <text/>
     </element>
   </define>
-  <define name="pre">
-    <element name="pre">
-      <text/>
-    </element>
-  </define>
-  <define name="keyword">
-    <element name="keyword">
-      <text/>
-    </element>
-  </define>
   <define name="security">
     <element name="security">
       <text/>

data/lib/isodoc/rsd/html_convert.rb

@@ -78,10 +78,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
@@ -95,18 +91,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
@@ -129,7 +113,6 @@ module IsoDoc
         @meta.security isoxml, out
         super
       end
-
     end
   end
 end

data/lib/isodoc/rsd/pdf_convert.rb

@@ -76,10 +76,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
@@ -93,18 +89,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/rsd/word_convert.rb

@@ -63,10 +63,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
@@ -80,18 +76,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
@@ -109,7 +93,6 @@ module IsoDoc
         end
         docxml
       end
-
     end
   end
 end

data/lib/metanorma/rsd/version.rb

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

data/metanorma-rsd.gemspec

@@ -40,7 +40,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-rsd
 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
@@ -182,16 +182,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