metanorma-iso 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f4f74e50a543a5e6c5b97ac1430e59e99d333e38a0256cc320d098f4e34ace3
-  data.tar.gz: 2089e633925a0175ad691d09db5073c5fcabaf79e0c3d96a55daf013361e2c88
+  metadata.gz: 37fdffb62095a8f1613fc65eb1671c5aa50afeade748005124b9f0b685f4fc06
+  data.tar.gz: e91693cd6da032e5315fa2d453571744bd72b2c1098297f27a9cb3dcad46bc65
 SHA512:
-  metadata.gz: 7b0e1f752a14610332c9b1dce35e3b82caf8477997111c030623b1c3b4f98e98667f110821e6d534fa96e8bc7a66895c3038a2c705fe6921ec3367f35d970869
-  data.tar.gz: 3842beb81b972f9e3078279ebababbda2c6b63d2818c7cf85329dafcc92be73046f29c87c9e938a8214a4f49f27dbd0970a4f49e9ad30e5969b177e8c15985ac
+  metadata.gz: 5f43da44b6f164ccb1424bfe54644954d1e32d0f93459739730ccff7098dd294c0cb1a65f748c4bf91ee99dca7b7c6cd473730ecd6926067711fafd200e00116
+  data.tar.gz: 74f892bf58f069752e9d9a62c89887dea1954877bf395fc6e0c02d96fa2b59085c29a6b7ac12da499d6fcdc54fa872b2ada173df7dba05be05024842f9413f10

data/README.adoc

@@ -73,3 +73,8 @@ The metanorma-cli gem is the command-line interface for the Metanorma tool suite
 
 See https://www.metanorma.com/author/iso/[The ISO flavor of Metanorma].
 
+== Examples
+
+* Example documents are avalable at the https://github.com/metanorma/mn-samples-iso[mn-samples-iso] repository.
+* Document templates are available at the https://github.com/metanorma/mn-templates-iso[mn-templates-iso] repository.
+

data/lib/asciidoctor/iso/basicdoc.rng

@@ -284,6 +284,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

data/lib/asciidoctor/iso/biblio.rng

@@ -278,10 +278,12 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <ref name="orgname"/>
-      <optional>
+      <oneOrMore>
+        <ref name="orgname"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subdivision"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -357,6 +359,9 @@
   </define>
   <define name="phone">
     <element name="phone">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1024,6 +1029,8 @@
       <value>correctedBy</value>
       <value>revises</value>
       <value>revisedBy</value>
+      <value>describes</value>
+      <value>describedBy</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/iso/cleanup.rb

@@ -52,9 +52,10 @@ module Asciidoctor
         prefix = get_id_prefix(xmldoc)
         id = xmldoc.at("//bibdata/docidentifier[@type = 'iso']") or return
         id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") or
-          return
-        id.content = id_prefix(prefix, id)
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
+          id.content = id_prefix(prefix, id)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-with-lang']") and
+          id.content = id_prefix(prefix, id)
       end
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze

data/lib/asciidoctor/iso/front.rb

@@ -23,6 +23,18 @@ module Asciidoctor
         dn = add_id_parts(node.attr("docnumber"), part, subpart)
         dn = id_stage_prefix(dn, node)
         xml.docidentifier dn, **attr_code(type: "iso")
+        xml.docidentifier id_langsuffix(dn, node), **attr_code(type: "iso-with-lang")
+      end
+
+      def id_langsuffix(dn, node)
+        lang = node.attr("language") || "en"
+        suffix = case lang
+                 when "en" then "(E)"
+                 when "fr" then "(F)"
+                 else
+                   "(X)"
+                 end
+        "#{dn} #{suffix}"
       end
 
       def metadata_ext(node, xml)

data/lib/asciidoctor/iso/isostandard.rng

@@ -6,7 +6,9 @@
     </start>
     <define name="organization">
       <element name="organization">
-        <ref name="orgname"/>
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
         <optional>
           <ref name="abbreviation"/>
         </optional>

data/lib/isodoc/iso/html_convert.rb

@@ -14,10 +14,10 @@ module IsoDoc
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                       options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
-          monospacefont: (options[:alt] ?  '"Space Mono",monospace' :
-                          '"Courier New",monospace'),
+        headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                     options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
+        monospacefont: (options[:alt] ?  '"Space Mono",monospace' :
+                        '"Courier New",monospace'),
         }
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.10".freeze
+    VERSION = "1.3.11".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -100,12 +100,8 @@ RSpec.describe Asciidoctor::ISO do
    <title language="fr" format="text/plain" type="title-main">Titre Principal</title>
    <title language="fr" format="text/plain" type="title-part">Part du Titre</title>
          <docidentifier type="iso">ISO/PreNWIP3 1000-1</docidentifier>
+         <docidentifier type='iso-with-lang'>ISO/PreNWIP3 1000-1 (E)</docidentifier>
 <docnumber>1000</docnumber>
-         <edition>2</edition>
-<version>
-         <revision-date>2000-01-01</revision-date>
-         <draft>0.3.4</draft>
-       </version>
          <contributor>
            <role type="author"/>
            <organization>
@@ -120,6 +116,11 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
+         <edition>2</edition>
+<version>
+         <revision-date>2000-01-01</revision-date>
+         <draft>0.3.4</draft>
+       </version>
          <language>en</language>
          <script>Latn</script>
          <status>
@@ -187,6 +188,7 @@ RSpec.describe Asciidoctor::ISO do
        <iso-standard xmlns="http://riboseinc.com/isoxml">
        <bibdata type="standard">
          <docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
+         <docidentifier type='iso-with-lang'>ISO/IEC/IETF 1000-1-1:2001 (X)</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
          <docidentifier type="iso-tc">2003</docidentifier>
          <docnumber>1000</docnumber>
@@ -289,10 +291,12 @@ RSpec.describe Asciidoctor::ISO do
       :no-isobib:
       :docnumber: 1000
       :docstage: 50
+      :language: fr
     INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
 <bibdata type="standard">
   <docidentifier type="iso">ISO/FDIS 1000</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO/FDIS 1000 (F)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -309,7 +313,7 @@ RSpec.describe Asciidoctor::ISO do
     </organization>
   </contributor>
 
-  <language>en</language>
+  <language>fr</language>
   <script>Latn</script>
   <status>
     <stage>50</stage>
@@ -355,6 +359,7 @@ OUTPUT
 <iso-standard xmlns="http://riboseinc.com/isoxml">
 <bibdata type="standard">
   <docidentifier type="iso">ISO 1000</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO 1000 (E)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -418,6 +423,7 @@ OUTPUT
 <iso-standard xmlns="http://riboseinc.com/isoxml">
 <bibdata type="standard">
   <docidentifier type="iso">ISO/PRF 1000</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO/PRF 1000 (E)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>

data/spec/asciidoctor-iso/table_spec.rb

@@ -130,14 +130,14 @@ RSpec.describe Asciidoctor::ISO do
       | Husked rice, parboiled | 1,0 | 1,0 | Not applicable | 1,0
       | Milled rice, parboiled | 1,0 | 1,0 | 1,0 | Not applicable
       | Chips | 0,1 | 0,1 | 0,1 | 0,1
-      | HDK | 2,0 footnoteref:[defectsmass,The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.] | 2,0 | 2,0 footnoteref:[defectsmass] | 2,0
+      | HDK | 2,0 footnote:defectsmass[The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.] | 2,0 | 2,0 footnote:defectsmass[] | 2,0
       | Damaged kernels | 4,0 | 3,0 | 4,0 | 3,0
       | Immature and/or malformed kernels | 8,0 | 2,0 | 8,0 | 2,0
-      | Chalky kernels | 5,0 footnoteref:[defectsmass] | 5,0 | Not applicable | Not applicable
-      | Red kernels and red-streaked kernels | 12,0 | 12,0 | 12,0 footnoteref:[defectsmass] | 12,0
-      | Partly gelatinized kernels | Not applicable | Not applicable | 11,0 footnoteref:[defectsmass] | 11,0
+      | Chalky kernels | 5,0 footnote:defectsmass[] | 5,0 | Not applicable | Not applicable
+      | Red kernels and red-streaked kernels | 12,0 | 12,0 | 12,0 footnote:defectsmass[] | 12,0
+      | Partly gelatinized kernels | Not applicable | Not applicable | 11,0 footnote:defectsmass[] | 11,0
       | Pecks | Not applicable | Not applicable | 4,0 | 2,0
-      | Waxy rice | 1,0 footnoteref:[defectsmass] | 1,0 | 1,0 footnoteref:[defectsmass] | 1,0
+      | Waxy rice | 1,0 footnote:defectsmass[] | 1,0 | 1,0 footnote:defectsmass[] | 1,0
       
       5+a| Live insects shall not be present. Dead insects shall be included in extraneous matter.
       |===

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing