metanorma-mpfa 0.7.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8ca5a7caeb351d633b4634fc1ccf1c753306f4f585c94a21a3db4ef2c6415a
-  data.tar.gz: 8287264ff711cc29b80bbc5874e7aa8f8bd71d68f06f933583e04a626273970c
+  metadata.gz: 7c09cb7532953cf42fbe4269d2445b66d07e8fcb526b7bc6823f55c2e89c6309
+  data.tar.gz: 738bc439f45030ad22384275ded6236b11e34af84eceb929e2db46da19f79f27
 SHA512:
-  metadata.gz: 101768b7548de4be22fb87eee873ddc0d203e09c185f62611565194115014af18334a40187e34fc41b33bd2975245b497d6b5f2984f9acb2dbb376203a8d74cb
-  data.tar.gz: 8f8d89828603c1f8ad7c5b5131cb18461e2a36ad9bad1f6d2bc815fd379cf3ee934afdec28906070f7bd575ab4d3e6237da9354fc6a62d5dd166e134d4257a94
+  metadata.gz: 3b817b4da954ecea69d29fafe4589c0921f575fe271165d95157ec1bc8d30017ae6ab1699920a07395f2139a72a4399eacc180e7c02f3efc78a019bdeb91a96d
+  data.tar.gz: 569c0ecf30e868952d70d295c3cb1c571bf594881d9d6320bc5c5e84eb358e31d39da75b2840cf5478096bd9c53a309c4c0d6cb77bc7eed3bb48a38939b034db

data/lib/asciidoctor/mpfa/converter.rb

@@ -9,7 +9,6 @@ require_relative "./validate"
 
 module Asciidoctor
   module MPFA
-
     # A {Converter} implementation that generates MPFD output, and a document
     # schema encapsulation of the document for validation
     #
@@ -25,13 +24,14 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("committee"),
-            **attr_code(type: node.attr("committee-type"))
+                      **attr_code(type: node.attr("committee-type"))
           i = 2
-          while node.attr("committee_#{i}") do
+          while node.attr("committee_#{i}")
             a.committee node.attr("committee_#{i}"),
-              **attr_code(type: node.attr("committee-type_#{i}"))
+                        **attr_code(type: node.attr("committee-type_#{i}"))
             i += 1
           end
         end
@@ -42,7 +42,7 @@ module Asciidoctor
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
-      def title_validate(root)
+      def title_validate(_root)
         nil
       end
 
@@ -52,11 +52,14 @@ module Asciidoctor
       end
 
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml", nil,
+                                     false, "#{@filename}.html")
+        doc_converter(node).convert("#{@filename}.presentation.xml", nil,
+                                    false, "#{@filename}.doc")
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml", nil,
+                                     false, "#{@filename}.pdf")
       end
 
       def validate(doc)
@@ -65,8 +68,8 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "mpfd.rng"))
       end
 
-      def style(n, t)
-        return
+      def style(_n, _t)
+        nil
       end
 
       def presentation_xml_converter(node)
@@ -83,7 +86,8 @@ module Asciidoctor
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
-        IsoDoc::MPFA::PdfConvert.new(doc_extract_attributes(node))
+
+        IsoDoc::MPFA::PdfConvert.new(pdf_extract_attributes(node))
       end
     end
   end

data/lib/asciidoctor/mpfa/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1942,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2067,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2088,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2101,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

data/lib/isodoc/mpfa/html/htmlstyle.css

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -566,13 +575,13 @@ p.document-stage {
 /*
     3.1 Titles
 */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #301907;
   font-weight: 300;
   margin-top: 2em; }
 
-h1 {
+h1, .h1 {
   color: #301907;
   font-size: 1.6em;
   /* margin-top: 5em; */
@@ -582,7 +591,7 @@ h1 {
   border-bottom: solid 5px #FD8924;
   font-weight: 800; }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 0em;
   margin-left: -2em; }
 
@@ -600,18 +609,20 @@ h2.containerhdr {
   font-style: italic;
   padding: 45px 15px 15px 50px; }
 
-h2 {
+h2, .h2 {
   font-size: 1.5em;
   font-weight: 400; }
 
-h3 {
+h3, .h3 {
   font-size: 1.1em;
   font-weight: 100; }
 
-.TermNum, .Terms, .AltTerms {
-  color: #301907;
+.TermNum {
   font-weight: 100; }
 
+.TermNum, .Terms, .AltTerms {
+  color: #301907; }
+
 h2.TermNum {
   font-size: 0.9em;
   line-height: 1em;
@@ -873,7 +884,7 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -1048,7 +1059,7 @@ h2 p {
     filter: invert(100%); }
   .coverpage-title {
     border-left: 0.5em solid #888; }
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note, .figure, pre, .pseudocode, table {
@@ -1066,15 +1077,15 @@ h2 p {
     margin-top: -5px; }
   .container {
     padding-left: 0; }
-  h1.content {
+  h1.content, .h1.content {
     margin-top: 2em;
     line-height: 2.5em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;
@@ -1114,10 +1125,10 @@ h2 p {
     padding-left: 0; }
   main {
     margin-left: 1em; }
-  h1 {
+  h1, .h1 {
     margin-left: 0;
     padding-left: 0; }
-  h1#content {
+  h1#content, #content.h1 {
     margin-left: 1em; } }
 
 /* Tablet Styles */
@@ -1139,10 +1150,10 @@ h2 p {
     padding-left: 0; }
   main {
     margin-left: 2em; }
-  h1 {
+  h1, .h1 {
     margin-left: 0em;
     padding-left: 0; }
-  h1#content {
+  h1#content, #content.h1 {
     margin-left: 1em; } }
 
 @media screen and (max-width: 768px) {
@@ -1152,9 +1163,9 @@ h2 p {
     display: none; } }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-  .main-section h1 {
+  .main-section h1, .main-section .h1 {
     margin-left: 14px; }
-  .main-section h2, h3, h4, ol, ul, p, .ms-table-wrap {
+  .main-section h2, .main-section .h2, h3, h4, .h3, .h4, ol, ul, p, .ms-table-wrap {
     margin-left: 75px; }
   .main-section li p {
     margin-left: 5px; }

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

@@ -228,14 +228,14 @@ p.document-stage {
     3.1 Titles
 */
 
-h1,h2,h3,h4,h5,h6 {
+h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6 {
   font-family: $headerfont;
   color: #301907;
   font-weight: 300;
   margin-top: 2em;
 }
 
-h1 {
+h1,.h1 {
   color: #301907;
   font-size: 1.6em;
   /* margin-top: 5em; */
@@ -246,7 +246,7 @@ h1 {
   font-weight: 800;
 }
 
-h1#content {
+h1#content,.h1#content {
   margin-top: 0em;
   margin-left: -2em;
 }
@@ -267,19 +267,22 @@ h2.containerhdr {
   padding: 45px 15px 15px 50px;
 }
 
-h2 {
+h2,.h2 {
   font-size: 1.5em;
   font-weight: 400;
 }
 
-h3 {
+h3,.h3 {
   font-size: 1.1em;
   font-weight: 100;
 }
 
+.TermNum {
+  font-weight: 100;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: #301907;
-  font-weight: 100;
 }
 
 h2.TermNum {
@@ -531,7 +534,7 @@ p {
   margin-bottom: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -752,7 +755,7 @@ padding: 0 2em 0 5em; }
     border-left: 0.5em solid #888;
   }
 
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -784,21 +787,21 @@ padding: 0 2em 0 5em; }
     padding-left: 0;
   }
 
-  h1.content {
+  h1.content, .h1.content {
     margin-top: 2em;
     line-height: 2.5em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 
@@ -867,12 +870,12 @@ padding: 0 2em 0 5em; }
     margin-left: 1em;
   }
 
-  h1 {
+  h1, .h1 {
     margin-left: 0;
     padding-left: 0;
   }
 
-  h1#content {
+  h1#content, .h1#content {
     margin-left: 1em;
   }
 }
@@ -910,12 +913,12 @@ padding: 0 2em 0 5em; }
     margin-left: 2em;
   }
 
-  h1 {
+  h1, .h1 {
     margin-left: 0em;
     padding-left: 0;
   }
 
-  h1#content {
+  h1#content, .h1#content {
     margin-left: 1em;
   }
 }
@@ -933,8 +936,8 @@ padding: 0 2em 0 5em; }
 }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-  .main-section h1 {margin-left:14px;}
-  .main-section h2, h3, h4, ol, ul, p, .ms-table-wrap {margin-left:75px;}
+  .main-section h1, .main-section .h1 {margin-left:14px;}
+  .main-section h2, .main-section .h2, h3, h4, .h3, .h4, ol, ul, p, .ms-table-wrap {margin-left:75px;}
   .main-section li p {margin-left:5px;}
   .main-section li {margin-left:25px;}
 }

data/lib/isodoc/mpfa/html/rsd.css

@@ -309,7 +309,6 @@ p.Terms, li.Terms, div.Terms {
   mso-fareast-font-family: {{headerfont}};
   mso-bidi-font-family: {{headerfont}};
   mso-ansi-language: EN-GB;
-  font-weight: bold;
   mso-bidi-font-weight: normal; }
 
 p.AltTerms, li.AltTerms, div.AltTerms {

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

@@ -296,7 +296,6 @@ p.Terms, li.Terms, div.Terms
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
         {mso-style-name:"AltTerm\(s\)";

data/lib/isodoc/mpfa/html/scripts.html

@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
     else {
         $('nav').show();
         $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
     }
 });
 </script>