metanorma-bipm 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f258a2387575d227d79ffe3950fa8768f29cd319eaf4e929197a635304ef247
-  data.tar.gz: e4f8f7a88bdec337362131fd8535a96f904dba6b703fcc8d9604fca5026563e9
+  metadata.gz: df8f742d2d6c42afa7521168765ce2ab2be0bc9d3a4a942fb184bae97aefeb75
+  data.tar.gz: fbb7b975f0f7b114fb3228ea824f9dd689f76dfb22310f2d450ad82c1bd7da53
 SHA512:
-  metadata.gz: 2f3819a2b709b1befe0df2ed04f53647b12cee97be3494b8477e3326f5ec531f2558274e1fae49b5be4071117e0e34cef0ff47a4dacadee28ec46be064cb61b2
-  data.tar.gz: '031558adb23c13e72bf4995e78a7979c26b0438f897ae85f4181dfa03870d2062701df86f80ab3e894f5816aaabbc9c7e3ad5b3865f4febc265821c02dd08244'
+  metadata.gz: 886074989dcf59abbfb155eec67d66e44439bd556600666f8385e86c58222c7884d2418bf0c9b87e19f982c9473bc86de9943f388d8820dbab84ebac3db8b93b
+  data.tar.gz: 322113649ffa804792b6872e6e99004d27d2c128c12cfb4f71cd1c72a7e71dc2c7ce96b8ffb9e036f045f8475e833657770d74496ad96027862d234861ad534e

data/lib/asciidoctor/bipm/bipm.rng

@@ -307,7 +307,7 @@
           <value>CCT</value>
           <value>CCTF</value>
           <value>CCU</value>
-          <value>CCL-CCTF</value>
+          <value>CCL-CCTF-WGFS</value>
           <value>JCGM</value>
           <value>JCRB</value>
           <value>JCTLM</value>

data/lib/asciidoctor/bipm/isodoc.rng

@@ -990,6 +990,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="linkmention">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="linkref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -1700,7 +1710,9 @@
       <zeroOrMore>
         <ref name="termgrammar"/>
       </zeroOrMore>
-      <ref name="definition"/>
+      <oneOrMore>
+        <ref name="termdefinition"/>
+      </oneOrMore>
       <zeroOrMore>
         <ref name="termnote"/>
       </zeroOrMore>
@@ -1763,7 +1775,7 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="definition">
+  <define name="termdefinition">
     <element name="definition">
       <oneOrMore>
         <choice>
@@ -1772,6 +1784,9 @@
           <ref name="formula"/>
         </choice>
       </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="termnote">

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -8936,6 +8936,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -8936,6 +8936,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl

@@ -8936,6 +8936,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/bipm/bipm.rapport.xsl

@@ -8936,6 +8936,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -549,9 +549,15 @@ ul li:before {
 ul li p {
   display: inline; }
 
-ul li:first-child {
+ul > li:first-child {
   margin-top: 1em; }
 
+ul ul > li:first-child {
+  margin-top: 0; }
+
+ol ul > li:first-child {
+  margin-top: 0; }
+
 #toc-list ul {
   margin-bottom: 0.25em; }
 

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

@@ -239,10 +239,17 @@ ul li p {
   display: inline;
 }
 
-ul li:first-child {
+ul > li:first-child {
   margin-top: 1em;
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 #toc-list ul {
   margin-bottom: 0.25em;
 }

data/lib/isodoc/bipm/jcgm.standard.xsl

@@ -6491,6 +6491,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -65,6 +65,7 @@ module IsoDoc
       def clause1(elem)
         return if elem["unnumbered"] == "true"
         return if elem.at(("./ancestor::*[@unnumbered = 'true']"))
+
         super
       end
 
@@ -111,7 +112,7 @@ module IsoDoc
         i = 3
         while list_draft(xml, i) != ["", ""]
           ret += "<tr>#{list_draft(xml, i).map { |x| "<td>#{x}</td>" }.join} "\
-            "<td/></tr>"
+                 "<td/></tr>"
           i += 1
         end
         ret
@@ -135,7 +136,7 @@ module IsoDoc
 
       COCHAIR = "xmlns:role[contains(text(),'co-chair')]".freeze
       CHAIR = "[xmlns:role[contains(text(),'chair')]"\
-        "[not(contains(text(),'co-chair'))]]".freeze
+              "[not(contains(text(),'co-chair'))]]".freeze
 
       def list_cochairs(xml)
         ret = list_people(xml, "//bibdata/contributor[#{COCHAIR}]/person")
@@ -172,6 +173,7 @@ module IsoDoc
       end
 
       def mathml1(elem, locale)
+        asciimath_dup(elem)
         localize_maths(elem, locale)
       end
 

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.1.8".freeze
+    VERSION = "1.1.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic