metanorma-m3aawg 1.8.0 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41c17183f17b9cbfa6b9582d6df922d9aee4d0a1d7a857e59af86202d114559c
-  data.tar.gz: bf8edc681c9a4fcec8c202b1e2e9faec5324344ff195796a2680af9dc653e95f
+  metadata.gz: 98cf9edfce9695583f5c2efdc8d2931b1260877d0fa167dd00d889632cd769e0
+  data.tar.gz: a6b2395106f9837e137bdb9e24183c45534420858709af82bf1577a1ee5446dd
 SHA512:
-  metadata.gz: 8fac863d42a8e69875a0d6f27b174224a0e2bed16a28f0f34992a58536a4057abd570edf1c416dafa6ae8495c620047e84894b24ded8c3a7e2c51719e0adf228
-  data.tar.gz: e011f6c8a2d17a7576812891163ade0261794d831af62dfb15056c6f7b07365c0d43cce9d1592c1c5a99db78627516eeb794a9d4d2d3c5ae1c999dc0f83a51ef
+  metadata.gz: ad3dcafd0323b38225068e9c7f0047431e8ac30e2a11cfd9d0ce9aaca3db7b7d9a1323d6c310b460cb7a6784f013fc2ad3b5549ec0f217b664e06994215ba76f
+  data.tar.gz: ad5298efc2c57cb4f0040c7524a3ba3af0bf9f7457c46093f39ef56ab351b4b65b2b09965c8e5bb8777d7e89c40904473a0a1b726cde0f7c4a6ce8f1c6439e26

data/lib/asciidoctor/m3aawg/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor/standoc/converter"
-require 'asciidoctor/generic/converter'
+require "asciidoctor/generic/converter"
 
 module Asciidoctor
   module M3AAWG
@@ -11,19 +11,20 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("technical-committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("technical-committee"),
-            **attr_code(type: node.attr("technical-committee-type"))
+                      **attr_code(type: node.attr("technical-committee-type"))
           i = 2
-          while node.attr("technical-committee_#{i}") do
+          while node.attr("technical-committee_#{i}")
             a.committee node.attr("technical-committee_#{i}"),
-              **attr_code(type: node.attr("technical-committee-type_#{i}"))
+                        **attr_code(type: node.attr("technical-committee-type_#{i}"))
             i += 1
           end
         end
       end
 
-       def configuration
+      def configuration
         Metanorma::M3AAWG.configuration
       end
 
@@ -33,11 +34,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 sections_cleanup(xml)
@@ -62,7 +66,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::M3AAWG::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::M3AAWG::PdfConvert.new(pdf_extract_attributes(node))
       end
     end
   end

data/lib/asciidoctor/m3aawg/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>
@@ -1946,7 +1977,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1987,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2014,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2050,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2063,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 +2084,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,9 +2097,17 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
-        <ref name="paragraph"/>
+        <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>
         <ref name="termsource"/>
@@ -2071,7 +2115,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>
@@ -2163,6 +2207,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>

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

@@ -597,10 +597,12 @@ h3 {
     color: #cfcfcf;
     content: "\f0c1"; } }
 
-.TermNum, .Terms, .AltTerms {
-  color: black;
+.TermNum {
   font-weight: 400; }
 
+.TermNum, .Terms, .AltTerms {
+  color: black; }
+
 p.TermNum {
   font-size: 0.9em;
   line-height: 1em;

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

@@ -256,9 +256,12 @@ p.document-stage {
   }
 }
 
+  .TermNum {
+    font-weight: 400;
+  }
+
   .TermNum, .Terms, .AltTerms {
     color: black;
-    font-weight: 400;
   }
 
   p.TermNum {

data/lib/isodoc/m3aawg/html/m3d.css

@@ -312,7 +312,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/m3aawg/html/m3d.scss

@@ -299,7 +299,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/m3aawg/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>