metanorma-m3d 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888a159b277de928e7919cded97ed96c137be8113996d54860a850b04d918dfa
-  data.tar.gz: c10657db54eb7eec78cb5cd17bf56ea88e591225ccd2dc05b75825ecf5175a80
+  metadata.gz: 8e547037e67b0e0e801e60628c592161fbb2f8f3475e9430dc4b804ceaed0bea
+  data.tar.gz: 7a821dff76506187b273df899d7fe4e84a4b7299d67f13591bf8ce00cbc763ba
 SHA512:
-  metadata.gz: 8180e4a569b1496ca29317345f8d1ea049dc1b1dcbd080a64983cf0431e168a845519c07c49496e12dea37b31fa689c8ed023a83c5e18b827ded0387b0a4b344
-  data.tar.gz: d33af34e65346c67ea7e38c376bb089c1f662e3c616f973ea250687b80c1b81be37f46c3b203618cb57cf88a9b68e79f689cd619f5d3f626739deb83d1a35016
+  metadata.gz: 87c1537944eb92c2d3d3599ecb63e635150357ce07a900ac25661b750054f192a7efd07d12dd3437d557bc43654952e87fef319c9e50a08e57a2a20cd0f7145c
+  data.tar.gz: 759fe729cd05b687c2bd2b3c700ed8a080e756a244827e1cec25bc093c5ce5e94ff376f80f8170ba7b1dd6e58154e94bbe43b105ad8eaf62b4cf65975c96a3fd

data/README.adoc

@@ -144,9 +144,6 @@ report:: report
 
 `:language:` :: The language of the document (only `en` for now)  (mandatory)
 
-`:url:` :: The URL that the HTML version of the document will be published to
-(optional)
-
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.
 

data/lib/asciidoctor/m3d/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/asciidoctor/m3d/converter.rb

@@ -29,11 +29,6 @@ module Asciidoctor
         metadata_ics(node, xml)
       end
 
-      def metadata_source(node, xml)
-        return unless node.attr("url")
-        xml.source node.attr("url")
-      end
-
       def metadata_author(node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }

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

@@ -220,6 +220,14 @@ table {
     }
 }
   
+@media screen {
+  img {
+      width: 100%;
+      height: auto;
+  }
+}
+
+
 
 #toc ul {
     margin: 0;

data/lib/isodoc/m3d/html/m3d.scss

@@ -478,6 +478,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
@@ -504,6 +506,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; }
@@ -645,6 +649,15 @@ p.example, li.example, div.example, td.example
 	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/m3d/html/wordstyle.scss

@@ -81,9 +81,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:11.0pt;
@@ -97,9 +96,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:11.0pt;
@@ -113,9 +111,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:11.0pt;
@@ -129,9 +126,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:11.0pt;
@@ -204,19 +200,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;
@@ -1078,6 +1061,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/m3d/m3dhtmlconvert.rb

@@ -85,66 +85,6 @@ module IsoDoc
         docxml
       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
-
       def info(isoxml, out)
         @meta.url isoxml, out
         super

data/lib/isodoc/m3d/m3dhtmlrender.rb

@@ -3,19 +3,16 @@ module IsoDoc
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
     class HtmlConvert < IsoDoc::HtmlConvert
-            def annex_name(annex, name, div)
+      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/isodoc/m3d/m3dpdfconvert.rb

@@ -85,66 +85,6 @@ module IsoDoc
         docxml
       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
-
       def info(isoxml, out)
         @meta.url isoxml, out
         super

data/lib/isodoc/m3d/m3dpdfrender.rb

@@ -6,16 +6,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/isodoc/m3d/m3wordrender.rb

@@ -3,19 +3,16 @@ module IsoDoc
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
     class WordConvert < IsoDoc::WordConvert
-            def annex_name(annex, name, div)
+      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/m3d/processor.rb

@@ -22,8 +22,8 @@ module Metanorma
         "Metanorma::M3d #{Metanorma::M3d::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/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/metanorma-m3d.gemspec

@@ -51,5 +51,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.5"
+  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 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
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
 description: |
   metanorma-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc syntax.