metanorma-rsd 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9934a2e81bcaa0b44cbb9fcefca5bc966bc951e3d9c5b91681e5ddd8bf4a660c
-  data.tar.gz: 3114106ea0ada7fa5536197227b84fd23acefda5122e6a8ab07c03d9f3c75f53
+  metadata.gz: 98b99e88b32c3e2d17a6afc7b45fd10faaac409883603438a8a31cde40eb5054
+  data.tar.gz: 2186f48f7fcc6108ba1bb0fc0c7f259e254b43c3e41eb90605a9c54fdddcf97e
 SHA512:
-  metadata.gz: 15e46c71c99be72bcc98be58ee5c84b593d35df3e9a178bc257fce8ebbc7221bf34d16eca3cdd017852d2cb120430ef22205a19b12b19d38e38bbd159f392c67
-  data.tar.gz: fb47f1d2194099deef65c936669984f17c013ce21361c0a0fba5d782f2e6ec554473fb24336ecd0c5c55118e30af74486bd90be16751791ed1d88c5ba6bdf5a7
+  metadata.gz: d096176eea24e61432d283604596f3dc4d38d7dc761d7041c9af23605a8588c1ef2cb4618e0c66e46eb9aff160e3848144bf3e84fc23d241d43aa65fb14438ff
+  data.tar.gz: 9033dcc1afc7be2924018b9a23013d331ebecc2730d6fd4adece1a1425982885f693d846641b40a01ab4e11f46a817b15a145b3ccd51a159a57c4d8c8b07310f

data/lib/asciidoctor/rsd/biblio.rng

@@ -414,6 +414,20 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="relaton_collection">
+    <element name="relaton-collection">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="btitle"/>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -531,7 +545,10 @@
   </define>
   <define name="fetched">
     <element name="fetched">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validity">
@@ -549,17 +566,26 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -744,6 +770,7 @@
     <element name="from">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>
@@ -752,6 +779,7 @@
     <element name="to">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>

data/lib/isodoc/rsd/html/htmlstyle.scss

@@ -207,6 +207,13 @@ table {
     }
 }
 
+@media screen {
+  img { 
+      width: 100%;   
+      height: auto;
+  }
+}
+    
 
 
 #toc ul {

data/lib/isodoc/rsd/html/rsd.scss

@@ -535,6 +535,8 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable tr
@@ -561,6 +563,8 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 td { page-break-inside:avoid; }
@@ -617,6 +621,15 @@ p.example, li.example, div.example, td.example, td.example p
         mso-pagination:none;
         font-size:10.0pt;
         font-family:$bodyfont;}
+
+table.example {
+        margin-bottom:12pt;
+}
+
+td.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

data/lib/isodoc/rsd/html/wordstyle.scss

@@ -82,9 +82,8 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         mso-style-qformat:yes;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
+        margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -98,9 +97,8 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         mso-style-type:export-only;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
+        margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -114,9 +112,8 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         mso-style-type:export-only;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
+        margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -130,9 +127,8 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         mso-style-type:export-only;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
-        /* do not put in margin-left, it is specific to list level */
         margin-bottom:12.0pt;
+        /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -280,19 +276,6 @@ a:visited, span.MsoHyperlinkFollowed
 	color:purple;
 	text-decoration:underline;
 	text-underline:single;}
-p
-	{mso-style-priority:99;
-	mso-margin-top-alt:auto;
-	margin-right:0cm;
-	mso-margin-bottom-alt:auto;
-	margin-left:0cm;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:$bodyfont;
-	mso-fareast-font-family:"MS Mincho";
-	mso-bidi-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
 p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
@@ -318,75 +301,6 @@ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
-p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	margin-left:36.0pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
-p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-type:export-only;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:36.0pt;
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
-p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-type:export-only;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:36.0pt;
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
-p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-type:export-only;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	margin-left:36.0pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
 span.blackgraphtxsidebar
 	{mso-style-name:blackgraphtxsidebar;
 	mso-style-unhide:no;
@@ -1172,6 +1086,8 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 br.section

data/lib/isodoc/rsd/html_convert.rb

@@ -71,16 +71,13 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+          t.br
+          t.b do |b|
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      end
-
       def pre_parse(node, out)
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
@@ -133,66 +130,6 @@ module IsoDoc
         super
       end
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
-        end
-      end
-
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      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
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @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
-
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
     end
   end
 end

data/lib/isodoc/rsd/pdf_convert.rb

@@ -69,14 +69,11 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+          t.br
+          t.b do |b|
+          name&.children&.each { |c2| parse(c2, b) }
+        end
         end
-      end
-
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
       end
 
       def pre_parse(node, out)
@@ -130,67 +127,6 @@ module IsoDoc
         @meta.security isoxml, out
         super
       end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
-        end
-      end
-
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      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
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @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
-
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
     end
   end
 end

data/lib/isodoc/rsd/word_convert.rb

@@ -94,16 +94,13 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+          t.br
+          t.b do |b|
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      end
-
       def pre_parse(node, out)
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end

data/lib/metanorma/rsd/processor.rb

@@ -22,8 +22,8 @@ module Metanorma
         "Metanorma::Rsd #{Metanorma::Rsd::VERSION}"
       end
 
-      def input_to_isodoc(file)
-        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      def input_to_isodoc(file, filename)
+        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
       def output(isodoc_node, outname, format, options={})

data/lib/metanorma/rsd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Rsd
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/metanorma-rsd.gemspec

@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.2.6"
+  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
 description: |
   metanorma-rsd lets you write RSD in AsciiDoc syntax.