metanorma-csa 1.9.1 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2398ecbb838d1f8f1722882f4abb7457c8d12cfda2b680d74e688995e92c19f3
-  data.tar.gz: 2c28d8bb4e4f357955cf257ecc05c2ee9d606c6e891a3108fbc7d6221c462382
+  metadata.gz: 37d3298cbb694f395c6d67468590131ee9d24a46fd1f77c5469a9eb066e8cbd4
+  data.tar.gz: 2fb5f6aa1b8154b25be5fe200686cae552c75992640885be121267ee2de27b19
 SHA512:
-  metadata.gz: 6b2a266e0b8a95b547ede1f5a9ad12b429057a104caf84327999b6133c04d8042020cce97fc4214695b9a50cab3903f47af8a73e6b7524a9ab000acc69aec944
-  data.tar.gz: 23fe36463fbe7d12215359a15de93253701d0b026a50bf4b00d1b1559e2df6ba8be496d8cddc59229e4d670e60fccc2f92f71805f80e5f2a5f4312100a661b92
+  metadata.gz: 82a604704af383a648fa2deb3cb99e0144fd793b84e91810a4c4742eeb58f6f00511b2c30144dbae2f8165f7160f2140a78db292a625751b8267aaa2a616e8b5
+  data.tar.gz: e651db08a2b49fad657d925df1dd4775fedc4b5f5af1383f714939453a9dd10d504db668221f652c5b9d8c75a38b13ccbb47199b4be6617a42f4591a2ec90bfb

data/lib/asciidoctor/csa/converter.rb

@@ -91,7 +91,7 @@ module Asciidoctor
       def pdf_converter(node)
         return if node.attr("no-pdf")
 
-        IsoDoc::Csa::PdfConvert.new(html_extract_attributes(node))
+        IsoDoc::Csa::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)

data/lib/asciidoctor/csa/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"/>