metanorma-bipm 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e92f453fd51171c023324636e3d16215d4d2af372c2975da080d9b7f81f5ded
-  data.tar.gz: 7066c446be4aa7b01e18c685b7c86b0e6bfd8883fc702e984d8a9fb0448df04f
+  metadata.gz: a53880abd1573a497cf5de514c78f002e9ad698fb7f9899babde3840132af5ee
+  data.tar.gz: 47c1fbccab81b1614f8692c7605d77c25d16d7324a5113b2d615b560f3e2a136
 SHA512:
-  metadata.gz: 7c11d1f4e93dde04a7f46498906bd8143a8bc7a3fb917e86706436894cc2989a7b4ac373c29ae29061f4e0d5967216c45b1e4724cac84ba664eb1fd4ec052cbb
-  data.tar.gz: 28999ac1b868021ed0fe9aa63ba01f3dee7d66a3e111586624f5576f72962c06ea993be25cd52cd9d64ffa3fdbe035b6daf196fdc2e08b05ddce506ad9a31f43
+  metadata.gz: 525c38fd4e67b10703a2811fd0f5b45958bd00eff0675b23ccc427d7a03d4755c059ace2209dd60c78823666cbf8af6cbf6015d16029dc6f68a088634fbac470
+  data.tar.gz: 9598204d734b04605900681eaf3da059e8f2a70002858156e9bfb23694e91b4114786d22824cf182696b3b53366bf92f7df97edefae21035c30d31427246fa72

data/lib/asciidoctor/bipm/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor/standoc/converter"
-require 'asciidoctor/generic/converter'
+require "asciidoctor/generic/converter"
 
 module Asciidoctor
   module BIPM
@@ -19,20 +19,26 @@ module Asciidoctor
       end
 
       def org_abbrev
-          { org_name_long => configuration.organization_name_short }
+        { org_name_long => configuration.organization_name_short }
       end
 
       def metadata_committee(node, xml)
         return unless node.attr("committee-en") || node.attr("committee-fr")
+
         xml.editorialgroup do |a|
           metadata_committee1(node, a)
-          metadata_committee2(node, a)
+          i = 2
+          while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")
+            metadata_committee2(node, a, i)
+            i += 1
+          end
           metadata_workgroup(node, a)
         end
       end
 
-      def metadata_committee1(node, a)
-        a.committee **attr_code(acronym: node.attr("committee-acronym")) do |c|
+      def metadata_committee1(node, xml)
+        xml.committee **attr_code(acronym:
+                                  node.attr("committee-acronym")) do |c|
           e = node.attr("committee-en") and
             c.variant e, language: "en", script: "Latn"
           e = node.attr("committee-fr") and
@@ -40,24 +46,25 @@ module Asciidoctor
         end
       end
 
-      def metadata_committee2(node, a)
-        i = 2
-        while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")  do
-          a.committee **attr_code(acronym: node.attr("committee-acronym_#{i}")) do |c|
-            e = node.attr("committee-en_#{i}") and c.variant e, language: "en", script: "Latn"
-            e = node.attr("committee-fr_#{i}") and c.variant e, language: "fr", script: "Latn"
+      def metadata_committee2(node, xml, num)
+        xml.committee **attr_code(acronym:
+                                  node.attr("committee-acronym_#{num}")) do |c|
+          %w(en fr).each do |lg|
+            e = node.attr("committee-#{lg}_#{num}") and
+              c.variant e, language: lg, script: "Latn"
           end
-          i += 1
         end
       end
 
-      def metadata_workgroup(node, a)
-        a.workgroup node.attr("workgroup"),
-          **attr_code(acronym: node.attr("workgroup-acronym"))
+      def metadata_workgroup(node, xml)
+        xml.workgroup(node.attr("workgroup"),
+                      **attr_code(acronym: node.attr("workgroup-acronym")))
         i = 2
-        while node.attr("workgroup_#{i}") do
-          a.workgroup node.attr("workgroup_#{i}"),
+        while node.attr("workgroup_#{i}")
+          xml.workgroup(
+            node.attr("workgroup_#{i}"),
             **attr_code(acronym: node.attr("workgroup-acronym_#{i}"))
+          )
           i += 1
         end
       end
@@ -76,13 +83,15 @@ module Asciidoctor
         draft = node.attr("supersedes-draft#{suffix}")
         edition = node.attr("supersedes-edition#{suffix}")
         return false unless d || draft || edition
+
         relation_supersedes_self1(xml, d, edition, draft)
       end
 
-      def relation_supersedes_self1(xml, d, edition, draft)
+      def relation_supersedes_self1(xml, date, edition, draft)
         xml.relation **{ type: "supersedes" } do |r|
           r.bibitem do |b|
-            d and b.date d, **{ type: edition ? "published" : "circulated" }
+            date and b.date(date,
+                            **{ type: edition ? "published" : "circulated" })
             edition and b.edition edition
             draft and b.version do |v|
               v.draft draft
@@ -91,13 +100,13 @@ module Asciidoctor
         end
       end
 
-      def personal_role(node, c, suffix)
+      def personal_role(node, xml, suffix)
         role = node.attr("role#{suffix}") || "author"
         unless %w(author editor).include?(role.downcase)
           desc = role
           role = "editor"
         end
-        c.role desc, **{ type: role.downcase }
+        xml.role desc, **{ type: role.downcase }
       end
 
       def title(node, xml)
@@ -106,7 +115,7 @@ module Asciidoctor
           xml.title **attr_code(at.merge(type: "main")) do |t1|
             t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-#{lang}"))
           end
-          %w(cover appendix annex part subpart).each do |w|
+          %w(cover appendix annex part subpart provenance).each do |w|
             typed_title(node, xml, lang, w)
           end
         end
@@ -115,6 +124,7 @@ module Asciidoctor
       def typed_title(node, xml, lang, type)
         at = { language: lang, format: "text/plain" }
         return unless title = node.attr("title-#{type}-#{lang}")
+
         xml.title **attr_code(at.merge(type: type)) do |t1|
           t1 << Metanorma::Utils::asciidoc_sub(title)
         end
@@ -122,7 +132,7 @@ module Asciidoctor
 
       def sectiontype_streamline(ret)
         case ret
-        when "introduction" then "clause"
+        when "introduction" then @jcgm ? "introduction" : "clause"
         else
           super
         end
@@ -130,13 +140,13 @@ module Asciidoctor
 
       def inline_anchor_xref_attrs(node)
         flags = %w(pagenumber nosee nopage).each_with_object({}) do |w, m|
-          if /#{w}%/.match(node.text)
+          if /#{w}%/.match?(node.text)
             node.text = node.text.sub(/#{w}%/, "")
             m[w] = true
           end
         end
         ret = super
-        flags.keys.each { |k| ret[k.to_sym] = true }
+        flags.each_key { |k| ret[k.to_sym] = true }
         ret
       end
 
@@ -154,9 +164,6 @@ module Asciidoctor
         super.merge(attr_code(start: node.attr("start")))
       end
 
-      def section_names_terms_cleanup(x)
-      end
-
       def committee_validate(xml)
         committees = Array(configuration&.committees) || return
         committees.empty? and return
@@ -173,21 +180,44 @@ module Asciidoctor
       end
 
       def boilerplate_file(xmldoc)
-        return super unless xmldoc&.at("//bibdata/ext/editorialgroup/committee/@acronym")&.value == "JCGM"
+        return super unless @jcgm
+
         File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.xml")
       end
 
+      def sections_cleanup(xml)
+        super
+        jcgm_untitled_sections_cleanup(xml) if @jcgm
+      end
+
+      def jcgm_untitled_sections_cleanup(xml)
+        xml.xpath("//clause//clause | //annex//clause").each do |c|
+          next if !c&.at("./title")&.text&.empty?
+
+          c["inline-header"] = true
+        end
+      end
+
+      def section_names_terms_cleanup(xml); end
+
+      def section_names_refs_cleanup(xml); end
+
       def mathml_mi_italics
         { uppergreek: false, upperroman: false,
           lowergreek: false, lowerroman: true }
       end
 
+      def document(node)
+        @jcgm = node.attr("committee-acronym") == "JCGM"
+        super
+      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",
+        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")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml",
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
 
@@ -201,6 +231,7 @@ module Asciidoctor
 
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
+
         IsoDoc::BIPM::PdfConvert.new(doc_extract_attributes(node))
       end
     end

data/lib/asciidoctor/bipm/isodoc.rng

@@ -86,6 +86,35 @@
         <text/>
       </element>
     </define>
+    <define name="erefType">
+      <optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="citeas"/>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
+      <optional>
+        <attribute name="case">
+          <choice>
+            <value>capital</value>
+            <value>lowercase</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="droploc">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="CitationType"/>
+      <text/>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -775,6 +804,78 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="em">
+      <element name="em">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strong">
+      <element name="strong">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="tt">
+      <element name="tt">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="keyword">
+      <element name="keyword">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strike">
+      <element name="strike">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="underline">
+      <element name="underline">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="smallcap">
+      <element name="smallcap">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="colgroup">
@@ -793,7 +894,35 @@
     <value>internal</value>
   </define>
   <define name="TextElement" combine="choice">
-    <ref name="concept"/>
+    <choice>
+      <ref name="concept"/>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
+  <define name="add">
+    <element name="add">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
+  </define>
+  <define name="del">
+    <element name="del">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
   </define>
   <define name="concept">
     <element name="concept">

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

@@ -4,6 +4,7 @@
 	
 	<xsl:param name="svg_images"/>
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	<xsl:param name="initial_page_number"/>
 	<xsl:param name="doc_split_by_language"/>
@@ -4630,12 +4631,18 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -6101,8 +6108,12 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<fo:inline xsl:use-attribute-sets="add-style">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
-		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -6740,22 +6751,37 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'title']">
+				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@src"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>