metanorma-bipm 1.2.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370d29ed386f2e5c7540d82e0dfcbcafc17a702234c84ee83e6a137da5d87208
-  data.tar.gz: e3caae791429708ca02269e0a0c3a61ff79e2a44f71900454f173e4a0a6e0478
+  metadata.gz: d974105c9bfacaa99b3e88208ce15c2f6d88b5dc9b6bb8c68ed37278172ef2f0
+  data.tar.gz: ba1d26792f3c15da831fc94bf505ed1747e19a8f8390d912bdf112130493cd35
 SHA512:
-  metadata.gz: 2b36089016db9ee6494a4ccbe5acf9f01dbc4e7b20846e40f283304752bac759a810198a1756ec7c8bda70901f3f23615a7808f14c8a314450848c15e0a8ef4d
-  data.tar.gz: f57d70b623e8f5a4963d395f510457f423eca6ade6ff6d90993857b5913226ddb3b1a2230487d9707d570b516b5dbc35cba8897de331d3462cfcb4533bb9097e
+  metadata.gz: d5afec8786d1aa673c3a7a4a8015b3283fd9b82df7c3d1ea51c42709fce7c1cc72f3d2272f4b9a8d58717ad8860e76a3008df8c18fd31b5aa926d412ce8d4b90
+  data.tar.gz: da690ae876f6e53684077c41dc16cfd06dc50cbd5c68b88c9ce46cef50c53048db0a3ff37a111d8c485b6043f992a3129bf73c75b88ba1d5ec75df5fbb900510

data/lib/asciidoctor/bipm/converter.rb

@@ -240,7 +240,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::BIPM::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::BIPM::PdfConvert.new(pdf_extract_attributes(node))
       end
     end
   end

data/lib/asciidoctor/bipm/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/bipm/base_convert.rb

@@ -8,7 +8,8 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.value == "JCGM"
+        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
+                              "@acronym"))&.value == "JCGM"
         super
       end
 
@@ -45,7 +46,7 @@ module IsoDoc
           identifiers = render_identifier(ids)
           if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
           else
-            ref << identifiers[0] || identifiers[1]
+            ref << (identifiers[0] || identifiers[1])
             ref << " #{identifiers[1]}" if identifiers[0] && identifiers[1]
           end
           ref << " " unless biblio && !identifiers[1]
@@ -58,7 +59,7 @@ module IsoDoc
           identifiers = render_identifier(bibitem_ref_code(bibitem))
           if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
           else
-            ref << identifiers[0] || identifiers[1]
+            ref << (identifiers[0] || identifiers[1])
             ref << " #{identifiers[1]}" if identifiers[0] && identifiers[1]
           end
           date_note_process(bibitem, ref)
@@ -71,16 +72,6 @@ module IsoDoc
         @jcgm ? docxml : super
       end
 
-      def termref_cleanup(docxml)
-        docxml
-          .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
-                l10n(", #{@i18n.modified} [/TERMREF]"))
-          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
-          .gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source} "))
-          .gsub(%r{\s*\[/TERMREF\]\s*}, l10n("]"))
-          .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
-      end
-
       def error_parse(node, out)
         case node.name
         when "blacksquare" then blacksquare_parse(node, out)