metanorma-mpfd 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd9d19985eddcef1eabeedaa3dca1db61e1767d957c6a7dde74629348ec8c8d
-  data.tar.gz: b48a2d933e9de7f1e6596c28efd836c69229a883a46ce43bdc0f6a99bb199d42
+  metadata.gz: dfc1b89acbeb299bef9437ea614dd60ffb37dae39c15cfb97bfe6c6f10dd96d9
+  data.tar.gz: 613740b76c6fb47a0a2f0d3169211dddd067457f9ddbc4f88bd1a7482125a5bf
 SHA512:
-  metadata.gz: 15f8a9ef23becf0d761bada2e162c60d38b70d167f4e4c558b3592a228e73e592449845984b88fb28bbd2a4b09125370520d6a78568986585e5219b2514b7500
-  data.tar.gz: 8f1352d82db65f8d2d28a7adf2f2c3e7e1ec4bdc5e96e14773bebc57d71778b7e498ec9cd6db3710f30bf26b2de28fc23a8763a11e2ed3db72ef745c5601fdc2
+  metadata.gz: 753b6939a96a5f666b6540ffbce379d26d5200530dc2b3a4a81e8eda2df343c51a890dead4c455723392191a481a7f83e8a8fc2a39d5e3e9765e77da91b87ade
+  data.tar.gz: e72ba32a437526c8e047bddadde880a37a34a836d8b20cd2a7601e96232d3591ed3319633e1452775e788b6afaf4e98ad3c56f206b903e2ad2d4521b3c6c550b

data/lib/asciidoctor/mpfd/converter.rb

@@ -132,7 +132,7 @@ module Asciidoctor
       def validate(doc)
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "rsd.rng"))
+                        File.join(File.dirname(__FILE__), "mpfd.rng"))
       end
 
       def rsd_html_path(file)

data/lib/asciidoctor/mpfd/isostandard.rng

@@ -20,6 +20,9 @@
     <!-- add type to docidentifier in isodoc? -->
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <choice>
           <text/>
           <group>
@@ -66,6 +69,9 @@
           <ref name="BibItemType"/>
         </attribute>
       </optional>
+      <optional>
+        <ref name="fetched"/>
+      </optional>
       <choice>
         <oneOrMore>
           <ref name="btitle"/>
@@ -108,6 +114,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -164,6 +191,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -548,10 +596,17 @@
     </define>
     <define name="li">
       <element name="li">
-        <oneOrMore>
-          <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
-          <ref name="BasicBlock"/>
-        </oneOrMore>
+        <group>
+          <optional>
+            <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
+        </group>
         <!-- exclude figures? -->
       </element>
     </define>
@@ -681,6 +736,14 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="preface">
+      <element name="preface">
+        <ref name="foreword"/>
+        <optional>
+          <ref name="introduction"/>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -706,14 +769,6 @@
       <ref name="bibliography"/>
     </element>
   </define>
-  <define name="preface">
-    <element name="preface">
-      <ref name="foreword"/>
-      <optional>
-        <ref name="introduction"/>
-      </optional>
-    </element>
-  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>
@@ -736,13 +791,15 @@
   </define>
   <define name="editorialgroup">
     <element name="editorialgroup">
-      <ref name="technical-committee"/>
-      <optional>
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subcommittee"/>
-      </optional>
-      <optional>
+      </zeroOrMore>
+      <zeroOrMore>
         <ref name="workgroup"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="secretariat"/>
       </optional>
@@ -859,7 +916,7 @@
     </element>
   </define>
   <define name="allParts">
-    <element name="allParts">
+    <element name="allparts">
       <data type="boolean"/>
     </element>
   </define>
@@ -947,17 +1004,13 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
-        <oneOrMore>
+      <zeroOrMore>
+        <choice>
           <ref name="term-clause"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <choice>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-          </choice>
-        </zeroOrMore>
-      </choice>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
   <define name="reference-clause">

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

@@ -204,6 +204,13 @@ strong {
     }
 }
 
+@media screen {
+  img { 
+      width: 100%;   
+      height: auto;
+  }
+}
+    
 
 #toc ul {
     margin: 0;

data/lib/isodoc/mpfd/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
         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/mpfd/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;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
+        margin-bottom:12.0pt;
         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/mpfd/html_convert.rb

@@ -74,16 +74,12 @@ 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.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
@@ -96,11 +92,6 @@ module IsoDoc
         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
@@ -122,52 +113,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 i18n_init(lang, script)
         super
         y = if lang == "en"
@@ -178,6 +123,7 @@ module IsoDoc
             else
               YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
             end
+        @annex_lbl = "Appendix"
         @labels = @labels.merge(y)
         @clause_lbl = y["clause"]
       end

data/lib/isodoc/mpfd/pdf_convert.rb

@@ -72,16 +72,12 @@ 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.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
@@ -94,11 +90,6 @@ module IsoDoc
         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
@@ -120,52 +111,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 i18n_init(lang, script)
         super
         y = if lang == "en"
@@ -176,6 +121,7 @@ module IsoDoc
             else
               YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
             end
+        @annex_lbl = "Appendix"
         @labels = @labels.merge(y)
         @clause_lbl = y["clause"]
       end

data/lib/isodoc/mpfd/word_convert.rb

@@ -103,16 +103,12 @@ 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.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/mpfd/processor.rb

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

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.0.10"
+    VERSION = "0.1.0"
   end
 end

data/metanorma-mpfd.gemspec

@@ -42,5 +42,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-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 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
@@ -240,14 +240,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-mpfd lets you write MPF documents in AsciiDoc syntax.
 
@@ -274,8 +274,8 @@ files:
 - lib/asciidoctor/mpfd/converter.rb
 - lib/asciidoctor/mpfd/isodoc.rng
 - lib/asciidoctor/mpfd/isostandard.rng
+- lib/asciidoctor/mpfd/mpfd.rng
 - lib/asciidoctor/mpfd/pdf.js
-- lib/asciidoctor/mpfd/rsd.rng
 - lib/asciidoctor/mpfd/section.rb
 - lib/isodoc/mpfd/html/header.html
 - lib/isodoc/mpfd/html/html_rsd_intro.html